巡检任务操作中添加事件上报

src/pages/business/common/projectMange/record/details.vue

@@ -2,7 +2,7 @@
   <u-navbar  :titleStyle="{ color: '#000' }" :autoBack="true" title="日报详情" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
     <template #left>
       <view class="u-navbar__content__left__item">
-        <u-icon name="arrow-left" size="20" color="#000"></u-icon>
+        <u-icon name="arrow-left" size="20" color="#000" @click="returnTo('business/common/projectMange/record/index')"></u-icon>
       </view>
     </template>
   </u-navbar>
@@ -153,7 +153,19 @@ const state = reactive({
 });
 
 const { dataList, userData, tabsList, tabsCurrent, pageSize, total } = toRefs(state);
-
+  /**
+ * 返回上级页面
+ * @param defaultPage 默认页面
+ */
+ function returnTo(defaultPage) {
+    if(getCurrentPages().length > 1){
+      uni.navigateBack()
+    }else{
+      uni.redirectTo({
+        url: `/pages/${defaultPage}`
+      })
+    }
+  }
 /**
  * @tabs点击事件
  */

src/pages/business/common/projectMange/statistics/dailyReport.vue

@@ -232,7 +232,7 @@
     if(getCurrentPages().length > 1){
       uni.navigateBack()
     }else{
-      uni.switchTab({
+      uni.redirectTo({
         url: `/pages/${defaultPage}`
       })
     }

src/pages/business/zhaf/xunJian/plan/components/content.vue

@@ -103,6 +103,7 @@ import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
 import { updatePlan } from "@/api/business/zhaf/xunJian/plan.js";
+import { errorApi } from "@/api/business/zhaf/xunJian/index.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
@@ -207,6 +208,20 @@ async function buttonClick(type) {
           title.value = "消息";
           content.value = "提交成功，确定后返回！";
           show.value = true;
+          errorApi()
+            .Insert(
+              {
+                "eventName": "巡检事件",
+                "eventType": 9,
+                "eventLevel": 1,
+                "eventCategory": 9,
+                "deviceId": proxy.$settingStore.deviceList.deviceId,
+                "planId": xunJianStore.planId
+              }
+            )
+            .catch((err) => {
+              proxy.$modal.msg(err);
+            });
         }
       })
       .catch((err) => {

src/pages/business/zhaf/xunJian/plan/components/report.vue

@@ -5,6 +5,11 @@
         <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
       </view>
     </template>
+    <template #right>
+      <view class="u-navbar__content__right__item font12">
+        <span @click="endInspection">结束巡检</span>
+      </view>
+    </template>
   </u-navbar>
 
   <oa-scroll
@@ -32,13 +37,13 @@
               :style="{
                 margin: 'auto auto auto 15px',
                 fontSize: '5px',
-                backgroundColor: cu.inspectionStatus == 1 ? '#ffbebb' : '#ABE399',
-                color: cu.inspectionStatus == 1 ? '#FF3128' : '#189400',
+                backgroundColor: cu.inspectionStatus == 2 ? '#ABE399' : '#ffbebb',
+                color: cu.inspectionStatus == 2 ? '#189400' : '#FF3128',
                 borderRadius: '10px',
                 padding: '0px 5px',
               }"
             >
-              {{ cu.inspectionStatus == 1 ? "未巡检" : "已巡检" }}
+              {{ cu.inspectionStatus == 2 ? "已巡检" : "未巡检" }}
             </view>
           </view>
           <view style="font-size: 13px; color: #a1a1a1; margin-bottom: 5px"> 描述：{{ cu.siteDescribe == "" || cu.siteDescribe == null ? "无" : cu.siteDescribe }} </view>
@@ -86,6 +91,7 @@ import { onLoad, onShow, onUnload } from "@dcloudio/uni-app";
 import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
 import { recordList, recordOption, siteDetails, planSonSiteDetails } from "@/api/business/zhaf/xunJian/plan.js";
+import { errorApi } from "@/api/business/zhaf/xunJian/index.js";
 /*----------------------------------组件引入-----------------------------------*/
 import oaMovable from "@/components/oa-movable/index.vue"; // 引入组件
 /*----------------------------------store引入-----------------------------------*/
@@ -206,9 +212,49 @@ function currentApi() {
       proxy.$modal.msg(err);
     });
 }
+/**
+ * @异常上报
+ */
+function AbnormalReport(){
+  errorApi()
+  .Insert(
+    {
+      "eventName": "执行任务",
+      "eventType": 8,
+      "eventLevel": 1,
+      "eventCategory": 8,
+      "deviceId": proxy.$settingStore.deviceList.deviceId,
+      "planId": xunJianStore.planId
+    }
+  )
+  .catch((err) => {
+    proxy.$modal.msg(err);
+  });
+}
+
+/**
+ * @结束巡检
+ */
+function endInspection() {
+  errorApi()
+  .Insert(
+    {
+      "eventName": "结束巡检",
+      "eventType": 10,
+      "eventLevel": 1,
+      "eventCategory": 10,
+      "deviceId": proxy.$settingStore.deviceList.deviceId,
+      "planId": xunJianStore.planId
+    }
+  )
+  .catch((err) => {
+    proxy.$modal.msg(err);
+  });
+}
 
 onLoad((options) => {
   currentApi();
+  AbnormalReport()
 });
 
 onShow(() => {

src/pages/business/zhaf/xunJian/plan/index.vue

@@ -182,6 +182,7 @@ function reportClick(obj) {
 
   if (tabPosition.value == 0) {
     xunJianStore.planSonId = obj.id;
+    xunJianStore.planId = obj.planId;
     uni.navigateTo({
       url: "/pages/business/zhaf/xunJian/plan/components/report",
     });
@@ -299,6 +300,7 @@ function activitiesApi() {
           res.data.forEach((el) => {
             activities.value.push({
               id: el.id,
+              planId: el.planId,
               planName: el.planName,
               timestamp: (el.startTime ? el.startTime.split(":")[0] + ":" + el.startTime.split(":")[1] + "~" : "") + (el.endTime ? el.endTime.split(":")[0] + ":" + el.endTime.split(":")[1] : ""),
               planStatus: el.planStatus,

src/store/modules/xunJian.js

@@ -9,6 +9,7 @@ import keyListen from "@/plugins/keyListen.plugins.js";
 
 const xunJianStores = defineStore(`storage-xunJian`, {
   state: () => ({
+    planId: null, //巡检计划页 计划Id
     planTabs: 0, //巡检计划页 tabs切换值
     siteId: null, //巡检计划页 站点id
     planSonId: null, //巡检计划页 子计划id