Browse Source

新分支

28169 1 year ago
parent
commit
62a39bab15

+ 21 - 9
src/xt_pages/device/airDisinfectTwo.vue View File

28
           </div>
28
           </div>
29
           <div style="float:right;margin-bottom:10px;">
29
           <div style="float:right;margin-bottom:10px;">
30
             <el-button type="primary" @click="setAirDisInfect">设置</el-button>
30
             <el-button type="primary" @click="setAirDisInfect">设置</el-button>
31
-            <el-button type="primary" @click="printCard" v-if="air_way==0||air_way == 1">打印</el-button>
32
-            <el-button type="primary" @click="printCardOne" v-if="air_way == 2">打印</el-button>
33
-            <el-button type="primary" @click="AddCard" v-if="air_way==0||air_way == 1">新增</el-button>
34
-            <el-button type="primary" @click="AddCardOne" v-if="air_way == 2">新增</el-button>
31
+            <el-button type="primary" @click="printCard" v-if="art_way_one==0||art_way_one == 1">打印</el-button>
32
+            <el-button type="primary" @click="printCardOne" v-if="art_way_one == 2">打印</el-button>
33
+            <el-button type="primary" @click="AddCard" v-if="art_way_one==0||art_way_one == 1">新增</el-button>
34
+            <el-button type="primary" @click="AddCardOne" v-if="art_way_one == 2">新增</el-button>
35
 
35
 
36
           </div>
36
           </div>
37
-          <div class="tab_air" v-if="air_way ==0 ||air_way == 1">
37
+          <div class="tab_air" v-if="art_way_one ==0 ||art_way_one == 1">
38
             <el-table  :data="tableData" :fit="true" stripe>
38
             <el-table  :data="tableData" :fit="true" stripe>
39
                 <el-table-column prop="year" label="名称" width="150" align="center">
39
                 <el-table-column prop="year" label="名称" width="150" align="center">
40
                     <el-table-column prop="year" label="消毒时间" align="center" width="150">
40
                     <el-table-column prop="year" label="消毒时间" align="center" width="150">
135
           </div>
135
           </div>
136
 
136
 
137
 
137
 
138
-          <div  v-if="air_way == 2">
138
+          <div  v-if="art_way_one == 2">
139
             <el-table
139
             <el-table
140
                 :data="tableDataOne"
140
                 :data="tableDataOne"
141
                 style="width: 100%"
141
                 style="width: 100%"
1423
          last_total_time:0,
1423
          last_total_time:0,
1424
          air_way:"2",
1424
          air_way:"2",
1425
          disinfectionOfficeList:[],
1425
          disinfectionOfficeList:[],
1426
-         tableDataOne:[]
1426
+         tableDataOne:[],
1427
+         art_way_one:0,
1427
         }
1428
         }
1428
       },
1429
       },
1429
       created(){
1430
       created(){
1447
         this.getNewAirDisinfectList()
1448
         this.getNewAirDisinfectList()
1448
         this.getNewAirWayDisinfectList()
1449
         this.getNewAirWayDisinfectList()
1449
         var time=moment(this.form.first_start_time).format("HH:mm");
1450
         var time=moment(this.form.first_start_time).format("HH:mm");
1450
-        
1451
+        this.getSetAirDisInfectById()
1451
 
1452
 
1452
       },
1453
       },
1453
       computed:{
1454
       computed:{
1994
             if(response.data.state == 1){
1995
             if(response.data.state == 1){
1995
               var airset = response.data.data.airset
1996
               var airset = response.data.data.airset
1996
               if(airset!=undefined){
1997
               if(airset!=undefined){
1997
-                this.air_way = airset.air_way.toString()
1998
+                this.art_way_one = airset.air_way.toString()
1998
                 this.setEditDialog = true
1999
                 this.setEditDialog = true
1999
               }
2000
               }
2000
              
2001
              
2002
           })
2003
           })
2003
         
2004
         
2004
         },
2005
         },
2006
+        getSetAirDisInfectById(){
2007
+            getSetAirDisInfectById().then(response=>{
2008
+            if(response.data.state == 1){
2009
+              var airset = response.data.data.airset
2010
+              if(airset!=undefined){
2011
+                this.art_way_one = airset.air_way.toString()
2012
+                
2013
+              }
2014
+            }
2015
+          })
2016
+        },
2005
         saveSetAirDisInfect(){
2017
         saveSetAirDisInfect(){
2006
            var params = {
2018
            var params = {
2007
             air_way:parseInt(this.air_way)
2019
             air_way:parseInt(this.air_way)

+ 21 - 7
src/xt_pages/device/objectTableDisinfectTwo.vue View File

24
           </div>
24
           </div>
25
           <div style="float:right;margin-bottom:10px;">
25
           <div style="float:right;margin-bottom:10px;">
26
             <el-button type="primary" @click="toSetting">设置</el-button>
26
             <el-button type="primary" @click="toSetting">设置</el-button>
27
-            <el-button type="primary" @click="printCard" v-if="air_way==0 || air_way ==1">打印</el-button>
28
-            <el-button type="primary" @click="printCardOne" v-if=" air_way ==2">打印</el-button>
29
-            <el-button type="primary" @click="dialogFormVisible = true" v-if="air_way == 0 || air_way == 1">新增</el-button>
30
-            <el-button type="primary" @click="newdialogFormVisible = true" v-if="air_way == 2">新增</el-button>
27
+            <el-button type="primary" @click="printCard" v-if="art_way_one==0 || art_way_one ==1">打印</el-button>
28
+            <el-button type="primary" @click="printCardOne" v-if=" art_way_one ==2">打印</el-button>
29
+            <el-button type="primary" @click="dialogFormVisible = true" v-if="art_way_one == 0 || art_way_one == 1">新增</el-button>
30
+            <el-button type="primary" @click="newdialogFormVisible = true" v-if="art_way_one == 2">新增</el-button>
31
           </div>
31
           </div>
32
-          <div class="tab_air" v-if="air_way == 0 || air_way ==1">
32
+          <div class="tab_air" v-if="art_way_one == 0 || art_way_one ==1">
33
             <el-table  :data="tableData" :fit="true" stripe>
33
             <el-table  :data="tableData" :fit="true" stripe>
34
                 <el-table-column prop="year" label="名称" width="150" align="center">
34
                 <el-table-column prop="year" label="名称" width="150" align="center">
35
                     <el-table-column prop="year" label="消毒时间" align="center" width="150">
35
                     <el-table-column prop="year" label="消毒时间" align="center" width="150">
140
           </el-pagination>
140
           </el-pagination>
141
          </div>
141
          </div>
142
 
142
 
143
-         <div  v-if="air_way == 2">
143
+         <div  v-if="art_way_one == 2">
144
             <el-table  :data="tableDataOne" :fit="true" stripe   style="width: 100%"
144
             <el-table  :data="tableDataOne" :fit="true" stripe   style="width: 100%"
145
                 row-key="id"
145
                 row-key="id"
146
                 border
146
                 border
1532
          disinfectionOfficeList:[],
1532
          disinfectionOfficeList:[],
1533
          tableDataOne:[],
1533
          tableDataOne:[],
1534
          hiddenShowOne:false,
1534
          hiddenShowOne:false,
1535
+         art_way_one:0,
1535
         }
1536
         }
1537
+
1536
       },
1538
       },
1537
       created(){
1539
       created(){
1538
         var  disinfection_fluid = getManageMentDataConfig('management', 'disinfection_fluid')
1540
         var  disinfection_fluid = getManageMentDataConfig('management', 'disinfection_fluid')
1554
         this.getAllDoctorList()
1556
         this.getAllDoctorList()
1555
         this.getObjectTableDisInfectList()
1557
         this.getObjectTableDisInfectList()
1556
         this.getObjectTableDisInfectWayList()
1558
         this.getObjectTableDisInfectWayList()
1559
+        this.getObjectWayDisinfect()
1557
       },
1560
       },
1558
       computed:{
1561
       computed:{
1559
         firstdisinfection_time (){
1562
         firstdisinfection_time (){
2084
            if(response.data.state==1){
2087
            if(response.data.state==1){
2085
              var objctSet = response.data.data.objctSet
2088
              var objctSet = response.data.data.objctSet
2086
              if(objctSet!=undefined){
2089
              if(objctSet!=undefined){
2087
-                this.air_way = objctSet.air_way.toString()
2090
+                this.art_way_one = objctSet.air_way.toString()
2088
              }
2091
              }
2089
              this.setEditDialog = true
2092
              this.setEditDialog = true
2090
            }
2093
            }
2091
         })
2094
         })
2092
       },
2095
       },
2096
+      getObjectWayDisinfect(){
2097
+        getObjectWayDisinfect().then(response=>{
2098
+           if(response.data.state==1){
2099
+             var objctSet = response.data.data.objctSet
2100
+             if(objctSet!=undefined){
2101
+                this.art_way_one = objctSet.air_way.toString()
2102
+             }
2103
+            
2104
+           }
2105
+        })
2106
+      },
2093
       saveSetObjectTable(){
2107
       saveSetObjectTable(){
2094
          var params = {
2108
          var params = {
2095
             air_way:parseInt(this.air_way)
2109
             air_way:parseInt(this.air_way)