823

src/components/system/role.vue

@@ -88,7 +88,7 @@
         limit: 10,
         roleList: [],
         exportMenuList: [ // 导出权限
-          '2-3', '5-10', '5-2', '5-1', '5-3', '5-8', '5-9', '6-4', '3-1', '3-6', '3-7', '7-9', '6-3', '10-8'
+          '2-3', '5-10', '5-2', '5-1', '5-3', '5-8', '5-9', '6-4', '3-1', '3-6', '3-7', '7-9', '6-3', '10-8','3-8'
         ],
         dialog: {
           title: '新增角色',

src/components/userDetail/index.vue

@@ -347,6 +347,54 @@
           </el-table-column> -->
         </el-table>
       </el-tab-pane>
+      <el-tab-pane label="成长记录" name="growthRecord">
+      <el-table :data="growthRecordList">
+          <el-table-column
+            prop="element_title"
+            width="200"
+            label="歌曲名">
+          </el-table-column>
+          <el-table-column
+            prop="category_name"
+            width="200"
+            label="课程">
+          </el-table-column>
+          <el-table-column
+            prop="interest"
+            width="100"
+            label="兴趣度">
+          </el-table-column>
+          <el-table-column
+            prop="concent"
+            width="100"
+            label="专注度">
+          </el-table-column>
+          <el-table-column
+            prop="parent_child"
+            width="100"
+            label="亲子互动">
+          </el-table-column>
+          <el-table-column
+            prop="growth_record"
+            label="成长记录">
+            <template slot-scope="scope">
+              <el-popover
+                placement="top-start"
+                width="200"
+                trigger="hover"
+                :content="scope.row.growth_record">
+                <el-button slot="reference">{{scope.row.growth_record}}</el-button>
+              </el-popover>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="created_at"
+            width="200"
+            label="提交时间">
+          </el-table-column>
+        </el-table>
+        <page :total="total" :limit="limit" @pageChange="onRecordPageChange" @sizeChange="onRecordSizeChange"/>
+      </el-tab-pane>
     </el-tabs>
     <teacher-dialog :dialogObj="dialogObj" @reflash="getDetail"></teacher-dialog>
     <user-list :userObj="userObj"/>
@@ -503,7 +551,8 @@
     getyunjiApi,
     fetchAddressListApi,
     getSubAccountInfoApi,
-    getUserSubAccountListApi
+    getUserSubAccountListApi,
+    getGrowthRecordApi
   } from "../../service/api";
   import page from '../framework/page'
   import sourceDialog from '../order/sourceDialog'
@@ -543,6 +592,7 @@
         },
         nowPage: 1,
         limit: 5,
+        recordPage:1,
         id: '',
         detail: {},
         subDetail: {},
@@ -610,7 +660,8 @@
           }
         ],
         sourceByDateDialogJson: {},
-        deliverRecordList: []
+        deliverRecordList: [],
+        growthRecordList:[]
       }
     },
     components: {
@@ -647,6 +698,9 @@
         if (value === 'deliverRecord') {
           this.getDeliverRecordList()
         }
+        if (value === 'growthRecord') {
+          this.getGrowthRecordList()
+        }
 
       }
     },
@@ -685,6 +739,13 @@
           console.log(this.deliverRecordList)
         })
       },
+      getGrowthRecordList() {
+        getGrowthRecordApi({user_id: this.id, page: this.recordPage, limit: this.limit}).then(res => {
+          this.growthRecordList = res.list
+          this.total = res.total
+          console.log(this.growthRecordList)
+        })
+      },
       onUpdateAddress() {
         this.dialogObj.show = false;
         this.getAddressList();
@@ -843,6 +904,15 @@
         this.limit = val;
         this.getUser();
       },
+      onRecordPageChange(val) {
+        this.recordPage = val;
+        this.getGrowthRecordList();
+      },
+      onRecordSizeChange(val) {
+        this.recordPage = 1;
+        this.limit = val;
+        this.getGrowthRecordList();
+      },
       getUser() {
         let json = {
           user_id: this.id,
@@ -1124,9 +1194,20 @@
     padding: 20px;
     color: #666;
   }
+  .el-popover__reference{
+    /* background: #c30005; */
+   max-width: 100%;
+  }
 </style>
 
 <style>
+.el-popover__reference span{
+    display:-webkit-box;
+    -webkit-line-clamp:3;
+    -webkit-box-orient:vertical;
+    overflow:hidden;
+    white-space:normal;
+  }
   .f-c > div {
     display: flex !important;
     flex-flow: row;

src/service/api.js

@@ -1354,3 +1354,7 @@ export const postMediaConvertApi = function (json) {
 export const getUpdateTimeApi = function () {
   return Vue.prototype.$fetch(`${_baseUrl}api/admin/get/report/time`)
 };
+export const getGrowthRecordApi = function (json) {
+  return Vue.prototype.$fetch(`${_baseUrl}api/admin/user/growth/list`,json)
+};
+//api/admin/user/growth/list
\ No newline at end of file

src/util/menuList.js

@@ -189,6 +189,17 @@ export default [{
   value: '用户管理',
   icon: 'icon-yonghu',
   list: [
+    {
+      value: '成长记录',
+      routerName: 'growthRecord',
+      path: '/growthRecord',
+      cover: '3-8',
+      router: {
+        path: '/growthRecord',
+        name: 'growthRecord',
+        component: e => require(['@/components/growthRecord'], e),
+      }
+    },
     {
       value: '用户列表',
       routerName: 'user',