fix(功能走查)： 功能走查85%

components/searchCom/index.vue

@@ -78,8 +78,8 @@ export default {
       ],
       exceptionArr: [
         { value: "", text: "全部" },
-        { value: 1, text: "有异常" },
-        { value: 2, text: "无异常" },
+        { value: 2, text: "有异常" },
+        { value: 1, text: "无异常" },
       ],
     };
   },

pages/inspectionContent/inspectionContent.vue

@@ -319,7 +319,12 @@ export default {
 
       // 更新巡检list
       this.$store.commit("SET_ALL_DATA", tempAllData);
-      writeInspectionData(tempAllData);
+      const userInfo = this.userInfo;
+      const inspectList =  tempAllData.filter((item) => item.createByName == userInfo.user)
+      writeInspectionData(
+        inspectList,
+        userInfo.user
+      );
 
       // 清空草稿数据
       this.$store.commit("SET_DARF_DATA", {}); // 缓存[巡检信息]
@@ -480,7 +485,13 @@ export default {
 
           // 更新巡检list
           this.$store.commit("SET_ALL_DATA", all_data);
-          writeInspectionData(all_data);
+          const userInfo = this.userInfo;
+          const inspectList =  all_data.filter((item) => item.createByName == userInfo.user)
+
+          writeInspectionData(
+            inspectList,
+            userInfo.user
+          );
 
           // 更新日志
           const log_list = this.$store.state.log_list;

pages/login/login.vue

@@ -203,7 +203,6 @@ export default {
                   log_list.push(logContent);
                   this.$store.commit("SET_LOG_LIST", log_list);
                   addLog(log_list);
-
                 });
 
               // 密码不正确

pages/shaftInspection/shaftInspection.vue

@@ -234,15 +234,16 @@ export default {
       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)
 
           // 更新巡检list
           this.$store.commit("SET_ALL_DATA", tempAllData);
-          writeInspectionData(tempAllData);
+          writeInspectionData(tempAllData, userInfo.user);
 
           // 清空草稿数据
           this.$store.commit("SET_DARF_DATA", {}); // 缓存[巡检信息]
@@ -387,8 +388,11 @@ export default {
           }
 
           // 更新巡检list
+          const userInfo = this.userInfo;
           this.$store.commit("SET_ALL_DATA", all_data);
-          writeInspectionData(all_data);
+          const inspectList =  all_data.filter((item) => item.createByName == userInfo.user)
+
+          writeInspectionData(inspectList,  userInfo.user);
 
           // 更新日志
           const log_list = this.$store.state.log_list;

pages/synchronousManagement/dialog.vue

@@ -44,8 +44,7 @@ import {
   createFileWithPlusIO,
   setSm2,
 } from "@/utils/systemCofig";
-import getDateTime from "@/common/getdateTime.js";
-import { Base64 } from "js-base64";
+
 import {
   writeInspectionData,
   copyDirectory,
@@ -58,6 +57,14 @@ import moment from "moment";
 import { getAllInspections } from "@/request/index.js";
 
 export default {
+  props: {
+    list: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
   components: {},
   data() {
     return {
@@ -68,11 +75,17 @@ export default {
   },
 
   mounted() {
+    const temp = [];
+    this.list.forEach((item) => {
+      temp.push(...(item.list || []));
+    });
+    this.notSynchronizationList = temp.filter(
+      (item) => item.synchronization == 0
+    );
+
     getAllInspections().then((res) => {
       this.allList = res;
-      this.notSynchronizationList = (res || []).filter(
-        (item) => item.synchronization == 0
-      );
+      console.log("_--", this.list);
     });
   },
   methods: {
@@ -165,7 +178,7 @@ export default {
           const keys = Object.keys(userData);
           const promiseArr = keys.map((key) => {
             const val = userData[key];
-            return writeInspectionData(val,  key);
+            return writeInspectionData(val, key);
           });
 
           Promise.all(promiseArr)
@@ -216,17 +229,6 @@ export default {
         });
     },
 
-    // 更新当前用户数据 || 更新所有数据
-    updateData(userData) {
-      const keys = Object.keys(userData);
-      const promiseArr = keys.map((key) => {
-        const val = userData[key];
-        return writeInspectionData(val);
-      });
-
-      return Promise.all(promiseArr).then();
-    },
-
     // 打包文件
     packedData(content, fileName) {
       const fileContent = setSm2(content);

pages/synchronousManagement/index.vue

@@ -37,14 +37,14 @@
 
     <!-- 数据打包 -->
     <view
-      v-show="isPackedDataBtn "
+      v-show="isPackedDataBtn"
       class="synchronous-button"
       @click="openDialog(true)"
       >数据打包</view
     >
 
     <!-- 打包弹窗 -->
-    <Dialog v-show="isDialog" @close="openDialog(false)"></Dialog>
+    <Dialog v-if="isDialog && list.length"  :list="list" @close="openDialog(false)"></Dialog>
   </view>
 </template>
 

utils/IoReadingAndWriting.js

@@ -150,21 +150,23 @@ export const readDarfData = () => {
  * @param {*} isEncryption  是否加密
  * @returns
  */
-export const writeInspectionData = (content, useName) => {
+export const writeInspectionData = (content, userName) => {
   return new Promise((resolve, reject) => {
-    const now_user = store.state.now_user;
-    const isAdmin = now_user.isAdmin;
+    // const now_user = store.state.now_user;
+
     let timeStr = moment().format("yyyy-MM-DD");
     let fileName = `${timeStr}.txt`;
 
-    console.log("写入-巡检数据--", content);
-    console.log("写入-巡检数据- 路劲-",   `${SYNCHRONIZE_DATA_PAD}/巡检数据/${isAdmin ? useName: now_user.user}`);
-
+    // console.log("写入-巡检数据--", content);
+    // console.log(
+    //   "写入-巡检数据- 路劲-",
+    //   `${SYNCHRONIZE_DATA_PAD}/巡检数据/${userName}`
+    // );
 
-    const fileContent =  Base64.encode(JSON.stringify(content));
+    const fileContent = Base64.encode(JSON.stringify(content));
 
     createFileWithPlusIO(
-      `${SYNCHRONIZE_DATA_PAD}/巡检数据/${isAdmin ? useName: now_user.user}`,
+      `${SYNCHRONIZE_DATA_PAD}/巡检数据/${userName}`,
       fileName,
       fileContent
     ).then((res) => {
@@ -182,7 +184,8 @@ export const readInspectionData = () => {
   const directoryPath = isAdmin
     ? `${SYNCHRONIZE_DATA_PAD}/巡检数据`
     : `${SYNCHRONIZE_DATA_PAD}/巡检数据/${now_user.user}`;
-    console.log("---directoryPath", directoryPath)
+    
+  console.log("---directoryPath", directoryPath);
 
   return new Promise((resolve, reject) => {
     readFilesInDirectory(directoryPath)