From 623c691a3cbf09fc0fe68bfa50d9354d12a3da77 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 17 十一月 2023 14:34:51 +0800
Subject: [PATCH] 1、车间看板页面修改设备详情弹窗触发条件由悬浮改为单击 2、大屏车间管理页面增加有关设备编号字体颜色各项功能，由用户自行设置
---
src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue | 75 ++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 35 deletions(-)
diff --git a/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue b/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue
index b586a1c..9f19ba1 100644
--- a/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue
+++ b/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false" class="device_list">
+ <div :bordered="false" class="device_list">
<div class="com_box">
<!-- 鏌ヨ鍖哄煙 -->
<div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
@@ -53,7 +53,7 @@
</div>
<!-- table鍖哄煙-end -->
</div>
- </a-card>
+ </div>
</template>
<script>
@@ -136,7 +136,6 @@
}
},
nodePeople(val){
-
if (JSON.stringify(val) != '{}') {
if (val.equipmentId) {
// this.$set(this.queryParam, 'tierName', val.title)
@@ -177,40 +176,46 @@
})
},
searchQuery(){
- this.AnalysisList = []
- this.AnalysisBarList = []
- this.AnalysisGauge = []
- this.AnalysisPie = []
- if(this.queryParams.typeTree == "1"){
- this.queryParams.parentId = this.queryParamEquip.parentId
- // this.queryParams.equipmentId = this.queryParamEquip.equipmentId
-
- }else{
- this.queryParams.parentId = this.queryParamEquip.parentId
-
- // this.queryParams.equipmentId = ""
- }
- this.AnalysisList = [];
- //鑾峰彇鏌ヨ鏉′欢
- this.queryParam.parentId = this.queryParams.parentId;
- this.queryParam.equipmentId = this.queryParams.equipmentId;
- this.queryParam.typeTree = this.queryParams.typeTree
- getAction(this.url.comparativeAnalysis,this.queryParam).then((res) => {
- if(res.success){
- this.AnalysisList = res.result
- this.AnalysisBarList = res.result.graphics
- this.AnalysisGauge = res.result.meters
- this.AnalysisPie.push(res.result.pieCharts)
+ if(this.dates&&this.dates.length>0){
+ this.AnalysisList = []
+ this.AnalysisBarList = []
+ this.AnalysisGauge = []
+ this.AnalysisPie = []
+ if(this.queryParams.typeTree == "1"){
+ this.queryParams.parentId = this.queryParamEquip.parentId
+ // this.queryParams.equipmentId = this.queryParamEquip.equipmentId
}else{
- // this.$message.warning(res.message)
- this.$notification.warning({
- message:'娑堟伅',
- description:res.message
- });
+ this.queryParams.parentId = this.queryParamEquip.parentId
+ // this.queryParams.equipmentId = ""
}
- }).finally(() => {
- this.loading = false
- })
+ this.AnalysisList = []
+ //鑾峰彇鏌ヨ鏉′欢
+ this.queryParam.parentId = this.queryParams.parentId;
+ this.queryParam.equipmentId = this.queryParams.equipmentId;
+ this.queryParam.typeTree = this.queryParams.typeTree
+ getAction(this.url.comparativeAnalysis,this.queryParam).then((res) => {
+ if(res.success){
+ this.AnalysisList = res.result
+ this.AnalysisBarList = res.result.graphics
+ this.AnalysisGauge = res.result.meters
+ this.AnalysisPie.push(res.result.pieCharts)
+ }else{
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ }else{
+ this.$notification.warning({
+ message:'鎻愮ず' ,
+ description:'璇烽�夋嫨鏃堕棿'
+ })
+ }
+
},
searchReset() {
this.AnalysisList = []
--
Gitblit v1.9.3