货机航班综合查询

src/router/routes/routes-file-seven.ts

@@ -107,11 +107,20 @@ const HomeRoutes = {
       path: "/statisticalanalysis/cargoflight",
       name: "Cargoflight",
       meta: {
-        title: "货机航班计划统计",
+        title: "货机航班综合查询",
       },
       component: () =>
         import("@/views/statisticalanalysis/cargoflight/index.vue"),
     },
+    {
+      path: "/statisticalanalysis/cargoperiod",
+      name: "Cargoperiod",
+      meta: {
+        title: "货机航班时段查询",
+      },
+      component: () =>
+        import("@/views/statisticalanalysis/cargoperiod/index.vue"),
+    },
     {
       path: "/statisticalanalysis/gantryframe",
       name: "Gantryframe",

src/utils/validate.ts

@@ -1,11 +1,11 @@
-import { CommonValue } from '~/common'
+import { CommonValue } from "~/common";
 
 /**
  * @param {string} path
  * @returns {Boolean}
  */
 export function isExternal(path: string): boolean {
-  return /^(https?:|mailto:|tel:)/.test(path)
+  return /^(https?:|mailto:|tel:)/.test(path);
 }
 
 /**
@@ -13,8 +13,8 @@ export function isExternal(path: string): boolean {
  * @returns {Boolean}
  */
 export function validUsername(str: string): boolean {
-  const valid_map = ['admin', 'editor']
-  return valid_map.indexOf(str.trim()) >= 0
+  const valid_map = ["admin", "editor"];
+  return valid_map.indexOf(str.trim()) >= 0;
 }
 
 /**
@@ -22,8 +22,8 @@ export function validUsername(str: string): boolean {
  * @returns {Boolean}
  */
 export function validURL(url: string): boolean {
-  const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
-  return reg.test(url)
+  const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/;
+  return reg.test(url);
 }
 
 /**
@@ -31,8 +31,8 @@ export function validURL(url: string): boolean {
  * @returns {Boolean}
  */
 export function validLowerCase(str: string): boolean {
-  const reg = /^[a-z]+$/
-  return reg.test(str)
+  const reg = /^[a-z]+$/;
+  return reg.test(str);
 }
 
 /**
@@ -40,8 +40,8 @@ export function validLowerCase(str: string): boolean {
  * @returns {Boolean}
  */
 export function validUpperCase(str: string): boolean {
-  const reg = /^[A-Z]+$/
-  return reg.test(str)
+  const reg = /^[A-Z]+$/;
+  return reg.test(str);
 }
 
 /**
@@ -49,8 +49,8 @@ export function validUpperCase(str: string): boolean {
  * @returns {Boolean}
  */
 export function validAlphabets(str: string): boolean {
-  const reg = /^[A-Za-z]+$/
-  return reg.test(str)
+  const reg = /^[A-Za-z]+$/;
+  return reg.test(str);
 }
 
 /**
@@ -67,7 +67,7 @@ export function validAlphabets(str: string): boolean {
  * @returns {Boolean}
  */
 export function isString(str: any): boolean {
-  return typeof str === 'string' || str instanceof String
+  return typeof str === "string" || str instanceof String;
 }
 
 /**
@@ -76,12 +76,12 @@ export function isString(str: any): boolean {
  */
 export function isValue(arg: any[]) {
   if (Array.isArray(arg)) {
-    return arg.length
+    return arg.length;
   } else {
-    if (typeof arg === 'object') {
-      return Object.keys(arg).length
+    if (typeof arg === "object") {
+      return Object.keys(arg).length;
     } else {
-      return false
+      return false;
     }
   }
 }
@@ -94,28 +94,28 @@ export function isValue(arg: any[]) {
  */
 export function parseTime(time: any, cFormat: string) {
   if (arguments.length === 0 || !time) {
-    return null
+    return null;
   }
-  const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
-  let date
-  if (typeof time === 'object') {
-    date = time
+  const format = cFormat || "{y}-{m}-{d} {h}:{i}:{s}";
+  let date;
+  if (typeof time === "object") {
+    date = time;
   } else {
-    if (typeof time === 'string') {
+    if (typeof time === "string") {
       if (/^[0-9]+$/.test(time)) {
         // support "1548221490638"
-        time = parseInt(time)
+        time = parseInt(time);
       } else {
         // support safari
         // https://stackoverflow.com/questions/4310953/invalid-date-in-safari
-        time = time.replace(new RegExp(/-/gm), '/')
+        time = time.replace(new RegExp(/-/gm), "/");
       }
     }
 
-    if (typeof time === 'number' && time.toString().length === 10) {
-      time = time * 1000
+    if (typeof time === "number" && time.toString().length === 10) {
+      time = time * 1000;
     }
-    date = new Date(time)
+    date = new Date(time);
   }
   const formatObj = {
     y: date.getFullYear(),
@@ -125,68 +125,95 @@ export function parseTime(time: any, cFormat: string) {
     i: date.getMinutes(),
     s: date.getSeconds(),
     a: date.getDay(),
-  }
+  };
   const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
-    const value = formatObj[key]
+    const value = formatObj[key];
     // Note: getDay() returns 0 on Sunday
-    if (key === 'a') {
-      return ['日', '一', '二', '三', '四', '五', '六'][value]
+    if (key === "a") {
+      return ["日", "一", "二", "三", "四", "五", "六"][value];
     }
-    return value.toString().padStart(2, '0')
-  })
-  return time_str
+    return value.toString().padStart(2, "0");
+  });
+  return time_str;
 }
 
 export function translateDataToTreeAll(arr, parentKey, key) {
-  const map = {}
-  const result: any[] = []
-  arr.forEach(element => {
-    const id = element[key]
-    const pid = element[parentKey]
+  const map = {};
+  const result: any[] = [];
+  arr.forEach((element) => {
+    const id = element[key];
+    const pid = element[parentKey];
     if (map[id]) {
       map[id] = {
         ...element,
         children: map[id].children,
-      }
+      };
     } else {
       map[id] = {
         ...element,
         children: [],
-      }
+      };
     }
-    const item = map[id]
+    const item = map[id];
     if (pid <= 0) {
-      result.push(item)
+      result.push(item);
     } else {
       if (map[pid]) {
-        map[pid].children.push(item)
+        map[pid].children.push(item);
       } else {
         map[pid] = {
           children: [item],
-        }
+        };
       }
     }
-  })
-  return result
+  });
+  return result;
 }
 
 export function datetimeToTime(
   datetimeValue: CommonValue,
   currentDate: CommonValue
 ) {
-  if (typeof datetimeValue !== 'string' || !datetimeValue) {
-    return ''
+  if (typeof datetimeValue !== "string" || !datetimeValue) {
+    return "";
   }
-  if (typeof currentDate !== 'string') {
-    return ''
+  if (typeof currentDate !== "string") {
+    return "";
   }
-  const [date, time] = datetimeValue.trim().split(/[T|\s]+/)
-  let clipTime = time.slice(0, -3)
+  const [date, time] = datetimeValue.trim().split(/[T|\s]+/);
+  let clipTime = time.slice(0, -3);
   if (date !== currentDate) {
     const days =
       (new Date(date).getTime() - new Date(currentDate).getTime()) /
-      (24 * 60 * 60 * 1000)
-    clipTime += ` (${days > 0 ? '+' : ''}${days})`
+      (24 * 60 * 60 * 1000);
+    clipTime += ` (${days > 0 ? "+" : ""}${days})`;
   }
-  return clipTime
+  return clipTime;
 }
+
+export const Format = (fmt, date) => {
+  let o = {
+    "M+": date.getMonth() + 1, // 月份
+    "d+": date.getDate(), // 日
+    "h+": date.getHours(), // 小时
+    "m+": date.getMinutes(), // 分
+    "s+": date.getSeconds(), // 秒
+    "q+": Math.floor((date.getMonth() + 3) / 3), // 季度
+    S: date.getMilliseconds(), // 毫秒
+  };
+  if (/(y+)/.test(fmt)) {
+    fmt = fmt.replace(
+      RegExp.$1,
+      (date.getFullYear() + "").substr(4 - RegExp.$1.length)
+    );
+  }
+  for (var k in o) {
+    if (new RegExp("(" + k + ")").test(fmt)) {
+      fmt = fmt.replace(
+        RegExp.$1,
+        RegExp.$1.length === 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length)
+      );
+    }
+  }
+  return fmt;
+};

src/views/statisticalanalysis/cargoflight/index.vue

@@ -19,7 +19,7 @@
     </div>
     <div class="echart">
       <Tableformbrs :tableList="tableList" action="10" :set="set" />
-      <Tableformbrs
+      <!-- <Tableformbrs
         :tableList="tableLister"
         action="11"
         :set="set"
@@ -27,7 +27,7 @@
       />
       <div class="imgechatr">
         <Echarts :id="dataid" :option="echartsData" />
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
@@ -98,7 +98,7 @@ export default {
         ],
         list: [],
       },
-      titleTop: "货机航班计划统计",
+      titleTop: "货机航班综合查询",
       formItems: [
         {
           prop: "dateTime",
@@ -133,9 +133,9 @@ export default {
         },
       ];
       this.getQuery(option, null);
-      this.getQuerys(option, null);
+      // this.getQuerys(option, null);
       this.listname =
-        " 货机航班计划统计表-汇总" + data.dateTime[0] + "--" + data.dateTime[1];
+        "货机航班综合查询" + data.dateTime[0] + "--" + data.dateTime[1];
       this.listHeader = [
         "日期",
         "汇总",
@@ -148,35 +148,35 @@ export default {
         "国际及地区出港",
         "国际及地区进港",
       ];
-      this.listnames =
-        "货机航班计划统计表-小时" + data.dateTime[0] + "--" + data.dateTime[1];
-      this.listHeaders = [
-        "日期",
-        "t0",
-        "t1",
-        "t2",
-        "t3",
-        "t4",
-        "t5",
-        "t6",
-        "t7",
-        "t8",
-        "t9",
-        "t10",
-        "t11",
-        "t12",
-        "t13",
-        "t14",
-        "t15",
-        "t16",
-        "t17",
-        "t18",
-        "t19",
-        "t20",
-        "t21",
-        "t22",
-        "t23",
-      ];
+      // this.listnames =
+      //   "货机航班计划统计表-小时" + data.dateTime[0] + "--" + data.dateTime[1];
+      // this.listHeaders = [
+      //   "日期",
+      //   "t0",
+      //   "t1",
+      //   "t2",
+      //   "t3",
+      //   "t4",
+      //   "t5",
+      //   "t6",
+      //   "t7",
+      //   "t8",
+      //   "t9",
+      //   "t10",
+      //   "t11",
+      //   "t12",
+      //   "t13",
+      //   "t14",
+      //   "t15",
+      //   "t16",
+      //   "t17",
+      //   "t18",
+      //   "t19",
+      //   "t20",
+      //   "t21",
+      //   "t22",
+      //   "t23",
+      // ];
     },
     //获取表格数据
     async getQuery(data, dat) {
@@ -267,7 +267,7 @@ export default {
     },
     Excelto() {
       this.tableToExcel();
-      this.tableToExcels();
+      // this.tableToExcels();
     },
     //导出
     tableToExcel() {

src/views/statisticalanalysis/cargoperiod/index.vue

@@ -0,0 +1,432 @@
+<template>
+  <div class="airportInfo">
+    <div class="variable">
+      <StatisticsHeader
+        :title="titleTop"
+        :items="formItems"
+        :data="formData"
+        :eledata="eledata"
+        with-setting
+        :withSetting="false"
+        :withExport="true"
+        :set="set"
+        :action="action"
+        :asShow="asShow"
+        @getFormData="getFormData"
+        @export="Excelto"
+        @upset="upset"
+      />
+    </div>
+    <div class="echart">
+      <!-- <Tableformbrs :tableList="tableList" action="10" :set="set" /> -->
+      <Tableformbrs
+        :tableList="tableLister"
+        action="11"
+        :set="set"
+        style="margin-top: 10px"
+      />
+      <div class="imgechatr">
+        <Echarts :id="dataid" :option="echartsData" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Echarts from "../components/echart/echartsgas.vue";
+import Tableformbrs from "../components/echart/tableforms.vue";
+import StatisticsHeader from "../components/echart/statisticsHeader.vue";
+import { export_json_to_excel } from "@/utils/Export2Excel";
+import { Format } from "@/utils/validate";
+import { Query } from "@/api/webApi";
+export default {
+  name: "ChartsBar",
+  data() {
+    return {
+      asShow: false,
+      optiondata: [],
+      picShow: true, //图片表格切换
+      action: 10,
+      dataid: "collection_ecahrt10",
+      listqueryTemplateID: DATACONTENT_ID.modeCargoFlightStatisTable,
+      listqueryTemplatesID: DATACONTENT_ID.modeCargoFlightTimeTable,
+      eledata: null,
+      set: "",
+      tableList: [],
+      tableListcop: [],
+      listname: "",
+      listHeader: [],
+      listnames: "",
+      listHeaders: [],
+      tableData: {
+        time: [],
+        data1: [],
+        data2: [],
+        kg: "",
+        tyol: "",
+      },
+      formData: {
+        airport: "",
+        dateTime: "",
+      },
+      tableLister: [],
+      echartsData: {
+        time: [
+          "t0",
+          "t1",
+          "t2",
+          "t3",
+          "t4",
+          "t5",
+          "t6",
+          "t7",
+          "t8",
+          "t9",
+          "t10",
+          "t11",
+          "t12",
+          "t13",
+          "t14",
+          "t15",
+          "t16",
+          "t17",
+          "t18",
+          "t19",
+          "t20",
+          "t21",
+          "t22",
+          "t23",
+        ],
+        list: [],
+      },
+      titleTop: "货机航班综合查询",
+      formItems: [
+        {
+          prop: "dateTime",
+          inputType: "erdatime",
+          clearable: true,
+          width: "240px",
+          options: [],
+        },
+      ],
+    };
+  },
+  mounted() {
+    // this.getQuery([]);
+  },
+  watch: {
+    // 监听数据变化，重绘折线图
+    option: {
+      deep: true,
+      handler(newVal) {},
+    },
+  },
+  destroyed() {},
+  methods: {
+    getFormData(data) {
+      this.tableData.time = [];
+      this.tableData.data1 = [];
+      this.tableData.data2 = [];
+      let option = [
+        {
+          fd1:
+            Format(
+              "yyyy-MM-dd",
+              new Date(new Date(data.dateTime).getTime() - 24 * 60 * 60 * 1000)
+            ) + " 00:00:00",
+          fd2: data.dateTime + " 23:00:00",
+        },
+      ];
+      // this.getQuery(option, null);
+      this.getQuerys(option, data.dateTime);
+      // this.listname =
+      //   "货机航班综合查询" + data.dateTime[0] + "--" + data.dateTime[1];
+      // this.listHeader = [
+      //   "日期",
+      //   "汇总",
+      //   "进港",
+      //   "出港",
+      //   "国内",
+      //   "国际及地区",
+      //   "国内出港",
+      //   "国内进港",
+      //   "国际及地区出港",
+      //   "国际及地区进港",
+      // ];
+      this.listnames =
+        "货机航班计划统计表-小时" + data.dateTime[0] + "--" + data.dateTime[1];
+      this.listHeaders = [
+        "日期",
+        "t0",
+        "t1",
+        "t2",
+        "t3",
+        "t4",
+        "t5",
+        "t6",
+        "t7",
+        "t8",
+        "t9",
+        "t10",
+        "t11",
+        "t12",
+        "t13",
+        "t14",
+        "t15",
+        "t16",
+        "t17",
+        "t18",
+        "t19",
+        "t20",
+        "t21",
+        "t22",
+        "t23",
+      ];
+    },
+    //获取表格数据
+    async getQuery(data, dat) {
+      try {
+        const { code, returnData } = await Query({
+          id: this.listqueryTemplateID,
+          dataContent: data,
+        });
+        if (code == 0) {
+          this.tableData.time = [];
+          this.tableData.data1 = [];
+          this.tableData.data2 = [];
+          this.tableList = JSON.parse(JSON.stringify(returnData.listValues));
+          this.tableListcop = JSON.parse(JSON.stringify(returnData.listValues));
+          this.tableList.forEach((item, index) => {
+            item.indexs = index + 1;
+          });
+          this.tableListcop.forEach((item, index) => {
+            item.indexs = index + 1;
+          });
+          returnData.listValues.forEach((element) => {
+            this.tableData.data1 = [];
+          });
+          this.tableData.data1.push(0);
+          for (let index = 0; index < this.tableData.data2.length; index++) {
+            if (index > 0) {
+              const element =
+                (this.tableData.data2[index] -
+                  this.tableData.data2[index - 1]) /
+                this.tableData.data2[index - 1];
+              this.tableData.data1.push(
+                element.toFixed(2) ? element.toFixed(2) : 0
+              );
+              this.tableData.data1.forEach((element) => {
+                element = Number(element);
+                if (typeof element !== "number") {
+                  element = 0;
+                }
+              });
+            }
+          }
+        }
+      } catch (error) {
+        this.page--;
+      }
+    },
+    //获取表格数据
+    async getQuerys(data, dat) {
+      try {
+        const { code, returnData } = await Query({
+          id: this.listqueryTemplatesID,
+          dataContent: data,
+        });
+        if (code == 0) {
+          this.tableLister = returnData.listValues.filter((i) => i.dat === dat);
+          for (let index = 0; index < returnData.listValues.length; index++) {
+            this.echartsData.list[index] = new Array(
+              returnData.listValues[index].t0,
+              returnData.listValues[index].t1,
+              returnData.listValues[index].t2,
+              returnData.listValues[index].t3,
+              returnData.listValues[index].t4,
+              returnData.listValues[index].t5,
+              returnData.listValues[index].t6,
+              returnData.listValues[index].t7,
+              returnData.listValues[index].t8,
+              returnData.listValues[index].t9,
+              returnData.listValues[index].t10,
+              returnData.listValues[index].t11,
+              returnData.listValues[index].t12,
+              returnData.listValues[index].t13,
+              returnData.listValues[index].t14,
+              returnData.listValues[index].t15,
+              returnData.listValues[index].t16,
+              returnData.listValues[index].t17,
+              returnData.listValues[index].t18,
+              returnData.listValues[index].t19,
+              returnData.listValues[index].t20,
+              returnData.listValues[index].t21,
+              returnData.listValues[index].t22,
+              returnData.listValues[index].t23
+            );
+          }
+        }
+      } catch (error) {
+        this.page--;
+      }
+    },
+    Excelto() {
+      // this.tableToExcel();
+      this.tableToExcels();
+    },
+    //导出
+    tableToExcel() {
+      import("../../../utils/Export2Excel").then((excel) => {
+        // 设置导出表格的头部
+        const tHeader = this.listHeader;
+        // 将要导出的数据进行一个过滤
+        /**
+         * 源数据导入到excel的数据每一条重新拼成一个数组,数组里的每个元素就是filterVal里的每个字段
+         */
+        const data = this.tableListcop.map((item, index) => {
+          return [
+            item.dat,
+            item.total,
+            item.landing,
+            item.departure,
+            item.d,
+            item.i,
+            item.departure_d,
+            item.landing_d,
+            item.departure_i,
+            item.landing_i,
+          ];
+        });
+        data[data.length - 1].indexs = "总计";
+        // 调用我们封装好的方法进行导出Excel
+        excel.export_json_to_excel({
+          // 导出的头部
+          header: tHeader,
+          // 导出的内容
+          data,
+          // 导出的文件名称
+          filename: this.listname,
+          // 导出的表格宽度是否自动
+          autoWidth: true,
+          // 导出文件的后缀类型
+          bookType: "xlsx",
+        });
+      });
+    },
+    tableToExcels() {
+      import("../../../utils/Export2Excel").then((excel) => {
+        // 设置导出表格的头部
+        const tHeader = this.listHeaders;
+        // 将要导出的数据进行一个过滤
+        /**
+         * 源数据导入到excel的数据每一条重新拼成一个数组,数组里的每个元素就是filterVal里的每个字段
+         */
+        const data = this.tableLister.map((item, index) => {
+          return [
+            item.dat,
+            item.t0,
+            item.t1,
+            item.t2,
+            item.t3,
+            item.t4,
+            item.t5,
+            item.t6,
+            item.t7,
+            item.t8,
+            item.t9,
+            item.t10,
+            item.t11,
+            item.t12,
+            item.t13,
+            item.t14,
+            item.t15,
+            item.t16,
+            item.t17,
+            item.t18,
+            item.t19,
+            item.t20,
+            item.t21,
+            item.t22,
+            item.t23,
+          ];
+        });
+        data[data.length - 1].indexs = "总计";
+        // 调用我们封装好的方法进行导出Excel
+        excel.export_json_to_excel({
+          // 导出的头部
+          header: tHeader,
+          // 导出的内容
+          data,
+          // 导出的文件名称
+          filename: this.listnames,
+          // 导出的表格宽度是否自动
+          autoWidth: true,
+          // 导出文件的后缀类型
+          bookType: "xlsx",
+        });
+      });
+    },
+    upset(data) {
+      this.picShow = data;
+    },
+  },
+  components: {
+    Echarts,
+    StatisticsHeader,
+    Tableformbrs,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.airportInfo {
+  position: relative;
+  .header {
+    width: 103%;
+    height: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #f7f7f7;
+    position: relative;
+    left: -23px;
+    > .nav {
+      padding: 0 30px 0 30px;
+      cursor: pointer;
+      font-size: 16px;
+      font-family: Microsoft YaHei;
+      font-weight: 400;
+      color: #101116;
+    }
+    > .navs {
+      height: 100%;
+      padding: 0 30px 0 30px;
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      font-size: 16px;
+      font-family: Microsoft YaHei;
+      font-weight: bold;
+      color: #ac014d;
+      border-bottom: 2px solid #ac014d;
+    }
+  }
+  .variable {
+    width: 100%;
+    height: 64px;
+  }
+  .echart {
+    width: 100%;
+    height: 746px;
+    position: absolute;
+    background: #ffffff;
+    box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.1);
+    border-radius: 4px;
+    > .imgechatr {
+      width: 100%;
+      height: 73%;
+      position: absolute;
+      bottom: 0;
+    }
+  }
+}
+</style>

src/views/statisticalanalysis/components/echart/echartsgas.vue

@@ -62,7 +62,6 @@ export default {
         this.myChart = markRaw(echarts.init(chartDom));
         collection.xAxis.data = newVal.time;
         let arr = JSON.parse(JSON.stringify(newVal.list));
-        console.log(arr);
         for (let index = 0; index < arr.length; index++) {
           collection.series.push({
             name: "",

src/views/statisticalanalysis/components/echart/statisticsHeader.vue

@@ -72,6 +72,15 @@
           >
           </el-date-picker>
         </template>
+        <template v-if="item.inputType === 'erdatime'">
+          <el-date-picker
+            value-format="YYYY-MM-DD"
+            v-model="formData[item.prop]"
+            type="date"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
+        </template>
         <template v-if="item.inputType === 'cascader'">
           <el-cascader
             v-model="formData[item.prop]"

src/views/statisticalanalysis/components/echart/tableforms.vue

@@ -707,8 +707,8 @@
           style="width: 100%"
           :row-style="rowStyle"
           :style="dataTableContentStyle"
-          height="calc(40vh - 190px)"
-          max-height="calc(40vh - 190px)"
+          height="calc(100vh - 190px)"
+          max-height="calc(100vh - 190px)"
           :stripe="tableProps.stripe"
           :border="tableProps.border"
           :row-key="tableProps.rowKey"