From 3e091224ab26252d8624b42b461ba773ee8bee0f Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期日, 03 十一月 2024 19:16:31 +0800
Subject: [PATCH] update

---
 src/views/console/workstation/CollTable.vue |  103 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/src/views/console/workstation/CollTable.vue b/src/views/console/workstation/CollTable.vue
index 3aa0465..3e0a57d 100644
--- a/src/views/console/workstation/CollTable.vue
+++ b/src/views/console/workstation/CollTable.vue
@@ -1,12 +1,12 @@
 <!--
  * @Date: 2024-10-05 09:51:45
  * @LastEditors: gaoshp
- * @LastEditTime: 2024-10-09 20:22:09
+ * @LastEditTime: 2024-10-27 14:03:19
  * @FilePath: /cps-web/src/views/console/workstation/CollTable.vue
 -->
 <template>
     <div>
-        <el-table :data="tabledata" height="200px">
+        <el-table :data="tabledata">
             <el-table-column width="200" v-for="item in cols" :key="item.prop" :prop="item.prop" :label="item.label">
                 <template #header="scope">
                     <span v-show="item.isRequired" style="color: red;">*</span>
@@ -35,8 +35,9 @@
 </template>
 
 <script>
-
+import addOptions from './addOptions'
 export default {
+    mixins: [addOptions],
     props: {
         info: {
             type: Object,
@@ -69,51 +70,61 @@
             })
         },
         getList(params) {
-            this.$HTTP.get(`/api/blade-cps/workstation/listDatapointsByWorkstationId`, {}, { params }).then(res => {
+            this.$HTTP.get(`/api/smis/workstation/listDatapointsByWorkstationId`, {}, { params }).then(res => {
                 try {
                     this.cols = JSON.parse(res.data.dpHead)
-                    if (this.cols.filter(v => v.prop === 'isProcessParam').length === 0) {
-                        this.cols.unshift(
-                            {
-                                label: "杩囩▼鍙傛暟",
-                                prop: "isProcessParam",
-                                isRequired: true,
-                                type: 'boolean',
-                            }
-                        )
-                    }
-                    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'
-                                }, {
-                                    label: '鍏朵粬',
-                                    value: 'Other'
-                                }]
-                            }
-                        )
-                    }
+                    this.addOptions(this.cols)
+                    // if (this.cols.filter(v => v.prop === 'isProcessParam').length === 0) {
+                    //     this.cols.unshift(
+                    //         {
+                    //             label: "杩囩▼鍙傛暟",
+                    //             prop: "isProcessParam",
+                    //             isRequired: true,
+                    //             type: 'boolean',
+                    //         }
+                    //     )
+                    // }
+                    // 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: 'ProgName'
+                    //             }, {
+                    //                 label: '绋嬪簭鍐呭',
+                    //                 value: 'ProgContent'
+                    //             }, {
+                    //                 label: '鍒�鍏峰彿',
+                    //                 value: 'ToolNo'
+                    //             }, {
+                    //                 label: '鐘舵��',
+                    //                 value: 'DeviceStatus'
+                    //             }, {
+                    //                 label: '浜ч噺',
+                    //                 value: 'Output'
+                    //             }, {
+                    //                 label: '鍛婅',
+                    //                 value: 'Alarm'
+                    //             }, {
+                    //                 label: '鍏朵粬',
+                    //                 value: 'Other'
+                    //             }]
+                    //         }
+                    //     )
+                    // }
                 } catch (error) {
                     this.cols = []
                 }

--
Gitblit v1.9.3