巡查和养护。失效状态的判断

刘淇
1 parent 67af4c8e
Showing 10 changed files with 81 additions and 41 deletions
App.vue
api/patrol-manage/patrol-plan.js
pages-sub/daily/maintain-manage/finish-plan-detail.vue
pages-sub/daily/maintain-manage/index.vue
pages-sub/daily/maintain-manage/road-detail-list.vue
pages-sub/daily/patrol-manage/add-patrol-record.vue
pages-sub/daily/patrol-manage/finish-plan-detail.vue
pages-sub/daily/patrol-manage/pending-plan-detail.vue
pages.json
pages/mine/index.vue
@@ -50,6 +50,35 @@ page {
 // 卡片列表样式
 .common-card-list {
+  .card-header{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    .common-name{
+      flex: 1; // 占满剩余空间，挤压标签到右侧
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #333;
+      // 关键：单行文本溢出省略
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      // 与标签保持间距
+      margin-right: 16rpx;
+    }
+    // 已失效标签样式
+    .common-invalid-tag {
+      color: #f56c6c;
+      font-size: 24rpx;
+      flex-shrink: 0; // 禁止标签被压缩
+    }
+    .common-finish-tag{
+      color: #5ac725;
+      font-size: 24rpx;
+      flex-shrink: 0; // 禁止标签被压缩
+    }
+  }
   .common-card-title {
   }
@@ -26,7 +26,7 @@ export const inspectioDetailByPlanno = (params) =&gt; {
 };
 /**
- *  巡查计划完成详情
+ *  巡查计划创建
  * @returns {Promise}
  */
 export const inspectionCreate = (data) => {
@@ -71,7 +71,7 @@
               <view  style="min-width: 200rpx">巡查描述</view>
             </template>
             <template #value>
-              <view  class="up-line-1">{{i.remark || '--'}}</view>
+              <view  class="up-line-1" style="color: #606266">{{i.remark || '--'}}</view>
             </template>
           </up-cell>
@@ -138,7 +138,7 @@
               <view class="u-body-item u-flex common-item-center common-justify-between">
                 <view class="u-body-item-title">计划完成次数： {{ item.planNum || 0 }}</view>
-                <view class="u-line-1">
+                <view class="u-line-1" v-if="item.finishState!==3">
                   <up-button
                       type="primary"
                       size="mini"
@@ -330,6 +330,7 @@ onShow(()=&gt;{
 <style scoped lang="scss">
 // 吸顶区域样式
 .sticky-wrap {
+  margin-top: -10rpx;
   background-color: #fff;
   padding-bottom: 10rpx;
   border-bottom: 1px solid #eee;
@@ -53,12 +53,12 @@
         >
           <!-- 自定义标题区域 -->
           <template #head>
-            <view class="card-header">
-              <view class="common-card-title  u-line-1">{{ item.planName || '无计划名称' }}</view>
-              <!-- 已失效标识 -->
-              <up-text type="error" v-if="item.finishState === '3'"  text="错误" class="invalid-tag"></up-text>
-<!--              <view v-if="item.finishState === '3'" class="invalid-tag">已失效</view>-->
-            </view>
+              <view class="card-header">
+                <view class="common-card-title common-name">{{ item.planName || '无计划名称' }}{{ item.planName || '无计划名称' }}</view>
+                <!-- 已失效标识 -->
+                <view v-show="item.finishState == 3 "  class="common-invalid-tag">已失效</view>
+                <view v-show="item.finishState == 2 "  class="common-finish-tag">已完成</view>
+              </view>
           </template>
           <template #body>
@@ -83,12 +83,34 @@
                       @click="submitRecord(item)"
                       class="submit-record-btn"
-                      :disabled="item.finishState === '3'"
-                      :class="{ 'disabled-btn': item.finishState === '3' }"
+                      :disabled="item.finishState == 3"
+
                   >
-                    {{ item.finishState === '3' ? '补交记录' : '提交记录' }}
+                    {{ item.finishState ==3 ? '补交记录' : '提交记录' }}
                   </up-button>
+
+<!--                  :class="{ 'disabled-btn': item.finishState ==3 }"-->
+<!--                  <up-button-->
+<!--                      v-if="item.finishState ==3"-->
+<!--                      type="primary"-->
+<!--                      size="mini"-->
+<!--                      @click=""-->
+<!--                      class="submit-record-btn"-->
+<!--                      :disabled="true"-->
+<!--                  >-->
+<!--                    补交记录-->
+<!--                  </up-button>-->
+
+<!--                  <up-button-->
+<!--                      v-if="item.finishState !== '3' && item.planFinishNum>0"-->
+<!--                      type="primary"-->
+<!--                      size="mini"-->
+<!--                      @click="gotoFinishPlanDetail(item)"-->
+<!--                      class="submit-record-btn"-->
+<!--                  >-->
+<!--                    提交记录-->
+<!--                  </up-button>-->
                 </view>
               </view>
@@ -138,7 +160,7 @@ const getUrlParams = (options) =&gt; {
   }
   if (options?.finish_state) {
     finishState.value = options.finish_state
-    activeStatus.value = options.finish_state
+    // activeStatus.value = options.finish_state
     console.log('从URL获取的finish_state：', finishState.value)
   }
 }
@@ -174,7 +196,7 @@ const queryList = async (pageNo, pageSize) =&gt; {
       pageNo: pageNo,
       pageSize: pageSize,
       roadId: roadId.value,
-      finishState: finishState.value || activeStatus.value,
+      finishState: activeStatus.value,
       planName: searchValue.value.trim()
     }
     console.log('请求参数：', paramsData)
@@ -206,6 +228,7 @@ onShow(() =&gt; {
 }
 // 顶部吸顶区域样式
 .sticky-header {
+  margin-top: -10rpx;
   background-color: #ffffff;
   padding-bottom: 10rpx;
   border-bottom: 1px solid #eee;
@@ -215,21 +238,6 @@ onShow(() =&gt; {
   }
 }
-// 卡片头部样式
-.card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-// 禁用按钮样式
-.disabled-btn {
-  background-color: #c0c4cc !important;
-  border-color: #c0c4cc !important;
-  color: #fff !important;
-  pointer-events: none; // 防止点击
-  opacity: 0.7;
-}
 </style>
 \ No newline at end of file
@@ -268,7 +268,7 @@ export default {
           "inspectionState": this.inspectForm.isWorkOrder,
           "transState": this.inspectForm.isWorkOrder==1?'1':'2',
           "transWorkNo": "default'",
-          "remark": this.inspectForm.isWorkOrder
+          "remark": this.inspectForm.content
         }
         // 显示加载中
@@ -72,7 +72,7 @@
               <view  style="min-width: 200rpx">巡查描述</view>
             </template>
             <template #value>
-              <view  class="up-line-1">{{i.remark || '--'}}</view>
+              <view  class="up-line-1" style="color: #606266">{{i.remark || '--'}}</view>
             </template>
           </up-cell>
@@ -11,10 +11,13 @@
         <!-- 自定义标题区域 -->
         <template #head>
           <view class="card-header">
-            <view class="common-card-title  u-line-1">{{ item.planName || '无计划名称' }}</view>
+            <view class="common-card-title common-name">{{ item.planName || '无计划名称' }}{{
+                item.planName || '无计划名称'
+              }}
+            </view>
             <!-- 已失效标识 -->
-            <up-text type="error" v-if="item.finishState === '3'"  text="错误" class="invalid-tag">已失效</up-text>
-            <!--              <view v-if="item.finishState === '3'" class="invalid-tag">已失效</view>-->
+            <view v-show="item.finishState == 3 " class="common-invalid-tag">已失效</view>
+            <view v-show="item.finishState == 2 " class="common-finish-tag">已完成</view>
           </view>
         </template>
@@ -35,10 +38,10 @@
               <view class="u-body-item-title">计划完成次数： {{ item.planNum || 0 }}</view>
               <view class="u-line-1">
                 <up-button
-                    v-if="item.finishState === '3'"
+                    v-if="item.finishState ==3"
                     type="primary"
                     size="mini"
-                    @click="gotoFinishPlanDetail(item)"
+                    @click=""
                     class="submit-record-btn"
                     :disabled="true"
                 >
@@ -46,7 +49,7 @@
                 </up-button>
                 <up-button
-                    v-if="item.finishState !== '3' && item.planFinishNum>0"
+                    v-if="item.finishState !== 3 && item.planFinishNum > 0"
                     type="primary"
                     size="mini"
                     @click="gotoFinishPlanDetail(item)"
@@ -130,8 +133,6 @@ const getPlanDetail = async () =&gt; {
 const gotoFinishPlanDetail = (i) => {
   uni.navigateTo({
     url: `/pages-sub/daily/patrol-manage/finish-plan-detail?planNo=${i.planNo}`
-
-
   });
 };
 // 新增记录
@@ -144,4 +145,5 @@ const addNewRecord = () =&gt; {
 <style scoped lang="scss">
+
 </style>
 \ No newline at end of file
@@ -47,7 +47,7 @@
 				{
 					"path": "patrol-manage/finish-plan-detail",
 					"style": {
-						"navigationBarTitleText": "已完成计划明细",
+						"navigationBarTitleText": "已完成详情",
 						"enablePullDownRefresh": false
 					}
 				},
@@ -80,7 +80,7 @@ const confirmLogout = async () =&gt; {
     if (res.confirm) {
       await userStore.logout()
-      uni.showToast({ title: '退出登录成功', type: 'success' })
+      // uni.showToast({ title: '退出登录成功', type: 'success' })
     }
   } catch (error) {
     console.error('退出登录失败：', error)