chenrui  2 年之前
父节点
当前提交
72255e104c

+ 9 - 7
src/views/dataQuery/components/DataQueryView/index.vue

@@ -232,13 +232,6 @@ const formData = reactive({
   endDate: today,
   keyWords: "",
 });
-const route = useRoute();
-const { flightDate, stockCode } = route.query;
-if (stockCode) {
-  formData.keyWords = stockCode;
-  formData.startDate = flightDate;
-  formData.endDate = flightDate;
-}
 watchEffect(() => {
   if (formData.inOrOut === "in") {
     formData.sAirport = "";
@@ -367,6 +360,15 @@ const { tableColumns, tableData, getTableData } = useTable(
   noMore,
   loading
 );
+// const route = useRoute();
+// const unroute = () => {
+//   const { flightDate, stockCode } = route.query;
+//   if (stockCode) {
+//     s.keyWords = stockCode;
+//     formData.startDate = flightDate;
+//     formData.endDate = flightDate;
+//   }
+// };
 // const load = () => {
 //   if (loading.value || noMore.value) {
 //     return

+ 4 - 2
src/views/dataQuery/components/DataQueryView/useTable.ts

@@ -56,7 +56,6 @@ export function useTable(
             ]
           : [startDate, endDate, keyWords];
       dataContent = dataContent.map((v) => (v === "" ? null : v));
-      // console.log(dataContent, "1111111");
       const {
         code,
         returnData: { columnSet, listValues },
@@ -120,11 +119,14 @@ export function useTable(
       loading.value = false;
     }
   };
-
+  const route = useRoute();
   onMounted(() => {
+    const { flightDate, stockCode } = route.query;
     const defaultDataContent =
       tableName === "flight"
         ? [null, null, "2000-01-01", null, null, null, null, null]
+        : stockCode
+        ? [flightDate, flightDate, stockCode]
         : [null, null, null];
     getTableData(defaultDataContent);
   });

+ 5 - 0
src/views/statisticalanalysis/components/echart/statisticsHeader.vue

@@ -417,6 +417,11 @@ export default {
       }
     });
   },
+  mounted() {
+    if (this.action == 14 || this.action == 15) {
+      this.$emit("getFormData", this.formData);
+    }
+  },
   methods: {
     getDay(day) {
       var today = new Date();

+ 1 - 0
src/views/statisticalanalysis/deliverydetails/index.vue

@@ -122,6 +122,7 @@ export default {
     };
   },
   mounted() {
+    // this.getFormData();
     // this.getQuery([]);
   },
   watch: {