Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/device/airDisinfectTwo.vue

@@ -28,13 +28,13 @@
           </div>
           <div style="float:right;margin-bottom:10px;">
             <el-button type="primary" @click="setAirDisInfect">设置</el-button>
-            <el-button type="primary" @click="printCard" v-if="air_way==0||air_way == 1">打印</el-button>
-            <el-button type="primary" @click="printCardOne" v-if="air_way == 2">打印</el-button>
-            <el-button type="primary" @click="AddCard" v-if="air_way==0||air_way == 1">新增</el-button>
-            <el-button type="primary" @click="AddCardOne" v-if="air_way == 2">新增</el-button>
+            <el-button type="primary" @click="printCard" v-if="art_way_one==0||art_way_one == 1">打印</el-button>
+            <el-button type="primary" @click="printCardOne" v-if="art_way_one == 2">打印</el-button>
+            <el-button type="primary" @click="AddCard" v-if="art_way_one==0||art_way_one == 1">新增</el-button>
+            <el-button type="primary" @click="AddCardOne" v-if="art_way_one == 2">新增</el-button>
 
           </div>
-          <div class="tab_air" v-if="air_way ==0 ||air_way == 1">
+          <div class="tab_air" v-if="art_way_one ==0 ||art_way_one == 1">
             <el-table  :data="tableData" :fit="true" stripe>
                 <el-table-column prop="year" label="名称" width="150" align="center">
                     <el-table-column prop="year" label="消毒时间" align="center" width="150">
@@ -135,7 +135,7 @@
           </div>
 
 
-          <div  v-if="air_way == 2">
+          <div  v-if="art_way_one == 2">
             <el-table
                 :data="tableDataOne"
                 style="width: 100%"
@@ -1423,7 +1423,8 @@
          last_total_time:0,
          air_way:"2",
          disinfectionOfficeList:[],
-         tableDataOne:[]
+         tableDataOne:[],
+         art_way_one:0,
         }
       },
       created(){
@@ -1447,7 +1448,7 @@
         this.getNewAirDisinfectList()
         this.getNewAirWayDisinfectList()
         var time=moment(this.form.first_start_time).format("HH:mm");
-        
+        this.getSetAirDisInfectById()
 
       },
       computed:{
@@ -1994,7 +1995,7 @@
             if(response.data.state == 1){
               var airset = response.data.data.airset
               if(airset!=undefined){
-                this.air_way = airset.air_way.toString()
+                this.art_way_one = airset.air_way.toString()
                 this.setEditDialog = true
               }
              
@@ -2002,6 +2003,17 @@
           })
         
         },
+        getSetAirDisInfectById(){
+            getSetAirDisInfectById().then(response=>{
+            if(response.data.state == 1){
+              var airset = response.data.data.airset
+              if(airset!=undefined){
+                this.art_way_one = airset.air_way.toString()
+                
+              }
+            }
+          })
+        },
         saveSetAirDisInfect(){
            var params = {
             air_way:parseInt(this.air_way)

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -24,12 +24,12 @@
           </div>
           <div style="float:right;margin-bottom:10px;">
             <el-button type="primary" @click="toSetting">设置</el-button>
-            <el-button type="primary" @click="printCard" v-if="air_way==0 || air_way ==1">打印</el-button>
-            <el-button type="primary" @click="printCardOne" v-if=" air_way ==2">打印</el-button>
-            <el-button type="primary" @click="dialogFormVisible = true" v-if="air_way == 0 || air_way == 1">新增</el-button>
-            <el-button type="primary" @click="newdialogFormVisible = true" v-if="air_way == 2">新增</el-button>
+            <el-button type="primary" @click="printCard" v-if="art_way_one==0 || art_way_one ==1">打印</el-button>
+            <el-button type="primary" @click="printCardOne" v-if=" art_way_one ==2">打印</el-button>
+            <el-button type="primary" @click="dialogFormVisible = true" v-if="art_way_one == 0 || art_way_one == 1">新增</el-button>
+            <el-button type="primary" @click="newdialogFormVisible = true" v-if="art_way_one == 2">新增</el-button>
           </div>
-          <div class="tab_air" v-if="air_way == 0 || air_way ==1">
+          <div class="tab_air" v-if="art_way_one == 0 || art_way_one ==1">
             <el-table  :data="tableData" :fit="true" stripe>
                 <el-table-column prop="year" label="名称" width="150" align="center">
                     <el-table-column prop="year" label="消毒时间" align="center" width="150">
@@ -140,7 +140,7 @@
           </el-pagination>
          </div>
 
-         <div  v-if="air_way == 2">
+         <div  v-if="art_way_one == 2">
             <el-table  :data="tableDataOne" :fit="true" stripe   style="width: 100%"
                 row-key="id"
                 border
@@ -1532,7 +1532,9 @@
          disinfectionOfficeList:[],
          tableDataOne:[],
          hiddenShowOne:false,
+         art_way_one:0,
         }
+
       },
       created(){
         var  disinfection_fluid = getManageMentDataConfig('management', 'disinfection_fluid')
@@ -1554,6 +1556,7 @@
         this.getAllDoctorList()
         this.getObjectTableDisInfectList()
         this.getObjectTableDisInfectWayList()
+        this.getObjectWayDisinfect()
       },
       computed:{
         firstdisinfection_time (){
@@ -2084,12 +2087,23 @@
            if(response.data.state==1){
              var objctSet = response.data.data.objctSet
              if(objctSet!=undefined){
-                this.air_way = objctSet.air_way.toString()
+                this.art_way_one = objctSet.air_way.toString()
              }
              this.setEditDialog = true
            }
         })
       },
+      getObjectWayDisinfect(){
+        getObjectWayDisinfect().then(response=>{
+           if(response.data.state==1){
+             var objctSet = response.data.data.objctSet
+             if(objctSet!=undefined){
+                this.art_way_one = objctSet.air_way.toString()
+             }
+            
+           }
+        })
+      },
       saveSetObjectTable(){
          var params = {
             air_way:parseInt(this.air_way)