From fa37d06890dabf79562128d22f7b043025732802 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期六, 05 十月 2024 17:29:10 +0800
Subject: [PATCH] update
---
src/views/console/workstation/index.vue | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index 964c685..724afd8 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -140,15 +140,17 @@
<el-container>
<el-header>
<h2>閲囬泦淇℃伅</h2>
- <el-button v-show="list.length > 0"
+ <!-- <el-button v-show="list.length > 0"
@click="() => { editFlag = !editFlag; showTable = !editFlag }"
style="margin-left: auto;" text type="primary"
size="small">{{ editFlag ? '鍙栨秷' : '閰嶇疆宸ヤ綅閲囬泦'
}}</el-button>
<el-button v-show="editFlag" @click="saveInfo" text
- type="primary" size="small">淇濆瓨</el-button>
+ type="primary" size="small">淇濆瓨</el-button> -->
<!-- <el-button text type="primary" size="small"
@click="editDMP">淇敼DMP閰嶇疆</el-button> -->
+ <el-button @click="editCollection" text type="primary"
+ size="small">鏁版嵁鐐圭紪杈�</el-button>
</el-header>
<el-main>
<el-table :data="list" height="200px"
@@ -392,17 +394,20 @@
</el-tabs>
</el-card>
<Dialog ref="dialog" @success="success" :option="{ types, status, group }"></Dialog>
+ <CollDialog ref="CollDialog" @success="success" :option="{ previewData }"></CollDialog>
</el-main>
</template>
<script>
import pmsPng from '@/assets/pms.png'
import Dialog from './Dialog.vue'
+import CollDialog from './CollDialog.vue'
import machinePng from '@/assets/machine.png'
export default {
name: 'system',
components: {
- Dialog
+ Dialog,
+ CollDialog
},
data() {
return {
@@ -482,7 +487,6 @@
handler(val) {
this.queryList().then(() => {
if (val == 1) {
- console.log('>>>>>>>>>>>>>>', this.treeCheckedNode)
this.apiObj = this.$API.workstation.getList
this.params = {
groupId: this.treeCheckedNode.id,
@@ -511,8 +515,11 @@
this.queryList()
},
methods: {
+ // 鏁版嵁鐐圭紪杈�
+ editCollection() {
+ this.$refs.CollDialog.open('edit', this.previewData)
+ },
handleSelectionChange(val) {
- console.log(val)
val.forEach(v => {
v.bigScreen = true
v.realTimeData = true
@@ -520,7 +527,6 @@
})
this.list.forEach(v => {
if (val.filter(item => v.id === item.id).length == 0) {
- console.log(v)
v.bigScreen = false
v.realTimeData = false
v.processParameter = false
@@ -573,7 +579,6 @@
let data = this.formatData(res.data)
this.group = data
this.showGrouploading = false
- console.log('>>>>>>>>>>>>>>>>>>>>>')
// this.$nextTick(() => {
if (!flag) {
debugger
@@ -626,13 +631,11 @@
groupCategory: this.treeCheckedNode.groupCategory
}, this.form)
return this.$API.workstation.saveWorkstationGroup.post(data).then(res => {
- console.log(res)
this.queryList(true)
})
}
let data = Object.assign({}, this.treeCheckedNode, this.form)
this.$API.workstation.saveWorkstationGroup.put(data).then(res => {
- console.log(res)
this.queryList(true)
})
},
@@ -655,7 +658,6 @@
},
rowClick(data) {
this.previewData = data
- console.log(data, '>>>>>>>>>>>')
if (!data.id) {
Object.keys(this.basic).forEach(key => {
this.basic[key] = '-'
@@ -667,7 +669,8 @@
this.workbenchVOList = []
return
}
- this.$HTTP.get(`/api/blade-cps/workstation/listDmpVariablesByWorkstationId?workstationId=${data.id}`).then(res => {
+ console.log(data, '>>>>>>>>>>>')
+ this.$HTTP.get(`/api/blade-cps/workstation/listDmpVariablesByMachineId?machineId=${data.machineId}`).then(res => {
this.list = res?.data?.dmpVariablesVOList
Object.keys(this.basic).forEach(key => {
this.basic[key] = res?.data?.[key] || '-'
@@ -681,7 +684,6 @@
})
},
groupClick1(data) {
- console.log('-------', data)
var params = {
groupId: data.id,
keyWord: this.keyWord,
@@ -694,7 +696,6 @@
dataChange(res, data) {
if (data.length > 0) {
- console.log(data[0], '>>>>>>>>')
this.$refs.table.setCurrentRow(data[0])
this.previewData = data[0]
this.rowClick(data[0])
--
Gitblit v1.9.3