Merge remote-tracking branch 'origin/master'

psdc-ui/src/views/system/cl/index.vue

@@ -70,12 +70,9 @@
           <el-checkbox-group v-model="data.checkedSblb" @change="handleCheckedCitiesChange">
             <el-checkbox v-for="item in data.sblb" :label="item.deviceId" :key="item.deviceId" label-width="120" style="margin-bottom: 10px">
                <span style="width: 70px;display: inline-block">{{item.deviceName}}</span>
-              <el-input type="number"
-                        onKeypress="return(/^[0-9]*$/.test(String.fromCharCode(event.keyCode)))" v-model="item.intemp"  placeholder="进水温度" style="width: 120px ;margin: 10px"/>
-              <el-input type="number"
-                        onKeypress="return(/^[0-9]*$/.test(String.fromCharCode(event.keyCode)))" v-model="item.outtemp" placeholder="出水温度" style="width: 120px ;margin: 10px"/>
-              <el-input type="number"
-                        onKeypress="return(/^[0-9]*$/.test(String.fromCharCode(event.keyCode)))" v-model="item.temp" placeholder="温度" style="width: 120px ;margin: 10px"/>
+              <el-input type="number" v-model="item.intemp"  placeholder="进水温度" style="width: 120px ;margin: 10px"/>
+              <el-input type="number" v-model="item.outtemp" placeholder="出水温度" style="width: 120px ;margin: 10px"/>
+              <el-input type="number" v-model="item.temp" placeholder="温度" style="width: 120px ;margin: 10px"/>
             </el-checkbox>
           </el-checkbox-group>
 <!--          <el-col :span="12">-->
@@ -137,12 +134,9 @@
           <el-checkbox-group v-model="data.checkedSblb1" @change="handleCheckedCitiesChange1">
             <el-checkbox v-for="item in data.sblb" :label="item.deviceId" :key="item.deviceId" style="margin-bottom: 10px">
               <span style="width: 70px;display: inline-block">{{item.deviceName}}</span>
-              <el-input type="number"
-                        onKeypress="return(/^[0-9]*$/.test(String.fromCharCode(event.keyCode)))" v-model="item.intemp" placeholder="进水温度" style="width: 120px ;margin: 10px"/>
-              <el-input type="number"
-                        onKeypress="return(/^[0-9]*$/.test(String.fromCharCode(event.keyCode)))" v-model="item.outtemp" placeholder="出水温度" style="width: 120px ;margin: 10px"/>
-              <el-input type="number"
-                        onKeypress="return(/^[0-9]*$/.test(String.fromCharCode(event.keyCode)))" v-model="item.temp" placeholder="温度" style="width: 120px ;margin: 10px"/>
+              <el-input type="number" v-model="item.intemp" placeholder="进水温度" style="width: 120px ;margin: 10px"/>
+              <el-input type="number" v-model="item.outtemp" placeholder="出水温度" style="width: 120px ;margin: 10px"/>
+              <el-input type="number" v-model="item.temp" placeholder="温度" style="width: 120px ;margin: 10px"/>
             </el-checkbox>
           </el-checkbox-group>
 <!--          <el-col :span="24">-->