From de8719ea8fb7d543bbffe666cd0deb18fd1d060e Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期三, 28 五月 2025 13:46:58 +0800
Subject: [PATCH] 1
---
src/views/console/workstation/index.vue | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index 4aa08d1..fed5a67 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -9,7 +9,7 @@
<el-main class="nopadding">
<el-tree :expand-on-click-node="false" ref="group" class="menu" node-key="id"
:data="group" :current-node-key="treeCheckKey" :highlight-current="true"
- :check-on-click-node="true" :default-expanded-keys="[1]"
+ :check-on-click-node="true" :default-expanded-keys="['1']"
:render-content="renderContent" @node-click="groupClick1"></el-tree>
</el-main>
</el-container>
@@ -177,7 +177,7 @@
<el-col :span="8">
{{ info.properties }}
</el-col>
- <el-col :span="4">
+ <!-- <el-col :span="4">
绋嬪簭浼犺緭鏂瑰紡
</el-col>
<el-col :span="8">
@@ -191,7 +191,7 @@
</el-col>
<el-col :span="4">
宸ヤ綔鍙�
- </el-col>
+ </el-col> -->
<el-col :span="8">
<ul class="workbench">
<li v-for="item in workbenchVOList" :key="item.sort">
@@ -219,7 +219,7 @@
<el-tree ref="group" class="menu" node-key="id" :data="group"
:current-node-key="treeCheckKey" :highlight-current="true"
:expand-on-click-node="false" :check-on-click-node="true"
- :default-expanded-keys="[1]" :render-content="renderContent"
+ :default-expanded-keys="['1']" :render-content="renderContent"
@node-click="groupClick"></el-tree>
</el-main>
</el-container>
@@ -228,13 +228,13 @@
<el-main class="" v-show="addGroupShow">
<el-form v-show="treeCheckedNode.id == 1" :model="form" :rules="rules" ref="dialogForm"
label-width="200px" label-position="left">
- <el-form-item label="浜х嚎鏍囩" prop="groupTag">
+ <!-- <el-form-item label="浜х嚎鏍囩" prop="groupTag">
<el-select v-model="form.groupTag" clearable placeholder="浜х嚎鏍囩"
style="width: 240px">
<el-option v-for="item in beltline_type" :key="item.dictKey"
:label="item.dictValue" :value="item.dictKey" />
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="浜х嚎鍚嶇О" prop="name">
<el-input style="width: 240px" v-model="form.name" clearable
placeholder="浜х嚎鍚嶇О"></el-input>
@@ -404,7 +404,7 @@
previewData: {},
// --------
form: {
- groupTag: '',
+ groupTag: 'beltline',
name: '',
sort: '',
remark: ''
@@ -474,11 +474,11 @@
methods: {
// 鏁版嵁鐐瑰鍑�
getExport() {
- this.$HTTP.get(`/api/blade-cps/workstation/export-dp?` + this.$TOOL.qsStringify({
+ this.$HTTP.get(`/api/smis/workstation/export-dp?` + this.$TOOL.qsStringify({
workstationId: this.previewData.id
})).then(res => {
if (res.code == 200) {
- window.open(res.data.link)
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
})
},
@@ -551,12 +551,10 @@
this.showGrouploading = false
// this.$nextTick(() => {
if (!flag) {
- debugger
let parent = res.data.filter(item => item.parentId == 0)[0]
this.treeCheckedNode = parent
this.treeCheckKey = parent.id
} else {
- debugger
let parent = res.data.filter(item => item.parentId == 0)[0]
parent && (this.treeCheckedNode = parent)
parent && (this.treeCheckKey = parent.id)
@@ -640,24 +638,26 @@
return
}
console.log(data, '>>>>>>>>>>>')
- data.machineId && this.$HTTP.get(`/api/blade-cps/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/blade-cps/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/blade-cps/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 = {
@@ -688,7 +688,7 @@
this.$refs.dialog.open('edit', row)
},
table_del(row, index, type) {
- this.$HTTP.delete(`/api/blade-cps/workstation?type=0&workstationIds=${row.id}`).then(res => {
+ this.$HTTP.delete(`/api/smis/workstation?type=0&workstationIds=${row.id}`).then(res => {
this.search()
})
},
@@ -696,12 +696,12 @@
this.selection = selection
},
batchDel() {
- this.$HTTP.delete(`/api/blade-cps/workstation?type=0&workstationIds=${this.selection.map(item => item.id).join(',')}`).then(res => {
+ this.$HTTP.delete(`/api/smis/workstation?type=0&workstationIds=${this.selection.map(item => item.id).join(',')}`).then(res => {
this.search()
})
},
saveInfo() {
- this.$HTTP.post('/api/blade-cps/workstation-wcs/save', this.workbenchVOList).then(res => {
+ this.$HTTP.post('/api/smis/workstation-wcs/save', this.workbenchVOList).then(res => {
this.editFlag = false
this.showTable = true
})
--
Gitblit v1.9.3