From 1b30c098b9effb2a97fe008151253e1ceed11f99 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 30 Sep 2024 12:25:57 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edgeInsert/components/form-insert.vue     |  52 +-
 .../base/proj/components/form-project.vue     |  35 +-
 src/views/base/proj/index.vue                 |   6 +-
 .../base/warning/components/form-warning.vue  | 507 ++++++++++++++++--
 src/views/login1.vue                          |   3 +
 5 files changed, 547 insertions(+), 56 deletions(-)

diff --git a/src/views/base/edgeInsert/components/form-insert.vue b/src/views/base/edgeInsert/components/form-insert.vue
index d23c438..e51e3e7 100644
--- a/src/views/base/edgeInsert/components/form-insert.vue
+++ b/src/views/base/edgeInsert/components/form-insert.vue
@@ -18,13 +18,27 @@
               filterable
               placeholder="请选择"
               @change="departChange"
+              :popper-append-to-body="false"
             >
               <el-option
                 v-for="item in departRange"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
-              />
+              >
+              <template
+                  v-if="item.label.length > maxlength">
+                  <el-tooltip
+                    class="item-tooltip"
+                    effect="dark"
+                    :content="item.label"
+                    placement="top"
+                  >
+                    <span class="ellipsis">{{ item.label }}</span>
+                   </el-tooltip>
+                  
+              </template>
+            </el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -212,6 +226,7 @@ export default {
           },
         ],
       },
+      maxlength:20,
       // 各类下拉
       departRange: [],
       projRange: [],
@@ -270,21 +285,27 @@ export default {
           value: item.id,
         };
       });
-      // 获取工程下拉选
-      let projRes = await queryProjApi({
-        isAll: 0,
-      });
-      this.projRange = projRes.data.map((item) => {
-        return {
-          label: item.proName,
-          value: item.id,
-        };
-      });
+
     },
     departChange(e) {
       this.departRange.forEach((item) => {
         if (e === item.value) {
           this.projectParams.departName = item.label;
+          console.log(1111)
+          // 获取工程下拉选
+          let projRes =  queryProjApi({
+            isAll: 0,
+            departId: e,
+          }).then(projRes =>{
+            console.log(projRes)
+          this.projRange = projRes.data.map((item) => {
+            return {
+              label: item.proName,
+              value: item.id,
+            };
+          });
+          console.log(22222)
+          })
         }
       });
     },
@@ -332,6 +353,15 @@ export default {
 </script>
 
 <style scoped>
+
+.ellipsis {
+  display: block; /* 确保是块级元素 */
+  white-space: nowrap; /* 防止换行 */
+  overflow: hidden; /* 隐藏超出的部分 */
+  text-overflow: ellipsis; /* 显示省略号 */
+  max-width: 400px; /* 设置最大宽度，调整为你需要的值 */
+}
+
 ::v-deep .el-select {
   width: 100%;
 }
diff --git a/src/views/base/proj/components/form-project.vue b/src/views/base/proj/components/form-project.vue
index b58bdda..4d41326 100644
--- a/src/views/base/proj/components/form-project.vue
+++ b/src/views/base/proj/components/form-project.vue
@@ -35,13 +35,29 @@
                   filterable
                   placeholder="请选择"
                   @change="departChange"
+                  class="custom-select"
+                  :popper-append-to-body="false"
                 >
                   <el-option
                     v-for="item in deptRange"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
-                  />
+                  >
+                  <template
+                  v-if="item.label.length > maxlength">
+                  <el-tooltip
+                    class="item-tooltip"
+                    effect="dark"
+                    :content="item.label"
+                    placement="top"
+                  >
+                    <span class="ellipsis">{{ item.label }}</span>
+                   </el-tooltip>
+                  
+                  </template>
+                  
+                </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -181,6 +197,7 @@ export default {
     },
     data() {
         return {
+          maxlength: 20,
             subSort: '', // 提交类型：新增 1 / 修改 2
             projectParams: {
               proName: undefined, //工程名称
@@ -446,6 +463,22 @@ export default {
 ::v-deep .el-select {
     width: 100%;
 }
+/* .custom-select .el-select-dropdown__item{
+  max-width: 400px; 
+  overflow: hidden; 
+  text-overflow: ellipsis; 
+  white-space: nowrap; 
+
+} */
+
+.ellipsis {
+  display: block; /* 确保是块级元素 */
+  white-space: nowrap; /* 防止换行 */
+  overflow: hidden; /* 隐藏超出的部分 */
+  text-overflow: ellipsis; /* 显示省略号 */
+  max-width: 400px; /* 设置最大宽度，调整为你需要的值 */
+}
+ 
 ::v-deep .el-form-item__label{
   font-weight: normal;
 }
diff --git a/src/views/base/proj/index.vue b/src/views/base/proj/index.vue
index 96d520c..01fb183 100644
--- a/src/views/base/proj/index.vue
+++ b/src/views/base/proj/index.vue
@@ -41,12 +41,16 @@
         >
       </template>
       <template slot="powerTotal" slot-scope="{ data }">
-        <span
+        
+        <span v-if="data.proTypeName==='线路工程'"
           style="color: #0060EE; font-weight: bold; cursor: pointer"
           @click="handleTower(data)"
         >
           {{ data.powerTotal }}
         </span>
+        <span v-else>
+          -
+        </span>
       </template>
     </TableModel>
 
diff --git a/src/views/base/warning/components/form-warning.vue b/src/views/base/warning/components/form-warning.vue
index be2e973..01cd48f 100644
--- a/src/views/base/warning/components/form-warning.vue
+++ b/src/views/base/warning/components/form-warning.vue
@@ -325,90 +325,303 @@ export default {
                 {
                   required: true,
                   message: '请输入温度阈值',
-                  validator: this.validateNum,
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请正确输入温度阈值(小数点后最多保留六位)'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请正确输入温度阈值(小数点后最多保留六位)'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      callback();
+                  }
+                },
+                  trigger: 'blur'
+                }
               ],
               configVal1Max: [
                 {
                   required: true,
                   message: '请输入温度阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请正确输入温度阈值(小数点后最多保留六位)'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请正确输入温度阈值(小数点后最多保留六位)'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      callback();
+                  }
+                },
+                  trigger: 'blur'
+                }
               ],
               configVal2Min: [
                 {
                   required: true,
                   message: '请输入湿度阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    // 检查前导零（例如 '0000' 或 '000.000000'）
+                    if (value !== valueTemp.toString() || valueTemp.toString() === "0") {
+                      return callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    }
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp < 0 || valueTemp > 100 ||valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      if (valueTemp < 0 || valueTemp > 100) {
+                      callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    } else {
+                      callback();
+                    }
+                  }
+                  trigger: 'blur'
+                }
+              }
               ],
               configVal2Max: [
                 {
                   required: true,
                   message: '请输入湿度阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp < 0 || valueTemp > 100 ||valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      if (valueTemp < 0 || valueTemp > 100) {
+                      callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    } else {
+                      callback();
+                    }
+                  }
+                  trigger: 'blur'
+                }
+              }
               ],
               configVal3Min: [
                 {
                   required: true,
                   message: '请输入噪声阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请正确输入噪声阈值(小数点后最多保留六位)'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请正确输入噪声阈值(小数点后最多保留六位)'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      callback();
+                  }
+                },
+                  trigger: 'blur'
+                }
               ],
               configVal3Max: [
                 {
                   required: true,
                   message: '请输入噪声阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请正确输入噪声阈值(小数点后最多保留六位)'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请正确输入噪声阈值(小数点后最多保留六位)'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      callback();
+                  }
+                },
+                  trigger: 'blur'
+                }
               ],
               configVal4Min: [
                 {
                   required: true,
                   message: '请输入PM2.5阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
+                }, 
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请正确输入PM2.5阈值(小数点后最多保留六位)'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请正确输入PM2.5阈值(小数点后最多保留六位)'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      callback();
+                  }
                 },
+                  trigger: 'blur'
+                }
               ],
               configVal4Max: [
                 {
                   required: true,
                   message: '请输入PM2.5阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请正确输入PM2.5阈值(小数点后最多保留六位)'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请正确输入PM2.5阈值(小数点后最多保留六位)'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      callback();
+                  }
+                },
+                  trigger: 'blur'
+                }
               ],
               configVal5Min: [
                 {
                   required: true,
                   message: '请输入PM10阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请正确输入PM10阈值(小数点后最多保留六位)'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请正确输入PM10阈值(小数点后最多保留六位)'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      callback();
+                  }
+                },
+                  trigger: 'blur'
+                }
               ],
               configVal5Max: [
                 {
                   required: true,
                   message: '请输入PM10阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请正确输入PM10阈值(小数点后最多保留六位)'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请正确输入PM10阈值(小数点后最多保留六位)'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      callback();
+                  }
+                },
+                  trigger: 'blur'
+                }
               ],
             },
             projectParams2Rules: {
@@ -423,19 +636,47 @@ export default {
                 {
                   required: true,
                   message: '请输入倾角阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请必须输入0~90的数'));
+                    }
+                    // const numValue = value.trim();
+                    // 正则表达式：负数、零和正整数
+                    const integerPattern = /^(0|[1-9]\d*(\.\d+)?|0\.\d+)$/;
+                    if (!integerPattern.test(value) && value <= 90) {
+                         callback(new Error('请必须输入0~90的数'));
+                    } else {
+                      callback();
+                    }
+                  },
+                  trigger: 'blur'
+                }
               ],
               configVal1Max: [
                 {
                   required: true,
                   message: '请输入倾角阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请必须输入0~90的数'));
+                    }
+                    // const numValue = value.trim();
+                    // 正则表达式：负数、零和正整数
+                    const integerPattern = /^(0|[1-9]\d*(\.\d+)?|0\.\d+)$/;
+                    if (!integerPattern.test(value) && value <= 90) {
+                         callback(new Error('请必须输入0~90的数'));
+                    } else {
+                      callback();
+                    }
+                  },
+                  trigger: 'blur'
+                }
               ],
             },
             projectParams3Rules: {
@@ -450,19 +691,47 @@ export default {
                 {
                   required: true,
                   message: '请输入拉力阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请必须输入非负数'));
+                    }
+                    // const numValue = value.trim();
+                    // 正则表达式：负数、零和正整数
+                    const integerPattern = /^(0|[1-9]\d*(\.\d+)?|0\.\d+)$/;
+                    if (!integerPattern.test(value)) {
+                         callback(new Error('请必须输入非负数'));
+                    } else {
+                      callback();
+                    }
+                  },
+                  trigger: 'blur'
+                }
               ],
               configVal1Max: [
                 {
                   required: true,
                   message: '请输入拉力阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请必须输入非负数'));
+                    }
+                    // const numValue = value.trim();
+                    // 正则表达式：负数、零和正整数
+                    const integerPattern = /^(0|[1-9]\d*(\.\d+)?|0\.\d+)$/;
+                    if (!integerPattern.test(value)) {
+                         callback(new Error('请必须输入非负数'));
+                    } else {
+                      callback();
+                    }
+                  },
+                  trigger: 'blur'
+                }
               ],
             },
             projectParams4Rules: {
@@ -477,73 +746,225 @@ export default {
                 {
                   required: true,
                   message: '请输入含氧量阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp < 0 || valueTemp > 100 ||valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      if (valueTemp < 0 || valueTemp > 100) {
+                      callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    } else {
+                      callback();
+                    }
+                  }
+                  trigger: 'blur'
+                }
+              }
               ],
               configVal1Max: [
                 {
                   required: true,
                   message: '请输入含氧量阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp < 0 || valueTemp > 100 ||valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      if (valueTemp < 0 || valueTemp > 100) {
+                      callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    } else {
+                      callback();
+                    }
+                  }
+                  trigger: 'blur'
+                }
+              }
               ],
               configVal2Min: [
                 {
                   required: true,
                   message: '请输入一氧化碳阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请必须输入非负数'));
+                    }
+                    // const numValue = value.trim();
+                    // 正则表达式：负数、零和正整数
+                    const integerPattern = /^(0|[1-9]\d*(\.\d+)?|0\.\d+)$/;
+                    if (!integerPattern.test(value)) {
+                         callback(new Error('请必须输入非负数'));
+                    } else {
+                      callback();
+                    }
+                  },
+                  trigger: 'blur'
+                }
               ],
               configVal2Max: [
                 {
                   required: true,
                   message: '请输入一氧化碳阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请必须输入非负数'));
+                    }
+                    // const numValue = value.trim();
+                    // 正则表达式：负数、零和正整数
+                    const integerPattern = /^(0|[1-9]\d*(\.\d+)?|0\.\d+)$/;
+                    if (!integerPattern.test(value)) {
+                         callback(new Error('请必须输入非负数'));
+                    } else {
+                      callback();
+                    }
+                  },
+                  trigger: 'blur'
+                }
               ],
               configVal3Min: [
                 {
                   required: true,
                   message: '请输入可燃气体阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp < 0 || valueTemp > 100 ||valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      if (valueTemp < 0 || valueTemp > 100) {
+                      callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    } else {
+                      callback();
+                    }
+                  }
+                },
+                  trigger: 'blur'
+                }
               ],
               configVal3Max: [
                 {
                   required: true,
                   message: '请输入可燃气体阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    }
+                    const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
+                    if(!regexTwo.test(value)){
+                      return callback(new Error('请勿输入非数字'));
+                    }
+                    const valueTemp = parseFloat(value);
+                    if(valueTemp.toString().includes('.')==true){
+                      if (valueTemp < 0 || valueTemp > 100 ||valueTemp.toString().split(".")[1].length>6) {
+                      callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    } else {
+                      callback();
+                    }
+                    }else{
+                      if (valueTemp < 0 || valueTemp > 100) {
+                      callback(new Error('请输入0~100内的数据且小数点后最多保留六位'));
+                    } else {
+                      callback();
+                    }
+                  }
+                },
+                  trigger: 'blur'
+                }
               ],
               configVal4Min: [
                 {
                   required: true,
                   message: '请输入硫化氢阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请必须输入非负数'));
+                    }
+                    // const numValue = value.trim();
+                    // 正则表达式：负数、零和正整数
+                    const integerPattern = /^(0|[1-9]\d*(\.\d+)?|0\.\d+)$/;
+                    if (!integerPattern.test(value)) {
+                         callback(new Error('请必须输入非负数'));
+                    } else {
+                      callback();
+                    }
+                  },
+                  trigger: 'blur'
+                }
               ],
               configVal4Max: [
                 {
                   required: true,
                   message: '请输入硫化氢阈值',
-                  validator: this.validateNum,
-
                   trigger: 'blur',
                 },
+                {
+                  validator: (rule, value, callback) => {
+                    if (value === '' || value === null) {
+                      return callback(new Error('请必须输入非负数'));
+                    }
+                    // const numValue = value.trim();
+                    // 正则表达式：负数、零和正整数
+                    const integerPattern = /^(0|[1-9]\d*(\.\d+)?|0\.\d+)$/;
+                    if (!integerPattern.test(value)) {
+                         callback(new Error('请必须输入非负数'));
+                    } else {
+                      callback();
+                    }
+                  },
+                  trigger: 'blur'
+                }
               ],
             },
             // 各类下拉
diff --git a/src/views/login1.vue b/src/views/login1.vue
index 88ba9b8..b8115c8 100644
--- a/src/views/login1.vue
+++ b/src/views/login1.vue
@@ -169,6 +169,9 @@
 
     <div class="bottom-info">
         版权所有权归国网电力工程技术研究院有限公司
+        <div>
+          版本：v1.0
+        </div>
     </div>
   </div>
 </template>