From dcc4992bd51e9ee4a97099cd3a15085f7e247f23 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期日, 03 十一月 2024 20:21:41 +0800
Subject: [PATCH] update
---
src/views/console/workstation/CollDialog.vue | 127 ++++++++++++++++++++++--------------------
1 files changed, 66 insertions(+), 61 deletions(-)
diff --git a/src/views/console/workstation/CollDialog.vue b/src/views/console/workstation/CollDialog.vue
index 9b84e1c..e7e979d 100644
--- a/src/views/console/workstation/CollDialog.vue
+++ b/src/views/console/workstation/CollDialog.vue
@@ -38,9 +38,9 @@
</template>
<template #default="scope">
- <el-select :disabled="!scope.row.status" v-model="scope.row[item.prop]"
- @change="change($event, scope.row, scope.$index, item)" placeholder="" size="small"
- v-if="item.type === 'option'">
+ <el-select :disabled="!scope.row.status || (item.disabledFn && item.disabledFn(scope.row))"
+ v-model="scope.row[item.prop]" @change="change($event, scope.row, scope.$index, item)"
+ 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>
@@ -62,9 +62,11 @@
</template>
<script>
+import addOptions from './addOptions'
export default {
name: 'CollDialog',
emits: ['success', 'closed'],
+ mixins: [addOptions],
props: {
option: {
type: Object
@@ -99,10 +101,12 @@
const label = options.find(v => v.value === e).label
this.tabledata[index].dpLabel = label
this.tabledata[index].dpName = e
+ this.tabledata[index].paramChartType = 'distribute'
} else if (prop === 'dpCategory' && e === 'Other') {
this.tabledata[index].dpLabel = ''
this.tabledata[index].dpName = ''
}
+ // 鐐逛綅鍒嗙被涓洪潪鍏朵粬鏃� 杩囩▼鍙傛暟灞曠ず鏂瑰紡涓哄垎甯冨浘
},
changeType(val) {
if (this.tabledata.length > 0) {
@@ -111,7 +115,7 @@
}).then(() => {
try {
this.cols = JSON.parse(this.typeList.find(v => v.id === val).dpHeadFull)
- this.addOptions()
+ this.addOptions(this.cols)
this.tabledata = []
} catch (error) {
this.cols = []
@@ -122,7 +126,7 @@
} else {
try {
this.cols = JSON.parse(this.typeList.find(v => v.id === val).dpHeadFull)
- this.addOptions()
+ this.addOptions(this.cols)
} catch (error) {
this.cols = []
@@ -162,64 +166,64 @@
})
},
- addOptions() {
- 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",
- isRequired: true,
- }
- )
- }
- if (this.cols.filter(v => v.prop === 'dpCategory').length === 0) {
- this.cols.unshift(
- {
- label: "鐐逛綅鍒嗙被",
- prop: "dpCategory",
- isRequired: true,
- type: 'option',
- options: [{
- label: '绋嬪簭鍚�',
- value: 'ProgName'
- }, {
- label: '绋嬪簭鍐呭',
- value: 'ProgContent'
- }, {
- label: '鍒�鍏峰彿',
- value: 'ToolNo'
- }, {
- label: '鐘舵��',
- value: 'DeviceStatus'
- }, {
- label: '浜ч噺',
- value: 'Output'
- }, {
- label: '鍛婅',
- value: 'Alarm'
- }, {
- label: '鍏朵粬',
- value: 'Other'
- }]
- }
- )
- }
- },
+ // addOptions() {
+ // 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",
+ // isRequired: true,
+ // }
+ // )
+ // }
+ // if (this.cols.filter(v => v.prop === 'dpCategory').length === 0) {
+ // this.cols.unshift(
+ // {
+ // label: "鐐逛綅鍒嗙被",
+ // prop: "dpCategory",
+ // isRequired: true,
+ // type: 'option',
+ // options: [{
+ // label: '绋嬪簭鍚�',
+ // value: 'ProgName'
+ // }, {
+ // label: '绋嬪簭鍐呭',
+ // value: 'ProgContent'
+ // }, {
+ // label: '鍒�鍏峰彿',
+ // value: 'ToolNo'
+ // }, {
+ // label: '鐘舵��',
+ // value: 'DeviceStatus'
+ // }, {
+ // label: '浜ч噺',
+ // value: 'Output'
+ // }, {
+ // label: '鍛婅',
+ // value: 'Alarm'
+ // }, {
+ // label: '鍏朵粬',
+ // value: 'Other'
+ // }]
+ // }
+ // )
+ // }
+ // },
getList(params) {
- this.$HTTP.get(`/api/blade-cps/workstation/listDatapointsByWorkstationId`, {}, { params }).then(res => {
+ this.$HTTP.get(`/api/smis/workstation/listDatapointsByWorkstationId`, {}, { params }).then(res => {
try {
this.cols = JSON.parse(res.data.dpHead)
- this.addOptions()
+ this.addOptions(this.cols)
} catch (error) {
this.cols = []
}
@@ -238,6 +242,7 @@
})
},
table_edit(row) {
+ console.log('bianji', row)
row.status = '1'
},
del(index) {
@@ -261,7 +266,7 @@
if (len != this.tabledata.length) {
return this.$message.warning('鏁版嵁鐐瑰悕绉颁笉鑳介噸澶�')
}
- this.$HTTP.put('/api/blade-cps/workstation/saveDatapoints', {
+ this.$HTTP.put('/api/smis/workstation/saveDatapoints', {
dpConfig: JSON.stringify(this.tabledata.map(v => {
delete v.status
return v
--
Gitblit v1.9.3