From e2fdfe540eaf160dc7d063c60667041edcc64e86 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 05 十一月 2024 22:55:14 +0800
Subject: [PATCH] 处理显示名称
---
src/views/console/workstation/index.vue | 77 +++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index ed7765c..e41d64a 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -139,7 +139,7 @@
</el-main>
</el-container>
<el-container>
- <el-header>
+ <el-header style="justify-content: flex-start;">
<h2>閲囬泦淇℃伅</h2>
<!-- <el-button v-show="list.length > 0"
@click="() => { editFlag = !editFlag; showTable = !editFlag }"
@@ -150,10 +150,10 @@
type="primary" size="small">淇濆瓨</el-button> -->
<!-- <el-button text type="primary" size="small"
@click="editDMP">淇敼DMP閰嶇疆</el-button> -->
- <el-button style="margin-left: auto;" @click="getExport"
- text type="primary" size="small">瀵煎嚭</el-button>
+ <el-button @click="getExport" style="margin-left: 12px" text
+ type="primary" size="small">瀵煎嚭</el-button>
<el-button @click="editCollection" text type="primary"
- size="small">鏁版嵁鐐圭紪杈�</el-button>
+ style="margin-left: 0px;" size="small">鏁版嵁鐐圭紪杈�</el-button>
</el-header>
<el-main>
@@ -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">
@@ -215,7 +215,7 @@
<el-container>
<el-aside width="200px" v-loading="showGrouploading">
<el-container>
- <el-main class="nopadding">
+ <el-main class="nopadding" style="overflow: hidden;">
<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"
@@ -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>
@@ -274,9 +274,16 @@
<el-header v-show="!addGroupShow">
<div class="left-panel">
<el-button @click="addChild" type="primary" plain>鏂板涓嬬骇</el-button>
- <el-button @click="deleteWorkGroup"
+ <el-popconfirm width="220" cancel-button-text="鍙栨秷" confirm-button-text="鍒犻櫎"
+ title="鍒犻櫎浼氬皢宸ヤ綅缁勪笅鐨勫伐浣嶇Щ鍔ㄥ埌榛樿缁勪腑锛岃纭鏄惁鍒犻櫎锛�" @confirm="deleteWorkGroup">
+ <template #reference>
+ <el-button v-show="!['1', '101'].includes(treeCheckedNode.id)" type="danger"
+ plain>鍒犻櫎</el-button>
+ </template>
+ </el-popconfirm>
+ <!-- <el-button @click="deleteWorkGroup"
v-show="!['1', '101'].includes(treeCheckedNode.id)" type="danger"
- plain>鍒犻櫎</el-button>
+ plain>鍒犻櫎</el-button> -->
</div>
</el-header>
<el-main class="" v-show="!addGroupShow">
@@ -397,7 +404,7 @@
previewData: {},
// --------
form: {
- groupTag: '',
+ groupTag: 'beltline',
name: '',
sort: '',
remark: ''
@@ -467,7 +474,7 @@
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) {
@@ -633,24 +640,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 = {
@@ -681,7 +690,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()
})
},
@@ -689,12 +698,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