4月12日bug修改

src/xt_pages/management/components/RepairForm.vue

@@ -1,8 +1,7 @@
 <template>
   <div>
-    <div>
     <el-row class="row">
-      <!-- <el-col :span="5">
+      <el-col :span="5">
         <span class="machineClass">机号:</span>
         <el-select style="width:100px" v-model="forms.bed">
           <el-option
@@ -12,7 +11,7 @@
             :value="item.id"
           ></el-option>
         </el-select>
-      </el-col> -->
+      </el-col>
       <el-col :span="11">
         <span class="machineClass">日期查询:</span>
         <el-date-picker
@@ -53,8 +52,7 @@
           <el-button type="primary" size="small" @click="printCard">打印</el-button>
       </el-col>
     </el-row>
-    <el-row>
-
+   
       <el-table
         ref="multipleTable"
         @selection-change="handleSelectionChange"
@@ -334,7 +332,7 @@
             </el-tooltip>
           </template>
         </el-table-column>
-      </el-table> -->
+      </el-table>
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -416,32 +414,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="24">
-              <el-form-item class="formItem" label="功能及附件检查:">
-                  <el-input
-                    type="textarea"
-                    :rows="2"
-                      placeholder="请输入内容"
-                      v-model="guaForm.function_accessories_inspection"
-                    style="width:85%">
-                  </el-input>
-              </el-form-item>
-            </el-col>
-        </el-row>
-        <el-row>
-        <el-col :span="24">
-            <el-form-item class="formItem" label="其他:">
-                <el-input
-                  type="textarea"
-                  :rows="2"
-                    placeholder="请输入内容"
-                    v-model="guaForm.other_information"
-                  style="width:85%">
-                </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="故障发生阶段">
@@ -472,7 +444,7 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="故障现象:" required prop="fault_description">
+            <el-form-item label="故障描述:" required prop="fault_description">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -483,7 +455,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="维修内容:">
+            <el-form-item label="原因分析:">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -494,7 +466,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="维修结果:">
+            <el-form-item label="处理过程:">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -544,7 +516,7 @@
         </el-row>
         <el-row>
           <el-col :span="20">
-            <el-form-item label="备注:">
+            <el-form-item label="原因:">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -555,21 +527,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="20">
-            <el-form-item label="维修者:">
-              <el-select v-model="guaForm.admin_user_id" placeholder="请选择" >
-                      <el-option
-                      v-for="item in docList"
-                      :key="item.admin_user_id"
-                      :label="item.user_name"
-                      :value="item.admin_user_id"
-                      style="width:185px">
-                      </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
 <!--        <button @click="lili">调试</button>-->
@@ -579,272 +536,6 @@
         >
       </span>
     </el-dialog>
-
-    <div hidden="hidden">
-      <div id="print-card-info" v-show="hiddenShow">
-        <div>
-          <div class="print_main_content">
-            <div class="order_title">水机使用记录清单</div>
-          </div>
-          <div>
-            <div class="printClass">打印日期:{{ nowTime }}</div>
-            <table
-              border="1"
-              style="width:100%"
-              cellspacing="0"
-              cellpadding="0"
-              class="tableClass"
-            >
-              <tr>
-                <td
-                  :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px;"
-                >
-                  日期
-                </td>
-              
-               
-                <td
-                  :colspan="4"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                  原水参数
-                </td>
-
-                <td
-                  :colspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                  一级反渗
-                </td>
-
-                <td
-                  :colspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                  二级反渗
-                </td>
-
-                <td
-                  :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                 碳罐
-                </td>
-                <td
-                 :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                 砂罐
-                </td>
-
-                <td
-                 :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                 树脂罐
-                </td>
-
-                <td
-                 :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                  静谧过滤器（MPa）
-                </td>
-              
-                <td
-                 :colspan="4"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                 水质监测
-                </td>
-
-                <td
-                 :colspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                 消毒
-                </td>
-
-                <td
-                 :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                过滤器更换
-                </td>
-
-                <td
-                 :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                记录人
-                </td>
-               
-              </tr>
-              <tr>
-                <td style="text-align:center;width:70px;font-size:15px">
-                  原水电导度
-                </td>
-                <td style="text-align:center;width:50px;font-size:15px">
-                  原水压力
-                </td>
-                <td style="text-align:center;width:70px;font-size:15px">
-                  温度
-                </td>
-                <td style="text-align:center;width:95px;font-size:15px">
-                  加压泵
-                </td>
-
-                <td style="text-align:center;width:70px;font-size:15px">
-                  产水电导度
-                </td>
-                <td style="text-align:center;width:95px;font-size:15px">
-                  产水量
-                </td>
-
-                <td style="text-align:center;width:70px;font-size:15px">
-                  产水电导度
-                </td>
-                <td style="text-align:center;width:95px;font-size:15px">
-                  产水量
-                </td>
-
-             
-
-                <td style="text-align:center;width:70px;font-size:15px">
-                   硬度(mg/l）
-                </td>
-                <td style="text-align:center;width:95px;font-size:15px">
-                  总氯（mg/l）
-                </td>
-
-                <td style="text-align:center;width:70px;font-size:15px">
-                  PH值
-                </td>
-                <td style="text-align:center;width:95px;font-size:15px">
-                  过氧乙酸(mg/l）
-                </td>
-
-                <td style="text-align:center;width:70px;font-size:15px">
-                  反渗膜消毒
-                </td>
-                <td style="text-align:center;width:95px;font-size:15px">
-                  输水管道消毒
-                </td>
-                
-               
-              
-              </tr>
-              <tr v-for="item in this.tableData" :key="item.id">
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-               
-                <td style="text-align:center;font-size:15px;height:30px">
-                  
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                  
-                </td>
-
-                <td style="text-align:center;font-size:15px;height:30px">
-                
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-
-                <td
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                
-                </td>
-                <td
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                
-                </td>
-
-                <td
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                 
-                </td>
-
-                <td
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-              
-                </td>
-
-                <td
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-               
-                </td>
-                <td
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-               
-                </td>
-
-                <td
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                 
-                </td>
-
-                <td
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                
-                </td>
-
-                <td
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-               
-                </td>
-
-                <td
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-              
-                </td>
-
-                <td
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                
-                </td>
-                
-                <td style="text-align:center;width:70px;font-size:15px">
-                
-                </td>
-             
-               
-               
-             
-              </tr>
-            </table>
-          </div>
-        </div>
-      </div>
-    </div>
-   </div>
   </div>
 </template>
 
@@ -860,13 +551,10 @@ import {
 } from "@/api/manage";
 import { uParseTime } from "@/utils/tools";
 import { getFileExtension } from "@/utils/tools";
-import print from "print-js";
-const moment = require("moment");
 export default {
   name: "RepairForm",
   data() {
     return {
-      nowTime: moment(new Date()).format("YYYY-MM-DD HH:MM:SS"),
       dialogVisible: false,
       selectCulture: [],
       forms: {
@@ -890,10 +578,7 @@ export default {
         exclude: "",
         reason: "",
         code_information: "",
-        image_name: "",
-        admin_user_id:this.$store.getters.xt_user.user.id,
-        function_accessories_inspection:"",
-        other_information:"",
+        image_name: ""
       },
       isIndeterminate: false,
       checkAllStatus: false,
@@ -921,9 +606,6 @@ export default {
       limit: 10,
       page: 1,
       total: 0,
-      macherList:[],
-      docList:[],
-      hiddenShow:false,
     };
   },
   methods: {
@@ -956,10 +638,6 @@ export default {
         if (response.data.state === 1) {
           var repair = response.data.data.repair;
           console.log("repair是", repair);
-          var macherList = response.data.data.macherList
-         
-          this.macherList = macherList
-          this.docList = response.data.data.docList
           // eslint-disable-next-line no-unused-vars
           var total = response.data.data.total;
           this.total = total;
@@ -998,7 +676,6 @@ export default {
               repair[index].exclude = "未解决";
             }
           }
-          console.log("repair------",repair)
           this.tableData = repair;
         }
       });
@@ -1021,7 +698,6 @@ export default {
         if (response.data.state === 1) {
           var repair = response.data.data.repair;
           console.log("repair", repair);
-          this.docList = response.data.data.docList
           this.guaForm.guarantee_date = uParseTime(
             repair.guarantee_date,
             "{y}-{m}-{d}"
@@ -1049,9 +725,6 @@ export default {
           this.guaForm.code_information = repair.code_information;
           this.guaForm.id = repair.id;
           this.filename = repair.image_name;
-          this.guaForm.admin_user_id = repair.admin_user_id
-          this.guaForm.function_accessories_inspection = repair.function_accessories_inspection
-          this.guaForm.other_information= repair.other_information
         }
       });
     },
@@ -1258,50 +931,9 @@ export default {
         });
       });
     },
-    getDeviceName(id){
-      var device_name= ""
-      for(let i=0;i<this.macherList.length;i++){
-        if(id == this.macherList[i].id){
-           device_name = this.macherList[i].device_name
-        }
-      }
-      return device_name
-    },
-    getRepairName(id){
-      var device_type= ""
-      for(let i=0;i<this.macherList.length;i++){
-        if(id == this.macherList[i].id){
-          device_type = this.macherList[i].device_type
-        }
-      }
-      return device_type
-    },
-    getName(admin_user_id){
-      var user_name = ""
-      for(let i=0;i<this.docList.length;i++){
-        if(admin_user_id == this.docList[i].admin_user_id){
-           user_name = this.docList[i].user_name
-        }
-      }
-      return user_name
-    },
-    printCard() {
-        this.hiddenShow = true;
-        var ptime = Math.round(new Date().getTime() / 1000);
-        this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
-
-        const style =
-          "@media print {.print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0;font-size:15px } .print_main_content .order_title { text-align: center; font-size: 15px; line-height: 50px;} .print_main_content table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px;font-size:15px } .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px;font-size:15px } .td_proj_title { font-size: 15px; line-height: 25px;} .td_proj_content { font-size: 15px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 15px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj}";
-
-        setTimeout(() => {
-          printJS({
-            printable: "print-card-info",
-            type: "html",
-            style: style,
-            scanStyles: false
-          });
-        }, 1);
-      },
+    printCard(){
+      console.log('sadfgadsf');
+    }
   },
   created() {
     this.getAllSubregion();
@@ -1310,30 +942,8 @@ export default {
 };
 </script>
 
-
 <style scoped>
-
 .row {
   margin-bottom: 10px;
 }
-.a {
-  /* .el-col-2 {
-    width: 8.33333%;
-    margin-bottom: 20px;
-  } */
-}
-.print_main_content {
-  background-color: white;
-  width: 960px;
-  margin: 0 auto;
-  padding: 0 0 20px 0;
-}
-.tableClass {
-  font-size: 10px;
-  font-weight: none;
-}
-.printClass {
-  width: 100%;
-  text-align: right;
-}
 </style>

src/xt_pages/management/components/UserForm.vue

@@ -362,7 +362,7 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.start_time"
-                style="width:185px"
+                
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -374,7 +374,6 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.end_time"
-                style="width:185px"
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -634,7 +633,7 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.starttime"
-                style="width:185px"
+                
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -646,7 +645,7 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.endtime"
-                style="width:185px"
+                
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -2609,7 +2608,7 @@ export default {
       //       })
       //   })
     },
-  },
+  
   created() {
     this.getAllSubregion();
     // this.getInformationData();
@@ -2662,7 +2661,7 @@ export default {
     text-align: right;
   }
   .el-input--prefix .el-input__inner {
-    padding-left: 15px;
+    // padding-left: 15px;
   }
   .el-input--prefix .el-input__inner {
     padding-right: 15px;

src/xt_pages/management/components/WaterForm.vue

@@ -36,19 +36,31 @@
          </el-row>
          <el-row>
             <el-col :span="8">
-                <el-form-item label="原水电导度(μs/cm):"   class="st" label-width="100px">
-                    <el-input  v-model="form.water_conductivity" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
-                    <!-- <el-input-number v-model="form.water_conductivity" :controls="false" :precision="2" ></el-input-number> -->
+                <el-form-item label="原水电导度(μs/cm):" prop="water_conductivity"  class="st" label-width="100px">
+                    <el-input  v-model="form.water_conductivity" style="width:100px" 
+                        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-input  v-model="form.water_conductivity" style="width:100px" oninput="value=value.replace(/[^\d+(.\d{1,2})?$]/g,'')" ></el-input> /[^\d^\.]/g,''-->
+                    <!-- <el-input  v-model="form.water_conductivity" style="width:100px" onkeyup="value=value.match(/^\d+(.\d{1,2})?$/g,'')" ></el-input> -->
+                    <!-- <el-input-number  auto-complete="off" v-model.number="form.water_conductivity" :precision="2" :controls="false"></el-input-number> -->
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="原水压力(Mpa):"  class="st">
-                    <el-input  v-model="form.water_pressure" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    <el-input  v-model="form.water_pressure" style="width:100px" 
+                    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-input-number  auto-complete="off" v-model.number="form.water_pressure" :precision="2" :controls="false"></el-input-number> -->
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="温度:"  class="st">
-                    <el-input  v-model="form.temperature" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    <el-input  v-model="form.temperature" style="width:100px"
+                    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-input-number  auto-complete="off" v-model.number="form.temperature" :precision="2" :controls="false"></el-input-number> -->
                 </el-form-item>
             </el-col>
          </el-row>
@@ -60,72 +72,66 @@
                 </el-form-item>
             </el-col>
          </el-row>
-         <el-row>
-            <span>反渗一级</span>
-         </el-row>
-         <el-row>
-            <el-col :span="8">
-                <el-form-item label="RO膜进水:"  class="st">
-                    <el-input  v-model="form.first_ro_membrane_water" type="number" style="width:100px"></el-input>
-                </el-form-item>
+         <el-row :gutter="20">
+            <el-col :span="4" style="text-align: center;">
+                <span >反渗</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="RO膜浓水:"  class="st">
-                    <el-input  v-model="form.first_ro_film_thick_water" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <span >RO膜进水</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="RO膜出水:"  class="st">
-                    <el-input  v-model="form.first_ro_membrane_effluent" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <span >RO膜浓水</span>
             </el-col>
-         </el-row>
-         <el-row>
-            <el-col :span="8">
-                <el-form-item label="产水电导度(μs/cm):"  class="st">
-                    <el-input  v-model="form.first_production_of_water_conductivity" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <span >RO膜出水</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="产水量(L/h):"  class="st">
-                    <el-input  v-model="form.first_water_yield" style="width:100px" type="number"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <span >产水电导度(μs/cm)</span>
+            </el-col>
+            <el-col :span="4">
+                <span >产水量(L/h)</span>
             </el-col>
-         
-         </el-row>
-         <el-row>
-            <span>反渗二级</span>
          </el-row>
-         <el-row>
-            <el-col :span="8">
-                <el-form-item label="RO膜进水:"  class="st">
-                    <el-input  v-model="form.last_ro_membrane_water" type="number" style="width:100px"></el-input>
-                </el-form-item>
+         <el-row :gutter="20">
+            <el-col :span="4" style="text-align: center;">
+                <span>一级</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="RO膜浓水:"  class="st">
-                    <el-input  v-model="form.last_ro_film_thick_water" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <el-input v-model.number="form.first_ro_membrane_water" style="width:100px" type="number"></el-input>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="RO膜出水:"  class="st">
-                    <el-input  v-model="form.last_ro_membrane_effluent" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <el-input v-model.number="form.first_ro_film_thick_water" style="width:100px" type="number"></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-col>
+            <el-col :span="4">
+                <el-input v-model.number="form.first_production_of_water_conductivity" style="width:100px" type="number"></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-col>
          </el-row>
-         <el-row>
-            <el-col :span="8">
-                <el-form-item label="产水电导度(μs/cm):"  class="st">
-                    <el-input  v-model="form.last_production_of_water_conductivity" type="number" style="width:100px"></el-input>
-                </el-form-item>
+         <el-row :gutter="20">
+            <el-col :span="4" style="text-align: center;">
+                <span>二级</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="产水量(L/h):"  class="st">
-                    <el-input  v-model="form.last_water_yield" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <el-input v-model.number="form.last_ro_membrane_water"  style="width:100px" type="number"></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-col>
+            <el-col :span="4">
+                <el-input  v-model="form.last_ro_membrane_effluent"  style="width:100px" type="number"></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-col>
+            <el-col :span="4">
+                <el-input v-model.number="form.last_water_yield"  style="width:100px" type="number"></el-input>
             </el-col>
          </el-row>
-
          <el-row>
             <el-col :span="8">
                 <el-form-item label="碳罐(MPa):"  class="st">
@@ -159,19 +165,23 @@
             <el-col :span="8">
                 <el-form-item label="硬度监测(mg/l):"  class="st">
                     <el-input  v-model="form.hardness_monitoring" 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>
             <el-col :span="8">
                 <el-form-item label="总氯检测(mg/l):"  class="st">
                     <el-input  v-model="form.total_chlorine_detection" 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>
             <el-col :span="8">
                 <el-form-item label="PH值检测:"  class="st">
                     <el-input  v-model="form.ph_detection" 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>
          </el-row>
@@ -180,7 +190,8 @@
             <el-col :span="8">
                 <el-form-item label="过氧乙酸浓度(mg/l):"  class="st">
                     <el-input  v-model="form.concentration_of_peroxyacetic_acid" 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>
          </el-row>
@@ -339,11 +350,11 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
             ],
             checked:"",
             rules: {
-             admin_user_id: [{ required: true, message: '请选择记录人' }],
+                admin_user_id: [{ required: true, message: '请选择记录人' }],
            },
            nurseList:[],
         }
-
+       
     },
     methods:{
         saveWater(formName){
@@ -450,15 +461,41 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
 
            }
          })
-       }
+       },
+    //    limitInput (e) {
+    //     e.target.value = e.target.value.replace(/(^\s*)|(\s*$)/g, "");
+    //     const reg = /[^\d.]/g;
+
+    //     // 只能是数字和小数点，不能是其他输入
+    //     e.target.value = e.target.value.replace(reg, "");
+
+    //     // 保证第一位只能是数字，不能是点
+    //     e.target.value = e.target.value.replace(/^\./g, "");
+    //     // 小数只能出现1位
+    //     e.target.value = e.target.value
+    //       .replace(".", "$#$")
+    //       .replace(/\./g, "")
+    //       .replace("$#$", ".");
+    //     // 小数点后面保留2位
+    //     e.target.value = e.target.value.replace(
+    //       /^(\-)*(\d+)\.(\d\d).*$/,
+    //       "$1$2.$3"
+    //     );
+    //     }
     },
     created(){
-      
        this.getAllDoctorList()
+    },
+    mounted(){
+        
     }
  }
+ 
 </script>
 <style scoped>
+.el-row {
+    margin-bottom: 20px;
+}
 .newMain .el-form-item__label {
     width: 110px !important;
 }

src/xt_pages/management/home.vue

@@ -5404,6 +5404,9 @@ export default {
        margin-bottom: 10px;
     margin-left: 82%
   }
+  .el-form-item__error {
+    margin-left: 130px;
+  }
 
 </style>
 <style lang="scss">
@@ -5449,9 +5452,7 @@ export default {
   //   width: 130px;
   //   font-size: 14px;
   // }
-  .el-form-item__error {
-    margin-left: 130px;
-  }
+  
 
  .el-upload-list__item-name {
     color: #606266;

src/xt_pages/user/courseOfDisease.vue

@@ -48,7 +48,10 @@
                         :row-class-name="tableRow"
                         @row-click="onRowClick"
               >
-                <el-table-column type="selection" width="40" align="center"></el-table-column>
+                <el-table-column
+                  type="selection"
+                  width="55">
+                </el-table-column>
                 <el-table-column label="病程标题" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.title}}
@@ -69,8 +72,8 @@
             <el-col :span="14">
               <div class="record_content_panel">
                 <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
-                <div class="content">
-                  <span v-if="current_select_record" v-html="current_select_record.content">{{current_select_record.content }}</span>
+                <div class="content"><!--v-html="current_select_record.content"-->
+                  <span v-if="current_select_record" >{{current_select_record.content }}</span>
                   <span v-else></span>
                 </div>
               </div>

src/xt_pages/user/rescueRecord.vue

@@ -68,11 +68,10 @@
                 @current-change="didChangeCurrentRecord"
                 @selection-change="didSelectionChange"
               >
-                <el-table-column
-                  type="selection"
-                  width="40"
-                  align="center"
-                ></el-table-column>
+              <el-table-column
+                type="selection"
+                width="55">
+              </el-table-column>
                 <el-table-column label="记录时间" align="center">
                   <template slot-scope="scope">
                     {{ recordTime(scope.row.record_time) }}