From 176c4048080d0ea3d5d4a22c67f73fbace060f22 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Mon, 19 Dec 2022 15:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BAID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/consultant-table.vue            |  8 ++++++--
 .../sylive/groups/components/gro-edit.vue      |  3 +++
 .../sylive/groups/components/gro-user-list.vue | 10 ++++------
 .../members/components/members-majia.vue       |  6 ++++++
 .../members/components/members-search.vue      |  6 +++---
 src/views/sylive/members/index.vue             |  4 ++--
 .../organization/components/org-edit.vue       | 12 ++++--------
 .../organization/components/org-user-list.vue  |  7 +++----
 src/views/sylive/team/components/team-edit.vue | 18 +++++++-----------
 .../sylive/team/components/team-user-list.vue  | 10 ++++------
 src/views/system/role/index.vue                |  4 ++--
 src/views/system/user/index.vue                |  4 ++--
 12 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/views/sylive/groups-statistics/components/consultant-table.vue b/src/views/sylive/groups-statistics/components/consultant-table.vue
index 9aeb2c0..b048e63 100644
--- a/src/views/sylive/groups-statistics/components/consultant-table.vue
+++ b/src/views/sylive/groups-statistics/components/consultant-table.vue
@@ -164,7 +164,9 @@
             '浏览数（人）',
             '预约数（人）',
             '观看数（人）',
-            '订单数（单）'
+            '订单数（单）',
+            '观看数（人次）',
+            '人均观看（分）'
           ]
         ];
         const loading = this.$loading({ lock: true });
@@ -187,7 +189,9 @@
                   d.browse,
                   d.subscribe,
                   d.watch,
-                  d.order
+                  d.order,
+                  d.livePV,
+                  d.watchDuration
                 ]);
               });
               writeFile(
diff --git a/src/views/sylive/groups/components/gro-edit.vue b/src/views/sylive/groups/components/gro-edit.vue
index f2dbaec..36b2213 100644
--- a/src/views/sylive/groups/components/gro-edit.vue
+++ b/src/views/sylive/groups/components/gro-edit.vue
@@ -26,6 +26,9 @@
               placeholder="请输入分组名称"
             />
           </el-form-item>
+          <el-form-item label="分组id:" v-if="form.groupsId">
+            <el-input v-model="form.groupsId" disabled />
+          </el-form-item>
           <el-form-item label="排序号:">
             <el-input-number
               :min="0"
diff --git a/src/views/sylive/groups/components/gro-user-list.vue b/src/views/sylive/groups/components/gro-user-list.vue
index bd02453..b0d5fd0 100644
--- a/src/views/sylive/groups/components/gro-user-list.vue
+++ b/src/views/sylive/groups/components/gro-user-list.vue
@@ -106,12 +106,10 @@
         // 表格列配置
         columns: [
           {
-            columnKey: 'index',
-            type: 'index',
-            width: 45,
-            align: 'center',
-            showOverflowTooltip: true,
-            fixed: 'left'
+            prop: 'userId',
+            label: 'ID',
+            minWidth: 60,
+            showOverflowTooltip: true
           },
           {
             prop: 'uname',
diff --git a/src/views/sylive/members/components/members-majia.vue b/src/views/sylive/members/components/members-majia.vue
index 25ebb48..016869b 100644
--- a/src/views/sylive/members/components/members-majia.vue
+++ b/src/views/sylive/members/components/members-majia.vue
@@ -73,6 +73,12 @@
             return pageMembers({ ...where, ...order, page, limit });
           },
           columns: [
+            {
+              prop: 'userId',
+              label: 'ID',
+              showOverflowTooltip: true,
+              width: 60
+            },
             {
               prop: 'uname',
               label: '姓名',
diff --git a/src/views/sylive/members/components/members-search.vue b/src/views/sylive/members/components/members-search.vue
index 58184d4..7f3296c 100644
--- a/src/views/sylive/members/components/members-search.vue
+++ b/src/views/sylive/members/components/members-search.vue
@@ -7,17 +7,17 @@
     @submit.native.prevent
   >
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 8 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="姓名:">
           <el-input clearable v-model="where.uname" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 8 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="手机号:">
           <el-input clearable v-model="where.mobile" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 8 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="机构:">
           <el-select
             clearable
diff --git a/src/views/sylive/members/index.vue b/src/views/sylive/members/index.vue
index bb6eabe..ebd490d 100644
--- a/src/views/sylive/members/index.vue
+++ b/src/views/sylive/members/index.vue
@@ -112,8 +112,8 @@
         // 表格列配置
         columns: [
           {
-            columnKey: 'index',
-            type: 'index',
+            prop: 'userId',
+            label: 'ID',
             width: 60,
             align: 'center',
             showOverflowTooltip: true,
diff --git a/src/views/sylive/organization/components/org-edit.vue b/src/views/sylive/organization/components/org-edit.vue
index 27c3e31..661c13c 100644
--- a/src/views/sylive/organization/components/org-edit.vue
+++ b/src/views/sylive/organization/components/org-edit.vue
@@ -60,7 +60,10 @@
           <el-form-item label="机构类型:" prop="organizationType">
             <org-type-select v-model="form.organizationType" />
           </el-form-item>
-          <el-form-item label="排序号:" prop="sortNumber">
+          <el-form-item label="机构id:" v-if="form.organizationId">
+            <el-input v-model="form.organizationId" disabled />
+          </el-form-item>
+          <el-form-item label="排序号:">
             <el-input-number
               :min="0"
               :max="99999"
@@ -145,13 +148,6 @@
               message: '请选择机构类型',
               trigger: 'blur'
             }
-          ],
-          sortNumber: [
-            {
-              required: true,
-              message: '请输入排序号',
-              trigger: 'blur'
-            }
           ]
         },
         // 提交状态
diff --git a/src/views/sylive/organization/components/org-user-list.vue b/src/views/sylive/organization/components/org-user-list.vue
index a134a7d..304ce0c 100644
--- a/src/views/sylive/organization/components/org-user-list.vue
+++ b/src/views/sylive/organization/components/org-user-list.vue
@@ -91,10 +91,9 @@
         // 表格列配置
         columns: [
           {
-            columnKey: 'index',
-            type: 'index',
-            width: 45,
-            align: 'center',
+            prop: 'userId',
+            label: 'ID',
+            minWidth: 60,
             showOverflowTooltip: true,
             fixed: 'left'
           },
diff --git a/src/views/sylive/team/components/team-edit.vue b/src/views/sylive/team/components/team-edit.vue
index 5b87ac3..c3e01c2 100644
--- a/src/views/sylive/team/components/team-edit.vue
+++ b/src/views/sylive/team/components/team-edit.vue
@@ -18,9 +18,6 @@
               placeholder="请选择上级团队"
             />
           </el-form-item>
-          <el-form-item label="所属机构:" v-show="form.parentId ? false : true">
-            <team-org-select v-model="form.organizationId" />
-          </el-form-item>
           <el-form-item label="团队名称:" prop="teamName">
             <el-input
               clearable
@@ -29,6 +26,9 @@
               placeholder="请输入团队名称"
             />
           </el-form-item>
+          <el-form-item label="所属机构:" v-show="form.parentId ? false : true">
+            <team-org-select v-model="form.organizationId" />
+          </el-form-item>
           <el-form-item label="所在城市:">
             <regions-select
               v-model="form.city"
@@ -56,7 +56,10 @@
           <el-form-item label="团队类型:" prop="teamType">
             <team-type-select v-model="form.teamType" />
           </el-form-item>
-          <el-form-item label="排序号:" prop="sortNumber">
+          <el-form-item label="团队id:" v-if="form.teamId">
+            <el-input v-model="form.teamId" disabled />
+          </el-form-item>
+          <el-form-item label="排序号:">
             <el-input-number
               :min="0"
               :max="99999"
@@ -145,13 +148,6 @@
               message: '请选择所属机构',
               trigger: 'blur'
             }
-          ],
-          sortNumber: [
-            {
-              required: true,
-              message: '请输入排序号',
-              trigger: 'blur'
-            }
           ]
         },
         // 提交状态
diff --git a/src/views/sylive/team/components/team-user-list.vue b/src/views/sylive/team/components/team-user-list.vue
index d9b24aa..d2a1831 100644
--- a/src/views/sylive/team/components/team-user-list.vue
+++ b/src/views/sylive/team/components/team-user-list.vue
@@ -95,12 +95,10 @@
         // 表格列配置
         columns: [
           {
-            columnKey: 'index',
-            type: 'index',
-            width: 45,
-            align: 'center',
-            showOverflowTooltip: true,
-            fixed: 'left'
+            prop: 'userId',
+            label: 'ID',
+            minWidth: 60,
+            showOverflowTooltip: true
           },
           {
             prop: 'uname',
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index bbd25ee..20cc070 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -96,8 +96,8 @@
             fixed: 'left'
           },
           {
-            columnKey: 'index',
-            type: 'index',
+            prop: 'roleId',
+            label: 'ID',
             width: 45,
             align: 'center',
             showOverflowTooltip: true,
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 53bc726..5683de7 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -137,8 +137,8 @@
             fixed: 'left'
           },
           {
-            columnKey: 'index',
-            type: 'index',
+            prop: 'userId',
+            label: 'ID',
             width: 45,
             align: 'center',
             showOverflowTooltip: true,