@@ -258,6 +261,20 @@
>
+
+
+
+
+ {{ dict.dictName }}
+ {{ dict.dictType }}
+
+
+
+
@@ -325,6 +342,7 @@ export default {
nodes: [],
edges: []
},
+ dictTypeList:[],
// 表格Column设置弹窗开关
tableColumnEditOpen:false,
loading: false,
@@ -332,11 +350,6 @@ export default {
clientHeight: window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight,
//todo 设置线段的选择 er图中只有一种线
edgeShapeList: [
- // { guid: "top-line", label: "直线", class: "iconfont icon-flow-line" },
- // { guid: "dice-er-edge", label: "连线", class: "iconfont icon-flow-line" },
- // { guid: "top-brokenline", label: "折线", class: "iconfont icon-flow-broken" },
- // { guid: "top-polyline", label: "多段线", class: "iconfont icon-flow-broken" },
- // { guid: "top-cubic", label: "曲线", class: "iconfont icon-flow-curve" }
],
graph: null,
grid: null,
@@ -510,7 +523,6 @@ export default {
// 修改字段信息
editColumns() {
this.tableColumnEditOpen = true
-
},
// 连线的三个选择框触发实践
tableCommentChang(e) {
@@ -583,6 +595,9 @@ export default {
},
dragendHandler() {
},
+ tranDictData(list){
+ this.dictTypeList = list
+ },
initTopo(graphData) {
let self = this
if (self.graph) {
@@ -1162,6 +1177,7 @@ export default {
item.type = 1
item.ucMock = ''
item.ucName = item.columnComment
+ item.dictType = null
columns.push(item)
}
diff --git a/ebts-ui/src/views/tool/top/topology.vue b/ebts-ui/src/views/tool/top/topology.vue
index 76f0fee..e8f451f 100644
--- a/ebts-ui/src/views/tool/top/topology.vue
+++ b/ebts-ui/src/views/tool/top/topology.vue
@@ -80,23 +80,21 @@
-
-
-
+
+
+
{{ parseDateOrTime(scope.row[item.prop]) }}
-
-
-
-
+
+
+ {{ dictFormat(item.dictType, scope.row[item.prop]) }}
+
+ {{ scope.row[item.prop] }}
+
+