fix(pad): bug修改

pages/inspectionContent/inspectionContent.vue

@@ -325,11 +325,13 @@ export default {
         userInfo.user
       );
 
-      // 清空草稿数据
-      this.$store.commit("SET_DARF_DATA", {}); // 缓存[巡检信息]
-      writeDarf("").then((res) => {
-        console.log("写入草稿文件成功");
-      });
+      if(!detailsInfo.uid){
+        // 清空草稿数据
+        this.$store.commit("SET_DARF_DATA", {}); // 缓存[巡检信息]
+        writeDarf("").then((res) => {
+          console.log("写入草稿文件成功");
+        });
+      }
 
       // 更新日志
       const log_list = this.$store.state.log_list;

pages/inspectionContent/model/dutyHandover.vue

@@ -99,15 +99,6 @@ export default {
         successor: "", // 接班人
       },
       quickTextList: [
-       
-        {
-          text: "进出总人数：",
-         
-        },
-        {
-          text: "访客记录：",
-         
-        },
         {
           text: "未完成事项：",
          

pages/shaftInspection/model/tabs.vue

@@ -18,15 +18,15 @@
 
     <!-- 描述 -->
     <view class="descript">
-      <view v-if="list[activeIndex].position" class="descript-item">
+      <view v-if="(list[activeIndex] || {}).position" class="descript-item">
         <text class="name">巡检位置</text>
         <text class="text">{{
-          list[activeIndex].position.map((item) => item.dictLabel).join("、")
+          (list[activeIndex].position || []).map((item) => item.dictLabel).join("、")
         }}</text>
       </view>
       <view class="descript-item">
         <text class="name">巡检说明</text>
-        <text class="text"> {{ list[activeIndex].descript }}</text>
+        <text class="text"> {{ (list[activeIndex] || {}).descript }}</text>
       </view>
     </view>
   </view>

pages/shaftInspection/shaftInspection.vue

@@ -15,7 +15,11 @@
 
       <block slot="right">
         <view class="nav-right">
-          <view v-if="isOperationPermissions" class="uni-nav-bar-text" @click="deleteClick">
+          <view
+            v-if="isOperationPermissions"
+            class="uni-nav-bar-text"
+            @click="deleteClick"
+          >
             <text class="iconfont icon-delete"></text
           ></view>
 
@@ -102,7 +106,7 @@ import {
   writeDarf,
   writeInspectionData,
 } from "@/utils/IoReadingAndWriting.js";
-import { pad_2_1_inspection_position,pad_2_1_floor } from "@/utils/dict.js";
+import { pad_2_1_inspection_position, pad_2_1_floor } from "@/utils/dict.js";
 
 import { getInspectionDetails, getDarft } from "@/request/index.js";
 
@@ -127,10 +131,11 @@ export default {
     userInfo() {
       return this.$store.state.now_user || {};
     },
-    isOperationPermissions(){ // 是否有操作权限
-      const {uid, createByName} = this.detailsInfo;
-      return !uid ||  (uid && createByName == this.userInfo.user)
-    }
+    isOperationPermissions() {
+      // 是否有操作权限
+      const { uid, createByName } = this.detailsInfo;
+      return !uid || (uid && createByName == this.userInfo.user);
+    },
   },
 
   onLoad(options) {
@@ -177,7 +182,7 @@ export default {
             // type: 1, // 枚举值
             position: pad_2_1_floor.rows,
             refName: `TabContentItem_${index}`,
-            descript: "检查内容包括门禁、卫生、设备告警。"
+            descript: "检查内容包括门禁、卫生、设备告警。",
           };
         });
 
@@ -204,7 +209,7 @@ export default {
       getInspectionDetails(uid)
         .then((res) => {
           const detailsInfo = res;
-          
+
           this.baseInfo = detailsInfo.originData.baseInfo;
           this.tempForm = detailsInfo.originData.tempForm;
           this.detailsInfo = detailsInfo;
@@ -225,51 +230,71 @@ export default {
     },
     // 回显组件数据
     setComponentData(refName, componentData) {
-      this.$refs[refName][0].setForm(componentData);
+      this.$refs[refName][0] && this.$refs[refName][0].setForm(componentData);
     },
     //--弹出对话框
     dialogInputConfirm2() {
-      uni.redirectTo({
-        url: "/pages/home/home?tabIndex=1",
-        success: () => {
-          const userInfo = this.userInfo.user
-          const all_data = this.$store.state.all_data;
-          const detailsInfo = this.detailsInfo;
-          const tempAllData = all_data.filter(
-            (element) => element.uid != detailsInfo.uid
-          ).filter(item => item.createByName == userInfo.user)
+      // uni.redirectTo({
+      //   url: "/pages/home/home?tabIndex=1",
+      //   success: () => {
+      const userInfo = this.userInfo;
+      const all_data = this.$store.state.all_data;
+      const detailsInfo = this.detailsInfo;
+      const baseInfo = this.baseInfo;
 
-          // 更新巡检list
-          this.$store.commit("SET_ALL_DATA", tempAllData);
-          writeInspectionData(tempAllData, userInfo.user);
+      const tempAllData = all_data.filter(
+        (element) => element.uid != detailsInfo.uid
+      );
 
-          // 清空草稿数据
-          this.$store.commit("SET_DARF_DATA", {}); // 缓存[巡检信息]
-          writeDarf("").then((res) => {
-            console.log("写入草稿文件成功");
-          });
+      // console.log(
+      //   "---删除内容",
+      //   all_data.filter((element) => element.uid == detailsInfo.uid)
+      // );
 
-          // 更新日志
-          const log_list = this.$store.state.log_list;
-          const logContent = getLogContent(
-            LOG_TYPE_ENUM.delete,
-            `${detailsInfo.recordName}(${detailsInfo.inspectionCode})`,
-            "巡检模块"
-          );
-          logContent.inspectionType = detailsInfo.inspectionType;
-          log_list.push(logContent);
-          this.$store.commit("SET_LOG_LIST", log_list);
+      // 更新巡检list
+      this.$store.commit("SET_ALL_DATA", tempAllData);
+      const inspectList = tempAllData.filter(
+        (item) => item.createByName == userInfo.user
+      );
 
-          addLog(log_list).then((res) => {
-            console.log("日志文件写入成功");
-          });
+      writeInspectionData(inspectList, userInfo.user);
 
-          uni.showToast({
-            icon: `success`,
-            title: `删除成功`,
-          });
+      if (!detailsInfo.uid) {
+        // 清空草稿数据
+        this.$store.commit("SET_DARF_DATA", {}); // 缓存[巡检信息]
+        writeDarf("").then((res) => {
+          console.log("写入草稿文件成功");
+        });
+      }
+
+      // 更新日志
+      const log_list = this.$store.state.log_list;
+      const logContent = getLogContent(
+        LOG_TYPE_ENUM.delete,
+        `${baseInfo.recordName}(${baseInfo.inspectionCode})`,
+        "巡检模块"
+      );
+      logContent.inspectionType = baseInfo.inspectionType;
+      log_list.push(logContent);
+      this.$store.commit("SET_LOG_LIST", log_list);
+
+      addLog(log_list).then((res) => {
+        console.log("日志文件写入成功");
+      });
+
+      uni.showToast({
+        icon: `success`,
+        title: `删除成功`,
+      });
+
+      uni.redirectTo({
+        url: "/pages/home/home?tabIndex=1",
+        success() {
+          uni.hideLoading();
         },
       });
+      // },
+      // });
     },
     // 删除
     deleteClick() {
@@ -389,9 +414,11 @@ export default {
           // 更新巡检list
           const userInfo = this.userInfo;
           this.$store.commit("SET_ALL_DATA", all_data);
-          const inspectList =  all_data.filter((item) => item.createByName == userInfo.user)
+          const inspectList = all_data.filter(
+            (item) => item.createByName == userInfo.user
+          );
 
-          writeInspectionData(inspectList,  userInfo.user);
+          writeInspectionData(inspectList, userInfo.user);
 
           // 更新日志
           const log_list = this.$store.state.log_list;
@@ -410,7 +437,6 @@ export default {
 
           // 清空基础缓存信息
           this.$store.commit("SET_TEMP_DATA", {}); // 缓存[巡检信息]
-
         }
 
         uni.showToast({

pages/synchronousManagement/dialog.vue

@@ -113,15 +113,18 @@ export default {
      *  读取上一次打包的文件, 复制到 [ history ] 文件夹中
      */
     clickHandle() {
+      if(this.loading) return;
       const directoryPath = `${SYNCHRONIZE_DATA_PAD}/发送数据`;
       const targetDirectoryPath = `${SYNCHRONIZE_DATA_PAD}/history`;
 
       checkAndCreateDirectory(directoryPath).then(() => {
         copyDirectory(directoryPath, targetDirectoryPath)
           .then(() => {
+
             return deleteAllFilesInDirectory(directoryPath);
           })
           .then(() => {
+
             this.coverData();
           })
           .catch((error) => {

utils/IoReadingAndWriting.js

@@ -156,8 +156,7 @@ export const writeInspectionData = (content, userName) => {
     const fileContent = Base64.encode(JSON.stringify(content));
 
 
-     // store 更新 巡检数据
-     store.commit("SET_ALL_DATA", content);
+   
 
 
     createFileWithPlusIO(
@@ -165,7 +164,8 @@ export const writeInspectionData = (content, userName) => {
       fileName,
       fileContent
     ).then((res) => {
-
+      // store 更新 巡检数据. 缓存数据置为空,让接口重新读取文件数据
+      store.commit("SET_ALL_DATA", []);
       resolve();
     });
   });