2112A-ONE
/
cloud-ui
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
面包骑士 2024-09-10 20:54:01 +08:00
parent b186934535 27e4f6590a
commit 886aa3cb8b
6 changed files with 42 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/rule/ruleEdition.js
View File

@ -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',
})
}

2
src/api/source/source.js
View File

@ -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',
})
}

40
src/router/index.js
View File

@ -19,12 +19,12 @@ Vue.use(Router)
* roles: ['admin', 'common'] // 访问路由的角色权限
* permissions: ['a:a:a', 'b:b:b'] // 访问路由的菜单权限
* meta : {
noCache: true // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字
icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg
breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示
activeMenu: '/system/user' // 当路由设置了该属性，则会高亮相对应的侧边栏。
}
noCache: true // 如果设置为true，则不会被 <keep-alive> 缓存(默认 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'}
}
]
}
]

1
src/views/engine/ruleInfo/index.vue
View File

@ -253,6 +253,7 @@ export default {
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;

1
src/views/quest/node/components/node/dispFind.vue
View File

@ -30,6 +30,7 @@ import UniteFind from "./type/uniteFind.vue";
import RuleFind from "./type/ruleFind.vue";
export default {
// import引入的组件需要注入到对象中才能使用"
name: 'type-table',

71
src/views/rule/rule/version.vue
View File

@ -356,77 +356,13 @@
<div slot="header" class="clearfix">
<span>选择资产集</span>
<template>
<!-- <el-table-->
<!-- :data="tableOrigin"-->
<!-- style="width: 100%">-->
<!-- <el-table-column-->
<!-- label="主键"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span style="margin-left: 10px">{{ scope.row.id }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="数据源ID"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span style="margin-left: 10px">{{ scope.row.basicId }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="表名称"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span style="margin-left: 10px">{{ scope.row.tableName }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="表备注"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span style="margin-left: 10px">{{ scope.row.tableRemark }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="类型"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span style="margin-left: 10px">{{ scope.row.type }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="数据量"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span style="margin-left: 10px">{{ scope.row.dataNum }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="是否核心"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span style="margin-left: 10px">{{ scope.row.center }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- @click="handleEditSelect(scope.row)">选择-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
{{tableDatas}}
<el-table>
<el-table-column
v-for="tableData in tableDatas"
:key="key"
v-for="tableData in tableDatas"
:label="tableData.label"
:prop="tableData.value"
width="180">
{{tableData.value}}
</el-table-column>
<el-table-column label="操作">
@ -569,7 +505,6 @@ export default {
this.findById();
this.findList()
this.getDataOrigin()
this.findTableValueByTableName();
},
//生命周期 - 挂载完成（可以访问DOM元素）",
mounted() {
@ -578,6 +513,8 @@ export default {
methods: {
//表数据
handleEditSelect(data) {
console.log(data.basicId);
console.log(data.tableName);
findTableValueByTableName(data.basicId, data.tableName).then(res => {
console.log(res.data)
this.tableDatas = res.data