From 60884524aba674d2368d2169b057f0d806acc0f6 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 10 十月 2024 12:14:24 +0800
Subject: [PATCH] 1
---
src/views/console/workstation/CollDialog.vue | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/src/views/console/workstation/CollDialog.vue b/src/views/console/workstation/CollDialog.vue
index 89f5b05..d274661 100644
--- a/src/views/console/workstation/CollDialog.vue
+++ b/src/views/console/workstation/CollDialog.vue
@@ -11,7 +11,7 @@
<scFormTable v-show="type" ref="table1" v-model="tabledata" stripe hideDelete :hideAdd="!type"
:addTemplate="addTemplate">
- <el-table-column v-for="item in cols" :key="item.prop" :prop="item.prop" :label="item.label">
+ <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>
@@ -24,20 +24,21 @@
</template>
<template #default="scope">
- <el-select :disabled="!scope.row.status" v-model="scope.row[item.prop]" placeholder="" size="small"
+ <el-select :disabled="!scope.row.status" v-model="scope.row[item.prop]"
+ @change="change($event, scope.row, scope.$index, 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'" />
- <el-input size="small" v-model="scope.row[item.prop]" placeholder=""
- v-else-if="scope.row.status"></el-input>
+ <el-input size="small" v-model="scope.row[item.prop]" placeholder="" v-else-if="scope.row.status"
+ :disabled="(['dpLabel', 'dpName'].includes(item.prop) && 'Other' !== scope.row.dpCategory)"></el-input>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" prop="state" width="200">
+ <el-table-column label="鎿嶄綔" prop="state" width="200" fixed="right">
<template #default="scope">
<el-button-group>
<el-button text type="primary" size="small" @click="table_edit(scope.row)">缂栬緫</el-button>
@@ -91,6 +92,26 @@
},
methods: {
+ change(e, row, index, prop) {
+ console.log(e)
+ if (prop === 'dpCategory' && e !== 'Other') {
+ const label = [{
+ label: '鐘舵��',
+ value: 'DeviceStatus'
+ }, {
+ label: '浜ч噺',
+ value: 'Output'
+ }, {
+ label: '鍛婅',
+ value: 'Alarm'
+ }].find(v => v.value === e).label
+ this.tabledata[index].dpLabel = label
+ this.tabledata[index].dpName = e
+ } else if (prop === 'dpCategory' && e === 'Other') {
+ this.tabledata[index].dpLabel = ''
+ this.tabledata[index].dpName = ''
+ }
+ },
changeType(val) {
if (this.tabledata.length > 0) {
this.$confirm(`鍒囨崲绫诲瀷灏嗗垹闄ゆ墍鏈夊凡閰嶇疆鏁版嵁鐐筦, '鎻愮ず', {
@@ -150,11 +171,21 @@
},
addOptions() {
- if (this.cols.filter(v => v.prop === 'dplabel').length === 0) {
+ 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",
+ prop: "dpLabel",
isRequired: true,
}
)
@@ -175,6 +206,9 @@
}, {
label: '鍛婅',
value: 'Alarm'
+ }, {
+ label: '鍏朵粬',
+ value: 'Other'
}]
}
)
--
Gitblit v1.9.3