Merge branch 'develop' of http://code.nyzhwlw.com:3000/com_yunfeiyun_develop/agmp_wpr_vue into develop

src/views/monitoringMamage/index.vue

@@ -166,7 +166,7 @@
                   class="status nolive"
                   v-if="scope.row.tmnstatusRunstatusContent == '离线'"
                 ></span>
-                {{ scope.row.tmnstatusRunstatusContent }}
+                {{ scope.row.tmnstatusRunstatusContent === '空闲中' ? '在线' : scope.row.tmnstatusRunstatusContent }}
               </span>
             </template>
 

src/views/peasantHouseholdManage/components/IrrigationRecord.vue

@@ -35,7 +35,7 @@
       showIndex
     >
       <template #cardusercdBillingtype="scope">
-        {{ scope.row.cardusercdBillingtype === '1' ? '综合计价' : '阶梯计价' }}
+        {{ scope.row.cardusercdBillingtype === '0' ? '综合计价' : '阶梯计价' }}
       </template>
     </b-table>
   </el-dialog>

src/views/waterCardManage/dataDetail.vue

@@ -54,6 +54,9 @@
             :columns="columns1"
             isShowIndex
           >
+          <template #cardusercdBillingtype="scope">
+            {{ scope.row.cardusercdBillingtype === '0' ? '综合计价' : '阶梯计价' }}
+          </template>
           </b-table>
         </el-tab-pane>
         <el-tab-pane 
@@ -158,7 +161,7 @@ export default {
         {
           label: '计费方式',
           prop: 'cardusercdBillingtype',
-          customRender: '',
+          customRender: 'cardusercdBillingtype',
           align: 'center'
         },
         // {