diff --git a/package.json b/package.json index 6a46cc5..db5695b 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,9 +56,11 @@ "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", + "vue-monaco-editor": "0.0.19", "vue-router": "3.4.9", "vuedraggable": "2.24.3", "vuex": "3.6.0" diff --git a/src/api/kvt/kvt.js b/src/api/kvt/kvt.js index 1656f94..0342589 100644 --- a/src/api/kvt/kvt.js +++ b/src/api/kvt/kvt.js @@ -194,3 +194,22 @@ export function selectDataDisplayName(name) { }) } +//权限添加 +export function permissionsUserAdd(data) { + return request({ + url: '/kvt/kvt/permissionsUserAdd', + method: 'post', + data + }) +} + + +//权限删除 +export function permissionsUserDel(data) { + return request({ + url: '/kvt/kvt/permissionsUserDel', + method: 'post', + data + }) +} + diff --git a/src/api/rule_engine/engine.js b/src/api/rule_engine/engine.js index ec0c513..88299bb 100644 --- a/src/api/rule_engine/engine.js +++ b/src/api/rule_engine/engine.js @@ -16,6 +16,14 @@ export function getEngine(id) { method: 'get' }) } +// 新增授权 +export function permissionsUserAdd(data) { + return request({ + url: '/rule_engine/permissionsUserAdd/' , + method: 'post', + data + }) +} // 新增规则引擎 export function addEngine(data) { @@ -42,3 +50,55 @@ export function delEngine(id) { method: 'delete' }) } + + +// 加载 +export function loading(data) { + return request({ + url: '/rule_engine/engine/loading/' , + method: 'post', + data + }) +} +// 加载 +export function writeCodeAdd(data) { + return request({ + url: '/rule_engine/engine/writeCodeAdd/' , + method: 'post', + data + }) +} +// 获取规则引擎版本列表 +export function selectRuleEngineVersion(id) { + return request({ + url: '/rule_engine/engine/selectRuleEngineVersion?id='+id , + method: 'post' + }) +} +// 获取规则引擎是否激活 +export function updateRuleEngineVersionIsActivate(data) { + return request({ + url: '/rule_engine/engine/updateRuleEngineVersionIsActivate' , + method: 'post', + data + }) +}// 获取规则引擎状态 +export function updateRuleEngineVersionStates(data) { + return request({ + url: '/rule_engine/engine/updateRuleEngineVersionStates' , + method: 'post', + data + }) +} + + +// 添加规则引擎 +export function ruleEngineVersionAdd(data) { + return request({ + url: '/rule_engine/engine/RuleEngineVersionAdd' , + method: 'post', + data + }) +} + + diff --git a/src/components/Encoding/index.vue b/src/components/Encoding/index.vue index 31344f8..c99fb08 100644 --- a/src/components/Encoding/index.vue +++ b/src/components/Encoding/index.vue @@ -1,6 +1,6 @@ @@ -75,7 +75,7 @@ export default { .CodeMirror { font-family: 'JetBrainsMono-Medium', monospace; - height: 800px; + height: 600px; } .CodeMirror-lines { diff --git a/src/router/index.js b/src/router/index.js index 2afac71..c208340 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -71,6 +71,13 @@ export const constantRoutes = [ name: 'Index', meta: {title: '首页', icon: 'dashboard', affix: true} } + , + { + path: '/engine/engineMaintenance/:id', // :id 是动态参数 + name: 'EngineVersion', // 给路由起一个名字 + component: () => import('@/views/ruleEngine/engineVersion'), // 加载对应的路径 + meta: {title: '规则维护' ,affix: true} + }, ] }, { @@ -87,6 +94,7 @@ export const constantRoutes = [ } ] } + ] // 动态路由,基于用户权限动态去加载 diff --git a/src/views/kvt/analysisData/dashboard/OverallAssetStructure.vue b/src/views/kvt/analysisData/dashboard/OverallAssetStructure.vue index 6fea0ea..466b090 100644 --- a/src/views/kvt/analysisData/dashboard/OverallAssetStructure.vue +++ b/src/views/kvt/analysisData/dashboard/OverallAssetStructure.vue @@ -2,7 +2,7 @@
- 111资产模型基本信息 + {{title}}资产模型基本信息
@@ -184,7 +184,8 @@ export default { 'selectData', 'childrenMess', 'selectAll', - 'dictName' + 'dictName', + 'title' ], data() { return { diff --git a/src/views/kvt/analysisData/dashboard/OverallSpecificAssets.vue b/src/views/kvt/analysisData/dashboard/OverallSpecificAssets.vue index 321fb04..aa80214 100644 --- a/src/views/kvt/analysisData/dashboard/OverallSpecificAssets.vue +++ b/src/views/kvt/analysisData/dashboard/OverallSpecificAssets.vue @@ -146,7 +146,8 @@ export default { 'selectAll', 'dictName', 'bb', - 'shu' + 'shu', + 'title' ], // watch:{ // activeTab(newVal,oldVal){ diff --git a/src/views/kvt/analysisData/index.vue b/src/views/kvt/analysisData/index.vue index beebd49..2de7126 100644 --- a/src/views/kvt/analysisData/index.vue +++ b/src/views/kvt/analysisData/index.vue @@ -110,18 +110,16 @@ export default { if (node.level === 0) return resolve(this.assetStructureList); const {data} = node; this.showAssets = data.type; - selectChildAll().then(res=>{ - console.log(res) + console.log("wwwwwwww",res) this.chir = res.data }) - console.log(node) selectDepartmen(node.data.databaseName).then(res=>{ this.childrenList = res.data }) if (node.level==1){ overallDataStructure().then(res =>{ - console.log(res) + console.log("rrrr",res) this.DataStructure = res.data }) } @@ -129,8 +127,7 @@ export default { this.aa=data.id console.log("55555555555555555",data) selectDictionaryy(data.id).then(res => { - - console.log("res",res) + console.log("selectDictionaryy",res.data) this.dictAddName = res.data }) } @@ -141,13 +138,12 @@ export default { resolve(this.childrenList) }, 500); }, + showAssetsFun(data){ this.title = data.name + '('+data.databaseName + '-' + data.systemName+')' this.showAssets = data.type; this.dataname= data.name, this.databaseNam= data.databaseName - - console.log("dataname",data.name) selectChild(data.name).then(res =>{ this.childr=res.data }) diff --git a/src/views/kvt/assetAuthorization/auth/AuthDataSource.vue b/src/views/kvt/assetAuthorization/auth/AuthDataSource.vue index 4ff236e..77585b1 100644 --- a/src/views/kvt/assetAuthorization/auth/AuthDataSource.vue +++ b/src/views/kvt/assetAuthorization/auth/AuthDataSource.vue @@ -2,7 +2,7 @@

基本信息

55555555 -{{DataSource}} + {{DataSource}} @@ -49,10 +49,10 @@ active-color="#13ce66" inactive-color="#ff4949" active-text="已授权" - inactive-text="未授权" > - - - + inactive-text="未授权" + :active-value="1" + :inactive-value="0" + > @@ -61,6 +61,7 @@ + {{userList}} @@ -76,10 +77,10 @@ active-color="#13ce66" inactive-color="#ff4949" active-text="已授权" - inactive-text="未授权"> - - - + inactive-text="未授权" + :active-value="1" + :inactive-value="0" + @change="permissionsAdd(scope.row)"> @@ -93,7 +94,7 @@