From 67a8703176c9f36519d98c52130b12316029bb23 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 18 七月 2023 15:20:28 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/flow-cycle/components/DetailPanel.vue | 79 +++++++++++++++++++++++++++------------
1 files changed, 54 insertions(+), 25 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/flow-cycle/components/DetailPanel.vue b/Source/UBCS-WEB/src/components/flow-cycle/components/DetailPanel.vue
index 78c2af5..6f1b324 100644
--- a/Source/UBCS-WEB/src/components/flow-cycle/components/DetailPanel.vue
+++ b/Source/UBCS-WEB/src/components/flow-cycle/components/DetailPanel.vue
@@ -46,33 +46,34 @@
<group-panel :status="status">
<detail-form type="group" />
</group-panel>
- <node-panel :status="status">
+ <!-- <edge-panel :status="status">
<div class="event">
<hr />
- <div class="btn_box">
- <el-button type="primary" size="mini">鏂板</el-button>
- <el-button type="danger" size="mini">鍒犻櫎</el-button>
- <el-button type="primary" size="mini">淇濆瓨</el-button>
- </div>
- <div class="flex" v-for="(item, index) in eventList" :key="index" :class="{active: index === currentActive}">
- <el-select size="mini" style="width: 70%" v-if="item.isEdit">
- <el-option></el-option>
- </el-select>
- <span v-else style="width: 70%">{{item.evenName}}</span>
- <el-button size="mini" type="text" class="red">鍒犻櫎</el-button>
- <el-button size="mini" type="text" @click="editChange(item)">{{item.isEdit ? '鏆傚瓨' : '缂栬緫'}}</el-button>
- </div>
+ <h4>璺冭縼浜嬩欢</h4>
+ <el-select
+ size="mini"
+ style="width: 100%"
+ value-key="oid"
+ v-model="saveEventList"
+ multiple
+ >
+ <el-option
+ v-for="itm in eventList"
+ :key="itm.oid"
+ :value="itm"
+ :label="itm.eventShowName"
+ ></el-option>
+ </el-select>
</div>
- </node-panel>
-
- <!-- <multi-panel :status="status" /> -->
- <!-- <canvas-panel :status="status" /> -->
+ </edge-panel> -->
</template>
</detail-panel>
</div>
</template>
<script>
+import API from "@/api/modeling/cycle";
+
import {
NodePanel,
EdgePanel,
@@ -94,7 +95,7 @@
DetailPanel,
DetailForm,
},
- props: ["rowData", "existNodes", "type"],
+ props: ["rowData", "existNodes", "existEdges", "type", "currentSelectedLine"],
data() {
return {
newRowData: {
@@ -117,9 +118,14 @@
{ required: true, message: "璧峰鐘舵�佷笉鑳戒负绌�", trigger: "change" },
],
},
- eventList: [{evenName: '123123'}],
- currentActive: 0
+ eventList: [],
+ saveEventList: [],
+ edgeEventList: {},
+ currentActive: 0,
};
+ },
+ created() {
+ this.getEventList();
},
methods: {
getNewRowDate() {
@@ -133,9 +139,13 @@
});
});
},
- editChange(row) {
- this.$set(row, 'isEdit', !row.isEdit)
- }
+ getEventList() {
+ API.getEventList().then((res) => {
+ if (res.data.code === 200) {
+ this.eventList = res.data.data;
+ }
+ });
+ },
},
watch: {
rowData: {
@@ -157,6 +167,25 @@
this.newRowData.startStatus = undefined;
}
},
+ currentSelectedLine: {
+ deep: true,
+ handler(newV) {
+ if (newV.id) {
+ if (this.edgeEventList[newV.id]) {
+ this.saveEventList = this.edgeEventList[newV.id]
+ } else {
+ this.edgeEventList[newV.id] = []
+ this.saveEventList = []
+ }
+ }
+ }
+ },
+ saveEventList: {
+ deep: true,
+ handler(newV) {
+ this.edgeEventList[this.currentSelectedLine.id] = newV
+ }
+ }
},
};
</script>
@@ -174,6 +203,6 @@
color: red;
}
.active {
- box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.4)
+ // box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.4)
}
</style>
--
Gitblit v1.9.3