dedsudiyu 3 月之前
父节点
当前提交
f2464a9635

+ 1 - 1
src/views/safetyOverview/pageComponent/userEquipmentComponents.vue

@@ -8,7 +8,7 @@
           <p>学院单位</p>
           <p>实验人数</p>
           <p>值日人数</p>
-          <p>检查数</p>
+          <p>检查数</p>
           <p>超期设备</p>
         </div>
         <div class="userEquipment-for-max-box" ref="scrollDiv" @mouseleave="tableTimerFun" @mouseenter="tableTimerOff">

+ 15 - 8
src/views/safetyOverview/pageComponent/warningComponents.vue

@@ -20,7 +20,7 @@
           </div>
           <div>
             <p>环比增长:</p>
-            <p>{{deptData.rate}}</p>
+            <p :class="deptData.rateType == 1?'colorA':(deptData.rateType == 2?'colorB':'')">{{deptData.rate}}% <span :class="deptData.rateType == 1?'el-icon-bottom':(deptData.rateType == 2?'el-icon-top':'')"></span></p>
           </div>
         </div>
         <!--星期-->
@@ -75,7 +75,7 @@
         //展示数据
         deptData: {},
         deptListIndex: 0,
-        eChartsTimer: null
+        eChartsTimer: null,
       }
     },
     created() {
@@ -153,6 +153,7 @@
             let obj = {
               handleTotal:response.data[i].handleTotal,
               rate:response.data[i].rate,
+              rateType:response.data[i].rate.indexOf('-') != -1?'1':(response.data[i].rate.indexOf('+') != -1?'2':'0'),
               schoolName:response.data[i].schoolName,
               todayHandleTotal:response.data[i].todayHandleTotal,
               yesterdayHandleTotal:response.data[i].yesterdayHandleTotal,
@@ -207,16 +208,16 @@
           margin-bottom: 40px;
         }
         div {
-          width: 202px;
-          height: 50px;
-          background: no-repeat;
+          width: 220px;
+          height: 54px;
+          /*background: no-repeat;*/
           background-image: url("../../../assets/ZDimages/img_yjczbg@1x.png");
           background-size: 100%;
           display: flex;
-          margin-left: 25px;
+          margin-left: 11px;
           p:nth-child(1) {
             color: #fff;
-            line-height: 52px;
+            line-height: 56px;
             font-size: 18px;
             font-weight: 700;
             margin-left: 20px;
@@ -224,12 +225,18 @@
           }
           p:nth-child(2) {
             color: #FF8400;
-            line-height: 52px;
+            line-height: 56px;
             font-size: 18px;
             font-weight: 700;
             margin-right: 15px;
           }
         }
+        .colorA{
+          color:#95F204!important;
+        }
+        .colorB{
+          color:#ed1941!important;
+        }
       }
       .date-max-box {
         position: absolute;

+ 1 - 1
src/views/safetyOverview/pageList/userEquipmentComponentsTable.vue

@@ -40,7 +40,7 @@
           <el-table-column align="center" sortable="custom" label="办理准入人数" prop="safeApplyNum" width="300" show-overflow-tooltip/>
           <el-table-column align="center" sortable="custom" label="实验人数" prop="subPassOutNum" width="300" show-overflow-tooltip/>
           <el-table-column align="center" sortable="custom" label="值日人数" prop="boardDutyNum" width="300" show-overflow-tooltip/>
-          <el-table-column align="center" sortable="custom" label="检查数" prop="boardPatrolNum" width="300" show-overflow-tooltip/>
+          <el-table-column align="center" sortable="custom" label="检查数" prop="boardPatrolNum" width="300" show-overflow-tooltip/>
           <el-table-column align="center" sortable="custom" label="超期设备" prop="deviceNum" width="300" show-overflow-tooltip/>
         </el-table>
         <pagination :page-sizes="[20, 30, 40, 50]"