人工督查单查询+处理对接

src/api/business/zhxf/fireInspect/index.js

@@ -1,7 +1,7 @@
 import { request } from "@/utils/request";
 
 /**
- * @查询
+ * @电子督察单查询
  */
 export function eleInspectList(param) {
   return request({
@@ -12,9 +12,20 @@ export function eleInspectList(param) {
 }
 
 /**
- * @未处理-提交
+ * @人工督察单查询
  */
-export function dealPut(param) {
+export function persInspectList(param) {
+  return request({
+    url: "/service-fire/dataJinganPerson/personList",
+    method: "GET",
+    data: param,
+  });
+}
+
+/**
+ * @电子督查单未处理-提交
+ */
+export function dealPutEle(param) {
   return request({
       url: "/service-fire/dataJinganAnalysis",
       method: "PUT",
@@ -22,3 +33,15 @@ export function dealPut(param) {
   });
 }
 
+/**
+ * @人工督查单未处理-提交
+ */
+export function dealPutPer(param) {
+  return request({
+      url: "/service-fire/dataJinganPerson",
+      method: "PUT",
+      data: param,
+  });
+}
+
+

src/pages/business/zhxf/fireInspect/inspectDetails/index.vue

@@ -5,7 +5,7 @@
         <image style="width: 40px; height: 40px; margin: auto 15px auto 0" :src="dataArray.typeImg ? dataArray.typeImg : '/static/images/404.png'" mode="aspectFill"></image>
 
         <view style="margin: auto auto auto 0">
-          <view style="font-size: 15px">  {{ dataArray.timestamp ? dataArray.timestamp.replace("T", " ") : "" }} </view>
+          <view style="font-size: 15px"> {{ dataArray.timestamp ? dataArray.timestamp.replace("T", " ") : "" }} </view>
         </view>
 
         <view style="margin: auto 0 auto 0">
@@ -47,7 +47,14 @@
             ></u-radio>
           </u-radio-group>
 
-          <u--textarea v-model="dataArray.handleContent" placeholder="备注信息，最多可输入50个字" :count="true" maxlength="50" style="margin: 0 0 15px 0" :disabled="dataArray.handleStatus == 1"></u--textarea>
+          <u--textarea
+            v-model="dataArray.handleContent"
+            placeholder="备注信息，最多可输入50个字"
+            :count="true"
+            maxlength="50"
+            style="margin: 0 0 15px 0"
+            :disabled="dataArray.handleStatus == 1"
+          ></u--textarea>
         </view>
 
         <view class="flex" v-if="dataArray.handleStatus != 1">
@@ -62,17 +69,6 @@
             }"
             @click="handleSubmit(1)"
           ></u-button>
-          <!-- <u-button
-            type="primary"
-            text="非误报"
-            shape="circle"
-            :customStyle="{
-              width: '80px',
-              height: '30px',
-              marginLeft: '15px',
-            }"
-            @click="handleSubmit(0)"
-          ></u-button> -->
         </view>
       </view>
     </view>
@@ -85,8 +81,7 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue
 import { useStores, commonStores } from "@/store/modules/index";
 
 import { baseAlarmList, baseAlarm } from "@/api/business/fireIot/alarmManage.js";
-import { eleInspectList,dealPut } from "@/api/business/zhxf/fireInspect/index.js";
-
+import { eleInspectList, dealPutEle, persInspectList, dealPutPer } from "@/api/business/zhxf/fireInspect/index.js";
 
 const { proxy } = getCurrentInstance();
 
@@ -105,7 +100,7 @@ const dataList = ref([
 const deviceName = ref("");
 const alarmTime = ref("");
 const id = ref("");
-const productName=ref('');
+const productName = ref("");
 const pageSize = ref(20);
 const current = ref(1);
 const total = ref(0);
@@ -135,71 +130,66 @@ function init() {
  * @api接口查询
  */
 function selectListApi() {
-  if(productName.value='电子督察单'){
-     eleInspectList({
-        id: id.value,
-        startTime: alarmTime.value,
-        endTime: alarmTime.value,
-        pageNum: current.value,
-        pageSize: pageSize.value,
-      }).then((requset) => {
-        if (requset.status === "SUCCESS") {
-          console.log( requset.data)
-          dataArray.value = requset.data.records[0];
-          dataList.value[0].value = requset.data.records[0].superviseCode;
-          dataList.value[1].value = requset.data.records[0].content;
-          // dataList.value[2].value = requset.data.records[0].alarmGrade + "级";
-          // dataList.value[3].value = requset.data.records[0].alarmContent;
-          // dataList.value[4].value = requset.data.records[0].alarmTime;
-          total.value = requset.data.total;
-        }
-      });
-
+  if (productName.value == "电子督察单") {
+    eleInspectList({
+      id: id.value,
+      startTime: alarmTime.value,
+      endTime: alarmTime.value,
+      pageNum: current.value,
+      pageSize: pageSize.value,
+    }).then((requset) => {
+      if (requset.status === "SUCCESS") {
+        console.log(requset.data);
+        dataArray.value = requset.data.records[0];
+        dataList.value[0].value = requset.data.records[0].superviseCode;
+        dataList.value[1].value = requset.data.records[0].content;
+        total.value = requset.data.total;
+      }
+    });
   }else{
-
-    baseAlarmList({
-    deviceName: deviceName.value,
-    startTime: alarmTime.value,
-    endTime: alarmTime.value,
-    current: current.value,
-    size: pageSize.value,
-  }).then((requset) => {
-    if (requset.status === "SUCCESS") {
-      dataArray.value = requset.data.records[0];
-      dataList.value[0].value = requset.data.records[0].deviceName;
-      dataList.value[1].value = requset.data.records[0].alarmAddress;
-      dataList.value[2].value = requset.data.records[0].alarmGrade + "级";
-      dataList.value[3].value = requset.data.records[0].alarmContent;
-      dataList.value[4].value = requset.data.records[0].alarmTime;
-      total.value = requset.data.total;
-    }
-  });
-
+    persInspectList({
+      id: id.value,
+      startTime: alarmTime.value,
+      endTime: alarmTime.value,
+      pageNum: current.value,
+      pageSize: pageSize.value,
+    }).then((requset) => {
+      if (requset.status === "SUCCESS") {
+        console.log(requset.data);
+        dataArray.value = requset.data.records[0];
+        dataList.value[0].value = requset.data.records[0].superviseCode;
+        dataList.value[1].value = requset.data.records[0].content;
+        total.value = requset.data.total;
+      }
+    });
   }
-  
-
-
- 
-
-
 }
 
 /**
  * @提交
  */
-function handleSubmit(alarmFalse) {
-  dealPut({
-    id: dataArray.value.id,
-    // deviceId: dataArray.value.deviceId,
-    // alarmType: dataArray.value.alarmType,
-    handleContent: dataArray.value.handleContent,
-    // alarmFalse: alarmFalse,
-    // handleRange: handleRange.value,
-  }).then((requset) => {
-    if (requset.status === "SUCCESS") {
-      proxy.$tab.navigateTo(`/pages/common/success/index?codeName=提交成功`);
-    }
-  });
+function handleSubmit() {
+  if (productName.value == "电子督察单") {
+    dealPutEle({
+      id: dataArray.value.id,
+      handleContent: dataArray.value.handleContent,
+      handleRange: handleRange.value,
+    }).then((requset) => {
+      if (requset.status === "SUCCESS") {
+        proxy.$tab.navigateTo(`/pages/common/success/index?codeName=提交成功`);
+      }
+    });
+  } else {
+    dealPutPer({
+      id: dataArray.value.id,
+      handleContent: dataArray.value.handleContent,
+      handleRange: handleRange.value,
+    }).then((requset) => {
+      if (requset.status === "SUCCESS") {
+        proxy.$tab.navigateTo(`/pages/common/success/index?codeName=提交成功`);
+      }
+    });
+  }
 }
 
 onReady(() => {});
@@ -223,7 +213,6 @@ onLoad((options) => {
   if ("productName" in options) {
     productName.value = options.productName;
   }
-
   init();
 });
 </script>

src/pages/business/zhxf/fireInspect/inspectDetailsList/index.vue

@@ -1,73 +1,45 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-tabs :list="tabsList" :current="tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }"
-      :inactiveStyle="{ color: '#909399' }" :scrollable="false"></u-tabs>
+    <u-tabs :list="tabsList" :current="tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }" :scrollable="false"></u-tabs>
   </u-sticky>
 
-  <oa-scroll customClass="scroll-height" :pageSize="pageSize" :total="total" :refresherLoad="true"
-    :refresherEnabled="true" :refresherDefaultStyle="'none'" :refresherThreshold="44" :lowerThreshold="44"
-    :refresherBackground="'#f5f6f7'" @load="load" @refresh="refresh"
-    :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
-    <!-- <template #default>
-      <view class="alarmDetailsList-container">
-        <view class="menu-list margin-0">
-          <view class="list-cell list-cell-arrow" v-for="(base, index) in dataList" :key="index" @click="handleToDetails(base)">
-
-            <view class="menu-item" style="font-size: 13px; flex-flow: row wrap">
-              <view style="min-width: 80%; margin-bottom: 5px; color: #909399"> {{ base.alarmTime }}</view>
-              <view style="min-width: 20%; margin-bottom: 5px; color: #909399; text-align: right; padding-right: 15px"> {{ base.alarmGrade }}级</view>
-              <view style="min-width: 80%; margin-bottom: 5px; color: #909399">{{ base.deviceName }}</view>
-              <view style="min-width: 20%; margin-bottom: 5px; text-align: right; padding-right: 15px" :style="`color:${base.handleStatus == 1 ? '#16bf00' : 'red'}`">
-                {{ base.handleStatus == 1 ? "已处理" : "未处理" }}
-              </view>
-              <view style="min-width: 50%; padding-right: 15px">{{ base.alarmContent }}</view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </template> -->
-
-
+  <oa-scroll
+    customClass="scroll-height"
+    :pageSize="pageSize"
+    :total="total"
+    :refresherLoad="true"
+    :refresherEnabled="true"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :lowerThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    @load="load"
+    @refresh="refresh"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
     <template #default>
       <view class="menu-list m0">
-        <view class="list-cell list-cell-arrow" style=" line-height: 25px" v-for="(base, index) in dataList"
-          :key="index" @click="handleToDetails(base)">
+        <view class="list-cell list-cell-arrow" style="line-height: 25px" v-for="(base, index) in dataList" :key="index" @click="handleToDetails(base)">
           <view class="menu-item">
-            <image class="image-bg"
+            <image
+              class="image-bg"
               style="width: 80rpx; height: 80rpx; margin: auto 10px auto 0"
-              :src="base.handleStatus == 1 ? '/static/images/fireInspect/processed-icon.png' : '/static/images/fireInspect/process-icon.png'">
+              :src="base.handleStatus == 1 ? '/static/images/fireInspect/processed-icon.png' : '/static/images/fireInspect/process-icon.png'"
+            >
             </image>
-            <view
-              style="width: calc(100% - 51px); display: flex; justify-content: space-between;align-items: center; padding-right: 10px">
-              <view class="deviceHeader" v-if="productName=='人工督察单'">
-                <view class="deviceName text-ellipsis">{{ base.productCode }}</view>
-                <view class="deviceName text-ellipsis"> {{ base.alarmAddress }}</view>
-                <view class="deviceName text-ellipsis">{{ base.alarmTime }}</view>
-              </view>
-
-
-              <view class="deviceHeader" v-else>
+            <view style="width: calc(100% - 51px); display: flex; justify-content: space-between; align-items: center; padding-right: 10px">
+              <view class="deviceHeader">
                 <view class="deviceName text-ellipsis">{{ base.superviseCode }}</view>
                 <view class="deviceName text-ellipsis"> {{ base.content }}</view>
-                <view class="deviceName text-ellipsis">{{ base.timestamp?base.timestamp.replace("T", " "):'' }}</view>
+                <view class="deviceName text-ellipsis">{{ base.timestamp ? base.timestamp.replace("T", " ") : "" }}</view>
               </view>
-
-
-              <view class="" v-if="base.handleStatus == 1" style="color: #16bf00;margin-right:10px"> 已处理 </view>
-              <view class="" v-if="base.handleStatus == 0" style="color: red;margin-right:10px"> 未处理 </view>
-            </view>
-
-            <view>
-
+              <view class="" v-if="base.handleStatus == 1" style="color: #16bf00; margin-right: 10px"> 已处理 </view>
+              <view class="" v-if="base.handleStatus == 0" style="color: red; margin-right: 10px"> 未处理 </view>
             </view>
           </view>
         </view>
       </view>
     </template>
-
-
-
-
   </oa-scroll>
 </template>
 
@@ -76,7 +48,7 @@ import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, on
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 import { useStores, commonStores } from "@/store/modules/index";
 
-import { eleInspectList } from "@/api/business/zhxf/fireInspect/index.js";
+import { eleInspectList, persInspectList } from "@/api/business/zhxf/fireInspect/index.js";
 import { baseAlarmList } from "@/api/business/fireIot/alarmManage.js";
 
 const { proxy } = getCurrentInstance();
@@ -97,7 +69,6 @@ const tabsList = ref([
   },
 ]);
 const tabsCurrent = ref(0);
-
 const dataList = ref([]);
 const productCode = ref("");
 const productName = ref("");
@@ -117,61 +88,43 @@ function init() {
  * @api接口查询
  */
 function selectListApi() {
-  if(productName.value=='电子督察单'){
-      eleInspectList({
-        // productCode: productCode.value,
-        handleStatus: tabsList.value[tabsCurrent.value].value,
-        pageNum: current.value,
-        pageSize: pageSize.value,
-      }).then((requset) => {
-        if (requset.status === "SUCCESS") {
-          dataList.value = requset.data.records;
-          total.value = requset.data.total;
-
-          uni.setNavigationBarTitle({
-            title: `${productName.value}（${total.value}）`,
-          });
-        }
-      });
-
-
-  }else{
-
-      baseAlarmList({
-        productCode: productCode.value,
-        handleStatus: tabsList.value[tabsCurrent.value].value,
-        current: current.value,
-        size: pageSize.value,
-      }).then((requset) => {
-        if (requset.status === "SUCCESS") {
+  if (productName.value == "电子督察单") {
+    eleInspectList({
+      handleStatus: tabsList.value[tabsCurrent.value].value,
+      pageNum: current.value,
+      pageSize: pageSize.value,
+    }).then((requset) => {
+      if (requset.status === "SUCCESS") {
         dataList.value = requset.data.records;
         total.value = requset.data.total;
         uni.setNavigationBarTitle({
-        title: `${productName.value}（${total.value}）`,
+          title: `${productName.value}（${total.value}）`,
         });
       }
-});
-
-
-
-
+    });
+  } else {
+    persInspectList({
+      handleStatus: tabsList.value[tabsCurrent.value].value,
+      pageNum: current.value,
+      pageSize: pageSize.value,
+    }).then((requset) => {
+      if (requset.status === "SUCCESS") {
+        dataList.value = requset.data.records;
+        total.value = requset.data.total;
+        uni.setNavigationBarTitle({
+          title: `${productName.value}（${total.value}）`,
+        });
+      }
+    });
   }
-  
 }
 
 /**
  * @跳转详情事件
  */
 function handleToDetails(e) {
-  console.log(e)
-  if(productName.value=='电子督察单'){
-    proxy.$tab.navigateTo(`/pages/business/zhxf/fireInspect/inspectDetails/index?id=${e.id}&productName=${productName.value}`);
-
-  }else{
-  // proxy.$tab.navigateTo(`/pages/business/zhxf/fireInspect/inspectDetails/index?deviceName=${e.deviceName}&alarmTime=${e.alarmTime}&productName=${productName.value}`);
-
-  }
-
+  console.log(e);
+  proxy.$tab.navigateTo(`/pages/business/zhxf/fireInspect/inspectDetails/index?id=${e.id}&productName=${productName.value}`);
 }
 
 /**
@@ -199,7 +152,7 @@ function tabsClick(e) {
   init();
 }
 
-onReady(() => { });
+onReady(() => {});
 
 onShow(() => {
   init();
@@ -210,7 +163,7 @@ onShow(() => {
 onLoad((options) => {
   if ("productName" in options) {
     productName.value = options.productName;
-      }
+  }
   if ("productCode" in options) {
     productCode.value = options.productCode;
     init();
@@ -219,5 +172,6 @@ onLoad((options) => {
 </script>
 
 <style lang="scss" scoped>
-.alarmDetailsList-container {}
+.alarmDetailsList-container {
+}
 </style>