7.31.3

src/views/AlarmPage/AlarmInfoPage.vue

@@ -108,7 +108,7 @@ function sortMethod({ order, prop }){
             direction = 'DESC'
           }
           if(i === "name"){
-            sortname = "name";
+            sortname = "UnitName";
           }else if(i === "alarmDate"){
             sortname = "alarmDate";
           }
@@ -305,6 +305,7 @@ function gettransfer() {
   }
   http.post("/api/alarm/" + type.value, AlarmInfo).then((result) => {
     console.log(result.data);
+    console.log(AlarmInfo);
     if(result.data !== null){
       tableData.value = result.data.dataInfoList;
       total.value = result.data.rowCount;

src/views/PatrolPage/HisPatrolPage.vue

@@ -3,21 +3,21 @@
     <el-card class="card-contianer">
       <div class="div-header">
         <el-form-item label="设备：">
-          <el-cascader :options="options" v-model="AlarmInfo.Id" :props="props" collapse-tags clearable :show-all-levels="false"
+          <el-cascader :options="options" v-model="PatrolInfo.Id" :props="props" collapse-tags clearable :show-all-levels="false"
           placeholder="请选择" style="min-width: 210px;" />
         </el-form-item>
-        <!-- <el-form-item label="开始时间：">
+        <el-form-item label="开始时间：">
           <el-config-provider :locale="zhCn">
-            <el-date-picker v-model="AlarmInfo.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择开始时间" style="min-width: 180px;" />  日期时间格式 2024-01-01 00:00:00
+            <el-date-picker v-model="PatrolInfo.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择开始时间" style="min-width: 180px;" /> <!--  日期时间格式 2024-01-01 00:00:00-->
           </el-config-provider>
         </el-form-item>
         <el-form-item label="结束时间：">
           <el-config-provider :locale="zhCn">
-            <el-date-picker v-model="AlarmInfo.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+            <el-date-picker v-model="PatrolInfo.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
               placeholder="选择结束时间" style="min-width: 180px;" />
           </el-config-provider> 
-        </el-form-item>-->
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getdata" style="min-width: 70px;">查询</el-button>
         </el-form-item>
@@ -95,10 +95,10 @@
             } else if (sortField[i] == 'descending') {
               direction = 'DESC'
             }
-            if(i === "name"){
-              sortname = "name";
-            }else if(i === "alarmDate"){
-              sortname = "alarmDate";
+            if(i === "transferName"){
+              sortname = "UnitName";
+            }else if(i === "patrolTime"){
+              sortname = "PatrolTime";
             }
             // console.log(sortname)
             if(sortnames===""){
@@ -106,7 +106,7 @@
             }else{
               sortnames = sortnames + "," + sortname + " " + direction;
             }
-            AlarmInfo.sort = sortnames;
+            PatrolInfo.sort = sortnames;
           }
           getdata() //调用后端查询接口
   }
@@ -149,8 +149,10 @@
     sessionStorage.setItem("DeviceQueryEnd", endTime);
   }
   
-  const AlarmInfo = reactive({
+  const PatrolInfo = reactive({
     "Id": [],
+    "startTime": startTime,
+    "endTime": endTime,
     "start": 0,
     "count": 30,
     "sort": ""
@@ -159,8 +161,8 @@
   getSupplys();
   getdata();
   function getdata() {
-    // sessionStorage.setItem("DeviceQueryStart", AlarmInfo.startTime);
-    // sessionStorage.setItem("DeviceQueryEnd", AlarmInfo.endTime);
+    sessionStorage.setItem("DeviceQueryStart", PatrolInfo.startTime);
+    sessionStorage.setItem("DeviceQueryEnd", PatrolInfo.endTime);
     gettransfer();
   }
   
@@ -169,7 +171,7 @@
     loading.value = true;
     tableData.value.length = 0;
     options.length = 0;
-    AlarmInfo.Id.length = 0;
+    PatrolInfo.Id.length = 0;
     var result = store.getters.getEnterprise();
     if (result) {
       result.forEach(element=>{
@@ -198,26 +200,26 @@
         }
       });
     }
-    AlarmInfo.Id.push(options[0].children[0].children[0].value);
+    PatrolInfo.Id.push(options[0].children[0].children[0].value);
   }
   //获取数据列表
   function gettransfer() {
     loading.value = true;
     if (currentPage.value == 1) {
-      AlarmInfo.start = 0;
-      AlarmInfo.count = pageSize.value;
+      PatrolInfo.start = 0;
+      PatrolInfo.count = pageSize.value;
     } else {
-      AlarmInfo.start = ((currentPage.value - 1) * pageSize.value) + 1;
-      AlarmInfo.count = pageSize.value - 1;
+      PatrolInfo.start = ((currentPage.value - 1) * pageSize.value) + 1;
+      PatrolInfo.count = pageSize.value - 1;
     }
-    http.post("/api/patrol/GetPatrolHisData", AlarmInfo).then((result) => {
+    http.post("/api/patrol/GetPatrolHisData", PatrolInfo).then((result) => {
       console.log(result.data);
-      console.log(AlarmInfo);
+      console.log(PatrolInfo);
       if(result.data !== null){
         tableData.value = result.data.dataInfoList;
         total.value = result.data.rowCount;
       }
-      if(result.data === null || AlarmInfo.Id.length < 1){
+      if(result.data === null || PatrolInfo.Id.length < 1){
         tableData.value = null;
         total.value = 0;
       }