预警规则

src/api/ruleManagement/earlyWarning.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request';
 
+// 预警规则下拉列表数据
+export async function listAllAlertLevel(params) {
+  const res = await request.get(`/main/alertrules/listAllAlertLevel/`, params);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 // 操作类型 
 export async function listAllActionType(params) {
   const res = await request.get(`/main/alertrules/listAllActionType/`, params);

src/views/rulesManagement/earlyWarningRules/components/matter-add.vue

@@ -61,7 +61,6 @@
                   placeholder="请输入"
                   size="small"
                   :min="0"
-                  :precision="1"
                   :controls="false"
                   style="width: 100%"
                 />
@@ -78,16 +77,7 @@
               </el-col>
             </el-form-item>
           </el-col>
-          <!-- 阈值 -->
-          <el-col :span="8">
-            <el-form-item label="阈值" prop="thresholdValue">
-              <el-input
-                v-model="formData.thresholdValue"
-                placeholder="请输入"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="8">
             <el-form-item label="状态" prop="enabled">
               <el-select
@@ -133,24 +123,46 @@
                 :rules="contentConfigFormRules.targetAddressName"
               >
                 <el-input
+                  placeholder="请选择"
                   v-model="scope.row.targetAddressName"
                   @focus="handleAddInfo(scope.row, scope.$index)"
-                ></el-input>
-                <!-- <el-select
-                  v-model="scope.row.manager"
-                  placeholder="请选择"
-                  style="width: 100%"
-                  filterable
-                  multiple
                 >
+                  <template #suffix>
+                    <el-badge :value="NumberOfPeople"></el-badge>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="alertLevel" label="预警级别" width="120">
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'actionList.' + scope.$index + '.alertLevel'"
+                label-width="0"
+                :rules="contentConfigFormRules.alertLevel"
+              >
+                <el-select size="small" v-model="scope.row.alertLevel">
                   <el-option
-                    v-for="item in managerData"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select> -->
+                    v-for="(value, key) in allAlertLevelData"
+                    :key="key"
+                    :label="value"
+                    :value="key"
+                  />
+                </el-select>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="thresholdValue" label="阈值" width="120">
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'actionList.' + scope.$index + '.thresholdValue'"
+                label-width="0"
+                :rules="contentConfigFormRules.thresholdValue"
+              >
+                <el-input
+                  v-model="scope.row.thresholdValue"
+                  placeholder="请输入"
+                ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -173,22 +185,6 @@
             </template>
           </el-table-column>
 
-          <!-- <el-table-column prop="urgent" label="紧急程度" width="120">
-            <template slot-scope="scope">
-              <el-form-item
-                :prop="'actionList.' + scope.$index + '.urgent'"
-                label-width="0"
-                :rules="contentConfigFormRules.urgent"
-              >
-                <DictSelection
-                  dictName="紧急程度"
-                  v-model="scope.row.urgent"
-                  :disabled="isBindPlan"
-                >
-                </DictSelection>
-              </el-form-item>
-            </template>
-          </el-table-column> -->
           <el-table-column
             prop="alertMessageTempateCode"
             label="模板编码"
@@ -206,6 +202,7 @@
                   placeholder="请选择"
                   v-model="scope.row.alertMessageTempateCode"
                   @change="changeTemplate(scope.row, scope.$index)"
+                  filterable
                 >
                   <el-option
                     v-for="item in templateData"
@@ -218,7 +215,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="content" label="内容" width="240">
+          <el-table-column prop="content" label="内容">
             <template slot-scope="scope">
               <el-input
                 type="textarea"
@@ -229,7 +226,7 @@
               ></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="操作">
+          <el-table-column label="操作" width="80">
             <template slot-scope="scope">
               <el-button
                 type="text"
@@ -261,7 +258,8 @@
     getDetail,
     listAllRulesObj,
     listAllDateUnit,
-    listAllActionType
+    listAllActionType,
+    listAllAlertLevel
   } from '@/api/ruleManagement/earlyWarning';
   import { notifyTemplatePageAPI } from '@/api/notifyManage';
   import { getUserPage } from '@/api/system/organization';
@@ -290,14 +288,14 @@
           ruleObjCode: '',
           alertCycleValue: '1',
           alertCycleUnit: '',
-          thresholdValue: '',
           enabled: 1,
           actionList: [
             {
               targetAddress: '',
               targetAddressName: '',
               actionType: '',
-              // urgent: '',
+              alertLevel: '',
+              thresholdValue: '',
               alertMessageTempateCode: '',
               content: ''
             }
@@ -316,16 +314,18 @@
           alertCycleValue: [
             { required: true, message: '请输入周期', trigger: 'blur' }
           ],
-
+          alertLevel: [
+            { required: true, message: '请选择紧急程度', trigger: 'blur' }
+          ],
           targetAddressName: [
             { required: true, message: '请选择通知人', trigger: 'blur' }
           ],
           actionType: [
             { required: true, message: '请选择操作类型', trigger: 'blur' }
           ],
-          // urgent: [
-          //   { required: true, message: '请选择紧急程度', trigger: 'blur' }
-          // ],
+          thresholdValue: [
+            { required: true, message: '请输入阈值', trigger: 'blur' }
+          ],
           alertMessageTempateCode: [
             { required: true, message: '请选择模板编码', trigger: 'blur' }
           ]
@@ -335,7 +335,9 @@
         templateData: [],
         allRulesData: {},
         cycleUnitOpt: {},
-        operationTypeData: {}
+        operationTypeData: {},
+        NumberOfPeople: '',
+        allAlertLevelData: {}
       };
     },
     watch: {},
@@ -356,6 +358,8 @@
       async getAllActionType() {
         const res = await listAllActionType();
         this.operationTypeData = res;
+        const res2 = await listAllAlertLevel();
+        this.allAlertLevelData = res2;
       },
       handleAddInfo(row, index) {
         this.formData.actionList[index].targetAddress = '';
@@ -363,7 +367,8 @@
         this.$refs.selectPersonDialogRef.open(row, index);
       },
       changeParent(list, index) {
-        console.log(list, 'list', this.isBindPlan);
+        this.NumberOfPeople = list.length;
+        console.log(list.length, 'list', this.isBindPlan);
         let ids = list
           .map((item) => {
             return item.id;
@@ -402,9 +407,7 @@
         });
       },
       async openDialog(row, type) {
-        this.addMatterDialog = true;
         this.isBindPlan = type;
-
         await this.getAllRulesObj();
         await this.getAllDateUnit();
         await this.getAllActionType();
@@ -418,6 +421,7 @@
         if (type != 'edit') {
           this.getOrderCode();
         }
+        this.addMatterDialog = true;
       },
 
       async getRuleInfo(id, type) {
@@ -460,8 +464,10 @@
         if (this.formData.actionList) {
           this.formData.actionList.push({
             targetAddress: '',
+            targetAddressName: '',
             actionType: '',
-            // urgent: '',
+            alertLevel: '',
+            thresholdValue: '',
             alertMessageTempateCode: '',
             content: ''
           });
@@ -469,8 +475,10 @@
           let arr = [
             {
               targetAddress: '',
+              targetAddressName: '',
               actionType: '',
-              // urgent: '',
+              alertLevel: '',
+              thresholdValue: '',
               alertMessageTempateCode: '',
               content: ''
             }
@@ -497,8 +505,6 @@
               this.handleClose();
               this.$emit('done');
             }
-          } else {
-            this.$message.warning('请将信息补充完整！');
           }
         });
       }
@@ -587,4 +593,8 @@
   ::v-deep .el-input-number .el-input__inner {
     text-align: left !important;
   }
+
+  ::v-deep .el-badge__content {
+    font-size: 10px;
+  }
 </style>

src/views/rulesManagement/earlyWarningRules/components/matter-search.vue

@@ -6,23 +6,21 @@
     @keyup.enter.native="search"
     @submit.native.prevent
   >
-    <el-row :gutter="15">
+    <el-row :gutter="24">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="规则名称:">
           <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
-        <el-form-item label="规则状态:">
-          <DictSelection dictName="规则状态" clearable v-model.trim="where.status">
-          </DictSelection>
-        </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="规则编码:">
           <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="创建时间:">
           <el-date-picker
-            style="width: 100%;"
+            style="width: 100%"
             v-model="time"
             type="daterange"
             range-separator="至"
@@ -35,18 +33,17 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="预警类型:">
-          <DictSelection dictName="预警类型" clearable v-model.trim="where.type">
+        <el-form-item label="规则状态:">
+          <DictSelection
+            dictName="规则状态"
+            clearable
+            v-model.trim="where.status"
+          >
           </DictSelection>
         </el-form-item>
-        <el-form-item label="组织机构:">
-          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
-        </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="创建人:">
-          <el-input clearable v-model.trim="where.userName" placeholder="请输入" />
-        </el-form-item>
+
+      <el-col v-bind="styleResponsive ? { lg: 24, md: 12 } : { span: 24 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -71,7 +68,6 @@
 </template>
 
 <script>
-
   export default {
     data() {
       // 默认表单数据