From ef6702a962c4ebe2ff9494375ae8b2011632c12f Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期三, 16 十月 2024 23:42:01 +0800
Subject: [PATCH] update
---
src/views/console/workstation/CollTable.vue | 15 ++++++++++++---
src/views/console/workstation/CollDialog.vue | 18 +++++++++++++++---
2 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/views/console/workstation/CollDialog.vue b/src/views/console/workstation/CollDialog.vue
index d274661..8ce06d3 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">
@@ -198,6 +198,15 @@
isRequired: true,
type: 'option',
options: [{
+ label: '绋嬪簭鍚�',
+ value: 'ProgName'
+ }, {
+ label: '绋嬪簭鍐呭',
+ value: 'ProgContent'
+ }, {
+ label: '鍒�鍏峰彿',
+ value: 'ToolNo'
+ }, {
label: '鐘舵��',
value: 'DeviceStatus'
}, {
@@ -273,10 +282,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')
+
})
},
diff --git a/src/views/console/workstation/CollTable.vue b/src/views/console/workstation/CollTable.vue
index 3b136a9..e67ffc6 100644
--- a/src/views/console/workstation/CollTable.vue
+++ b/src/views/console/workstation/CollTable.vue
@@ -1,8 +1,8 @@
<!--
* @Date: 2024-10-05 09:51:45
- * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-10-10 10:45:03
- * @FilePath: /cps-web/src/views/console/workstation/CollTable.vue
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-10-16 23:41:34
+ * @FilePath: /avue-data/Users/mache/Documents/demo/cps-web/src/views/console/workstation/CollTable.vue
-->
<template>
<div>
@@ -99,6 +99,15 @@
isRequired: true,
type: 'option',
options: [{
+ label: '绋嬪簭鍚�',
+ value: 'ProgName'
+ }, {
+ label: '绋嬪簭鍐呭',
+ value: 'ProgContent'
+ }, {
+ label: '鍒�鍏峰彿',
+ value: 'ToolNo'
+ }, {
label: '鐘舵��',
value: 'DeviceStatus'
}, {
--
Gitblit v1.9.3