From 8f38a93c9c9ddaf547200a542aecced93f8857a3 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 11 十一月 2024 15:11:50 +0800
Subject: [PATCH] 报警分析页面子表格持续时间增加默认升序排序功能
---
src/views/mdc/base/MasterControlWorkshopSignage.vue | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/views/mdc/base/MasterControlWorkshopSignage.vue b/src/views/mdc/base/MasterControlWorkshopSignage.vue
index efd16d2..c100666 100644
--- a/src/views/mdc/base/MasterControlWorkshopSignage.vue
+++ b/src/views/mdc/base/MasterControlWorkshopSignage.vue
@@ -23,7 +23,7 @@
<div class="page-title">
<div style="position: relative">
- <img src="../../../assets/image/logo.jpg">
+ <img src="@/assets/logo-yt.png">
<span style="cursor: pointer"
@dblclick="modalVisible=true">{{isFakeData?fakeData.title:'涓�鎷栧ぇ鎷栬閰嶅巶'}}</span>
</div>
@@ -67,8 +67,9 @@
<div class="switch-container">
<div class="switch-item" v-for="(item,index) in switchList" :key="index" @click="navigateToOthers(item,index)"
- :style="{backgroundColor:activeIndex===index?'#848284':'#6B6D6B',color:activeIndex==index?'#27A2DB':'#000'}">
- {{item.label}}
+ :style="{color:activeIndex==index?'#27A2DB':'#000'}">
+ <img src="@/assets/navigateImg.png">
+ <span>{{item.label}}</span>
</div>
</div>
@@ -81,15 +82,15 @@
<div class="chart-container" id="right-col-chart1"></div>
</div>
<div class="col-content">
- <div class="content-title">浠婃棩璁惧寮�鏈虹巼(%)</div>
+ <div class="content-title">璁惧浠婃棩寮�鏈虹巼锛�%锛�</div>
<div class="chart-container" id="right-col-chart2"></div>
</div>
<div class="col-content">
- <div class="content-title">浠婃棩璁惧鍒╃敤鐜�(%)</div>
+ <div class="content-title">璁惧浠婃棩鍒╃敤鐜囷紙%锛�</div>
<div class="chart-container" id="right-col-chart3"></div>
</div>
<div class="col-content">
- <div class="content-title">鏈堣澶囧埄鐢ㄧ巼(%)</div>
+ <div class="content-title">璁惧鏈堝埄鐢ㄧ巼锛�%锛�</div>
<div class="chart-container" id="right-col-chart4"></div>
</div>
</div>
@@ -267,15 +268,15 @@
this.leftColChart1Data = [
{
'name': '浜у搧鍚堟牸鐜�',
- 'count': res.result.passRate ? res.result.passRate : 0
+ 'count': res.result.passRate ? res.result.passRate / 100 : 0
},
{
'name': '璁惧鍒╃敤鐜�',
- 'count': res.result.utilizationRate ? res.result.utilizationRate : 0
+ 'count': res.result.utilizationRate ? res.result.utilizationRate / 100 : 0
},
{
'name': '璁″垝瀹屾垚鐜�',
- 'count': res.result.planCompleteRate ? res.result.planCompleteRate : 0
+ 'count': res.result.planCompleteRate ? res.result.planCompleteRate / 100 : 0
}
]
this.drawLeftColChart1()
@@ -2320,6 +2321,7 @@
}
},
+
/**
* 绐楀彛灏哄鍙樺寲鏃惰Е鍙�
* 璋冩暣鍥捐〃灏哄浠ラ�傚簲鍒嗚鲸鐜�
@@ -2382,8 +2384,9 @@
text-align: center;
img {
+ height: 100%;
+ width: 10%;
position: absolute;
- width: 12%;
left: 12%;
}
}
@@ -2428,13 +2431,26 @@
flex: 1;
text-align: center;
cursor: pointer;
+ position: relative;
+
+ span {
+ position: relative;
+ z-index: 1;
+ }
+ img {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ }
}
}
.page-description {
text-align: center;
color: #fff;
- font-size: 14px;
+ font-size: 0.7vw;
}
}
--
Gitblit v1.9.3