From 8eda199da3781f4c8e0d95f47a092db342c85ed7 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 09 十月 2024 11:40:51 +0800
Subject: [PATCH] 1

---
 src/views/console/workstation/CollDialog.vue |   70 +++++++++++++++++++++++++++++------
 1 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/src/views/console/workstation/CollDialog.vue b/src/views/console/workstation/CollDialog.vue
index b448605..89f5b05 100644
--- a/src/views/console/workstation/CollDialog.vue
+++ b/src/views/console/workstation/CollDialog.vue
@@ -15,11 +15,19 @@
                 <template #header="scope">
                     <span v-show="item.isRequired" style="color: red;">*</span>
                     <span>{{ scope.column.label }}</span>
+                    <el-tooltip class="box-item" effect="dark" placement="top-start">
+                        <template #content>
+                            <p v-html="item.describe"></p>
+                        </template>
+                        <el-icon v-show="item.describe"><el-icon-question-filled /></el-icon>
+                    </el-tooltip>
+
                 </template>
                 <template #default="scope">
-                    <el-select v-model="scope.row[item.prop]" placeholder="" size="small"
-                        v-if="scope.row.status && item.type === 'option'">
-                        <el-option v-for="item in item.options" :key="item" :label="item" :value="item" />
+                    <el-select :disabled="!scope.row.status" v-model="scope.row[item.prop]" placeholder="" size="small"
+                        v-if="item.type === 'option'">
+                        <el-option v-for="item in item.options" :key="item.value || item" :label="(item?.label || item)"
+                            :value="(item.value || item)" />
                     </el-select>
                     <el-switch :disabled="!scope.row.status" size="small" v-model="scope.row[item.prop]"
                         v-else-if="item.type === 'boolean'" />
@@ -53,6 +61,7 @@
 
 <script>
 export default {
+    name: 'CollDialog',
     emits: ['success', 'closed'],
     props: {
         option: {
@@ -89,6 +98,7 @@
                 }).then(() => {
                     try {
                         this.cols = JSON.parse(this.typeList.find(v => v.id === val).dpHeadFull)
+                        this.addOptions()
                         this.tabledata = []
                     } catch (error) {
                         this.cols = []
@@ -99,12 +109,24 @@
             } else {
                 try {
                     this.cols = JSON.parse(this.typeList.find(v => v.id === val).dpHeadFull)
+                    this.addOptions()
+
                 } catch (error) {
                     this.cols = []
                 }
             }
+            console.log('default')
+            this.setAddTemp()
 
+        },
+        setAddTemp() {
+            this.cols.forEach(v => {
+                if (v.type === 'boolean') {
+                    this.addTemplate[v.prop] = false
+                }
+                v.default && (this.addTemplate[v.prop] = v.default)
 
+            })
         },
         //鏄剧ず
         open(mode = 'add', params) {
@@ -127,19 +149,42 @@
             })
 
         },
+        addOptions() {
+            if (this.cols.filter(v => v.prop === 'dplabel').length === 0) {
+                this.cols.unshift(
+                    {
+                        label: "鏄剧ず鍚嶇О",
+                        prop: "dplabel",
+                        isRequired: true,
+                    }
+                )
+            }
+            if (this.cols.filter(v => v.prop === 'dpCategory').length === 0) {
+                this.cols.unshift(
+                    {
+                        label: "鐐逛綅鍒嗙被",
+                        prop: "dpCategory",
+                        isRequired: true,
+                        type: 'option',
+                        options: [{
+                            label: '鐘舵��',
+                            value: 'DeviceStatus'
+                        }, {
+                            label: '浜ч噺',
+                            value: 'Output'
+                        }, {
+                            label: '鍛婅',
+                            value: 'Alarm'
+                        }]
+                    }
+                )
+            }
+        },
         getList(params) {
             this.$HTTP.get(`/api/blade-cps/workstation/listDatapointsByWorkstationId`, {}, { params }).then(res => {
                 try {
                     this.cols = JSON.parse(res.data.dpHead)
-                    if (this.cols.filter(v => v.prop === 'dplabel').length === 0) {
-                        this.cols.unshift(
-                            {
-                                label: "鏄剧ず鍚嶇О",
-                                prop: "dplabel",
-                                isRequired: true,
-                            }
-                        )
-                    }
+                    this.addOptions()
                 } catch (error) {
                     this.cols = []
                 }
@@ -153,6 +198,7 @@
                 }
                 this.type = res.data.type
                 this.appId = res.data.appId
+                this.setAddTemp()
                 // return res
             })
         },

--
Gitblit v1.9.3