From 54e14bff397221b5b0d64720f77217f4d34ebf98 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 14 七月 2023 09:50:53 +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 | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 52 insertions(+), 6 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 75a9bab..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,13 +11,14 @@ <el-form-item label="鍚嶇О" prop="name"> <el-input v-model.trim="newRowData.name" :maxLength="20" clearable /> </el-form-item> - <el-form-item label="鏍囩" prop="id"> + <el-form-item label="缂栧彿" prop="id"> <el-input v-model.trim="newRowData.id" clearable /> </el-form-item> <el-form-item label="璧峰鐘舵��" prop="startStatus"> <el-select v-model="newRowData.startStatus" placeholder="璇烽�夋嫨璧峰鐘舵��" + :disabled="type === 'edit'" style="width: 100%" > <el-option @@ -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,25 +94,31 @@ DetailPanel, DetailForm, }, - props: ["rowData", "existNodes"], + props: ["rowData", "existNodes", "type"], data() { return { newRowData: { startStatus: undefined, name: undefined, id: undefined, - remark: undefined + remark: undefined, }, rules: { name: [{ required: true, message: "鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }], id: [ { required: true, message: "鏍囩涓嶈兘涓虹┖", trigger: "blur" }, - { pattern: /^[A-z]+$/g, message: "鏍囩鍙兘杈撳叆鑻辨枃", trigger: "blur" } + { + pattern: /^[A-z]+$/g, + message: "鏍囩鍙兘杈撳叆鑻辨枃", + trigger: "blur", + }, ], startStatus: [ { required: true, message: "璧峰鐘舵�佷笉鑳戒负绌�", trigger: "change" }, ], }, + eventList: [{evenName: '123123'}], + currentActive: 0 }; }, methods: { @@ -107,6 +133,9 @@ }); }); }, + editChange(row) { + this.$set(row, 'isEdit', !row.isEdit) + } }, watch: { rowData: { @@ -131,3 +160,20 @@ }, }; </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