feat: add api

api/assRoom.js

@@ -25,6 +25,7 @@ export default {
     if (res && res.length > 0) {
       return res[0];
     }
+    return null;
   },
   async remove(id) {
     if (!id) {

pages/inspectionContent/components/dczt.vue

@@ -99,7 +99,7 @@ export default {
     },
     // 父组件传递的巡检类型
     jfType: {
-      type: Number,
+      type: [Number, String],
       default: 0,
     },
     // 父组件传递的巡检事项名

pages/inspectionContent/components/sbgj.vue

@@ -316,7 +316,7 @@ export default {
           const isAllFull = item.cabinets.every((cabinet) => {
             return cabinet.deviceId && cabinet.UpositonS && cabinet.UpositonE;
           });
-          if (!item.conclusion || !isAllFull || cabinet.photos.length > 0) {
+          if (!item.conclusion || !isAllFull || !item.photos.length) {
             return false;
           }
         } else {

pages/inspectionContent/inspectionContentList.vue

@@ -276,12 +276,22 @@ export default {
     },
     init(baseList) {
       return new Promise((resolve, reject) => {
+        const roomFeatureMap = {
+          1: "1",
+          2: "0",
+          3: "2",
+        };
         let list = baseList.map((item, index) => {
+          const jfType = roomFeatureMap[item.roomFeature];
           return {
             id: item.id,
             name: item.roomName,
             value: item.dictValue,
-            jfType: item.roomFeature, // 机房类型枚举：1.汇聚机房，2.屏蔽机房，3.UPS机房，4.数据机房
+            /** 只是为了映射jfType，为了兼容之前的逻辑
+             * 前端用的：jfType 机房类型 0屏蔽  1汇聚  2电池间（1） 3电池间（2）
+             * roomFeature 机房类型枚举：1.汇聚机房，2.屏蔽机房，3.UPS机房，4.数据机房
+             */
+            jfType: item.dictValue == "11" ? "3" : jfType,
             isVaild: false, // 校验通过
             status: 0,
             statusLable: "未巡检",
@@ -497,7 +507,6 @@ export default {
       let params = this.detailsInfo;
       params.signImg = value;
       console.log("all_data", all_data);
-      console.log("all_data", all_data);
       const index = all_data.findIndex((element) => element.uid == this.uid);
 
       all_data[index] = params;

pages/inspectionContent/inspectionContentNew.vue

@@ -131,9 +131,8 @@
       >
         下一项
       </view>
-      <view v-if="value > 2" class="action-btn" @click="normal">
-        一键正常
-      </view>
+      <!-- v-if="value > 2" -->
+      <view class="action-btn" @click="normal"> 一键正常 </view>
     </view>
     <startDialog
       ref="startDialog"
@@ -145,6 +144,9 @@
 </template>
 
 <script>
+import assRoomApi from "@/api/assRoom.js";
+import { dataToSql } from "./shared";
+
 import {
   pad_all_inspection_position,
   tabsInfo1,
@@ -218,6 +220,8 @@ export default {
       paramsObjFirst: {},
       all_data: [],
       imgSrc: "",
+      // 我新增的
+      jfList: [],
     };
   },
   computed: {
@@ -259,8 +263,16 @@ export default {
   watch: {},
   mounted() {
     this.itemDetail = this.getAllChildFormData();
+    this.getRoomList();
   },
   methods: {
+    getRoomList() {
+      return assRoomApi.selectRoomList(1).then((res) => {
+        console.log("机房列表Content", res);
+        this.jfList = res;
+        return res;
+      });
+    },
     // 初始化
     init() {
       console.log("查看tabs", this.tabs);
@@ -334,6 +346,7 @@ export default {
     },
     // 处理提交数据
     getParams(isSubmit) {
+      console.log("this.getParams", this.uid, this.value);
       if (this.uid) {
         let posItem = this.detailsInfo.originData[this.value - 1];
         let paramsObj = this.getAllChildFormData(); //获取所有数据
@@ -366,11 +379,22 @@ export default {
       } else {
         let baseInfo = this.baseInfo;
         let paramsObj = this.getAllChildFormData(); //获取所有数据
-        let dataObj = pad_all_inspection_position.rows.map((item, index) => {
+        const roomFeatureMap = {
+          1: "1",
+          2: "0",
+          3: "2",
+        };
+        let dataObj = this.jfList.map((item, index) => {
+          const jfType = roomFeatureMap[item.roomFeature];
           return {
-            name: item.dictLabel,
+            id: item.id,
+            name: item.roomName,
             value: item.dictValue,
-            jfType: item.jfType,
+            /** 只是为了映射jfType，为了兼容之前的逻辑
+             * 前端用的：jfType 机房类型 0屏蔽  1汇聚  2电池间（1） 3电池间（2）
+             * roomFeature 机房类型枚举：1.汇聚机房，2.屏蔽机房，3.UPS机房，4.数据机房
+             */
+            jfType: item.dictValue == "11" ? "3" : jfType,
             isVaild: false, // 校验通过
             details: this.paramsObjFirst,
             status: item.status,
@@ -471,6 +495,12 @@ export default {
       // 所有 inspectionResult 都为 0，返回 false（正常）
       return false;
     },
+    realSave(data) {
+      const send = dataToSql(data);
+      assRoomApi.saveBatch([send]).then((res) => {
+        console.log(res);
+      });
+    },
     // 提交
     submit(isSubmit = 1) {
       console.log("提交时查看一下数据", this.getAllChildFormData());
@@ -485,6 +515,9 @@ 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);

pages/inspectionContent/shared.js

+import moment from "moment";
+import store from "@/store";
+
+// 将现有机房巡检数据转换为SQL数据所需要格式
+export function dataToSql(data) {
+  let synFlag = 0;
+  if (data.isSubmit == 0) {
+    synFlag = 0;
+  } else {
+    synFlag = data.synchronization;
+  }
+  const send = {
+    inspectionType: data.inspectionType,
+    inspectionCode: data.inspectionCode,
+    recordName: `${moment().format("yyyyMMDD")}-机房巡检`,
+    inspectionTime: moment().format("yyyy-MM-DD HH:mm"),
+    isException: data.isException,
+    inspectionNumber: data.inspectionNumber,
+    userId: store.state.now_user.userId,
+    userName: store.state.now_user.user,
+    synFlag: synFlag, // 0.未同步，1.已同步，2.编辑
+    signImg: data.signImg,
+    createBy: store.state.now_user.userId,
+    creatTime: data.id ? data.creatTime : `${new Date().getTime()}`,
+    updateTime: `${new Date().getTime()}`,
+    inspectionData: data.originData,
+
+    // isSubmit: 1,
+    // isSign: false,
+    // signImg: "",
+    // conclusion: "",
+    // creatTime: "1744023337279",
+    // items: [],
+    // synchronization: 0,
+    // submitTime: "2025-04-07",
+    // submitMonth: "2025-04",
+    // originData: data.originData,
+  };
+  console.log("dataToSql", send);
+  return send;
+}