From 3007cbf86ea42756be4d5bf4f81e0d56d6150c67 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 07 十月 2024 00:52:48 +0800
Subject: [PATCH] Merge branch 'release' of http://122.9.151.159:9090/r/smart-web into release
---
src/views/console/workstation/CollTable.vue | 11 ++++++++++-
src/views/console/workstation/CollDialog.vue | 10 +++++++++-
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/views/console/workstation/CollDialog.vue b/src/views/console/workstation/CollDialog.vue
index e62bc6f..0b30ce6 100644
--- a/src/views/console/workstation/CollDialog.vue
+++ b/src/views/console/workstation/CollDialog.vue
@@ -129,7 +129,15 @@
this.$HTTP.get(`/api/blade-cps/workstation/listDatapointsByWorkstationId`, {}, { params }).then(res => {
try {
this.cols = JSON.parse(res.data.dpHead)
- console.log(this.cols, 'cols')
+ if (this.cols.filter(v => v.prop === 'dplabel').length === 0) {
+ this.cols.unshift(
+ {
+ label: "鏄剧ず鍚嶇О",
+ prop: "dplabel",
+ isRequired: true,
+ }
+ )
+ }
} catch (error) {
this.cols = []
}
diff --git a/src/views/console/workstation/CollTable.vue b/src/views/console/workstation/CollTable.vue
index 400b45a..f2261d3 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-05 20:40:36
+ * @LastEditTime: 2024-10-07 00:32:44
* @FilePath: /cps-web/src/views/console/workstation/CollTable.vue
-->
<template>
@@ -54,6 +54,15 @@
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,
+ }
+ )
+ }
} catch (error) {
this.cols = []
}
--
Gitblit v1.9.3