Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZYGM1.0

src/views/dataQuery/flightQuery/index.vue

@@ -47,7 +47,7 @@
       </Dialog> -->
       <TableColumnSet
         :dialogVisible="dialogVisible"
-        :columnList="state.list"
+        :columnList="tableCols"
         @closeDialog="closeDialog"
       />
     </div>

src/views/dataQuery/freightInquiry/index.vue

@@ -24,7 +24,7 @@
       </div>
       <TableColumnSet
         :dialogVisible="dialogVisible"
-        :columnList="state.list"
+        :columnList="tableCols"
         @closeDialog="closeDialog"
       />
     </div>

src/views/dataQuery/waybillQuery/index.vue

@@ -24,7 +24,7 @@
       </div>
       <TableColumnSet
         :dialogVisible="dialogVisible"
-        :columnList="state.list"
+        :columnList="tableCols"
         @closeDialog="closeDialog"
       />
     </div>

src/views/systemSettings/securityPolicy/index.vue

@@ -336,22 +336,6 @@ const tableData = ref([
     three: "CCA",
     text: "CA国航",
   },
-  {
-    name: "中国国际航空",
-    china: "国航",
-    englin: "AIRCHINA",
-    two: "CA",
-    three: "CCA",
-    text: "CA国航",
-  },
-  {
-    name: "中国国际航空",
-    china: "国航",
-    englin: "AIRCHINA",
-    two: "CA",
-    three: "CCA",
-    text: "CA国航",
-  },
 ]);
 //表头
 const state = reactive({

src/views/systemSettings/warningSet/index.vue

@@ -6,6 +6,7 @@
         :is-statuser="true"
         :is-Search="true"
         @addForm="addForm"
+        @searchForms="searchForms"
       >
         <template #header>
           <div class="status flex-wrap">
@@ -388,6 +389,13 @@ const generalDataReception = async (data) => {
     resetForm();
   }
 };
+//清除
+const searchForms = (data) => {
+  // tableData.value = [];
+
+  // page.value = 0;
+  getQuery();
+};
 getQuery();
 </script>
 <style lang="scss" scoped>