From 65a5e8c7ec6d6eab78b76c5831eaf40c30e23c61 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 13 九月 2024 14:56:50 +0800
Subject: [PATCH] 1、设备管理页面设备种类字段改成重要程度字段；新增设备异常状态字段，若表格记录的设备状态不为正常时，则标红此表格记录 2、设备利用率、设备开动率、班次利用率以及设备综合效率分析新增按照重要程度字段查询表格数据；左侧树数据新增参数key，用来过滤异常状态设备 3、设备利用率页面新增设备型号字段
---
src/views/mdc/common/BaseTree.vue | 126 ++++++++++++++++++++++-------------------
1 files changed, 67 insertions(+), 59 deletions(-)
diff --git a/src/views/mdc/common/BaseTree.vue b/src/views/mdc/common/BaseTree.vue
index 445f539..11835c5 100644
--- a/src/views/mdc/common/BaseTree.vue
+++ b/src/views/mdc/common/BaseTree.vue
@@ -1,28 +1,28 @@
<template>
- <a-card class="tree_con" :loading="cardLoading" :bordered="false" >
+ <a-card class="tree_con" :loading="cardLoading" :bordered="false">
<a-spin :spinning="loading">
<div style="display: flex;flex-direction: column;height: 100%">
- <div>
- <a-alert type="info" :showIcon="false" style="margin-right: 54px;padding-left: 5px">
- <div slot="message">
- <span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
- <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">鍙栨秷</a>
- <span v-else>鏃�</span>
- </div>
- </a-alert>
- <div class="drawer-bottom-button">
- <a-dropdown :trigger="['click']" placement="bottomCenter">
- <a-menu slot="overlay">
- <a-menu-item key="1" @click="expandAll">灞曞紑鎵�鏈�</a-menu-item>
- <a-menu-item key="2" @click="closeAll">鍚堝苟鎵�鏈�</a-menu-item>
- <a-menu-item key="3" @click="refreshTree">鍒锋柊</a-menu-item>
- </a-menu>
- <a-button>
- <a-icon type="bars"/>
- </a-button>
- </a-dropdown>
+ <div>
+ <a-alert type="info" :showIcon="false" style="margin-right: 54px;padding-left: 5px">
+ <div slot="message">
+ <span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
+ <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">鍙栨秷</a>
+ <span v-else>鏃�</span>
</div>
+ </a-alert>
+ <div class="drawer-bottom-button">
+ <a-dropdown :trigger="['click']" placement="bottomCenter">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="expandAll">灞曞紑鎵�鏈�</a-menu-item>
+ <a-menu-item key="2" @click="closeAll">鍚堝苟鎵�鏈�</a-menu-item>
+ <a-menu-item key="3" @click="refreshTree">鍒锋柊</a-menu-item>
+ </a-menu>
+ <a-button>
+ <a-icon type="bars"/>
+ </a-button>
+ </a-dropdown>
</div>
+ </div>
<a-input-search @search="handleSearch" style="width:100%;margin-top: 10px" placeholder="妫�绱� 绫诲埆缂栫爜/鍚嶇О" allowClear
v-model="searchInput" @change="handleChange"/>
<!-- showLine -->
@@ -58,7 +58,7 @@
</div>
</div>
</a-spin>
- <tier-model ref="tierModalForm" @ok="modalFormOk"></tier-model>
+ <tier-model ref="tierModalForm" @ok="modalFormOk"></tier-model>
</a-card>
</template>
@@ -70,7 +70,7 @@
} from '@/api/manage'
import Tooltip from 'ant-design-vue/es/tooltip'
import TierModel from './modules/baseTree/TierModel'
- import {mapActions} from 'vuex'
+ import { mapActions } from 'vuex'
export default {
name: 'BaseTree',
@@ -80,6 +80,10 @@
default() {
return true
}
+ },
+ filterAbnormalDeviceKey: {
+ type: String,
+ default: ''
}
},
components: {
@@ -105,7 +109,7 @@
allTreeKeys: [],
currSelected: {},
hiding: false,
- mathChange:''
+ mathChange: ''
}
}
,
@@ -149,17 +153,17 @@
queryTreeData() {
this.loading = true
this.cardLoading = true
- this.QueryProduction().then(res => {
+ this.QueryProduction(this.filterAbnormalDeviceKey).then(res => {
if (res.success) {
this.dataList = []
this.allTreeKeys = []
this.treeDataSource = res.result
this.generateList(res.result)
- this.expandedKeys=this.allTreeKeys
+ this.expandedKeys = this.allTreeKeys
} else {
this.$message.warn(res.message)
}
- }).finally(() =>{
+ }).finally(() => {
this.loading = false
this.cardLoading = false
})
@@ -181,7 +185,7 @@
let search = this.searchInput
let expandedKeys = this.dataList
.map(item => {
- if(item.title !=null){
+ if (item.title != null) {
if (item.title.indexOf(search) > -1) {
return this.getParentKey(item.key, this.treeDataSource)
}
@@ -200,7 +204,7 @@
let expandedKeys = this.dataList
.map(item => {
- if(item.title !=null){
+ if (item.title != null) {
if (item.title.indexOf(search) > -1) {
return this.getParentKey(item.key, this.treeDataSource)
}
@@ -262,9 +266,9 @@
if (!ids) {
// this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
this.$notification.warning({
- message:'娑堟伅',
- description:"璇烽�夋嫨涓�鏉¤褰�"
- });
+ message: '娑堟伅',
+ description: '璇烽�夋嫨涓�鏉¤褰�'
+ })
return
} else {
var that = this
@@ -276,7 +280,7 @@
deleteAction(that.url.deleteBatch, { ids: ids }).then((res) => {
if (res.success) {
that.$message.success(res.message)
- that.queryTreeData();
+ that.queryTreeData()
} else {
that.$message.warning(res.message)
}
@@ -288,7 +292,7 @@
}
},
modalFormOk(val) {
- console.log("mmm")
+ console.log('mmm')
// 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
this.queryTreeData()
// 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
@@ -298,7 +302,7 @@
watch: {
currSelected(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
this.$emit('getCurrSelected', val)
- },
+ }
}
}
</script>
@@ -368,37 +372,41 @@
border-radius: 0 0 2px 2px;
}
- .tree_con{
+ .tree_con {
overflow: hidden;
}
- @media screen and (min-width: 1920px){
- .tree_con{
- height: 748px!important;
- }
- }
- @media screen and (min-width: 1680px) and (max-width: 1920px){
- .tree_con{
- height: 748px!important;
- }
- }
- @media screen and (min-width: 1400px) and (max-width: 1680px){
- .tree_con{
- height: 600px!important;
- }
- }
- @media screen and (min-width: 1280px) and (max-width: 1400px){
- .tree_con{
- height: 501px!important;
- }
- }
- @media screen and (max-width: 1280px){
- .tree_con{
- height: 501px!important;
+ @media screen and (min-width: 1920px) {
+ .tree_con {
+ height: 748px !important;
}
}
- /deep/ .ant-card-body,/deep/ .ant-spin-nested-loading,/deep/ .ant-spin-container{
+ @media screen and (min-width: 1680px) and (max-width: 1920px) {
+ .tree_con {
+ height: 748px !important;
+ }
+ }
+
+ @media screen and (min-width: 1400px) and (max-width: 1680px) {
+ .tree_con {
+ height: 600px !important;
+ }
+ }
+
+ @media screen and (min-width: 1280px) and (max-width: 1400px) {
+ .tree_con {
+ height: 501px !important;
+ }
+ }
+
+ @media screen and (max-width: 1280px) {
+ .tree_con {
+ height: 501px !important;
+ }
+ }
+
+ /deep/ .ant-card-body, /deep/ .ant-spin-nested-loading, /deep/ .ant-spin-container {
height: 100%;
}
</style>
--
Gitblit v1.9.3