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

src/components/SimpleTable/index.vue

@@ -33,9 +33,14 @@
           :filter-options="filterOptionMap[column.columnName]"
           :sortable="!!column.needSort"
           filter-style="arrow"
+          @update:changeValues="
+            (sortRule) => {
+              filterValuesChangeHandler(sortRule);
+            }
+          "
           @update:sort-rule="
-            sortRule => {
-              sortRuleChangeHandler(column.columnName, sortRule)
+            (sortRule) => {
+              sortRuleChangeHandler(column.columnName, sortRule);
             }
           "
         />
@@ -48,126 +53,126 @@
 </template>
 
 <script setup lang="ts">
-import TableHeaderCell from '@/components/TableHeaderCell/index.vue'
-import type { CSSProperties, VNode } from 'vue'
-import { TableColumnCtx } from 'element-plus/es/components/table/src/table-column/defaults'
-import { CommonData, CommonTableColumn } from '~/common'
-import { Options, useTableFilterAndSort } from '@/hooks/useTableFilterAndSort'
-import { ElTable } from 'element-plus'
-import { useTableSettingsStore } from '@/store/tableSettings'
+import TableHeaderCell from "@/components/TableHeaderCell/index.vue";
+import type { CSSProperties, VNode } from "vue";
+import { TableColumnCtx } from "element-plus/es/components/table/src/table-column/defaults";
+import { CommonData, CommonTableColumn } from "~/common";
+import { Options, useTableFilterAndSort } from "@/hooks/useTableFilterAndSort";
+import { ElTable } from "element-plus";
+import { useTableSettingsStore } from "@/store/tableSettings";
 
 type SummaryMethod<T> = (data: {
-  columns: TableColumnCtx<T>[]
-  data: T[]
-}) => string[]
-type ColumnCls<T> = string | ((data: { row: T; rowIndex: number }) => string)
+  columns: TableColumnCtx<T>[];
+  data: T[];
+}) => string[];
+type ColumnCls<T> = string | ((data: { row: T; rowIndex: number }) => string);
 type ColumnStyle<T> =
   | CSSProperties
-  | ((data: { row: T; rowIndex: number }) => CSSProperties)
+  | ((data: { row: T; rowIndex: number }) => CSSProperties);
 type CellCls<T> =
   | string
   | ((data: {
-      row: T
-      rowIndex: number
-      column: TableColumnCtx<T>
-      columnIndex: number
-    }) => string)
+      row: T;
+      rowIndex: number;
+      column: TableColumnCtx<T>;
+      columnIndex: number;
+    }) => string);
 type CellStyle<T> =
   | CSSProperties
   | ((data: {
-      row: T
-      rowIndex: number
-      column: TableColumnCtx<T>
-      columnIndex: number
-    }) => CSSProperties)
+      row: T;
+      rowIndex: number;
+      column: TableColumnCtx<T>;
+      columnIndex: number;
+    }) => CSSProperties);
 type Sort = {
-  prop: string
-  order: 'ascending' | 'descending'
-  init?: any
-  silent?: any
-}
+  prop: string;
+  order: "ascending" | "descending";
+  init?: any;
+  silent?: any;
+};
 type TreeNode = {
-  expanded?: boolean
-  loading?: boolean
-  noLazyChildren?: boolean
-  indent?: number
-  level?: number
-  display?: boolean
-}
-type Layout = 'fixed' | 'auto'
+  expanded?: boolean;
+  loading?: boolean;
+  noLazyChildren?: boolean;
+  indent?: number;
+  level?: number;
+  display?: boolean;
+};
+type Layout = "fixed" | "auto";
 type TableColumnProps<T> = {
-  type?: string
-  index?: number | ((index: number) => number)
-  columnKey?: string
-  width?: string | number
-  minWidth?: string | number
-  fixed?: boolean | string
-  renderHeader?: (data: { column: TableColumnCtx<T>; $index: number }) => VNode
-  resizable?: boolean
+  type?: string;
+  index?: number | ((index: number) => number);
+  columnKey?: string;
+  width?: string | number;
+  minWidth?: string | number;
+  fixed?: boolean | string;
+  renderHeader?: (data: { column: TableColumnCtx<T>; $index: number }) => VNode;
+  resizable?: boolean;
   formatter?: (
     row: T,
     column: TableColumnCtx<T>,
     cellValue: any,
     index: number
-  ) => VNode | string
-  showOverflowTooltip?: boolean
-  align?: string
-  headerAlign?: string
-  className?: string
-  labelClassName?: string
-  selectable?: (row: T, index: number) => boolean
-  reserveSelection?: boolean
-}
+  ) => VNode | string;
+  showOverflowTooltip?: boolean;
+  align?: string;
+  headerAlign?: string;
+  className?: string;
+  labelClassName?: string;
+  selectable?: (row: T, index: number) => boolean;
+  reserveSelection?: boolean;
+};
 
 const props = withDefaults(
   defineProps<{
-    data: CommonData[]
-    size?: string
-    width?: string | number
-    height?: string | number
-    maxHeight?: string | number
-    fit?: boolean
-    stripe?: boolean
-    border?: boolean
-    rowKey?: string | ((row: CommonData) => string)
-    showHeader?: boolean
-    showSummary?: boolean
-    sumText?: string
-    summaryMethod?: SummaryMethod<CommonData>
-    rowClassName?: ColumnCls<CommonData>
-    rowStyle?: ColumnStyle<CommonData>
-    cellClassName?: CellCls<CommonData>
-    cellStyle?: CellStyle<CommonData>
-    headerRowClassName?: ColumnCls<CommonData>
-    headerRowStyle?: ColumnStyle<CommonData>
-    headerCellClassName?: CellCls<CommonData>
-    headerCellStyle?: CellStyle<CommonData>
-    highlightCurrentRow?: boolean
-    currentRowKey?: string | number
-    emptyText?: string
-    expandRowKeys?: any[]
-    defaultExpandAll?: boolean
-    defaultSort?: Sort
-    tooltipEffect?: string
+    data: CommonData[];
+    size?: string;
+    width?: string | number;
+    height?: string | number;
+    maxHeight?: string | number;
+    fit?: boolean;
+    stripe?: boolean;
+    border?: boolean;
+    rowKey?: string | ((row: CommonData) => string);
+    showHeader?: boolean;
+    showSummary?: boolean;
+    sumText?: string;
+    summaryMethod?: SummaryMethod<CommonData>;
+    rowClassName?: ColumnCls<CommonData>;
+    rowStyle?: ColumnStyle<CommonData>;
+    cellClassName?: CellCls<CommonData>;
+    cellStyle?: CellStyle<CommonData>;
+    headerRowClassName?: ColumnCls<CommonData>;
+    headerRowStyle?: ColumnStyle<CommonData>;
+    headerCellClassName?: CellCls<CommonData>;
+    headerCellStyle?: CellStyle<CommonData>;
+    highlightCurrentRow?: boolean;
+    currentRowKey?: string | number;
+    emptyText?: string;
+    expandRowKeys?: any[];
+    defaultExpandAll?: boolean;
+    defaultSort?: Sort;
+    tooltipEffect?: string;
     spanMethod?: (data: {
-      row: CommonData
-      rowIndex: number
-      column: TableColumnCtx<CommonData>
-      columnIndex: number
+      row: CommonData;
+      rowIndex: number;
+      column: TableColumnCtx<CommonData>;
+      columnIndex: number;
     }) =>
       | number[]
       | {
-          rowspan: number
-          colspan: number
+          rowspan: number;
+          colspan: number;
         }
-      | undefined
-    selectOnIndeterminate?: boolean
-    indent?: number
+      | undefined;
+    selectOnIndeterminate?: boolean;
+    indent?: number;
     treeProps?: {
-      hasChildren?: string
-      children?: string
-    }
-    lazy?: boolean
+      hasChildren?: string;
+      children?: string;
+    };
+    lazy?: boolean;
     load?: (
       row: CommonData,
       treeNode: TreeNode,
@@ -188,86 +193,86 @@ const props = withDefaults(
     labelFormatter?: (label: string) => string
   }>(),
   {
-    size: 'default',
-    height: '100%',
-    maxHeight: '100%',
+    size: "default",
+    height: "100%",
+    maxHeight: "100%",
     stripe: true,
     border: true,
     fit: true,
     showHeader: true,
     labelFormatter: (label: string) => label,
   }
-)
+);
 
 const defaultSummaryMethod: SummaryMethod<CommonData> = ({ columns, data }) => {
-  const sums: string[] = []
+  const sums: string[] = [];
   columns.forEach((column, index) => {
     const countColumn = tableColumns.value.find(
-      col => column.property === col.columnName && col.needCount
-    )
+      (col) => column.property === col.columnName && col.needCount
+    );
     if (countColumn) {
       const sumNumber = data.reduce((prev: number, curr: CommonData) => {
-        const cellData = curr[column.property]
-        if (countColumn.countMode === 'all') {
-          return prev + 1
+        const cellData = curr[column.property];
+        if (countColumn.countMode === "all") {
+          return prev + 1;
         }
-        if (countColumn.countMode === 'notNull') {
-          return cellData ? prev + 1 : prev
+        if (countColumn.countMode === "notNull") {
+          return cellData ? prev + 1 : prev;
         }
-        const value = Number(cellData)
+        const value = Number(cellData);
         if (!Number.isNaN(value)) {
-          prev += value
+          prev += value;
         }
-        return prev
-      }, 0)
-      sums[index] = sumNumber.toString()
+        return prev;
+      }, 0);
+      sums[index] = sumNumber.toString();
     }
-  })
-  sums[0] = '合计：' + (sums[0] ?? '')
-  return sums
-}
+  });
+  sums[0] = "合计：" + (sums[0] ?? "");
+  return sums;
+};
 
 const tableProps = computed(() => {
-  const rawProps = toRaw(props)
-  const result: { [x: string]: any } = {}
+  const rawProps = toRaw(props);
+  const result: { [x: string]: any } = {};
   Object.entries(rawProps).forEach(([key, value]) => {
     if (
       ![
-        'columnProps',
-        'columns',
-        'sequence',
-        'customSequence',
-        'filterSortOptions',
-        'cacheKeys',
-        'labelFormatter',
+        "columnProps",
+        "columns",
+        "sequence",
+        "customSequence",
+        "filterSortOptions",
+        "cacheKeys",
+        "labelFormatter",
       ].includes(key) &&
-      (value ?? '') !== ''
+      (value ?? "") !== ""
     ) {
-      result[key] = value
+      result[key] = value;
     }
-    if (props.columns.some(column => column.needCount)) {
-      result.showSummary = true
+    if (props.columns.some((column) => column.needCount)) {
+      result.showSummary = true;
     }
     if (!result.summaryMethod) {
-      result.summaryMethod = defaultSummaryMethod
+      result.summaryMethod = defaultSummaryMethod;
     }
-  })
-  return result
-})
+  });
+  return result;
+});
 
 const computedColumnProps = computed(() => {
   const defaultColumnProps: TableColumnProps<CommonData> = {
-    align: 'center',
-  }
+    align: "center",
+  };
   return (column: CommonTableColumn & TableColumnProps<CommonData>) => ({
     ...defaultColumnProps,
     ...props.columnProps,
     ...column,
-  })
-})
+  });
+});
 
-const tableColumns = ref<CommonTableColumn[]>([])
-const tableData = ref<CommonData[]>([])
+const tableColumns = ref<CommonTableColumn[]>([]);
+const tableData = ref<CommonData[]>([]);
 watchEffect(() => {
   tableColumns.value = props.columns.reduce(
     (prevColumns: CommonTableColumn[], column) => {
@@ -276,18 +281,18 @@ watchEffect(() => {
           label: column.columnLabel,
           prop: column.columnName,
           ...column,
-        })
+        });
       }
-      return prevColumns
+      return prevColumns;
     },
     []
-  )
-  tableData.value = props.data
-})
+  );
+  tableData.value = props.data;
+});
 
 const hasFixedColumn = computed(() =>
-  tableColumns.value.some(column => column.fixed)
-)
+  tableColumns.value.some((column) => column.fixed)
+);
 
 const {
   filterOptionMap,
@@ -295,31 +300,35 @@ const {
   sortRuleMap,
   dealedTableData,
   sortChangeHandler,
-} = useTableFilterAndSort(tableColumns, tableData, props.filterSortOptions)
+} = useTableFilterAndSort(tableColumns, tableData, props.filterSortOptions);
 
-const { saveTableFilterValues } = useTableSettingsStore()
+const { saveTableFilterValues } = useTableSettingsStore();
 
 watch(
   sortRuleMap,
-  map => {
-    emit('sortRuleChange', map)
+  (map) => {
+    emit("sortRuleChange", map);
   },
   { deep: true }
-)
+);
 
 const sortRuleChangeHandler = (columnName: string, sortRule: string) => {
-  sortRuleMap[columnName] = sortRule
-  sortChangeHandler(columnName, sortRule)
-}
+  sortRuleMap[columnName] = sortRule;
+  sortChangeHandler(columnName, sortRule);
+};
+
+const filterValuesChangeHandler = (sortRule: string[]) => {
+  emit("filterChange", sortRule);
+};
 
 if (props.cacheKeys?.length) {
-  watch(filterValueMap, map => {
-    const values: { [x: string]: string[] } = {}
-    props.cacheKeys!.forEach(columnName => {
-      values[columnName] = map[columnName]
-    })
-    saveTableFilterValues(values)
-  })
+  watch(filterValueMap, (map) => {
+    const values: { [x: string]: string[] } = {};
+    props.cacheKeys!.forEach((columnName) => {
+      values[columnName] = map[columnName];
+    });
+    saveTableFilterValues(values);
+  });
 }
 
 // 组件的inheritAttrs属性默认为true，此时组件上的属性（包括v-on）会被添加到根元素上
@@ -329,13 +338,13 @@ const emit = defineEmits([
 ])
 
 const scrollOver = () => {
-  emit('scrollOver')
-}
+  emit("scrollOver");
+};
 
-const table = ref<InstanceType<typeof ElTable> | null>(null)
+const table = ref<InstanceType<typeof ElTable> | null>(null);
 defineExpose({
   table,
-})
+});
 </script>
 
 <style scoped lang="scss">
@@ -346,7 +355,7 @@ defineExpose({
     &.cell-filter {
       position: relative;
       &::before {
-        content: '';
+        content: "";
         position: absolute;
         width: 100%;
         height: 100%;

src/components/TableHeaderCell/index.vue

@@ -17,12 +17,12 @@
             :class="['filter-button', { 'filter-button-active': active }]"
             ref="buttonRef"
             v-click-outside="clickOutsideHandler"
-            >{{ `${showDesc ? '*' : ''}${label}` }}</span
+            >{{ `${showDesc ? "*" : ""}${label}` }}</span
           >
         </span>
       </template>
       <template v-else>
-        <span style="flex: 1">{{ `${showDesc ? '*' : ''}${label}` }}</span>
+        <span style="flex: 1">{{ `${showDesc ? "*" : ""}${label}` }}</span>
       </template>
       <div
         v-if="(filterable && filterStyle === 'arrow') || sortable"
@@ -62,12 +62,12 @@
         placement="bottom"
         @show="
           () => {
-            expand = true
+            expand = true;
           }
         "
         @hide="
           () => {
-            expand = false
+            expand = false;
           }
         "
       >
@@ -85,6 +85,7 @@
           collapse-tags
           clearable
           :teleported="false"
+          @change="selectionChange"
         >
           <el-option
             v-for="(option, index) in groupedOptions"
@@ -135,7 +136,7 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits(['update:filterValues', 'update:sortRule'])
+const emit = defineEmits(['update:filterValues', 'update:sortRule','update:changeValues'])
 
 const selections = ref<string[]>([])
 const groupedOptions = computed(() => {
@@ -203,6 +204,10 @@ const sortChange = () => {
         : ''
   emit('update:sortRule', sortRule)
 }
+
+const selectionChange = (val:string[]) =>{
+  emit('update:changeValues', val)
+}
 </script>
 
 <style lang="scss" scoped>
@@ -227,7 +232,7 @@ const sortChange = () => {
       position: relative;
 
       &::after {
-        content: '';
+        content: "";
         display: block;
         width: calc(100% + 4px);
         position: absolute;
@@ -259,7 +264,7 @@ const sortChange = () => {
     position: relative;
 
     &::after {
-      content: '';
+      content: "";
       display: block;
       width: 100%;
       height: 100%;

src/hooks/useTableFilterAndSort.ts

@@ -92,14 +92,6 @@ export function useTableFilterAndSort(
     if (defaultSortFunction) {
       return filtered.sort(defaultSortFunction);
     }
-    if (filtered.length) {
-      const list0 = filtered[0];
-      if (list0["indexs"] != undefined) {
-        filtered.map((item, index) => {
-          item["indexs"] = index + 1;
-        });
-      }
-    }
     return filtered;
   });
 

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

@@ -1112,12 +1112,13 @@
         :header-row-style="rowStyle"
         :border="false"
         :header-cell-style="{ background: '#F9FAFC' }"
+        @filterChange="selectionChange"
       />
       <SimpleTable
-        v-show="tableList.length && action == 13"
+        v-show="tableData.length && action == 13"
         ref="tableRef"
         height="calc(100vh - 236px)"
-        :data="tableList"
+        :data="tableData"
         :columns="tableColumns"
         :summary-method="totalOutPrice"
         :show-summary="tableProps.showSummary"
@@ -1126,10 +1127,11 @@
         :header-row-style="rowStyle"
         :border="false"
         :header-cell-style="{ background: '#F9FAFC' }"
+        @filterChange="selectionChange"
       />
-      <template v-if="tableList.length && action == 14">
+      <template v-if="tableData.length && action == 14">
         <el-table
-          :data="tableList"
+          :data="tableData"
           style="width: 100%"
           :row-style="rowStyle"
           :header-row-style="rowStyle"
@@ -1419,12 +1421,25 @@ export default {
           needSort: 1,
         },
       ],
+      tableData: [],
+      listNewall: {
+        piclvall: 0,
+        acclvall: 0,
+        readlvall: 0,
+        oklvall: 0,
+        reCodeNumall: 0,
+        codeNumall: 0,
+        reAccNumall: 0,
+        accNumall: 0,
+        pcsall: 0,
+      },
+      capLen: null,
     };
   },
   watch: {
     tableList: {
       handler(val) {
-        // console.log(val, "111111111");
+        this.tableData = val;
       },
       deep: true,
       immediate: true,
@@ -1490,26 +1505,50 @@ export default {
           column.property == "readlvs" ||
           column.property == "oklvs"
         ) {
-          if (this.action === 12) {
-            sums[3] = this.listall.codeNumall;
-            sums[4] = this.listall.reCodeNumall;
-            sums[5] = this.listall.accNumall;
-            sums[6] = this.listall.reAccNumall;
-            sums[7] = this.listall.pcsall;
-            sums[8] = this.listall.piclvall;
-            sums[9] = this.listall.acclvall;
-            sums[10] = this.listall.readlvall;
-            sums[11] = this.listall.oklvall;
-          } else if (this.action === 13) {
-            sums[3] = this.listall.codeNumall;
-            sums[4] = this.listall.reCodeNumall;
-            sums[5] = this.listall.accNumall;
-            sums[6] = this.listall.reAccNumall;
-            sums[7] = this.listall.pcsall;
-            sums[8] = this.listall.piclvall;
-            sums[9] = this.listall.acclvall;
-            sums[10] = this.listall.readlvall;
-            sums[11] = this.listall.oklvall;
+          if (this.capLen) {
+            if (this.action === 12) {
+              sums[3] = this.listNewall.codeNumall;
+              sums[4] = this.listNewall.reCodeNumall;
+              sums[5] = this.listNewall.accNumall;
+              sums[6] = this.listNewall.reAccNumall;
+              sums[7] = this.listNewall.pcsall;
+              sums[8] = this.listNewall.piclvall;
+              sums[9] = this.listNewall.acclvall;
+              sums[10] = this.listNewall.readlvall;
+              sums[11] = this.listNewall.oklvall;
+            } else if (this.action === 13) {
+              sums[3] = this.listNewall.codeNumall;
+              sums[4] = this.listNewall.reCodeNumall;
+              sums[5] = this.listNewall.accNumall;
+              sums[6] = this.listNewall.reAccNumall;
+              sums[7] = this.listNewall.pcsall;
+              sums[8] = this.listNewall.piclvall;
+              sums[9] = this.listNewall.acclvall;
+              sums[10] = this.listNewall.readlvall;
+              sums[11] = this.listNewall.oklvall;
+            }
+          } else {
+            if (this.action === 12) {
+              sums[3] = this.listall.codeNumall;
+              sums[4] = this.listall.reCodeNumall;
+              sums[5] = this.listall.accNumall;
+              sums[6] = this.listall.reAccNumall;
+              sums[7] = this.listall.pcsall;
+              sums[8] = this.listall.piclvall;
+              sums[9] = this.listall.acclvall;
+              sums[10] = this.listall.readlvall;
+              sums[11] = this.listall.oklvall;
+            } else if (this.action === 13) {
+              sums[3] = this.listall.codeNumall;
+              sums[4] = this.listall.reCodeNumall;
+              sums[5] = this.listall.accNumall;
+              sums[6] = this.listall.reAccNumall;
+              sums[7] = this.listall.pcsall;
+              sums[8] = this.listall.piclvall;
+              sums[9] = this.listall.acclvall;
+              sums[10] = this.listall.readlvall;
+              sums[11] = this.listall.oklvall;
+            }
           }
         }
         if (this.action === 15) {
@@ -1525,6 +1564,97 @@ export default {
     tabRowClassName({ row, rowIndex }) {
       return "warning-row";
     },
+    selectionChange(data) {
+      const datas = this.tableList;
+      const arr = [...data];
+      // cargoCompany
+      let res = null;
+      if (this.action == 12) {
+        res = [...datas, ...arr].filter(
+          (item) =>
+            datas.some((p) => item.ChannelId == p.ChannelId) &&
+            arr.some((c) => item.ChannelId == c)
+        );
+      } else {
+        res = [...datas, ...arr].filter(
+          (item) =>
+            datas.some((p) => item.cargoCompany == p.cargoCompany) &&
+            arr.some((c) => item.cargoCompany == c)
+        );
+      }
+      if (res.length) {
+        res.forEach((item, index) => {
+          item.indexs = index + 1;
+        });
+        this.tableData = res;
+        this.capLen = res.length;
+      } else {
+        this.tableList.forEach((item, index) => {
+          item.indexs = index + 1;
+        });
+        this.tableData = this.tableList;
+      }
+      this.formatNum(this.tableData);
+    },
+    formatNum(arr) {
+      const returnData = {
+        listValues: [...arr],
+      };
+      for (let i = 0; i < returnData.listValues.length; i++) {
+        this.listNewall.reCodeNumall =
+          this.listNewall.reCodeNumall + returnData.listValues[i].reCodeNum;
+        this.listNewall.codeNumall =
+          this.listNewall.codeNumall + returnData.listValues[i].codeNum;
+        this.listNewall.reAccNumall =
+          this.listNewall.reAccNumall + returnData.listValues[i].reAccNum;
+        this.listNewall.accNumall =
+          this.listNewall.accNumall + returnData.listValues[i].accNum;
+        this.listNewall.pcsall =
+          this.listNewall.pcsall + returnData.listValues[i].pcs;
+      }
+      if (this.listNewall.codeNumall === 0) {
+        this.listNewall.piclvall =
+          ((this.listNewall.reCodeNumall * 100) / 1).toFixed(2) + "%";
+      } else {
+        this.listNewall.piclvall =
+          (
+            (this.listNewall.reCodeNumall * 100) /
+            this.listNewall.codeNumall
+          ).toFixed(2) + "%";
+      }
+      if (this.listNewall.accNumall === 0) {
+        this.listNewall.acclvall =
+          ((this.listNewall.reAccNumall * 100) / 1).toFixed(2) + "%";
+      } else {
+        this.listNewall.acclvall =
+          (
+            (this.listNewall.reAccNumall * 100) /
+            this.listNewall.accNumall
+          ).toFixed(2) + "%";
+      }
+      if (this.listNewall.pcsall === 0) {
+        this.listNewall.readlvall =
+          ((this.listNewall.codeNumall * 100) / 1).toFixed(2) + "%";
+      } else {
+        this.listNewall.readlvall =
+          ((this.listNewall.codeNumall * 100) / this.listNewall.pcsall).toFixed(
+            2
+          ) + "%";
+      }
+      if (this.listNewall.pcsall === 0) {
+        this.listNewall.oklvall =
+          (
+            ((this.listNewall.pcsall - this.listNewall.reAccNumall) * 100) /
+            1
+          ).toFixed(2) + "%";
+      } else {
+        this.listNewall.oklvall =
+          (
+            ((this.listNewall.pcsall - this.listNewall.reAccNumall) * 100) /
+            this.listNewall.pcsall
+          ).toFixed(2) + "%";
+      }
+    },
     //滚动分页加载
     // load  () {
     //   this.$emit("load", true);

src/views/statisticalanalysis/gantryframe/index.vue

@@ -225,11 +225,11 @@ export default {
           this.tableList = JSON.parse(JSON.stringify(returnData.listValues));
           this.tableListcop = JSON.parse(JSON.stringify(returnData.listValues));
           this.total = this.tableList.length;
-          for (let i = 0; i < 9; i++) {
-            if (!this.tableList[i]) {
-              this.tableList.push({});
-            }
-          }
+          // for (let i = 0; i < 9; i++) {
+          //   if (!this.tableList[i]) {
+          //     this.tableList.push({});
+          //   }
+          // }
           this.tableList.forEach((item, index) => {
             item.reCodeNum = item.reCodeNum ? item.reCodeNum : 0;
             item.codeNum = item.codeNum ? item.codeNum : 0;