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

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -28,7 +28,7 @@
           <div class="tab_air">
             <el-table  :data="tableData" :fit="true" stripe>
                 <el-table-column prop="year" label="名称" width="150" align="center">
-                    <el-table-column prop="year" label="消毒时间/min" align="center" width="150">
+                    <el-table-column prop="year" label="消毒时间" align="center" width="150">
                         <el-table-column prop="year" label="日期" align="center" width="150">
                             <template slot-scope="scope">
                                 {{getTimes(scope.row.record_date) }}

src/xt_pages/management/components/RepairForm.vue

@@ -12,7 +12,7 @@
           ></el-option>
         </el-select>
       </el-col> -->
-      <el-col :span="11">
+      <el-col :span="10">
         <span class="machineClass">日期查询:</span>
         <el-date-picker
           v-model="forms.start_time"

src/xt_pages/management/components/WaterForm.vue

@@ -97,19 +97,19 @@
                 <span>一级</span>
             </el-col>
             <el-col :span="4">
-                <el-input v-model.number="form.first_ro_membrane_water" style="width:100px" type="number"></el-input>
+                <el-input v-model="form.first_ro_membrane_water" style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
             </el-col>
             <el-col :span="4">
-                <el-input v-model.number="form.first_ro_film_thick_water" style="width:100px" type="number"></el-input>
+                <el-input v-model="form.first_ro_film_thick_water" style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
             </el-col>
             <el-col :span="4">
-                <el-input v-model.number="form.first_ro_membrane_effluent" style="width:100px" type="number"></el-input>
+                <el-input v-model="form.first_ro_membrane_effluent" style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
             </el-col>
             <el-col :span="4">
-                <el-input v-model.number="form.first_production_of_water_conductivity" style="width:100px" type="number"></el-input>
+                <el-input v-model="form.first_production_of_water_conductivity" style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
             </el-col>
             <el-col :span="4">
-                <el-input v-model.number="form.first_water_yield" style="width:100px" type="number"></el-input>
+                <el-input v-model="form.first_water_yield" style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
             </el-col>
          </el-row>
          <el-row :gutter="20">
@@ -117,42 +117,42 @@
                 <span>二级</span>
             </el-col>
             <el-col :span="4">
-                <el-input v-model.number="form.last_ro_membrane_water"  style="width:100px" type="number"></el-input>
+                <el-input v-model="form.last_ro_membrane_water"  style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
             </el-col>
             <el-col :span="4">
-                <el-input v-model="form.last_ro_film_thick_water"  style="width:100px" type="number"></el-input>
+                <el-input v-model="form.last_ro_film_thick_water"  style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
             </el-col>
             <el-col :span="4">
-                <el-input  v-model="form.last_ro_membrane_effluent"  style="width:100px" type="number"></el-input>
+                <el-input  v-model="form.last_ro_membrane_effluent"  style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
             </el-col>
             <el-col :span="4">
-                <el-input v-model="form.last_production_of_water_conductivity"  style="width:100px" type="number"></el-input>
+                <el-input v-model="form.last_production_of_water_conductivity"  style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
             </el-col>
             <el-col :span="4">
-                <el-input v-model.number="form.last_water_yield"  style="width:100px" type="number"></el-input>
+                <el-input v-model="form.last_water_yield"  style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
             </el-col>
          </el-row>
          <el-row>
             <el-col :span="8">
                 <el-form-item label="碳罐(MPa):"  class="st">
-                    <el-input  v-model="form.carbon_tank" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.carbon_tank"  style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="砂罐(MPa):"  class="st">
-                    <el-input  v-model="form.snd_tank" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.snd_tank"  style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="树脂罐(MPa):"  class="st">
-                    <el-input  v-model="form.resin_tank" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.resin_tank"  style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
          <el-row>
             <el-col :span="8">
                 <el-form-item label="精密过滤器（MPa):"  class="st">
-                    <el-input  v-model="form.ultrafilter" type="number" style="width:100px"></el-input>
+                    <el-input  v-model.number="form.ultrafilter"  style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -214,7 +214,7 @@
             </el-col>
             <el-col :span="8">
                 <el-form-item label="时长(h):"  class="st">
-                    <el-input  v-model="form.first_disinfection_time" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.first_disinfection_time" type="number" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -237,7 +237,7 @@
             </el-col>
             <el-col :span="8">
                 <el-form-item label="时长(h):"  class="st">
-                    <el-input  v-model="form.last_disinfection_time" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.last_disinfection_time" type="number" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -247,7 +247,8 @@
             <el-col :span="8">
                 <el-form-item label="过滤器更换(只):"  class="st">
                     <el-input  v-model="form.filter_replacement" style="width:100px" 
-                    oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                    ></el-input>
                 </el-form-item>
             </el-col>