修改条件限制

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -424,8 +424,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="阈值：" prop="eventValue">
-          <el-input v-model="reportEventConfigForm.eventValue" placeholder="请输入阈值"
-                    oninput="value=value.replace(/[^0-9.]/g,'')">
+          <el-input v-model="reportEventConfigForm.eventValue" placeholder="请输入阈值">
           </el-input>
         </el-form-item>
         <el-form-item label="事件驱动报表：" prop="tableReportId">
@@ -507,7 +506,12 @@ export default {
             required: true,
             validator: (rule, val, callback) => {
               if (val) {
-                callback()
+                let reg = /^(\-)?\d+(\.\d{1,2})?$/
+                if (reg.test(val)) {
+                  callback()
+                } else {
+                  callback(new Error('阈值不合法'))
+                }
               } else {
                 callback(new Error('请输入阈值'))
               }
@@ -707,7 +711,12 @@ export default {
       if (!value) {
         callback(new Error(this.modeValueTips + '不能为空'))
       } else {
-        callback()
+        let reg = /^(\-)?\d+(\.\d{1,2})?$/
+        if (reg.test(val)) {
+          callback()
+        } else {
+          callback(new Error('阈值不合法'))
+        }
       }
     },
     /** 数据项搜索过滤 */

chuanyi_client2/src/utils/errorCode.js

@@ -1,6 +1,6 @@
 export default {
-    'url': 'http://127.0.0.1:8081',
-    'ws': 'ws://127.0.0.1:8081/webSocket/',
+    'url': 'http://192.168.0.40:8081',
+    'ws': 'ws://192.168.0.40:8081/webSocket/',
 
     'clientRole': 'ClientRole',
 

chuanyi_client2/src/views/group_item/index.vue

@@ -401,6 +401,16 @@ export default {
     },
     /** 编辑确认事件 */
     editConfirmEvent() {
+      if (this.itemForm.eventValue) {
+        let reg = /^(\-)?\d+(\.\d{1,2})?$/
+        if (!reg.test(this.itemForm.eventValue)) {
+          this.$message({
+            message: '阈值不合法',
+            type: 'warning'
+          })
+          return
+        }
+      }
       const loading = showLoading(this, '加载中，请稍候···')
       // 若驱动报表事件任意一项为空，则清空报表事项
       if (!this.itemForm.eventMode

chuanyi_client2/src/views/my_report/index.vue

@@ -498,6 +498,9 @@ export default {
       }, {
         label: '自动报表',
         value: 1
+      }, {
+        label: '事件驱动报表',
+        value: 3
       }],
       reportHistoryData: [],
       reportHistoryTotal: 0,

chuanyi_client2/src/views/run_config/index.vue

@@ -2051,7 +2051,7 @@ export default {
     cancelSaveReport() {
       luckysheet.destroy()
 
-      this.breadcrumbList = ['我的报表']
+      this.breadcrumbList = ['运行配置']
       this.showMainView = false
       this.btnType = ''
       this.chooseMyReport = null