From 284b8dc2fee29d6f7b9dc7de46cc23532315c909 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 07 十月 2024 09:01:14 +0800
Subject: [PATCH] update
---
src/views/console/workstation/CollDialog.vue | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/src/views/console/workstation/CollDialog.vue b/src/views/console/workstation/CollDialog.vue
index 01f827b..c13be76 100644
--- a/src/views/console/workstation/CollDialog.vue
+++ b/src/views/console/workstation/CollDialog.vue
@@ -1,10 +1,12 @@
<template>
<el-dialog title="鏁版嵁鐐�" v-model="visible" :width="'80%'" destroy-on-close @closed="$emit('closed')">
- <p style="margin-bottom: 14px;">
+ <p style="margin-bottom: 14px;display: flex;align-items: center;">
<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>
+ <span style="margin-right: 8px;margin-left: auto;">IOT搴旂敤ID</span>
+ <el-input v-model="appId" placeholder="IOT搴旂敤ID" style="width: 240px"></el-input>
</p>
<scFormTable v-show="type" ref="table1" v-model="tabledata" stripe hideDelete :hideAdd="!type"
@@ -19,8 +21,8 @@
v-if="scope.row.status && item.type === 'option'">
<el-option v-for="item in item.options" :key="item" :label="item" :value="item" />
</el-select>
- <el-switch size="small" v-model="scope.row[item.prop]"
- v-else-if="scope.row.status && item.type === 'boolean'" />
+ <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>
<span v-else>{{ scope.row[item.prop] }}</span>
@@ -72,8 +74,8 @@
status: '2' // 涓嶅瓨鍦ㄥ凡淇濆瓨 1: 姝ｅ湪缂栬緫 2: 鏂板
},
type: '',
- typeList: []
-
+ typeList: [],
+ appId: ''
}
},
created() {
@@ -81,18 +83,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 +131,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 = []
}
@@ -133,7 +152,7 @@
this.tabledata = []
}
this.type = res.data.type
-
+ this.appId = res.data.appId
// return res
})
},
@@ -167,7 +186,8 @@
return v
})),
workstationId: this.params.id,
- type: this.type
+ type: this.type,
+ appId: this.appId
}).then(res => {
if (res.code === 200) {
this.getList({
--
Gitblit v1.9.3