fix: bugs

api/user.js

@@ -26,7 +26,7 @@ export default {
 			let {
 				account,
 				pwd
-			} = data
+			} = data
 			const sql = `select * from ${table.userName} where user = '${account}' AND passWord ='${pwd}'`
 			let res = await sqllitedb.selectSQL(sql);
 

pages/inspectionContent/components/afxt.vue

@@ -223,10 +223,9 @@ export default {
       const isAllOne = this.areAllInspectionResultsOne(this.itemData.detail);
       this.itemData.isValid = isValid;
       this.itemData.inspectionItem = this.inspectionItem;
-      console.log(222, this.itemData);
       this.itemData.status = isAllOne.status; //1表示已经巡检过没有异常
-      this.itemData.statusLabel = isAllOne.statusLabel;
-      // console.log(this.itemData);
+      this.itemData.statusLabel = isAllOne.statusLabel;
+			console.log('afxt', this.itemData);
       return this.itemData;
     },
     // 数据校验方法 true说明有未填项
@@ -249,7 +248,7 @@ export default {
       console.log("确定需要校验的范围 ", itemsToCheck);
       // 检查 conclusion 和 photos（如果存在）
       for (const item of itemsToCheck) {
-        if (item.inspectionResult === 0) {
+        if (item.inspectionResult === 0 || item.inspectionResult === 2) {
           continue; // 跳过检查
         }
         if ("conclusion" in item && !item.conclusion) {

pages/inspectionContent/components/customPopup.vue

@@ -127,7 +127,7 @@ export default {
         "需处理",
 				"已处理"
       ];
-    },
+    }
   },
 };
 </script>
@@ -142,8 +142,9 @@ export default {
   background: rgba(0, 0, 0, 0.5);
   display: flex;
   align-items: center;
-  justify-content: center;
-  z-index: 999999;
+  justify-content: center;
+	// pointer-events: none;
+  z-index: 999999;
   .synchronous-content {
     padding: 3% 20px 32px 24px;
     width: 400px;

pages/inspectionContent/components/detail.vue

@@ -287,13 +287,36 @@
             class="cards-item"
           >
             <view class="name"
-              >{{ item.label }}{{ index === 0 ? `(${item.setting})` : ""
-              }}<text
-                class="status"
-                :class="{ warning: item.inspectionResult === 1 }"
-                >{{ item.inspectionResultLable }}</text
-              ></view
-            >
+              >
+							<template v-if="index==0">
+								<view>
+										{{  item.label }} 
+										<text
+											class="status"
+											:class="{ warning: item.inspectionResult === 1 }"
+											>{{ item.inspectionResultLable }}
+										</text>
+								</view>
+								<!-- <text>
+									{{  item.settingLabel }} {{  `(${item.setting})` }}
+								</text> -->
+							</template>
+							<template v-else>
+								{{  item.label }} 
+								<text
+									class="status"
+									:class="{ warning: item.inspectionResult === 1 }"
+									>{{ item.inspectionResultLable }}
+								</text>
+							</template>
+							</view
+            >
+						<view v-if="index==0" class="list">
+						  <view class="label" style="width: 70px;">{{item.settingLabel}}：</view>
+						  <view class="content">
+						    {{ item.setting }}
+						  </view>
+						</view>
             <view class="list">
               <view class="label">情况描述：</view>
               <view class="content">

pages/inspectionContent/components/dialog.vue

@@ -66,7 +66,8 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  text-align: center;
+  text-align: center;
+	z-index: 99999;
   .synchronous-content {
     padding: 25.6px 19.2px;
     width: 420px;

pages/inspectionContent/inspectionContentNew.vue

@@ -126,7 +126,7 @@
       </view>
       <!-- v-if="value > 2" -->
 			<view class="action-btn complete-btn" @click="submit(1)"> 完成巡检 </view>
-      <view class="action-btn" @click="normal"> 一键正常 </view>
+      <!-- <view class="action-btn" @click="normal"> 一键正常 </view> -->
     </view>
     <startDialog
       ref="startDialog"
@@ -1154,10 +1154,10 @@ export default {
   gap: 16px;
   left: 50%;
   transform: translateX(-50%);
-  bottom: 25.6px;
+  bottom: 20px;
 
   .action-btn {
-    width: 145.6px;
+    width: 118px;
     height: 38.4px;
     line-height: 38.4px;
     background: #ffffff;

pages/login/login.vue

@@ -13,7 +13,7 @@
 					<uni-easyinput v-if="passwordVisible" class="log-input" prefixIcon="locked" clearSize="0"
 						v-model="person.pwd" @iconClick="togglePasswordVisible" :placeholder="passwordPlaceholder"
 						:passwordIcon="false" :type="passwordVisible ? 'text' : 'password'"></uni-easyinput>
-					<uni-easyinput v-else class="log-input" prefixIcon="locked-filled" clearSize="0" v-model="person.pd"
+					<uni-easyinput v-else class="log-input" prefixIcon="locked-filled" clearSize="0" v-model="person.pwd"
 						@iconClick="togglePasswordVisible" :placeholder="passwordPlaceholder" :passwordIcon="false"
 						:type="passwordVisible ? 'text' : 'password'"></uni-easyinput>
 				</view>
@@ -44,8 +44,8 @@
 		data() {
 			return {
 				person: {
-					account: "管理员",
-					pwd: "Gly@124",
+					account: "", // "管理员",
+					pwd: "" // Gly@124",
 				},
 				backButtonPress: 0,
 				personList: [],
@@ -89,7 +89,7 @@
 				this.passwordVisible = !this.passwordVisible;
 			},
 			// 点击登录
-			async login() {
+			async login() {
 				userApi.login(this.person).then((res) => {
 					if (res.data) {
 						this.personList = res.data;