pengyu 4 месяцев назад
Родитель
Сommit
2c6f6e5833

+ 13 - 46
src/components/common-comp-alarm-list/src/components/AlarmList.vue

@@ -84,11 +84,11 @@
       />
     </div>
     <!--    固定按钮位置  -->
-    <div class="allBut">
-      <el-button class="yujingA">真警</el-button>
-      <el-button class="yujingB">误报</el-button>
-      <el-button class="yujingC">重复告警</el-button>
-      <el-button class="yujingD">关闭</el-button>
+    <div class="allBut" v-show="showSelectAll">
+      <el-button class="yujingA" @click="piliang('批量处理真警成功')">真警</el-button>
+      <el-button class="yujingB" @click="piliang('批量处理误报成功')">误报</el-button>
+      <el-button class="yujingC" @click="piliang('批量处理重复告警成功')">重复告警</el-button>
+      <el-button class="yujingD" @click="piliang('批量处理关闭成功')">关闭</el-button>
     </div>
     <!--    固定按钮位置end  -->
     <div class="input-box">
@@ -99,7 +99,7 @@
       >
         {{ showSelectAll ? '取消批量' : '批量操作' }}
       </el-button>
-      <span class="xianshisj">已选32条</span>
+      <span v-show="showSelectAll" class="xianshisj">已选{{selectedItems.size}}条</span>
       <div class="select-all-container" v-if="showSelectAll" style="float: right;">
         <!-- 将复选框改为按钮形式 -->
         <el-button
@@ -226,9 +226,6 @@
           v-c-tip="'更多'"
           @click="goEventManage"
         ></div>
-        <div class="page-number">
-          已选择{{selectedItems.size}}条
-        </div>
       </div>
     </div>
   </div>
@@ -462,7 +459,7 @@ export default {
 
 
         ], //  表格显示数据
-        total: 11, // 数据总数
+        total: 9, // 数据总数
         isMap: false // 点地图告警查询的
       },
       showPagination: false, // 是否右侧告警显示页码
@@ -528,6 +525,10 @@ export default {
     clearTimeout(this.searchTimer)
   },
   methods: {
+    //批量处理逻辑
+    piliang(title){
+      alert(title);
+    },
     // 添加切换批量操作显示状态的方法
     toggleSelectAll() {
       this.showSelectAll = !this.showSelectAll;
@@ -837,44 +838,9 @@ export default {
       this.keywordValueForHighLight = params.keyword
       try {
         const resp = await getOrderList(params)
-        _this.rightTableParam.total = 11
+        _this.rightTableParam.total = 9
           _this.rightTableParam.tableDatas.push(
               {
-                orderId: 'ALM20230719001',
-                warningSourceName: '基站监控系统',
-                alarmBody: '电池电压过低告警,当前电压48.2V,低于阈值52V',
-                address: '杭州市西湖区文三路382号基站',
-                alarmTime: '2023-07-19 14:32:15',
-                showTime: '剩余2小时',
-                isCollection: '0',
-                orderStatus: '2',
-                enableAcceptanceMode: '0',
-                fileImgUrlIcon: '',
-                imgUrl: '',
-                alarmLableRelDTOList: [
-                  { lableName: '紧急' },
-                  { lableName: '电力相关' },
-                  { lableName: '需要现场处理' }
-                ]
-              },
-              {
-                orderId: 'ALM20230719002',
-                warningSourceName: '环境监测系统',
-                alarmBody: '温度异常升高,机房温度达到38℃,超过阈值35℃',
-                address: '宁波市鄞州区中山东路128号机房',
-                alarmTime: '2023-07-19 15:22:08',
-                showTime: '超时1小时',
-                isCollection: '1',
-                orderStatus: '4',
-                enableAcceptanceMode: '0',
-                fileImgUrlIcon: '',
-                imgUrl: '',
-                alarmLableRelDTOList: [
-                  { lableName: '重要' },
-                  { lableName: '环境监控' }
-                ]
-              },
-              {
                 orderId: 'ALM20230719003',
                 warningSourceName: '安防监控系统',
                 alarmBody: '红外入侵检测报警,检测到不明物体闯入',
@@ -1037,6 +1003,7 @@ export default {
         _this.showPagination = true
         _this.rightTableLoading = false
         _this.infiniteScrollLoading = false
+        _this.showSelectAll = false
       } catch (err) {
         _this.showPagination = false
         _this.rightTableLoading = false

+ 2 - 1
src/components/common-comp-alarm-list/src/components/AlarmListItem.vue

@@ -3,7 +3,7 @@
   <div>
     <div class="eventListItem" @contextmenu="disableRightClick">
       <!-- 添加多选框 -->
-      <div v-show="showSelectAll" :style="{ marginRight: pxToRem(3), display: 'flex', alignItems: 'center' }">
+      <div v-if="showSelectAll" :style="{ marginRight: pxToRem(3), display: 'flex', alignItems: 'center' }">
         <input
             type="checkbox"
             :checked="item.selected"
@@ -218,6 +218,7 @@ export default {
     this.$nextTick(() => {
       this.boxKey = Symbol('key')
     })
+    this.showSelectAll=false
   },
   methods: {
     // 添加处理选择变化的方法