Merge remote-tracking branch 'origin/main'

src/views/equipmentAlarmRecord/index.vue

@@ -101,13 +101,13 @@
                     <span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
                   </template>
                 </div>
-                <div class="label">报警地点：</div>
+                <div class="label">报警地点</div>
                 <div class="alearmADD">
                   {{ item.location }}
                 </div>
                 <div v-if="item.treatmentState === 0" class="dl_bot d_fl">
-                  <div>时长:{{ item.durationTime }}</div>
+                  <div v-if="item.durationTime">时长:{{ item.durationTime }}</div>
-                  <div>解除: {{ item.finishTime.split(' ')[1] || '' }}</div>
+                  <div v-if="item.finishTime">解除: {{ item.finishTime.split(' ')[1] || '' }}</div>
                 </div>
               </div>
             </el-card>
@@ -219,8 +219,11 @@ const getList = async () => {
     queryTime2: endTime
   };
   const res = await listAlarm(queryParams.value);
-  alarmList.value = res.rows;
+  if (res.rows) {
-  total.value = res.total;
+    alarmList.value = res.rows;
+    total.value = res.total;
+  }
+
   loading.value = false;
 }
 // 设备类型
@@ -258,7 +261,7 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-    dateRange.value = ['', ''];
+  dateRange.value = ['', ''];
   queryFormRef.value?.resetFields();
   handleQuery();
 }
@@ -268,9 +271,10 @@ onMounted(() => {
 });
 </script>
 <style lang="scss" scoped>
-:deep .el-collapse{
+:deep .el-collapse {
-  border-top:none
+  border-top: none
 }
+
 :deep .el-collapse-item__header {
   display: none;
 }