修改bug

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

@@ -44,6 +44,28 @@ const HomeRoutes = {
               '@/views/statisticalanalysis/dataException/views/waybill.vue'
             ),
         },
+        {
+          path: '/statisticalanalysis/dataException/dimension',
+          name: 'dataExceptionDimension',
+          meta: {
+            title: '部门维度统计',
+          },
+          component: () =>
+            import(
+              '@/views/statisticalanalysis/dataException/views/dimension.vue'
+            ),
+        },
+        {
+          path: '/statisticalanalysis/dataException/detail',
+          name: 'dataExceptionDetail',
+          meta: {
+            title: '节点明细统计',
+          },
+          component: () =>
+            import(
+              '@/views/statisticalanalysis/dataException/views/detail.vue'
+            ),
+        },
       ],
     },
     {

src/utils/Export2Excel.ts

@@ -1,20 +1,21 @@
-import { saveAs } from "file-saver";
-import * as XLSX from "xlsx";
+import { saveAs } from 'file-saver'
+import * as XLSX from 'xlsx'
+import { ElMessage } from 'element-plus'
 
 function generateArray(table) {
-  var out = [];
-  var rows = table.querySelectorAll("tr");
-  var ranges = [];
+  var out = []
+  var rows = table.querySelectorAll('tr')
+  var ranges = []
   for (var R = 0; R < rows.length; ++R) {
-    var outRow = [];
-    var row = rows[R];
-    var columns = row.querySelectorAll("td");
+    var outRow = []
+    var row = rows[R]
+    var columns = row.querySelectorAll('td')
     for (var C = 0; C < columns.length; ++C) {
-      var cell = columns[C];
-      var colspan = cell.getAttribute("colspan");
-      var rowspan = cell.getAttribute("rowspan");
-      var cellValue = cell.innerText;
-      if (cellValue !== "" && cellValue === +cellValue) cellValue = +cellValue;
+      var cell = columns[C]
+      var colspan = cell.getAttribute('colspan')
+      var rowspan = cell.getAttribute('rowspan')
+      var cellValue = cell.innerText
+      if (cellValue !== '' && cellValue === +cellValue) cellValue = +cellValue
 
       //Skip ranges
       ranges.forEach(function (range) {
@@ -24,14 +25,14 @@ function generateArray(table) {
           outRow.length >= range.s.c &&
           outRow.length <= range.e.c
         ) {
-          for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
+          for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null)
         }
-      });
+      })
 
       //Handle Row Span
       if (rowspan || colspan) {
-        rowspan = rowspan || 1;
-        colspan = colspan || 1;
+        rowspan = rowspan || 1
+        colspan = colspan || 1
         ranges.push({
           s: {
             r: R,
@@ -41,28 +42,28 @@ function generateArray(table) {
             r: R + rowspan - 1,
             c: outRow.length + colspan - 1,
           },
-        });
+        })
       }
 
       //Handle Value
-      outRow.push(cellValue !== "" ? cellValue : null);
+      outRow.push(cellValue !== '' ? cellValue : null)
 
       //Handle Colspan
-      if (colspan) for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
+      if (colspan) for (var k = 0; k < colspan - 1; ++k) outRow.push(null)
     }
-    out.push(outRow);
+    out.push(outRow)
   }
-  return [out, ranges];
+  return [out, ranges]
 }
 
 function datenum(v, date1904) {
-  if (date1904) v += 1462;
-  var epoch = Date.parse(v);
-  return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
+  if (date1904) v += 1462
+  var epoch = Date.parse(v)
+  return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000)
 }
 
 function sheet_from_array_of_arrays(data, opts) {
-  var ws = {};
+  var ws = {}
   var range = {
     s: {
       c: 10000000,
@@ -72,82 +73,82 @@ function sheet_from_array_of_arrays(data, opts) {
       c: 0,
       r: 0,
     },
-  };
+  }
   for (var R = 0; R != data.length; ++R) {
     for (var C = 0; C != data[R].length; ++C) {
-      if (range.s.r > R) range.s.r = R;
-      if (range.s.c > C) range.s.c = C;
-      if (range.e.r < R) range.e.r = R;
-      if (range.e.c < C) range.e.c = C;
+      if (range.s.r > R) range.s.r = R
+      if (range.s.c > C) range.s.c = C
+      if (range.e.r < R) range.e.r = R
+      if (range.e.c < C) range.e.c = C
       var cell = {
         v: data[R][C],
-      };
-      if (cell.v == null) continue;
+      }
+      if (cell.v == null) continue
       var cell_ref = XLSX.utils.encode_cell({
         c: C,
         r: R,
-      });
+      })
 
-      if (typeof cell.v === "number") cell.t = "n";
-      else if (typeof cell.v === "boolean") cell.t = "b";
+      if (typeof cell.v === 'number') cell.t = 'n'
+      else if (typeof cell.v === 'boolean') cell.t = 'b'
       else if (cell.v instanceof Date) {
-        cell.t = "n";
-        cell.z = XLSX.SSF._table[14];
-        cell.v = datenum(cell.v);
-      } else cell.t = "s";
+        cell.t = 'n'
+        cell.z = XLSX.SSF._table[14]
+        cell.v = datenum(cell.v)
+      } else cell.t = 's'
 
-      ws[cell_ref] = cell;
+      ws[cell_ref] = cell
     }
   }
-  if (range.s.c < 10000000) ws["!ref"] = XLSX.utils.encode_range(range);
-  return ws;
+  if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range)
+  return ws
 }
 
 function Workbook() {
-  if (!(this instanceof Workbook)) return new Workbook();
-  this.SheetNames = [];
-  this.Sheets = {};
+  if (!(this instanceof Workbook)) return new Workbook()
+  this.SheetNames = []
+  this.Sheets = {}
 }
 
 function s2ab(s) {
-  var buf = new ArrayBuffer(s.length);
-  var view = new Uint8Array(buf);
-  for (var i = 0; i !== s.length; ++i) view[i] = s.charCodeAt(i) & 0xff;
-  return buf;
+  var buf = new ArrayBuffer(s.length)
+  var view = new Uint8Array(buf)
+  for (var i = 0; i !== s.length; ++i) view[i] = s.charCodeAt(i) & 0xff
+  return buf
 }
 
 export function export_table_to_excel(id) {
-  var theTable = document.getElementById(id);
-  var oo = generateArray(theTable);
-  var ranges = oo[1];
+  var theTable = document.getElementById(id)
+  var oo = generateArray(theTable)
+  var ranges = oo[1]
 
   /* original data */
-  var data = oo[0];
-  var ws_name = "SheetJS";
+  var data = oo[0]
+  var ws_name = 'SheetJS'
 
   var wb = new Workbook(),
-    ws = sheet_from_array_of_arrays(data);
+    ws = sheet_from_array_of_arrays(data)
 
   /* add ranges to worksheet */
   // ws['!cols'] = ['apple', 'banan'];
-  ws["!merges"] = ranges;
+  ws['!merges'] = ranges
 
   /* add worksheet to workbook */
-  wb.SheetNames.push(ws_name);
-  wb.Sheets[ws_name] = ws;
+  wb.SheetNames.push(ws_name)
+  wb.Sheets[ws_name] = ws
 
   var wbout = XLSX.write(wb, {
-    bookType: "xlsx",
+    bookType: 'xlsx',
     bookSST: false,
-    type: "binary",
-  });
+    type: 'binary',
+  })
 
   saveAs(
     new Blob([s2ab(wbout)], {
-      type: "application/octet-stream",
+      type: 'application/octet-stream',
     }),
-    "test.xlsx"
-  );
+    'test.xlsx'
+  )
 }
 
 export function export_json_to_excel({
@@ -157,26 +158,26 @@ export function export_json_to_excel({
   filename,
   merges = [],
   autoWidth = true,
-  bookType = "xlsx",
+  bookType = 'xlsx',
 } = {}) {
   /* original data */
-  filename = filename || "excel-list";
-  data = [...data];
-  data.unshift(header);
+  filename = filename || 'excel-list'
+  data = [...data]
+  data.unshift(header)
 
   for (let i = multiHeader.length - 1; i > -1; i--) {
-    data.unshift(multiHeader[i]);
+    data.unshift(multiHeader[i])
   }
 
-  var ws_name = "Sheet1";
+  var ws_name = 'Sheet1'
   var wb = new Workbook(),
-    ws = sheet_from_array_of_arrays(data);
+    ws = sheet_from_array_of_arrays(data)
 
   if (merges.length > 0) {
-    if (!ws["!merges"]) ws["!merges"] = [];
+    if (!ws['!merges']) ws['!merges'] = []
     merges.forEach((item) => {
-      ws["!merges"].push(XLSX.utils.decode_range(item));
-    });
+      ws['!merges'].push(XLSX.utils.decode_range(item))
+    })
   }
 
   if (autoWidth) {
@@ -187,44 +188,161 @@ export function export_json_to_excel({
         if (val == null) {
           return {
             wch: 10,
-          };
+          }
         } else if (val.toString().charCodeAt(0) > 255) {
           /*再判断是否为中文*/
           return {
             wch: val.toString().length * 2,
-          };
+          }
         } else {
           return {
             wch: val.toString().length,
-          };
+          }
         }
       })
-    );
+    )
     /*以第一行为初始值*/
-    let result = colWidth[0];
+    let result = colWidth[0]
     for (let i = 1; i < colWidth.length; i++) {
       for (let j = 0; j < colWidth[i].length; j++) {
-        if (result[j]["wch"] < colWidth[i][j]["wch"]) {
-          result[j]["wch"] = colWidth[i][j]["wch"];
+        if (result[j]['wch'] < colWidth[i][j]['wch']) {
+          result[j]['wch'] = colWidth[i][j]['wch']
         }
       }
     }
-    ws["!cols"] = result;
+    ws['!cols'] = result
   }
 
   /* add worksheet to workbook */
-  wb.SheetNames.push(ws_name);
-  wb.Sheets[ws_name] = ws;
+  wb.SheetNames.push(ws_name)
+  wb.Sheets[ws_name] = ws
 
   var wbout = XLSX.write(wb, {
     bookType: bookType,
     bookSST: false,
-    type: "binary",
-  });
+    type: 'binary',
+  })
   saveAs(
     new Blob([s2ab(wbout)], {
-      type: "application/octet-stream",
+      type: 'application/octet-stream',
     }),
     `${filename}.${bookType}`
-  );
+  )
+}
+
+function devideGroup(cellName) {
+  const stringArray = cellName.split('')
+  const length = stringArray.length
+  let index = 0
+  for (let i = 0; i < length; i++) {
+    if (isNaN(parseInt(stringArray[i]))) {
+      index += stringArray[i].charCodeAt(0) - 'A'.charCodeAt(0) + i * 26
+    } else {
+      return {
+        columnIndex: index,
+        rowIndex: Number(stringArray.slice(i).join('')) - 1,
+      }
+    }
+  }
+}
+
+export function exportToExcel(table, tableName, fileName, headerRowNumber = 1) {
+  try {
+    // 设置了列的fixed属性后会有两个table元素，导出数据会重复，需要去掉一个table
+    const fixedTable = table.querySelector('.el-table__fixed')
+    fixedTable && table.removeChild(fixedTable)
+    // 自定义的表头里包含筛选，直接导出会把筛选的下拉数据也写到表头单元格里，需要先去掉筛选弹出框
+    const tableHeaderCellPopovers = table.querySelectorAll(
+      '.table-header-cell-popover'
+    )
+    tableHeaderCellPopovers.forEach((node) => {
+      if (node.querySelector('.el-popover')) {
+        node.removeChild(node.querySelector('.el-popover'))
+      }
+    })
+    // 生成要导出的xlsx数据，raw: true表示不使用excel的格式解析，输出为纯文本，sheet设置xlsx这一页的标题
+    const tableBook = XLSX.utils.table_to_book(table, {
+      raw: true,
+      sheet: tableName,
+    })
+    // 计算每一列的单元格的最大宽度（包含表头），单元格的key为'A12'、'AA2'等，和excel里一致
+    const xlsxDatas = tableBook.Sheets[tableName]
+    const columnWidths: any = []
+    for (const cellName in xlsxDatas) {
+      if (
+        !['!rows', '!cols', '!fullref', '!ref', '!merges'].includes(cellName)
+      ) {
+        const { columnIndex, rowIndex } = devideGroup(cellName) as any
+        const cellWidth = Math.max(
+          ...xlsxDatas[cellName].v
+            .toString()
+            .split('\n')
+            .map((cellRow) =>
+              cellRow.split('').reduce((pre, curr) => {
+                const letterSize = curr.charCodeAt(0) > 255 ? 2 : 1
+                return pre + letterSize
+              }, 0)
+            )
+        )
+        if (
+          (!columnWidths[columnIndex] && cellWidth > 0) ||
+          cellWidth > columnWidths[columnIndex]
+        ) {
+          columnWidths[columnIndex] = cellWidth
+        }
+        let cellStyle: any = {
+          alignment: {
+            horizontal: 'center',
+            vertical: 'center',
+            wrapText: true,
+          },
+        }
+        if (rowIndex < headerRowNumber) {
+          const borderStyle = {
+            style: 'medium',
+            color: {
+              rgb: 'FFFFFF',
+            },
+          }
+          cellStyle = {
+            ...cellStyle,
+            border: {
+              top: borderStyle,
+              right: borderStyle,
+              bottom: borderStyle,
+              left: borderStyle,
+            },
+            font: {
+              color: {
+                rgb: 'FFFFFF',
+              },
+            },
+            fill: {
+              fgColor: {
+                rgb: '3366FF',
+              },
+            },
+          }
+        } else {
+          cellStyle.alignment.horizontal = 'left'
+        }
+        xlsxDatas[cellName].s = cellStyle
+      }
+    }
+    xlsxDatas['!cols'] = columnWidths.map((width) => ({
+      wch: width + 2,
+    }))
+    const tableWrite = XLSX.write(tableBook, {
+      bookType: 'xlsx',
+      bookSST: true,
+      type: 'buffer',
+      cellStyles: true,
+    })
+    saveAs(
+      new Blob([tableWrite], { type: 'application/octet-stream' }),
+      fileName
+    )
+  } catch (error: any) {
+    ElMessage.error(error.message)
+  }
 }

src/views/dataQuery/components/DataQueryView/index.vue

@@ -191,6 +191,9 @@ onMounted(() => {
 })
 
 const keyWordsValidator = (rule: any, value: any, callback: any) => {
+  if (props.name == 'waybill') {
+    return true
+  }
   const searchTitle = searchTitleMap[props.name] ?? '关键词'
   if (!value) {
     if (['flight'].includes(props.name)) {

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

@@ -8,94 +8,44 @@
       </div>
     </template>
     <el-form ref="form" class="form" :model="formData">
-      <el-form-item
-        v-for="item in formItems"
-        :key="item.prop"
-        :prop="item.prop"
-        :label="item.label"
-        :style="{
+      <el-form-item v-for="item in formItems" :key="item.prop" :prop="item.prop" :label="item.label" :style="{
           width: item.width || '120px',
-        }"
-      >
+        }">
         <template v-if="item.inputType === 'input'">
-          <el-input
-            v-model="formData[item.prop]"
-            :size="item.size || 'small'"
-            :placeholder="item.placeholder || '请输入'"
-            :clearable="item.clearable"
-          />
+          <el-input v-model="formData[item.prop]" :size="item.size || 'small'" :placeholder="item.placeholder || '请输入'" :clearable="item.clearable" />
         </template>
         <template v-if="item.inputType === 'select'">
-          <el-select
-            v-model="formData[item.prop]"
-            :filterable="item.filterable"
-            :default-first-option="item.filterable"
-            :size="item.size || 'small'"
-            :placeholder="item.placeholder || '请选择'"
-            :multiple="item.multiple"
-            :collapse-tags="item.multiple"
-            :clearable="item.clearable"
-            :disabled="item.disabled"
-            @change="
+          <el-select v-model="formData[item.prop]" :filterable="item.filterable" :default-first-option="item.filterable" :size="item.size || 'small'" :placeholder="item.placeholder || '请选择'" :multiple="item.multiple" :collapse-tags="item.multiple" :clearable="item.clearable" :disabled="item.disabled" @change="
               (value) => {
                 item.changeHandler && call(item.changeHandler, value);
               }
-            "
-          >
-            <el-option
-              v-for="option in item.options"
-              :key="option.value"
-              :value="option.value"
-              :label="option.label"
-            />
+            ">
+            <el-option v-for="option in item.options" :key="option.value" :value="option.value" :label="option.label" />
           </el-select>
         </template>
         <template v-if="item.inputType === 'datePicker'">
-          <el-date-picker
-            v-model="formData[item.prop]"
-            :size="item.size || 'small'"
-            type="daterange"
-            value-format="YYYY-MM-DD"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          />
+          <el-date-picker v-model="formData[item.prop]" :size="item.size || 'small'" type="daterange" value-format="YYYY-MM-DD" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
         </template>
         <template v-if="item.inputType === 'datetimerange'">
-          <el-date-picker
-            v-model="formData[item.prop]"
-            type="datetimerange"
-            range-separator="至"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          >
+          <el-date-picker v-model="formData[item.prop]" type="datetimerange" range-separator="至" value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
           </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 v-if="item.haveDisabled">
+            <el-date-picker value-format="YYYY-MM-DD" v-model="formData[item.prop]" type="date" :disabled-date="item.disabledDate" placeholder="选择日期">
+            </el-date-picker>
+          </template>
+          <template v-else>
+            <el-date-picker value-format="YYYY-MM-DD" v-model="formData[item.prop]" type="date" placeholder="选择日期">
+            </el-date-picker>
+          </template>
         </template>
         <template v-if="item.inputType === 'cascader'">
-          <el-cascader
-            v-model="formData[item.prop]"
-            :size="item.size || 'small'"
-            :placeholder="item.placeholder || '请选择'"
-            :options="item.options"
-            :props="item.props"
-            :clearable="item.clearable"
-            :disabled="item.disabled"
-            @change="
+          <el-cascader v-model="formData[item.prop]" :size="item.size || 'small'" :placeholder="item.placeholder || '请选择'" :options="item.options" :props="item.props" :clearable="item.clearable" :disabled="item.disabled" @change="
               (value) => {
                 item.changeHandler && call(item.changeHandler, value);
               }
-            "
-          />
+            " />
         </template>
       </el-form-item>
       <el-form-item v-if="formItems.length">
@@ -104,20 +54,10 @@
         }}</el-button>
       </el-form-item>
       <el-form-item v-if="withExport">
-        <img
-          src="@/assets/nav/ic_export.png"
-          title="导出"
-          class="btn-icon-only"
-          @click="exportClickHandler"
-        />
+        <img src="@/assets/nav/ic_export.png" title="导出" class="btn-icon-only" @click="exportClickHandler" />
       </el-form-item>
       <el-form-item v-if="withSetting">
-        <img
-          src="@/assets/nav/ic_setting.png"
-          title="节点设置"
-          class="btn-icon-only"
-          @click="settingClickHandler"
-        />
+        <img src="@/assets/nav/ic_setting.png" title="节点设置" class="btn-icon-only" @click="settingClickHandler" />
       </el-form-item>
     </el-form>
   </div>
@@ -170,7 +110,7 @@ export default {
       default: true,
     },
   },
-  data() {
+  data () {
     return {
       picShow: true,
       formData: {
@@ -214,7 +154,7 @@ export default {
               label: "航站楼",
             },
           ],
-          changeHandler(value) {
+          changeHandler (value) {
             this.formData.inOrOut = "";
             // this.formData.interval = ''
             this.formData.area = "";
@@ -348,21 +288,21 @@ export default {
   },
   watch: {
     asShow: {
-      handler(val) {
+      handler (val) {
         // console.log(val);
       },
       deep: true,
       immediate: true,
     },
     items: {
-      handler(val) {
+      handler (val) {
         val && (this.formItems = val);
       },
       deep: true,
       immediate: true,
     },
     formData: {
-      handler(val) {
+      handler (val) {
         if (this.action === 14 || this.action === 2) {
           this.$emit("fore", val);
         }
@@ -371,21 +311,21 @@ export default {
       immediate: true,
     },
     data: {
-      handler(val) {
+      handler (val) {
         val && (this.formData = val);
       },
       deep: true,
       immediate: true,
     },
     eledata: {
-      handler(val) {
+      handler (val) {
         this.formData = {};
       },
       deep: true,
       immediate: true,
     },
     action: {
-      handler(val) {
+      handler (val) {
         this.picShow = true;
         if (val === 14 || val === 15) {
           this.formData.dateTime = [this.getDay(-7), this.getDay(0)];
@@ -395,7 +335,7 @@ export default {
       immediate: true,
     },
   },
-  created() {
+  created () {
     this.customItems.forEach((item) => {
       if (typeof item.itemIndex === "number") {
         if (item.prop) {
@@ -416,13 +356,13 @@ export default {
       }
     });
   },
-  mounted() {
+  mounted () {
     if (this.action == 14 || this.action == 15) {
       this.$emit("getFormData", this.formData);
     }
   },
   methods: {
-    getDay(day) {
+    getDay (day) {
       var today = new Date();
       var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;
       return Format(
@@ -430,18 +370,18 @@ export default {
         new Date(today.setTime(targetday_milliseconds))
       );
     },
-    picup() {
+    picup () {
       this.picShow = false;
       this.$emit("upset", this.picShow);
     },
-    picups() {
+    picups () {
       this.picShow = true;
       this.$emit("upset", this.picShow);
     },
-    call(func, ...args) {
+    call (func, ...args) {
       func.call(this, ...args);
     },
-    getData() {
+    getData () {
       try {
         this.formItems.forEach((item) => {
           if (
@@ -467,13 +407,13 @@ export default {
       }
       this.$emit("getFormData", this.formData);
     },
-    exportClickHandler() {
+    exportClickHandler () {
       this.$emit("export");
     },
-    settingClickHandler() {
+    settingClickHandler () {
       this.$emit("setting");
     },
-    setInOrOutOptions(range) {
+    setInOrOutOptions (range) {
       const theInOrOutItem = this.formItems.find(
         (item) => item.prop === "inOrOut"
       );
@@ -514,7 +454,7 @@ export default {
           break;
       }
     },
-    async getOptions(queryId, setKey, prop) {
+    async getOptions (queryId, setKey, prop) {
       try {
         const { code, returnData, message } = await Query({
           id: queryId,

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

@@ -307,8 +307,10 @@
           </el-table-column>
         </el-table>
       </template>
-      <SimpleTable v-show="tableList.length && action == 12" ref="tableRef" height="calc(100vh - 236px)" :data="tableList" :columns="tableColumn" :summary-method="totalOutPrice" :show-summary="tableProps.showSummary" :stripe="tableProps.stripe" :row-style="rowStyle" :header-row-style="rowStyle" :border="false" :header-cell-style="{ background: '#F9FAFC' }" @filterChange="selectionChange" />
-      <SimpleTable v-show="tableData.length && action == 13" ref="tableRef" height="calc(100vh - 236px)" :data="tableData" :columns="tableColumns" :summary-method="totalOutPrice" :show-summary="tableProps.showSummary" :stripe="tableProps.stripe" :row-style="rowStyle" :header-row-style="rowStyle" :border="false" :header-cell-style="{ background: '#F9FAFC' }" @filterChange="selectionChange" />
+      <template v-if="tableList.length && (action == 12 || action == 13)">
+        <SimpleTable v-show="tableList.length && action == 12" ref="tableRef" height="calc(100vh - 236px)" :data="tableList" :columns="tableColumn" :summary-method="totalOutPrice" :show-summary="tableProps.showSummary" :stripe="tableProps.stripe" :row-style="rowStyle" :header-row-style="rowStyle" :border="false" :header-cell-style="{ background: '#F9FAFC' }" @filterChange="selectionChange" />
+        <SimpleTable v-show="tableData.length && action == 13" ref="tableRef" height="calc(100vh - 236px)" :data="tableData" :columns="tableColumns" :summary-method="totalOutPrice" :show-summary="tableProps.showSummary" :stripe="tableProps.stripe" :row-style="rowStyle" :header-row-style="rowStyle" :border="false" :header-cell-style="{ background: '#F9FAFC' }" @filterChange="selectionChange" />
+      </template>
       <template v-if="tableData.length && action == 14">
         <el-table :data="tableData" style="width: 100%" :row-style="rowStyle" :header-row-style="rowStyle" :style="dataTableContentStyle" height="calc(100vh - 236px)" max-height="calc(100vh - 236px)" :stripe="tableProps.stripe" :row-key="tableProps.rowKey" :highlight-current-row="tableProps.highlightCurrentRow" :header-cell-class-name="tableProps.headerCellClassName" :tooltip-effect="tableProps.tooltipEffect" :summary-method="totalOutPrice" :show-summary="tableProps.showSummary" :header-cell-style="{ background: '#F9FAFC' }">
           <el-table-column prop="indexs" label="序号" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
@@ -401,6 +403,74 @@
           </el-table-column>
         </el-table>
       </template>
+      <template v-if="tableList.length && action == 18">
+        <el-table :data="tableList" style="width: 100%" :row-style="rowStyle" :header-row-style="rowStyle" :style="dataTableContentStyle" height="calc(100vh - 236px)" max-height="calc(100vh - 236px)" :stripe="tableProps.stripe" :row-key="tableProps.rowKey" :highlight-current-row="tableProps.highlightCurrentRow" :header-cell-class-name="tableProps.headerCellClassName" :tooltip-effect="tableProps.tooltipEffect" :summary-method="totalOutPrice" :show-summary="tableProps.showSummary" :header-cell-style="{ background: '#F9FAFC' }">
+          <el-table-column prop="flight_date" label="区域" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column prop="allflight" label="一级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column prop="allflight" label="二级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column label="航班异常" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+            <el-table-column label="航班总数" prop="allflight" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+            </el-table-column>
+            <el-table-column label="数据缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+              <el-table-column prop="havenot_allnode_flight" label="航班数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+              <el-table-column prop="havenot_allnode_lv" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+            </el-table-column>
+            <el-table-column label="流程节点缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+              <el-table-column prop="have_part_flight" label="航班数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+              <el-table-column prop="have_part_lv" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+            </el-table-column>
+            <el-table-column label="时间倒置" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+              <el-table-column prop="time_inversion_flight" label="航班数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+              <el-table-column prop="time_inversion_lv" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+            </el-table-column>
+            <el-table-column label="时间相同" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+              <el-table-column prop="time_equal_flight" label="航班数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+              <el-table-column prop="time_equal_lv" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="运单异常" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+            <el-table-column label="运单总数" prop="allflight" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+            </el-table-column>
+            <el-table-column label="数据缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+              <el-table-column prop="havenot_allnode_flight" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+              <el-table-column prop="havenot_allnode_lv" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+            </el-table-column>
+            <el-table-column label="流程节点缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+              <el-table-column prop="have_part_flight" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+              <el-table-column prop="have_part_lv" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+            </el-table-column>
+            <el-table-column label="时间倒置" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+              <el-table-column prop="time_inversion_flight" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+              <el-table-column prop="time_inversion_lv" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+            </el-table-column>
+            <el-table-column label="时间相同" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+              <el-table-column prop="time_equal_flight" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+              <el-table-column prop="time_equal_lv" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+            </el-table-column>
+          </el-table-column>
+        </el-table>
+      </template>
+      <template v-if="tableList.length && action == 19">
+        <el-table :data="tableList" style="width: 100%" :row-style="rowStyle" :header-row-style="rowStyle" :style="dataTableContentStyle" height="calc(100vh - 236px)" max-height="calc(100vh - 236px)" :stripe="tableProps.stripe" :row-key="tableProps.rowKey" :highlight-current-row="tableProps.highlightCurrentRow" :header-cell-class-name="tableProps.headerCellClassName" :tooltip-effect="tableProps.tooltipEffect" :summary-method="totalOutPrice" :show-summary="tableProps.showSummary" :header-cell-style="{ background: '#F9FAFC' }">
+          <el-table-column prop="indexs" label="航班号" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column prop="flightDate" label="运单号" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column prop="flightNO" label="指标分类" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column prop="stockCode" label="节点名称" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column prop="weight" label="节点时间" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column prop="stockCode" label="一级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column prop="weight" label="二级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+        </el-table>
+      </template>
     </div>
   </div>
 </template>

src/views/statisticalanalysis/dataException/views/detail.vue

@@ -0,0 +1,291 @@
+<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="tableToExcel('table')" @upset="upset" />
+    </div>
+    <div class="echart">
+      <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
+      <Tableformbrs ref="table" :tableList="tableList" :action="action" :set="set" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Echarts from "../../components/echart/index.vue";
+import Tableformbrs from "../../components/echart/tableforms.vue";
+import StatisticsHeader from "../../components/echart/statisticsHeader.vue";
+import { export_json_to_excel, exportToExcel } from "@/utils/Export2Excel";
+import { Query } from "@/api/webApi";
+import _ from 'lodash'
+export default {
+  name: "ChartsBar",
+  data () {
+    return {
+      asShow: false,
+      optiondata: [],
+      picShow: true, //图片表格切换
+      action: 19,
+      dataid: "collection_ecahrt1",
+      listqueryTemplateID: DATACONTENT_ID.modeFlightvolume,
+      eledata: 1,
+      set: "",
+      isShow: Echarts,
+      tableList: [],
+      tableListcop: [],
+      listname: "",
+      listHeader: [],
+      tableData: {
+        time: [],
+        data1: [],
+        data2: [],
+        kg: "",
+        tyol: "",
+      },
+      formData: {
+        flighttype: "",
+        dateTime: "",
+      },
+      titleTop: "节点明细统计",
+      levelList: [
+        {
+          name: "加货重量统计",
+        },
+        {
+          name: "航班量统计",
+        },
+        {
+          name: "特货统计",
+        },
+        {
+          name: "货量统计",
+        },
+        {
+          name: "拉货统计",
+        },
+        {
+          name: "国内进港保障时间统计",
+        },
+      ],
+      formItems: [
+        {
+          prop: "fttp",
+          inputType: "select",
+          placeholder: "国内国际",
+          requiredWarning: "请先选择国内国际",
+          clearable: true,
+          options: [
+            {
+              value: DATACONTENT_ID.dataGnDeparture,
+              label: "国内出港",
+            },
+            {
+              value: DATACONTENT_ID.dataGjDeparture,
+              label: "国际出港",
+            },
+            {
+              value: DATACONTENT_ID.dataGnArrival,
+              label: "国内进港",
+            },
+            {
+              value: DATACONTENT_ID.dataGjArrival,
+              label: "国际进港",
+            },
+          ],
+        },
+        {
+          prop: "flighttype",
+          inputType: "select",
+          placeholder: "客货类型",
+          requiredWarning: "请先选择客货类型",
+          clearable: true,
+          options: [
+            {
+              value: "客机",
+              label: "客机",
+            },
+            {
+              value: "货机",
+              label: "货机",
+            },
+            {
+              value: "全部",
+              label: "全部",
+            },
+          ],
+        },
+        {
+          prop: "dateTime",
+          inputType: "erdatime",
+          requiredWarning: "请先选择日期",
+          clearable: true,
+          width: "240px",
+          options: [],
+          haveDisabled: true,
+          disabledDate: function (time) {
+            return !(time.getTime() < Date.now() - 3600 * 1000 * 24)
+          }
+        },
+      ],
+    };
+  },
+  mounted () {
+    // this.getQuery([]);
+  },
+  watch: {
+    // 监听数据变化，重绘折线图
+    option: {
+      deep: true,
+      handler (newVal) { },
+    },
+  },
+  destroyed () { },
+  methods: {
+    getFormData (data) {
+      this.tableData.time = [];
+      this.tableData.data1 = [];
+      this.tableData.data2 = [];
+      let option = [
+        {
+          flighttype: data.flighttype,
+          fd1: data.dateTime,
+          fd2: data.dateTime
+        },
+      ];
+      this.getQuery(data.fttp, option, null);
+      let typeName = null
+      switch (data.fttp) {
+        case 52221:
+          typeName = '国内出港'
+          break;
+        case 52222:
+          typeName = '国内进港'
+          break;
+        case 52223:
+          typeName = '国际出港'
+          break;
+        case 52224:
+          typeName = '国际进港'
+          break;
+        default:
+          typeName = '国内出港'
+          break;
+      }
+      this.listname =
+        "航班统计" + '-' +
+        typeName + '-' +
+        data.flighttype + '-' +
+        data.dateTime;
+      this.listHeader = ["序号", "时间", "航班(班)", "环比(%)"];
+    },
+    //获取表格数据
+    async getQuery (id, data, dat) {
+      try {
+        const { code, returnData } = await Query({
+          id: Number(id),
+          dataContent: data,
+        });
+        if (code == 0) {
+          this.tableData.time = [];
+          this.tableData.data1 = [];
+          this.tableData.data2 = [];
+          this.tableList = _.cloneDeep(returnData);
+          this.tableListcop = _.cloneDeep(returnData);
+          // returnData.listValues.forEach((element) => {
+          //   this.tableData.data2.push(
+          //     element.flightNum ? element.flightNum : 0
+          //   );
+          //   this.tableData.time.push(element.dat);
+          //   this.tableData.kg = "单位：班";
+          //   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;
+          //       }
+          //     });
+          //   }
+          // }
+        } else {
+          console.log(code)
+        }
+      } catch (error) {
+        this.page--;
+      }
+    },
+    //导出
+    tableToExcel (refName) {
+      import("@/utils/Export2Excel").then((excel) => {
+        const table = this.$refs[refName].$el.cloneNode(true);
+        const fileName = `${this.listname}.xlsx`;
+        exportToExcel(table, '航班统计', fileName);
+      });
+    },
+    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: 52px;
+  }
+  .echart {
+    width: 100%;
+    height: 746px;
+    position: absolute;
+    background: #ffffff;
+    box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.1);
+    border-radius: 4px;
+  }
+}
+</style>

src/views/statisticalanalysis/dataException/views/dimension.vue

@@ -0,0 +1,291 @@
+<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="tableToExcel('table')" @upset="upset" />
+    </div>
+    <div class="echart">
+      <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
+      <Tableformbrs ref="table" :tableList="tableList" :action="action" :set="set" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Echarts from "../../components/echart/index.vue";
+import Tableformbrs from "../../components/echart/tableforms.vue";
+import StatisticsHeader from "../../components/echart/statisticsHeader.vue";
+import { export_json_to_excel, exportToExcel } from "@/utils/Export2Excel";
+import { Query } from "@/api/webApi";
+import _ from 'lodash'
+export default {
+  name: "ChartsBar",
+  data () {
+    return {
+      asShow: false,
+      optiondata: [],
+      picShow: true, //图片表格切换
+      action: 18,
+      dataid: "collection_ecahrt1",
+      listqueryTemplateID: DATACONTENT_ID.modeFlightvolume,
+      eledata: 1,
+      set: "",
+      isShow: Echarts,
+      tableList: [],
+      tableListcop: [],
+      listname: "",
+      listHeader: [],
+      tableData: {
+        time: [],
+        data1: [],
+        data2: [],
+        kg: "",
+        tyol: "",
+      },
+      formData: {
+        flighttype: "",
+        dateTime: "",
+      },
+      titleTop: "部门维度统计",
+      levelList: [
+        {
+          name: "加货重量统计",
+        },
+        {
+          name: "航班量统计",
+        },
+        {
+          name: "特货统计",
+        },
+        {
+          name: "货量统计",
+        },
+        {
+          name: "拉货统计",
+        },
+        {
+          name: "国内进港保障时间统计",
+        },
+      ],
+      formItems: [
+        {
+          prop: "fttp",
+          inputType: "select",
+          placeholder: "国内国际",
+          requiredWarning: "请先选择国内国际",
+          clearable: true,
+          options: [
+            {
+              value: DATACONTENT_ID.dataGnDeparture,
+              label: "国内出港",
+            },
+            {
+              value: DATACONTENT_ID.dataGjDeparture,
+              label: "国际出港",
+            },
+            {
+              value: DATACONTENT_ID.dataGnArrival,
+              label: "国内进港",
+            },
+            {
+              value: DATACONTENT_ID.dataGjArrival,
+              label: "国际进港",
+            },
+          ],
+        },
+        {
+          prop: "flighttype",
+          inputType: "select",
+          placeholder: "客货类型",
+          requiredWarning: "请先选择客货类型",
+          clearable: true,
+          options: [
+            {
+              value: "客机",
+              label: "客机",
+            },
+            {
+              value: "货机",
+              label: "货机",
+            },
+            {
+              value: "全部",
+              label: "全部",
+            },
+          ],
+        },
+        {
+          prop: "dateTime",
+          inputType: "erdatime",
+          requiredWarning: "请先选择日期",
+          clearable: true,
+          width: "240px",
+          options: [],
+          haveDisabled: true,
+          disabledDate: function (time) {
+            return !(time.getTime() < Date.now() - 3600 * 1000 * 24)
+          }
+        },
+      ],
+    };
+  },
+  mounted () {
+    // this.getQuery([]);
+  },
+  watch: {
+    // 监听数据变化，重绘折线图
+    option: {
+      deep: true,
+      handler (newVal) { },
+    },
+  },
+  destroyed () { },
+  methods: {
+    getFormData (data) {
+      this.tableData.time = [];
+      this.tableData.data1 = [];
+      this.tableData.data2 = [];
+      let option = [
+        {
+          flighttype: data.flighttype,
+          fd1: data.dateTime,
+          fd2: data.dateTime
+        },
+      ];
+      this.getQuery(data.fttp, option, null);
+      let typeName = null
+      switch (data.fttp) {
+        case 52221:
+          typeName = '国内出港'
+          break;
+        case 52222:
+          typeName = '国内进港'
+          break;
+        case 52223:
+          typeName = '国际出港'
+          break;
+        case 52224:
+          typeName = '国际进港'
+          break;
+        default:
+          typeName = '国内出港'
+          break;
+      }
+      this.listname =
+        "航班统计" + '-' +
+        typeName + '-' +
+        data.flighttype + '-' +
+        data.dateTime;
+      this.listHeader = ["序号", "时间", "航班(班)", "环比(%)"];
+    },
+    //获取表格数据
+    async getQuery (id, data, dat) {
+      try {
+        const { code, returnData } = await Query({
+          id: Number(id),
+          dataContent: data,
+        });
+        if (code == 0) {
+          this.tableData.time = [];
+          this.tableData.data1 = [];
+          this.tableData.data2 = [];
+          this.tableList = _.cloneDeep(returnData);
+          this.tableListcop = _.cloneDeep(returnData);
+          // returnData.listValues.forEach((element) => {
+          //   this.tableData.data2.push(
+          //     element.flightNum ? element.flightNum : 0
+          //   );
+          //   this.tableData.time.push(element.dat);
+          //   this.tableData.kg = "单位：班";
+          //   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;
+          //       }
+          //     });
+          //   }
+          // }
+        } else {
+          console.log(code)
+        }
+      } catch (error) {
+        this.page--;
+      }
+    },
+    //导出
+    tableToExcel (refName) {
+      import("@/utils/Export2Excel").then((excel) => {
+        const table = this.$refs[refName].$el.cloneNode(true);
+        const fileName = `${this.listname}.xlsx`;
+        exportToExcel(table, '航班统计', fileName);
+      });
+    },
+    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: 52px;
+  }
+  .echart {
+    width: 100%;
+    height: 746px;
+    position: absolute;
+    background: #ffffff;
+    box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.1);
+    border-radius: 4px;
+  }
+}
+</style>

src/views/statisticalanalysis/dataException/views/flight.vue

@@ -1,11 +1,11 @@
 <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="tableToExcel" @upset="upset" />
+      <StatisticsHeader :title="titleTop" :items="formItems" :data="formData" :eledata="eledata" with-setting :withSetting="false" :withExport="true" :set="set" :action="action" :asShow="asShow" @getFormData="getFormData" @export="tableToExcel('table')" @upset="upset" />
     </div>
     <div class="echart">
-      <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" />
-      <Tableformbrs :tableList="tableList" :action="action" v-if="!picShow" :set="set" />
+      <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
+      <Tableformbrs ref="table" :tableList="tableList" :action="action" :set="set" />
     </div>
   </div>
 </template>
@@ -14,14 +14,14 @@
 import Echarts from "../../components/echart/index.vue";
 import Tableformbrs from "../../components/echart/tableforms.vue";
 import StatisticsHeader from "../../components/echart/statisticsHeader.vue";
-import { export_json_to_excel } from "@/utils/Export2Excel";
+import { export_json_to_excel, exportToExcel } from "@/utils/Export2Excel";
 import { Query } from "@/api/webApi";
 import _ from 'lodash'
 export default {
   name: "ChartsBar",
   data () {
     return {
-      asShow: true,
+      asShow: false,
       optiondata: [],
       picShow: true, //图片表格切换
       action: 16,
@@ -115,11 +115,15 @@ export default {
         },
         {
           prop: "dateTime",
-          inputType: "datePicker",
+          inputType: "erdatime",
           requiredWarning: "请先选择日期",
           clearable: true,
           width: "240px",
           options: [],
+          haveDisabled: true,
+          disabledDate: function (time) {
+            return !(time.getTime() < Date.now() - 3600 * 1000 * 24)
+          }
         },
       ],
     };
@@ -143,15 +147,34 @@ export default {
       let option = [
         {
           flighttype: data.flighttype,
-          fd1: data.dateTime[0],
-          fd2: data.dateTime[1]
+          fd1: data.dateTime,
+          fd2: data.dateTime
         },
       ];
       this.getQuery(data.fttp, option, null);
+      let typeName = null
+      switch (data.fttp) {
+        case 52221:
+          typeName = '国内出港'
+          break;
+        case 52222:
+          typeName = '国内进港'
+          break;
+        case 52223:
+          typeName = '国际出港'
+          break;
+        case 52224:
+          typeName = '国际进港'
+          break;
+        default:
+          typeName = '国内出港'
+          break;
+      }
       this.listname =
-        "航班统计" +
-        data.flighttype +
-        data.fd;
+        "航班统计" + '-' +
+        typeName + '-' +
+        data.flighttype + '-' +
+        data.dateTime;
       this.listHeader = ["序号", "时间", "航班(班)", "环比(%)"];
     },
     //获取表格数据
@@ -201,30 +224,11 @@ export default {
       }
     },
     //导出
-    tableToExcel () {
+    tableToExcel (refName) {
       import("@/utils/Export2Excel").then((excel) => {
-        // 设置导出表格的头部
-        const tHeader = this.listHeader;
-        // 将要导出的数据进行一个过滤
-        /**
-         * 源数据导入到excel的数据每一条重新拼成一个数组,数组里的每个元素就是filterVal里的每个字段
-         */
-        const data = this.tableListcop.map((item, index, arr) => {
-          return [item.indexs, item.dat, item.flightNum, index < arr.length - 1 ? `${item.flightChain ?? 0}%` : ''];
-        });
-        // 调用我们封装好的方法进行导出Excel
-        excel.export_json_to_excel({
-          // 导出的头部
-          header: tHeader,
-          // 导出的内容
-          data,
-          // 导出的文件名称
-          filename: this.listname,
-          // 导出的表格宽度是否自动
-          autoWidth: true,
-          // 导出文件的后缀类型
-          bookType: "xlsx",
-        });
+        const table = this.$refs[refName].$el.cloneNode(true);
+        const fileName = `${this.listname}.xlsx`;
+        exportToExcel(table, '航班统计', fileName);
       });
     },
     upset (data) {

src/views/statisticalanalysis/dataException/views/waybill.vue

@@ -1,11 +1,11 @@
 <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="tableToExcel" @upset="upset" />
+      <StatisticsHeader :title="titleTop" :items="formItems" :data="formData" :eledata="eledata" with-setting :withSetting="false" :withExport="true" :set="set" :action="action" :asShow="asShow" @getFormData="getFormData" @export="tableToExcel('table')" @upset="upset" />
     </div>
     <div class="echart">
-      <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" />
-      <Tableformbrs :tableList="tableList" :action="action" v-if="!picShow" :set="set" />
+      <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
+      <Tableformbrs ref="table" :tableList="tableList" :action="action" :set="set" />
     </div>
   </div>
 </template>
@@ -14,14 +14,14 @@
 import Echarts from "../../components/echart/index.vue";
 import Tableformbrs from "../../components/echart/tableforms.vue";
 import StatisticsHeader from "../../components/echart/statisticsHeader.vue";
-import { export_json_to_excel } from "@/utils/Export2Excel";
+import { export_json_to_excel, exportToExcel } from "@/utils/Export2Excel";
 import { Query } from "@/api/webApi";
 import _ from 'lodash'
 export default {
   name: "ChartsBar",
   data () {
     return {
-      asShow: true,
+      asShow: false,
       optiondata: [],
       picShow: true, //图片表格切换
       action: 17,
@@ -115,11 +115,15 @@ export default {
         },
         {
           prop: "dateTime",
-          inputType: "datePicker",
+          inputType: "erdatime",
           requiredWarning: "请先选择日期",
           clearable: true,
           width: "240px",
           options: [],
+          haveDisabled: true,
+          disabledDate: function (time) {
+            return !(time.getTime() < Date.now() - 3600 * 1000 * 24)
+          }
         },
       ],
     };
@@ -143,15 +147,34 @@ export default {
       let option = [
         {
           flighttype: data.flighttype,
-          fd1: data.dateTime[0],
-          fd2: data.dateTime[1]
+          fd1: data.dateTime,
+          fd2: data.dateTime
         },
       ];
       this.getQuery(data.fttp, option, null);
+      let typeName = null
+      switch (data.fttp) {
+        case 52225:
+          typeName = '国内出港'
+          break;
+        case 52226:
+          typeName = '国内进港'
+          break;
+        case 52227:
+          typeName = '国际出港'
+          break;
+        case 52228:
+          typeName = '国际进港'
+          break;
+        default:
+          typeName = '国内出港'
+          break;
+      }
       this.listname =
-        "航班统计" +
-        data.flighttype +
-        data.fd;
+        "运单统计" + '-' +
+        typeName + '-' +
+        data.flighttype + '-' +
+        data.dateTime;
       this.listHeader = ["序号", "时间", "航班(班)", "环比(%)"];
     },
     //获取表格数据
@@ -201,29 +224,12 @@ export default {
       }
     },
     //导出
-    tableToExcel () {
+    tableToExcel (refName) {
       import("@/utils/Export2Excel").then((excel) => {
-        // 设置导出表格的头部
-        const tHeader = this.listHeader;
-        // 将要导出的数据进行一个过滤
-        /**
-         * 源数据导入到excel的数据每一条重新拼成一个数组,数组里的每个元素就是filterVal里的每个字段
-         */
-        const data = this.tableListcop.map((item, index, arr) => {
-          return [item.indexs, item.dat, item.flightNum, index < arr.length - 1 ? `${item.flightChain ?? 0}%` : ''];
-        });
-        // 调用我们封装好的方法进行导出Excel
-        excel.export_json_to_excel({
-          // 导出的头部
-          header: tHeader,
-          // 导出的内容
-          data,
-          // 导出的文件名称
-          filename: this.listname,
-          // 导出的表格宽度是否自动
-          autoWidth: true,
-          // 导出文件的后缀类型
-          bookType: "xlsx",
+        import("@/utils/Export2Excel").then((excel) => {
+          const table = this.$refs[refName].$el.cloneNode(true);
+          const fileName = `${this.listname}.xlsx`;
+          exportToExcel(table, '运单统计', fileName);
         });
       });
     },

src/views/systemSettings/log/index.vue

@@ -29,7 +29,7 @@
       <el-row :gutter="24">
         <el-col :span="19">
           <div class="app-containers">
-            <DataTable :table-header="tableColumns" :table-data="tableData" :table-property="{ rowKey: 'ID' }" @load="load" @row-click="rowClickHandler" />
+            <DataTable :table-header="tableColumns" :table-data="tableData" :table-property="{ rowKey: 'ID' }" @row-click="rowClickHandler" />
           </div>
         </el-col>
         <el-col :span="5">
@@ -99,7 +99,7 @@ const getTableData = async () => {
       returnData: { columnSet, listValues },
     } = await Query({
       id: DATACONTENT_ID.sysLogTable,
-      needPage: ++page,
+      // needPage: ++page,
       dataContent:
         selMsg.value == "系统"
           ? [timeStart.value, timeEnd.value, selMsg.value, resMsg.value]
@@ -115,7 +115,8 @@ const getTableData = async () => {
         page--;
         noMore.value = true;
       }
-      tableData.value.push(...listValues);
+      // tableData.value.push(...listValues);
+      tableData.value = [...listValues];
       loading.value = false;
     } else {
       throw new Error("获取数据失败");

src/views/userManagement/account/index.vue

@@ -34,8 +34,14 @@
         </el-form-item>
         <el-form-item label="是否启用" :rules="[{required: true,message: '请选择是否启用',trigger: 'change',}]" prop="user_status">
           <el-radio-group v-model="ruleForm.user_status">
-            <el-radio :label="ruleForm.user_status || 2">启用</el-radio>
-            <el-radio :label="0">禁用</el-radio>
+            <template v-if="(typeof ruleForm.user_status) == 'number'">
+              <el-radio :label="ruleForm.user_status || 2">启用</el-radio>
+              <el-radio :label="0">禁用</el-radio>
+            </template>
+            <template v-else>
+              <el-radio :label="ruleForm.user_status || '2'">启用</el-radio>
+              <el-radio label="0">禁用</el-radio>
+            </template>
           </el-radio-group>
         </el-form-item>
       </el-form>