liyongli 3 年 前
コミット
22908b72ba
2 ファイル変更54 行追加17 行削除
  1. 12 0
      src/config/tableCol.js
  2. 42 17
      src/views/ReportForm/ReportForm.vue

+ 12 - 0
src/config/tableCol.js

@@ -4,6 +4,7 @@ export default {
       {
         label: "排名",
         key: "index",
+        width: 50
       },
       {
         label: "账号",
@@ -30,6 +31,7 @@ export default {
       {
         label: "排名",
         key: "index",
+        width: 50
       },
       {
         label: "账号",
@@ -56,6 +58,7 @@ export default {
       {
         label: "排名",
         key: "index",
+        width: 50
       },
       {
         label: "账号",
@@ -78,6 +81,7 @@ export default {
       {
         label: "排名",
         key: "index",
+        width: 50
       },
       {
         label: "账号",
@@ -104,6 +108,7 @@ export default {
       {
         label: "排名",
         key: "index",
+        width: 50
       },
       {
         label: "账号",
@@ -126,6 +131,7 @@ export default {
       {
         label: "排名",
         key: "index",
+        width: 50
       },
       {
         label: "账号",
@@ -150,6 +156,7 @@ export default {
       {
         label: "排名",
         key: "index",
+        width: 50
       },
       {
         label: "账号",
@@ -176,6 +183,7 @@ export default {
       {
         label: "排名",
         key: "index",
+        width: 50
       },
       {
         label: "账号",
@@ -206,6 +214,7 @@ export default {
       {
         label: "排名",
         key: "index",
+        width: 50
       },
       {
         label: "账号",
@@ -236,6 +245,7 @@ export default {
       {
         label: "排名",
         key: "index",
+        width: 50
       },
       {
         label: "账号",
@@ -266,6 +276,7 @@ export default {
       {
         label: "排名",
         key: "index",
+        width: 50
       },
       {
         label: "账号",
@@ -292,6 +303,7 @@ export default {
       {
         label: "排名",
         key: "index",
+        width: 50
       },
       {
         label: "账号",

+ 42 - 17
src/views/ReportForm/ReportForm.vue

@@ -30,7 +30,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item style="float: right">
-          <el-button type="primary" @click="onSubmit">查询</el-button>
+          <el-button type="primary" @click="onSubmit" :loading="load">查询</el-button>
           <el-button type="primary" @click="onExport">导出</el-button>
         </el-form-item>
       </el-form>
@@ -45,16 +45,27 @@
               color: '#606266',
             }"
             :data="tableData"
+            empty-text="暂无数据"
             style="width: 100%"
           >
-            <el-table-column
-              align="center"
-              show-overflow-tooltip
-              :prop="item.key"
-              :label="item.label"
-              v-for="(item, i) in agg"
-              :key="i"
-            />
+            <template v-for="(item, i) in agg" :key="i">
+              <el-table-column
+                align="center"
+                v-if="item.width"
+                :width="item.width"
+                show-overflow-tooltip
+                :prop="item.key"
+                :label="item.label"
+              />
+              <el-table-column
+                align="center"
+                v-else
+                :width="item.width"
+                show-overflow-tooltip
+                :prop="item.key"
+                :label="item.label"
+              />
+            </template>
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="清单" name="list">
@@ -63,17 +74,28 @@
               backgroundColor: '#f4f5f7',
               color: '#606266',
             }"
+            empty-text="暂无数据"
             :data="tableList"
             style="width: 100%"
           >
-            <el-table-column
-              align="center"
-              show-overflow-tooltip
-              :prop="item.key"
-              :label="item.label"
-              v-for="(item, i) in list"
-              :key="i"
-            />
+            <template v-for="(item, i) in list" :key="i">
+              <el-table-column
+                align="center"
+                v-if="item.width"
+                :width="item.width"
+                show-overflow-tooltip
+                :prop="item.key"
+                :label="item.label"
+              />
+              <el-table-column
+                align="center"
+                v-else
+                :width="item.width"
+                show-overflow-tooltip
+                :prop="item.key"
+                :label="item.label"
+              />
+            </template>
           </el-table>
           <br />
           <el-pagination
@@ -103,6 +125,7 @@ export default {
       page: 0,
       pagesize: 20,
       total: 0,
+      load: false,
       activeTab: "agg",
       form: {
         platform: "",
@@ -166,6 +189,7 @@ export default {
     onSubmit() {
       const data = this.formatListData();
       this.page = 0;
+      this.load = true;
       Promise.all([platform(data), platformlistData(data)]).then(list => {
         this.formRael = data;
         this.tableData = (list[0] || []).map((v, i) => {
@@ -178,6 +202,7 @@ export default {
         });
         this.total = tableDataListOri.length;
         this.page = this.page + 1;
+        this.load = false;
       });
     },
     dateFormat(date) {