Merge branch 'dev' oft pus https://git.yfzx.zjtys.com.cn/privateNetwork/inspection-pad-web into dev

pages/inspectionContent/components/detail.vue

@@ -331,8 +331,8 @@
               }}<text
                 class="status"
                 :class="{ warning: item.inspectionResult === 1 }"
-                >{{ item.inspectionResultLable }}</text
-              ></view
+                >{{ item.inspectionResultLable }}
+              </text></view
             >
             <view class="list">
               <view class="label">情况描述：</view>

pages/inspectionContent/inspectionContentList.vue

@@ -202,6 +202,7 @@
             class="card"
             :class="{
               active: value === card.value,
+              warning: card.statusLable == '巡检异常',
             }"
           >
             <view class="card-content">
@@ -938,6 +939,16 @@ export default {
         border: 1px solid rgba(55, 116, 246, 1);
         box-shadow: 0px 0px 3px 0px rgba(55, 116, 246, 0.2);
       }
+      &.warning {
+        background: #fff5f4;
+        &.active {
+          border: 1px solid #ff4a34;
+        }
+        .status {
+          color: #ff4a34 !important;
+        }
+      }
+
       &.status1 {
         background: #f3f7ff;
         .status {
@@ -952,6 +963,7 @@ export default {
       }
       .card-content {
         padding: 6.4px;
+
         .first-row {
           display: flex;
           align-items: center;

pages/inspectionContent/inspectionContentNew.vue

@@ -16,13 +16,7 @@
     <!-- Tab 操作区域 -->
     <view class="module">
       <view class="location">{{ location }}</view>
-      <view
-        class="action-btn"
-        :class="canSubmit ? 'complete-btn' : 'disable-btn'"
-        @click="submit(1)"
-      >
-        完成巡检
-      </view>
+      <view class="action-btn complete-btn" @click="submit(1)"> 完成巡检 </view>
       <view class="tab-buttons">
         <view
           v-for="(tab, index) in tabs"