asd123a20 2 سال پیش
والد
کامیت
39095f8716
2فایلهای تغییر یافته به همراه11 افزوده شده و 6 حذف شده
  1. 1 1
      src/views/stat/activity/activity-table-a.vue
  2. 10 5
      src/views/stat/activity/index.vue

+ 1 - 1
src/views/stat/activity/activity-table-a.vue

@@ -26,7 +26,7 @@
       <el-table v-loading="loading" :data="activityList" show-summary>
         <el-table-column label="活动类型" align="center" prop="activityType" />
         <el-table-column label="主题" align="center" prop="activityTopic" />
-        <el-table-column label="人" align="center" prop="userCount" />
+        <el-table-column label="人" align="center" prop="userCount" />
         <el-table-column label="积分" align="center" prop="points" />
       </el-table>
   

+ 10 - 5
src/views/stat/activity/index.vue

@@ -47,11 +47,16 @@
           <el-row :gutter="24">
             <el-col :span="4" v-for="(item, index) in userData" :key="index"><div style="margin-top: 8px;">{{ item.name }}: {{ item.value }}人</div></el-col>
           </el-row>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <div ref="usedmemory" style="height: 440px" />
-          </div>
         </el-card>
       </el-col>
+      <el-col :span="16" class="card-box">
+          <el-card>
+            <div slot="header">
+              <span>人次统计</span>
+            </div>
+            <div ref="usedmemory" style="height: 350px" />
+          </el-card>
+        </el-col>
     </el-row>
   </div>
 </template>
@@ -107,8 +112,8 @@ export default {
         (this.dict.type.user_tags.find(tag => tag.label === a.name)?.raw.dictSort ?? Infinity) -
         (this.dict.type.user_tags.find(tag => tag.label === b.name)?.raw.dictSort ?? Infinity)
       );
-      const allUser = await userTotalTimesByTag(this.queryParams);
-      const allData = [{ name: '总人', value: allUser.data }];
+      const allUser = await userTotalCountByTag(this.queryParams);
+      const allData = [{ name: '总人', value: allUser.data }];
       this.userData = [ ...allData, ...typeUser?.data ];
       this.$modal.closeLoading();
     },