Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/management/components/WaterFormList.vue

@@ -1018,29 +1018,29 @@
             this.form.id = detail.id
             this.form.record_date = this.getTime(detail.record_date)
             this.form.machine_status = detail.machine_status.toString()
-            this.form.fault_description = detail.fault_description
-            this.form.water_pressure= detail.water_pressure
-            this.form.water_conductivity = detail.water_conductivity
-            this.form.temperature = detail.temperature
+            this.form.fault_description = detail.fault_description?detail.fault_description:""
+            this.form.water_pressure= detail.water_pressure? detail.water_pressure:""
+            this.form.water_conductivity = detail.water_conductivity?detail.water_conductivity:""
+            this.form.temperature = detail.temperature?detail.temperature:""
             this.form.force_pump_status = detail.force_pump_status.toString()
-            this.form.first_ro_membrane_water = detail.first_ro_membrane_water
-            this.form.first_ro_film_thick_water = detail.first_ro_film_thick_water
-            this.form.first_ro_membrane_effluent = detail.first_ro_membrane_effluent
-            this.form.first_production_of_water_conductivity = detail.first_production_of_water_conductivity
-            this.form.first_water_yield = detail.first_water_yield
-            this.form.last_ro_membrane_water = detail.last_ro_membrane_water
-            this.form.last_ro_membrane_effluent  =detail.last_ro_membrane_effluent
-            this.form.last_ro_film_thick_water = detail.last_ro_film_thick_water
-            this.form.last_production_of_water_conductivity = detail.last_production_of_water_conductivity
-            this.form.last_water_yield= detail.last_water_yield
-            this.form.carbon_tank = detail.carbon_tank
-            this.form.snd_tank = detail.snd_tank
-            this.form.resin_tank = detail.resin_tank
-            this.form.ultrafilter = detail.ultrafilter
-            this.form.hardness_monitoring = detail.hardness_monitoring
-            this.form.total_chlorine_detection= detail.total_chlorine_detection
-            this.form.ph_detection = detail.ph_detection
-            this.form.concentration_of_peroxyacetic_acid = detail.concentration_of_peroxyacetic_acid
+            this.form.first_ro_membrane_water = detail.first_ro_membrane_water?detail.first_ro_film_thick_water:""
+            this.form.first_ro_film_thick_water = detail.first_ro_film_thick_water?detail.first_ro_film_thick_water:""
+            this.form.first_ro_membrane_effluent = detail.first_ro_membrane_effluent?detail.first_ro_membrane_effluent:""
+            this.form.first_production_of_water_conductivity = detail.first_production_of_water_conductivity?detail.first_production_of_water_conductivity:""
+            this.form.first_water_yield = detail.first_water_yield?detail.first_water_yield:""
+            this.form.last_ro_membrane_water = detail.last_ro_membrane_water?detail.last_ro_membrane_water:""
+            this.form.last_ro_membrane_effluent  = detail.last_ro_membrane_effluent?detail.last_ro_membrane_effluent:""
+            this.form.last_ro_film_thick_water = detail.last_ro_film_thick_water?detail.last_ro_film_thick_water:""
+            this.form.last_production_of_water_conductivity = detail.last_production_of_water_conductivity? detail.last_production_of_water_conductivity:""
+            this.form.last_water_yield= detail.last_water_yield?detail.last_water_yield:""
+            this.form.carbon_tank = detail.carbon_tank?detail.carbon_tank:""
+            this.form.snd_tank = detail.snd_tank?detail.snd_tank:""
+            this.form.resin_tank = detail.resin_tank?detail.resin_tank:""
+            this.form.ultrafilter = detail.ultrafilter?detail.ultrafilter:""
+            this.form.hardness_monitoring = detail.hardness_monitoring?detail.hardness_monitoring:""
+            this.form.total_chlorine_detection= detail.total_chlorine_detection?detail.total_chlorine_detection:""
+            this.form.ph_detection = detail.ph_detection?detail.ph_detection:""
+            this.form.concentration_of_peroxyacetic_acid = detail.concentration_of_peroxyacetic_acid?detail.concentration_of_peroxyacetic_acid:""
             if(detail.reverse_osmosis_membrane_disinfection == 1){
               this.form.reverse_osmosis_membrane_disinfection  = true
             }else{
@@ -1052,12 +1052,12 @@
             }else{
               this.form.disinfection_of_water_pipeline = false
             }
-            this.form.first_disinfection_method = detail.first_disinfection_method
-            this.form.last_disinfection_method = detail.last_disinfection_method
-            this.form.first_disinfection_time = detail.first_disinfection_time
-            this.form.last_disinfection_time = detail.last_disinfection_time
-            this.form.remark = detail.remark
-            this.form.filter_replacement = detail.filter_replacement
+            this.form.first_disinfection_method = detail.first_disinfection_method?detail.first_disinfection_method:""
+            this.form.last_disinfection_method = detail.last_disinfection_method?detail.last_disinfection_method:""
+            this.form.first_disinfection_time = detail.first_disinfection_time?detail.first_disinfection_time:""
+            this.form.last_disinfection_time = detail.last_disinfection_time?detail.last_disinfection_time:""
+            this.form.remark = detail.remark? detail.remark:""
+            this.form.filter_replacement = detail.filter_replacement?detail.filter_replacement:""
             this.form.admin_user_id = detail.admin_user_id
             var adminRole = response.data.data.adminRole
             for(let i=0;i<adminRole.length;i++){
@@ -1073,8 +1073,14 @@
 
       UpdateDilaysisWater(formName){
         console.log("form",this.form,this.equimentid)
-        this.form.force_pump_status = parseInt(this.form.force_pump_status)
-        this.form.machine_status = parseInt(this.form.machine_status)
+        if(this.form.force_pump_status!=""){
+          this.form.force_pump_status = parseInt(this.form.force_pump_status)
+        }
+        if(this.form.machine_status!=""){
+          this.form.machine_status = parseInt(this.form.machine_status)
+        }
+      
+       
         if(this.form.reverse_osmosis_membrane_disinfection == true){
            this.form.reverse_osmosis_membrane_disinfection = 1
         }
@@ -1087,37 +1093,187 @@
         if(this.form.disinfection_of_water_pipeline == false){
           this.form.disinfection_of_water_pipeline = 2
         }
+        if(this.form.water_conductivity!=""){
+          this.form.water_conductivity = parseFloat(this.form.water_conductivity)== NaN ? 0:parseFloat(this.form.water_conductivity)
+        }else{
+           this.form.water_conductivity = 0 
+        }
+        
+        if(this.form.water_pressure!=""){
+          this.form.water_pressure = parseFloat(this.form.water_pressure) == NaN ? 0:parseFloat(this.form.water_pressure)
+        }else{
+            this.form.water_pressure=  0
+        }
+
+        if(this.form.temperature!=""){
+          this.form.temperature = parseFloat(this.form.temperature)== NaN ? 0:parseFloat(this.form.temperature)
+        }else{
+          this.form.temperature = 0    
+        }
+        
+        if(this.form.force_pump_status!=""){
+          this.form.force_pump_status = parseFloat(this.form.force_pump_status) ==  NaN ? 0: parseFloat(this.form.force_pump_status)
+        }else{
+            this.form.force_pump_status = 0
+        }
+        
+        if(this.form.first_ro_membrane_water!=""){
+          this.form.first_ro_membrane_water = parseFloat(this.form.first_ro_membrane_water) == NaN?0:parseFloat(this.form.first_ro_membrane_water)
+        }else{
+          this.form.first_ro_membrane_water = 0
+        }
+
+        if(this.form.first_ro_film_thick_water!=""){
+          this.form.first_ro_film_thick_water = parseFloat(this.form.first_ro_film_thick_water) ==NaN?0:parseFloat(this.form.first_ro_film_thick_water)
+        }else{
+          this.form.first_ro_film_thick_water = 0
+        }
+        
+        if(this.form.first_ro_membrane_effluent!=""){
+          this.form.first_ro_membrane_effluent =parseFloat(this.form.first_ro_membrane_effluent) == NaN?0:parseFloat(this.form.first_ro_membrane_effluent) 
+        }else{
+           this.form.first_ro_membrane_effluent = 0 
+        }
+
+        if(this.form.first_production_of_water_conductivity!=""){
+          this.form.first_production_of_water_conductivity = parseFloat(this.form.first_production_of_water_conductivity) == NaN?0: parseFloat(this.form.first_production_of_water_conductivity)
+        }else{
+          this.form.first_production_of_water_conductivity = 0
+        }
+        
+        if(this.form.first_water_yield !=""){
+           this.form.first_water_yield = parseFloat(this.form.first_water_yield) == NaN?0:parseFloat(this.form.first_water_yield)  
+        }else{
+            this.form.first_water_yield =0
+        }
+       
+        if(this.form.last_ro_membrane_water!=""){
+          this.form.last_ro_membrane_water = parseFloat(this.form.last_ro_membrane_water) ==NaN?0:parseFloat(this.form.last_ro_membrane_water)  
+        }else{
+          this.form.last_ro_membrane_water = 0
+        }
+      
+        if(this.form.last_ro_membrane_effluent!=""){
+          this.form.last_ro_membrane_effluent = parseFloat(this.form.last_ro_membrane_effluent) == NaN?0:parseFloat(this.form.last_ro_membrane_effluent)
+        }else{
+          this.form.last_ro_membrane_effluent = 0
+        }
+      
+        if(this.form.last_ro_film_thick_water!=""){
+            this.form.last_ro_film_thick_water = parseFloat(this.form.last_ro_film_thick_water) == NaN?0:parseFloat(this.form.last_ro_film_thick_water)
+        }else{
+          this.form.last_ro_film_thick_water = 0
+        }
+   
+        if( this.form.last_production_of_water_conductivity!=""){
+            this.form.last_production_of_water_conductivity = parseFloat(this.form.last_production_of_water_conductivity) == NaN?0:parseFloat(this.form.last_production_of_water_conductivity)
+        }else{
+            this.form.last_production_of_water_conductivity =0
+        }
+       
+        if(this.form.last_water_yield!=""){
+            this.form.last_water_yield = parseFloat(this.form.last_water_yield)==NaN?0: parseFloat(this.form.last_water_yield)
+        }else{
+            this.form.last_water_yield = 0
+        }
+
+        if(this.form.carbon_tank!=""){
+            this.form.carbon_tank = parseFloat(this.form.carbon_tank) == NaN?0:parseFloat(this.form.carbon_tank)
+        }else{
+            this.form.carbon_tank = 0
+        }
+        
+        if( this.form.snd_tank!=""){
+            this.form.snd_tank = parseFloat(this.form.snd_tank) == NaN?0:parseFloat(this.form.snd_tank)
+        }else{
+            this.form.snd_tank = 0
+        }
+         
+        if(this.form.resin_tank!=""){
+            this.form.resin_tank= parseFloat(this.form.resin_tank) ==NaN?0:parseFloat(this.form.resin_tank)
+        }else{
+            this.form.resin_tank= 0
+        }
+      
+        if( this.form.ultrafilter!=""){
+            this.form.ultrafilter = parseFloat(this.form.ultrafilter)== NaN?0:parseFloat(this.form.ultrafilter)
+        }else{
+          this.form.ultrafilter = 0
+        }
+        
+        if(this.form.hardness_monitoring !=""){
+            this.form.hardness_monitoring = parseFloat(this.form.hardness_monitoring) ==NaN?0: parseFloat(this.form.hardness_monitoring)
+        }else{
+           this.form.hardness_monitoring= 0
+        }
+
+        if( this.form.total_chlorine_detection!=""){
+            this.form.total_chlorine_detection = parseFloat(this.form.total_chlorine_detection)==NaN?0: parseFloat(this.form.total_chlorine_detection)
+        }else{
+            this.form.total_chlorine_detection = 0
+        }
+        
+        if( this.form.ph_detection!=""){
+            this.form.ph_detection = parseFloat(this.form.ph_detection) == NaN?0:parseFloat(this.form.ph_detection)
+        }else{
+            this.form.ph_detection = 0
+        }
+
+        if(this.form.concentration_of_peroxyacetic_acid!="" ){
+            this.form.concentration_of_peroxyacetic_acid = parseFloat(this.form.concentration_of_peroxyacetic_acid) == NaN?0: parseFloat(this.form.concentration_of_peroxyacetic_acid)   
+        }else{
+            this.form.concentration_of_peroxyacetic_acid = 0
+        }
 
-        this.form.water_conductivity = parseFloat(this.form.water_conductivity)
-        this.form.water_pressure = parseFloat(this.form.water_pressure)
-        this.form.temperature = parseFloat(this.form.temperature)
-        this.form.force_pump_status = parseFloat(this.form.force_pump_status)
-        this.form.first_ro_membrane_water = parseFloat(this.form.first_ro_membrane_water)
-        this.form.first_ro_film_thick_water = parseFloat(this.form.first_ro_film_thick_water)
-        this.form.first_ro_membrane_effluent =parseFloat(this.form.first_ro_membrane_effluent)
-        this.form.first_production_of_water_conductivity = parseFloat(this.form.first_production_of_water_conductivity)
-        this.form.first_water_yield = parseFloat(this.form.first_water_yield)
-        this.form.last_ro_membrane_water = parseFloat(this.form.last_ro_membrane_water)
-        this.form.last_ro_membrane_effluent = parseFloat(this.form.last_ro_membrane_effluent)
-        this.form.last_ro_film_thick_water = parseFloat(this.form.last_ro_film_thick_water)
-        this.form.last_production_of_water_conductivity = parseFloat(this.form.last_production_of_water_conductivity)
-        this.form.last_water_yield = parseFloat(this.form.last_water_yield)
-        this.form.carbon_tank = parseFloat(this.form.carbon_tank)
-        this.form.snd_tank = parseFloat(this.form.snd_tank)
-        this.form.resin_tank= parseFloat(this.form.resin_tank)
-        this.form.ultrafilter = parseFloat(this.form.ultrafilter)
-        this.form.hardness_monitoring = parseFloat(this.form.hardness_monitoring)
-        this.form.total_chlorine_detection = parseFloat(this.form.total_chlorine_detection)
-        this.form.ph_detection = parseFloat(this.form.ph_detection)
-        this.form.concentration_of_peroxyacetic_acid = parseFloat(this.form.concentration_of_peroxyacetic_acid)
-        this.form.reverse_osmosis_membrane_disinfection= parseFloat(this.form.reverse_osmosis_membrane_disinfection)
-        this.form.first_disinfection_method = parseFloat(this.form.first_disinfection_method)
-        this.form.last_disinfection_method = parseFloat(this.form.last_disinfection_method)
-        this.form.first_disinfection_time = parseFloat(this.form.first_disinfection_time)
-        this.form.last_disinfection_time = parseFloat(this.form.last_disinfection_time)
-        this.form.filter_replacement = parseFloat(this.form.filter_replacement)
-        this.form.admin_user_id = parseFloat(this.form.admin_user_id)
-        this.form.disinfection_of_water_pipeline = parseFloat(this.form.disinfection_of_water_pipeline)
+        if( this.form.reverse_osmosis_membrane_disinfection!=""){
+            this.form.reverse_osmosis_membrane_disinfection= parseFloat(this.form.reverse_osmosis_membrane_disinfection) == NaN?0:parseFloat(this.form.reverse_osmosis_membrane_disinfection)
+        }else{
+            this.form.reverse_osmosis_membrane_disinfection=  0
+        }
+
+        if(this.form.first_disinfection_method !=""){
+            this.form.first_disinfection_method = parseFloat(this.form.first_disinfection_method) == NaN?0:parseFloat(this.form.first_disinfection_method)
+        }else{
+            this.form.first_disinfection_method = 0
+        }
+      
+       
+        if(this.form.last_disinfection_method !=""){
+           this.form.last_disinfection_method = parseFloat(this.form.last_disinfection_method) == NaN?0:parseFloat(this.form.last_disinfection_method)
+        }else{
+            this.form.last_disinfection_method = 0
+        }
+       
+        if(this.form.first_disinfection_time !=""){
+          this.form.first_disinfection_time = parseFloat(this.form.first_disinfection_time) == NaN?0:parseFloat(this.form.first_disinfection_time)
+        }else{
+            this.form.first_disinfection_time = 0
+        }
+        
+        if( this.form.last_disinfection_time!=""){
+            this.form.last_disinfection_time = parseFloat(this.form.last_disinfection_time) == NaN?0:parseFloat(this.form.last_disinfection_time)
+        }else{
+            this.form.last_disinfection_time = 0  
+        }
+      
+        if(this.form.filter_replacement!=""){
+            this.form.filter_replacement = parseFloat(this.form.filter_replacement) == NaN?0:parseFloat(this.form.filter_replacement)
+        }else{
+            this.form.filter_replacement= 0
+        }
+
+        if( this.form.admin_user_id != ""){
+            this.form.admin_user_id = parseFloat(this.form.admin_user_id) == NaN?0:parseFloat(this.form.admin_user_id)
+        }else{
+            this.form.admin_user_id =0
+        }
+        
+        if(this.form.disinfection_of_water_pipeline !=""){
+            this.form.disinfection_of_water_pipeline = parseFloat(this.form.disinfection_of_water_pipeline) == NaN?0:parseFloat(this.form.disinfection_of_water_pipeline)
+        }else{
+            this.form.disinfection_of_water_pipeline =0
+        }
+      
          this.$refs[formName].validate((valid) => {
           if (valid) {
             UpdateDilaysisWater(this.form,this.equimentid).then(response=>{

src/xt_pages/management/home.vue

@@ -2868,7 +2868,7 @@ export default {
         },
         repirRules: {
           guarantee_date: [{ required: true, message: '请填写保修日期' }],
-          fault_description: [{ required: true, message: '请填写故障描述' }]
+          fault_description: [{ required: true, message: '请填写故障描述', trigger: ['blur', 'change']}]
         },
         ruleThree: {
           detection_unit: [{ required: true, message: '请填写检测单位' }],
@@ -3252,6 +3252,7 @@ export default {
           imageName: '',
           function_accessories_inspection:"",
           other_information:'',
+          admin_user_id:this.$store.getters.xt_user.user.id,
         },
 
         filename: '',
@@ -4953,6 +4954,8 @@ export default {
                 this.guaForm.exclude = 0
                 this.guaForm.images = ''
                 this.guaForm.treatment_process = ''
+                this.guaForm.function_accessories_inspection= ""
+                this.guaForm.other_information= ""
                 this.classShow = false
                 this.guaForm.imageName = ''
               }