Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/energyai_vue into dev

src/pages/eq/hall/components/hallModal.vue

@@ -7,12 +7,14 @@
   >
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm">
       <el-form-item label="设置频率：" :label-width="formLabelWidth"  prop="set_frequency">
-        <el-input
+        <el-input-number
+          :controls='false'
+          :min="35"
+          :max="45"
           size="mini"
           autocomplete="off"
-          style="width: 300px"
           v-model="dataForm.set_frequency"
-        ></el-input>
+        ></el-input-number>
       </el-form-item>
     </el-form>
     <div slot="footer">

src/pages/eq/hall/components/settingFlrb.vue

@@ -53,9 +53,7 @@
       </el-row>
       <el-row>
         <el-form-item label="制热启动温度：" :label-width="formLabelWidth"  prop="heating_start_temperature">
-          <el-input
-            size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.heating_start_temperature"
-          ></el-input>
+          <el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.heating_start_temperature" :controls='false' :min='0' :max='100' ></el-input-number>
         </el-form-item>
         <el-form-item>
           <el-button
@@ -68,9 +66,7 @@
       </el-row>
       <el-row>
         <el-form-item label="制热停止温度：" :label-width="formLabelWidth"  prop="heating_stop_temperature">
-          <el-input
-            size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.heating_stop_temperature"
-          ></el-input>
+          <el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.heating_stop_temperature" :controls='false' :min='0' :max='100' ></el-input-number>
         </el-form-item>
         <el-form-item>
           <el-button
@@ -83,9 +79,7 @@
       </el-row>
       <el-row>
         <el-form-item label="热风启动温度：" :label-width="formLabelWidth"  prop="hot_air_start_temperature">
-          <el-input
-            size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.hot_air_start_temperature"
-          ></el-input>
+          <el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.hot_air_start_temperature" :controls='false' :min='0' :max='100' ></el-input-number>
         </el-form-item>
         <el-form-item>
           <el-button
@@ -98,9 +92,7 @@
       </el-row>
       <el-row>
         <el-form-item label="热风停止温度：" :label-width="formLabelWidth"  prop="hot_air_stop_temperature">
-          <el-input
-            size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.hot_air_stop_temperature"
-          ></el-input>
+          <el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.hot_air_stop_temperature" :controls='false' :min='0' :max='100' ></el-input-number>
         </el-form-item>
         <el-form-item>
           <el-button