liyongli há 3 anos atrás
pai
commit
4e1c66e403
3 ficheiros alterados com 31 adições e 26 exclusões
  1. 24 24
      src/config/tableCol.js
  2. 1 1
      src/views/Jugou/Jugou.vue
  3. 6 1
      src/views/ReportForm/ReportForm.vue

+ 24 - 24
src/config/tableCol.js

@@ -158,14 +158,14 @@ export default {
         key: "index",
         width: 50
       },
-      {
-        label: "账号",
-        key: "userName",
-      },
       {
         label: "部门",
         key: "depName",
       },
+      {
+        label: "账号",
+        key: "userName",
+      },
       {
         label: "篇名",
         key: "title",
@@ -185,14 +185,14 @@ export default {
         key: "index",
         width: 50
       },
-      {
-        label: "账号",
-        key: "userName",
-      },
       {
         label: "部门",
         key: "depName",
       },
+      {
+        label: "账号",
+        key: "userName",
+      },
       {
         label: "篇名",
         key: "title",
@@ -216,14 +216,14 @@ export default {
         key: "index",
         width: 50
       },
-      {
-        label: "账号",
-        key: "userName",
-      },
       {
         label: "部门",
         key: "depName",
       },
+      {
+        label: "账号",
+        key: "userName",
+      },
       {
         label: "篇名",
         key: "title",
@@ -247,14 +247,14 @@ export default {
         key: "index",
         width: 50
       },
-      {
-        label: "账号",
-        key: "userName",
-      },
       {
         label: "部门",
         key: "depName",
       },
+      {
+        label: "账号",
+        key: "userName",
+      },
       {
         label: "篇名",
         key: "title",
@@ -278,14 +278,14 @@ export default {
         key: "index",
         width: 50
       },
-      {
-        label: "账号",
-        key: "userName",
-      },
       {
         label: "部门",
         key: "depName",
       },
+      {
+        label: "账号",
+        key: "userName",
+      },
       {
         label: "篇名",
         key: "title",
@@ -305,14 +305,14 @@ export default {
         key: "index",
         width: 50
       },
-      {
-        label: "账号",
-        key: "userName",
-      },
       {
         label: "部门",
         key: "depName",
       },
+      {
+        label: "账号",
+        key: "userName",
+      },
       {
         label: "篇名",
         key: "title",

+ 1 - 1
src/views/Jugou/Jugou.vue

@@ -78,7 +78,7 @@
                 当前时间:{{
                   nowItem.date ? nowItem.date.split(" ")[1] || "" : ""
                 }}
-                <div style="float: right">人数: {{formateNum()}}</div>
+                <div style="float: right">人数: {{formateNum(nowItem.uv)}}</div>
               </div>
               <el-row>
                 <el-col :span="12">

+ 6 - 1
src/views/ReportForm/ReportForm.vue

@@ -71,6 +71,7 @@
               backgroundColor: '#f4f5f7',
               color: '#606266',
             }"
+            align="center"
             :data="tableData"
             empty-text="暂无数据"
             style="width: 100%"
@@ -101,6 +102,7 @@
               backgroundColor: '#f4f5f7',
               color: '#606266',
             }"
+            align="center"
             empty-text="暂无数据"
             :data="tableList"
             style="width: 100%"
@@ -128,6 +130,7 @@
           <el-pagination
             @current-change="cChange"
             background
+            :page-size="pageSize"
             layout="prev, pager, next"
             :total="total"
           />
@@ -223,8 +226,9 @@ export default {
         i++
       ) {
         const v = tableDataListOri[i];
-        out.push(v);
+        v && out.push(v);
       }
+      console.log(out)
       return out;
     },
   },
@@ -267,6 +271,7 @@ export default {
             return v;
           });
           this.total = tableDataListOri.length;
+          console.log(this.total,tableDataListOri.length/this.pagesize)
           this.page = this.page + 1;
           this.load = false;
           l.close();