From 3931e2728f618d0090f129b2665bc1285c4440c3 Mon Sep 17 00:00:00 2001 From: gaoshp <291585735@qq.com> Date: 星期日, 03 十一月 2024 17:27:32 +0800 Subject: [PATCH] update --- src/views/console/workstation/index.vue | 51 ++++++++++++++++++++++++++------------------------- 1 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue index cd2c407..733ae1b 100644 --- a/src/views/console/workstation/index.vue +++ b/src/views/console/workstation/index.vue @@ -274,9 +274,8 @@ <el-header v-show="!addGroupShow"> <div class="left-panel"> <el-button @click="addChild" type="primary" plain>鏂板涓嬬骇</el-button> - <el-popconfirm width="220" cancel-button-text="鍋滅敤" confirm-button-text="鍒犻櫎" - title="鍒犻櫎浼氬皢宸ヤ綅缁勪笅鐨勫伐浣嶇Щ鍔ㄥ埌榛樿缁勪腑锛岃纭鏄惁鍒犻櫎锛�" @confirm="deleteWorkGroup" - @cancel="table_del([scope.row], '1')"> + <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> @@ -475,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) { @@ -641,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 = { @@ -689,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() }) }, @@ -697,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