账号设置，模块权限，标题显示问题

app/controller/sub_proj_setting_controller.js

@@ -64,7 +64,7 @@ module.exports = app => {
                 };
                 await this.layout('sp_setting/category.ejs', renderData, 'sp_setting/category_modal.ejs');
             } catch (error) {
-                console.log(error);
+                ctx.log(error);
                 ctx.redirect(`/sp/${ctx.subProject.id}/dashboard`);
             }
         }
@@ -89,7 +89,7 @@ module.exports = app => {
                 responseData.data = await ctx.service.category.addCategory(ctx.subProject, data.name, settingConst.cType.key.dropDown);
                 ctx.body = responseData;
             } catch (err) {
-                this.log(err);
+                ctx.log(err);
                 ctx.body = {err: 1, msg: err.toString(), data: null};
             }
         }
@@ -124,7 +124,7 @@ module.exports = app => {
 
                 ctx.body = responseData;
             } catch (err) {
-                this.log(err);
+                ctx.log(err);
                 ctx.body = {err: 1, msg: err.toString(), data: null};
             }
         }
@@ -145,7 +145,7 @@ module.exports = app => {
 
                 ctx.body = responseData;
             } catch (err) {
-                this.log(err);
+                ctx.log(err);
                 ctx.body = {err: 1, msg: err instanceof String ? err : '提交数据失败', data: null};
             }
         }
@@ -171,7 +171,7 @@ module.exports = app => {
 
                 ctx.body = responseData;
             } catch (err) {
-                this.log(err);
+                ctx.log(err);
                 ctx.body = {err: 1, msg: err.toString(), data: null};
             }
         }
@@ -193,7 +193,7 @@ module.exports = app => {
                 responseData.data = await ctx.service.category.getAllCategory(ctx.subProject);
                 ctx.body = responseData;
             } catch (err) {
-                this.log(err);
+                ctx.log(err);
                 ctx.body = {err: 1, msg: err.toString(), data: null};
             }
         }
@@ -261,7 +261,7 @@ module.exports = app => {
                 };
                 await this.layout('sp_setting/user.ejs', renderData, 'sp_setting/user_modal.ejs');
             } catch (error) {
-                console.log(error);
+                ctx.log(error);
                 ctx.redirect(`/sp/${ctx.subProject.id}/dashboard`);
             }
         }
@@ -294,6 +294,7 @@ module.exports = app => {
                 }).filter(x => { return x.groupList.length > 0; });
                 const renderData = {
                     ptype: ctx.query.ptype,
+                    ptypeStr: permissionConst[ctx.query.ptype].title,
                     accountGroup,
                     subProjectAccountList,
                     subProjectAllAccountList,
@@ -305,7 +306,7 @@ module.exports = app => {
                 };
                 await this.layout('sp_setting/permission.ejs', renderData, 'sp_setting/user_modal.ejs');
             } catch (error) {
-                console.log(error);
+                ctx.log(error);
                 ctx.redirect(`/sp/${ctx.subProject.id}/dashboard`);
             }
         }
@@ -336,7 +337,7 @@ module.exports = app => {
                 };
                 await this.layout('sp_setting/logs.ejs', renderData);
             } catch (error) {
-                console.log(error);
+                ctx.log(error);
                 ctx.redirect(`/sp/${ctx.subProject.id}/dashboard`);
             }
         }
@@ -353,7 +354,7 @@ module.exports = app => {
                     funSet: fun_set,
                 }, 'sp_setting/fun_modal.ejs');
             } catch (error) {
-                ctx.helper.log(error);
+                ctx.log(error);
                 ctx.redirect(`/sp/${ctx.subProject.id}/dashboard`);
             }
         }
@@ -395,7 +396,7 @@ module.exports = app => {
 
                 ctx.body = {err: 0, msg: '', data: null};
             } catch (error) {
-                ctx.helper.log(error);
+                ctx.log(error);
                 this.ajaxErrorBody(error, '保存数据失败');
             }
         }
@@ -439,7 +440,7 @@ module.exports = app => {
                 }
                 await this.layout('sp_setting/datacollect.ejs', renderData, 'sp_setting/datacollect_modal.ejs');
             } catch (error) {
-                ctx.helper.log(error);
+                ctx.log(error);
                 ctx.session.postError = error.toString();
                 ctx.redirect(`/sp/${ctx.subProject.id}/dashboard`);
             }
@@ -528,7 +529,7 @@ module.exports = app => {
                 }
                 ctx.body = responseData;
             } catch (err) {
-                this.log(err);
+                ctx.log(err);
                 ctx.body = {err: 1, msg: err.toString(), data: null};
             }
         }
@@ -587,7 +588,7 @@ module.exports = app => {
                 renderData.selfCategoryLevel = await this.ctx.service.projectAccount.getSelfCategoryLevel(this.ctx.session.sessionUser.accountId);
                 await this.layout('sp_setting/manage.ejs', renderData, 'sp_setting/manage_modal.ejs');
             } catch (error) {
-                ctx.helper.log(error);
+                ctx.log(error);
                 ctx.redirect(`/sp/${ctx.subProject.id}/dashboard`);
             }
         }
@@ -671,7 +672,7 @@ module.exports = app => {
                 }
                 ctx.body = responseData;
             } catch (err) {
-                this.log(err);
+                ctx.log(err);
                 ctx.body = { err: 1, msg: err.toString(), data: null };
             }
         }

app/service/sub_proj_permission.js

@@ -85,6 +85,7 @@ module.exports = app => {
                         for (const prop in pConst) {
                             c.permission.push({ key: prop, ...pConst[prop]});
                         }
+                        pConst.title = c.name;
                     }
                 } else {
                     p.permission = [];
@@ -93,6 +94,7 @@ module.exports = app => {
                     for (const prop in pConst) {
                         p.permission.push({ key: prop, ...pConst[prop]});
                     }
+                    pConst.title = p.name;
                 }
             }
         }

app/view/sp_setting/permission.ejs

@@ -41,7 +41,7 @@
                             <div class="col-9">
                                 <div class="card mb-2">
                                     <div class="card-header d-flex justify-content-between">
-                                        <div>决策大屏</div>
+                                        <div><%- ptypeStr %></div>
                                         <div class="ml-auto">
                                             <div class="form-check form-check-inline">
                                                 <span style="margin:0 .5rem 0 1rem; font-weight: bold;">筛选已授权</span>