BUG修改+合并

src/views/dataAdministration/index.vue

@@ -210,9 +210,11 @@
                 :rules="getFileAddrRules(index)"
               >
                 <el-input
+                  :min="1"
                   v-model="item.transferAddr"
                   :placeholder="'请输入' + item.transferTypeName"
                   size="small"
+                  @change="ensureMinValue(item, 'transferAddr')"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -224,9 +226,11 @@
               >
                 <el-input
                   type="number"
+                  :min="1"
                   v-model="item.timeGranularity"
                   :placeholder="'请输入' + item.timeGranularityName"
                   size="small"
+                  @input="ensureMinValue(item, 'timeGranularity')"
                 >
                   <template slot="append">秒</template></el-input
                 >
@@ -320,6 +324,7 @@
               >
                 <el-input
                   type="number"
+                  :min="1"
                   v-model="
                     newEditForm.dataTransferTypePathDtoList[0].timeGranularity
                   "
@@ -481,6 +486,11 @@ export default {
     this.getBatchCodeList();
   },
   methods: {
+    ensureMinValue(item, field) {
+      if (item[field] < 1) {
+        item[field] = 1;
+      }
+    },
     editstateCancel(formName) {
       this.$refs[formName] && this.$refs[formName].resetFields();
       this.editTransferStateForm = {};

src/views/performance/components/abnormalDetail.vue

@@ -7,7 +7,12 @@
       <el-table-column prop="name" label="异常数量" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.isEditing">
-            <el-input v-model="scope.row.errCount" type="number"></el-input>
+            <el-input
+              v-model="scope.row.errCount"
+              type="number"
+              :min="1"
+              @input="checkErrCount(scope.row)"
+            ></el-input>
           </div>
           <div v-else>
             {{ scope.row.errCount }}
@@ -20,6 +25,8 @@
             <el-input
               v-model="scope.row.handleErrCount"
               type="number"
+              :min="1"
+              @input="checkHandleErrCount(scope.row)"
             ></el-input>
           </div>
           <div v-else>
@@ -152,6 +159,16 @@ export default {
   },
 
   methods: {
+    checkErrCount(row) {
+      if (row.errCount < 1) {
+        row.errCount = 1;
+      }
+    },
+    checkHandleErrCount(row) {
+      if (row.handleErrCount < 1) {
+        row.handleErrCount = 1;
+      }
+    },
     // 分页数据切换
     handleCurrentChange(val) {
       this.formInline.pageNum = val;

src/views/performance/components/analysisEvent.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:13:51
- * @LastEditTime: 2024-06-17 15:45:24
+ * @LastEditTime: 2024-06-19 14:03:49
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/analysisEvent.vue
@@ -134,16 +134,20 @@
                 <div class="demo-input-suffix">
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最小值"
                     v-model="form.valueWindSpeed[0]"
+                    @input="ensureMinValue(form.valueWindSpeed, 0)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最大值"
                     v-model="form.valueWindSpeed[1]"
+                    @input="ensureMinValue(form.valueWindSpeed, 1)"
                   >
                   </el-input>
                 </div>
@@ -154,16 +158,20 @@
                 <div class="demo-input-suffix">
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最小值"
                     v-model="form.valuePitchAngle[0]"
+                    @input="ensureMinValue(form.valuePitchAngle, 0)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最大值"
                     v-model="form.valuePitchAngle[1]"
+                    @input="ensureMinValue(form.valuePitchAngle, 1)"
                   >
                   </el-input>
                 </div>
@@ -174,16 +182,20 @@
                 <div class="demo-input-suffix">
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最小值"
                     v-model="form.valueActivePower[0]"
+                    @input="ensureMinValue(form.valueActivePower, 0)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最大值"
                     v-model="form.valueActivePower[1]"
+                    @input="ensureMinValue(form.valueActivePower, 1)"
                   >
                   </el-input>
                 </div>
@@ -194,16 +206,20 @@
                 <div class="demo-input-suffix">
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最小值"
                     v-model="form.valueGeneratorSpeed[0]"
+                    @input="ensureMinValue(form.valueGeneratorSpeed, 0)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最大值"
                     v-model="form.valueGeneratorSpeed[1]"
+                    @input="ensureMinValue(form.valueGeneratorSpeed, 1)"
                   >
                   </el-input>
                 </div>
@@ -222,23 +238,29 @@
                 <div class="demo-input-suffix">
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="步长"
                     v-model="form.dGeneratorSpeed[0]"
+                    @input="ensureMinValue(form.dGeneratorSpeed, 0)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最小值"
                     v-model="form.dGeneratorSpeed[1]"
+                    @input="ensureMinValue(form.dGeneratorSpeed, 1)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最大值"
                     v-model="form.dGeneratorSpeed[2]"
+                    @input="ensureMinValue(form.dGeneratorSpeed, 2)"
                   >
                   </el-input>
                 </div>
@@ -249,23 +271,29 @@
                 <div class="demo-input-suffix">
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="步长"
                     v-model="form.iGeneratorSpeed[0]"
+                    @input="ensureMinValue(form.iGeneratorSpeed, 0)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最小值"
                     v-model="form.iGeneratorSpeed[1]"
+                    @input="ensureMinValue(form.iGeneratorSpeed, 1)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最大值"
                     v-model="form.iGeneratorSpeed[2]"
+                    @input="ensureMinValue(form.iGeneratorSpeed, 2)"
                   >
                   </el-input>
                 </div>
@@ -276,23 +304,29 @@
                 <div class="demo-input-suffix">
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="步长"
                     v-model="form.dGeneratorTorque[0]"
+                    @input="ensureMinValue(form.dGeneratorTorque, 0)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最小值"
                     v-model="form.dGeneratorTorque[1]"
+                    @input="ensureMinValue(form.dGeneratorTorque, 1)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最大值"
                     v-model="form.dGeneratorTorque[2]"
+                    @input="ensureMinValue(form.dGeneratorTorque, 2)"
                   >
                   </el-input>
                 </div>
@@ -303,23 +337,29 @@
                 <div class="demo-input-suffix">
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="步长"
                     v-model="form.iGeneratorTorque[0]"
+                    @input="ensureMinValue(form.iGeneratorTorque, 0)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最小值"
                     v-model="form.iGeneratorTorque[1]"
+                    @input="ensureMinValue(form.iGeneratorTorque, 1)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最大值"
                     v-model="form.iGeneratorTorque[2]"
+                    @input="ensureMinValue(form.iGeneratorTorque, 2)"
                   >
                   </el-input>
                 </div>
@@ -330,23 +370,29 @@
                 <div class="demo-input-suffix">
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="步长"
                     v-model="form.cp[0]"
+                    @input="ensureMinValue(form.cp, 0)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最小值"
                     v-model="form.cp[1]"
+                    @input="ensureMinValue(form.cp, 1)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最大值"
                     v-model="form.cp[2]"
+                    @input="ensureMinValue(form.cp, 2)"
                   >
                   </el-input>
                 </div>
@@ -357,23 +403,29 @@
                 <div class="demo-input-suffix">
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="步长"
                     v-model="form.tsr[0]"
+                    @input="ensureMinValue(form.tsr, 0)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最小值"
                     v-model="form.tsr[1]"
+                    @input="ensureMinValue(form.tsr, 1)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最大值"
                     v-model="form.tsr[2]"
+                    @input="ensureMinValue(form.tsr, 2)"
                   >
                   </el-input>
                 </div>
@@ -384,23 +436,29 @@
                 <div class="demo-input-suffix">
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="步长"
                     v-model="form.activePower[0]"
+                    @input="ensureMinValue(form.activePower, 0)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最小值"
                     v-model="form.activePower[1]"
+                    @input="ensureMinValue(form.activePower, 1)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最大值"
                     v-model="form.activePower[2]"
+                    @input="ensureMinValue(form.activePower, 2)"
                   >
                   </el-input>
                 </div>
@@ -411,23 +469,29 @@
                 <div class="demo-input-suffix">
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="步长"
                     v-model="form.pitchAngle[0]"
+                    @input="ensureMinValue(form.pitchAngle, 0)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最小值"
                     v-model="form.pitchAngle[1]"
+                    @input="ensureMinValue(form.pitchAngle, 1)"
                   >
                   </el-input>
                   <el-input
                     type="number"
+                    :min="1"
                     size="small"
                     placeholder="最大值"
                     v-model="form.pitchAngle[2]"
+                    @input="ensureMinValue(form.pitchAngle, 2)"
                   >
                   </el-input>
                 </div>
@@ -622,6 +686,11 @@ export default {
     this.getWindCodeList();
   },
   methods: {
+    ensureMinValue(field, index) {
+      if (field[index] < 1) {
+        field[index] = 1;
+      }
+    },
     handleEngineCode(e) {
       console.log(e);
       this.engineCode = e;

vue.config.js

@@ -66,7 +66,7 @@ module.exports = {
       "/api": {
         // target: "http://192.168.5.4:16200", // 石月
         target: "http://192.168.50.235:16200", //内网
-        // target: "http://192.168.5.15:16200",//老陈
+        // target: "http://192.168.5.15:16200",
         // target: "http://106.120.102.238:16600", //外网
         changeOrigin: true,
         pathRewrite: {