角色调整

src/constants/adminNavs.js

@@ -2,7 +2,7 @@ const navs = [
   {
     title: "超管中心",
     name: "admin",
-    icon: "el-icon-receiving",
+    icon: "el-icon-help",
     children: [
       {
         title: "用户管理",

src/main.js

@@ -68,8 +68,8 @@ axios.interceptors.request.use(
     let token = Vue.ls.get("token");
     if (token) {
       const ids = {
-        orgId: Vue.ls.get("orgId"),
-        schoolId: Vue.ls.get("schoolId"),
+        orgId: Vue.ls.get("orgId", ""),
+        schoolId: Vue.ls.get("schoolId", ""),
         userId: Vue.ls.get("user", { id: "" }).id
       };
       Object.entries(ids).forEach(([key, val]) => {

src/modules/admin/views/Admin.vue

@@ -10,6 +10,10 @@
             <i class="el-icon-s-home"></i>
             <span>切换学校</span>
           </li>
+          <li class="menu-item menu-item-account">
+            <i class="el-icon-s-custom"></i>
+            <span :title="username">{{ username }}</span>
+          </li>
           <li class="menu-item" @click="toLogout">
             <i class="el-icon-switch-button"></i>
             <span>退出登录</span>
@@ -80,6 +84,7 @@
 
 <script>
 import localNavs from "@/constants/adminNavs";
+import { SYS_ADMIN_NAME } from "@/constants/enumerate";
 import { logout } from "@/modules/login/api";
 
 export default {
@@ -99,6 +104,13 @@ export default {
     }
   },
   created() {
+    const loginName = this.$ls.get("user", { loginName: "" }).loginName;
+    if (loginName !== SYS_ADMIN_NAME) {
+      this.$message.error("非法操作!");
+      this.$router.replace({ name: "Login" });
+      return;
+    }
+
     if (this.$route.name === "Admin") {
       this.$router.replace({
         name: "AdminUserManage"

src/modules/admin/views/AdminUserManage.vue

@@ -47,21 +47,13 @@
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="loginName" label="用户名"></el-table-column>
-        <el-table-column
-          prop="realName"
-          label="姓名"
-          width="120"
-        ></el-table-column>
+        <el-table-column prop="realName" label="姓名"></el-table-column>
         <el-table-column prop="roles" label="角色">
           <template slot-scope="scope">
             {{ scope.row.roles | rolesFilter }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="mobileNumber"
-          label="手机号"
-          width="120"
-        ></el-table-column>
+        <el-table-column prop="mobileNumber" label="手机号"></el-table-column>
         <el-table-column prop="enable" label="状态" width="100">
           <template slot-scope="scope">
             {{ scope.row.enable | enableFilter }}

src/modules/base/components/ModifyTemplate.vue

@@ -148,8 +148,8 @@ export default {
     format() {
       const formats = {
         GENERIC: ["html"],
-        VARIABLE: ["pdf"],
-        ORDINARY: ["pdf"]
+        VARIABLE: ["ftl"],
+        ORDINARY: ["ftl", "html", "pdf"]
       };
       return formats[this.modalForm.type];
     }

src/modules/base/views/UserManage.vue

@@ -203,6 +203,9 @@ export default {
     async getRoleList() {
       const data = await userRoleListPage();
       this.roles = data || [];
+      this.roles = this.roles.filter(
+        item => item.type !== "ADMIN" && item.type !== "CUSTOMER"
+      );
     },
     async getList() {
       const datas = {

src/modules/login/views/SelectSchool.vue

@@ -15,7 +15,7 @@
           </el-form-item>
           <el-form-item>
             <el-button style="width:100%;" type="primary" @click="confirm"
-              >确定</el-button
+              >进入学校</el-button
             >
           </el-form-item>
           <el-form-item>