FIX

api/inspect.js

@@ -90,6 +90,7 @@ export default {
 			createBy,
 			createTime,
 			updateTime,
+      signImg,
 			inspectionData
 		) values(
 			'${data.inspectionType}',
@@ -103,12 +104,9 @@ export default {
 			'${data.createBy}',
 			'${data.createTime}',
 			'${data.updateTime}',
+			'${data.signImg}',
 			'${JSON.stringify(data.inspectionData)}'
 		 )`;
-      // let has = await this.info(data.id);
-      // if (has && has.id) {
-      //   await this.remove(data.id);
-      // }
       await sqllitedb.executeSQL(sql);
     } catch (e) {
       console.log(e.message);
@@ -130,7 +128,6 @@ export default {
             recordName = '${data.recordName}',
             inspectionTime = '${data.inspectionTime}',
             isException = ${data.isException},
-            inspectionNumber = ${data.inspectionNumber},
             userId = '${data.userId}',
             userName = '${data.userName}',
             synFlag = ${data.synFlag},
@@ -138,7 +135,7 @@ export default {
             createBy = '${data.createBy}',
             createTime = '${data.createTime}',
             updateTime = '${data.updateTime}',
-            inspectionData = '${data.inspectionData}'
+            inspectionData = '${JSON.stringify(data.inspectionData)}'
             WHERE id = ${data.id}`;
       await sqllitedb.executeSQL(sql);
     } catch (e) {

pages/home/home.vue

 <template>
   <!-- 首页 -->
   <view class="container">
+    <view class="flex">
       <navigator url="/pages/test/index" hover-class="navigator-hover">
-      <button type="default">跳转到新页面</button>
+        <button type="default" class="uni-btn">跳转TEST</button>
       </navigator>
+      <navigator
+        url="/pages/inspectionContent/inspectionContentList?uid=1"
+        hover-class="navigator-hover"
+      >
+        <button type="default" class="uni-btn">测试巡检</button>
+      </navigator>
+    </view>
     <!-- 第一个模块 -->
     <view class="header">
       <view class="title">杭州内网监管在线-运维在线</view>
@@ -76,21 +84,22 @@
 export default {
   data() {
     return {
-			cards: [{
-					image: '../../static/img/jf.png',
-					text: '机房巡检',
-					url:"/pages/inspectionContent/inspectionContentList?backValue=home"
+      cards: [
+        {
+          image: "../../static/img/jf.png",
+          text: "机房巡检",
+          url: "/pages/inspectionContent/inspectionContentList?backValue=home",
         },
         {
-					image: '../../static/img/jd.png',
-					text: '井道巡检',
-					url:"/pages/shaftInspection/shaftInspectionList?backValue=home"
+          image: "../../static/img/jd.png",
+          text: "井道巡检",
+          url: "/pages/shaftInspection/shaftInspectionList?backValue=home",
         },
         {
-					image: '../../static/img/sj.png',
-					text: '设备上架',
-					url: "/pages/listingManagement/index?backValue=home"
-				}
+          image: "../../static/img/sj.png",
+          text: "设备上架",
+          url: "/pages/listingManagement/index?backValue=home",
+        },
       ],
       userName: this.$store.state.now_user.user,
     };
@@ -101,7 +110,7 @@ export default {
     },
   },
   created() {
-		console.log(this.$store.state)
+    console.log(this.$store.state);
   },
   methods: {
     // 修改密码
@@ -121,11 +130,10 @@ export default {
       });
     },
     // 三模块卡片跳转页面
-		toList(url){
+    toList(url) {
       uni.navigateTo({
         url: url,
       });
-
     },
     // 巡检管理
     toInspectionManagement() {
@@ -158,8 +166,7 @@ export default {
         },
       });
     },
-
-	}
+  },
 };
 </script>
 

pages/inspectionContent/inspectionContentList.vue

@@ -279,9 +279,7 @@ export default {
         return res;
       });
     },
-    init(baseList) {
-      this.value = baseList[0].dictValue;
-      return new Promise((resolve, reject) => {
+    listFormat(baseList) {
       const roomFeatureMap = {
         1: "1",
         2: "0",
@@ -303,8 +301,14 @@ export default {
           statusLable: item.statusLable || "未巡检",
         };
       });
-
+      return list;
+    },
+    init(baseList) {
+      this.value = baseList[0].dictValue;
+      return new Promise((resolve, reject) => {
+        let list = this.listFormat(baseList);
         this.listData = this.deepClone(list);
+
         console.log("this.listData", this.listData);
 
         const group1 = list.slice(0, 5);
@@ -364,10 +368,12 @@ export default {
       return inspectApi
         .info(uid)
         .then((res) => {
+          console.log("before sqlToData", res);
           const detailsInfo = sqlToData(res);
           console.log("getDetails", detailsInfo);
 
-          this.listData = this.deepClone(detailsInfo.originData);
+          // this.listData = this.deepClone(detailsInfo.originData);
+          this.listData = this.listFormat(detailsInfo.originData);
 
           this.detailsInfo = detailsInfo;
           this.inspectionNumber = detailsInfo.inspectionNumber;

pages/inspectionContent/inspectionContentNew.vue

@@ -140,7 +140,7 @@
 <script>
 import assRoomApi from "@/api/assRoom.js";
 import inspectApi from "@/api/inspect.js";
-import { dataToSql } from "./shared";
+import { dataToSql, sqlToData } from "./shared";
 
 import {
   pad_all_inspection_position,
@@ -243,6 +243,7 @@ export default {
     this.inspectionCode = options.inspectionCode;
     this.backValue = options.backValue || "";
     this.imgSrc = `../../static/img/jf/jf${this.value}.png`;
+
     this.tabs =
       this.jfType === "2" || this.jfType === "3"
         ? this.deepClone(tabsInfo2)
@@ -299,12 +300,12 @@ export default {
     // 回显数据
     getDetails(uid) {
       uni.showLoading();
-      getInspectionDetails(uid)
+      inspectApi
+        .info(uid)
         .then((res) => {
-          const detailsInfo = res;
-          console.log("查看tabs", this.tabs);
+          const detailsInfo = sqlToData(res);
+
           this.list = detailsInfo.originData[this.value - 1].details;
-          console.log("查看list", this.list);
           this.tabs.forEach((item) => {
             if (
               this.list[item.value] &&
@@ -314,8 +315,6 @@ export default {
             }
           });
           console.log("查看tabs2", this.tabs);
-
-          // this.inspectionResult = list[0].inspectionResult;
           this.detailsInfo = detailsInfo;
           console.log("detailsInfo", detailsInfo);
 
@@ -343,6 +342,7 @@ export default {
     // 处理提交数据
     getParams(isSubmit) {
       console.log("this.getParams", this.uid, this.value);
+      console.log("originData", this.detailsInfo.originData);
       if (this.uid) {
         let posItem = this.detailsInfo.originData[this.value - 1];
         let paramsObj = this.getAllChildFormData(); //获取所有数据
@@ -493,8 +493,9 @@ export default {
     },
     realSave(data) {
       const send = dataToSql(data);
-      inspectApi.save(send).then((res) => {
-        console.log(res);
+      const api = this.uid ? inspectApi.update : inspectApi.save;
+      api(this.uid ? { id: this.uid, ...send } : send).then((res) => {
+        console.log("保存成功");
       });
     },
     // 提交

pages/inspectionContent/shared.js

@@ -10,16 +10,15 @@ export function dataToSql(data) {
     synFlag = data.synchronization;
   }
   const send = {
-    id: Math.random().toString(36).substring(2, 15),
     inspectionType: data.inspectionType,
     inspectionCode: data.inspectionCode,
     recordName: `${moment().format("yyyyMMDD")}-机房巡检`,
     inspectionTime: moment().format("yyyy-MM-DD HH:mm"),
-    isException: data.isException,
+    isException: data.isException, // 是否异常：0 否 1 是 2 巡检中
     userId: store.state.now_user.userId,
     userName: store.state.now_user.user,
     synFlag: synFlag, // 0.未同步，1.已同步，2.编辑
-    signImg: data.signImg,
+    signImg: data.signImg || "",
     createBy: store.state.now_user.userId,
     createTime: data.id ? data.createTime : `${new Date().getTime()}`,
     updateTime: `${new Date().getTime()}`,