From 212c59d51d4aac85f5ee4f83d460929b00c9bafc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Fri, 26 Aug 2022 18:17:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E9=99=8D=E6=9C=BA=E7=B3=BB=E7=BB=9F(?=
 =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E4=BF=A1=E6=81=AF):=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/index.js                          |  8 +--
 src/views/projectFront/lifter/alarmInfo.vue | 61 ++++++++++++++++-----
 2 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index 5cafa864..0f8baa6f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -45,8 +45,8 @@ export default new Vuex.Store({
     // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
     // FILEURL:'http://10.0.1.43:6023/image/',//测试
     BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', //
-    // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
-    // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
+    UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
+    FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
     /* 2022-05-16 */
     // tag: 部署河南项目时，需要打开这两行代码
     // UPLOADURL: 'http://124.71.178.44:100/upload/image',
@@ -56,8 +56,8 @@ export default new Vuex.Store({
     // UPLOADURL: 'http://192.168.34.125:6023/upload/image',
     // FILEURL: 'http://192.168.34.125:6023/image/',
     // 邱平毅的
-    UPLOADURL: 'http://192.168.34.216:6023/upload/image',
-    FILEURL: 'http://192.168.34.216:6023/image/',
+    // UPLOADURL: 'http://192.168.34.216:6023/upload/image',
+    // FILEURL: 'http://192.168.34.216:6023/image/',
 
     // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
     // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式
diff --git a/src/views/projectFront/lifter/alarmInfo.vue b/src/views/projectFront/lifter/alarmInfo.vue
index b137db6e..01af5cc3 100644
--- a/src/views/projectFront/lifter/alarmInfo.vue
+++ b/src/views/projectFront/lifter/alarmInfo.vue
@@ -98,14 +98,20 @@
           <el-table-column prop="bottomAlarm" :label="$t('message.lifter.lowerLimitAlarm')">
             <template slot-scope="scope">
               <!-- normal 正常   alarm 报警   earlyWarning 预警 -->
-              {{ scope.row.bottomAlarm == 0? $t('message.lifter.normal') : scope.row.bottomAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+               <span :class="{ 'alarm_statu2' : scope.row.bottomAlarm == 1 }" >
+                 {{ scope.row.bottomAlarm == 0? $t('message.lifter.normal') : scope.row.bottomAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+               </span>
+             
             </template>
           </el-table-column>
           <!-- 防坠器报警 -->
           <el-table-column prop="fallAlarm" :label="$t('message.lifter.fallArresterAlarm')">
             <template slot-scope="scope">
+              <span :class="{ 'alarm_statu2' : scope.row.fallAlarm == 1 }" >
+                {{ scope.row.fallAlarm == 0? $t('message.lifter.normal') : scope.row.fallAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              </span>
               <!-- normal 正常   alarm 报警   earlyWarning 预警 -->
-              {{ scope.row.fallAlarm == 0? $t('message.lifter.normal') : scope.row.fallAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              
             </template>
           </el-table-column>
           <!-- <el-table-column prop="name2" label="力矩"> </el-table-column>
@@ -114,26 +120,35 @@
           <!-- 高度报警 -->
           <el-table-column prop="heightAlarm" :label="$t('message.lifter.altitudeAlarm')">
             <template slot-scope="scope">
-              {{ scope.row.heightAlarm == 0? $t('message.lifter.normal') : scope.row.heightAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+               <span :class="{ 'alarm_statu2' : scope.row.heightAlarm == 1 }" >
+                {{ scope.row.heightAlarm == 0? $t('message.lifter.normal') : scope.row.heightAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+               </span>
+              
             </template>
           </el-table-column>
           <!-- 1号电机报警 -->
           <el-table-column prop="motor1Alarm" :label="$t('message.lifter.firstAlarm')">
             <template slot-scope="scope">
               <!-- normal 正常   alarm 报警   earlyWarning 预警 -->
-              {{ scope.row.motor1Alarm == 0? $t('message.lifter.normal') : scope.row.motor1Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+               <span :class="{ 'alarm_statu2' : scope.row.motor1Alarm == 1 }" >
+                 {{ scope.row.motor1Alarm == 0? $t('message.lifter.normal') : scope.row.motor1Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+               </span>
             </template>
           </el-table-column>
            <!-- 2号电机报警 -->
           <el-table-column prop="motor2Alarm" :label="$t('message.lifter.secondAlarm')">
             <template slot-scope="scope">
-              {{ scope.row.motor2Alarm == 0? $t('message.lifter.normal') : scope.row.motor2Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              <span :class="{ 'alarm_statu2' : scope.row.motor2Alarm == 1 }" >
+                {{ scope.row.motor2Alarm == 0? $t('message.lifter.normal') : scope.row.motor2Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              </span>
             </template>
           </el-table-column>
            <!-- 3号电机报警 -->
           <el-table-column prop="motor3Alarm" :label="$t('message.lifter.thirdAlarm')">
             <template slot-scope="scope">
-              {{ scope.row.motor3Alarm == 0? $t('message.lifter.normal') : scope.row.motor3Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              <span :class="{ 'alarm_statu2' : scope.row.motor3Alarm == 1 }" >
+                {{ scope.row.motor3Alarm == 0? $t('message.lifter.normal') : scope.row.motor3Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              </span>
             </template>
           </el-table-column>
           <!-- <el-table-column prop="speed" label="运行时刻"> </el-table-column> -->
@@ -141,46 +156,63 @@
           <!-- 倾角X报警 -->
           <el-table-column prop="obliguityXAlarm" :label="$t('message.lifter.inclinationXAlarm')">
             <template slot-scope="scope">
-              {{ scope.row.obliguityXAlarm == 0? $t('message.lifter.normal') : scope.row.obliguityXAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              <span :class="{ 'alarm_statu2' : scope.row.obliguityXAlarm == 1 }" >
+                 {{ scope.row.obliguityXAlarm == 0? $t('message.lifter.normal') : scope.row.obliguityXAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              </span>
             </template>
           </el-table-column>
           <!-- 倾角Y报警 -->
           <el-table-column prop="obliguityYAlarm" :label="$t('message.lifter.inclinationYAlarm')">
             <template slot-scope="scope">
-              {{ scope.row.obliguityYAlarm == 0? $t('message.lifter.normal') : scope.row.obliguityYAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              <span :class="{ 'alarm_statu2' : scope.row.obliguityYAlarm == 1 }" >
+                 {{ scope.row.obliguityYAlarm == 0? $t('message.lifter.normal') : scope.row.obliguityYAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              </span>
             </template>
           </el-table-column>
           <!-- 人数报警 -->
           <el-table-column prop="peopleCntAlarm" :label="$t('message.lifter.numberAlarm')">
             <template slot-scope="scope">
               <!-- normal 正常   alarm 报警   earlyWarning 预警 -->
-              {{ scope.row.peopleCntAlarm == 0? $t('message.lifter.normal') : scope.row.peopleCntAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              <span :class="{ 'alarm_statu2' : scope.row.peopleCntAlarm == 1 }" >
+                {{ scope.row.peopleCntAlarm == 0? $t('message.lifter.normal') : scope.row.peopleCntAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              </span>
             </template>
           </el-table-column>
           <!-- 速度报警 -->
           <el-table-column prop="speedAlarm" :label="$t('message.lifter.speedAlarm')">
             <template slot-scope="scope">
-              <!-- normal 正常   alarm 报警   earlyWarning 预警 -->
+              <span :class="{ 'alarm_statu2' : scope.row.speedAlarm == 1 }" >
               {{ scope.row.speedAlarm == 0? $t('message.lifter.normal') : scope.row.speedAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              </span>
+              <!-- normal 正常   alarm 报警   earlyWarning 预警 -->
             </template>
           </el-table-column>
           <!-- 防冲顶报警 -->
           <el-table-column prop="topAlarm" :label="$t('message.lifter.antiImpactRoofAlarm')">
             <template slot-scope="scope">
-              {{ scope.row.topAlarm == 0? $t('message.lifter.normal') : scope.row.topAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              <span :class="{ 'alarm_statu2' : scope.row.topAlarm == 1 }" >
+                  {{ scope.row.topAlarm == 0? $t('message.lifter.normal') : scope.row.topAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              </span>
+            
             </template>
           </el-table-column>
           <!-- 载重报警 -->
           <el-table-column prop="weightAlarm" :label="$t('message.lifter.loadAlarm')">
             <template slot-scope="scope">
-              {{ scope.row.weightAlarm == 0? $t('message.lifter.normal') : scope.row.weightAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              <span :class="{ 'alarm_statu2' : scope.row.weightAlarm == 1 }" >
+                {{ scope.row.weightAlarm == 0? $t('message.lifter.normal') : scope.row.weightAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              </span>
+              
             </template>
           </el-table-column>
           <!-- 风速报警 -->
           <el-table-column prop="windSpeedAlarm" :label="$t('message.lifter.windSpeedAlarm')">
             <template slot-scope="scope">
+              <span :class="{ 'alarm_statu2' : scope.row.windSpeedAlarm == 1 }" >
+                 {{ scope.row.windSpeedAlarm == 0? $t('message.lifter.normal') : scope.row.windSpeedAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+              </span>
               <!-- normal 正常   alarm 报警   earlyWarning 预警 -->
-              {{ scope.row.windSpeedAlarm == 0? $t('message.lifter.normal') : scope.row.windSpeedAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+             
             </template>
           </el-table-column>
           <!-- <el-table-column prop="name2" label="正常工作预警状态"> </el-table-column>
@@ -389,5 +421,8 @@ export default {
     height: 720px;
     background-color: #ffffff;
   }
+  .alarm_statu2{
+    color: #f76462;
+  }
 }
 </style>