From eef1ef0be935d4a3d8fc691b2666f41796b2d4a5 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 04 十一月 2024 19:57:08 +0800
Subject: [PATCH] 增加列表显示
---
src/views/mdc/processParam/index.vue | 6 --
src/views/mdc/MYTree.vue | 70 ++++++++++++++++++++++++++++++----
2 files changed, 62 insertions(+), 14 deletions(-)
diff --git a/src/views/mdc/MYTree.vue b/src/views/mdc/MYTree.vue
index 93e9090..06363fd 100644
--- a/src/views/mdc/MYTree.vue
+++ b/src/views/mdc/MYTree.vue
@@ -1,17 +1,30 @@
<!--
* @Date: 2024-04-18 19:53:35
- * @LastEditors: Sneed
- * @LastEditTime: 2024-06-16 16:21:59
- * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/MYTree.vue
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-11-04 19:55:07
+ * @FilePath: /cps-web/src/views/mdc/MYTree.vue
-->
<template>
- <el-tree :expand-on-click-node="false" ref="treeRef" v-bind="$attrs" :show-checkbox="showCheckbox"
- :current-node-key="currentNodeKey" node-key="id" :props="defalutProps" :data="data" @check-change="checkChange"
- @node-click="handleNodeClick" highlight-current default-expand-all :render-content="renderContent"></el-tree>
+ <el-input v-model="word" style="max-width: 600px" @change="search" placeholder="" class="input-with-select">
+ <template #append>
+ <el-button :icon="ElementPlusIconsVue.Search" />
+ </template>
+ </el-input>
+ <el-switch v-model="showType" active-text="鍒楄〃" inactive-text="鏍戠姸" @change="switchFn" />
+ <el-tree v-show="!showType" :expand-on-click-node="false" ref="treeRef" v-bind="$attrs"
+ :show-checkbox="showCheckbox" :current-node-key="currentNodeKey" node-key="id" :props="defalutProps"
+ :data="data" @check-change="checkChange" @node-click="handleNodeClick" highlight-current default-expand-all
+ :render-content="renderContent"></el-tree>
+ <el-table v-show="showType" :data="tableData" @selection-change="handleSelectionChange" highlight-current-row
+ :current-row-key="currentNodeKey" row-key="id" @row-click="rowClick">
+ <el-table-column v-if="showCheckbox" type="selection" :selectable="selectable" width="55" />
+ <el-table-column prop="title" label="宸ヤ綅鍚嶇О" />
+ </el-table>
</template>
<script>
import pmsPng from '@/assets/pms.png'
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
export default {
props: {
showCheckbox: {
@@ -31,6 +44,10 @@
},
data() {
return {
+ ElementPlusIconsVue,
+ word: '',
+ showType: false, // 鏄剧ず绫诲瀷
+ tableData: [],
pmsPng,
firstWorkKey: '',
currentNodeKey: [],
@@ -57,10 +74,29 @@
this.$emit('update:modelValue', value)
}
},
- created() {
+ mounted() {
this.getList()
+ let key = this.$route.path
+ if (localStorage.getItem(key) === '1') {
+ this.showType = true
+ }
+ console.log(this.$route, '>>>>>>')
},
methods: {
+ search() {
+ console.log('Search')
+ this.getList()
+ },
+ switchFn(val) {
+ console.log(this.$route, val, '>>>>>>')
+ localStorage.setItem(this.$route.path, val ? '1' : '0')
+ },
+ handleSelectionChange(selection) {
+ this.value = selection.map(v => v.id)
+ },
+ rowClick(row) {
+ this.currentNodeKey = row.id
+ },
renderContent(h, { data, node }) {
let img = data.groupTag == 'fms_beltline'
return h('a', {
@@ -80,6 +116,7 @@
groupType: "group_workstation"
}).then(({ code, data }) => {
if (code === 200) {
+ this.tableData = data.filter(v => v.isWorkstation && v.title.indexOf(this.word) > -1)
this.data = this.formatData(data)
this.$nextTick(() => {
this.currentNodeKey = this.firstWorkKey
@@ -100,8 +137,15 @@
if (!current) {
newData = data.filter(item => item.parentId == 0).map(v => {
if (!v.isWorkstation) v.disabled = true
- v.children = this.formatData(data, v).sort((a, b) => {
+ let children = this.formatData(data, v).sort((a, b) => {
return b.sort - a.sort
+ })
+ v.children = children.filter(v => {
+ if (v.isWorkstation) {
+ return v.title.indexOf(this.word) > -1
+ } else {
+ return true
+ }
})
this.setCurrentKey(v)
return v
@@ -110,8 +154,15 @@
let res = data.filter(v => v.parentId == current.id)
res = res.map(item => {
if (!item.isWorkstation) item.disabled = true
- item.children = this.formatData(data, item).sort((a, b) => {
+ let children = this.formatData(data, item).sort((a, b) => {
return b.sort - a.sort
+ })
+ item.children = children.filter(v => {
+ if (v.isWorkstation) {
+ return v.title.indexOf(this.word) > -1
+ } else {
+ return true
+ }
})
this.setCurrentKey(item)
return item
@@ -129,6 +180,7 @@
},
checkChange(data, data1, data2) {
+ console.log('>>>>>>>')
if (this.getAll) {
return this.value = this.$refs.treeRef.getCheckedNodes().filter(v => v.isWorkstation)
}
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index b795e8c..8f7690f 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: gaoshp
- * @LastEditTime: 2024-11-03 20:10:01
+ * @LastEditTime: 2024-11-04 19:16:35
* @FilePath: /cps-web/src/views/mdc/processParam/index.vue
瀹炴椂鐪嬫澘
-->
@@ -211,7 +211,6 @@
},
query() {
if (!this.treeChecked.toString()) return
- console.log(this.treeChecked.toString(), '>>>>>>>>>/')
this.$refs?.timeLine?.init({
dates: this.time,
workstationId: this.treeChecked.toString()
@@ -219,7 +218,6 @@
this.list = []
this.$HTTP.get('/api/mdc/process-parameter/params', { workstationId: this.treeChecked.toString() }).then(res => {
if (res.code === 200) {
- console.log('jkjkjkjkj', this.list)
this.list = res.data.map(v => {
let name = v.isProcessParam ? 'ProcessProgram' : v.dpName
return {
@@ -271,7 +269,6 @@
} else {
this.setLineOptions(res.data.data, item.dpName)
}
- console.log(this.list, '>>>>>>>>>>//////1')
})
},
setLineOptions(data, myname) {
@@ -413,7 +410,6 @@
},
},
}
- console.log(dayCharts, '>>>>>>>???')
let index = this.list.findIndex(item => item.dpName === myname)
this.list[index] = Object.assign({
...this.list[index],
--
Gitblit v1.9.3