From 5280ccf366c656054731d62c903d97b77d5baf0d Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 24 十月 2024 18:37:25 +0800
Subject: [PATCH] 1
---
src/views/console/workstation/index.vue | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index eb35a5f..4aa08d1 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -88,7 +88,8 @@
<p class="preview-title">宸ヤ綅淇℃伅</p>
<div class="preview-content">
<div class="img">
- <img v-if="!previewData.avatar" :src="machinePng" alt="">
+ <img style="width: 148px;height: 148px;" v-if="!previewData.avatar"
+ :src="machinePng" alt="">
<scUpload v-else disabled v-model="previewData.avatar" title="宸ヤ綅鍥剧墖">
</scUpload>
</div>
@@ -138,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 }"
@@ -149,8 +150,11 @@
type="primary" size="small">淇濆瓨</el-button> -->
<!-- <el-button text type="primary" size="small"
@click="editDMP">淇敼DMP閰嶇疆</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>
<!-- <el-table :data="list" height="200px">
@@ -211,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"
@@ -270,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">
@@ -347,7 +358,7 @@
import Dialog from './Dialog.vue'
import CollDialog from './CollDialog.vue'
import CollTable from './CollTable.vue'
-import machinePng from '@/assets/machine.png'
+import machinePng from '@/assets/machine1.jpg'
export default {
name: 'system',
components: {
@@ -461,6 +472,16 @@
this.queryList()
},
methods: {
+ // 鏁版嵁鐐瑰鍑�
+ getExport() {
+ this.$HTTP.get(`/api/blade-cps/workstation/export-dp?` + this.$TOOL.qsStringify({
+ workstationId: this.previewData.id
+ })).then(res => {
+ if (res.code == 200) {
+ window.open(res.data.link)
+ }
+ })
+ },
// 鏁版嵁鐐圭紪杈�
editCollection() {
this.$refs.CollDialog.open('edit', this.previewData)
@@ -619,7 +640,7 @@
return
}
console.log(data, '>>>>>>>>>>>')
- this.$HTTP.get(`/api/blade-cps/workstation/listDmpVariablesByMachineId?machineId=${data.machineId}`).then(res => {
+ 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] || '-'
--
Gitblit v1.9.3