预警报警策略维护修改

src/views/systemSettings/warningEdit/index.vue

@@ -15,6 +15,11 @@
               <el-input v-model="tableForm.name" placeholder="请输入策略名称" />
             </el-form-item>
           </div> -->
+          <div class="outersurface pd30">
+            <el-form-item label="名称" prop="alarmname" size="default">
+              <el-input v-model="tableForm.alarmname" placeholder="请输入名称" />
+            </el-form-item>
+          </div>
           <div class="outersurface pd30">
             <el-form-item label="航司二字码" size="default" prop="IATACode">
               <el-select style="width: 100%" v-model="tableForm.IATACode" class="input-shadow" filterable allow-create default-first-option clearable placeholder="请选择航司二字码">
@@ -47,7 +52,7 @@
               </el-select>
             </el-form-item>
           </div>
-          <div class="outersurface">
+          <div class="outersurface pd30">
             <el-form-item label="航班号" size="default" prop="flightNo">
               <el-input v-model="tableForm.flightNo" placeholder="请输入航班号" />
             </el-form-item>
@@ -61,6 +66,15 @@
               </el-select>
             </el-form-item>
           </div>
+          <div class="outersurface pd30">
+            <el-form-item label="客货机" prop="flighttype" size="default">
+              <el-select style="width: 100%" v-model="tableForm.flighttype" class="input-shadow" filterable allow-create default-first-option placeholder="请选择客货机">
+                <el-option label="客机" value="客机" />
+                    <el-option label="货机" value="货机" />
+                    <el-option label="全部" value="全部" />
+              </el-select>
+            </el-form-item>
+          </div>
           <div class="outersurface pd30">
             <el-form-item label="停机位" prop="landingstand" size="default">
               <el-input ref="inputRef" v-model="tableForm.landingstand" placeholder="请输入停机位" />
@@ -78,6 +92,11 @@
               </el-date-picker>
             </el-form-item>
           </div>
+          <div class="outersurface pd30">
+            <el-form-item label="描述" prop="alarmdesc" size="default">
+              <el-input v-model="tableForm.alarmdesc" placeholder="请输入描述" />
+            </el-form-item>
+          </div>
         </el-form>
       </div>
     </div>
@@ -214,7 +233,10 @@ const tableForm = reactive({
   startDate: null,
   endDate: null,
   planetype: null,
+  flighttype: null,
   landingstand: null,
+  alarmname: null,
+  alarmdesc: null,
   event: 2,
   ditype: "ALL",
 }); //报警预警场景

src/views/systemSettings/warningSet/index.vue

@@ -23,6 +23,11 @@
                   />
                 </el-form-item>
               </el-col> -->
+              <el-col :span="12">
+                <el-form-item label="名称" prop="alarmname" size="default">
+                  <el-input v-model="tableForm.alarmname" placeholder="请输入名称" />
+                </el-form-item>
+              </el-col>
               <el-col :span="12">
                 <el-form-item label="起飞机场" size="default" prop="departmentAirport" :rules="formRules.isNotNull">
                   <el-select style="width: 100%" v-model="tableForm.departmentAirport" class="input-shadow" filterable allow-create default-first-option clearable placeholder="请选择起飞机场">
@@ -55,7 +60,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col>
+              <el-col :span="12">
                 <el-form-item label="航班号" size="default">
                   <el-input v-model="tableForm.flightNo" placeholder="请输入航班号" />
                 </el-form-item>
@@ -69,6 +74,15 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="客货机" prop="flighttype" size="default">
+                  <el-select style="width: 100%" v-model="tableForm.flighttype" class="input-shadow" filterable allow-create default-first-option placeholder="请选择客货机">
+                    <el-option label="客机" value="客机" />
+                    <el-option label="货机" value="货机" />
+                    <el-option label="全部" value="全部" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :span="12">
                 <el-form-item label="停机位" prop="landingstand" size="default">
                   <el-input ref="inputRef" v-model="tableForm.landingstand" placeholder="请输入停机位" />
@@ -86,6 +100,11 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="描述" prop="alarmdesc" size="default">
+                  <el-input v-model="tableForm.alarmdesc" placeholder="请输入描述" />
+                </el-form-item>
+              </el-col>
               <!-- <el-col>
                 <el-form-item label="备注" size="default">
                   <el-input
@@ -150,7 +169,10 @@ const tableForm = reactive<any>({
   endDate: null,
   ditype: "ALL",
   planetype: null,
+  flighttype: null,
   landingstand: null,
+  alarmname: null,
+  alarmdesc: null,
   // alarmSceneId: "",
   // event: "",
 }); //弹窗内容
@@ -225,7 +247,10 @@ const resetForm = () => {
   tableForm.startDate = "";
   tableForm.endDate = "";
   tableForm.planetype = '',
+  tableForm.flighttype = '',
   tableForm.landingstand = '',
+  tableForm.alarmname = '',
+  tableForm.alarmdesc = '',
   // tableForm.event = "";
   delName.value = "";
 };
@@ -286,6 +311,22 @@ const delRest = () => {
 const getQuery = async (data?) => {
   try {
     const columnSet = [
+      {
+        queryTemplateColumnSetID: 300,
+        queryTemplateID: 13,
+        columnName: "alarmname",
+        columnLabel: "名称",
+        columnDescribe: "名称",
+        needSort: 0,
+        needFilters: 1,
+        needShow: 1,
+        needGroup: 0,
+        dataType: "varchar",
+        listqueryTemplateID: null,
+        needCount: null,
+        orderNumber: null,
+        needSearch: null,
+      },
       {
         queryTemplateColumnSetID: 290,
         queryTemplateID: 13,
@@ -398,6 +439,22 @@ const getQuery = async (data?) => {
         orderNumber: null,
         needSearch: null,
       },
+      {
+        queryTemplateColumnSetID: 299,
+        queryTemplateID: 13,
+        columnName: "flighttype",
+        columnLabel: "客货机",
+        columnDescribe: "客货机",
+        needSort: 0,
+        needFilters: 1,
+        needShow: 1,
+        needGroup: 0,
+        dataType: "varchar",
+        listqueryTemplateID: null,
+        needCount: null,
+        orderNumber: null,
+        needSearch: null,
+      },
       {
         queryTemplateColumnSetID: 298,
         queryTemplateID: 13,
@@ -446,6 +503,22 @@ const getQuery = async (data?) => {
         orderNumber: null,
         needSearch: null,
       },
+      {
+        queryTemplateColumnSetID: 301,
+        queryTemplateID: 13,
+        columnName: "alarmdesc",
+        columnLabel: "描述",
+        columnDescribe: "描述",
+        needSort: 0,
+        needFilters: 1,
+        needShow: 1,
+        needGroup: 0,
+        dataType: "varchar",
+        listqueryTemplateID: null,
+        needCount: null,
+        orderNumber: null,
+        needSearch: null,
+      },
     ];
     const { code, returnData } = await Query({
       id: DATACONTENT_ID.sysServiceCjId,