feat: update inspect

api/log.js

@@ -45,7 +45,7 @@ export default {
 			        '${data.LastSynchronizationTime || ""}',
 			        '${data.avatar || ""}',
 			        '${data.detail || ""}',
-			        ${data.isAdmin},
+			        '${data.isAdmin}',
 			        '${data.level}',
 			        '${data.module}',
 			        '${data.passWord}',

pages/inspectionContent/components/dczt.vue

@@ -25,15 +25,8 @@
             {{ item.lableArr[1] }}
           </view>
         </view>
-        <!-- <input
-          v-if="'value' in item"
-          class="input"
-          v-model="item.value"
-          type="text"
-          placeholder="请输入"
-          maxlength="3"
-        /> -->
-        <template v-if="'value' in item">
+        <!--
+				 <template v-if="'value' in item">
           <NumberInput
             v-if="index == 0"
             class="input"
@@ -63,8 +56,8 @@
 					 />
 				 </template>
         </template>
-
-        {{ item.unit }}
+        {{ item.unit }} 
+				-->
       </view>
       <template v-if="item.inspectionResult === 1">
         <view v-if="'conclusion' in item" class="form-item">
@@ -148,7 +141,7 @@ export default {
             settingLabel: "设定电池电压",
             settingLabelShow: "设定电压",
             setting: this.jfType === "3" ? "10V-15V" : "2V-3V", //设定温度值
-            value: "", //输入温度
+            // value: "", //输入温度
             unit: "V", //单位
             photos: [],
           },
@@ -163,7 +156,7 @@ export default {
             settingLabel: "设定电池温度",
             settingLabelShow: "设定温度",
             setting: "15℃-30℃", //设定湿度值
-            value: "", //输入湿度
+            // value: "", //输入湿度
             unit: "℃", //单位
             photos: [],
           },
@@ -178,7 +171,7 @@ export default {
             settingLabel: "设定电池内阻",
             settingLabelShow: "设定内阻",
             setting: this.jfType === "3" ? "<10mΩ" : "<0.5mΩ", //设定湿度值
-            value: "", //输入湿度
+            // value: "", //输入湿度
             unit: "mΩ", //单位
             photos: [],
           },
@@ -279,12 +272,13 @@ export default {
       // 遍历每一项进行检查
       for (const item of details) {
         if (item.inspectionResult === 0) {
-					if (!item.value) {
-					  return false;
-					}
+					// if ((item.hasOwnProperty("value") && !item.value)) {
+					//   return false;
+					// }
+					return true
         } else if (item.inspectionResult === 1) {
           // 如果 inspectionResult 为 1，检查 conclusion 和 photos
-          if (!item.conclusion || item.photos.length === 0 || !item.value) {
+          if (!item.conclusion || item.photos.length === 0 || (item.hasOwnProperty("value") && !item.value)) {
             return false;
           }
         } else {

pages/inspectionContent/components/detail.vue

@@ -118,10 +118,16 @@
                 {{ item.setting }}
               </view>
             </view>
-            <view class="list">
+          <!-- <view class="list">
               <view class="label">{{ item.sjLabelShow }}：</view>
               <view class="content"> {{ item.value }}{{ item.unit }} </view>
-            </view>
+            </view> -->
+						<view class="list">
+						  <view class="label">情况描述：</view>
+						  <view class="content">
+						    {{ item.conclusion }}
+						  </view>
+						</view>
             <view class="list">
               <view class="label">现场照片：</view>
               <view v-if="item.photos.length === 0" class="content">
@@ -293,7 +299,7 @@
               >
 							<template v-if="index==0">
 								<view>
-										{{  item.label }} （{{item.setting}}）
+										{{  item.label }} （气压范围：{{item.setting}}）
 										<text
 											class="status"
 											:class="{ warning: item.inspectionResult === 1 }"
@@ -311,7 +317,7 @@
 							</template>
 							</view
             >
-						<template v-if="index==0">
+						<!-- <template v-if="index==0">
 							<view class="list">
 								<view class="label" style="width: 70px;">{{item.settingLabel}}：</view>
 								<view class="content">
@@ -324,7 +330,7 @@
 									{{ item.value || '--' }} MPa
 								</view>
 							</view>
-						</template>
+						</template> -->
             <view class="list">
               <view class="label">情况描述：</view>
               <view class="content">

pages/inspectionContent/components/jfwsd.vue

@@ -124,7 +124,7 @@ export default {
         inspectionItem: "", //巡检事项
         detail: [
           {
-            label: "机房温度",
+            label: "实际温度",
             sjLabel: "实际温度",
             inspectionResult: "",
             inspectionResultLable: "正常",
@@ -137,7 +137,7 @@ export default {
             photos: [],
           },
           {
-            label: "机房湿度",
+            label: "实际湿度",
             sjLabel: "实际湿度",
             inspectionResult: "",
             inspectionResultLable: "正常",

pages/inspectionContent/components/xfxt.vue

@@ -25,15 +25,7 @@
             {{ item.lableArr[1] }}
           </view>
         </view>
-        <!-- <input
-          v-if="'value' in item && item.inspectionResult === 1"
-          class="input"
-          v-model="item.value"
-          type="text"
-          placeholder="请输入"
-          maxlength="3"
-        /> -->
-        <NumberInput
+       <!-- <NumberInput
           v-if="'value' in item && item.inspectionResult === 1"
           class="input"
           v-model="item.value"
@@ -42,8 +34,9 @@
           :min="0"
           placeholder="请输入"
         />
-        {{ item.inspectionResult === 1 ? item.unit : "" }}
-      </view>
+        {{ item.inspectionResult === 1 ? item.unit : "" }}
+				-->
+      </view> 
       <template v-if="item.inspectionResult === 1">
         <view v-if="'conclusion' in item" class="form-item">
           <text class="form-label"
@@ -139,8 +132,7 @@ export default {
             conclusion: "",
             settingLabel: "气压范围",
             setting: "2-4.2MPa", //设定气压
-            value: "", //请输入
-			sjLabel:'实际气压',// 新增显示
+						sjLabel:'实际气压',// 新增显示
             unit: "MPa", //单位
             photos: [],
           },

pages/inspectionContent/inspectionContentNew.vue

@@ -1152,7 +1152,7 @@ export default {
   justify-content: center;
   position: fixed;
   gap: 16px;
-  left: 50%;
+  left: 55%;
   transform: translateX(-50%);
   bottom: 20px;
 

pages/inspectionManagement/dialog.vue

@@ -154,14 +154,23 @@
 					});
 				// });
 			},
-			copyPhotos() {
+			async copyPhotos() {
+				const signImgList = []
 				this.list.forEach((e) => {
 					if (typeof e.inspectionData === "string") {
 						e.inspectionData = JSON.parse(e.inspectionData) || "{}";
-					}
+					}
+					if(e.signImg) {
+						signImgList.push(e.signImg.split("/").pop())
+					}
 				});
 				const urls = findPhotosUrls(this.list).map((url) => url.split("/").pop());
-				console.log("urls", urls);
+				console.log("urls", signImgList, urls);
+				await copySelectedFiles(
+					"_documents/data/sign",
+					`${SYNCHRONIZE_DATA_PAD}/发送数据`,
+					signImgList
+				);
 				return copySelectedFiles(
 					"_documents/data/photos",
 					`${SYNCHRONIZE_DATA_PAD}/发送数据`,