feat: 井道巡检状态修改

pages/shaftInspection/model/dialog.vue

@@ -83,21 +83,6 @@ export default {
       this.init()
     },
   },
-  // async mounted() {
-  //   const temp = [];
-  //   this.list.forEach((item) => {
-  //     temp.push(...(item.list || []));
-  //   });
-  //   console.log("this.list", this.list);
-  //   console.log("temp", temp);
-  //   this.notSynchronizationList = temp.filter(
-  //     (item) => item.synchronization == 0 && item.isSign === true
-  //   );
-
-  //   getAllInspections().then((res) => {
-  //     this.allList = res;
-  //   });
-  // },
   methods: {
     init() {
       const temp = [];
@@ -159,11 +144,11 @@ export default {
 
       let timeStr = moment().format("yyyy_MM_DD_hh_mm_ss");
 
-      const JFXJ_DATA = notSynchronizationList
-        .filter((item) => item.inspectionType == 1)
-        .map((item) => {
-          return item;
-        }); // 机房数据类型是 1
+      // const JFXJ_DATA = notSynchronizationList
+      //   .filter((item) => item.inspectionType == 1)
+      //   .map((item) => {
+      //     return item;
+      //   }); // 机房数据类型是 1
 
       const JDXJ_DATA = notSynchronizationList
         .filter((item) => item.inspectionType == 2)
@@ -175,10 +160,10 @@ export default {
       this.loading = true;
       const tmepList = [];
 
-      if (JFXJ_DATA.length) {
-        let JFXJ_DATA_FILE_NAME = `${userName}_JFXJ_${timeStr}.txt`;
-        tmepList.push(this.packedData(JFXJ_DATA, JFXJ_DATA_FILE_NAME));
-      }
+      // if (JFXJ_DATA.length) {
+      //   let JFXJ_DATA_FILE_NAME = `${userName}_JFXJ_${timeStr}.txt`;
+      //   tmepList.push(this.packedData(JFXJ_DATA, JFXJ_DATA_FILE_NAME));
+      // }
 
       JDXJ_DATA.forEach((item, index) => {
         let JDXJ_DATA_FILE_NAME = `${userName}_JDXJ_${timeStr}_${index}.txt`;

pages/shaftInspection/shaftInspectionList.vue

@@ -120,7 +120,8 @@
                       v-if="position.status == 2"
                       class="iconfont icon-shibai1"
                     ></text>
-                    <text class="status-text">{{ position.statusLable }}</text>
+                    <text v-if="position.isSubmit === 0" class="status-text">草稿</text>
+                    <text v-else class="status-text">{{ position.statusLable }}</text>
                   </view>
                   <view class="info-line">
                     <text class="info-text"
@@ -182,7 +183,8 @@
                       v-if="position.status == 2"
                       class="iconfont icon-shibai1"
                     ></text>
-                    <text class="status-text">{{ position.statusLable }}</text>
+                    <text v-if="position.isSubmit === 0" class="status-text">草稿</text>
+                    <text v-else class="status-text">{{ position.statusLable }}</text>
                   </view>
                   <view class="info-line">
                     <text class="info-text"
@@ -389,7 +391,10 @@ export default {
           }
           this.inspectionCode = detailsInfo.inspectionCode;
           // this.cardsInfo = this.tabList = detailsInfo.originData;
-          this.isSubmit = this.detailsInfo.isSubmit;
+          this.isSubmit = this.detailsInfo.originData.reduce((acc,cur) => {
+            acc.push(...cur.position)
+            return acc
+          }, []).every(pos => pos.isSubmit === '' || pos.isSubmit === 1);
           this.isSign = !!this.detailsInfo.signImg;
           this.cardsInfo.forEach((item) => {
             this.tabs.push(item.name);

pages/shaftInspection/shared.js

@@ -3,18 +3,29 @@ import store from "@/store";
 
 // 将现有机房巡检数据转换为SQL数据所需要格式
 export function dataToSql(data) {
-  let synFlag = 0;
-  if (data.isSubmit == 0) {
-    synFlag = 0;
+  let synFlag = 0, isException = data.isException;
+  // 是否有草稿状态的井道
+  let hasDraft;
+  hasDraft = !(data.originData.reduce((acc,cur) => {
+    acc.push(...cur.position)
+    return acc
+  }, []).every(pos => pos.isSubmit === '' || pos.isSubmit === 1))
+  if (data.synchronization === 1) {
+    synFlag = 1;
   } else {
-    synFlag = data.synchronization;
+    if(hasDraft) {
+      synFlag = 2
+      isException = 2
+    } else {
+      synFlag = 0
+    }
   }
   const send = {
     inspectionType: data.inspectionType,
     inspectionCode: data.inspectionCode,
     recordName: `${moment().format("yyyyMMDD")}-井道巡检`,
     inspectionTime: moment().format("yyyy-MM-DD HH:mm"),
-    isException: data.isException, // 是否异常：0 否 1 是 2 巡检中
+    isException: isException, // 是否异常：0 否 1 是 2 巡检中
     userId: store.state.now_user.userId,
     userName: store.state.now_user.user,
     synFlag: synFlag, // 0.未同步，1.已同步，2.编辑
@@ -42,11 +53,10 @@ export function sqlToData(sqlData) {
       synchronization = sqlData.synFlag;
     }
     const originData = JSON.parse(sqlData.inspectionData || "{}");
-    console.log(originData)
     const inspectedItems = originData.reduce((acc,cur) => {
       acc.push(...cur.position)
       return acc
-    }, []).filter((item) => item.status == 1 || item.status == 2)
+    }, []).filter((item) => (item.status == 1 || item.status == 2) && item.isSubmit !== 0)
     console.log(inspectedItems)
 
     // 获取已经巡检过的数量

utils/dict.js

@@ -1085,7 +1085,7 @@ export const pad_2_1_floor = {
       default: false,
       statusLable: "未巡检",
       details: [],
-      isSubmit: 0,
+      isSubmit: '',
     },
     {
       createBy: "admin",
@@ -1105,7 +1105,7 @@ export const pad_2_1_floor = {
       default: false,
       statusLable: "未巡检",
       details: [],
-      isSubmit: 0,
+      isSubmit: '',
     },
     {
       createBy: "admin",
@@ -1125,7 +1125,7 @@ export const pad_2_1_floor = {
       default: false,
       statusLable: "未巡检",
       details: [],
-      isSubmit: 0,
+      isSubmit: '',
     },
     {
       createBy: "admin",
@@ -1145,7 +1145,7 @@ export const pad_2_1_floor = {
       default: false,
       statusLable: "未巡检",
       details: [],
-      isSubmit: 0,
+      isSubmit: '',
     },
     {
       createBy: "admin",
@@ -1165,7 +1165,7 @@ export const pad_2_1_floor = {
       default: false,
       statusLable: "未巡检",
       details: [], //数据
-      isSubmit: 0, //提交状态
+      isSubmit: '', //提交状态
     },
     {
       createBy: "admin",
@@ -1185,7 +1185,7 @@ export const pad_2_1_floor = {
       default: false,
       statusLable: "未巡检",
       details: [],
-      isSubmit: 0,
+      isSubmit: '',
     },
     {
       createBy: "admin",
@@ -1205,7 +1205,7 @@ export const pad_2_1_floor = {
       default: false,
       statusLable: "未巡检",
       details: [],
-      isSubmit: 0,
+      isSubmit: '',
     },
     {
       createBy: "admin",
@@ -1225,7 +1225,7 @@ export const pad_2_1_floor = {
       default: false,
       statusLable: "未巡检",
       details: [],
-      isSubmit: 0,
+      isSubmit: '',
     },
     {
       createBy: "admin",
@@ -1245,7 +1245,7 @@ export const pad_2_1_floor = {
       default: false,
       statusLable: "未巡检",
       details: [],
-      isSubmit: 0,
+      isSubmit: '',
     },
     {
       createBy: "admin",
@@ -1265,7 +1265,7 @@ export const pad_2_1_floor = {
       default: false,
       statusLable: "未巡检",
       details: [],
-      isSubmit: 0,
+      isSubmit: '',
     },
     {
       createBy: "admin",
@@ -1285,7 +1285,7 @@ export const pad_2_1_floor = {
       default: false,
       statusLable: "未巡检",
       details: [],
-      isSubmit: 0,
+      isSubmit: '',
     },
     {
       createBy: "admin",
@@ -1305,7 +1305,7 @@ export const pad_2_1_floor = {
       default: false,
       statusLable: "未巡检",
       details: [],
-      isSubmit: 0,
+      isSubmit: '',
     },
     {
       createBy: "admin",
@@ -1325,7 +1325,7 @@ export const pad_2_1_floor = {
       default: false,
       statusLable: "未巡检",
       details: [],
-      isSubmit: 0,
+      isSubmit: '',
     },
   ],
 };