修改

src/components/organization/index.vue

@@ -13,7 +13,7 @@
       <div class="paren_content">
         <div class="dptBox" v-show="active == 0">
           <el-scrollbar style="height: 100%">
-            <el-tree :data="data" :check-strictly="true" show-checkbox @node-click="nodeClick" @check-change="currentChange" :props="defaultProps" default-expand-all :default-checked-keys="checkedKeys" :expand-on-click-node="false" :node-key="nodekey" ref="tree" highlight-current>
+            <el-tree :data="data" :check-strictly="true" show-checkbox @node-click="nodeClick" @check-change="currentChange" :props="defaultProps" :default-checked-keys="checkedKeys" :expand-on-click-node="false" :node-key="nodekey" ref="tree" highlight-current>
               <span v-if="orgType == 'org'" slot-scope="{ data }" :title="data.OrganName" class="org-data-tree-node">
                 {{ data.OrganName }}
               </span>

src/components/permissionlist/permissionlist.scss

@@ -81,7 +81,7 @@
     }
     > .paren_list {
       width: 100%;
-      margin-bottom: 10px;
+      margin-top: 16px;
       > ul {
         width: 100%;
         height: 100%;
@@ -138,7 +138,7 @@
               width: 100%;
             }
             .cide {
-              height: 80px;
+              // height: 80px;
               cursor: pointer;
               background: #f5f7fa;
               box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
@@ -243,7 +243,7 @@
 .hucPower {
   .right {
     .paren_content {
-      height: 25%;
+      height: 40%;
     }
   }
 }

src/components/usergrouptree/index.vue

@@ -11,30 +11,10 @@
     <div class="head">
       <p>{{ title }}</p>
     </div>
-    <div
-      :class="type ? 'radioBg':''"
-      class="content"
-    >
-      <el-scrollbar
-        style="height: 100%"
-        wrap-style="overflow-x:hidden;"
-      >
-        <el-tree
-          ref="tree"
-          :data="data"
-          show-checkbox
-          :check-strictly="true"
-          :default-props="defaultProps"
-          :expand-on-click-node="false"
-          node-key="GroupId"
-          default-expand-all
-          highlight-current
-          @check-change="currentChange"
-        >
-          <span
-            slot-scope="{ data }"
-            class="custom-tree-node"
-          >
+    <div :class="type ? 'radioBg':''" class="content">
+      <el-scrollbar style="height: 100%" wrap-style="overflow-x:hidden;">
+        <el-tree ref="tree" :data="data" show-checkbox :check-strictly="true" :default-props="defaultProps" :expand-on-click-node="false" node-key="GroupId" highlight-current @check-change="currentChange">
+          <span slot-scope="{ data }" class="custom-tree-node">
             {{ data.GroupName }}
           </span>
         </el-tree>
@@ -75,7 +55,7 @@ export default {
       default: false
     }
   },
-  data() {
+  data () {
     return {
       data: [], // tree数据
       checkedList: [], // 已选中数据
@@ -85,19 +65,19 @@ export default {
   },
   watch: {
     checkedKeys: {
-      handler(val) {
+      handler (val) {
         this.checkedList = val
         this.$refs.tree.setCheckedKeys(val)
       },
       deep: true
     }
   },
-  created() {
+  created () {
     this.getGroupTree()
   },
   methods: {
     // 复选框选中
-    currentChange(data, isChecked) {
+    currentChange (data, isChecked) {
       if (this.type) {
         const { GroupId } = data
         this.$emit('getTreeData', this.$refs.tree.getCheckedNodes())
@@ -110,7 +90,7 @@ export default {
         this.$emit('getTreeData', arr)
       }
     },
-    async getGroupTree() {
+    async getGroupTree () {
       const result = await GetGroupTree({
         QueryName: '',
         PageIndex: this.pageIndex,

src/layout/index.vue

@@ -112,8 +112,12 @@ export default {
     //退出系统-确定
     async outQd () {
       sessionStorage.removeItem("userName")
+      sessionStorage.removeItem("tabViews")
       await this.$store.dispatch('app/toggleOutcheck', true)
       this.$store.dispatch('app/toggleOutflag', false)
+      // this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
+      //   this.$router.push('/login')
+      // })
     },
     //修改密码
     async editPwd () {

src/router/routes/routes-file-four.js

@@ -40,7 +40,7 @@ const systemManagementRoutes = {
     },
   },
   {
-    path: 'LoginPolicy',
+    path: '/LoginPolicy',
     name: 'LoginPolicy',
     component: () => import('@/views/systemManagement/LoginPolicy/index'),
     meta: {
@@ -52,7 +52,7 @@ const systemManagementRoutes = {
     },
   },
   {
-    path: 'addSystem',
+    path: '/addSystem',
     name: 'addSystem',
     hidden: true,
     component: () => import('@/views/systemManagement/addSystem/index'),
@@ -64,7 +64,7 @@ const systemManagementRoutes = {
     },
   },
   {
-    path: 'EditSystem',
+    path: '/EditSystem',
     name: 'EditSystem',
     hidden: true,
     component: () => import('@/views/systemManagement/EditSystem/index'),

src/store/modules/user.js

@@ -102,7 +102,7 @@ const actions = {
         removeToken('systemSet');
         resetRouter();
         commit('RESET_STATE');
-        commit('SET_ROLES', [])
+        commit('SET_ROLES', []);
         resolve();
       })
 

src/views/accountGroupManagement/components/accountGroupAdd.vue

@@ -36,7 +36,7 @@
           <Rolelist title="角色" @checkClick="checkClick" @checkChange="checkChange" :GroupIds="GroupIds" />
         </div>
         <div class="flex1 part">
-          <Permissionlist :RoleList="RoleList" :check="true" class="hucPower" title="权限列表" />
+          <Permissionlist :RoleList="RoleList" :check="true" title="权限列表" />
         </div>
       </template>
       <!--无角色-->

src/views/accountGroupManagement/components/accountGroupEdit copy.vue

@@ -8,27 +8,12 @@
         </div>
       </div>
       <div class="addApp-form-content dialog-public-background">
-        <el-form
-          :inline="true"
-          ref="addFrom"
-          :rules="rules"
-          class="form"
-          :model="addFrom"
-        >
+        <el-form :inline="true" ref="addFrom" :rules="rules" class="form" :model="addFrom">
           <el-form-item prop="name" label="账号组名称">
-            <el-input
-              maxlength="16"
-              placeholder="账号组名称"
-              v-model="addFrom.name"
-            ></el-input>
+            <el-input maxlength="16" placeholder="账号组名称" v-model="addFrom.name"></el-input>
           </el-form-item>
           <el-form-item label="描述" style="margin-left: 40px">
-            <el-input
-              style="width: 640px"
-              placeholder="请输入描述"
-              maxlength="200"
-              v-model="addFrom.textarea2"
-            ></el-input>
+            <el-input style="width: 640px" placeholder="请输入描述" maxlength="200" v-model="addFrom.textarea2"></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -38,41 +23,17 @@
       <el-row :gutter="24" v-if="this.openRole != 0">
         <el-col :span="8">
           <div class="part">
-            <Organization
-              title="所属账号组"
-              :data="data"
-              :defaultProps="defaultProps"
-              :checkedKeys="[GroupUpid]"
-              :nodekey="'GroupId'"
-              :checkedIdList="checkedIdList"
-              @getTreeData="getTreeData"
-              :type="true"
-            />
+            <Organization title="所属账号组" :data="data" :defaultProps="defaultProps" :checkedKeys="[GroupUpid]" :nodekey="'GroupId'" :checkedIdList="checkedIdList" @getTreeData="getTreeData" :type="true" />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="part">
-            <rolelists
-              title="角色列表"
-              @checkChange="checkChange"
-              @checkClick="radioChanges"
-              :checkBoxList="checkRole"
-              :dataList="roleList"
-              :roleType="roleType"
-              :GroupIds="GroupIds"
-              :number="8"
-            />
+            <rolelists title="角色列表" @checkChange="checkChange" @checkClick="radioChanges" :checkBoxList="checkRole" :dataList="roleList" :roleType="roleType" :GroupIds="GroupIds" :number="8" />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="part">
-            <permissionlist
-              title="权限列表"
-              :RoleList="powerList"
-              :check="true"
-              class="hucPower"
-              @Competen="Competen"
-            />
+            <permissionlist title="权限列表" :RoleList="powerList" :check="true" @Competen="Competen" />
           </div>
         </el-col>
       </el-row>
@@ -80,27 +41,12 @@
       <el-row :gutter="24" v-else>
         <el-col :span="8">
           <div class="part">
-            <Organization
-              title="所属账号组"
-              :data="dataObj"
-              :defaultProps="defaultProps"
-              :nodekey="'GroupId'"
-              :checkedKeys="[GroupUpid]"
-              :checkedIdList="checkedIdList"
-              @getTreeData="getTreeData"
-            />
+            <Organization title="所属账号组" :data="dataObj" :defaultProps="defaultProps" :nodekey="'GroupId'" :checkedKeys="[GroupUpid]" :checkedIdList="checkedIdList" @getTreeData="getTreeData" />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="part">
-            <Permissiontree
-              @nodeClick="nodeClick"
-              :checkedKeys="powerT"
-              @getTreeData="getTreeDatas"
-              :queryType="queryType"
-              :queryId="queryId"
-              title="权限树"
-            />
+            <Permissiontree @nodeClick="nodeClick" :checkedKeys="powerT" @getTreeData="getTreeDatas" :queryType="queryType" :queryId="queryId" title="权限树" />
           </div>
         </el-col>
         <el-col :span="8">
@@ -156,9 +102,9 @@ export default {
       default: () => [],
     },
   },
-  data() {
+  data () {
     return {
-      roleType:"",
+      roleType: "",
       checkedAuthList: [],
       GroupId: this.$route.query.GroupId,
       GroupUpid: this.$route.query.GroupUpid,
@@ -198,11 +144,11 @@ export default {
       queryId: "",
       queryType: "group",
       objID: "",
-      GroupIds:[],
+      GroupIds: [],
     };
   },
 
-  created() {
+  created () {
     let obj;
     if (typeof this.$store.state.app.systemSet == "string") {
       obj = JSON.parse(this.$store.state.app.systemSet);
@@ -233,7 +179,7 @@ export default {
   },
   watch: {
     dataList: {
-      handler(val) {
+      handler (val) {
         const arr = [val];
         // this.decompose(arr, this.GroupUpid);
         if (Array.isArray(val)) {
@@ -248,19 +194,19 @@ export default {
 
   methods: {
     //权限树点击
-    nodeClick(obj) {
+    nodeClick (obj) {
       const arr = this.$store.getters.authArrs;
       arr.push(obj);
       this.$store.dispatch("auth/changeAuthArrs", arr);
     },
     //获取权限树回调
-    getTreeDatas(arr) {
+    getTreeDatas (arr) {
       this.checkedAuthList = arr;
     },
     //获取选中的树数据
-    getTreeData(arr) {
+    getTreeData (arr) {
       this.checkTrees = arr;
-      if(this.checkTrees.length==1){
+      if (this.checkTrees.length == 1) {
         let id = arr[0].GroupId
         console.log(id)
         this.GroupIds = [id]
@@ -269,11 +215,11 @@ export default {
     },
 
     //获取权限规则
-    getData(obj) {
+    getData (obj) {
       this.rulesObj = obj;
     },
     //获取指定数据
-    decompose(data, id) {
+    decompose (data, id) {
       for (let i = 0; i < data.length; i++) {
         if (data[i].GroupId == id) {
           this.dataObj = data[i];
@@ -285,7 +231,7 @@ export default {
       }
     },
     //账号组详情
-    async getDeaitls() {
+    async getDeaitls () {
       try {
         const res = await GetGroupDetails({
           GroupId: this.GroupId,
@@ -313,7 +259,7 @@ export default {
         console.log("出错了", error);
       }
     },
-    async radioChanges(data) {
+    async radioChanges (data) {
       try {
         let params = {
           RoleIds: [data.RoleId],
@@ -329,7 +275,7 @@ export default {
       }
     },
     //角色列表
-    async queryRole() {
+    async queryRole () {
       try {
         const res = await GetRoleByGroup({
           GroupId: this.objID,
@@ -352,7 +298,7 @@ export default {
       }
     },
     //所有角色列表
-    async RoleBox() {
+    async RoleBox () {
       try {
         const res = await QueryRole({
           QueryName: "",
@@ -392,7 +338,7 @@ export default {
     //   }
     // },
     //获取权限列表
-    async radioChange(data) {
+    async radioChange (data) {
       try {
         let params = {
           RoleId: data,
@@ -407,11 +353,11 @@ export default {
         console.log("出错了", error);
       }
     },
-    Competen(data) {
+    Competen (data) {
       this.$emit("Competen", data);
     },
     //账号组修改保存
-    async editAuth() {
+    async editAuth () {
       this.checkedAuthList.forEach((item) => {
         this.treeData1.push(item.AuthList);
       });
@@ -446,7 +392,7 @@ export default {
       }
     },
     //角色选取
-    checkChange(arr) {
+    checkChange (arr) {
       const datas = [];
       const arrs = [];
       for (let i = 0; i < arr.length; i++) {
@@ -463,7 +409,7 @@ export default {
       this.checkRoles = arrs;
     },
   },
-  mounted(){
+  mounted () {
     this.roleType = "roleByUpId"
   }
 };

src/views/accountGroupManagement/components/accountGroupEdit.vue

@@ -3,45 +3,17 @@
     <div class="postmanagementadd_header">
       <div class="postmanagementadd_top">
         <div class="tltleLeft">{{ pageTitle }}</div>
-        <div
-          v-is="['group_btn_edit']"
-          class="btn"
-          style="margin-top: 20px"
-        >
-          <el-button
-            type="primary"
-            @click="handleClickSave('editForm')"
-          >保存</el-button>
+        <div v-is="['group_btn_edit']" class="btn" style="margin-top: 20px">
+          <el-button type="primary" @click="handleClickSave('editForm')">保存</el-button>
         </div>
       </div>
       <div class="addApp-form-content dialog-public-background">
-        <el-form
-          ref="editForm"
-          :inline="true"
-          :rules="rules"
-          class="form"
-          :model="editForm"
-        >
-          <el-form-item
-            prop="name"
-            label="账号组名称"
-          >
-            <el-input
-              v-model="editForm.name"
-              maxlength="32"
-              placeholder="账号组名称"
-            />
+        <el-form ref="editForm" :inline="true" :rules="rules" class="form" :model="editForm">
+          <el-form-item prop="name" label="账号组名称">
+            <el-input v-model="editForm.name" maxlength="32" placeholder="账号组名称" />
           </el-form-item>
-          <el-form-item
-            label="描述"
-            style="margin-left: 40px"
-          >
-            <el-input
-              v-model="editForm.desc"
-              style="width: 640px"
-              placeholder="请输入描述"
-              maxlength="200"
-            />
+          <el-form-item label="描述" style="margin-left: 40px">
+            <el-input v-model="editForm.desc" style="width: 640px" placeholder="请输入描述" maxlength="200" />
           </el-form-item>
         </el-form>
       </div>
@@ -50,43 +22,19 @@
       <el-row :gutter="24">
         <el-col :span="8">
           <div class="part">
-            <AccountGroupTree
-              title="上级账号组"
-              nodekey="GroupId"
-              :check-disabled="doesGroupExist"
-              :type="true"
-              :defaultProps="defaultProps"
-              :checkedKeys="accountGroupTreeCheckedList"
-              @getTreeData="getAccountGroupChecked"
-            />
+            <AccountGroupTree title="上级账号组" nodekey="GroupId" :check-disabled="doesGroupExist" :type="true" :defaultProps="defaultProps" :checkedKeys="accountGroupTreeCheckedList" @getTreeData="getAccountGroupChecked" />
           </div>
         </el-col>
         <!-- 开启角色 -->
         <template v-if="openRole">
           <el-col :span="8">
             <div class="part">
-              <RoleList
-                title="角色列表"
-                :roleType="roleType"
-                :GroupIds="groupIds"
-                :checkBoxList="roleListCheckedList"
-                :number="8"
-                :active="true"
-                @checkChange="getRoleListChecked"
-                @checkClick="selectRole"
-                @roleListChange="roleListCheckedChange"
-              />
+              <RoleList title="角色列表" :roleType="roleType" :GroupIds="groupIds" :checkBoxList="roleListCheckedList" :number="8" :active="true" @checkChange="getRoleListChecked" @checkClick="selectRole" @roleListChange="roleListCheckedChange" />
             </div>
           </el-col>
           <el-col :span="8">
             <div class="part">
-              <PermissionList
-                title="权限列表"
-                class="hucPower"
-                :RoleList="checkedRoles"
-                :check="true"
-                @Competen="Competen"
-              />
+              <PermissionList title="权限列表" :RoleList="checkedRoles" :check="true" @Competen="Competen" />
             </div>
           </el-col>
         </template>
@@ -94,22 +42,12 @@
         <template v-else>
           <el-col :span="8">
             <div class="part">
-              <PermissionTree
-                title="权限树"
-                :checkedKeys="permissionTreeChckedKeys"
-                :queryType="queryType"
-                :queryIds="queryIds"
-                @getTreeData="getPermissionTreeChecked"
-              />
+              <PermissionTree title="权限树" :checkedKeys="permissionTreeChckedKeys" :queryType="queryType" :queryIds="queryIds" @getTreeData="getPermissionTreeChecked" />
             </div>
           </el-col>
           <el-col :span="8">
             <div class="part">
-              <RulesOfCompetency
-                title="权限规则"
-                margin-b="20px"
-                @getData="getRulesOfCompetency"
-              />
+              <RulesOfCompetency title="权限规则" margin-b="20px" @getData="getRulesOfCompetency" />
             </div>
           </el-col>
         </template>
@@ -156,7 +94,7 @@ export default {
     // Dialog
   },
   // mixins: [treeData],
-  data() {
+  data () {
     return {
       doesGroupExist: this.$route.meta.doesGroupExist, // 控制账号组新增/编辑
       GroupId: 0,
@@ -196,11 +134,11 @@ export default {
   },
   computed: {
     ...mapGetters(['systemSet']),
-    pageTitle() {
+    pageTitle () {
       return this.doesGroupExist ? '编辑账号组' : '新增账号组'
     }
   },
-  created() {
+  created () {
     // 获取系统配置
     let obj
     if (typeof this.systemSet === 'string') {
@@ -215,7 +153,7 @@ export default {
     this.groupIds.push(this.GroupUpId)
     this.queryIds.push(this.GroupUpId)
   },
-  mounted() {
+  mounted () {
     if (this.doesGroupExist) {
       this.GroupId = this.$route.query.GroupId
       this.getGroupDetails()
@@ -227,7 +165,7 @@ export default {
   },
   methods: {
     // 账号组详情
-    async getGroupDetails() {
+    async getGroupDetails () {
       try {
         const res = await GetGroupDetails({
           GroupId: this.GroupId
@@ -261,7 +199,7 @@ export default {
       }
     },
     // 保存
-    handleClickSave(formName) {
+    handleClickSave (formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
           this.handleSaveEdit()
@@ -272,12 +210,12 @@ export default {
       })
     },
     // 获取当前权限树勾选项
-    getPermissionTreeChecked(arr) {
+    getPermissionTreeChecked (arr) {
       // console.log(arr)
       this.permissionTreeChckedTemp = arr.map(auth => auth.AuthList)
     },
     // 获取当前勾选的账号组
-    getAccountGroupChecked(arr) {
+    getAccountGroupChecked (arr) {
       if (arr && arr.length && arr[0] !== -1) {
         const GroupIds = arr.map(item => item.GroupId)
         this.accountGroupTreeCheckedTemp = GroupIds
@@ -292,19 +230,19 @@ export default {
       }
     },
     // 角色选取
-    getRoleListChecked(arr) {
+    getRoleListChecked (arr) {
       this.roleListCheckedTemp = arr
     },
-    roleListCheckedChange(arr) {
+    roleListCheckedChange (arr) {
       this.roleListCheckedTemp = this.roleListCheckedTemp.filter(role => arr.some(data => data.RoleId === role.RoleId))
       this.roleListCheckedList = this.roleListCheckedTemp.map(role => role.RoleId)
     },
     // 获取当前编辑的权限规则
-    getRulesOfCompetency(obj) {
+    getRulesOfCompetency (obj) {
       this.rulesOfCompetency = obj
     },
     // 点击角色后显示对应权限列表
-    async selectRole(data) {
+    async selectRole (data) {
       if (this.currentSelectedRoleId === data.RoleId) return
       try {
         const params = {
@@ -343,11 +281,11 @@ export default {
     //   }
     // },
     // 修改权限规则
-    Competen(data) {
+    Competen (data) {
       console.log(data)
     },
     // 账号组编辑保存
-    async handleSaveEdit() {
+    async handleSaveEdit () {
       const params = {
         AuthList: this.permissionTreeChckedTemp,
         GroupName: this.editForm.name,
@@ -366,7 +304,7 @@ export default {
         this.saveAddGroup(params)
       }
     },
-    async saveEditGroup(params) {
+    async saveEditGroup (params) {
       try {
         const res = await EditGroup(params)
         if (res.code === 0) {
@@ -382,7 +320,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    async saveAddGroup(params) {
+    async saveAddGroup (params) {
       try {
         const res = await SaveGroup(params)
         if (res.code === 0) {

src/views/jobsManagement/list.vue

@@ -7,47 +7,52 @@
       <Search @getSearchData="getSearchData" @clearSearchData="clearSearchData" :isSlot="false">
       </Search>
     </div>
-    <div v-infinite-scroll="load" :infinite-scroll-distance="20" infinite-scroll-disabled="disabled" class="contantBox scrollbar">
-      <div class="itemBox" v-for="(item, index) in listData" :key="index">
-        <div v-is="['joblist_btn_del_job']" class="del" @click="delate(item.JobId,index)">
-          <i class="el-icon-close"></i>
-        </div>
-        <div>
-          <el-row>
-            <el-col :span="24" class="nameBox">
-              <div class="name">{{ item.JobName }}</div>
-              <div v-is="['joblist_btn_edit']" class="loger" @click="toEdit(item.JobId)"></div>
-            </el-col>
-          </el-row>
+    <template v-if="listData.length">
+      <div v-infinite-scroll="load" :infinite-scroll-distance="20" infinite-scroll-disabled="disabled" class="contantBox scrollbar">
+        <div class="itemBox" v-for="(item, index) in listData" :key="index">
+          <div v-is="['joblist_btn_del_job']" class="del" @click="delate(item.JobId,index)">
+            <i class="el-icon-close"></i>
+          </div>
+          <div>
+            <el-row>
+              <el-col :span="24" class="nameBox">
+                <div class="name">{{ item.JobName }}</div>
+                <div v-is="['joblist_btn_edit']" class="loger" @click="toEdit(item.JobId)"></div>
+              </el-col>
+            </el-row>
 
-          <el-row>
-            <el-col :span="24"></el-col>
-          </el-row>
+            <el-row>
+              <el-col :span="24"></el-col>
+            </el-row>
 
-          <el-row class="conntent" v-if="radio == 1">
-            <el-col :span="12">上级组织：<span>{{ item.OrganName }}</span></el-col>
-            <el-col :span="12">拥有职员：<span>{{ item.OfficerCount }}</span></el-col>
-            <!-- <el-col :span="12" class="flexLeft">权限项数：<span>{{ item.AuthCount }}</span></el-col> -->
-          </el-row>
-          <!-- <el-row class="conntent" v-if="radio == 1">
+            <el-row class="conntent" v-if="radio == 1">
+              <el-col :span="12">上级组织：<span>{{ item.OrganName }}</span></el-col>
+              <el-col :span="12">拥有职员：<span>{{ item.OfficerCount }}</span></el-col>
+              <!-- <el-col :span="12" class="flexLeft">权限项数：<span>{{ item.AuthCount }}</span></el-col> -->
+            </el-row>
+            <!-- <el-row class="conntent" v-if="radio == 1">
             <el-col :span="24">拥有职员：<span>{{ item.OfficerCount }}</span></el-col>
           </el-row> -->
-          <el-row class="conntent2" v-if="radio == 2">
-            <el-col :span="24"><span>{{ item.UpLink }}</span></el-col>
-          </el-row>
-          <el-row class="conntent">
-            <el-col :span="12">
-              状态：<span class="used" v-if="item.Status == 1">启用</span>
-              <span class="unUsed" v-else-if="item.Status == 0">停用</span>
-            </el-col>
-            <el-col v-is="['joblist_btn_state_swatch']" :span="12" class="flexLeft">
-              <el-switch @change="isUsedChange(item, index)" v-model="item.Flag" :active-value="true" :inactive-value="false" active-color="#6F81BC" inactive-color="#CFD6E2">
-              </el-switch>
-            </el-col>
-          </el-row>
+            <el-row class="conntent2" v-if="radio == 2">
+              <el-col :span="24"><span>{{ item.UpLink }}</span></el-col>
+            </el-row>
+            <el-row class="conntent">
+              <el-col :span="12">
+                状态：<span class="used" v-if="item.Status == 1">启用</span>
+                <span class="unUsed" v-else-if="item.Status == 0">停用</span>
+              </el-col>
+              <el-col v-is="['joblist_btn_state_swatch']" :span="12" class="flexLeft">
+                <el-switch @change="isUsedChange(item, index)" v-model="item.Flag" :active-value="true" :inactive-value="false" active-color="#6F81BC" inactive-color="#CFD6E2">
+                </el-switch>
+              </el-col>
+            </el-row>
+          </div>
         </div>
       </div>
-    </div>
+    </template>
+    <template v-else>
+      <el-empty style="padding-top:150px;" description="暂无数据"></el-empty>
+    </template>
     <template v-if="total > 1">
       <p class="center" v-if="loading">加载中...</p>
       <p class="center" v-if="noMore">没有更多数据了~</p>

src/views/login/index.vue

@@ -152,7 +152,9 @@ export default {
                     if (datas && datas.length) {
                       const arrs = [];
                       for (const item of datas) {
-                        arrs.push(item.AuthIdent);
+                        if (item.AuthIdent) {
+                          arrs.push(item.AuthIdent);
+                        }
                       }
                       arrs.push('dashboard'); //进入首页手动添加权限
                       setToken('userAuthList', arrs);

src/views/staffManagement/compontents/staffAdd.vue

@@ -64,7 +64,7 @@
         <!--有角色 无账号组-->
         <template v-if="openRole && !OpenGroup">
           <div class="r24 flex1 part">
-            <Rolelist @checkChange="checkChange" @checkClick="checkClick" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />
+            <Rolelist @checkChange="checkChange" :imageSize="120" @checkClick="checkClick" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />
           </div>
           <div class="flex1 part">
             <Permissionlist style="height: 376px" :imageSize="120" :RoleList="RoleList" :check="true" class="hucPower" title="权限列表" />
@@ -77,7 +77,7 @@
             <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" title="用户组树" />
           </div>
           <div class="r24 flex1 part">
-            <Rolelist @checkChange="checkChange" :GroupIds="GroupIds" @checkClick="checkClick" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />
+            <Rolelist @checkChange="checkChange" :imageSize="120" :GroupIds="GroupIds" @checkClick="checkClick" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />
           </div>
           <div class="flex1 part">
             <Permissionlist style="height: 376px" :imageSize="120" :RoleList="RoleList" :check="true" class="hucPower" title="权限列表" />
@@ -242,6 +242,7 @@ export default {
     this.OpenGroup = OpenGroup;
     this.OpenAuthData = UserOfficerMulti;
     this.OrganId = OrganId;
+    this.AppId = OrganId;
     this.orgTypes = orgType;
     if (OpenGroup || !OpenGroup && !OpenRole) {
       this.queryType = "all";
@@ -407,7 +408,7 @@ export default {
           DepJobList: this.lessChecksData,
           GroupList: GroupIds.length ? GroupIds : [],
           JobId: this.JobId,
-          Status: Number(this.Status),
+          Status: 1,
           OrganId: this.AppId,
           OfficerId: this.OfficerId,
           UserList: this.OpenAuthData ? this.checkBoxList : []

src/views/staffManagement/compontents/staffEdit.vue

@@ -64,7 +64,7 @@
         <!--有角色 无账号组-->
         <template v-if="openRole && !OpenGroup">
           <div class="r24 flex1 part">
-            <Rolelist @checkChange="checkChange" @checkClick="checkClick" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />
+            <Rolelist @checkChange="checkChange" :imageSize="120" @checkClick="checkClick" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />
           </div>
           <div class="flex1 part">
             <Permissionlist style="height: 376px" :imageSize="120" :RoleList="RoleList" :check="true" class="hucPower" title="权限列表" />
@@ -77,7 +77,7 @@
             <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" title="用户组树" />
           </div>
           <div class="r24 flex1 part">
-            <Rolelist @checkChange="checkChange" @checkClick="checkClick" :GroupIds="GroupIds" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />
+            <Rolelist @checkChange="checkChange" :imageSize="120" @checkClick="checkClick" :GroupIds="GroupIds" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />
           </div>
           <div class="flex1 part">
             <Permissionlist style="height: 376px" :imageSize="120" :RoleList="RoleList" :check="true" class="hucPower" title="权限列表" />
@@ -491,14 +491,17 @@ export default {
     //组织新增保存
     async saveOrgan () {
       try {
-        if (this.JobId) {
-          if (!this.AppId) {
-            this.$message.error("请选中一个组织后再新增");
-            return false;
-          }
-        } else {
-          this.AppId = this.oldOrganId
-        }
+        // console.log(this.AppId)
+        // if (this.JobId) {
+        //   if (!this.AppId) {
+        //     this.$message.error("请选中一个组织后再新增");
+        //     return false;
+        //   }
+        // } else {
+        //   this.AppId = this.oldOrganId
+        // }
+        // console.log(this.AppId)
+        // return
         const datas = [];
         const checks = [];
         const GroupIds = [];