From 7ce592bb5a5b9e0dc78786e727f042b95ebc81c8 Mon Sep 17 00:00:00 2001 From: lihang <lihang@vci-tech.com> Date: 星期四, 13 七月 2023 16:00:59 +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 | 90 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 75 insertions(+), 15 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 1fb051b..78c2af5 100644 --- a/Source/UBCS-WEB/src/components/flow-cycle/components/DetailPanel.vue +++ b/Source/UBCS-WEB/src/components/flow-cycle/components/DetailPanel.vue @@ -11,20 +11,21 @@ <el-form-item label="鍚嶇О" prop="name"> <el-input v-model.trim="newRowData.name" :maxLength="20" clearable /> </el-form-item> - <el-form-item label="鏍囩" prop="label"> - <el-input v-model.trim="newRowData.label" clearable /> + <el-form-item label="缂栧彿" prop="id"> + <el-input v-model.trim="newRowData.id" clearable /> </el-form-item> - <el-form-item label="璧峰鐘舵��" prop="startState"> + <el-form-item label="璧峰鐘舵��" prop="startStatus"> <el-select - v-model="newRowData.startState" + v-model="newRowData.startStatus" placeholder="璇烽�夋嫨璧峰鐘舵��" + :disabled="type === 'edit'" style="width: 100%" > <el-option - v-for="item in []" - :key="item.value" - :label="item.label" - :value="item.value" + v-for="item in existNodes" + :key="item.id" + :label="item.id" + :value="item.id" > </el-option> </el-select> @@ -45,8 +46,27 @@ <group-panel :status="status"> <detail-form type="group" /> </group-panel> - <multi-panel :status="status" /> - <canvas-panel :status="status" /> + <node-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> + </div> + </node-panel> + + <!-- <multi-panel :status="status" /> --> + <!-- <canvas-panel :status="status" /> --> </template> </detail-panel> </div> @@ -74,17 +94,31 @@ DetailPanel, DetailForm, }, - props: ["readOnly", "rowData"], + props: ["rowData", "existNodes", "type"], data() { return { - newRowData: {}, + newRowData: { + startStatus: undefined, + name: undefined, + id: undefined, + remark: undefined, + }, rules: { name: [{ required: true, message: "鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }], - label: [{ required: true, message: "鏍囩涓嶈兘涓虹┖", trigger: "blur" }], - startState: [ - // { required: true, message: "璧峰鐘舵�佷笉鑳戒负绌�", trigger: "change" }, + id: [ + { required: true, message: "鏍囩涓嶈兘涓虹┖", trigger: "blur" }, + { + pattern: /^[A-z]+$/g, + message: "鏍囩鍙兘杈撳叆鑻辨枃", + trigger: "blur", + }, + ], + startStatus: [ + { required: true, message: "璧峰鐘舵�佷笉鑳戒负绌�", trigger: "change" }, ], }, + eventList: [{evenName: '123123'}], + currentActive: 0 }; }, methods: { @@ -99,6 +133,9 @@ }); }); }, + editChange(row) { + this.$set(row, 'isEdit', !row.isEdit) + } }, watch: { rowData: { @@ -114,6 +151,29 @@ } }, }, + existNodes(newV) { + const flag = newV.some((item) => item.id === this.newRowData.startStatus); + if (!flag) { + this.newRowData.startStatus = undefined; + } + }, }, }; </script> +<style lang="scss" scoped> +.event { + margin-top: 20px; + text-align: center; +} +.flex { + margin-top: 10px; + display: flex; + justify-content: space-between; +} +.red { + color: red; +} +.active { + box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.4) +} +</style> -- Gitblit v1.9.3