修改

src/views/systemSettings/warningEdit/index.vue

@@ -89,17 +89,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="预警时长" size="default" prop="warningDuration" :rules="formRules.isNotNull">
-                <el-input v-model="tableForms.warningDuration" placeholder="请输入预警时长" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="报警时长" size="default" prop="alarmDuration" :rules="formRules.isNotNull">
-                <el-input v-model="tableForms.alarmDuration" placeholder="请输入报警时长" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="开始节点" size="default">
+              <el-form-item label="基准节点" size="default">
                 <el-select style="width: 100%" v-model="tableForms.beginNode" class="input-shadow" filterable default-first-option clearable placeholder="请选择开始节点" @change="changeSelect">
                   <el-option v-for="item in tableOptionser" :key="item.nodeID" :label="item.nodeName" :value="item.nodeCode">
                   </el-option>
@@ -115,7 +105,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="结束节点" size="default">
+              <el-form-item label="报警节点" size="default">
                 <el-select style="width: 100%" v-model="tableForms.endNode" class="input-shadow" filterable default-first-option clearable placeholder="请选择结束节点" @change="changeSelected">
                   <el-option v-for="item in tableOptionser" :key="item.nodeID" :label="item.nodeName" :value="item.nodeCode">
                   </el-option>
@@ -130,9 +120,24 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="预警时长" size="default" prop="warningDuration">
+                <el-input v-model="tableForms.warningDuration" placeholder="请输入预警时长" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="报警时长" size="default" prop="alarmDuration">
+                <el-input v-model="tableForms.alarmDuration" placeholder="请输入报警时长" />
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
-              <el-form-item label="数量报警百分比" label-width="120" size="default">
-                <el-input v-model="tableForms.percentage" placeholder="请输入数量报警百分比" />
+              <el-form-item label="运单数报警百分比" label-width="140" size="default">
+                <el-input v-model="tableForms.percentage" placeholder="请输入运单数报警百分比" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="板卡数报警百分比" label-width="140" size="default">
+                <el-input v-model="tableForms.percentuld" placeholder="请输入板卡数报警百分比" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -192,6 +197,7 @@ const tableForms = reactive<any>({
   alarmSceneId: route.query.alarmSceneId,
   event: null,
   percentage: null,
+  percentuld: null,
 }); //弹窗内容
 const tableOption = ref<any>([]); //下拉
 const tableOptionser = ref<any>([]); //下拉
@@ -261,6 +267,7 @@ const resetForm = () => {
   tableForms.endNode = null;
   tableForms.endPosition = null;
   tableForms.percentage = null;
+  tableForms.percentuld = null;
   delName.value = null;
 };
 const delRemove = async () => {
@@ -320,6 +327,7 @@ const btnClick = (row, index, param) => {
     delete tableForms.endPosition;
     delete tableForms.percentage;
     delete tableForms.beginPosition;
+    delete tableForms.percentuld;
     // delete tableForms.alarmSceneId;
     delete tableForms.event;
     // tableForms.StrategyName = index.StrategyName;
@@ -483,8 +491,8 @@ const getQuery = async () => {
         queryTemplateColumnSetID: 295,
         queryTemplateID: 18033,
         columnName: "beginNode",
-        columnLabel: "开始节点",
-        columnDescribe: "开始节点",
+        columnLabel: "基准节点",
+        columnDescribe: "基准节点",
         needSort: 0,
         needFilters: 1,
         needShow: 1,
@@ -515,8 +523,8 @@ const getQuery = async () => {
         queryTemplateColumnSetID: 297,
         queryTemplateID: 18033,
         columnName: "endNode",
-        columnLabel: "结束节点",
-        columnDescribe: "结束节点",
+        columnLabel: "报警节点",
+        columnDescribe: "报警节点",
         needSort: 0,
         needFilters: 1,
         needShow: 1,
@@ -559,6 +567,38 @@ const getQuery = async () => {
         orderNumber: null,
         needSearch: null,
       },
+      {
+        queryTemplateColumnSetID: 305,
+        queryTemplateID: 18033,
+        columnName: "percentage",
+        columnLabel: "运单数报警百分比",
+        columnDescribe: "运单数报警百分比",
+        needSort: 0,
+        needFilters: 0,
+        needShow: 1,
+        needGroup: 0,
+        dataType: "int",
+        listqueryTemplateID: null,
+        needCount: null,
+        orderNumber: null,
+        needSearch: null,
+      },
+      {
+        queryTemplateColumnSetID: 305,
+        queryTemplateID: 18033,
+        columnName: "percentuld",
+        columnLabel: "板卡数报警百分比",
+        columnDescribe: "板卡数报警百分比",
+        needSort: 0,
+        needFilters: 0,
+        needShow: 1,
+        needGroup: 0,
+        dataType: "int",
+        listqueryTemplateID: null,
+        needCount: null,
+        orderNumber: null,
+        needSearch: null,
+      },
     ];
     const result: any = await htQuery(DATACONTENT_ID.sysServiceClId, {
       alarmSceneId: route.query.alarmSceneId,