From 5280ccf366c656054731d62c903d97b77d5baf0d Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 24 十月 2024 18:37:25 +0800
Subject: [PATCH] 1
---
src/views/console/workstation/CollDialog.vue | 92 ++++++++++++++++++++++++---------------------
1 files changed, 49 insertions(+), 43 deletions(-)
diff --git a/src/views/console/workstation/CollDialog.vue b/src/views/console/workstation/CollDialog.vue
index 8733eb6..9b84e1c 100644
--- a/src/views/console/workstation/CollDialog.vue
+++ b/src/views/console/workstation/CollDialog.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog title="鏁版嵁鐐�" v-model="visible" :width="'80%'" destroy-on-close @closed="$emit('closed')">
+ <el-dialog title="鏁版嵁鐐�" v-model="visible" :width="'100%'" destroy-on-close @closed="$emit('closed')">
<p style="margin-bottom: 14px;display: flex;align-items: center;">
<span style="margin-right: 8px;">绫诲瀷</span>
<el-select v-model="type" placeholder="绫诲瀷" size="small" style="width: 240px" @change="changeType">
@@ -11,34 +11,7 @@
<scFormTable v-show="type" ref="table1" v-model="tabledata" stripe hideDelete :hideAdd="!type"
:addTemplate="addTemplate">
- <el-table-column v-for="item in cols" :key="item.prop" :prop="item.prop" :label="item.label">
- <template #header="scope">
- <span v-show="item.isRequired" style="color: red;">*</span>
- <span>{{ scope.column.label }}</span>
- <el-tooltip class="box-item" effect="dark" placement="top-start">
- <template #content>
- <p v-html="item.describe"></p>
- </template>
- <el-icon v-show="item.describe"><el-icon-question-filled /></el-icon>
- </el-tooltip>
-
- </template>
- <template #default="scope">
- <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"
- :disabled="(item.prop == 'dpLabel' && 'Other' !== scope.row.dpCategory)"></el-input>
- <span v-else>{{ scope.row[item.prop] }}</span>
- </template>
- </el-table-column>
-
- <el-table-column label="鎿嶄綔" prop="state" width="200">
+ <el-table-column label="鎿嶄綔" prop="state" width="200" fixed="left">
<template #default="scope">
<el-button-group>
<el-button text type="primary" size="small" @click="table_edit(scope.row)">缂栬緫</el-button>
@@ -52,6 +25,34 @@
</template>
</el-table-column>
+ <el-table-column width="200" v-for="item in cols" :key="item.prop" :prop="item.prop" :label="item.label">
+ <template #header="scope">
+ <span v-show="item.isRequired" style="color: red;">*</span>
+ <span>{{ scope.column.label }}</span>
+ <el-tooltip class="box-item" effect="dark" placement="top-start">
+ <template #content>
+ <p v-html="item.describe"></p>
+ </template>
+ <el-icon v-show="item.describe"><el-icon-question-filled /></el-icon>
+ </el-tooltip>
+
+ </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-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"
+ :disabled="(['dpLabel', 'dpName'].includes(item.prop) && 'Other' !== scope.row.dpCategory)"></el-input>
+ <span v-else>{{ scope.row[item.prop] }}</span>
+ </template>
+ </el-table-column>
+
+
</scFormTable>
<template #footer>
<el-button @click="visible = false">鍙� 娑�</el-button>
@@ -92,22 +93,15 @@
},
methods: {
- change(e, row, index, prop) {
- console.log(e)
+ change(e, row, index, { prop, options }) {
+ console.log(e, options)
if (prop === 'dpCategory' && e !== 'Other') {
- const label = [{
- label: '鐘舵��',
- value: 'DeviceStatus'
- }, {
- label: '浜ч噺',
- value: 'Output'
- }, {
- label: '鍛婅',
- value: 'Alarm'
- }].find(v => v.value === e).label
+ const label = options.find(v => v.value === e).label
this.tabledata[index].dpLabel = label
+ this.tabledata[index].dpName = e
} else if (prop === 'dpCategory' && e === 'Other') {
this.tabledata[index].dpLabel = ''
+ this.tabledata[index].dpName = ''
}
},
changeType(val) {
@@ -196,6 +190,15 @@
isRequired: true,
type: 'option',
options: [{
+ label: '绋嬪簭鍚�',
+ value: 'ProgName'
+ }, {
+ label: '绋嬪簭鍐呭',
+ value: 'ProgContent'
+ }, {
+ label: '鍒�鍏峰彿',
+ value: 'ToolNo'
+ }, {
label: '鐘舵��',
value: 'DeviceStatus'
}, {
@@ -271,10 +274,13 @@
this.getList({
workstationId: this.params.id,
})
+ this.visible = false
+ this.$emit('success')
+ } else {
+ this.$message.error(res.msg)
}
}).finally(() => {
- this.visible = false
- this.$emit('success')
+
})
},
--
Gitblit v1.9.3