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/CollDialog.vue | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/views/console/workstation/CollDialog.vue b/src/views/console/workstation/CollDialog.vue
index 2b6bdd5..0b30ce6 100644
--- a/src/views/console/workstation/CollDialog.vue
+++ b/src/views/console/workstation/CollDialog.vue
@@ -2,7 +2,7 @@
<el-dialog title="鏁版嵁鐐�" v-model="visible" :width="'80%'" destroy-on-close @closed="$emit('closed')">
<p style="margin-bottom: 14px;">
<span style="margin-right: 8px;">绫诲瀷</span>
- <el-select v-model="type" placeholder="Select" size="small" style="width: 240px" @change="changeType">
+ <el-select v-model="type" placeholder="绫诲瀷" size="small" style="width: 240px" @change="changeType">
<el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</p>
@@ -31,7 +31,7 @@
<template #default="scope">
<el-button-group>
<el-button text type="primary" size="small" @click="table_edit(scope.row)">缂栬緫</el-button>
- <!-- <el-button text type="primary" size="small">澶嶅埗</el-button> -->
+ <el-button text type="primary" size="small" @click="copy(scope.row)">澶嶅埗</el-button>
<el-popconfirm width="220" title="纭畾灏嗛�夋嫨鐨勬暟鎹垹闄�" @confirm="del(scope.$index)">
<template #reference>
<el-button text type="primary" size="small">鍒犻櫎</el-button>
@@ -81,18 +81,27 @@
},
methods: {
changeType(val) {
- this.$confirm(`鍒囨崲绫诲瀷灏嗗垹闄ゆ墍鏈夊凡閰嶇疆鏁版嵁鐐筦, '鎻愮ず', {
- type: 'warning'
- }).then(() => {
+ if (this.tabledata.length > 0) {
+ this.$confirm(`鍒囨崲绫诲瀷灏嗗垹闄ゆ墍鏈夊凡閰嶇疆鏁版嵁鐐筦, '鎻愮ず', {
+ type: 'warning'
+ }).then(() => {
+ try {
+ this.cols = JSON.parse(this.typeList.find(v => v.id === val).dpHeadFull)
+ this.tabledata = []
+ } catch (error) {
+ this.cols = []
+ }
+ }).catch(() => {
+
+ })
+ } else {
try {
this.cols = JSON.parse(this.typeList.find(v => v.id === val).dpHeadFull)
- this.table = []
} catch (error) {
this.cols = []
}
- }).catch(() => {
+ }
- })
},
//鏄剧ず
@@ -120,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 = []
}
@@ -143,6 +160,9 @@
del(index) {
this.tabledata.splice(index, 1)
},
+ copy(row) {
+ this.tabledata.push(Object.assign({}, row, { status: '1' }))
+ },
//琛ㄥ崟鎻愪氦鏂规硶
submit() {
let isRequiredKey = this.cols.filter(v => v.isRequired).map(v => v.prop)
--
Gitblit v1.9.3