权限修改

阿宝
1 parent dd5150c5
Showing 10 changed files with 459 additions and 195 deletions
E/system-commandline-sentinel-files/dotnet-suggest-registration-git-credential-manager-core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null
src/api/apis/apis.js
src/api/urls/apis.js
src/router/permission.js
src/store/index.js
src/views/index/mainIndex.vue
src/views/layout/header/header.vue
src/views/login/index.vue
src/views/setUp/account.vue
src/views/setUp/index.vue
+Exception during registration:
+System.ComponentModel.Win32Exception (0x80004005): 系统找不到指定的文件。
+   在 System.Diagnostics.Process.StartWithCreateProcess(ProcessStartInfo startInfo)
+   在 System.Diagnostics.Process.Start()
+   在 System.CommandLine.Invocation.Process.StartProcess(String command, String args, String workingDir, Action`1 stdOut, Action`1 stdErr, ValueTuple`2[] environmentVariables)
+   在 System.CommandLine.Builder.CommandLineBuilderExtensions.<>c.<<RegisterWithDotnetSuggest>b__10_1>d.MoveNext()
 \ No newline at end of file
@@ -28,9 +28,9 @@ export default {
     })
   },
   // 分页查询账号
-  deviceList(data) {
+  userPage(data) {
     return service({
-      url: setUpUrls.deviceList,
+      url: setUpUrls.userPage,
       method: 'POST',
       data
     })
@@ -7,7 +7,7 @@ export default {
   // 查询角色列表
   roleList: "/api_html/school/manager/roleList",
   //  分页查询账号
-  deviceList: "/api_html/school/manager/userPage",
+  userPage: "/api_html/school/manager/userPage",
   // 修改账号 禁用账号、修改账号密码等
   updateUser: "/api_html/school/manager/updateUser",
   // 查询学校详情
-import NProgress from "nprogress"
-import router from "./index"
-import store from "../store"
+import NProgress from "nprogress";
+import router from "./index";
+import store from "../store";
 //  获取角色信息，根据用户权限动态加载路由
 router.beforeEach((to, from, next) => {
-  NProgress.start()
-  if (store.getters.token) {
-    // if (to.path === "/login") {
-    next()
-    // } else {
-    // if (!store.getters.info.permissions) {
-    // (async function getAddRouters() {
-    //   // 省略 axios 请求代码 通过 token 向后台请求用户权限等信息，这里用假数据赋值
-    //   const userInfo = {
-    //     permissions: [
-    //       {
-    //         role: "superAdmin",
-    //         roleName: "超级管理员"
-    //       }
-    //     ],
-    //     name: "李老师",
-    //     // avatar: data.avatar ? data.avatar : "",
-    //     // uid: data.id,
-    //     authorityRouter: ["examinationPaper",
-    //       "examinationPaperAdd",
-    //       "examinationPaperEdit",
-    //       "examinationPaperRecycle", "ask",
-    //       "askAnalysis",
-    //       "test",
-    //       "testAnalysis", "portrait"],
-
-    //   }
-    //   await store.commit("setInfo", { ...userInfo })
-    //   await store.commit("setRouters", userInfo.authorityRouter)
-    //   let newAddRouters = store.getters.addRouters
-    //   newAddRouters.forEach(res => {
-    //     router.addRoute(res)
-    //   })
-    //   router.addRoute({
-    //     path: "*",
-    //     redirect: "/404",
-    //     hidden: true,
-    //     children: []
-    //   })
-    //   next({ path: to.fullPath })
-    // }())
-    // } else {
-    // next()
-    // }
-    // }
+  NProgress.start();
+  if (to.path === "/login") {
+    next();
   } else {
-    if (store.getters.info && store.getters.addRouters) {
-      console.log(store.getters.addRouters)
-      store.commit("setToken", "isLogin");
-      store.commit(
-        "setRouters",
-        store.getters.info.authorityRouter
-      );
-
-      let newAddRouters = store.getters.addRouters;
-      newAddRouters.forEach((res) => {
-        router.addRoute(res);
-      });
-      router.addRoute({
-        path: "*",
-        redirect: "/404",
-        hidden: true,
-        children: [],
-      });
-      next({ path: to.fullPath })
+    if (store.getters.token) {
+      next();
     } else {
-      if (store.getters.code) {
-        next()
+      if (store.getters.info && store.getters.addRouters) {
+        store.commit("setToken", "isLogin");
+        let userInfo = store.getters.info;
+        let authorityRouterObj = userInfo.permissions.filter((item) => {
+          return item.roleName == userInfo.showRoleName;
+        });
+        console.log([...authorityRouterObj[0]?.authorityRouter])
+        store.commit("setRouters", [...authorityRouterObj[0]?.authorityRouter]);
+        store.commit("setInfo", { ...userInfo });
+        store.getters.addRouters.forEach((res) => {
+          router.addRoute(res);
+        });
+        router.addRoute({
+          path: "*",
+          redirect: "/404",
+          hidden: true,
+          children: [],
+        });
+        next({ path: to.fullPath });
       } else {
-        if (to.path === "/login") {
-          next()
+        if (store.getters.code) {
+          next();
         } else {
-          next({ path: "/login" })
+          if (to.path === "/login") {
+            next();
+          } else {
+            next({ path: "/login" });
+          }
         }
       }
     }
   }
-})
+});
 router.afterEach(() => {
-  NProgress.done()
-})
+  NProgress.done();
+});
 router.onError((error) => {
   const pattern = /Loading chunk (\d)+ failed/g;
   const isChunkLoadFailed = error.message.match(pattern);
   const targetPath = router.history.pending.fullPath;
-  if (isChunkLoadFailed) { router.replace(targetPath); }
+  if (isChunkLoadFailed) {
+    router.replace(targetPath);
+  }
 });
-import Vue from "vue"
-import Vuex from "vuex"
-import Cookies from "js-cookie"
-import layoutStore from "./modules/layout/index"
-import { defaultRouter } from "@/router/index"
+import Vue from "vue";
+import Vuex from "vuex";
+import Cookies from "js-cookie";
+import layoutStore from "./modules/layout/index";
+import { defaultRouter } from "@/router/index";
 import { encryptLoginPassword } from "@/utils";
-import request from "@/api/index"
-import router from "@/router/index"
-import { addrouters } from "@/router/index"
-Vue.use(Vuex)
+import request from "@/api/index";
+import router from "@/router/index";
+import { addrouters } from "@/router/index";
+Vue.use(Vuex);
 const store = new Vuex.Store({
   state: {
     token: "",
     csCode: localStorage.getItem("csCode") || "",
-    info: sessionStorage.getItem("info") ? JSON.parse(sessionStorage.getItem("info")) : "", // 每次刷新都要通过token请求个人信息来筛选动态路由
-    routers: [],//左侧菜单
-    addRouters: sessionStorage.getItem("addRouters") ? JSON.parse(sessionStorage.getItem("addRouters")) : [],//动态路由
-    tokenSources: new Map(),//正在请求接口（切换取消请求）
+    info: sessionStorage.getItem("info")
+      ? JSON.parse(sessionStorage.getItem("info"))
+      : "", // 每次刷新都要通过token请求个人信息来筛选动态路由
+    routers: [], //左侧菜单
+    addRouters:
+      sessionStorage.getItem("addRouters") &&
+      sessionStorage.getItem("addRouters") != "undefined"
+        ? JSON.parse(sessionStorage.getItem("addRouters"))
+        : [], //动态路由
+    tokenSources: new Map(), //正在请求接口（切换取消请求）
   },
   mutations: {
     setToken(state, token) {
-      state.token = token
+      state.token = token;
     },
     setCode(state, code) {
       state.csCode = code;
-      localStorage.setItem("csCode", code)
+      localStorage.setItem("csCode", code);
     },
     setInfo(state, data) {
-      state.info = {
-        role: data.role,
-        permissions: data.permissions,
-        name: data.name,
-        authorityRouter: data.authorityRouter,
-        avatar: data.avatar ? data.avatar : "",
-        uid: data.uid
-      }
-      sessionStorage.setItem("info", JSON.stringify(state.info))
+      state.info = { ...data };
+      sessionStorage.setItem("info", JSON.stringify(state.info));
     },
     setRouters: (state, routers) => {
-      let aRouters = addrouters.filter(item => {
-        let path = item.children[0]?.path.replace("/", "")
-        return routers?.includes(path)
-      })
+      let aRouters = addrouters.filter((item) => {
+        let path = item.children[0]?.path.replace("/", "");
+        return routers?.includes(path);
+      });
-      state.addRouters = aRouters // 保存动态路由用来addRouter
-      state.routers = defaultRouter.concat(aRouters) // 所有有权限的路由表，用来生成菜单列表
-      sessionStorage.setItem("addRouters", JSON.stringify(routers))
+      state.addRouters = aRouters; // 保存动态路由用来addRouter
+      state.routers = defaultRouter.concat(aRouters); // 所有有权限的路由表，用来生成菜单列表
+      sessionStorage.setItem("addRouters", JSON.stringify(routers));
     },
     setTokenSources(state, data) {
       if (data instanceof Array) {
-        state.tokenSources.set(data[0], data[1])
+        state.tokenSources.set(data[0], data[1]);
       } else {
-        state.tokenSources = new Map()
+        state.tokenSources = new Map();
       }
     },
     delTokenSources(state, data) {
-      state.tokenSources.delete(data)
+      state.tokenSources.delete(data);
     },
   },
   actions: {
     Login({ state, commit }, params) {
-      let loginForm = {}
+      let loginForm = {};
       loginForm.username = params.username;
       loginForm.password = encryptLoginPassword(params.password);
-      request.login({ ...loginForm }).then(res => {
-        let response = res
-        if (response.status == 0) {
-          const userInfo = { ...response.data }
-          commit("setToken", Cookies.get("ZT_YIJIAO_TOKEN"));
-          commit("setInfo", { ...userInfo });
-
-          commit("setRouters", [...userInfo.authorityRouter])
-          state.addRouters.forEach((res) => {
-            router.addRoute(res);
-          });
-          router.addRoute({
-            path: "*",
-            redirect: "/404",
-            hidden: true,
-            children: []
-          })
-          console.log()
-          if (params.url) {
-            window.location.href = params.url;
-          } else {
-            router.push({ path: "/" })
+      request
+        .login({ ...loginForm })
+        .then((res) => {
+          let response = res;
+          if (response.status == 0) {
+            const userInfo = { ...response.data };
+            userInfo.showRoleName = response.data.permissions[0]?.roleName;
+            commit("setToken", "isLogin");
+            commit("setInfo", { ...userInfo });
+            commit("setRouters", [...userInfo.permissions[0]?.authorityRouter]);
+            state.addRouters.forEach((res) => {
+              router.addRoute(res);
+            });
+            router.addRoute({
+              path: "*",
+              redirect: "/404",
+              hidden: true,
+              children: [],
+            });
+            console.log(Cookies.get("ZT_YIJIAO_TOKEN"));
+            if (params.url) {
+              window.location.href = params.url;
+            } else {
+              router.push({ path: "/" });
+            }
           }
-        }
-      }).catch(() => {
-      })
+        })
+        .catch(() => {});
     },
-    permissions({ state, commit }, that) {
-        let userInfo = {
-          permissions: [
-            {
-              role: "ROLE_XUEXIAO",
-              roleName: "学校管理员",
-            },
-            {
-              role: "ROLE_LAOSHI",
-              roleName: "老师",
-            },
-          ],
-          name: "李老师",
-          authorityRouter:[
-            "setUpAccount",
-            "setUpSchool",
-            "setUpTeacher",
-            "setUpStudent",
-            "card",
-            "device",
-            "analysis",
-            "down",
-            "downClient",
-            "dataSync"
-          ],
-        }
-      commit("setToken", "xxxx")
+    permissions({ state, commit }, role) {
+      commit("setToken", "isLogin");
+      let userInfo = state.info;
+      let authorityRouterObj = userInfo.permissions.filter((item) => {
+        return item.role == role;
+      });
+      userInfo.showRoleName = authorityRouterObj[0]?.roleName
       commit("setInfo", userInfo);
-      commit("setRouters", [...userInfo.authorityRouter])
+      commit("setRouters", [...authorityRouterObj[0]?.authorityRouter]);
       state.addRouters.forEach((res) => {
         router.addRoute(res);
       });
@@ -127,27 +108,26 @@ const store = new Vuex.Store({
         path: "*",
         redirect: "/404",
         hidden: true,
-        children: []
-      })
-      // }
-      // })
-    }
+        children: [],
+      });
+      router.push({ path: "/" });
+    },
   },
   getters: {
-    addRouters: state => state.addRouters,
-    token: state => state.token,
-    code: state => state.csCode,
-    info: state => state.info,
-    routers: state => state.routers,
-    logoShow: state => state.layoutStore.logoShow,
-    isCollapse: state => state.layoutStore.isCollapse,
-    uniquerouter: state => state.layoutStore.uniquerouter,
-    tabnavBox: state => state.layoutStore.tabnavBox,
-    rightNav: state => state.layoutStore.rightNav
+    addRouters: (state) => state.addRouters,
+    token: (state) => state.token,
+    code: (state) => state.csCode,
+    info: (state) => state.info,
+    routers: (state) => state.routers,
+    logoShow: (state) => state.layoutStore.logoShow,
+    isCollapse: (state) => state.layoutStore.isCollapse,
+    uniquerouter: (state) => state.layoutStore.uniquerouter,
+    tabnavBox: (state) => state.layoutStore.tabnavBox,
+    rightNav: (state) => state.layoutStore.rightNav,
   },
   modules: {
-    layoutStore
-  }
-})
+    layoutStore,
+  },
+});
-export default store
+export default store;
@@ -102,7 +102,7 @@ export default {
     };
   },
   watch:{
-    "$store.getters.routers":function(val){
+    "$store.getters.info.showRoleName":function(val){
       window.location.reload()
     }
   },
@@ -14,7 +14,7 @@
             <img :src="avatar" />
             <div class="txt">
               <p>{{ `${this.$store.getters.info.name}` }}</p>
-              <p>{{ `${permissions[0].roleName}` }}</p>
+              <p>{{ `${this.$store.getters.info.showRoleName}` }}</p>
             </div>
             <i class="el-icon-arrow-down"></i>
           </div>
@@ -125,7 +125,7 @@ export default {
     },
     handleCommand(command) {
       //刷新权限跳转首页
-      this.$store.dispatch("permissions", this);
+      this.$store.dispatch("permissions", command);
     },
     async logOut() {
       const { data,status } = await this.$request.logout();
@@ -92,8 +92,10 @@ export default {
       loginForm: {
         // username: "13610050254",
         // password: "Pw050254#",
-        username: "18946034886",
-        password: "Pw034886#",
+        // username: "18946034886",
+        // password: "Pw034886#",
+        username: "18332123505",
+        password: "Pw123505#",
       },
       loginRules: {
         username: [
 <template>
-  <div>账号管理</div>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>账号管理</span>
+      </template>
+    </back-box>
+    <div class="answer-header">
+      <div class="sel-box">
+        <el-select
+          class="sel"
+          v-model="query.id"
+          placeholder="选择账号角色"
+          @change="(page = 1),_QueryData(1)"
+        >
+          <el-option
+            v-for="item in roleList"
+            :key="item.id"
+            :label="item.roleName"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          class="sel"
+          v-model="query.available"
+          placeholder="选择账号状态"
+          @change="(page = 1),_QueryData(1)"
+        >
+          <el-option label="可用" :value="0"></el-option>
+          <el-option label="不可用" :value="1"></el-option>
+        </el-select>
+        <el-input
+          type="number"
+          placeholder="请输入老师账号"
+          v-model="query.loginName"
+          class="input-with-select"
+          @keyup.enter.native="(page = 1),_QueryData(2)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="(page = 1),_QueryData(2)"
+          ></el-button>
+        </el-input>
+        <el-input
+          placeholder="请输入老师姓名"
+          v-model="query.realName"
+          class="input-with-select"
+          @keyup.enter.native="(page = 1),_QueryData(3)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="(page = 1),_QueryData(3)"
+          ></el-button>
+        </el-input>
+      </div>
+    </div>
+    <div class="table-box">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        v-loading="loading"
+      >
+        <el-table-column
+          prop="loginName"
+          label="账号"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="realName"
+          label="姓名"
+          align="center"
+        ></el-table-column>
+        <el-table-column prop="roleList" label="角色" align="center">
+          <template slot-scope="scoped">
+            <span v-for="(item, index) in scoped.row.roleList" :key="item.id">{{
+              `${item.roleName}${
+                index != scoped.row.roleList.length - 1 ? "、" : ""
+              }`
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="available" label="状态" align="center"
+          ><template slot-scope="scoped">{{
+            `${scoped.row.available == 0 ? "可用" : "不可用"}`
+          }}</template></el-table-column
+        >
+        <el-table-column
+          prop="createdTime"
+          label="创建时间"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scoped">
+            <el-tooltip content="修改账号" placement="left">
+              <el-button
+                class="set-count"
+                type="primary"
+                circle
+                icon="el-icon-edit-outline"
+                size="mini"
+                @click="setCount(scoped.row)"
+              ></el-button>
+            </el-tooltip>
+            <el-dropdown
+              trigger="hover"
+              @command="handleDropdownClick($event, scoped.row)"
+            >
+              <el-button
+                type="info"
+                size="mini"
+                circle
+                icon="el-icon-more"
+              ></el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item :command="0">重置密码</el-dropdown-item>
+                <el-dropdown-item :command="1">禁用</el-dropdown-item>
+                <el-dropdown-item :command="2">删除</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination-box">
+        <el-pagination
+          small=""
+          layout="total,prev, pager, next"
+          :hide-on-single-page="true"
+          :total="total"
+          @current-change="changePage"
+          :current-page="page"
+          :page-size="size"
+        >
+        </el-pagination>
+      </div>
+      <el-empty
+        v-if="!loading && tableData.length == 0"
+        content="没有更多数据"
+        :image-size="100"
+      ></el-empty>
+    </div>
+    <el-dialog title="修改年级信息" :visible.sync="diaCount" width="400">
+      <el-form
+        class="form-box"
+        :model="formCount"
+        :rules="ruleCount"
+        ref="formCount"
+        label-width="160px"
+      >
+        <el-form-item label="手机号码：" prop="loginName">
+          <el-col :span="12">
+            <el-input
+              placeholder="请输入联系电话"
+              v-model.trim="formCount.loginName"
+              maxlength="11"
+            >
+            </el-input>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="姓名：" prop="realName">
+          <el-col :span="12">
+            <el-input
+              placeholder="请输入教师姓名"
+              v-model.trim="formCount.realName"
+              maxlength="11"
+            >
+            </el-input>
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="saveCount">确 定</el-button>
+        <el-button @click="diaCount = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 <script>
 export default {
+  data() {
+    return {
+      loading: false,
+      diaCount: false,
+      formCount: {
+        userId: "",
+        loginName: "",
+        realName: "",
+      },
+      ruleCount: {
+        loginName: [
+          { required: true, message: "请输入联系电话", trigger: "blur" },
+        ],
+        realName: [
+          { required: true, message: "请输入教师姓名", trigger: "blur" },
+        ],
+      },
+      roleList: [],
+      query: {
+        roleId: "",
+        available: "",
+        loginName: "",
+        realName: "",
+      },
+      tableData: [],
+      total: 0,
+      page: 1,
+      size: 20,
+    };
+  },
+  created() {
+    this._QueryData(4);
+    this._RoleList();
+  },
+  methods: {
+    setCount(obj) {
+      this.formCount.userId = obj.userId;
+      this.formCount.loginName = obj.loginName;
+      this.formCount.realName = obj.realName;
+      this.diaCount = true;
+    },
+    handleDropdownClick(value, item) {
+      //更多
+      this.updateUser(item, value);
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData(4);
+    },
-}
+    saveCount() {
+      this.$refs.formCount.validate(async (valid) => {
+        if (valid) {
+          const { data, status, info } = await this.$request.updateUser({
+            type: 3,
+            ...this.formCount,
+          });
+          if (status === 0) {
+            this.$message.success(info);
+            this._QueryData(4);
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          console.log("输入有误请检查！");
+          return false;
+        }
+      });
+    },
+    async updateUser(obj, type) {
+      let query = {
+        userId: obj.userId,
+        type: type,
+      };
+      if (type == 1) {
+        query.available = obj.available == 0 ? 1 : 0;
+      }
+      const { data, status, info } = await this.$request.updateUser({
+        ...query,
+      });
+      if (status === 0) {
+        this.$message.success(info);
+        this._QueryData(4);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _RoleList() {
+      const { data, status, info } = await this.$request.roleList();
+      if (status === 0) {
+        this.roleList = data.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData(type) {
+      let query = {};
+      if (type == 1) {
+        query.roleId = this.query.roleId;
+        query.available = this.query.available;
+        this.query.loginName = "";
+        this.query.realName = "";
+      } else if (type == 2) {
+        this.query.roleId = "";
+        this.query.available = "";
+        query.loginName = this.query.loginName;
+        this.query.realName = "";
+      } else if (type == 3) {
+        this.query.roleId = "";
+        this.query.available = "";
+        this.query.loginName = "";
+        query.realName = this.query.realName;
+      } else {
+        query = { ...this.query };
+      }
+      this.loading = true;
+      this.tableData = [];
+      const { data, status, info } = await this.$request.userPage({
+        ...query,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = data.list || [];
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
 </script>
-<style>
-
+<style lang="scss" scoped>
+.set-count {
+  margin-right: 12px;
+}
+.table-box {
+  padding: 0 20px;
+}
 </style>
 \ No newline at end of file