保持力异常报警修改。

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

2.Web/src/views/Force.vue

@@ -358,7 +358,7 @@
       ></el-input>
       <p><el-button size="small" type="primary" @click="submit_content">保 存</el-button></p>
      </el-tab-pane>
-     <el-tab-pane label="保持力下降报警" name="dw_alarm_low_drop">
+     <el-tab-pane label="保持力异常报警" name="dw_alarm_low_drop">
       <p><span class="mark">*</span>状态</p>
       <el-radio-group @change="enable_change" v-model="enable">
        <el-radio label="true">启用</el-radio>
@@ -372,8 +372,12 @@
         <el-radio :label="101">反位</el-radio>
        </el-radio-group>
       </p>
-      <p><span class="mark">*</span>下降报警值</p>
+      <p><span class="mark">*</span>最低报警值</p>
       <el-input style="width:100px" v-model="dw_alarm_low_drop" size="small"></el-input>
+      <p><span class="mark">*</span>下降超限百分比:(5≤值≤95)</p>
+      <el-input style="width:100px" v-model="alarm_low_percent" size="small"></el-input>
+      <p><span class="mark">*</span>上升超限百分比:(5≤值≤95)</p>
+      <el-input style="width:100px" v-model="alarm_high_percent" size="small"></el-input>
       <p><el-button size="small" type="primary" @click="submit_content">保 存</el-button></p>
      </el-tab-pane>
      <el-tab-pane label="报警提醒间隔设置" name="alarm_interval">
@@ -495,7 +499,9 @@ export default {
    up_warn_low_limit: '', //上超低限预警值
    dw_alarm_high_limit: '', //下超高限报警值
    dw_warn_high_limit: '', //下超高限预警值
-   dw_alarm_low_drop: '', // 下降报警值
+   dw_alarm_low_drop: '', // 最低报警值
+   alarm_low_percent: '', // 下降超限百分比
+   alarm_high_percent: '', // 上升超限百分比
    alarm_interval: 0, // 分钟
    conf: [],
    post_data: {
@@ -708,6 +714,8 @@ export default {
       .then(res => {
        this.enable = res.enable.toString()
        this.dw_alarm_low_drop = res.dw_alarm_low_drop
+       this.alarm_high_percent = res.alarm_high_percent
+       this.alarm_low_percent = res.alarm_low_percent
       })
       .catch(e => {
        console.log(e)
@@ -774,6 +782,8 @@ export default {
     'dw_alarm_high_limit',
     'dw_warn_high_limit',
     'dw_alarm_low_drop',
+    'alarm_low_percent',
+    'alarm_high_percent',
    ]
    this.alarm_interval = 0
    key_list.forEach(key => {
@@ -828,7 +838,16 @@ export default {
      ]
      break
     case 'dw_alarm_low_drop':
-     if (isNaN(this.dw_alarm_low_drop)) return this.$$alertmessage.warning('请输入数字')
+     if (isNaN(this.dw_alarm_low_drop)) return this.$message.warning('请输入数字')
+     if (isNaN(this.alarm_low_percent)) return this.$message.warning('下降超限百分比请输入0~95数字')
+     if (isNaN(this.alarm_high_percent))
+      return this.$message.warning('上升超限百分比请输入0~95的数字')
+     let alarm_low_percent = Number(this.alarm_low_percent)
+     if (alarm_low_percent < 5 || alarm_low_percent > 95)
+      return this.$message.warning('下降超限百分比请输入0~95的数字')
+     let alarm_high_percent = Number(this.alarm_high_percent)
+     if (alarm_high_percent < 5 || alarm_high_percent > 95)
+      return this.$message.warning('上升超限百分比请输入0~95的数字')
      let [mo, mp] = this.click_id.split('.')
      let send_data = {
       mo,
@@ -837,6 +856,8 @@ export default {
       conf: {
        enable: this.enable == 'true',
        dw_alarm_low_drop: Number(this.dw_alarm_low_drop),
+       alarm_low_percent,
+       alarm_high_percent,
       },
      }
      set_retension_force(send_data)

2.Web/src/views/SystemSetting.vue

@@ -178,7 +178,7 @@
       size="small"
      ></el-input>
     </el-tab-pane>
-    <el-tab-pane label="保持力下降报警" name="dw_alarm_low_drop">
+    <el-tab-pane label="保持力异常报警" name="dw_alarm_low_drop">
      <p><span class="mark">*</span>状态</p>
      <el-radio-group @change="enable_change" v-model="enable">
       <el-radio label="true">启用</el-radio>
@@ -192,8 +192,12 @@
        <el-radio :label="101">反位</el-radio>
       </el-radio-group>
      </p>
-     <p><span class="mark">*</span>下降报警值</p>
+     <p><span class="mark">*</span>最低报警值</p>
      <el-input style="width:180px" v-model="dw_alarm_low_drop" size="small"></el-input>
+     <p><span class="mark">*</span>下降超限百分比:(5≤值≤95)</p>
+     <el-input style="width:180px" v-model="alarm_low_percent" size="small"></el-input>
+     <p><span class="mark">*</span>上升超限百分比:(5≤值≤95)</p>
+     <el-input style="width:180px" v-model="alarm_high_percent" size="small"></el-input>
     </el-tab-pane>
     <el-tab-pane label="报警提醒间隔设置" name="alarm_interval">
      <span>间隔时间:</span>
@@ -258,7 +262,9 @@ export default {
    up_warn_low_limit: '', //上超低限预警值
    dw_alarm_high_limit: '', //下超高限报警值
    dw_warn_high_limit: '', //下超高限预警值
-   dw_alarm_low_drop: '', // 下降报警值
+   dw_alarm_low_drop: '', // 最低报警值
+   alarm_low_percent: '', // 下降超限百分比
+   alarm_high_percent: '', // 上升超限百分比
    conf: [],
    send_data: {
     cmd: 'conf_read',
@@ -393,6 +399,8 @@ export default {
       .then(res => {
        this.enable = res.enable.toString()
        this.dw_alarm_low_drop = res.dw_alarm_low_drop
+       this.alarm_high_percent = res.alarm_high_percent
+       this.alarm_low_percent = res.alarm_low_percent
       })
       .catch(e => {
        console.log(e)
@@ -510,6 +518,9 @@ export default {
     'up_warn_low_limit',
     'dw_alarm_high_limit',
     'dw_warn_high_limit',
+    'dw_alarm_low_drop',
+    'alarm_low_percent',
+    'alarm_high_percent',
    ]
    key_list.forEach(key => {
     this[key] = ''
@@ -648,7 +659,16 @@ export default {
      ]
      break
     case 'dw_alarm_low_drop':
-     if (isNaN(this.dw_alarm_low_drop)) return this.$$alertmessage.warning('请输入数字')
+     if (isNaN(this.dw_alarm_low_drop)) return this.$message.warning('请输入数字')
+     if (isNaN(this.alarm_low_percent)) return this.$message.warning('下降超限百分比请输入0~95数字')
+     if (isNaN(this.alarm_high_percent))
+      return this.$message.warning('上升超限百分比请输入0~95的数字')
+     let alarm_low_percent = Number(this.alarm_low_percent)
+     if (alarm_low_percent < 5 || alarm_low_percent > 95)
+      return this.$message.warning('下降超限百分比请输入0~95的数字')
+     let alarm_high_percent = Number(this.alarm_high_percent)
+     if (alarm_high_percent < 5 || alarm_high_percent > 95)
+      return this.$message.warning('上升超限百分比请输入0~95的数字')
      let [mo, mp] = this.click_id.split('.')
      console.log(this.enable)
      send_data = {
@@ -658,6 +678,8 @@ export default {
       conf: {
        enable: this.enable == 'true',
        dw_alarm_low_drop: Number(this.dw_alarm_low_drop),
+       alarm_low_percent,
+       alarm_high_percent,
       },
      }
      set_retension_force(send_data)