更新202111011858

src/api/alarmManage/index.js

@@ -7,4 +7,13 @@ export function alarmGradeCount(params) {
         method: 'GET',
         params,
     })
+}
+
+//巡检管理-巡检计划-计划列表详情
+export function alarmGradeList(params) {
+    return request({
+        url: '/alarmPower/alarmGradeList',
+        method: 'GET',
+        params,
+    })
 }

src/main.js

@@ -40,5 +40,9 @@ app
   .use(Antd)
   .mount('#app')
 
+
+/**
+ * @需添加路由拦截 --登录后执行
+ */
 store.commit("publicSiteList");
 store.commit('publicDeviceList')

src/views/alarmManage/alarmTotal.vue

@@ -3,7 +3,17 @@
     <!-- 返回start -->
     <div class="siteTitle">
       <el-button class="goBack" @click="goBack">返回</el-button>
-      站点【上海新时达电气股份有限公司】{{ alarmTit == 1 ? '一级告警' : '' }}
+      站点【上海新时达电气股份有限公司】{{
+        alarmGradeList.type == 0
+          ? '总数'
+          : alarmGradeList.type == 1
+          ? '一级告警'
+          : alarmGradeList.type == 2
+          ? '二级告警'
+          : alarmGradeList.type == 3
+          ? '其它'
+          : ''
+      }}
     </div>
     <!-- 返回end -->
 
@@ -17,18 +27,18 @@
     >
       <el-table-column
         fixed
-        prop="happenTime"
+        prop="soeTime"
         label="发生时间"
         width=""
       ></el-table-column>
       <el-table-column
-        prop="alarmDes"
-        label="告警描述"
+        prop="measDesc"
+        label="测点描述"
         width=""
       ></el-table-column>
       <el-table-column
-        prop="deviceName"
-        label="设备"
+        prop="alarmName"
+        label="告警名称"
         width=""
       ></el-table-column>
       <el-table-column
@@ -38,7 +48,7 @@
       ></el-table-column>
       <el-table-column prop="check" label="详情" width="">
         <template #default="scope">
-          <span @click="addItem()">{{ scope.row.check }}</span>
+          <span @click="addItem(scope.row)">查看</span>
         </template>
       </el-table-column>
       <el-table-column prop="eddl" label="状态" width="">
@@ -46,14 +56,24 @@
           <span
             :style="{
               color:
-                scope.row.eddl == '已确认-admin'
+                scope.row.handlingStatus == 1
                   ? '#8DCF6E'
-                  : scope.row.eddl == '未确认'
+                  : scope.row.handlingStatus == 2
                   ? '#FF747B'
                   : '#5c88fa',
             }"
           >
-            {{ scope.row.eddl }}
+            {{
+              scope.row.handlingStatus == 0
+                ? '未处理'
+                : scope.row.handlingStatus == 1
+                ? '已处理'
+                : scope.row.handlingStatus == 2
+                ? '待确认'
+                : scope.row.handlingStatus == 3
+                ? '自动恢复'
+                : '过期失效'
+            }}
           </span>
         </template>
       </el-table-column>
@@ -65,19 +85,18 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :current-page="currentPage4"
-        :page-sizes="[100, 200, 300, 400]"
-        :page-size="100"
+        :current-page="currentPage"
+        :page-sizes="[15, 20, 25, 30]"
+        :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
-        :total="400"
+        :total="total"
       ></el-pagination>
     </div>
     <!-- 分页end -->
 
     <!--弹框组件开始-----------------------start-->
     <dialog-component
-      v-if="showDialog"
-      ref="dialogComponent"
+      :show_Dialog="showDialog"
       :dialog-title="dialogTitle"
       :item-info="tableItem"
       @closeDialog="closeDialog"
@@ -87,73 +106,55 @@
 </template>
 
 <script>
-import DialogComponent from './dialogComponent'
-export default {
-  name: 'AlarmTotal',
-  // computed: {
-  //   ...mapGetters(['name']),
-  // },
-  props: ['pageShow'],
-  components: { DialogComponent },
-  data() {
-    return {
-      showDialog: false,
+import dialogComponent from './dialogComponent'
+import { useStore } from 'vuex'
+import { defineComponent, onMounted, ref } from 'vue'
+import * as api from '@/api/alarmManage/index'
+import { ElMessage } from 'element-plus'
 
-      input: '请输入发生时间',
-      tableData: [
-        {
-          happenTime: '2021-09-14 14:23:21',
-          alarmDes: '【母线带电】SEO状态变为ON',
-          deviceName: '电压测试',
-          alarmType: '故障',
-          check: '查看',
-          eddl: '自动恢复',
-        },
-        {
-          happenTime: '2021-09-14 14:23:21',
-          alarmDes: '【母线带电】SEO状态变为ON',
-          deviceName: '小会议室测试151',
-          alarmType: '故障',
-          check: '查看',
-          eddl: '已确认-admin',
-        },
-        {
-          happenTime: '2021-09-14 14:23:21',
-          alarmDes: '【母线带电】SEO状态变为ON',
-          deviceName: '电压测试',
-          alarmType: 'spjcsdb1',
-          check: '查看',
-          eddl: '未确认',
-        },
-        {
-          happenTime: '2021-09-14 14:23:21',
-          alarmDes: '【母线带电】SEO状态变为ON',
-          deviceName: '小会议室测试151',
-          alarmType: '故障',
-          check: '查看',
-          eddl: '自动恢复',
-        },
-      ],
-    }
-  },
-  computed: {
-    alarmTit: function () {
-      return this.$route.query.type
-      // if(this.$route.query.id==1){
-      //   alert(1)
-      //   return '一级告警'
-      // }
-    },
+export default defineComponent({
+  name: 'AlarmTotal',
+  props: {
+    pageShow: Boolean,
+    alarmGradeList: Object,
   },
-  methods: {
+  components: { dialogComponent },
+  setup(props, { emit }) {
+    const store = useStore()
 
-    goBack() {
-      this.$emit('func')
-    },
+    const total = ref(0)
+    const pageSize = ref(15)
+    const currentPage = ref(1)
+    const tableData = ref([])
+    const showDialog = ref(false)
+
+    const dialogTitle = ref('')
+    const tableItem = ref([])
+
+    //查询
+    function listSelect() {
+      api
+        .alarmGradeList({
+          siteId: store.state.siteId,
+          startTime: props.alarmGradeList.startTime,
+          endTime: props.alarmGradeList.endTime,
+          size: pageSize.value,
+          current: currentPage.value,
+          type: props.alarmGradeList.type,
+        })
+        .then((requset) => {
+          if (requset.status === 'SUCCESS') {
+            total.value = requset.data.total
+            tableData.value = requset.data.records
+          } else {
+            ElMessage.error(requset.msg)
+          }
+        })
+    }
 
     // 查看操作
-    checkItem() {
-      this.tableItem = {
+    const checkItem = () => {
+      tableItem.value = {
         id: '',
         stationName: '',
         stationCode: '',
@@ -162,37 +163,19 @@ export default {
         done: '',
         guaZai: '',
       }
-      this.dialogTitle = '告警详情'
-      this.showDialog = true
-      this.$nextTick(() => {
-        this.$refs['dialogComponent'].showDialog = true
-      })
-    },
-
- 
-    // 表头样式设置
-    headClass() {
-      return 'background:#FAFAFA;'
-    },
+      dialogTitle.value = '告警详情'
+      showDialog.value = true
+    }
 
-    //自定义列样式
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      console.log(row, column, rowIndex)
-      if (columnIndex === 4) {
-        return `color:#1187FF;cursor:pointer`
-      } else {
-        return ''
-      }
-    },
     //查看
-    handleClick(row) {
+    const handleClick = (row) => {
       alert('查看对应站点（页面跳转）')
       console.log(row)
-    },
+    }
 
     // 添加操作
-    addItem() {
-      this.tableItem = {
+    const addItem = () => {
+      tableItem.value = {
         id: '',
         happenTime: '',
         alarmDes: '',
@@ -201,14 +184,71 @@ export default {
         done: '',
         guaZai: '',
       }
-      this.dialogTitle = '告警详情'
-      this.showDialog = true
-      this.$nextTick(() => {
-        this.$refs['dialogComponent'].showDialog = true
-      })
-    },
+      dialogTitle.value = '告警详情'
+      showDialog.value = true
+    }
+
+    onMounted(() => {
+      listSelect()
+    })
+
+    //关闭弹窗
+    const closeDialog = (flag) => {
+      showDialog.value = flag
+    }
+    //返回
+    const goBack = () => {
+      emit('func')
+    }
+    //条数
+    const handleSizeChange = (val) => {
+      pageSize.value = val
+      listSelect()
+    }
+    //页数
+    const handleCurrentChange = (val) => {
+      currentPage.value = val
+      listSelect()
+    }
+    //自定义列样式
+    const cellStyle = ({ row, column, rowIndex, columnIndex }) => {
+      row, column, rowIndex
+      // console.log(row, column, rowIndex)
+      if (columnIndex === 4) {
+        return `color:#1187FF;cursor:pointer`
+      } else {
+        return ''
+      }
+    }
+    // 表头样式设置
+    const headClass = () => {
+      return 'background:#FAFAFA;'
+    }
+    return {
+      handleSizeChange,
+      handleCurrentChange,
+      goBack,
+      checkItem,
+      headClass,
+      cellStyle,
+      handleClick,
+      addItem,
+      listSelect,
+      closeDialog,
+
+      showDialog,
+      input: '请输入发生时间',
+
+      total,
+      pageSize,
+      currentPage,
+      tableData,
+
+      dialogTitle,
+      tableItem,
+    }
   },
-}
+})
 </script>
 
 <style lang='scss' scoped>

src/views/alarmManage/dialogComponent.vue

@@ -1,228 +1,242 @@
 <template>
-  <transition name="dialog-fade">
-    <el-dialog
-      v-if="showDialog"
-      :title="dialogTitle"
-      class="dialog-component"
-      v-model="showDialog"
-      width="640px"
-      @close="closeDialog(0)"
+  <el-dialog
+    :title="dialogTitle"
+    v-model="showDialog"
+    width="640px"
+    @close="closeDialog()"
+  >
+    <el-form
+      ref="formInfo"
+      :model="form"
+      class="demo-form-inline alarmStatusDialog"
+      label-width="100px"
+      :rules="rules"
     >
-      <el-form
-        ref="formInfo"
-        :model="formInfo"
-        class="demo-form-inline alarmStatusDialog"
-        label-width="100px"
-        :rules="rules"
-      >
-        <div class="topInfo underline">
-          <el-form-item label="卡号：" prop="stationName">
-            2021-09-14 14:53:28
-          </el-form-item>
-          <el-form-item label="告警历时：" prop="stationCode">
-            3分钟
-          </el-form-item>
-          <el-form-item label="关联告警：" prop="stationAddress">
-            2021-09-14 14:54:59
-          </el-form-item>
-          <div class="deviceTit">【测试站点主线】设备低压 复归:</div>
-           <el-button type="success" class="lubo">故障录播</el-button>
-           <div class="handleStatus">未处理</div>
-        </div>
-
-        <div class="basicTit">基本信息</div>
-
-        <el-form-item label="站点名称：" prop="pointNum">
-          测试站点1
-        </el-form-item>
-        <el-form-item label="台区展示：" prop="deviceNum">
-          测试台区1
-        </el-form-item>
-        <el-form-item label="线路：" prop="deviceNum"> 进线二 </el-form-item>
-        <el-form-item label="告警信息：" prop="deviceNum"> 低压 </el-form-item>
-        <el-form-item label="告警状态：" prop="deviceNum"> 动作 </el-form-item>
-        <el-form-item label="采集终端：" prop="deviceNum">
-          DA00013433
-        </el-form-item>
-        <el-form-item label="站点地址：" prop="deviceNum">
-          沪太路8786弄155号
+      <div class="topInfo underline">
+        <el-form-item label="卡号：" prop="stationName">
+          2021-09-14 14:53:28
         </el-form-item>
-        <el-form-item label="联系人：" prop="deviceNum"> 张三 </el-form-item>
-        <el-form-item label="联系方式：" prop="deviceNum">
-          12345675223
+        <el-form-item label="告警历时：" prop="stationCode">3分钟</el-form-item>
+        <el-form-item label="关联告警：" prop="stationAddress">
+          2021-09-14 14:54:59
         </el-form-item>
+        <div class="deviceTit">【测试站点主线】设备低压 复归:</div>
+        <el-button type="success" class="lubo">故障录播</el-button>
+        <div class="handleStatus">未处理</div>
+      </div>
 
-        <div class="basicTit">处理信息</div>
+      <div class="basicTit">基本信息</div>
 
-        <el-form-item label="处理内容" prop="handleCont" style="margin-bottom:20px">
-          <el-input
-            v-model="textarea"
-            :rows="2"
-            type="textarea"
-            placeholder="Please input"
-          />
-        </el-form-item>
+      <el-form-item label="站点名称：" prop="pointNum">测试站点1</el-form-item>
+      <el-form-item label="台区展示：" prop="deviceNum">测试台区1</el-form-item>
+      <el-form-item label="线路：" prop="deviceNum">进线二</el-form-item>
+      <el-form-item label="告警信息：" prop="deviceNum">低压</el-form-item>
+      <el-form-item label="告警状态：" prop="deviceNum">动作</el-form-item>
+      <el-form-item label="采集终端：" prop="deviceNum">
+        DA00013433
+      </el-form-item>
+      <el-form-item label="站点地址：" prop="deviceNum">
+        沪太路8786弄155号
+      </el-form-item>
+      <el-form-item label="联系人：" prop="deviceNum">张三</el-form-item>
+      <el-form-item label="联系方式：" prop="deviceNum">
+        12345675223
+      </el-form-item>
+
+      <div class="basicTit">处理信息</div>
+
+      <el-form-item
+        label="处理内容"
+        prop="handleCont"
+        style="margin-bottom: 20px"
+      >
+        <el-input
+          v-model="textarea"
+          :rows="2"
+          type="textarea"
+          placeholder="Please input"
+        />
+      </el-form-item>
 
-        <el-form-item label="现场照片" prop="deviceNum">
-          <el-upload
-                  action="#"
-                  list-type="picture-card"
-                  :auto-upload="false"
-                  :limit="3"
-                >
-                <!-- slot="default" -->
-                  <i  class="el-icon-plus"></i>
-                  <!-- :default-slot="{ file }" -->
-                  <div  >
-                    <!-- <img
+      <el-form-item label="现场照片" prop="deviceNum">
+        <el-upload
+          action="#"
+          list-type="picture-card"
+          :auto-upload="false"
+          :limit="3"
+        >
+          <!-- slot="default" -->
+          <i class="el-icon-plus"></i>
+          <!-- :default-slot="{ file }" -->
+          <div>
+            <!-- <img
                       class="el-upload-list__item-thumbnail"
                       :src="file.url"
                       alt=""
                     /> -->
-                    <span class="el-upload-list__item-actions">
-                      <span
-                        class="el-upload-list__item-preview"
-                        @click="handlePictureCardPreview(file)"
-                      >
-                        <!-- <i class="el-icon-zoom-in"></i> -->
-                      </span>
-                      <span
-                        v-if="!disabled"
-                        class="el-upload-list__item-delete"
-                        @click="handleRemove(file)"
-                      >
-                        <i class="el-icon-delete"></i>
-                      </span>
-                    </span>
-                  </div>
-                </el-upload>
-                <el-dialog v-model="dialogVisible">
-                  <img width="100%" :src="dialogImageUrl" alt="" />
-                </el-dialog>
-        </el-form-item>
-        <br />
-        <br />
-        <br />
-        <div style="text-align: right">
-          <el-button @click="closeDialog(0)">取消</el-button>
-          <el-button type="primary" @click="submitForm('formInfo')"
-            >确定</el-button
-          >
-        </div>
-      </el-form>
-    </el-dialog>
-  </transition>
+            <span class="el-upload-list__item-actions">
+              <span
+                class="el-upload-list__item-preview"
+                @click="handlePictureCardPreview(file)"
+              >
+                <!-- <i class="el-icon-zoom-in"></i> -->
+              </span>
+              <span
+                v-if="!disabled"
+                class="el-upload-list__item-delete"
+                @click="handleRemove(file)"
+              >
+                <i class="el-icon-delete"></i>
+              </span>
+            </span>
+          </div>
+        </el-upload>
+        <el-dialog v-model="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="" />
+        </el-dialog>
+      </el-form-item>
+      <br />
+      <br />
+      <br />
+      <div style="text-align: right">
+        <el-button @click="closeDialog()">取消</el-button>
+        <el-button type="primary" @click="submitForm()">确定</el-button>
+      </div>
+    </el-form>
+  </el-dialog>
 </template>
 
 <script>
-export default {
-  name: "DialogComponent",
+// import { useStore } from 'vuex'
+import { defineComponent, ref, watchEffect } from 'vue'
+// import * as api from '@/api/alarmManage/index'
+import { ElMessage } from 'element-plus'
+
+export default defineComponent({
+  name: 'DialogComponent',
+  emits: ['closeDialog'],
   props: {
+    show_Dialog: Boolean,
     dialogTitle: {
       type: String,
-      default: "告警详情",
+      default: '告警详情',
     },
     itemInfo: {
       type: Object,
       default: function () {
-        return {};
+        return {}
       },
     },
   },
-  data() {
+  setup(props, { emit }) {
+    const showDialog = ref(false)
+    const formInfo = ref(null)
+    const form = JSON.parse(JSON.stringify(props.itemInfo))
+    const dialogVisible = ref(false)
+
+    const handleRemove = (file) => {
+      console.log(file)
+    }
+    const handlePictureCardPreview = (file) => {
+      this.dialogImageUrl = file.url
+      dialogVisible.value = true
+    }
+
+    const resetForm = () => {
+      formInfo.value.resetFields()
+    }
+
+    const roleValid = (rule, value, callback) => {
+      if (value.length === 0) {
+        callback(new Error('角色不能为空'))
+      } else {
+        callback()
+      }
+    }
+
+    // onSelectedDrug(event) {
+    //   this.siteList = event;
+    //   console.log(this.siteList);
+    // },
+    // 保存操作
+    const submitForm = () => {
+      const params = Object.assign(form.value, {})
+      console.log(params)
+      formInfo.value.validate((valid) => {
+        if (valid) {
+          // 走保存请求
+          ElMessage({
+            message: '操作成功！',
+            type: 'success',
+          })
+          closeDialog()
+        } else {
+          return false
+        }
+      })
+    }
+
+    // 关闭弹框
+    const closeDialog = (flag) => {
+      showDialog.value = false
+      emit('closeDialog', flag)
+    }
+
+    watchEffect((fn, options) => {
+      fn, options
+      showDialog.value = props.show_Dialog
+    })
+
     return {
-       disabled: false,
-      textarea: "请输入",
-      showDialog: false,
-      formInfo: JSON.parse(JSON.stringify(this.itemInfo)),
+      handleRemove,
+      handlePictureCardPreview,
+      resetForm,
+      roleValid,
+      submitForm,
+      closeDialog,
+
+      disabled: false,
+      dialogVisible,
+      textarea: '请输入',
+      showDialog,
+      form,
+      formInfo,
       options: [
         {
-          value: "选项1",
-          label: "站点一",
+          value: '选项1',
+          label: '站点一',
         },
         {
-          value: "选项2",
-          label: "站点二",
+          value: '选项2',
+          label: '站点二',
         },
         {
-          value: "选项3",
-          label: "站点三",
+          value: '选项3',
+          label: '站点三',
         },
         {
-          value: "选项4",
-          label: "站点四",
+          value: '选项4',
+          label: '站点四',
         },
         {
-          value: "选项5",
-          label: "站点五",
+          value: '选项5',
+          label: '站点五',
         },
       ],
 
       rules: {
-      
         handleCont: [
-          { required: true, message: "请输入处理内容", trigger: "blur" },
-          { trigger: "blur" },
+          { required: true, message: '请输入处理内容', trigger: 'blur' },
+          { trigger: 'blur' },
         ],
         unloadImg: [
-          { required: true, message: "请上传图片", trigger: "blur" },
-          { trigger: "blur" },
+          { required: true, message: '请上传图片', trigger: 'blur' },
+          { trigger: 'blur' },
         ],
       },
-    };
-  },
-  methods: {
-
-     handleRemove(file) {
-      console.log(file);
-    },
-    handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url;
-      this.dialogVisible = true;
-    },
-
-    resetForm(formName) {
-      this.$refs[formName].resetFields();
-    },
-
-
-    roleValid(rule, value, callback) {
-      if (value.length === 0) {
-        callback(new Error("角色不能为空"));
-      } else {
-        callback();
-      }
-    },
-
-    // onSelectedDrug(event) {
-    //   this.siteList = event;
-    //   console.log(this.siteList);
-    // },
-    // 保存操作
-    submitForm(formName) {
-      const params = Object.assign(this.formInfo, {});
-      console.log(params)
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          // 走保存请求
-          this.$message({
-            message: "操作成功！",
-            type: "success",
-          });
-          this.closeDialog(1);
-        } else {
-          return false;
-        }
-      });
-    },
-    // 关闭弹框
-    closeDialog(flag) {
-      this.$refs["formInfo"].resetFields();
-      this.showDialog = false;
-      this.$emit("closeDialog", flag);
-    },
+    }
   },
-};
+})
 </script>
  
 <style scoped lang="scss">

src/views/alarmManage/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container alarmingManage" v-if="this.pageShow">
+  <div class="app-container alarmingManage" v-if="pageShow">
     <!-- 筛选start -->
     <div class="filter-container mb-10">
       <div class="left">
@@ -29,6 +29,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               style="width: auto"
+              @change="listSelect()"
             ></el-date-picker>
           </div>
           <el-button class="search-button">重置</el-button>
@@ -63,7 +64,7 @@
               width:
                 (scope.row.totalGrade / allMaxData.totalNumMax) * 100 + '%',
             }"
-            @click="goAlarmTotal"
+            @click="goAlarmTotal(0)"
           >
             {{ scope.row.totalGrade }}
           </span>
@@ -78,7 +79,7 @@
               width:
                 (scope.row.oneGrade / allMaxData.oneAlarmingMax) * 100 + '%',
             }"
-            @click="goAlarmTotal"
+            @click="goAlarmTotal(1)"
           >
             {{ scope.row.oneGrade }}
           </span>
@@ -93,7 +94,7 @@
               width:
                 (scope.row.twoGrade / allMaxData.twoAlarmingMax) * 100 + '%',
             }"
-            @click="goAlarmTotal"
+            @click="goAlarmTotal(2)"
           >
             {{ scope.row.twoGrade }}
           </span>
@@ -108,7 +109,7 @@
             :style="{
               width: (scope.row.otherGrade / allMaxData.otherMax) * 100 + '%',
             }"
-            @click="goAlarmTotal"
+            @click="goAlarmTotal(3)"
           >
             {{ scope.row.otherGrade }}
           </span>
@@ -135,7 +136,12 @@
     <!-- {{ totalNumMax }}
       {{ oneAlarmingMax }} -->
   </div>
-  <alarm-total v-else :pageShow="pageShow" @func="getMsgFormSon"></alarm-total>
+  <alarm-total
+    v-else
+    :pageShow="pageShow"
+    @func="goAlarmTotal"
+    :alarmGradeList="alarmGradeList"
+  ></alarm-total>
 </template>
 
 <script>
@@ -153,27 +159,27 @@ export default defineComponent({
     const router = useRouter()
 
     const pageShow = ref(true)
-    const dateValue = ref([
-      new Date(2021, 10, 10, 10, 10),
-      new Date(2021, 10, 11, 10, 10),
-    ])
+    const alarmGradeList = ref({})
+    const dateValue = ref([new Date(2020, 10, 10, 10, 10), new Date()])
 
-    const total = ref(400)
+    const total = ref(0)
     const pageSize = ref(15)
     const currentPage = ref(1)
     const tableData = ref([])
 
     //查询
     function listSelect() {
+      store.commit('TimeAll_function', dateValue.value)
       api
         .alarmGradeCount({
+          startTime: store.state.Time_Data[0],
+          endTime: store.state.Time_Data[1],
           siteId: store.state.siteId,
           size: pageSize.value,
           current: currentPage.value,
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            console.log(requset.data.records)
             total.value = requset.data.total
             tableData.value = requset.data.records
           } else {
@@ -188,14 +194,6 @@ export default defineComponent({
       console.log(row)
     }
 
-    const handleSizeChange = (val) => {
-      console.log(`每页 ${val} 条`)
-    }
-
-    const handleCurrentChange = (val) => {
-      console.log(`当前页: ${val}`)
-    }
-
     const goVariableList = () => {
       // 跳转至订单列表页面传参
       router.push({
@@ -204,17 +202,33 @@ export default defineComponent({
       // this.$router.push({ name:'variableList'})
     }
 
-    const getMsgFormSon = () => {
-      pageShow.value = !pageShow.value
-    }
-    const goAlarmTotal = () => {
+    const goAlarmTotal = (val) => {
       pageShow.value = !pageShow.value
+      store.commit('TimeAll_function', dateValue.value)
+      if (val != undefined) {
+        alarmGradeList.value = {
+          startTime: store.state.Time_Data[0],
+          endTime: store.state.Time_Data[1],
+          type: val,
+        }
+      }
     }
 
     onMounted(() => {
       listSelect()
     })
 
+    //条数
+    const handleSizeChange = (val) => {
+      pageSize.value = val
+      listSelect()
+    }
+    //页数
+    const handleCurrentChange = (val) => {
+      currentPage.value = val
+      listSelect()
+    }
+
     const allMaxData = computed(() => {
       var allMaxData = {}
 
@@ -263,7 +277,6 @@ export default defineComponent({
       cellStyle,
       handleClick,
       goAlarmTotal,
-      getMsgFormSon,
       listSelect,
 
       store,
@@ -274,6 +287,7 @@ export default defineComponent({
       pageSize,
       currentPage,
       tableData,
+      alarmGradeList,
 
       showDialog: false,
       tabPosition: 'one',

src/views/powerQuality/harmonicReport/index.vue

@@ -76,7 +76,9 @@
             </el-button> -->
           </div>
 
-          <el-button type="primary" class="search-button">搜索</el-button>
+          <el-button type="primary" class="search-button" @click="listSelect()">
+            搜索
+          </el-button>
         </div>
       </div>
     </div>
@@ -175,14 +177,14 @@ export default defineComponent({
         list = {
           deviceCode: deviceCode.value,
           startTime: store.state.dateList + ' ' + '00:00:00',
-          endTime: store.state.dateList + ' ' + '24:00:00',
+          endTime: store.state.dateList + ' ' + '23:59:59',
         }
       } else {
         store.commit('getCurrentMonthLast', dateTime.value)
         list = {
           deviceCode: deviceCode.value,
-          startTime: store.state.monthList[0],
-          endTime: store.state.monthList[1],
+          startTime: store.state.monthList[0] + ' ' + '00:00:00',
+          endTime: store.state.monthList[1] + ' ' + '23:59:59',
         }
       }