feat: add qt

pages/inspectionContent/components/qt.vue

@@ -18,8 +18,11 @@
         <CommonUpload
           v-model="item.photos"
           :max-count="9999"
-          @change="onPhotoChange"
+          @input="onPhotoChange"
         >
+          <template #tip>
+            请对检查项进行拍照留存。发现“异常、告警”时，需拍照留存。
+          </template>
         </CommonUpload>
       </view>
     </view>
@@ -112,10 +115,7 @@ export default {
     // 处理弹窗确认
     handlePopupConfirm(summary) {
       this.itemData.detail[this.currentIndex].conclusion = summary; // 回显到文字显示区域
-      this.$emit("sync", {
-        conclusion: summary,
-        photos: this.itemData.detail[this.currentIndex].photos,
-      });
+      this.$emit("sync", this.itemData);
     },
     // 处理】数据
     getFromData() {
@@ -163,10 +163,7 @@ export default {
     },
     onPhotoChange(val) {
       this.itemData.detail[this.currentIndex].photos = val;
-      this.$emit("sync", {
-        conclusion: this.itemData.detail[this.currentIndex].conclusion,
-        photos: val,
-      });
+      this.$emit("sync", this.itemData);
     },
   },
 };

pages/inspectionContent/inspectionContentList.vue

@@ -85,19 +85,27 @@
           >
             <view class="card-content">
               <view class="first-row">
-                <text
-                  v-if="card.status == 0"
-                  class="iconfont icon-weixunjian"
-                ></text>
-                <text
-                  v-if="card.status == 1"
-                  class="iconfont icon-wancheng"
-                ></text>
-                <text
-                  v-if="card.status == 2"
-                  class="iconfont icon-shibai1"
-                ></text>
-                <text class="status">{{ card.statusLable }}</text>
+                <template v-if="card.isSubmit == 0">
+                  <text class="iconfont icon-weixunjian"></text>
+                </template>
+                <template v-else>
+                  <text
+                    v-if="card.status == 0"
+                    class="iconfont icon-weixunjian"
+                  ></text>
+                  <text
+                    v-if="card.status == 1"
+                    class="iconfont icon-wancheng"
+                  ></text>
+                  <text
+                    v-if="card.status == 2"
+                    class="iconfont icon-shibai1"
+                  ></text>
+                </template>
+                <text class="status" v-if="card.isSubmit == 1">{{
+                  card.statusLable
+                }}</text>
+                <text class="status" v-else-if="card.isSubmit == 0">草稿</text>
               </view>
               <view class="second-row">
                 <text class="location">{{ card.name }}</text>
@@ -205,7 +213,7 @@ import startDialog from "./components/dialog.vue";
 
 import assRoomApi from "@/api/assRoom.js";
 import inspectApi from "@/api/inspect";
-import { sqlToData } from "./shared";
+import { sqlToData, dataToSql } from "./shared";
 export default {
   components: {
     signDialog,
@@ -570,44 +578,50 @@ export default {
       return rows[targetIndex];
     },
     // 处理弹窗确认
-    handlePopupConfirm(summary) {
+    handlePopupConfirm(signImg) {
       this.detailsInfo.isSign = this.isSign = true; // 回显到文字显示区域
-      this.detailsInfo.signImg = summary; // 回显到文字显示区域
+      this.detailsInfo.signImg = signImg; // 回显到文字显示区域
       this.detailsInfo.isSubmit = 1; // 提交状态
-      console.log("summary", summary);
-      this.submit("sign", this.detailsInfo.signImg);
+      this.realSave(this.detailsInfo);
     },
-    // 提交
-    submit(type = "sign", value = "") {
-      const all_data = this.all_data; //获取全部数据
-      let params = this.detailsInfo;
-      params.signImg = value;
-      console.log("all_data", all_data);
-      const index = all_data.findIndex((element) => element.uid == this.uid);
-
-      all_data[index] = params;
-      const logContent = getLogContent(LOG_TYPE_ENUM.sys, "数据同步", "同步");
-      // 更新巡检list
-      console.log("all_data存储", all_data);
-      console.log("all_data一个", all_data[index]);
-      this.$store.commit("SET_ALL_DATA", 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;
-      logContent.inspectionType = params.inspectionType;
-      log_list.push(logContent);
-      this.$store.commit("SET_LOG_LIST", log_list);
-      addLog(log_list).then((res) => {
-        console.log("日志文件写入成功");
-      });
-      uni.showToast({
-        title: type == "sign" ? "签字成功" : "同步成功",
-        icon: "success",
+    realSave(params, type = "sign") {
+      const send = dataToSql(params);
+      const api = this.uid ? inspectApi.update : inspectApi.save;
+      api(this.uid ? { id: this.uid, ...send } : send).then((res) => {
+        console.log("保存成功");
+
+        let logContent = "";
+
+        if (this.uid) {
+          params.uid = this.uid;
+          logContent = getLogContent(
+            LOG_TYPE_ENUM.edit,
+            `${params.recordName}(${params.inspectionCode})`,
+            "巡检模块"
+          );
+        } else {
+          this.uid = params.uid = new Date().getTime(); // 唯一标识 pad 端使用
+          logContent = getLogContent(
+            LOG_TYPE_ENUM.add,
+            `${params.recordName}(${params.inspectionCode})`,
+            "巡检模块"
+          );
+        }
+
+        // 更新日志
+        const log_list = this.$store.state.log_list;
+        logContent.inspectionType = params.inspectionType;
+        log_list.push(logContent);
+        this.$store.commit("SET_LOG_LIST", log_list);
+
+        addLog(log_list).then((res) => {
+          console.log("日志文件写入成功");
+        });
+
+        uni.showToast({
+          title: type == "sign" ? "签字成功" : "同步成功",
+          icon: "success",
+        });
       });
     },
     back() {

pages/inspectionContent/inspectionContentNew.vue

@@ -167,6 +167,7 @@ import xfxt from "./components/xfxt.vue"; //消防系统
 import xlqk from "./components/xlqk.vue"; //线路情况
 import qt from "./components/qt.vue"; //其它
 import startDialog from "./components/dialog.vue";
+import { cloneDeep } from "lodash";
 
 export default {
   components: {
@@ -487,15 +488,51 @@ export default {
           return true;
         }
       }
-
       // 所有 inspectionResult 都为 0，返回 false（正常）
       return false;
     },
-    realSave(data) {
-      const send = dataToSql(data);
+    realSave(params, isSubmit) {
+      const send = dataToSql(params);
       const api = this.uid ? inspectApi.update : inspectApi.save;
       api(this.uid ? { id: this.uid, ...send } : send).then((res) => {
         console.log("保存成功");
+
+        let logContent = "";
+
+        if (this.uid) {
+          params.uid = this.uid;
+          logContent = getLogContent(
+            LOG_TYPE_ENUM.edit,
+            `${params.recordName}(${params.inspectionCode})`,
+            "巡检模块"
+          );
+        } else {
+          this.uid = params.uid = new Date().getTime(); // 唯一标识 pad 端使用
+          logContent = getLogContent(
+            LOG_TYPE_ENUM.add,
+            `${params.recordName}(${params.inspectionCode})`,
+            "巡检模块"
+          );
+        }
+
+        // 更新日志
+        const log_list = this.$store.state.log_list;
+        logContent.inspectionType = params.inspectionType;
+        log_list.push(logContent);
+        this.$store.commit("SET_LOG_LIST", log_list);
+
+        addLog(log_list).then((res) => {
+          console.log("日志文件写入成功");
+        });
+
+        if (isSubmit) {
+          this.startDialog();
+        } else {
+          uni.showToast({
+            title: "暂存成功",
+            icon: "none",
+          });
+        }
       });
     },
     // 提交
@@ -512,70 +549,13 @@ export default {
       }
       const params = this.getParams(isSubmit); //数据获取
       console.log("提交时获取一次", params);
-
-      this.realSave(params);
-
-      // const all_data = this.$store.state.all_data; //获取全部数据
-      let logContent = "";
-      console.log("all_data", this.all_data);
-      if (this.uid) {
-        const index = this.all_data.findIndex(
-          (element) => element.uid == this.uid
-        );
-        params.uid = this.uid;
-
-        this.all_data[index] = params;
-        logContent = getLogContent(
-          LOG_TYPE_ENUM.edit,
-          `${params.recordName}(${params.inspectionCode})`,
-          "巡检模块"
-        );
-      } else {
-        this.uid = params.uid = new Date().getTime(); // 唯一标识 pad 端使用
-        this.all_data.push(params);
-        logContent = getLogContent(
-          LOG_TYPE_ENUM.add,
-          `${params.recordName}(${params.inspectionCode})`,
-          "巡检模块"
-        );
-      }
-      // 更新巡检list
-      const userInfo = this.userInfo;
-      console.log("all_data存储", this.all_data);
-      this.$store.commit("SET_ALL_DATA", this.all_data);
-      const inspectList = this.all_data.filter(
-        (item) => item.createByName == userInfo.user
-      );
-
-      console.log("inspectList", inspectList);
-      writeInspectionData(inspectList, userInfo.user);
-
-      // 更新日志
-      const log_list = this.$store.state.log_list;
-      logContent.inspectionType = params.inspectionType;
-      log_list.push(logContent);
-      this.$store.commit("SET_LOG_LIST", log_list);
-      addLog(log_list).then((res) => {
-        console.log("日志文件写入成功");
-      });
-
-      // 清空基础缓存信息
-      // this.$store.commit("SET_TEMP_DATA", {}); // 缓存[巡检信息]
-      // uni.showToast({
-      //   title: isSubmit ? "提交成功" : "保存草稿成功",
-      //   icon: "success",
-      // });
-      if (isSubmit) {
-        this.startDialog();
-      } else {
-        uni.showToast({
-          title: "暂存成功",
-          icon: "none",
-        });
-      }
+      this.realSave(params, isSubmit);
     },
     startDialog() {
-      let allIsSubmitOne = this.listData.every((item) => item.isSubmit === 1);
+      console.log("startDialog", this.listData);
+
+      let allIsSubmitOne = this.listData.every((item) => item.isSubmit == 1);
+
       this.allIsSubmitOne = allIsSubmitOne;
       console.log("是否全部完成", allIsSubmitOne);
       console.log("this.listData", this.listData);
@@ -751,12 +731,10 @@ export default {
       this.switchTab((this.activeTab + 1) % this.tabs.length);
     },
     setQtValue(data) {
+      console.log("setQtValue", data);
       this.detailsInfo.originData.forEach((item) => {
-        if (item.details && item.details.qt && item.details.qt.detail) {
-          item.details.qt.detail.forEach((current) => {
-            item.conclusion = data.conclusion;
-            item.photos = data.photos;
-          });
+        if (item.details) {
+          item.details.qt = data;
         }
       });
       console.log("setQtValue", this.detailsInfo);

pages/inspectionContent/shared.js

@@ -63,6 +63,7 @@ export function sqlToData(sqlData) {
     originData,
     inspectionNumber,
     allIsSubmitOne,
+    isSign: !!sqlData.signImg,
   };
 
   return ret;