Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev

ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/detail.vue

@@ -972,7 +972,7 @@ mounted() {
             color: #2d3748;
             line-height: 1.6;
             padding: 20px;
-            min-height: 60vh;
+            min-height: 50vh;
         }
         
         .dashboard {

ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/history.vue

@@ -66,13 +66,13 @@ export default {
       handler(val) {
         this.getList(val)
       },
-      deep: true,
+      deep: true
-      immediate: true
     }
   },
   methods: {
     /** 查询类型列表 */
     getList(id) {
+      if (!id) return;
       this.loading = true
       try {
         alertmessage(id).then(response => {

ALOps_sys_fe/alops-ui/src/views/index.vue

@@ -105,10 +105,7 @@
                                 </td>
                                 <td>{{ device.temperature || 0 }}°C</td>
                                 <td>
-                                    <div class="health-bar">
+                                    <el-tag  :hit="false" :type="device.health == '1'?'success':device.health == '2'?'':device.health == '3'?'danger':device.health == '4'?'warning':'info'"> {{ device.health == '1'?'健康':device.health == '2'?'良好':device.health == '3'?'一般':device.health == '4'?'需维护':'未获取' }} </el-tag>
-                                        <div class="health-fill" :class="getHealthStatus(device.health || 0)"></div>
-                                    </div>
-                                    {{ device.health || 0 }}%
                                 </td>
                                 <td>{{ formatDuration(device.contWorkPeriod) }}</td>
                                 <td>{{ parseTime(device.gatherTime) || '--' }}</td>