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 | 75 ++++++++++++++++++++++++++++++------- 1 files changed, 60 insertions(+), 15 deletions(-) diff --git a/src/views/console/workstation/CollTable.vue b/src/views/console/workstation/CollTable.vue index 85875a7..3e0a57d 100644 --- a/src/views/console/workstation/CollTable.vue +++ b/src/views/console/workstation/CollTable.vue @@ -1,13 +1,13 @@ <!-- * @Date: 2024-10-05 09:51:45 * @LastEditors: gaoshp - * @LastEditTime: 2024-10-07 09:51:11 + * @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-column v-for="item in cols" :key="item.prop" :prop="item.prop" :label="item.label" width="120"> + <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> <span>{{ scope.column.label }}</span> @@ -22,7 +22,8 @@ <template #default="scope"> <el-select disabled v-model="scope.row[item.prop]" placeholder="" size="small" v-if="item.type === 'option'"> - <el-option v-for="item in item.options" :key="item" :label="item" :value="item" /> + <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 size="small" v-model="scope.row[item.prop]" v-else-if="item.type === 'boolean'" /> @@ -34,8 +35,9 @@ </template> <script> - +import addOptions from './addOptions' export default { + mixins: [addOptions], props: { info: { type: Object, @@ -68,18 +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 === 'dplabel').length === 0) { - this.cols.unshift( - { - label: "鏄剧ず鍚嶇О", - prop: "dplabel", - isRequired: true, - } - ) - } + 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