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 @@
- {{ scope.row.bottomAlarm == 0? $t('message.lifter.normal') : scope.row.bottomAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+ {{ scope.row.bottomAlarm == 0? $t('message.lifter.normal') : scope.row.bottomAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+
+
+ {{ scope.row.fallAlarm == 0? $t('message.lifter.normal') : scope.row.fallAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
- {{ scope.row.fallAlarm == 0? $t('message.lifter.normal') : scope.row.fallAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
- {{ scope.row.heightAlarm == 0? $t('message.lifter.normal') : scope.row.heightAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+ {{ scope.row.heightAlarm == 0? $t('message.lifter.normal') : scope.row.heightAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+
- {{ scope.row.motor1Alarm == 0? $t('message.lifter.normal') : scope.row.motor1Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+ {{ scope.row.motor1Alarm == 0? $t('message.lifter.normal') : scope.row.motor1Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
- {{ scope.row.motor2Alarm == 0? $t('message.lifter.normal') : scope.row.motor2Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+ {{ scope.row.motor2Alarm == 0? $t('message.lifter.normal') : scope.row.motor2Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
- {{ scope.row.motor3Alarm == 0? $t('message.lifter.normal') : scope.row.motor3Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+ {{ scope.row.motor3Alarm == 0? $t('message.lifter.normal') : scope.row.motor3Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
@@ -141,46 +156,63 @@
- {{ scope.row.obliguityXAlarm == 0? $t('message.lifter.normal') : scope.row.obliguityXAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+ {{ scope.row.obliguityXAlarm == 0? $t('message.lifter.normal') : scope.row.obliguityXAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
- {{ scope.row.obliguityYAlarm == 0? $t('message.lifter.normal') : scope.row.obliguityYAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+ {{ scope.row.obliguityYAlarm == 0? $t('message.lifter.normal') : scope.row.obliguityYAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
- {{ scope.row.peopleCntAlarm == 0? $t('message.lifter.normal') : scope.row.peopleCntAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+ {{ scope.row.peopleCntAlarm == 0? $t('message.lifter.normal') : scope.row.peopleCntAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
-
+
{{ scope.row.speedAlarm == 0? $t('message.lifter.normal') : scope.row.speedAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+
- {{ scope.row.topAlarm == 0? $t('message.lifter.normal') : scope.row.topAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+ {{ scope.row.topAlarm == 0? $t('message.lifter.normal') : scope.row.topAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+
- {{ scope.row.weightAlarm == 0? $t('message.lifter.normal') : scope.row.weightAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+ {{ scope.row.weightAlarm == 0? $t('message.lifter.normal') : scope.row.weightAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
+
+
+ {{ scope.row.windSpeedAlarm == 0? $t('message.lifter.normal') : scope.row.windSpeedAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+
- {{ scope.row.windSpeedAlarm == 0? $t('message.lifter.normal') : scope.row.windSpeedAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
+