测试：BUG下面的【250】处理

git-svn-id: https://202.107.226.68:8443/svn/Services/ResistanceMonitor@112 a05970a1-87b9-9d4f-9ee5-fa77e2ec115b

2.Web/src/views/CurveStatistical.vue

@@ -82,16 +82,17 @@
      style="margin-left:8px;"
      type="primary"
      size="small"
-     @click="alarm_warn_setting('convert_resist')"
-     >转换阻力报警设置</el-button
+     @click="alarm_warn_setting('suobi_lock')"
+     >锁闭力报警设置</el-button
     >
     <el-button
      style="margin-left:8px;"
      type="primary"
      size="small"
-     @click="alarm_warn_setting('suobi_lock')"
-     >锁闭力报警设置</el-button
+     @click="alarm_warn_setting('convert_resist')"
+     >转换阻力报警设置</el-button
     >
+    
     <el-button
      style="margin-left:8px;"
      icon="el-icon-download"
@@ -134,25 +135,25 @@
      </el-radio-group>
     </p>
     <p class="no_show">1</p>
-    <span class="mark">*</span>伸出报警值:
+    <span class="mark">*</span>定扳反报警值:
     <el-input
-     style="width:110px"
-     v-model.number="convert_resist.dw_alarm_low_limit"  oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="大于0的数字"></el-input>
-    <span class="mark position_left">*</span><span>伸出预警值:</span>
+     style="width:90px"
+     v-model.number="convert_resist.dw_alarm_low_limit"   size="small" maxlength="5" placeholder="请输入数字"></el-input>
+    <span class="mark position_left">*</span><span>定扳反预警值:</span>
     <el-input
-     style="width:110px"
-     v-model.number="convert_resist.dw_warn_low_limit"  oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="大于0的数字"
+     style="width:90px"
+     v-model.number="convert_resist.dw_warn_low_limit"   size="small" maxlength="5" placeholder="请输入数字"
     ></el-input>
     <p class="no_show">1</p>
-    <span class="mark">*</span>缩进报警值:
+    <span class="mark">*</span>反扳定报警值:
     <el-input
-     style="width:110px"
-     v-model.number="convert_resist.up_alarm_high_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="大于0的数字"
+     style="width:90px"
+     v-model.number="convert_resist.up_alarm_high_limit"  size="small" maxlength="5" placeholder="请输入数字"
     ></el-input>
-    <span class="mark position_left">*</span>缩进预警值:
+    <span class="mark position_left">*</span>反扳定预警值:
     <el-input
-     style="width:110px"
-     v-model.number="convert_resist.up_warn_high_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="大于0的数字"
+     style="width:90px"
+     v-model.number="convert_resist.up_warn_high_limit"  size="small" maxlength="5" placeholder="请输入数字"
     ></el-input>
     <span slot="footer" class="dialog-footer">
      <el-button size="small" @click="cancel_setting('convert_resist')">关 闭</el-button>
@@ -199,27 +200,23 @@
     <span class="mark">*</span>最小报警值:
     <el-input
      style="width:110px"
-     v-model.number="suobi_lock.alarm_low_limit"
-    oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="大于0的数字"
+     v-model.number="suobi_lock.alarm_low_limit" size="small" maxlength="5" placeholder="请输入数字"
     ></el-input>
     <span class="mark position_left">*</span><span>最小预警值:</span>
     <el-input
      style="width:110px"
-     v-model.number="suobi_lock.warn_low_limit" 
-     oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="大于0的数字"
+     v-model.number="suobi_lock.warn_low_limit"  size="small" maxlength="5" placeholder="请输入数字"
     ></el-input>
     <p class="no_show">1</p>
     <span class="mark">*</span>最大报警值:
     <el-input
      style="width:110px"
-     v-model.number="suobi_lock.alarm_high_limit"
-     oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="大于0的数字"
+     v-model.number="suobi_lock.alarm_high_limit" size="small" maxlength="5" placeholder="请输入数字"
     ></el-input>
     <span class="mark position_left">*</span>最大预警值:
     <el-input
      style="width:110px"
-     v-model.number="suobi_lock.warn_high_limit"
-     oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="大于0的数字"
+     v-model.number="suobi_lock.warn_high_limit" size="small" maxlength="5" placeholder="请输入数字"
     ></el-input>
     <span slot="footer" class="dialog-footer">
      <el-button size="small" @click="cancel_setting('suobi_lock')">关 闭</el-button>
@@ -431,13 +428,19 @@ export default {
    }
    switch (type) {
     case 'convert_resist':
+
+    this.convert_resist.dw_alarm_low_limit = this.$isAlarmScope(this.convert_resist.dw_alarm_low_limit);
+    this.convert_resist.dw_warn_low_limit = this.$isAlarmScope(this.convert_resist.dw_warn_low_limit);
+    this.convert_resist.up_alarm_high_limit = this.$isAlarmScope(this.convert_resist.up_alarm_high_limit);
+    this.convert_resist.up_warn_high_limit = this.$isAlarmScope(this.convert_resist.up_warn_high_limit);
+    
     if(this.convert_resist.dw_alarm_low_limit  && this.convert_resist.dw_warn_low_limit 
      && this.convert_resist.dw_alarm_low_limit  <= this.convert_resist.dw_warn_low_limit){
-      return this.$message.warning('伸出报警值 应该大于 伸出预警值');
+      return this.$message.warning('定扳反报警值 应该大于 定扳反预警值');
      }
      if(this.convert_resist.up_alarm_high_limit && this.convert_resist.up_warn_high_limit
      && this.convert_resist.up_alarm_high_limit  <= this.convert_resist.up_warn_high_limit){
-      return this.$message.warning('缩进报警值 应该大于 缩进预警值');
+      return this.$message.warning('反扳定报警值 应该大于 反扳定预警值');
      }
 
      send_data.conf = JSON.parse(JSON.stringify(this.convert_resist))

2.Web/src/views/Force.vue

@@ -294,24 +294,24 @@
         <span class="mark">*</span>最小报警值:
      <el-input
       style="width:90px"
-      v-model.number="suobi_lock.alarm_low_limit"  oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5"  placeholder="输入整数"
+      v-model.number="suobi_lock.alarm_low_limit"   size="small" maxlength="5"  placeholder="输入数字"
      ></el-input>
      <span class="mark position_left">*</span><span>最小预警值:</span>
      <el-input
       style="width:90px"
-      v-model.number="suobi_lock.warn_low_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5"  placeholder="输入整数"
+      v-model.number="suobi_lock.warn_low_limit"  size="small" maxlength="5"  placeholder="输入数字"
      ></el-input>
       </div>  
       <div style="margin-top: 20px;">
         <span class="mark">*</span>最大报警值:
      <el-input
       style="width:90px"
-      v-model.number="suobi_lock.alarm_high_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5"  placeholder="输入整数"
+      v-model.number="suobi_lock.alarm_high_limit"  size="small" maxlength="5"  placeholder="输入数字"
      ></el-input>
      <span class="mark position_left">*</span>最大预警值:
      <el-input
       style="width:90px"
-      v-model.number="suobi_lock.warn_high_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5"  placeholder="输入整数"
+      v-model.number="suobi_lock.warn_high_limit"  size="small" maxlength="5"  placeholder="输入数字"
      ></el-input>
       </div>
      
@@ -326,28 +326,28 @@
      </div>
 
      <div style="margin-top: 20px;">
-     <span class="mark">*</span>伸出报警值:
+     <span class="mark">*</span>定扳反报警值:
      <el-input
-      style="width:90px"
-      v-model.number="convert_resist.dw_alarm_low_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5"  placeholder="输入整数"
+      style="width:80px"
+      v-model.number="convert_resist.dw_alarm_low_limit"  size="small" maxlength="5"  placeholder="输入数字"
      ></el-input>
-     <span class="mark position_left">*</span><span>伸出预警值:</span>
+     <span class="mark position_left">*</span><span>定扳反预警值:</span>
      <el-input
-      style="width:90px"
-      v-model.number="convert_resist.dw_warn_low_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5"  placeholder="输入整数"
+      style="width:80px"
+      v-model.number="convert_resist.dw_warn_low_limit"  size="small" maxlength="5"  placeholder="输入数字"
      ></el-input>
      </div>
 
      <div style="margin-top: 20px;">
-      <span class="mark">*</span>缩进报警值:
+      <span class="mark">*</span>反扳定报警值:
      <el-input
-      style="width:90px"
-      v-model.number="convert_resist.up_alarm_high_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5"  placeholder="输入整数"
+      style="width:80px"
+      v-model.number="convert_resist.up_alarm_high_limit"  size="small" maxlength="5"  placeholder="输入数字"
      ></el-input>
-     <span class="mark position_left">*</span>缩进预警值:
+     <span class="mark position_left">*</span>反扳定预警值:
      <el-input
-      style="width:90px"
-      v-model.number="convert_resist.up_warn_high_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5"  placeholder="输入整数"
+      style="width:80px"
+      v-model.number="convert_resist.up_warn_high_limit" size="small" maxlength="5"  placeholder="输入数字"
      ></el-input>
 
      </div>
@@ -818,7 +818,7 @@ export default {
     !target_data.direct2
    )
     return this.$message.warning(
-     '请先去"设备管理"模块设置1号、2号测力点位置和3号测力点伸出位、缩进位位置...'
+     '请先去"设备管理"模块设置1号、2号测力点位置和3号测力点定扳反位、反扳定位位置...'
     )
    let key_list = []
    let send_data = {};
@@ -901,13 +901,18 @@ export default {
     return this.save_settting(this.post_data.type);
     case 'convert_resist':
 
+    this.convert_resist.dw_alarm_low_limit = this.$isAlarmScope(this.convert_resist.dw_alarm_low_limit);
+    this.convert_resist.dw_warn_low_limit = this.$isAlarmScope(this.convert_resist.dw_warn_low_limit);
+    this.convert_resist.up_alarm_high_limit = this.$isAlarmScope(this.convert_resist.up_alarm_high_limit);
+    this.convert_resist.up_warn_high_limit = this.$isAlarmScope(this.convert_resist.up_warn_high_limit);
+
     if(this.convert_resist.dw_alarm_low_limit  && this.convert_resist.dw_warn_low_limit 
      && this.convert_resist.dw_alarm_low_limit  <= this.convert_resist.dw_warn_low_limit){
-      return this.$message.warning('伸出报警值 应该大于 伸出预警值');
+      return this.$message.warning('定扳反报警值 应该大于 定扳反预警值');
      }
      if(this.convert_resist.up_alarm_high_limit && this.convert_resist.up_warn_high_limit
      && this.convert_resist.up_alarm_high_limit  <= this.convert_resist.up_warn_high_limit){
-      return this.$message.warning('缩进报警值 应该大于 缩进预警值');
+      return this.$message.warning('反扳定报警值 应该大于 反扳定预警值');
      }
      return this.save_settting(this.post_data.type);
     default:

2.Web/src/views/SystemSetting.vue

@@ -100,17 +100,17 @@
    
      <div class="position_top_20">
       <span class="mark">*</span>上超低限报警值:
-     <el-input style="width:200px" v-model="up_alarm_low_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="请输入大于0的数字"></el-input>
+     <el-input style="width:200px" v-model="up_alarm_low_limit"  size="small" maxlength="5" placeholder="请输入数字"></el-input>
      <span class="mark">*</span>上超低限预警值:
-     <el-input style="width:200px" v-model="up_warn_low_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="请输入大于0的数字"></el-input>
+     <el-input style="width:200px" v-model="up_warn_low_limit"  size="small" maxlength="5" placeholder="请输入数字"></el-input>
      
      </div>
     
      <div class="position_top_20">
       <span class="mark">*</span>下超高限预警值:
-     <el-input style="width:200px" v-model="dw_warn_high_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="请输入大于0的数字"></el-input>  
+     <el-input style="width:200px" v-model="dw_warn_high_limit"  size="small" maxlength="5" placeholder="请输入数字"></el-input>  
       <span class="mark">*</span><span>下超高限报警值:</span>
-      <el-input style="width:200px" v-model="dw_alarm_high_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="请输入大于0的数字"></el-input> 
+      <el-input style="width:200px" v-model="dw_alarm_high_limit"  size="small" maxlength="5" placeholder="请输入数字"></el-input> 
      </div>
     
     </el-tab-pane>
@@ -140,24 +140,24 @@
         <span class="mark">*</span>最小报警值:
      <el-input
       style="width:200px"
-      v-model.number="suobi_lock.alarm_low_limit"  oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="请输入大于0的数字"
+      v-model.number="suobi_lock.alarm_low_limit"   size="small" maxlength="5" placeholder="请输入数字"
      ></el-input>
      <span class="mark position_left">*</span><span>最小预警值:</span>
      <el-input
       style="width:200px"
-      v-model.number="suobi_lock.warn_low_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="请输入大于0的数字"
+      v-model.number="suobi_lock.warn_low_limit"  size="small" maxlength="5" placeholder="请输入数字"
      ></el-input>
       </div>  
       <div class="position_top_20">
         <span class="mark">*</span>最大报警值:
      <el-input
       style="width:200px"
-      v-model.number="suobi_lock.alarm_high_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="请输入大于0的数字"
+      v-model.number="suobi_lock.alarm_high_limit"  size="small" maxlength="5" placeholder="请输入数字"
      ></el-input>
      <span class="mark position_left">*</span>最大预警值:
      <el-input
       style="width:200px"
-      v-model.number="suobi_lock.warn_high_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="请输入大于0的数字"
+      v-model.number="suobi_lock.warn_high_limit"  size="small" maxlength="5" placeholder="请输入数字"
      ></el-input>
       </div>
      
@@ -172,28 +172,28 @@
      </div>
 
      <div class="position_top_20">
-     <span class="mark">*</span>伸出报警值:
+     <span class="mark">*</span>定扳反报警值:
      <el-input
       style="width:200px"
-      v-model.number="convert_resist.dw_alarm_low_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="请输入大于0的数字"
+      v-model.number="convert_resist.dw_alarm_low_limit"  size="small" maxlength="5" placeholder="请输入数字"
      ></el-input>
-     <span class="mark position_left">*</span><span>伸出预警值:</span>
+     <span class="mark position_left">*</span><span>定扳反预警值:</span>
      <el-input
       style="width:200px"
-      v-model.number="convert_resist.dw_warn_low_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="请输入大于0的数字"
+      v-model.number="convert_resist.dw_warn_low_limit"  size="small" maxlength="5" placeholder="请输入数字"
      ></el-input>
      </div>
 
      <div class="position_top_20">
-      <span class="mark">*</span>缩进报警值:
+      <span class="mark">*</span>反扳定报警值:
      <el-input
       style="width:200px"
-      v-model.number="convert_resist.up_alarm_high_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="请输入大于0的数字"
+      v-model.number="convert_resist.up_alarm_high_limit" size="small" maxlength="5" placeholder="请输入数字"
      ></el-input>
-     <span class="mark position_left">*</span>缩进预警值:
+     <span class="mark position_left">*</span>反扳定预警值:
      <el-input
       style="width:200px"
-      v-model.number="convert_resist.up_warn_high_limit" oninput="value=value.replace(/^0|[^0-9]/g,'')" size="small" maxlength="5" placeholder="请输入大于0的数字"
+      v-model.number="convert_resist.up_warn_high_limit"  size="small" maxlength="5" placeholder="请输入数字"
      ></el-input>
 
      </div>
@@ -675,9 +675,10 @@ export default {
     !target_data.direct2
    )
     return this.$message.warning(
-     '请先去"设备管理"模块设置1号、2号测力点位置和3号测力点伸出位、缩进位位置...'
+     '请先去"设备管理"模块设置1号、2号测力点位置和3号测力点定扳反位、反扳定位位置...'
     )
     let send_data = {};
+    let regex  = /^-?\d+$/;
    switch (this.send_data.type) {
     case 'monitor.alarm.max_over_limit':  
     this.conf= [{name: "enable",val: this.enable}]; 
@@ -768,7 +769,6 @@ export default {
       let dw_alarm_low_drop = '';
       let alarm_low_percent = '';
       let alarm_high_percent= '';
-      let regex  = /^-?\d+$/;
       if (this.dw_alarm_low_drop) {
         if(!regex.test(this.dw_alarm_low_drop) || Math.abs(this.dw_alarm_low_drop) > 100000){
           return this.$message.warning('最低报警值要求：-100000~100000之间的数字');
@@ -814,19 +814,25 @@ export default {
       })
      return
     case 'suobi_lock':
+
     if(!this.$isSortedIgnoringEmpty(this.suobi_lock.alarm_high_limit,this.suobi_lock.warn_high_limit,this.suobi_lock.alarm_low_limit,this.suobi_lock.warn_low_limit)){
         return this.$message.warning('最大报警值 > 最大预警值 > 最小报警值 > 最小预警值');
     }
     return this.save_settting(this.send_data.type);
     case 'convert_resist':
 
+    this.convert_resist.dw_alarm_low_limit = this.$isAlarmScope(this.convert_resist.dw_alarm_low_limit);
+    this.convert_resist.dw_warn_low_limit = this.$isAlarmScope(this.convert_resist.dw_warn_low_limit);
+    this.convert_resist.up_alarm_high_limit = this.$isAlarmScope(this.convert_resist.up_alarm_high_limit);
+    this.convert_resist.up_warn_high_limit = this.$isAlarmScope(this.convert_resist.up_warn_high_limit);
+
     if(this.convert_resist.dw_alarm_low_limit  && this.convert_resist.dw_warn_low_limit 
      && this.convert_resist.dw_alarm_low_limit  <= this.convert_resist.dw_warn_low_limit){
-      return this.$message.warning('伸出报警值 应该大于 伸出预警值');
+      return this.$message.warning('定扳反报警值 应该大于 定扳反预警值');
      }
      if(this.convert_resist.up_alarm_high_limit && this.convert_resist.up_warn_high_limit
      && this.convert_resist.up_alarm_high_limit  <= this.convert_resist.up_warn_high_limit){
-      return this.$message.warning('缩进报警值 应该大于 缩进预警值');
+      return this.$message.warning('反扳定报警值 应该大于 反扳定预警值');
      }
      return this.save_settting(this.send_data.type);
     default:

4.Data/HttpPrcess.cpp

@@ -3488,7 +3488,7 @@ int DealGetResistCurve(const httplib::Request& req, const string token, char** j
 			{
 				auto obj = yyjson_mut_obj(doc);
 				yyjson_mut_arr_add_val(convert_line, obj);
-				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8(direct1+"告警线").c_str());
+				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8(direct1+"报警线").c_str());
 				yyjson_mut_obj_add_int(doc, obj, "value", pInfo->dw_alarm_low_limit);
 				yyjson_mut_obj_add_str(doc, obj, "color", "Red");
 			}
@@ -3496,7 +3496,7 @@ int DealGetResistCurve(const httplib::Request& req, const string token, char** j
 			{
 				auto obj = yyjson_mut_obj(doc);
 				yyjson_mut_arr_add_val(convert_line, obj);
-				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8(direct2+"告警线").c_str());
+				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8(direct2+"报警线").c_str());
 				yyjson_mut_obj_add_int(doc, obj, "value", pInfo->up_alarm_high_limit);
 
 				yyjson_mut_obj_add_str(doc, obj, "color", "Red");
@@ -3528,7 +3528,7 @@ int DealGetResistCurve(const httplib::Request& req, const string token, char** j
 			{
 				auto obj = yyjson_mut_obj(doc);
 				yyjson_mut_arr_add_val(suobi_line, obj);
-				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8("定位最小告警线").c_str());
+				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8("定位最小报警线").c_str());
 				yyjson_mut_obj_add_int(doc, obj, "value", pInfo->alarm_low_limit);
 				yyjson_mut_obj_add_str(doc, obj, "color", "Red");
 			}
@@ -3536,7 +3536,7 @@ int DealGetResistCurve(const httplib::Request& req, const string token, char** j
 			{
 				auto obj = yyjson_mut_obj(doc);
 				yyjson_mut_arr_add_val(suobi_line, obj);
-				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8("定位最大告警线").c_str());
+				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8("定位最大报警线").c_str());
 				yyjson_mut_obj_add_int(doc, obj, "value", pInfo->alarm_high_limit);
 				yyjson_mut_obj_add_str(doc, obj, "color", "Red");
 			}
@@ -3567,7 +3567,7 @@ int DealGetResistCurve(const httplib::Request& req, const string token, char** j
 			{
 				auto obj = yyjson_mut_obj(doc);
 				yyjson_mut_arr_add_val(suobi_line, obj);
-				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8("反位最小告警线").c_str());
+				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8("反位最小报警线").c_str());
 				yyjson_mut_obj_add_int(doc, obj, "value", pInfo->alarm_low_limit);
 				yyjson_mut_obj_add_str(doc, obj, "color", "Red");
 			}
@@ -3575,7 +3575,7 @@ int DealGetResistCurve(const httplib::Request& req, const string token, char** j
 			{
 				auto obj = yyjson_mut_obj(doc);
 				yyjson_mut_arr_add_val(suobi_line, obj);
-				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8("反位最大告警线").c_str());
+				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8("反位最大报警线").c_str());
 				yyjson_mut_obj_add_int(doc, obj, "value", pInfo->alarm_high_limit);
 				yyjson_mut_obj_add_str(doc, obj, "color", "Red");
 			}