Merge branch 'master' of ssh://gitlab.91isoft.com:10022/hikvision/web-project

src/views/SchedulingPage/AnnualParamPage.vue

@@ -258,31 +258,31 @@ function customSort(a, b) {
           <el-row>
             <el-col :span="8" col-label>热指标(W/m²)：</el-col>
             <el-col :span="16" col-value>
-              <el-input v-float-number v-model="reviseForm.standard" placeholder="" style="width: 370px" />
+              <el-input v-float-number maxlength="11" v-model="reviseForm.standard" placeholder="" style="width: 370px" />
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8" col-label>度日数标定值：</el-col>
             <el-col :span="16" col-value>
-              <el-input v-float-number v-model="reviseForm.degreeStandard" style="width: 370px" />
+              <el-input v-float-number maxlength="11" v-model="reviseForm.degreeStandard" style="width: 370px" />
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8" col-label>室内温度：</el-col>
             <el-col :span="16" col-value>
-              <el-input v-float-number v-model="reviseForm.indoorTemperature" style="width: 370px" />
+              <el-input v-float-number maxlength="11" v-model="reviseForm.indoorTemperature" style="width: 370px" />
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8" col-label>室外温度：</el-col>
             <el-col :span="16" col-value>
-              <el-input v-float-number v-model="reviseForm.outdoorTemperature" style="width: 370px" />
+              <el-input v-float-number maxlength="11" v-model="reviseForm.outdoorTemperature" style="width: 370px" />
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8" col-label>回水温度：</el-col>
             <el-col :span="16" col-value>
-              <el-input v-float-number v-model="reviseForm.backWaterTemperature" style="width: 370px" />
+              <el-input v-float-number maxlength="11" v-model="reviseForm.backWaterTemperature" style="width: 370px" />
             </el-col>
           </el-row>
         </template>
@@ -314,31 +314,31 @@ function customSort(a, b) {
           <el-row>
             <el-col :span="8" col-label>热指标(W/m²)：</el-col>
             <el-col :span="16" col-value>
-              <el-input v-float-number v-model="addForm.standard" placeholder="" style="width: 370px" />
+              <el-input v-float-number maxlength="11" v-model="addForm.standard" placeholder="" style="width: 370px" />
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8" col-label>度日数标定值：</el-col>
             <el-col :span="16" col-value>
-              <el-input v-float-number v-model="addForm.degreeStandard" style="width: 370px" />
+              <el-input v-float-number maxlength="11" v-model="addForm.degreeStandard" style="width: 370px" />
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8" col-label>室内温度：</el-col>
             <el-col :span="16" col-value>
-              <el-input v-float-number v-model="addForm.indoorTemperature" style="width: 370px" />
+              <el-input v-float-number maxlength="11" v-model="addForm.indoorTemperature" style="width: 370px" />
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8" col-label>室外温度：</el-col>
             <el-col :span="16" col-value>
-              <el-input v-float-number v-model="addForm.outdoorTemperature" style="width: 370px" />
+              <el-input v-float-number maxlength="11" v-model="addForm.outdoorTemperature" style="width: 370px" />
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8" col-label>回水温度：</el-col>
             <el-col :span="16" col-value>
-              <el-input v-float-number v-model="addForm.backWaterTemperature" style="width: 370px" />
+              <el-input v-float-number maxlength="11" v-model="addForm.backWaterTemperature" style="width: 370px" />
             </el-col>
           </el-row>
         </template>

src/views/SchedulingPage/PhenomenonPage.vue

@@ -199,7 +199,7 @@ function customSort(a,b){
         <el-row>
           <el-col :span="8" col-label>对应温度：</el-col>
           <el-col :span="16" col-value>
-            <el-input v-float-number v-model="reviseForm.phenomenonTemp" placeholder="" style="width: 370px"/>
+            <el-input v-float-number maxlength="11" v-model="reviseForm.phenomenonTemp" placeholder="" style="width: 370px"/>
           </el-col>
         </el-row>
         <el-row>
@@ -241,7 +241,7 @@ function customSort(a,b){
         <el-row>
           <el-col :span="8" col-label>对应温度：</el-col>
           <el-col :span="16" col-value>
-            <el-input v-float-number v-model="addForm.phenomenonTemp" placeholder="" style="width: 370px"/>
+            <el-input v-float-number maxlength="11" v-model="addForm.phenomenonTemp" placeholder="" style="width: 370px"/>
           </el-col>
         </el-row>
         <el-row>

src/views/SchedulingPage/WeatherManagePage.vue

@@ -29,6 +29,10 @@ const bind = (row) => { // 绑定按钮单击事件
   dependentSub.value = row
   bindWindowOpen.value = true
 }
+const cancelRevise = ()=>{
+  reviseWindowOpen.value = false
+  getData()
+}
 const confirmRevise = val => { // 修改弹窗确认按钮事件
   let params = cloneDeep(val)
   params.isAuto = params.isAuto === '自动模式' ? true : false
@@ -193,7 +197,7 @@ function getCurrentDateTime() {
       <ReviseWindow
           :open="reviseWindowOpen"
           :data="dependentSub"
-          @onCancel="reviseWindowOpen = false"
+          @onCancel="cancelRevise"
           @onConfirm="confirmRevise"
       ></ReviseWindow>
       <BindWindow

src/views/SchedulingPage/WindManagePage.vue

@@ -236,6 +236,7 @@ function customSort(a, b) {
               <el-input
                 v-float-number
                 v-model="reviseForm.windTemp"
+                maxlength="11"
                 placeholder=""
                 style="width: 370px"
               />
@@ -292,6 +293,7 @@ function customSort(a, b) {
             <el-col :span="16" col-value>
               <el-input
                 v-float-number
+                maxlength="11"
                 v-model="addForm.windTemp"
                 placeholder=""
                 style="width: 370px"

src/views/SchedulingPage/weatherManageSub/AddWindow.vue

@@ -98,25 +98,25 @@ function resetInput(){
         <el-row>
           <el-col :span="8" class="content-col-label">温度：</el-col>
           <el-col :span="16" class="content-col-value">
-            <el-input v-float-number :input-style="inputStyle" v-model="addData.temperature" style="width: 510px"/>
+            <el-input v-float-number maxlength="11" :input-style="inputStyle" v-model="addData.temperature" style="width: 510px"/>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8" class="content-col-label">风速：</el-col>
           <el-col :span="16" class="content-col-value">
-            <el-input :input-style="inputStyle" v-model="addData.wind" style="width: 510px"/>
+            <el-input :input-style="inputStyle" maxlength="11" v-model="addData.wind" style="width: 510px"/>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8" class="content-col-label">光照：</el-col>
           <el-col :span="16" class="content-col-value">
-            <el-input :input-style="inputStyle" v-model="addData.illumination" style="width: 510px"/>
+            <el-input :input-style="inputStyle" maxlength="11" v-model="addData.illumination" style="width: 510px"/>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8" class="content-col-label">排序：</el-col>
           <el-col :span="16" class="content-col-value">
-            <el-input :input-style="inputStyle" v-model="addData.sort" style="width: 510px"/>
+            <el-input :input-style="inputStyle" maxlength="11" v-model="addData.sort" style="width: 510px"/>
           </el-col>
         </el-row>
         <el-row>
@@ -126,17 +126,17 @@ function resetInput(){
           </el-col>
           <el-col :span="5" class="content-col-label">自动偏差百分比（%d）：</el-col>
           <el-col :span="7" class="content-col-value">
-            <el-input v-float-number :input-style="inputStyle" v-model="addData.diffPercentage" style="width: 240px"/>
+            <el-input v-float-number :input-style="inputStyle" maxlength="11" v-model="addData.diffPercentage" style="width: 240px"/>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="5" class="content-col-label">自动验证循环时间（分钟）：</el-col>
           <el-col :span="7" class="content-col-value">
-            <el-input v-float-number :input-style="inputStyle" v-model="addData.timeoutMin" style="width: 240px"/>
+            <el-input v-float-number :input-style="inputStyle" maxlength="11" v-model="addData.timeoutMin" style="width: 240px"/>
           </el-col>
           <el-col :span="5" class="content-col-label">自动调节温度（℃）：</el-col>
           <el-col :span="7" class="content-col-value">
-            <el-input v-float-number :input-style="inputStyle" v-model="addData.tempRegulation" style="width: 240px"/>
+            <el-input v-float-number :input-style="inputStyle" maxlength="11" v-model="addData.tempRegulation" style="width: 240px"/>
           </el-col>
         </el-row>
       </div>

src/views/SchedulingPage/weatherManageSub/ReviseWindow.vue

@@ -77,25 +77,25 @@ function onOpen(){
         <el-row>
           <el-col :span="8" class="content-col-label">温度：</el-col>
           <el-col :span="16" class="content-col-value">
-            <el-input v-float-number :input-style="inputStyle" v-model="reviseData.temperature" style="width: 510px"/>
+            <el-input v-float-number maxlength="11" :input-style="inputStyle" v-model="reviseData.temperature" style="width: 510px"/>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8" class="content-col-label">风速：</el-col>
           <el-col :span="16" class="content-col-value">
-            <el-input :input-style="inputStyle" v-model="reviseData.wind" style="width: 510px"/>
+            <el-input :input-style="inputStyle" maxlength="11" v-model="reviseData.wind" style="width: 510px"/>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8" class="content-col-label">光照：</el-col>
           <el-col :span="16" class="content-col-value">
-            <el-input :input-style="inputStyle" v-model="reviseData.illumination" style="width: 510px"/>
+            <el-input :input-style="inputStyle" maxlength="11" v-model="reviseData.illumination" style="width: 510px"/>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8" class="content-col-label">排序：</el-col>
           <el-col :span="16" class="content-col-value">
-            <el-input :input-style="inputStyle" v-model="reviseData.sort" style="width: 510px"/>
+            <el-input :input-style="inputStyle" maxlength="11" v-model="reviseData.sort" style="width: 510px"/>
           </el-col>
         </el-row>
         <el-row>
@@ -105,17 +105,17 @@ function onOpen(){
           </el-col>
           <el-col :span="5" class="content-col-label">自动偏差百分比（%d）：</el-col>
           <el-col :span="7" class="content-col-value">
-            <el-input v-float-number :input-style="inputStyle" v-model="reviseData.diffPercentage" style="width: 240px"/>
+            <el-input v-float-number :input-style="inputStyle" maxlength="11" v-model="reviseData.diffPercentage" style="width: 240px"/>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="5" class="content-col-label">自动验证循环时间（分钟）：</el-col>
           <el-col :span="7" class="content-col-value">
-            <el-input v-float-number :input-style="inputStyle" v-model="reviseData.timeoutMin" style="width: 240px"/>
+            <el-input v-float-number :input-style="inputStyle" maxlength="11" v-model="reviseData.timeoutMin" style="width: 240px"/>
           </el-col>
           <el-col :span="5" class="content-col-label">自动调节温度（℃）：</el-col>
           <el-col :span="7" class="content-col-value">
-            <el-input v-float-number :input-style="inputStyle" v-model="reviseData.tempRegulation" style="width: 240px"/>
+            <el-input v-float-number :input-style="inputStyle" maxlength="11" v-model="reviseData.tempRegulation" style="width: 240px"/>
           </el-col>
         </el-row>
       </div>