release: bump version to 1.15.22 and fix various details

1. add new device image qxsq.png and replace old qxz_low image
2. adjust weather station page image size and layout
3. comment out period section in pest echart component
4. fix div to view tag in dev control page and clean up unused style
5. add fallback dash for empty sim detail data
6. replace service icon and adjust soil moisture list date range
7. adjust i

manifest.json

@@ -2,8 +2,8 @@
     "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.15.21",
-    "versionCode" : 11521,
+    "versionName" : "1.15.22",
+    "versionCode" : 11522,
     "transformPx" : false,
     "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */

pages/deviceDetails/SoilMoisturelist/index.vue

@@ -286,7 +286,7 @@ export default {
       page: 1,
       photoIcon:'https://s3.hnyfwlw.com/webstaticimg/bigdata_app/newImg/home/photoIcon.png',
       editIcon:'https://s3.hnyfwlw.com/webstaticimg/bigdata_app/newImg/home/editIcon.png',
-      serviceIcon:'https://s3.hnyfwlw.com/webstaticimg/bigdata_app/newImg/home/serviceIcon.png',
+      serviceIcon:'https://s3.hnyfwlw.com/webstaticimg/bigdata_app/newImg/home/settingNewIcon.png',
       simIcon:'https://s3.hnyfwlw.com/webstaticimg/bigdata_app/newImg/home/simIcon.png',
       settingIcon:'https://s3.hnyfwlw.com/webstaticimg/bigdata_app/newImg/home/settingIcon.png',
       isShowPhoto:false,
@@ -367,14 +367,14 @@ export default {
         const today = new Date();
         this.endDate = this.formatDate(today);
         const startDate = new Date(today);
-        startDate.setDate(startDate.getDate() - 7);
+        startDate.setDate(startDate.getDate() - 1);
         this.startDate = this.formatDate(startDate);
         return;
       }
       const date = new Date(Number(timestamp) * 1000);
       this.endDate = this.formatDate(date);
       const startDate = new Date(date);
-      startDate.setDate(startDate.getDate() - 7);
+      startDate.setDate(startDate.getDate() - 1);
       this.startDate = this.formatDate(startDate);
     },
     switchTab(tab) {
@@ -801,6 +801,8 @@ export default {
         type: 'area',
         legend: {
           position: 'top',
+          float: 'left', // 圆点左对齐
+          lineHeight: 19, // 行间距 8px（字号 11 + 8）
         },
         fontSize: 11,
         background: '#FFFFFF',
@@ -1167,7 +1169,7 @@ export default {
         }
         .temp-icon{
           width: 48rpx;
-          height: 48rpx;
+          height: 40rpx;
           margin-right: 16rpx;
         }
         .temp-content{
@@ -1206,7 +1208,7 @@ export default {
         }
         .swc-icon{
           width: 48rpx;
-          height: 48rpx;
+          height: 40rpx;
           margin-right: 16rpx;
         }
         .swc-content{
@@ -1245,7 +1247,7 @@ export default {
         }
         .dept-icon{
           width: 48rpx;
-          height: 48rpx;
+          height: 40rpx;
           margin-right: 16rpx;
         }
         .dept-content{

pages/deviceDetails/weatherStation/simDetail.vue

@@ -26,19 +26,19 @@
         </view>
         <view class="sim-item">
           <text class="label">总流量：</text>
-          <span class="val">{{ simData.total }}M</span>
+          <span class="val">{{ simData.total || '-'}}M</span>
         </view>
         <view class="sim-item">
           <text class="label">状态：</text>
-          <text class="val">{{ simData.status }}</text>
+          <text class="val">{{ simData.status || '-'}}</text>
         </view>
         <view class="sim-item">
           <text class="label">到期时间：</text>
-          <text class="val">{{ simData.expire }}</text>
+          <text class="val">{{ simData.expire || '-' }}</text>
         </view>
         <view class="sim-item">
           <text class="label">厂商名称：</text>
-          <text class="val">{{ simData.company }}</text>
+          <text class="val">{{ simData.company || '-' }}</text>
         </view>
         <view class="sim-info-count">
           <view class="sim-item">

pages/deviceDetails/weatherStation2/devControl.vue

@@ -7,10 +7,12 @@
     </cu-custom>
     <view class="control-board">
       <view class="title">操作</view>
-      <div style="margin-bottom: 48rpx;">
+      <view style="margin-bottom: 48rpx;">
         <u-button type="success" class="reload-btn" @click="handleControl('reboot')">重启</u-button>
-      </div>
-      <u-button type="success" class="reload-btn" @click="handleControl('update')">升级</u-button>
+      </view>
+      <view style="margin-bottom: 48rpx;">
+        <u-button type="success" class="reload-btn" @click="handleControl('update')">升级</u-button>
+      </view>
       <u-button type="success" class="reload-btn" @click="handleControl('read')">查询上传时间间隔</u-button>
       <view class="title date-title">上传时间间隔(min)</view>
       <view class="date-slider">
@@ -158,9 +160,6 @@ export default {
     margin-bottom: 48rpx;
     border-radius: 16rpx;
   }
-  .date-slider {
-    
-  }
 }
 
 .footer-board {

pages/deviceDetails/weatherStation2/index.vue

@@ -151,8 +151,8 @@
             <view class="params-right">
               <image
                 class="device-img"
-                style="width: 150rpx; height: 300rpx;"
-                src="/static/images/device/qxz_low.png"
+                style="width: 150rpx; height: 260rpx;"
+                src="/static/images/device/qxsq.png"
                 mode="aspectFit"
               ></image>
             </view>

pages/sy/components/pestEchart.vue

@@ -16,7 +16,7 @@
 
     <view class="pest-echart__content" v-show="dayData.length">
       <!-- 三个关键时期 -->
-      <view class="period-section">
+      <!-- <view class="period-section">
         <view class="period-item">
           <view class="period-label">始见期</view>
           <view class="period-value">{{ periodData.firstDate }}</view>
@@ -29,7 +29,7 @@
           <view class="period-label">终见期</view>
           <view class="period-value">{{ periodData.lastDate }}</view>
         </view>
-      </view>
+      </view> -->
 
       <!-- 图表区域 -->
       <view class="chart-container">

pages/sy/deviceControl2.vue

@@ -25,7 +25,7 @@
         <view class="device-detail-item">
           <text class="device-detail-label">识别种类</text>
           <view class="device-detail-btn-container">
-            <u-button @click="show2 = true" size="mini">{{getSelectPest(selectPest)}}</u-button>
+            <view class="device-detail-btns" @click="show2 = true" size="mini">{{getSelectPest(selectPest)}}</view>
             <view class="device-detail-btn" @click="setBindPest">{{selectPest.pest_id == '' ? '恢复默认' : '绑定设备'}}</view>
           </view>
         </view>
@@ -47,16 +47,15 @@
       <view class="device-detail-content" style="padding-bottom: 50rpx" v-if="activeTab === 'viewImage'">
         <view class="device-detail-viewImage">
           <text class="device-detail-label">拍照频率(min):</text>
-          <text>
             <u-input
               v-model="equipContrlForm.takePhotoIntervalMinutes"
               type="number"
               :border="false"
               height="40"
+              style="width: 100rpx"
               auto-height="true"
               input-align="right"
             />
-          </text>
         </view>
         <view class="device-detail-viewImage">
           <text class="device-detail-label">控制模式:</text>
@@ -174,9 +173,10 @@ export default {
     formatCtrlMode(ctrlMode){
       if(ctrlMode == 1){
         return '时控模式'
-      }else{
+      }else if(ctrlMode == 0){
         return '光控模式'
       }
+      return '请选择控制模式'
     },
     getProgressWidth(value, min, max) {
       if (max === min) return 0
@@ -365,6 +365,13 @@ export default {
           id: this.d_id,
         },
       });
+      console.log(res,'resresres')
+      if(!res?.startHour){
+        res.startHour = '0'
+      }
+      if(!res?.endHour){
+        res.endHour = '0'
+      }
       this.equipContrlForm = res
     },
   }
@@ -463,9 +470,22 @@ export default {
         gap: 24rpx;
         margin-top: 12rpx;
       }
+      .device-detail-btns{
+        display: flex;
+        padding: 16rpx 24rpx;
+        justify-content: center;
+        align-items: center;
+        gap: 16rpx;
+        border: 1rpx solid #0BBC58;
+        border-radius: 16rpx;
+        color: #0BBC58;
+        font-family: "Source Han Sans CN VF";
+        font-size: 24rpx;
+        font-weight: 400;
+      }
       .device-detail-btn{
         display: flex;
-        padding: 10rpx 16rpx;
+        padding: 16rpx 24rpx;
         justify-content: center;
         align-items: center;
         gap: 16rpx;
@@ -554,10 +574,10 @@ export default {
     align-items: center;
     .device-detail-btn{
       display: flex;
-      height: 80rpx;
+      height: 100rpx;
       width: 90%;
       margin: 0 auto;
-      padding: 0rpx 20rpx;
+      padding: 10rpx 20rpx;
       justify-content: center;
       align-items: center;
       gap: 8rpx;