From 6d4ae56273c7453a258aa98b67aa82d59afa7648 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期三, 09 十月 2024 20:12:57 +0800
Subject: [PATCH] date
---
src/views/console/workstation/CollTable.vue | 19 ++++++++-
src/views/console/workstation/CollDialog.vue | 42 ++++++++++++++++++--
2 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/src/views/console/workstation/CollDialog.vue b/src/views/console/workstation/CollDialog.vue
index 89f5b05..8733eb6 100644
--- a/src/views/console/workstation/CollDialog.vue
+++ b/src/views/console/workstation/CollDialog.vue
@@ -24,15 +24,16 @@
</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="(item.prop == 'dpLabel' && 'Other' !== scope.row.dpCategory)"></el-input>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
@@ -91,6 +92,24 @@
},
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
+ } else if (prop === 'dpCategory' && e === 'Other') {
+ this.tabledata[index].dpLabel = ''
+ }
+ },
changeType(val) {
if (this.tabledata.length > 0) {
this.$confirm(`鍒囨崲绫诲瀷灏嗗垹闄ゆ墍鏈夊凡閰嶇疆鏁版嵁鐐筦, '鎻愮ず', {
@@ -150,11 +169,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 +204,9 @@
}, {
label: '鍛婅',
value: 'Alarm'
+ }, {
+ label: '鍏朵粬',
+ value: 'Other'
}]
}
)
diff --git a/src/views/console/workstation/CollTable.vue b/src/views/console/workstation/CollTable.vue
index f7f6dcb..4b6afa7 100644
--- a/src/views/console/workstation/CollTable.vue
+++ b/src/views/console/workstation/CollTable.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-10-05 09:51:45
* @LastEditors: gaoshp
- * @LastEditTime: 2024-10-08 20:20:28
+ * @LastEditTime: 2024-10-09 20:11:01
* @FilePath: /cps-web/src/views/console/workstation/CollTable.vue
-->
<template>
@@ -72,11 +72,21 @@
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) {
+ 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,
}
)
@@ -97,6 +107,9 @@
}, {
label: '鍛婅',
value: 'Alarm'
+ }, {
+ label: '鍏朵粬',
+ value: 'Other'
}]
}
)
--
Gitblit v1.9.3