Преглед изворни кода

fix: 修复多项页面细节问题并优化代码健壮性

1. 修正deviceData组件中"关照"的错别字为"光照"
2. 优化可选链操作避免空值报错
3. 调整标签页显示逻辑与注释冗余代码
4. 简化拍照频率输入框的DOM结构
allen пре 2 дана
родитељ
комит
65619cf7d3

+ 1 - 1
pages/cbd/detail.vue

@@ -361,7 +361,7 @@ export default {
       });
     },
     initAction(){
-      this.pest_order = {}
+      // this.pest_order = 
       if(this.activeTab === 'pestAnalysis'){
         this.getPestAnalysis();
       }else if(this.activeTab === 'viewImage'){

+ 1 - 1
pages/sy/components/deviceData.vue

@@ -37,7 +37,7 @@
           </view>
           <view class="data-item">
             <text class="data-value">{{ deviceStatic.lightDuration }}</text>
-            <text class="data-label">照</text>
+            <text class="data-label">照</text>
           </view>
         </view>
         <view class="data-column-left">

+ 5 - 4
pages/sy/components/pestEchart.vue

@@ -132,6 +132,7 @@ export default {
     pest_order:{
       handler(val){
         this.tabs = [];
+        this.activeTab = 0;
         for(let key in val){
           this.tabs.push({
             name: key,
@@ -200,14 +201,14 @@ export default {
         data: {
           model:'B',
           d_id: this.d_id,
-          year: this.endDate.split('-')[0],
+          year: this.endDate.split('-')?.[0],
           pest: this.currentPest,
         },
       });
       this.periodData = {
-        firstDate: res[0][0],
-        peakDate: res[1][0],
-        lastDate: res[2][0],
+        firstDate: res?.[0]?.[0],
+        peakDate: res?.[1]?.[0],
+        lastDate: res?.[2]?.[0],
       }
     },
     initChart() {

+ 12 - 12
pages/sy/detail.vue

@@ -40,7 +40,7 @@
       />
       <view class="tabs">
         <view class="tab-container" v-if="isShowTab">
-          <view class="tab-item" :class="activeTab === 'pestAnalysis'?'active':''" @click="handleTabClick('pestAnalysis')" v-if="disableShow">
+          <view class="tab-item" :class="activeTab === 'pestAnalysis'?'active':''" @click="handleTabClick('pestAnalysis')">
             害虫分析
           </view>
           <view class="tab-item" :class="activeTab === 'viewImage'?'active':''" @click="handleTabClick('viewImage')">
@@ -69,7 +69,7 @@
           </view>
         </view>
       </view>
-      <view v-if="activeTab === 'pestAnalysis'" class="tab-content">
+      <view v-show="activeTab === 'pestAnalysis'" class="tab-content">
         <PestDiscern
           :total="total"
           :pest_order="pest_order"
@@ -293,15 +293,15 @@ export default {
       }
       this.initAction();
       this.isShowTab = showStatus;
-      if(this.deviceInfo.disable == 0){
-        this.disableShow = false;
-        if(showStatus){
-          this.activeTab = 'viewImage';
-          this.handleTabClick('viewImage');
-        }
-      }else{
-        this.disableShow = true;
-      }
+      // if(this.deviceInfo.disable == 0){
+      //   this.disableShow = false;
+      //   if(showStatus){
+      //     this.activeTab = 'viewImage';
+      //     this.handleTabClick('viewImage');
+      //   }
+      // }else{
+      //   this.disableShow = true;
+      // }
     },
     prevPage(e){
       if(e == 1){
@@ -381,7 +381,7 @@ export default {
       });
     },
     initAction(){
-      this.pest_order = {}
+      // this.pest_order = {}
       if(this.activeTab === 'pestAnalysis'){
         this.getPestAnalysis();
       }else if(this.activeTab === 'viewImage'){

+ 1 - 2
pages/sy/deviceControl2.vue

@@ -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>