diff --git a/src/api/rule/ruleEdition.js b/src/api/rule/ruleEdition.js index cc3f1bd..510668c 100644 --- a/src/api/rule/ruleEdition.js +++ b/src/api/rule/ruleEdition.js @@ -82,7 +82,7 @@ export function findTableIdByParentId(id) { //表 export function findTableValueByTableName(basicId,tableName) { return request({ - url: `/source/value/findTableValueByTableName?basicId=`+basicId+'&&tableName='+tableName, + url: `/source/value/findTableValueList?basicId=`+basicId+'&&tableName='+tableName, method: 'post', }) } diff --git a/src/api/source/source.js b/src/api/source/source.js index 3101bd7..9320cb3 100644 --- a/src/api/source/source.js +++ b/src/api/source/source.js @@ -74,7 +74,7 @@ export function findByTableName() { //根据基础表ID和表名查询数据 export function findTableValueList(basicId,tableName) { return request({ - url: "/source/value/findTableValueByTableName?basicId="+basicId+"&tableName="+tableName, + url: "/source/value/findTableValueList?basicId="+basicId+"&tableName="+tableName, method: 'post', }) } diff --git a/src/router/index.js b/src/router/index.js index 186e20b..fcd2a2c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -19,12 +19,12 @@ Vue.use(Router) * roles: ['admin', 'common'] // 访问路由的角色权限 * permissions: ['a:a:a', 'b:b:b'] // 访问路由的菜单权限 * meta : { - noCache: true // 如果设置为true，则不会被 缓存(默认 false) - title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字 - icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg - breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示 - activeMenu: '/system/user' // 当路由设置了该属性，则会高亮相对应的侧边栏。 - } + noCache: true // 如果设置为true，则不会被 缓存(默认 false) + title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字 + icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg + breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示 + activeMenu: '/system/user' // 当路由设置了该属性，则会高亮相对应的侧边栏。 + } */ // 公共路由 @@ -146,6 +146,34 @@ export const dynamicRoutes = [ meta: {title: '修改生成配置', activeMenu: '/tool/gen'} } ] + }, + { + path: '/engine/rule-version', + component: Layout, + hidden: true, + permissions: ['engine:ruleInfo:query'], + children: [ + { + path: 'index/:ruleId', + component: () => import('@/views/engine/ruleInfo/Version'), + name: 'Version', + meta: {title: `规则版本`, activeMenu: '/engine/ruleInfo'} + } + ] + }, + { + path: '/engine/rule-test', + component: Layout, + hidden: true, + permissions: ['engine:ruleInfo:query'], + children: [ + { + path: 'index', + component: () => import('@/views/engine/ruleInfo/Test.vue'), + name: 'Test', + meta: {title: `测试拓扑图`, activeMenu: '/engine/ruleInfo'} + } + ] } ] diff --git a/src/views/engine/ruleInfo/index.vue b/src/views/engine/ruleInfo/index.vue index 03cb644..7d79e9e 100644 --- a/src/views/engine/ruleInfo/index.vue +++ b/src/views/engine/ruleInfo/index.vue @@ -253,6 +253,7 @@ export default { this.loading = false; }); }, + // 取消按钮 cancel() { this.open = false; diff --git a/src/views/quest/node/components/node/dispFind.vue b/src/views/quest/node/components/node/dispFind.vue index 0c26d4f..0d6c4e1 100644 --- a/src/views/quest/node/components/node/dispFind.vue +++ b/src/views/quest/node/components/node/dispFind.vue @@ -30,6 +30,7 @@ import UniteFind from "./type/uniteFind.vue"; import RuleFind from "./type/ruleFind.vue"; + export default { // import引入的组件需要注入到对象中才能使用" name: 'type-table', diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index 4be85e2..40c2801 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -356,77 +356,13 @@
选择资产集