fix: bug修改

components/customCard/customCard.vue

@@ -1,8 +1,8 @@
 <template>
   <view class="custom-card">
     <view class="custom-card-header">
-      <view class="custom-card-action" @tap="BackPage">
-        <u-icon name="arrow-left" color="#333333" size="32rpx" />
+      <view class="custom-card-action">
+        <u-icon name="arrow-left" color="#333333" size="32rpx" @tap="BackPage"/>
         <view class="custom-card-action-text">
           <slot name="backText"></slot>
         </view>

pages/cb/shuifeizs/components/base.vue

@@ -36,7 +36,8 @@ export default {
   background: linear-gradient(180deg, #edfbfb 0%, #d2f2ed 100%);
   margin-bottom: 30rpx;
   .base-list {
-    width: 100%;
+    width: calc(100% - 32rpx);
+    padding: 0 16px;
     display: grid;
     grid-template-columns: repeat(4, 1fr);
     .base-item {

pages/cb/shuifeizs/components/facilitystate.vue

@@ -116,7 +116,7 @@ export default {
           }
         }
       })
-      return current?.value
+      return current?.value || '0'
     },
     getBottomDeviceName(list){
       let current = {}
@@ -128,7 +128,7 @@ export default {
           }
         }
       })
-      return current?.value
+      return current?.value || '0'
     },
     getJSCurrentValue(list){
       // 进水阀

pages/cb/shuifeizs/control.vue

@@ -212,20 +212,20 @@ uni-page-body {
       }
       .borderTopRadius {
         position: absolute;
-        width: 30rpx;
-        height: 30rpx;
-        right: -4rpx;
-        top: -20rpx;
+        width: 40rpx;
+        height: 40rpx;
+        right: 10rpx;
+        top: -32rpx;
         transform: rotate(90deg);
         z-index: 100;
       }
       .borderBottomRadius {
         position: absolute;
+        z-index: 100;
         width: 40rpx;
         height: 40rpx;
-        right: -0rpx;
-        bottom: -30rpx;
-        z-index: 100;
+        bottom: -32rpx;
+        right: 10rpx;
       }
     }
     .control-list-right {

pages/cb/shuifeizs/detail.vue

@@ -65,35 +65,35 @@ export default {
           url: '',
         },
         {
-          icon: timing,
-          title: '定时计划',
-          url: '',
-        },
-        {
-          icon: masterStop,
-          title: '总停',
-          url: '',
-        },
-        {
-          icon: fertilizationFormula,
-          title: '施肥配方',
-          url: '',
-        },
-        {
-          icon: backwashControl,
-          title: '反冲洗控制',
-          url: '',
-        },
-        {
-          icon: basicSetting,
-          title: '基础设置',
-          url: '',
-        },
-        {
           icon: operatingRecord,
           title: '操作记录',
           url: '/pages/cb/shuifeizs/history',
         },
+        // {
+        //   icon: timing,
+        //   title: '定时计划',
+        //   url: '',
+        // },
+        // {
+        //   icon: masterStop,
+        //   title: '总停',
+        //   url: '',
+        // },
+        // {
+        //   icon: fertilizationFormula,
+        //   title: '施肥配方',
+        //   url: '',
+        // },
+        // {
+        //   icon: backwashControl,
+        //   title: '反冲洗控制',
+        //   url: '',
+        // },
+        // {
+        //   icon: basicSetting,
+        //   title: '基础设置',
+        //   url: '',
+        // },
       ],
       ggbCurrent: {},
       sfbCurrent: {},

pages/cb/shuifeizs/history.vue

@@ -35,7 +35,9 @@
             v-for="(item, index) in historyList"
             :key="index"
           >
-            <view class="form-content__item">{{ item.oprecdName }}</view>
+            <view class="form-content__item form-content__item--text">{{
+              item.oprecdName
+            }}</view>
             <view class="form-content__item">
               <view class="item-open" v-if="item.oprecdContent == '打开'"
                 >打开</view
@@ -297,6 +299,15 @@ uni-page-body {
           font-weight: 400;
         }
       }
+      &__item--text {
+        width: 20%;
+        margin-left: 5%;
+        // 超出隐藏
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        text-align: left;
+      }
     }
   }
 }

pages/cb/shuifeizs/rotationflow.vue

@@ -10,7 +10,7 @@
         <image :src="water" class="rotate-water" />
         <view class="rotationflow-time">
           <view class="rotationflow-time-title" style="font-size: 28px">{{
-            currentFq.name
+            currentFq.name || '--'
           }}</view>
           <!-- <view class="rotationflow-time-content"> {{ time }}</view> -->
           <view class="rotationflow-time-label">{{ label }}</view>
@@ -323,10 +323,11 @@ uni-page-wrapper {
     ),
     linear-gradient(102deg, #bfeadd 6.77%, #b8f1e7 40.15%, #b9eef5 84.02%);
   width: 100%;
-  height: calc(100% - 140rpx);
+  height: calc(100vh - 100rpx);
   overflow: hidden;
   overflow-y: scroll;
   margin-bottom: 140rpx;
+  position: relative;
   .rotationflow-top {
     height: 500rpx;
     width: 100%;
@@ -389,11 +390,11 @@ uni-page-wrapper {
           text-align: center;
         }
         .rotationflow-time-label {
-          width: 100rpx;
+          width: 140rpx;
           color: #687a74;
           text-align: left;
           font-family: 'Source Han Sans CN VF';
-          font-size: 24rpx;
+          font-size: 32rpx;
           font-weight: 400;
         }
       }
@@ -401,7 +402,7 @@ uni-page-wrapper {
   }
   .rotationflow-middle {
     display: flex;
-    padding: 0 32rpx;
+    padding: 0 48rpx;
     margin: 32rpx 0;
     .rotationflow-middle-item {
       width: 25%;
@@ -433,7 +434,7 @@ uni-page-wrapper {
     background-color: #fff;
     border-radius: 16rpx;
     padding: 32rpx;
-    width: calc(100% - 64rpx);
+    width: calc(100% - 128rpx);
     margin-left: 32rpx;
     margin-bottom: 140rpx;
     &::before {
@@ -502,14 +503,13 @@ uni-page-wrapper {
       .rotationflow-content-list-item {
         display: flex;
         justify-content: space-between;
-        margin-top: 8rpx;
+        margin: 16rpx 0;
         color: #042118;
         text-align: right;
         font-family: 'Source Han Sans CN VF';
         font-size: 28rpx;
         font-weight: 400;
         .rotationflow-content-list-item-desc {
-          margin-right: 32rpx;
         }
         .rotationflow-content-list-item-current {
           color: #14a478;
@@ -541,6 +541,7 @@ uni-page-wrapper {
     align-items: center;
     background: #fff;
     box-shadow: 0 -4rpx 8rpx 0 #00000026;
+    z-index: 9999;
     .rotationflow-footer-item {
       width: calc(100% - 64rpx);
       margin: 0 32rpx;

pages/cb/wenshizs/components/OperationCard.vue

@@ -3,19 +3,19 @@
     <view
       class="operation__header"
       :class="
-        dourceData.local_model == '0'
+        dourceData.local_model == '1'
           ? 'operation__header--info'
           : 'operation__header--warn'
       "
       >{{ dourceData.name }}
       <view
         :class="
-          dourceData.local_model == '0'
+          dourceData.local_model == '1'
             ? 'operation__header--infoing'
             : 'operation__header--warning'
         "
       >
-        {{ dourceData.local_model == '0' ? '本地' : '远程' }}
+        {{ dourceData.local_model == '1' ? '远程' : '本地' }}
       </view>
     </view>
     <view class="operation__model">