diff --git a/package.json b/package.json index 6a46cc5..de5b0c4 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "muyu", "version": "3.6.3", - "description": "若依管理系统", - "author": "若依", + "description": "数据处理系统", + "author": "MuYu", "license": "MIT", "scripts": { "dev": "vue-cli-service serve", @@ -37,8 +37,11 @@ }, "dependencies": { "@riophae/vue-treeselect": "0.4.0", + "@vue/compiler-core": "^3.4.26", + "@vue/compiler-ssr": "^3.4.26", "axios": "0.24.0", "clipboard": "2.0.8", + "codemirror": "^5.65.16", "core-js": "3.25.3", "echarts": "5.4.0", "element-ui": "2.15.13", @@ -53,6 +56,7 @@ "screenfull": "5.0.2", "sortablejs": "1.10.2", "vue": "2.6.12", + "vue-codemirror": "^4.0.6", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", "vue-meta": "2.4.0", diff --git a/src/api/dataSource/Permissions.js b/src/api/dataSource/Permissions.js index 7a1a6be..6f9d90b 100644 --- a/src/api/dataSource/Permissions.js +++ b/src/api/dataSource/Permissions.js @@ -6,3 +6,10 @@ export function getAllUserAndDept(dataType,dataId) { method: 'get' }) } +export function insertPermissions(permissionsReq) { + return request({ + url: '/data/permissions/insertPermissions?', + method: 'post', + data: permissionsReq + }) +} diff --git a/src/api/dataSource/dataKvt.js b/src/api/dataSource/dataKvt.js new file mode 100644 index 0000000..9fb9956 --- /dev/null +++ b/src/api/dataSource/dataKvt.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function getShowModel(tableId) { + return request({ + url: '/data/dataKvt/getShowModel?tableId='+tableId, + method: 'get' + }) +} diff --git a/src/api/ruleEngine/ruleEngine.js b/src/api/ruleEngine/ruleEngine.js new file mode 100644 index 0000000..04f906e --- /dev/null +++ b/src/api/ruleEngine/ruleEngine.js @@ -0,0 +1,32 @@ +import request from '@/utils/request' + +export function getRuleList(ruleListReq) { + return request({ + url: '/data/rule/getRuleList', + method: 'post', + data: ruleListReq + }) +} + +export function insertRuleEngine(ruleEngine) { + return request({ + url: '/data/rule/insertRuleEngine', + method: 'post', + data: ruleEngine + }) +} + +export function getRuleConfigList() { + return request({ + url: '/data/ruleConfig/getRuleConfigList', + method: 'get' + }) +} + +export function testCompile(testWord) { + return request({ + url: '/data/test/testCompile', + method: 'post', + data: testWord + }) +} diff --git a/src/components/Encoding/index.vue b/src/components/Encoding/index.vue new file mode 100644 index 0000000..0e6c05c --- /dev/null +++ b/src/components/Encoding/index.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 23e3ccc..12082ea 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -5,6 +5,25 @@ import Layout from '@/layout/index' import ParentView from '@/components/ParentView' import InnerLink from '@/layout/components/InnerLink' +let routeResponse = { + "msg": "操作成功", + "code": 200, + "data": [ + { + "name": "EngineVersion", + "path": "rule-engine/engine-version/:ruleEngineId(\\d+)", + "hidden": true, + "component": "ruleEngine/engineVersion/index", + "meta": { + "title": "引擎版本", + "icon": "component", + "noCache": false, + "link": null + } + }, + ] +} + const permission = { state: { routes: [], @@ -34,12 +53,13 @@ const permission = { return new Promise(resolve => { // 向后端请求路由数据 getRouters().then(res => { + const sdata = JSON.parse(JSON.stringify(res.data)) const rdata = JSON.parse(JSON.stringify(res.data)) const sidebarRoutes = filterAsyncRouter(sdata) const rewriteRoutes = filterAsyncRouter(rdata, false, true) const asyncRoutes = filterDynamicRoutes(dynamicRoutes); - rewriteRoutes.push({path: '*', redirect: '/404', hidden: true}) + // rewriteRoutes.push({path: '*', redirect: '/404', hidden: true}) router.addRoutes(asyncRoutes); commit('SET_ROUTES', rewriteRoutes) commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes)) diff --git a/src/views/dataAssets/assetAuthorization/auth/AuthDataSource.vue b/src/views/dataAssets/assetAuthorization/auth/AuthDataSource.vue index 9e1b370..2d128de 100644 --- a/src/views/dataAssets/assetAuthorization/auth/AuthDataSource.vue +++ b/src/views/dataAssets/assetAuthorization/auth/AuthDataSource.vue @@ -31,23 +31,25 @@ :tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="deptId" > - - - - + + + + - + @@ -61,16 +63,18 @@ - - + + @@ -83,12 +87,14 @@ diff --git a/src/views/dataAssets/assetAuthorization/auth/AuthTable.vue b/src/views/dataAssets/assetAuthorization/auth/AuthTable.vue index 050c9cb..ffe0989 100644 --- a/src/views/dataAssets/assetAuthorization/auth/AuthTable.vue +++ b/src/views/dataAssets/assetAuthorization/auth/AuthTable.vue @@ -35,7 +35,6 @@ - @@ -85,7 +86,10 @@ active-color="#13ce66" inactive-color="#ff4949" active-text="已授权" - inactive-text="未授权"> + inactive-text="未授权" + active-value="Y" + inactive-value="N" + @change="changeStatus($event,scope.row)"> @@ -99,11 +103,13 @@ + + diff --git a/src/views/dataAssets/assetStructure/dashboard/OverallAssetStructure.vue b/src/views/dataAssets/assetStructure/dashboard/OverallAssetStructure.vue index 5a04f96..ff79d0f 100644 --- a/src/views/dataAssets/assetStructure/dashboard/OverallAssetStructure.vue +++ b/src/views/dataAssets/assetStructure/dashboard/OverallAssetStructure.vue @@ -53,7 +53,7 @@ + + + + diff --git a/src/views/ruleEngine/engineMaintenance/index.vue b/src/views/ruleEngine/engineMaintenance/index.vue new file mode 100644 index 0000000..77f136c --- /dev/null +++ b/src/views/ruleEngine/engineMaintenance/index.vue @@ -0,0 +1,351 @@ + + + diff --git a/src/views/ruleEngine/engineVersion/index.vue b/src/views/ruleEngine/engineVersion/index.vue new file mode 100644 index 0000000..d82b166 --- /dev/null +++ b/src/views/ruleEngine/engineVersion/index.vue @@ -0,0 +1,24 @@ + + + + +