From 1988d77f4df3c01a9137303e0c959b3442c14377 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 30 九月 2024 22:10:30 +0800
Subject: [PATCH] 1
---
src/views/console/workstation/index.vue | 104 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 78 insertions(+), 26 deletions(-)
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index 1cb9149..964c685 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -7,11 +7,10 @@
<el-aside width="200px" v-loading="showGrouploading">
<el-container>
<el-main class="nopadding">
- <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"
- @node-click="groupClick1"></el-tree>
+ <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]"
+ :render-content="renderContent" @node-click="groupClick1"></el-tree>
</el-main>
</el-container>
</el-aside>
@@ -26,12 +25,12 @@
<div class="right-panel">
<div class="right-panel-search">
<span>绫诲瀷</span>
- <el-select v-model="type" style="width: 240px">
+ <el-select v-model="type" style="width: 240px" clearable>
<el-option v-for="item in types" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
<span>鐘舵��</span>
- <el-select v-model="statu" style="width: 240px">
+ <el-select v-model="statu" style="width: 240px" clearable>
<el-option v-for="item in status" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
@@ -45,11 +44,15 @@
<div style="display: flex">
<scTable highlight-current-row @dataChange="dataChange" @row-click="rowClick"
ref="table" :params="params" :apiObj="apiObj"
- @selection-change="selectionChange" stripe>
+ @selection-change="selectionChange" stripe v-show="showTable">
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column label="宸ヤ綅缂栧彿" prop="code" width="120"></el-table-column>
<el-table-column label="宸ヤ綅鍚嶇О" prop="name" width="120"></el-table-column>
- <el-table-column label="宸ヤ綅绫诲瀷" prop="type" width="120"></el-table-column>
+ <el-table-column label="宸ヤ綅绫诲瀷" prop="type" width="120">
+ <template #default="scope">
+ <span>{{ scope.row.type == '0' ? '鏈哄櫒' : '浜哄伐' }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="宸ヤ綅鏃ュ巻" prop="calendarName" width="120"></el-table-column>
<el-table-column label="鎿嶄綔" fixed="right" align="right" width="160">
<template #default="scope">
@@ -72,8 +75,16 @@
</template>
</el-table-column>
</scTable>
- <div style="margin-left: 14px" v-if="Object.keys(previewData).length > 0">
+ <div :style="{
+ 'max-width': showTable ? '50%' : '100%', 'margin-left': '14px',
+ flex: '1 1 auto'
+ }" v-if="Object.keys(previewData).length > 0">
<div class="header">
+ <el-icon @click="showTable = !showTable"
+ style="font-size: 20px;cursor: pointer;margin-top: 10px;">
+ <el-icon-arrow-left v-show="showTable" />
+ <el-icon-arrow-right v-show="!showTable" />
+ </el-icon>
<p class="preview-title">宸ヤ綅淇℃伅</p>
<div class="preview-content">
<div class="img">
@@ -94,7 +105,9 @@
<el-tabs tab-position="top" class="custom-tabs" v-model="normal">
<el-tab-pane label="鏈哄櫒淇℃伅" name="1">
<el-container>
- <el-header>鍩虹鏁版嵁</el-header>
+ <el-header>
+ <h2>鍩虹鏁版嵁</h2>
+ </el-header>
<el-main>
<el-row>
<el-col :span="4">
@@ -115,36 +128,44 @@
<el-col :span="8">
{{ basic.machineBrand }}
</el-col>
- <el-col :span="4">
+ <!-- <el-col :span="4">
椹卞姩鍚嶇О
</el-col>
<el-col :span="8">
{{ basic.typeName }}
- </el-col>
+ </el-col> -->
</el-row>
</el-main>
</el-container>
<el-container>
<el-header>
- <span>閲囬泦淇℃伅</span>
- <el-button @click="editFlag = !editFlag"
+ <h2>閲囬泦淇℃伅</h2>
+ <el-button v-show="list.length > 0"
+ @click="() => { editFlag = !editFlag; showTable = !editFlag }"
style="margin-left: auto;" text type="primary"
- size="small">閰嶇疆宸ヤ綅閲囬泦</el-button>
+ size="small">{{ editFlag ? '鍙栨秷' : '閰嶇疆宸ヤ綅閲囬泦'
+ }}</el-button>
<el-button v-show="editFlag" @click="saveInfo" text
type="primary" size="small">淇濆瓨</el-button>
- <el-button text type="primary"
- size="small">淇敼DMP閰嶇疆</el-button>
+ <!-- <el-button text type="primary" size="small"
+ @click="editDMP">淇敼DMP閰嶇疆</el-button> -->
</el-header>
<el-main>
- <el-table :data="list" height="200px">
- <el-table-column label="閲囬泦鍙橀噺鍚嶇О" prop="name" />
- <el-table-column label="宸ヤ綅鍙橀噺鍚嶇О" prop="dataItem">
+ <el-table :data="list" height="200px"
+ @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55"
+ v-if="editFlag" />
+ <el-table-column label="閲囬泦鍙橀噺鍚嶇О" prop="name"
+ width="120" />
+ <el-table-column label="宸ヤ綅鍙橀噺鍚嶇О" prop="dataItem"
+ width="120">
<template #default="scope">
<el-input :disabled="!editFlag"
v-model="scope.row.dataItem"></el-input>
</template>
</el-table-column>
- <el-table-column label="鏁版嵁鏍囩" prop="description">
+ <el-table-column label="鏁版嵁鏍囩" prop="description"
+ width="150">
<template #default="scope">
<el-select :disabled="!editFlag"
v-model="scope.row.description">
@@ -157,7 +178,8 @@
<!-- {{ dmp_data_type.find(v => v.dictKey == scope.row.wcsDataType)?.dictValue }} -->
</template>
</el-table-column>
- <el-table-column label="鏁版嵁绫诲埆" prop="wcsDataType">
+ <el-table-column label="鏁版嵁绫诲埆" prop="wcsDataType"
+ width="150">
<template #default="scope">
<el-select disabled
v-model="scope.row.wcsDataType">
@@ -384,6 +406,7 @@
},
data() {
return {
+ showTable: true,
machinePng,
showGrouploading: false,
options: [],
@@ -488,6 +511,31 @@
this.queryList()
},
methods: {
+ handleSelectionChange(val) {
+ console.log(val)
+ val.forEach(v => {
+ v.bigScreen = true
+ v.realTimeData = true
+ v.processParameter = true
+ })
+ 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
+ }
+ })
+ },
+ editDMP() {
+ this.$HTTP.get(`/api/blade-system/param/detail?paramKey=system.dmp.url`).then(res => {
+ if (res.success) {
+ window.open(res.data.paramValue)
+ } else {
+ this.$message.error(res.msg)
+ }
+ })
+ },
renderContent(h, { data }) {
let img = data.groupTag == 'fms_beltline'
return h('span', {
@@ -525,15 +573,18 @@
let data = this.formatData(res.data)
this.group = data
this.showGrouploading = false
+ console.log('>>>>>>>>>>>>>>>>>>>>>')
// this.$nextTick(() => {
if (!flag) {
+ debugger
let parent = res.data.filter(item => item.parentId == 0)[0]
this.treeCheckedNode = parent
this.treeCheckKey = parent.id
} else {
- let parent = res.data.filter(item => item.id == this.treeCheckedNode.id)[0]
- this.treeCheckedNode = parent
- this.treeCheckKey = parent.id
+ debugger
+ let parent = res.data.filter(item => item.parentId == 0)[0]
+ parent && (this.treeCheckedNode = parent)
+ parent && (this.treeCheckKey = parent.id)
}
// })
@@ -675,6 +726,7 @@
saveInfo() {
this.$HTTP.post('/api/blade-cps/workstation-wcs/save', this.workbenchVOList).then(res => {
this.editFlag = false
+ this.showTable = true
})
},
}
--
Gitblit v1.9.3