节点统计修改

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

@@ -352,19 +352,19 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="数据缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          <el-table-column label="数据缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
             <el-table-column prop="havenot_allnode_flight" label="航班数" class-name="cell-click" 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 label="流程节点缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
             <el-table-column prop="have_part_flight" class-name="cell-click" 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 label="时间倒置" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
             <el-table-column prop="time_inversion_flight" class-name="cell-click" 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 label="时间相同" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
             <el-table-column prop="time_equal_flight" class-name="cell-click" 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>
@@ -381,20 +381,20 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="数据缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          <el-table-column label="数据缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
             <el-table-column prop="havenot_allnode_stock" class-name="cell-click" 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 label="流程节点缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
             <el-table-column prop="have_part_stock" class-name="cell-click" 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 label="时间倒置" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
             <el-table-column prop="time_inversion_stock" class-name="cell-click" 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 label="时间相同" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
             <el-table-column prop="time_equal_stock" class-name="cell-click" 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>
@@ -411,19 +411,19 @@
           <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 label="数据缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
               <el-table-column prop="havenot_allnode_flight" class-name="cell-click" label="航班数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
               <el-table-column prop="havenot_allnode_lv_flight" 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 label="流程节点缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
               <el-table-column prop="have_part_flight" class-name="cell-click" label="航班数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
               <el-table-column prop="have_part_lv_flight" 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 label="时间倒置" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
               <el-table-column prop="time_inversion_flight" class-name="cell-click" label="航班数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
               <el-table-column prop="time_inversion_lv_flight" 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 label="时间相同" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
               <el-table-column prop="time_equal_flight" class-name="cell-click" label="航班数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
               <el-table-column prop="time_equal_lv_flight" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
             </el-table-column>
@@ -441,19 +441,19 @@
           <el-table-column label="运单异常" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
             <el-table-column label="运单总数" prop="allstock" :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="数据缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
               <el-table-column prop="havenot_allnode_stock" class-name="cell-click" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
               <el-table-column prop="havenot_allnode_lv_stock" 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 label="流程节点缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
               <el-table-column prop="have_part_stock" class-name="cell-click" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
               <el-table-column prop="have_part_lv_stock" 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 label="时间倒置" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
               <el-table-column prop="time_inversion_stock" class-name="cell-click" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
               <el-table-column prop="time_inversion_lv_stock" 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 label="时间相同" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align" :render-header="renderHeader">
               <el-table-column prop="time_equal_stock" class-name="cell-click" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
               <el-table-column prop="time_equal_lv_stock" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
             </el-table-column>
@@ -461,6 +461,26 @@
         </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" :header-cell-style="{ background: '#F9FAFC' }">
+          <el-table-column prop="flight_all_no" label="航班号" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column prop="flight_date" label="航班日期" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <!-- <el-table-column prop="stock_code" label="运单号" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column> -->
+          <el-table-column prop="index_class" label="指标分类" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column prop="node" label="节点名称" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column prop="execT" label="节点时间" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column prop="department" label="一级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+          <el-table-column prop="second_department" label="二级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          </el-table-column>
+        </el-table>
+      </template>
+      <template v-if="tableList.length && action == 21">
         <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" :header-cell-style="{ background: '#F9FAFC' }">
           <el-table-column prop="flight_all_no" label="航班号" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
           </el-table-column>
@@ -486,6 +506,16 @@
 
 <script>
 import SimpleTable from "@/components/SimpleTable/index.vue";
+import Toolstip from './tooltip.vue'
+import { h } from 'vue'
+
+const vnode = h(
+  'div', // type
+  { id: 'foo', class: 'bar' }, // props
+  [
+    /* children */
+  ]
+)
 export default {
   props: {
     tableList: {
@@ -507,6 +537,10 @@ export default {
     searchParams: {
       type: Object,
       default: () => { },
+    },
+    sortMsg: {
+      type: Array,
+      default: () => [],
     }
   },
   data () {
@@ -668,6 +702,7 @@ export default {
         pcsall: 0,
       },
       capLen: null,
+      tableSortMsg: []
     };
   },
   watch: {
@@ -678,6 +713,13 @@ export default {
       deep: true,
       immediate: true,
     },
+    sortMsg: {
+      handler (val) {
+        this.tableSortMsg = val;
+      },
+      deep: true,
+      immediate: true,
+    }
   },
   computed: {
     dataTableContentStyle () {
@@ -1000,6 +1042,14 @@ export default {
         }
       }
     },
+    renderHeader ({ column, $index }) {
+      return h('div', [
+        h(Toolstip, {
+          sortmsg: this.tableSortMsg[$index - 1],
+          property: column.label
+        })
+      ])
+    }
     //滚动分页加载
     // load  () {
     //   this.$emit("load", true);
@@ -1007,6 +1057,7 @@ export default {
   },
   components: {
     SimpleTable,
+    Toolstip
   },
 };
 </script>

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

@@ -0,0 +1,22 @@
+<template>
+  <div class="tooltip">
+    <el-tooltip effect="dark" placement="top" :content="sortmsg">
+      <span>{{ property }}</span>
+    </el-tooltip>
+  </div>
+</template>
+<script>
+export default {
+  name: 'promptMessages',
+  props: {
+    property: {
+      type: String,
+      default: ''
+    },
+    sortmsg: {
+      type: String,
+      default: ''
+    }
+  }
+};
+</script>

src/views/statisticalanalysis/dataException/components/page-head.vue

@@ -0,0 +1,288 @@
+<template>
+  <div class="flight-statistics-header">
+    <template v-if="title">
+      <div class="title">{{ title }}</div>
+    </template>
+    <el-form ref="form" class="form" :model="formData">
+      <el-form-item v-for="item in items" :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" />
+        </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="
+              (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-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="结束日期" />
+        </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>
+        </template>
+        <template v-if="item.inputType === 'erdatime'">
+          <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="
+              (value) => {
+                item.changeHandler && call(item.changeHandler, value);
+              }
+            " />
+        </template>
+      </el-form-item>
+      <el-form-item v-if="items.length">
+        <el-button type="primary" size="small" @click="getData">{{
+          buttonText
+        }}</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" />
+      </el-form-item>
+      <el-form-item v-if="withSetting">
+        <img src="@/assets/nav/ic_setting.png" title="节点设置" class="btn-icon-only" @click="settingClickHandler" />
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Pagehead',
+  props: {
+    title: {
+      type: String,
+      default: "",
+    },
+    items: {
+      type: Array,
+      default: () => [],
+    },
+    data: {
+      type: Object,
+      default: () => { },
+    },
+    buttonText: {
+      type: String,
+      default: "查询",
+    },
+    withExport: {
+      type: Boolean,
+      default: true,
+    },
+    withSetting: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data () {
+    return {
+      formData: {},
+    }
+  },
+  watch: {
+    data: {
+      handler (val) {
+        val && (this.formData = val);
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  methods: {
+    getData () {
+      try {
+        this.items.forEach((item) => {
+          if (
+            item.requiredWarning &&
+            (!this.formData[item.prop] || this.formData[item.prop].length === 0)
+          ) {
+            throw new Error(item.requiredWarning);
+          }
+        });
+      } catch (error) {
+        this.$message.warning(error.message);
+        return;
+      }
+      this.$emit("getFormData", this.formData);
+    },
+    exportClickHandler () {
+      this.$emit("export");
+    },
+    settingClickHandler () {
+      this.$emit("setting");
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.flight-statistics-header {
+  // padding-top: 24px;
+  // min-height: 80px;
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  position: relative;
+  .status {
+    position: absolute;
+    left: 144px;
+    display: flex;
+    align-items: center;
+    > .st_pic {
+      width: 32px;
+      height: 32px;
+      border-radius: 4px;
+      background: url("../../../../assets/nav/ic_table_default.png") no-repeat;
+      background-size: 100% 100%;
+      margin-right: 8px;
+      cursor: pointer;
+    }
+    > .st_pics {
+      width: 32px;
+      height: 32px;
+      border-radius: 4px;
+      background: url("../../../../assets/nav/ic_table_check.png") no-repeat;
+      background-size: 100% 100%;
+      margin-right: 8px;
+      cursor: pointer;
+    }
+    > .st_tab {
+      width: 32px;
+      height: 32px;
+      border-radius: 4px;
+      background: url("../../../../assets/nav/ic_chart_default.png") no-repeat;
+      background-size: 100% 100%;
+      cursor: pointer;
+    }
+    > .st_tabs {
+      width: 32px;
+      height: 32px;
+      border-radius: 4px;
+      background: url("../../../../assets/nav/ic_chart_check.png") no-repeat;
+      background-size: 100% 100%;
+      cursor: pointer;
+    }
+  }
+  .title {
+    margin-right: 24px;
+    padding-left: 16px;
+    // min-width: 190px;
+    height: 32px;
+    line-height: 32px;
+    font-size: 18px;
+    font-family: Helvetica, "Microsoft YaHei";
+    font-weight: bold;
+    white-space: nowrap;
+    position: relative;
+    &::before {
+      content: "";
+      width: 4px;
+      height: 20px;
+      background: #ac014d;
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      margin: auto;
+    }
+  }
+  ::v-deep .form {
+    display: flex;
+    flex-wrap: wrap;
+    > .el-form-item {
+      margin-bottom: 24px;
+      // width: 185px;
+      &:not(:last-child) {
+        margin-right: 8px;
+      }
+      &:nth-last-child(2),
+      &:nth-last-child(3) {
+        margin-right: 16px;
+      }
+      .el-form-item__content {
+        height: 32px;
+        line-height: 30px;
+        .el-input {
+          &.is-disabled .el-input__inner {
+            border: none;
+          }
+          .el-input__inner {
+            border-radius: 4px;
+            font-family: Helvetica, "Microsoft YaHei";
+            color: #303133;
+            border-color: #ffffff;
+            &:hover {
+              border-color: #c0c4cc;
+            }
+            &:focus {
+              border-color: #409eff;
+            }
+          }
+        }
+        .el-date-editor--daterange.el-input,
+        .el-date-editor--daterange.el-input__inner,
+        .el-date-editor--timerange.el-input,
+        .el-date-editor--timerange.el-input__inner {
+          width: 100%;
+          border-radius: 4px;
+          border-color: #ffffff;
+          color: #303133;
+          font-family: Helvetica, "Microsoft YaHei";
+          &:hover {
+            border-color: #c0c4cc;
+          }
+          &.is-active {
+            border-color: #409eff;
+          }
+          .el-input__icon {
+            color: #303133;
+          }
+          .el-range-separator {
+            line-height: 28px;
+          }
+        }
+        .el-select,
+        .el-cascader {
+          .el-input {
+            .el-icon-arrow-up::before {
+              content: "\e78f";
+            }
+            .el-icon-arrow-down::before {
+              content: "\e790";
+            }
+            &:not(.is-disabled) {
+              .el-input__icon,
+              .el-input__inner::-webkit-input-placeholder {
+                color: #303133;
+              }
+            }
+          }
+        }
+        .el-button {
+          border-radius: 4px;
+          font-family: Helvetica, "Microsoft YaHei";
+        }
+        .btn-icon-only {
+          width: 24px;
+          height: 24px;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+}
+</style>

src/views/statisticalanalysis/dataException/func/index.js

@@ -0,0 +1,9 @@
+export function setSortMsg (name) {
+  const sortMap = {
+    '国内出港': ['有预配载数据，无交接复核、机下交接、装机、关闭舱门数据', '有预配，1、有核单数据、无安检节点数据，2、机下交接数据、装机、关闭舱门（其中一项）、无交接复核数据', '有预配载，交接复核时间>机下交接', '有预配载，机下交接时间=装机完成时间'],
+    '国内进港': ['', '有理货数据，1、无卸机数据，2、无库区到达，3、无货站交接', '有理货数据，卸机时间>库区达到', '有理货数据，卸机时间=库区时间'],
+    '国际出港': ['有实配，交接复核、机下交接、装机、关闭舱门全无', '有实配、机下交接数据，无交接复核数据', '有实配，交接复核时间>机下交接时间', '有实配，机下交接=装机完成时间'],
+    '国际进港': ['', '有理货数据，1、无卸机数据、2、无货站交接', '', '有理货数据，卸机完成时间=货站交接时间']
+  }
+  return sortMap[name]
+}

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

@@ -1,7 +1,7 @@
 <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" @fore="fore" />
+      <StatisticsHeader :title="titleTop" :items="formItems" :data="formData" with-setting :withSetting="false" :withExport="true" :action="action" @getFormData="getFormData" @export="tableToExcel('table')" />
     </div>
     <div v-loading="loading" element-loading-text="数据加载中..." class="echart">
       <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
@@ -34,7 +34,7 @@
 <script>
 import Echarts from "../../components/echart/index.vue";
 import Tableformbrs from "../../components/echart/tableforms.vue";
-import StatisticsHeader from "../../components/echart/statisticsHeader.vue";
+import StatisticsHeader from "../components/page-head.vue";
 import { export_json_to_excel, exportToExcel } from "@/utils/Export2Excel";
 import { Query } from "@/api/webApi";
 import _ from 'lodash'
@@ -67,9 +67,9 @@ export default {
       },
       formData: {
         fttpId: "",
-        fttype: "",
-        fttp: "",
-        flighttype: "",
+        fttype: "全部",
+        fttp: "全部",
+        flighttype: "全部",
         flightno: "",
         dateTime: "",
       },
@@ -103,7 +103,7 @@ export default {
           clearable: true,
           options: [
             {
-              value: DATACONTENT_ID.detailGnDeparture,
+              value: DATACONTENT_ID.detailGnDepartureWay,
               label: "国内出港",
             },
             {
@@ -175,6 +175,22 @@ export default {
           placeholder: "二级部门",
           clearable: true,
           options: [
+            {
+              label: '货邮检查一大队',
+              value: '货邮检查一大队'
+            },
+            {
+              label: '运输部（万事通）',
+              value: '运输部（万事通）'
+            },
+            {
+              label: '装卸部（美华）',
+              value: '装卸部（美华）'
+            },
+            {
+              value: "全部",
+              label: "全部",
+            },
           ],
         },
         {
@@ -216,7 +232,7 @@ export default {
         this.formData.fttype = flighttype
         this.formData.dateTime = [fd1, fd2]
         this.listname =
-          "运单节点明细统计" + '-' +
+          "航班节点明细统计" + '-' +
           typeName + '-' +
           fd1 + '-' + fd2
         this.getQuery(fttpId, option, null)
@@ -229,6 +245,7 @@ export default {
       deep: true,
       handler (newVal) {
         const { fttpId, fttp, flighttype, flightno } = newVal
+        this.fore(newVal)
         if (flightno) {
           let datas = []
           if (fttp && !flighttype) {
@@ -314,7 +331,7 @@ export default {
       this.getQuery(data.fttpId, option, null);
       let typeName = null
       switch (data.fttpId) {
-        case 52233:
+        case 52238:
           typeName = '国内出港'
           break;
         case 52234:
@@ -331,7 +348,7 @@ export default {
           break;
       }
       this.listname =
-        "运单节点明细统计" + '-' +
+        "航班节点明细统计" + '-' +
         typeName + '-' +
         data.dateTime[0] + '-' + data.dateTime[1]
       this.listHeader = ["序号", "时间", "航班(班)", "环比(%)"];
@@ -343,7 +360,7 @@ export default {
     },
     fore (data) {
       switch (data.fttpId) {
-        case 52233:
+        case 52238:
           this.formItems[3].options = [
             {
               label: '货邮检查一大队',

src/views/statisticalanalysis/dataException/views/detailWay.vue

@@ -1,7 +1,7 @@
 <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" @fore="fore" />
+      <StatisticsHeader :title="titleTop" :items="formItems" :data="formData" with-setting :withSetting="false" :withExport="true" :action="action" @getFormData="getFormData" @export="tableToExcel('table')" />
     </div>
     <div v-loading="loading" element-loading-text="数据加载中..." class="echart">
       <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
@@ -34,7 +34,7 @@
 <script>
 import Echarts from "../../components/echart/index.vue";
 import Tableformbrs from "../../components/echart/tableforms.vue";
-import StatisticsHeader from "../../components/echart/statisticsHeader.vue";
+import StatisticsHeader from "../components/page-head.vue";
 import { export_json_to_excel, exportToExcel } from "@/utils/Export2Excel";
 import { Query } from "@/api/webApi";
 import _ from 'lodash'
@@ -46,7 +46,7 @@ export default {
       asShow: false,
       optiondata: [],
       picShow: true, //图片表格切换
-      action: 19,
+      action: 21,
       dataid: "collection_ecahrt1",
       listqueryTemplateID: DATACONTENT_ID.modeFlightvolume,
       eledata: 1,
@@ -67,9 +67,9 @@ export default {
       },
       formData: {
         fttpId: "",
-        fttype: "",
-        fttp: "",
-        flighttype: "",
+        fttype: "全部",
+        fttp: "全部",
+        flighttype: "全部",
         flightno: "",
         dateTime: "",
       },
@@ -103,21 +103,21 @@ export default {
           clearable: true,
           options: [
             {
-              value: DATACONTENT_ID.detailGnDepartureWay,
+              value: DATACONTENT_ID.detailGnDeparture,
               label: "国内出港",
             },
-            // {
-            //   value: DATACONTENT_ID.detailGjDeparture,
-            //   label: "国际出港",
-            // },
-            // {
-            //   value: DATACONTENT_ID.detailGnArrival,
-            //   label: "国内进港",
-            // },
-            // {
-            //   value: DATACONTENT_ID.detailGjArrival,
-            //   label: "国际进港",
-            // },
+            {
+              value: DATACONTENT_ID.detailGjDeparture,
+              label: "国际出港",
+            },
+            {
+              value: DATACONTENT_ID.detailGnArrival,
+              label: "国内进港",
+            },
+            {
+              value: DATACONTENT_ID.detailGjArrival,
+              label: "国际进港",
+            },
           ],
         },
         {
@@ -175,6 +175,22 @@ export default {
           placeholder: "二级部门",
           clearable: true,
           options: [
+            {
+              label: '货邮检查一大队',
+              value: '货邮检查一大队'
+            },
+            {
+              label: '运输部（万事通）',
+              value: '运输部（万事通）'
+            },
+            {
+              label: '装卸部（美华）',
+              value: '装卸部（美华）'
+            },
+            {
+              value: "全部",
+              label: "全部",
+            },
           ],
         },
         {
@@ -229,6 +245,7 @@ export default {
       deep: true,
       handler (newVal) {
         const { fttpId, fttp, flighttype, flightno } = newVal
+        this.fore(newVal)
         if (flightno) {
           let datas = []
           if (fttp && !flighttype) {

src/views/statisticalanalysis/dataException/views/dimension.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('table')" @upset="upset" />
+      <StatisticsHeader :title="titleTop" :items="formItems" :data="formData" with-setting :withSetting="false" :withExport="true" @getFormData="getFormData" @export="tableToExcel('table')" />
     </div>
     <div v-loading="loading" element-loading-text="数据加载中..." class="echart">
       <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
-      <Tableformbrs ref="table" :searchParams="searchParams" :tableList="tableList" :action="action" :set="set" />
+      <Tableformbrs ref="table" :searchParams="searchParams" :tableList="tableList" :sort-msg="tableSortMsg" :action="action" :set="set" />
     </div>
   </div>
 </template>
@@ -13,9 +13,10 @@
 <script>
 import Echarts from "../../components/echart/index.vue";
 import Tableformbrs from "../../components/echart/tableforms.vue";
-import StatisticsHeader from "../../components/echart/statisticsHeader.vue";
+import StatisticsHeader from "../components/page-head.vue";
 import { export_json_to_excel, exportToExcel } from "@/utils/Export2Excel";
 import { Query } from "@/api/webApi";
+import { setSortMsg } from '../func'
 import _ from 'lodash'
 export default {
   name: "ChartsBar",
@@ -43,7 +44,7 @@ export default {
       },
       loading: false,
       formData: {
-        flighttype: "",
+        flighttype: "全部",
         dateTime: "",
       },
       titleTop: "航班部门维度统计",
@@ -124,7 +125,8 @@ export default {
         },
       ],
       newObj: {},
-      searchParams: null
+      searchParams: null,
+      tableSortMsg: []
     };
   },
   mounted () {
@@ -170,6 +172,7 @@ export default {
           typeName = '国内出港'
           break;
       }
+      this.tableSortMsg = setSortMsg(typeName)
       this.searchParams = {
         typeName,
         flighttype: data.flighttype,

src/views/statisticalanalysis/dataException/views/dimensionWay.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('table')" @upset="upset" />
+      <StatisticsHeader :title="titleTop" :items="formItems" :data="formData" with-setting :withSetting="false" :withExport="true" @getFormData="getFormData" @export="tableToExcel('table')" />
     </div>
     <div v-loading="loading" element-loading-text="数据加载中..." class="echart">
       <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
-      <Tableformbrs ref="table" :searchParams="searchParams" :tableList="tableList" :action="action" :set="set" />
+      <Tableformbrs ref="table" :searchParams="searchParams" :tableList="tableList" :sort-msg="tableSortMsg" :action="action" :set="set" />
     </div>
   </div>
 </template>
@@ -13,9 +13,10 @@
 <script>
 import Echarts from "../../components/echart/index.vue";
 import Tableformbrs from "../../components/echart/tableforms.vue";
-import StatisticsHeader from "../../components/echart/statisticsHeader.vue";
+import StatisticsHeader from "../components/page-head.vue";
 import { export_json_to_excel, exportToExcel } from "@/utils/Export2Excel";
 import { Query } from "@/api/webApi";
+import { setSortMsg } from '../func'
 import _ from 'lodash'
 export default {
   name: "ChartsBar",
@@ -124,7 +125,8 @@ export default {
         },
       ],
       newObj: {},
-      searchParams: null
+      searchParams: null,
+      tableSortMsg: []
     };
   },
   mounted () {
@@ -170,6 +172,7 @@ export default {
           typeName = '国内出港'
           break;
       }
+      this.tableSortMsg = setSortMsg(typeName)
       this.searchParams = {
         typeName,
         flighttype: data.flighttype,

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('table')" @upset="upset" />
+      <StatisticsHeader :title="titleTop" :items="formItems" :data="formData" with-setting :withSetting="false" :withExport="true" @getFormData="getFormData" @export="tableToExcel('table')" />
     </div>
     <div v-loading="loading" element-loading-text="数据加载中..." class="echart">
       <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
-      <Tableformbrs ref="table" :searchParams="searchParams" :tableList="tableList" :action="action" :set="set" />
+      <Tableformbrs ref="table" :searchParams="searchParams" :tableList="tableList" :sort-msg="tableSortMsg" :action="action" :set="set" />
     </div>
   </div>
 </template>
@@ -13,9 +13,10 @@
 <script>
 import Echarts from "../../components/echart/index.vue";
 import Tableformbrs from "../../components/echart/tableforms.vue";
-import StatisticsHeader from "../../components/echart/statisticsHeader.vue";
+import StatisticsHeader from "../components/page-head.vue";
 import { export_json_to_excel, exportToExcel } from "@/utils/Export2Excel";
 import { Query } from "@/api/webApi";
+import { setSortMsg } from '../func'
 import _ from 'lodash'
 export default {
   name: "ChartsBar",
@@ -43,8 +44,9 @@ export default {
         tyol: "",
       },
       formData: {
-        flighttype: "",
+        flighttype: "全部",
         dateTime: "",
+        fttp: ""
       },
       titleTop: "航班统计",
       levelList: [
@@ -123,20 +125,10 @@ export default {
           options: [],
         },
       ],
-      searchParams: null
+      searchParams: null,
+      tableSortMsg: []
     };
   },
-  mounted () {
-    // this.getQuery([]);
-  },
-  watch: {
-    // 监听数据变化，重绘折线图
-    option: {
-      deep: true,
-      handler (newVal) { },
-    },
-  },
-  destroyed () { },
   methods: {
     getFormData (data) {
       this.tableData.time = [];
@@ -168,6 +160,7 @@ export default {
           typeName = '国内出港'
           break;
       }
+      this.tableSortMsg = setSortMsg(typeName)
       this.searchParams = {
         typeName,
         flighttype: data.flighttype,

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('table')" @upset="upset" />
+      <StatisticsHeader :title="titleTop" :items="formItems" :data="formData" with-setting :withSetting="false" :withExport="true" @getFormData="getFormData" @export="tableToExcel('table')" />
     </div>
     <div v-loading="loading" element-loading-text="数据加载中..." class="echart">
       <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
-      <Tableformbrs ref="table" :searchParams="searchParams" :tableList="tableList" :action="action" :set="set" />
+      <Tableformbrs ref="table" :searchParams="searchParams" :sort-msg="tableSortMsg" :tableList="tableList" :action="action" :set="set" />
     </div>
   </div>
 </template>
@@ -13,8 +13,9 @@
 <script>
 import Echarts from "../../components/echart/index.vue";
 import Tableformbrs from "../../components/echart/tableforms.vue";
-import StatisticsHeader from "../../components/echart/statisticsHeader.vue";
+import StatisticsHeader from "../components/page-head.vue";
 import { export_json_to_excel, exportToExcel } from "@/utils/Export2Excel";
+import { setSortMsg } from '../func'
 import { Query } from "@/api/webApi";
 import _ from 'lodash'
 export default {
@@ -43,7 +44,7 @@ export default {
         tyol: "",
       },
       formData: {
-        flighttype: "",
+        flighttype: "全部",
         dateTime: "",
       },
       titleTop: "运单统计",
@@ -123,7 +124,8 @@ export default {
           options: [],
         },
       ],
-      searchParams: null
+      searchParams: null,
+      tableSortMsg: []
     };
   },
   mounted () {
@@ -168,6 +170,7 @@ export default {
           typeName = '国内出港'
           break;
       }
+      this.tableSortMsg = setSortMsg(typeName)
       this.searchParams = {
         typeName,
         flighttype: data.flighttype,