From 28d85f9e3cbee51b900bd553ffe2cbedd6e9923b Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期六, 02 十一月 2024 20:39:22 +0800
Subject: [PATCH] dupate
---
src/views/console/workstation/index.vue | 38 ++++++++++++++++++++------------------
src/views/console/workstation/Dialog.vue | 7 ++-----
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/views/console/workstation/Dialog.vue b/src/views/console/workstation/Dialog.vue
index a25cbc5..5e44b5f 100644
--- a/src/views/console/workstation/Dialog.vue
+++ b/src/views/console/workstation/Dialog.vue
@@ -137,10 +137,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="4">
- <!-- <el-form-item label="宸ヤ綔鍙�" prop="workbenchVOList"> -->
-
- <!-- </el-form-item> -->
+ <!-- <el-col :span="4">
<span>宸ヤ綔鍙�</span>
</el-col>
@@ -152,7 +149,7 @@
</li>
</ul>
<el-button style="margin-left: 50px;margin-top: 8px" @click="addWork">娣诲姞宸ヤ綔鍙�</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="鏁版嵁鏉冮檺" prop="createDept">
<el-tree-select :props="{
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index d16be18..733ae1b 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -640,24 +640,26 @@
return
}
console.log(data, '>>>>>>>>>>>')
- data.machineId && this.$HTTP.get(`/api/smis/workstation/listDmpVariablesByMachineId?machineId=${data.machineId}`).then(res => {
- this.list = res?.data
- // Object.keys(this.basic).forEach(key => {
- // this.basic[key] = res?.data?.[key] || '-'
- // })
- })
- this.$HTTP.get(`/api/smis/workstation/listDmpVariablesByWorkstationId?workstationId=${data.id}`).then(res => {
- // this.list = res?.data?.dmpVariablesVOList
- Object.keys(this.basic).forEach(key => {
- this.basic[key] = res?.data?.[key] || '-'
- })
- })
- this.$HTTP.get(`/api/smis/workstation-workbench/listWorkbench?workstationId=${data.id}`).then(res => {
- Object.keys(this.info).forEach(key => {
- this.info[key] = res?.data?.[key] || '-'
- })
- this.workbenchVOList = res?.data?.workstationList || []
- })
+
+
+ // data.machineId && this.$HTTP.get(`/api/smis/workstation/listDmpVariablesByMachineId?machineId=${data.machineId}`).then(res => {
+ // this.list = res?.data
+ // // Object.keys(this.basic).forEach(key => {
+ // // this.basic[key] = res?.data?.[key] || '-'
+ // // })
+ // })
+ // this.$HTTP.get(`/api/smis/workstation/listDmpVariablesByWorkstationId?workstationId=${data.id}`).then(res => {
+ // // this.list = res?.data?.dmpVariablesVOList
+ // Object.keys(this.basic).forEach(key => {
+ // this.basic[key] = res?.data?.[key] || '-'
+ // })
+ // })
+ // this.$HTTP.get(`/api/smis/workstation-workbench/listWorkbench?workstationId=${data.id}`).then(res => {
+ // Object.keys(this.info).forEach(key => {
+ // this.info[key] = res?.data?.[key] || '-'
+ // })
+ // this.workbenchVOList = res?.data?.workstationList || []
+ // })
},
groupClick1(data) {
var params = {
--
Gitblit v1.9.3