人员组织架构

shanXiPlatform/.env.development

@@ -2,4 +2,4 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'http://10.10.1.25:9099/'

shanXiPlatform/mock/user.js

@@ -1,10 +1,10 @@
 
 const tokens = {
   admin: {
-    token: 'admin-token'
+    token: 'Token'
   },
   editor: {
-    token: 'editor-token'
+    token: 'Token'
   }
 }
 
@@ -33,12 +33,12 @@ module.exports = [
       const token = tokens[username]
 
       // mock error
-      if (!token) {
-        return {
-          code: 60204,
-          message: 'Account and password are incorrect.'
-        }
-      }
+      // if (!token) {
+      //   return {
+      //     code: 60204,
+      //     message: 'Account and password are incorrect.'
+      //   }
+      // }
 
       return {
         code: 20000,
@@ -56,12 +56,12 @@ module.exports = [
       const info = users[token]
 
       // mock error
-      if (!info) {
-        return {
-          code: 50008,
-          message: 'Login failed, unable to get user details.'
-        }
-      }
+      // if (!info) {
+      //   return {
+      //     code: 50008,
+      //     message: 'Login failed, unable to get user details.'
+      //   }
+      // }
 
       return {
         code: 20000,

shanXiPlatform/package.json

@@ -12,7 +12,9 @@
     "new": "plop",
     "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",
-    "test:ci": "npm run lint && npm run test:unit"
+    "test:ci": "npm run lint && npm run test:unit",
+    "start": "node index.js",
+    "server": "nodemon index.js --ignore client"
   },
   "dependencies": {
     "axios": "0.18.1",

shanXiPlatform/src/App.vue

@@ -5,10 +5,11 @@
 </template>
 
 <script>
+
 export default {
   name: 'App'
 }
 </script>
 <style>
 
-</style>
+</style>

shanXiPlatform/src/api/system/organizationalStructure/personnel.js

@@ -0,0 +1,49 @@
+
+import request from '@/utils/request'
+// 人员组织架构接口
+
+// 列表接口及条件查询
+export function getPersonnelInfo(data) {
+  return request({
+    url: `/sysPersonnel/authority/getPage`,
+    method: 'post',
+    data
+  })
+}
+
+// 新增接口
+export function addPersonnelInfo(data) {
+  return request({
+    url: `/sysPersonnel/authority_button/add`,
+    method: 'post',
+    data
+  })
+}
+
+// 删除接口
+
+export function deletePersonnelInfo(params) {
+  return request({
+    url: `/sysPersonnel/authority_button/deleteById`,
+    method: 'delete',
+    params
+  })
+}
+
+// 修改接口
+export function updatePersonnelInfo(data) {
+  return request({
+    url: `/sysPersonnel/authority_button/update`,
+    method: 'post',
+    data
+  })
+}
+
+// 查看接口
+export function checkPersonnelInfo(id) {
+  return request({
+    url: `/sysPersonnel/authority/getById/${id}`,
+    method: 'get'
+
+  })
+}

shanXiPlatform/src/api/system/userManagement/role.js

@@ -0,0 +1,48 @@
+import request from '@/utils/request'
+
+// 获取资源树
+
+export function resourcesTree() {
+  return request({
+    url: `/resource/authority/getAll`,
+    method: 'post'
+
+  })
+}
+
+// 获取列表
+export function getUserInfo(data) {
+  return request({
+    url: `/role/authority/getPage`,
+    method: 'post',
+    data
+  })
+}
+
+// 新增用户
+export function addUserInfo(data) {
+  return request({
+    url: `/role/authority_button/add`,
+    method: 'post',
+    data
+  })
+}
+
+// 修改用户
+
+export function updateUserInfo(data) {
+  return request({
+    url: `/role/authority_button/update`,
+    method: 'post',
+    data
+  })
+}
+
+// 查看角色是否存在
+export function roleIsExit(params) {
+  return request({
+    url: `/role/authority_button/getByRoleName`,
+    method: 'get',
+    params
+  })
+}

shanXiPlatform/src/layout/components/AppMain.vue

@@ -1,27 +1,26 @@
 <template>
   <section class="app-main">
     <!-- <transition name="fade-transform" mode="out-in"> -->
-      <keep-alive :include="cachedViews">
-        <router-view :key="key" />
-      </keep-alive>
+    <keep-alive :include="cachedViews">
+      <router-view :key="key" />
+    </keep-alive>
     <!-- </transition> -->
+
+    <foot />
+
   </section>
 </template>
 
 <script>
+import Foot from '@/layout/components/Foot/index'
 export default {
   name: 'AppMain',
-  data(){
-    return{
-      activeIndex: '1',
+  components: { Foot },
+  data() {
+    return {
+      activeIndex: '1'
     }
   },
-  methods:{
-    handleSelect(key, keyPath) {
-        console.log(key, keyPath);
-      }
-
-  },
   computed: {
     cachedViews() {
       return this.$store.state.tagsView.cachedViews
@@ -29,6 +28,12 @@ export default {
     key() {
       return this.$route.path
     }
+  },
+  methods: {
+    handleSelect(key, keyPath) {
+      console.log(key, keyPath)
+    }
+
   }
 }
 </script>

shanXiPlatform/src/layout/components/Foot/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div>
+    <div class="foot">
+      2020 中储粮-标准化管理云平台 版权所有
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'Foot'
+}
+</script>
+<style lang="scss" scoped>
+    .foot{
+        width:100%;
+        height:30px;
+        background:seagreen;
+        color:white;
+        line-height:30px;
+        text-align:center;
+        position: absolute;
+        bottom:0px;
+    }
+</style>

shanXiPlatform/src/layout/components/Navbar.vue

@@ -1,67 +1,63 @@
 <template>
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
- <div class="homeIcon" @click="goHome()">
+    <div class="homeIcon" @click="goHome()">
       <img src="../../assets/images/home.png"></img>
       <!-- <i class="el-icon-s-home" font-size:30px></i> -->
- </div>
- 
- 
-     
-   
+    </div>
+
+    <!-- <tags-view/> -->
+
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
 
-    <div  class="navbar_right">
-        
-        <div class="div_left"> 欢迎登录<span style="color:green">admin</span></div>
-        <div  class="div_right">
-            <div style="float:left;position:relative">
-               <img src="../../assets/images/newsNotice.png">
-               <div class="news_div">3</div>
-            </div>
-           <img src="../../assets/images/user.png">
-           <img src="../../assets/images/signOut.png" @click="loginOut()">
-        
-         
-         
-          
-          
-         
+    <div class="navbar_right">
+
+      <div class="div_left"> 欢迎登录<span style="color:green">admin</span></div>
+      <div class="div_right">
+        <div style="float:left;position:relative">
+          <img src="../../assets/images/newsNotice.png">
+          <div class="news_div">3</div>
         </div>
+        <img src="../../assets/images/user.png">
+        <img src="../../assets/images/signOut.png" @click="loginOut()">
+
       </div>
+    </div>
 
   </div>
 </template>
 
 <script>
-import { mapGetters } from "vuex"
-import Breadcrumb from "@/components/Breadcrumb"
-import Hamburger from "@/components/Hamburger"
+import { mapGetters } from 'vuex'
+import Breadcrumb from '@/components/Breadcrumb'
+import Hamburger from '@/components/Hamburger'
+// import TagsView from './TagsView'
 
 export default {
   components: {
     Breadcrumb,
-    Hamburger,
+    Hamburger
+
   },
   computed: {
-    ...mapGetters(["sidebar", "avatar", "device"]),
+    ...mapGetters(['sidebar', 'avatar', 'device'])
   },
   methods: {
-    //点击home图标时
+    // 点击home图标时
     goHome() {
-      this.$router.push({ path: "/home" })
+      this.$router.push({ path: '/home' })
     },
 
-    //退出
+    // 退出
     async loginOut() {
-      await this.$store.dispatch("user/logout")
+      await this.$store.dispatch('user/logout')
       this.$router.push(`/login?redirect=${this.$route.fullPath}`)
     },
 
     toggleSideBar() {
-      this.$store.dispatch("app/toggleSideBar")
-    },
-  },
+      this.$store.dispatch('app/toggleSideBar')
+    }
+  }
 }
 </script>
 

shanXiPlatform/src/layout/components/Sidebar/index.vue

@@ -26,6 +26,15 @@ import variables from '@/styles/variables.scss'
 
 export default {
   components: { SidebarItem, Logo },
+  data() {
+    return {
+      routes: []
+    }
+  },
+  created() {
+    // this.routes = this.$route;
+    // console.log(this.routes,'lllllll');
+  },
   computed: {
     ...mapGetters([
       'permission_routes',

shanXiPlatform/src/layout/index.vue

@@ -1,23 +1,28 @@
 <template>
   <div :class="classObj" class="app-wrapper">
-   
+
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
     <sidebar class="sidebar-container" />
     <div :class="{hasTagsView:needTagsView}" class="main-container">
-       
+
       <div :class="{'fixed-header':fixedHeader}">
         <navbar />
         <tags-view v-if="needTagsView" />
       </div>
-      <app-main />
+      <app-main>
+        <foot />
+      </app-main>
       <right-panel v-if="showSettings">
         <settings />
       </right-panel>
+
     </div>
+
   </div>
 </template>
 
 <script>
+import Foot from './components/Foot/index'
 import RightPanel from '@/components/RightPanel'
 import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
@@ -31,7 +36,8 @@ export default {
     RightPanel,
     Settings,
     Sidebar,
-    TagsView
+    TagsView,
+    Foot
   },
   mixins: [ResizeMixin],
   computed: {

shanXiPlatform/src/permission.js

@@ -8,7 +8,7 @@ import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['/login', '/auth-redirect'] // no redirect whitelist
+const whiteList = ['/login', 'auth-redirect'] // no redirect whitelist
 
 router.beforeEach(async(to, from, next) => {
   // start progress bar
@@ -27,6 +27,7 @@ router.beforeEach(async(to, from, next) => {
       NProgress.done() // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939
     } else {
       // determine whether the user has obtained his permission roles through getInfo
+
       const hasRoles = store.getters.roles && store.getters.roles.length > 0
       if (hasRoles) {
         next()

shanXiPlatform/src/router/index.js

@@ -6,7 +6,6 @@ Vue.use(Router)
 /* Layout */
 import Layout from '@/layout'
 
-
 /* Router Modules */
 // import componentsRouter from './modules/components'
 
@@ -14,12 +13,9 @@ import Layout from '@/layout'
 
 // import warehouseBasicInformation from '@/views/systemManagement/organizationalStructureManagement/warehouseBasicInformation';
 
-import organizationalStructureTabs from '@/views/systemManagement/organizationalStructureManagement/organizationalStructureTabs';
-
-
-
-import userTabs from '@/views/systemManagement/userManagement/userTabs';
+import organizationalStructureTabs from '@/views/systemManagement/organizationalStructureManagement/organizationalStructureTabs'
 
+import userTabs from '@/views/systemManagement/userManagement/userTabs'
 
 /**
  * Note: sub-menu only appear when route children.length >= 1
@@ -48,28 +44,27 @@ import userTabs from '@/views/systemManagement/userManagement/userTabs';
  * all roles can be accessed
  */
 export const constantRoutes = [
-  {
-    path: '/redirect',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: '/redirect/:path(.*)',
-        component: () => import('@/views/redirect/index')
-      }
-    ]
-  },
+  // {
+  //   path: '/redirect',
+  //   component: Layout,
+  //   hidden: true,
+  // children: [
+  //     {
+  //       path: '/redirect/:path(.*)',
+  //       component: () => import('@/views/redirect/index')
+  //     }
+  //   ]
+  // },
   {
     path: '/login',
     component: () => import('@/views/login/index'),
     hidden: true
   },
-  {
-    path: '/auth-redirect',
-    component: () => import('@/views/login/auth-redirect'),
-    hidden: true
-  },
-
+  // {
+  //   path: '/auth-redirect',
+  //   component: () => import('@/views/login/auth-redirect'),
+  //   hidden: true
+  // },
 
   // {
   //   path: '/',
@@ -85,7 +80,7 @@ export const constantRoutes = [
   //   ]
   // },
 
-  //首页
+  // 首页
   {
     path: '/',
     component: Layout,
@@ -101,8 +96,7 @@ export const constantRoutes = [
     ]
   },
 
-
-  //基本信息
+  // 基本信息
   {
 
     path: '/basicInformation',
@@ -110,41 +104,32 @@ export const constantRoutes = [
     // redirect: '/basicMatter',
     name: 'BasicInformation',
 
+    meta: { title: '基本信息', icon: 'dashboard', affix: false },
+
     children: [
+      // 基本信息/人员结构
       {
-        path: '/basicInformation',
-        component: () => import('@/views/basicInformation/index'),
-        name: 'BasicInformation',
+        path: 'personnelStructure',
+        component: () => import('@/views/basicInformation/personnelStructure'),
+        name: 'PersonnelStructure',
+        hiddren: true,
+        meta: { title: '人员结构', icon: 'dashboard', affix: false }
+
+      },
+      // 基本信息/政策制度
+      {
+        path: 'policySystem',
+        component: () => import('@/views/basicInformation/policySystem'),
+        name: 'PolicySystem',
+        hiddren: true,
+        meta: { title: '政策制度', icon: 'dashboard', affix: false }
 
-        meta: { title: '基本信息', icon: 'dashboard', affix: false },
       }
     ]
-    // children: [
-    //   // 基本信息/人员结构
-    //   {
-    //     path: '/basicInformation/personnelStructure',
-    //     component: () => import('@/views/basicInformation/personnelStructure'),
-    //     name: 'PersonnelStructure',
-    //     meta: { title: '人员结构', icon: 'dashboard', affix: false}
-
-    //   },
-    //      // 基本信息/政策制度
-    //   {
-    //     path: '/basicInformation/policySystem',
-    //     component: () => import('@/views/basicInformation/policySystem'),
-    //     name: 'PolicySystem',
-    //     meta: { title: '政策制度', icon: 'dashboard', affix: false}
-
-    //   },
-    // ]
 
   },
 
-
-
-
-
-  //数量质量
+  // 数量质量
   {
     path: '/countQuality',
     component: Layout,
@@ -152,7 +137,7 @@ export const constantRoutes = [
     meta: { title: '数量质量', icon: 'dashboard' },
     children: [
       {
-        //数量质量/仓房信息
+        // 数量质量/仓房信息
         path: 'warehouseInformation',
         component: () => import('@/views/countQuality/warehouseInformation'),
         name: 'WarehouseInformation',
@@ -181,18 +166,12 @@ export const constantRoutes = [
         component: () => import('@/views/countQuality/deliveryQuality'),
         name: 'DeliveryQuality',
         meta: { title: '出库质量管理', icon: 'documentation', affix: false }
-      },
+      }
     ]
 
-
   },
 
-
-
-
-
-
-  //储量管理
+  // 储量管理
   {
     path: '/reservesManagement',
     component: Layout,
@@ -225,9 +204,9 @@ export const constantRoutes = [
     ]
   },
 
-  //药剂管理
+  // 药剂管理
   {
-    path: "/medicamentManagement",
+    path: '/medicamentManagement',
     component: Layout,
     name: 'MedicamentManagement',
     meta: { title: '药剂管理', icon: 'dashboard', affix: false },
@@ -258,8 +237,7 @@ export const constantRoutes = [
     ]
   },
 
-
-  //设施设备
+  // 设施设备
   {
     path: '/facilitiesEquipment',
     component: Layout,
@@ -288,12 +266,11 @@ export const constantRoutes = [
         component: () => import('@/views/facilitiesEquipment/equipmentProcurementCollection'),
         name: 'EquipmentProcurementCollection',
         meta: { title: '设备采购领用', icon: 'dashboard', affix: false }
-      },
+      }
     ]
   },
 
-
-  //安全生产
+  // 安全生产
   {
     path: '/safeProduction',
     component: Layout,
@@ -314,13 +291,11 @@ export const constantRoutes = [
         component: () => import('@/views/safeProduction/safetyManagement'),
         name: 'SafetyManagement',
         meta: { title: '安全员管理', icon: 'dashboard', affix: false }
-      },
+      }
     ]
   },
 
-
-
-  //监督检查
+  // 监督检查
   {
     path: '/supervisionInspection',
     component: Layout,
@@ -336,12 +311,12 @@ export const constantRoutes = [
         name: 'Library',
         meta: { title: '本库检查', icon: 'dashboard', affix: false }
       },
- // 监督检查/本库详情
+      // 监督检查/本库详情
       {
         path: 'libraryDetail',
         component: () => import('@/views/supervisionInspection/library/libraryDetail'),
         name: 'LibraryDetail',
-        hidden:true,
+        hidden: true,
         meta: { title: '本库检查详情', icon: 'dashboard', affix: false }
       },
 
@@ -353,19 +328,17 @@ export const constantRoutes = [
         meta: { title: '分库检查', icon: 'dashboard', affix: false }
       },
 
-        
-
       // 监督检查/租仓、委托库点
       {
         path: 'entrustedRepository',
         component: () => import('@/views/supervisionInspection/entrustedRepository'),
         name: 'EntrustedRepository',
         meta: { title: '租仓、委托库点检查', icon: 'dashboard', affix: false }
-      },
+      }
     ]
   },
 
-  //库外管理
+  // 库外管理
   {
     path: '/warehouseOutsideManagement',
     component: Layout,
@@ -386,12 +359,11 @@ export const constantRoutes = [
         component: () => import('@/views/WarehouseOutsideManagement/entrusted'),
         name: 'Entrusted',
         meta: { title: '委托管理', icon: 'dashboard', affix: false }
-      },
+      }
     ]
   },
 
-
-  //专家指导
+  // 专家指导
   {
     path: '/guidanceExperts',
     component: Layout,
@@ -421,12 +393,11 @@ export const constantRoutes = [
         component: () => import('@/views/guidanceExperts/questionCenter'),
         name: 'QuestionCenter',
         meta: { title: '问题中心', icon: 'dashboard', affix: false }
-      },
+      }
     ]
   },
 
-
-  //系统管理
+  // 系统管理
   {
     path: '/systemManagement',
     component: Layout,
@@ -445,7 +416,7 @@ export const constantRoutes = [
       //   系统管理/组织架构管理
       {
         path: 'organizationalStructureManagement',
-        component:organizationalStructureTabs,
+        component: organizationalStructureTabs,
         name: 'OrganizationalStructureManagement',
         redirect: 'organizationalStructureManagement/granaryOrganizationalStructureManagement',
         meta: { title: '组织架构管理', icon: 'dashboard', affix: false },
@@ -455,12 +426,11 @@ export const constantRoutes = [
             path: 'granaryOrganizationalStructureManagement',
             component: () => import('@/views/systemManagement/organizationalStructureManagement/granaryOrganizationalStructureManagement/index'),
             name: 'GranaryOrganizationalStructureManagement',
-           
+
             hidden: true,
             meta: { title: '粮仓组织架构管理', icon: 'dashboard', affix: false }
           },
 
-          
           //   系统管理/组织架构管理/人员组织架构管理
           {
             path: 'personnelOrganizationalStructureManagement',
@@ -469,65 +439,59 @@ export const constantRoutes = [
             hidden: true,
             meta: { title: '人员组织架构管理', icon: 'dashboard', affix: false }
           },
-           // 系统管理/组织架构管理/仓房基本信息
-           {
-            path: 'warehouseBasicInformation', 
+          // 系统管理/组织架构管理/仓房基本信息
+          {
+            path: 'warehouseBasicInformation',
             component: () => import('@/views/systemManagement/organizationalStructureManagement/warehouseBasicInformation/index'),
             name: 'WarehouseBasicInformation',
             hidden: true,
-            meta: { title: '仓房基本信息', icon: 'dashboard',affix: false  }
-           },
-          
+            meta: { title: '粮库基本信息', icon: 'dashboard', affix: false }
+          }
 
         ]
       },
 
-
-       //   系统管理/组织架构管理/粮仓组织架构管理/新增直属库
-       {
+      //   系统管理/组织架构管理/粮仓组织架构管理/新增直属库
+      {
         path: '/granaryOrganizationalStructureManagement/directlyLibrary',
         component: () => import('@/views/systemManagement/organizationalStructureManagement/granaryOrganizationalStructureManagement/addDirectlyLibrary'),
         name: 'AddDirectlyLibrary',
         hidden: true,
-        meta: { title: '新增直属库', icon: 'dashboard', affix: false }
+        meta: { title: '新增直属库', icon: 'dashboard', affix: false, noCache: true }
       },
 
-
-
-       //   系统管理/组织架构管理/粮仓组织架构管理/新增分库
-       {
+      //   系统管理/组织架构管理/粮仓组织架构管理/新增分库
+      {
         path: '/granaryOrganizationalStructureManagement/sub',
         component: () => import('@/views/systemManagement/organizationalStructureManagement/granaryOrganizationalStructureManagement/subWarehouse/addSub'),
         name: 'AddSub',
         hidden: true,
-        meta: { title: '新增分库', icon: 'dashboard', affix: false }
+        meta: { title: '新增分库', icon: 'dashboard', affix: false, noCache: true }
       },
 
-
       //   系统管理/组织架构管理/粮仓组织架构管理/新增仓房
       {
         path: '/granaryOrganizationalStructureManagement/warehouse',
         component: () => import('@/views/systemManagement/organizationalStructureManagement/granaryOrganizationalStructureManagement/subWarehouse/addWarehouse'),
         name: 'AddWarehouse',
         hidden: true,
-        meta: { title: '新增仓房', icon: 'dashboard', affix: false }
+        meta: { title: '新增仓房', icon: 'dashboard', affix: false, noCache: true }
       },
 
+      //   系统管理/组织架构管理/人员组织架构/新增工作人员
+      {
+        path: '/personnelOrganizationalStructureManagement/personnel',
+        component: () => import('@/views/systemManagement/organizationalStructureManagement/personnelOrganizationalStructureManagement/addPersonnel'),
 
-        //   系统管理/组织架构管理/人员组织架构/新增工作人员
-        {
-          path: '/personnelOrganizationalStructureManagement/personnel',
-          component: () => import('@/views/systemManagement/organizationalStructureManagement/personnelOrganizationalStructureManagement/addPersonnel'),
-         
-          name: 'AddPersonnel',
-          hidden: true,
-          meta: { title: '新增工作人员', icon: 'dashboard', affix: false }
-        },
+        name: 'AddPersonnel',
+        hidden: true,
+        meta: { title: '新增工作人员', icon: 'dashboard', affix: false, noCache: true }
+      },
 
       //   系统管理/用户管理
       {
         path: 'user',
-        component:userTabs,
+        component: userTabs,
         name: 'user',
         redirect: 'user/userManagement',
         meta: { title: '用户管理', icon: 'dashboard', affix: false },
@@ -542,7 +506,6 @@ export const constantRoutes = [
             meta: { title: '用户管理', icon: 'dashboard', affix: false }
           },
 
-          
           //   系统管理/用户管理/部门管理
           {
             path: 'departmentManagement',
@@ -551,29 +514,27 @@ export const constantRoutes = [
             hidden: true,
             meta: { title: '部门管理', icon: 'dashboard', affix: false }
           },
-           // 系统管理/用户管理/角色管理
-           {
-            path: 'roleManagement', 
+          // 系统管理/用户管理/角色管理
+          {
+            path: 'roleManagement',
             component: () => import('@/views/systemManagement/userManagement/roleManagement/index'),
             name: 'RoleManagement',
             hidden: true,
-            meta: { title: '角色管理', icon: 'dashboard',affix: false  }
-           },
-             // 系统管理/用户管理/审批人管理
+            meta: { title: '角色管理', icon: 'dashboard', affix: false }
+          },
+          // 系统管理/用户管理/审批人管理
 
-           {
-            path: 'approverManagement', 
+          {
+            path: 'approverManagement',
             component: () => import('@/views/systemManagement/userManagement/approverManagement/index'),
             name: 'ApproverManagement',
             hidden: true,
-            meta: { title: '审批人管理', icon: 'dashboard',affix: false  }
-           },
-          
+            meta: { title: '审批人管理', icon: 'dashboard', affix: false }
+          }
 
         ]
       },
 
-
       //   系统管理/用户管理/新增用户
       {
         path: '/userManagement/addUser',
@@ -583,6 +544,23 @@ export const constantRoutes = [
         meta: { title: '新增用户', icon: 'dashboard', affix: false }
       },
 
+      //   系统管理/角色管理/新增角色
+      {
+        path: '/roleManagement/addRole',
+        component: () => import('@/views/systemManagement/userManagement/roleManagement/addRole'),
+        name: 'AddRole',
+        hidden: true,
+        meta: { title: '新增角色', icon: 'dashboard', affix: false }
+      },
+
+      //   系统管理/部门管理/新增部门
+      {
+        path: '/departmentManagement/addDepartment',
+        component: () => import('@/views/systemManagement/userManagement/departmentManagement/addDepartment'),
+        name: 'AddDepartment',
+        hidden: true,
+        meta: { title: '新增部门', icon: 'dashboard', affix: false }
+      },
 
       //   系统管理/预警管理
       {
@@ -592,7 +570,6 @@ export const constantRoutes = [
         meta: { title: '预警管理', icon: 'dashboard', affix: false }
       },
 
-
       //   系统管理/器材库
       {
         path: 'equipmentWarehouse',
@@ -608,7 +585,6 @@ export const constantRoutes = [
         name: 'PolicySystem',
         meta: { title: '政策制度', icon: 'dashboard', affix: false }
       },
-      
 
       //   系统管理/操作日志
       {
@@ -616,9 +592,9 @@ export const constantRoutes = [
         component: () => import('@/views/systemManagement/operationLog/index'),
         name: 'OperationLog',
         meta: { title: '操作日志', icon: 'dashboard', affix: false }
-      },
+      }
     ]
-  },
+  }
 
 ]
 
@@ -628,30 +604,8 @@ export const constantRoutes = [
  */
 export const asyncRoutes = [
 
-
-
-
-
-
-
   /** when your routing map is too long, you can split it into small modules **/
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
   // {
   //   path: 'external-link',
   //   component: Layout,

shanXiPlatform/src/store/modules/user.js

@@ -30,65 +30,91 @@ const mutations = {
 
 const actions = {
   // user login
+
   login({ commit }, userInfo) {
     const { username, password } = userInfo
     return new Promise((resolve, reject) => {
-      login({ username: username.trim(), password: password }).then(response => {
-        const { data } = response
-        commit('SET_TOKEN', data.token)
-        setToken(data.token)
-        resolve()
-      }).catch(error => {
-        reject(error)
-      })
+      var data = {
+        token: '132efegrthy'
+      }
+      console.log(data.token)
+      commit('SET_TOKEN', data.token)
+      setToken(data.token)
+      resolve()
+      // login({ username: username.trim(), password: password }).then(response => {
+      //   const { data } = response
+      //   // commit('SET_TOKEN', data.token)
+      //   // setToken(data.token)
+      //   // resolve()
+      // }).catch(error => {
+      //   reject(error)
+      // })
     })
   },
 
   // get user info
   getInfo({ commit, state }) {
     return new Promise((resolve, reject) => {
-      getInfo(state.token).then(response => {
-        const { data } = response
-
-        if (!data) {
-          reject('Verification failed, please Login again.')
-        }
-
-        const { roles, name, avatar, introduction } = data
-
-        // roles must be a non-empty array
-        if (!roles || roles.length <= 0) {
-          reject('getInfo: roles must be a non-null array!')
-        }
-
-        commit('SET_ROLES', roles)
-        commit('SET_NAME', name)
-        commit('SET_AVATAR', avatar)
-        commit('SET_INTRODUCTION', introduction)
-        resolve(data)
-      }).catch(error => {
-        reject(error)
-      })
+      var data = { roles: ['admin', 'editor'], name: 'admin', avatar: '', introduction: '' }
+      commit('SET_ROLES', data.roles)
+      commit('SET_NAME', data.name)
+      commit('SET_AVATAR', data.avatar)
+      commit('SET_INTRODUCTION', data.introduction)
+      resolve(data)
+      //   getInfo(state.token).then(response => {
+      //     const { data } = response
+
+      //     if (!data) {
+      //       reject('Verification failed, please Login again.')
+      //     }
+
+      //     const { roles, name, avatar, introduction } = data
+
+      //     // roles must be a non-empty array
+      //     if (!roles || roles.length <= 0) {
+      //       reject('getInfo: roles must be a non-null array!')
+      //     }
+
+    //     commit('SET_ROLES', roles)
+    //     commit('SET_NAME', name)
+    //     commit('SET_AVATAR', avatar)
+    //     commit('SET_INTRODUCTION', introduction)
+    //     resolve(data)
+    //   }).catch(error => {
+    //     reject(error)
+    //   })
     })
   },
 
   // user logout
+
   logout({ commit, state, dispatch }) {
     return new Promise((resolve, reject) => {
-      logout(state.token).then(() => {
-        commit('SET_TOKEN', '')
-        commit('SET_ROLES', [])
-        removeToken()
-        resetRouter()
-
-        // reset visited views and cached views
-        // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485
-        dispatch('tagsView/delAllViews', null, { root: true })
-
-        resolve()
-      }).catch(error => {
-        reject(error)
-      })
+      commit('SET_TOKEN', '')
+      commit('SET_ROLES', [])
+      removeToken()
+      resetRouter()
+
+      // reset visited views and cached views
+      // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485
+      dispatch('tagsView/delAllViews', null, { root: true })
+
+      resolve()
+
+      // logout(state.token).then(() => {
+      //   commit('SET_TOKEN', '')
+      //   commit('SET_ROLES', [])
+      //   removeToken()
+      //   resetRouter()
+
+      //   // reset visited views and cached views
+      //   // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485
+      //   dispatch('tagsView/delAllViews', null, { root: true })
+
+      //   resolve()
+      // }).catch(error => {
+      //   reject(error)
+      // })
     })
   },
 

shanXiPlatform/src/styles/global.scss

@@ -1,12 +1,12 @@
 .global{
-    height:calc(100vh - 60px);
+    height:calc(100vh - 60px - 30px);
     background-color: #ececec;
     padding: 15px;  
     overflow: hidden;
 
     .mainContainer
     {
-        height:calc(100vh - 115px);
+        height:calc(100vh - 145px);
         padding: 15px;
         background-color: #ffffff;
         overflow: auto;

shanXiPlatform/src/utils/auth.js

@@ -1,6 +1,6 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'Admin-Token'
+const TokenKey = 'Token'
 
 export function getToken() {
   return Cookies.get(TokenKey)

shanXiPlatform/src/utils/request.js

@@ -5,7 +5,10 @@ import { getToken } from '@/utils/auth'
 
 // create an axios instance
 const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
+  // baseURL: process.env.VUE_APP_BASE_API,
+  baseURL: '/api',
+
+  // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 5000 // request timeout
 })
@@ -19,7 +22,7 @@ service.interceptors.request.use(
       // let each request carry token
       // ['X-Token'] is a custom headers key
       // please modify it according to the actual situation
-      config.headers['X-Token'] = getToken()
+      config.headers['Token'] = getToken()
     }
     return config
   },
@@ -43,7 +46,15 @@ service.interceptors.response.use(
    * You can also judge the status by HTTP Status Code
    */
   response => {
-    const res = response.data
+    const res = response.data //
+
+    // 走框架接口，会先在这里拿到服务器返回的数据，如果出现请求超时，或者token获取，或者一些公共错误，可以在这里判断拦截，然后在返回
+
+    if (true) {
+      return res
+    } else {
+      return Promise.reject(new Error(res.message || 'Error')) // 返回错误，可以如下面所示，给一个弹框提示错误之后，在返回
+    }
 
     // if the custom code is not 20000, it is judged as an error.
     if (res.code !== 20000) {

shanXiPlatform/src/views/basicInformation/admin/components/TodoList/index.vue

@@ -38,6 +38,7 @@
 </template>
 
 <script>
+
 import Todo from './Todo.vue'
 
 const STORAGE_KEY = 'todos'

shanXiPlatform/src/views/basicInformation/index.vue

@@ -1,26 +1,21 @@
 <template>
   <div style="padding:10px">
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="机构人员" name="1"> 机构人员 </el-tab-pane>
+      <el-tab-pane label="人员结构" name="1">人员结构</el-tab-pane>
 
       <el-tab-pane label="政策制度" name="2">
         <el-table :data="policeSystemData" stripe style="width: 100%" border>
-          <el-table-column label="序号" type="index" align="center">
-          </el-table-column>
-          <el-table-column prop="issueDate" label="发布日期" align="center">
-          </el-table-column>
-          <el-table-column prop="issuer" label="发布者" align="center">
-          </el-table-column>
-          <el-table-column prop="title" label="标题" align="center">
-          </el-table-column>
+          <el-table-column label="序号" type="index" align="center" />
+          <el-table-column prop="issueDate" label="发布日期" align="center" />
+          <el-table-column prop="issuer" label="发布者" align="center" />
+          <el-table-column prop="title" label="标题" align="center" />
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">
               <el-button
-                @click="checkPoliceSystem(scope.row)"
                 type="text"
                 size="small"
-                >查看</el-button
-              >
+                @click="checkPoliceSystem(scope.row)"
+              >查看</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -36,8 +31,8 @@
   </div>
 </template>
 <script>
-//引入分页
-import Pagination from "@/components/Pagination"
+// 引入分页
+import Pagination from '@/components/Pagination'
 export default {
   components: { Pagination },
   data() {
@@ -50,36 +45,36 @@ export default {
         importance: undefined,
         title: undefined,
         type: undefined,
-        sort: "+id",
+        sort: '+id'
       },
-      activeName: "1",
-      //表格数据
+      activeName: '1',
+      // 表格数据
       policeSystemData: [
         {
-          //发布日期
-          issueDate: "2020-1-1",
+          // 发布日期
+          issueDate: '2020-1-1',
           //   发布者
-          issuer: "中储粮山西分公司",
-          //标题
-          title: "关于2021年小麦收购的相关事项",
+          issuer: '中储粮山西分公司',
+          // 标题
+          title: '关于2021年小麦收购的相关事项'
         },
         {
-          //发布日期
-          issueDate: "2020-1-1",
+          // 发布日期
+          issueDate: '2020-1-1',
           //   发布者
-          issuer: "中储粮山西分公司",
-          //标题
-          title: "关于2021年小麦收购的相关事项",
+          issuer: '中储粮山西分公司',
+          // 标题
+          title: '关于2021年小麦收购的相关事项'
         },
         {
-          //发布日期
-          issueDate: "2020-1-1",
+          // 发布日期
+          issueDate: '2020-1-1',
           //   发布者
-          issuer: "中储粮山西分公司",
-          //标题
-          title: "关于2021年小麦收购的相关事项",
-        },
-      ],
+          issuer: '中储粮山西分公司',
+          // 标题
+          title: '关于2021年小麦收购的相关事项'
+        }
+      ]
     }
   },
 
@@ -87,11 +82,11 @@ export default {
     handleClick(tab, event) {
       console.log(tab, event)
     },
-    //机构人员查看
+    // 机构人员查看
     checkPoliceSystem(row) {
       console.log(row)
     },
-    getList() {},
-  },
+    getList() {}
+  }
 }
-</script>
+</script>

shanXiPlatform/src/views/login/index.vue

@@ -1,7 +1,13 @@
 <template>
   <div class="login-container">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on" label-position="left">
-
+    <el-form
+      ref="loginForm"
+      :model="loginForm"
+      :rules="loginRules"
+      class="login-form"
+      autocomplete="on"
+      label-position="left"
+    >
       <div class="title-container">
         <h3 class="title">Login Form</h3>
       </div>
@@ -21,7 +27,12 @@
         />
       </el-form-item>
 
-      <el-tooltip v-model="capsTooltip" content="Caps lock is On" placement="right" manual>
+      <el-tooltip
+        v-model="capsTooltip"
+        content="Caps lock is On"
+        placement="right"
+        manual
+      >
         <el-form-item prop="password">
           <span class="svg-container">
             <svg-icon icon-class="password" />
@@ -40,31 +51,45 @@
             @keyup.enter.native="handleLogin"
           />
           <span class="show-pwd" @click="showPwd">
-            <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
+            <svg-icon
+              :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"
+            />
           </span>
         </el-form-item>
       </el-tooltip>
 
-      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">Login</el-button>
+      <!-- <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">Login</el-button> -->
+
+      <el-button
+        :loading="loading"
+        type="primary"
+        style="width: 100%; margin-bottom: 30px"
+        @click="handleLogin()"
+      >Login</el-button>
 
-      <div style="position:relative">
+      <div style="position: relative">
         <div class="tips">
           <span>Username : admin</span>
           <span>Password : any</span>
         </div>
         <div class="tips">
-          <span style="margin-right:18px;">Username : editor</span>
+          <span style="margin-right: 18px">Username : editor</span>
           <span>Password : any</span>
         </div>
 
-        <el-button class="thirdparty-button" type="primary" @click="showDialog=true">
+        <el-button
+          class="thirdparty-button"
+          type="primary"
+          @click="showDialog = true"
+        >
           Or connect with
         </el-button>
       </div>
     </el-form>
 
     <el-dialog title="Or connect with" :visible.sync="showDialog">
-      Can not be simulated on local, so please combine you own business simulation! ! !
+      Can not be simulated on local, so please combine you own business
+      simulation! ! !
       <br>
       <br>
       <br>
@@ -101,8 +126,12 @@ export default {
         password: '111111'
       },
       loginRules: {
-        username: [{ required: true, trigger: 'blur', validator: validateUsername }],
-        password: [{ required: true, trigger: 'blur', validator: validatePassword }]
+        username: [
+          { required: true, trigger: 'blur', validator: validateUsername }
+        ],
+        password: [
+          { required: true, trigger: 'blur', validator: validatePassword }
+        ]
       },
       passwordType: 'password',
       capsTooltip: false,
@@ -140,7 +169,7 @@ export default {
   methods: {
     checkCapslock(e) {
       const { key } = e
-      this.capsTooltip = key && key.length === 1 && (key >= 'A' && key <= 'Z')
+      this.capsTooltip = key && key.length === 1 && key >= 'A' && key <= 'Z'
     },
     showPwd() {
       if (this.passwordType === 'password') {
@@ -158,6 +187,8 @@ export default {
           this.loading = true
           this.$store.dispatch('user/login', this.loginForm)
             .then(() => {
+              console.log('判断登录结果')
+
               this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
               this.loading = false
             })
@@ -204,8 +235,8 @@ export default {
 /* 修复input 背景不协调 和光标变色 */
 /* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
 
-$bg:#283443;
-$light_gray:#fff;
+$bg: #283443;
+$light_gray: #fff;
 $cursor: #fff;
 
 @supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
@@ -248,9 +279,9 @@ $cursor: #fff;
 </style>
 
 <style lang="scss" scoped>
-$bg:#2d3a4b;
-$dark_gray:#889aa4;
-$light_gray:#eee;
+$bg: #2d3a4b;
+$dark_gray: #889aa4;
+$light_gray: #eee;
 
 .login-container {
   min-height: 100%;

shanXiPlatform/src/views/systemManagement/organizationalStructureManagement/granaryOrganizationalStructureManagement/subWarehouse/addSub.vue

@@ -1,43 +1,42 @@
 <template>
-  <div id="directlyLibrary">
-    <div class="title">新增分库</div>
 
-    <div class="main">
-      <div class="main_top">
-        <div>仓库名称:</div>
-        <div class="">
-          <el-input v-model="input" placeholder="请输入内容"></el-input>
+  <div class="global">
+    <div class="mainContainer">
+      <div class="title">新增分库</div>
+
+      <div class="main">
+        <div class="main_top">
+          <div>仓库名称:</div>
+          <div class="">
+            <el-input v-model="subName" placeholder="请输入内容" />
+          </div>
+        </div>
+        <div class="main_bottom">
+          <div>所属:</div>
+          <div>山西分公司</div>
         </div>
-      </div>
-      <div class="main_bottom">
-        <div>所属:</div>
-        <div>山西分公司</div>
-      </div>
         <div class="btns">
-      <el-button>取消</el-button>
-      <el-button>保存</el-button>
-    </div>
-    </div>
+          <el-button>取消</el-button>
+          <el-button>保存</el-button>
+        </div>
+      </div>
 
-  
+    </div>
   </div>
 </template>
 <script>
 export default {
-  name: "AddSub",
+  name: 'AddSub',
   data() {
     return {
-      formLabelWidth: "100px",
-      directlyLibrary: {
-        name: "",
-        company: "山西分公司",
-      },
+      formLabelWidth: '100px',
+      subName: ''
     }
-  },
+  }
 }
 </script>
 <style lang="scss" scoped>
-#directlyLibrary {
+.mainContainer {
   padding: 20px;
   .title {
     margin-bottom: 20px;
@@ -67,4 +66,4 @@ export default {
  .el-input__inner {
   width:100%;
 }
-</style>
+</style>

shanXiPlatform/src/views/systemManagement/organizationalStructureManagement/granaryOrganizationalStructureManagement/subWarehouse/addWarehouse.vue

@@ -1,44 +1,43 @@
 <template>
-  <div id="directlyLibrary">
-    <div class="title">新增仓房</div>
+  <!-- <div id="directlyLibrary"> -->
+  <div class="global">
+    <div class="mainContainer">
+      <div class="title">新增仓房</div>
 
-    <div class="main">
-      <div class="main_top">
-        <div>仓房名称:</div>
-        <div class="">
-          <el-input v-model="input" placeholder="请输入内容"></el-input>
+      <div class="main">
+        <div class="main_top">
+          <div>仓房名称:</div>
+          <div class="">
+            <el-input v-model="warehouseName" placeholder="请输入内容" />
+          </div>
+        </div>
+        <div class="main_bottom">
+          <div>所属:</div>
+          <div>山西分公司></div>
+          <div>中央储备粮太原直属库有限公司</div>
+        </div>
+        <div class="btns">
+          <el-button>取消</el-button>
+          <el-button>保存</el-button>
         </div>
       </div>
-      <div class="main_bottom">
-        <div>所属:</div>
-        <div>山西分公司></div>
-        <div>中央储备粮太原直属库有限公司></div>
-      </div>
-      <div class="btns">
-      <el-button>取消</el-button>
-      <el-button>保存</el-button>
-    </div>
-    </div>
 
-    
+    </div>
   </div>
 </template>
 <script>
 export default {
-  name: "AddWarehouse",
+  name: 'AddWarehouse',
   data() {
     return {
-      formLabelWidth: "100px",
-      directlyLibrary: {
-        name: "",
-        company: "山西分公司",
-      },
+      formLabelWidth: '100px',
+      warehouseName: ''
     }
-  },
+  }
 }
 </script>
 <style lang="scss" scoped>
-#directlyLibrary {
+.mainContainer {
   padding: 20px;
   .title {
     margin-bottom: 20px;
@@ -68,4 +67,4 @@ export default {
  .el-input__inner {
   width:100%;
 }
-</style>
+</style>

shanXiPlatform/src/views/systemManagement/organizationalStructureManagement/organizationalStructureTabs.vue

@@ -5,50 +5,47 @@
         <el-tab-pane
           label="粮仓组织架构管理"
           name="GranaryOrganizationalStructureManagement"
-        ></el-tab-pane>
+        />
         <el-tab-pane
           label="人员组织架构管理"
           name="PersonnelOrganizationalStructureManagement"
-        ></el-tab-pane>
+        />
         <el-tab-pane
-          label="仓房基本信息"
+          label="粮库基本信息"
           name="WarehouseBasicInformation"
-        ></el-tab-pane>
+        />
       </el-tabs>
       <div id="main">
-        
-        <router-view></router-view>
+
+        <router-view />
       </div>
     </div>
   </div>
 </template>
 <script>
 
-
 export default {
-  name: "OrganizationalStructureTabs",
-  
+  name: 'OrganizationalStructureTabs',
+
   data() {
     return {
-     
-      activeName: "GranaryOrganizationalStructureManagement",
+
+      activeName: 'GranaryOrganizationalStructureManagement'
     }
   },
   mounted() {
-    this.activeName = this.$route.name;
+    this.activeName = this.$route.name
   },
   methods: {
-    handleClick(tab, event){
-        this.$router.push({
-          name: tab.name
-        });
-    },
- 
-  },
+    handleClick(tab, event) {
+      this.$router.push({
+        name: tab.name
+      })
+    }
+
+  }
 }
 </script>
 <style lang="scss" scoped>
 
-
-
-</style>
+</style>

shanXiPlatform/src/views/systemManagement/organizationalStructureManagement/personnelOrganizationalStructureManagement/addPersonnel.vue

@@ -1,153 +1,404 @@
 <template>
-  <div id="personel">
-    <div class="title">新增人员信息</div>
+  <div class="global">
+    <div class="mainContainer">
+      <div class="title">{{ title }}人员信息</div>
 
-    <div class="company">
-      <span>所属公司:</span>
-      <span></span>
-    </div>
-    <div>
-      <div class="basicInfo">
-        <div>基本信息</div>
-        <div>
-          <el-form :inline="true" class="demo-form-inline" label-width="100px">
-            <el-form-item label="人员姓名:">
-              <el-input></el-input>
-            </el-form-item>
-
-            <el-form-item label="性别:">
-              <el-input></el-input>
-            </el-form-item>
-            <el-form-item label="联系方式:">
-              <el-input></el-input>
-            </el-form-item>
-
-            <el-form-item label="出生年月:">
-              <el-input></el-input>
-            </el-form-item>
-
-            <el-form-item label="邮箱:">
-              <el-input></el-input>
-            </el-form-item>
-            <el-form-item label="工作年限:">
-              <el-input></el-input>
-            </el-form-item>
-
-            <el-form-item label="岗位(职位):">
-              <el-input></el-input>
-            </el-form-item>
-
-            <el-form-item label="政治面貌:">
-              <el-input></el-input>
-            </el-form-item>
-            <el-form-item label="入党事件:">
-              <el-input></el-input>
-            </el-form-item>
-
-            <div>
-              <span>
-                上传头像
-              </span>
-             
-                 <el-upload
-                class="avatar-uploader"
-                action="https://jsonplaceholder.typicode.com/posts/"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccess"
-                :before-upload="beforeAvatarUpload"
-              >
-                <img v-if="imageUrl" :src="imageUrl" class="avatar" />
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
-          
-             
-            </div>
-           
-
-           <div class="educational">
-            <div>教育学历</div>
-              <el-form-item label="第一学历:">
-              <el-input></el-input>
-            </el-form-item>
-
-            <el-form-item label="毕业院校:">
-              <el-input></el-input>
-            </el-form-item>
-            <el-form-item label="专业:">
-              <el-input></el-input>
-            </el-form-item>
-
-
-               <el-form-item label="教育形式:">
-              <el-input></el-input>
-            </el-form-item>
-
-            <el-form-item label="学位:">
-              <el-input></el-input>
-            </el-form-item>
-
-            </div>
-
-            <div class="major">
-            
-            <div>专业证书</div>
-
-             <el-form-item label="专业:">
-              <el-input></el-input>
-            </el-form-item>
-
-            <el-form-item label="等级:">
-              <el-input></el-input>
-            </el-form-item>
-            <el-form-item label="颁证机构:">
-              <el-input></el-input>
-            </el-form-item>
-
-             <el-form-item label="颁证年月:">
-              <el-input></el-input>
-            </el-form-item>
-
-           </div>
-          </el-form>
+      <div class="company">
+        <span>所属公司:</span>
+        <span />
+      </div>
+      <div>
+        <div class="basicInfo">
+          <div>基本信息</div>
+          <div>
+            <el-form
+              ref="ruleForm"
+              :inline="true"
+              :model="personnel"
+              class="demo-form-inline"
+              label-width="100px"
+              :rules="rules"
+            >
+              <el-form-item label="人员姓名:" prop="uname">
+                <el-input v-model="personnel.uname" />
+              </el-form-item>
+
+              <el-form-item label="性别:">
+                <el-select v-model="personnel.usex" placeholder="请选择">
+                  <el-option label="男" value="0" />
+                  <el-option label="女" value="1" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="联系方式:" prop="uphone">
+                <el-input v-model="personnel.uphone" />
+              </el-form-item>
+
+              <el-form-item label="出生日期:">
+                <!-- <el-input v-model="personnel.ubirthday"></el-input> -->
+                <el-date-picker
+                  v-model="personnel.ubirthday"
+                  type="date"
+                  placeholder="选择日期"
+                />
+              </el-form-item>
+
+              <el-form-item label="邮箱:">
+                <el-input v-model="personnel.umail" />
+              </el-form-item>
+              <el-form-item label="工作年限:">
+                <el-input v-model="personnel.pworkYears" />
+              </el-form-item>
+
+              <el-form-item label="岗位(职位):" prop="ppost">
+                <el-select v-model="personnel.ppost">
+                  <el-option label="科长" value="0" />
+                  <el-option label="保管员" value="1" />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="政治面貌:">
+                <el-select v-model="personnel.ppoliticalOutlook">
+                  <el-option label="党员" value="0" />
+                  <el-option label="群众" value="1" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="入党时间:">
+                <!-- <el-input v-model="personnel.ppartyTime"></el-input> -->
+                <el-date-picker
+                  v-model="personnel.ppartyTime"
+                  type="date"
+                  placeholder="选择日期"
+                />
+              </el-form-item>
+              <el-form-item label="所属科室:" prop="pdepartment">
+                <el-select v-model="personnel.pdepartment">
+                  <el-option label="仓储科" value="0" />
+                  <el-option label="财务科" value="1" />
+                </el-select>
+              </el-form-item>
+
+              <div>
+                <span> 上传头像 </span>
+
+                <el-upload
+                  class="avatar-uploader"
+                  action="https://jsonplaceholder.typicode.com/posts/"
+                  :show-file-list="false"
+                  :on-success="handleAvatarSuccess"
+                  :before-upload="beforeAvatarUpload"
+                >
+                  <img v-if="imageUrl" :src="imageUrl" class="avatar">
+                  <i v-else class="el-icon-plus avatar-uploader-icon" />
+                </el-upload>
+              </div>
+
+              <div class="educational">
+                <div>教育学历</div>
+                <el-form-item label="第一学历:">
+                  <el-select v-model="personnel.pfirstDegree">
+                    <el-option label="男" value="0" />
+                    <el-option label="女" value="1" />
+                  </el-select>
+                </el-form-item>
+
+                <el-form-item label="毕业院校:">
+                  <el-input v-model="personnel.puniversityGraduated" />
+                </el-form-item>
+                <el-form-item label="专业:">
+                  <el-input v-model="personnel.pmajor" />
+                </el-form-item>
+
+                <el-form-item label="教育形式:">
+                  <el-select v-model="personnel.pformEducationTwo">
+                    <el-option label="男" value="0" />
+                    <el-option label="女" value="1" />
+                  </el-select>
+                </el-form-item>
+
+                <el-form-item label="学位:">
+                  <el-input v-model="personnel.pAcademicDegree" />
+                </el-form-item>
+                <div class="education2">
+                  <el-form-item label="最高学历:">
+                    <el-select v-model="personnel.pHighestEducation">
+                      <el-option label="男" value="0" />
+                      <el-option label="女" value="1" />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item label="毕业院校:">
+                    <el-input
+                      v-model="personnel.puniversityGraduatedTwo"
+                    />
+                  </el-form-item>
+                  <el-form-item label="专业:">
+                    <el-input v-model="personnel.pmajorTwo" />
+                  </el-form-item>
+
+                  <el-form-item label="教育形式:">
+                    <el-select v-model="personnel.pformEducationTwo">
+                      <el-option label="男" value="0" />
+                      <el-option label="女" value="1" />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item label="学位:">
+                    <el-input v-model="personnel.pacademicDegreeTwo" />
+                  </el-form-item>
+                </div>
+              </div>
+
+              <!-- <div class="major">
+                <div>专业证书</div>
+
+                <el-form-item label="专业:">
+                  <el-input v-model="personnel.pmajorThree"></el-input>
+                </el-form-item>
+
+                <el-form-item label="等级:">
+                  <el-input v-model="personnel.pGrade"></el-input>
+                </el-form-item>
+                <el-form-item label="颁证机构:">
+                  <el-input v-model="personnel.pLicensingAgency"></el-input>
+                </el-form-item>
+
+                <el-form-item label="颁证年月:">
+                  <el-input v-model="personnel.pLicensingTime"></el-input>
+                </el-form-item>
+              </div> -->
+            </el-form>
+          </div>
+        </div>
+
+        <div class="btns">
+          <el-button type="success" plain @click="cancel()">取消</el-button>
+          <el-button
+            v-show="this.type == 2 || this.type == 3"
+            type="success"
+            @click="btnSave('ruleForm')"
+          >保存</el-button>
         </div>
       </div>
     </div>
   </div>
 </template>
 <script>
+// 中转站
+import bus from '@/utils/bus'
+import {
+  getPersonnelInfo,
+  checkPersonnelInfo,
+  updatePersonnelInfo,
+  deletePersonnelInfo,
+  addPersonnelInfo
+} from '@/api/system/organizationalStructure/personnel'
 export default {
-  name: "AddPersonnel",
+  name: 'AddPersonnel',
+
   data() {
+    // 手机号校验
+    const checkPhone = (rule, value, callback) => {
+      const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
+      if (reg.test(value)) {
+        callback()
+      } else {
+        return callback(new Error('请输入正确的手机号'))
+      }
+    }
     return {
-              imageUrl: ''
+      // 按钮标识(1:查看；2:新增；3:修改)
+      type: '',
+      // 图片路径
+      imageUrl: '',
+      title: '',
+      id: '',
+      // 必填项规则
+      rules: {
+        // 姓名
+        uname: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+        // 联系方式
+        uphone: [{ required: true, validator: checkPhone, trigger: 'blur' }],
+        // 岗位(职务)
+        ppost: [
+          { required: true, message: '请输入职位名称', trigger: 'change' }
+        ],
+        // 所属科室
+        pdepartment: [
+          { required: true, message: '请选择所属科室', trigger: 'change' }
+        ]
+      },
+      // 初始化数据
+      personnel: {
+        // 人员姓名
+        uname: '',
+        // 性别
+        usex: '',
+        // 联系方式
+        uphone: '',
+        // 出生年月
+        ubirthday: '',
+        // 邮箱
+        umail: '',
+        // 工作年限
+        pworkYears: '',
+        // 岗位(职位)
+        ppost: '',
+        // 政治面貌
+        ppoliticalOutlook: '',
+        // 入党时间
+        ppartyTime: '',
+        // 所属科室
+        pdepartment: '',
+        // 第一学历(教育学历)
+        pfirstDegree: '',
+        // 毕业院校
+        puniversityGraduated: '',
+        // 专业
+        pmajor: '',
+        // 教育形式
+        pformEducationTwo: '',
+        // 学位
+        pAcademicDegree: '',
+        // 最高学历(教育学历)
+        pHighestEducation: '',
+        // 毕业院校
+        puniversityGraduatedTwo: '',
+        // 专业
+        pmajorTwo: '',
+        // 教育形式
+        pformEducationTwoTwo: '',
+        // 学位
+        pacademicDegreeTwo: ''
+      }
+    }
+  },
+  mounted() {
+    var routeParams = this.$route.query
+    console.log(routeParams, 'routeParams')
+    this.id = routeParams.pid
+    this.type = routeParams.type
+    console.log(this.id)
+
+    // 对表单数据进行重置
+    this.$nextTick(() => {
+      this.$refs['ruleForm'].resetFields()
+    })
 
+    if (routeParams.type == 1) {
+      this.title = '查看'
+      this.checkList()
+    } else if (routeParams.type == 2) {
+      this.title = '新增'
+    } else if (routeParams.type == 3) {
+      this.title = '修改'
+      this.checkList()
     }
   },
-  methods:{
-     handleAvatarSuccess(res, file) {
-        this.imageUrl = URL.createObjectURL(file.raw);
-      },
-      beforeAvatarUpload(file) {
-        const isJPG = file.type === 'image/jpeg';
-        const isLt2M = file.size / 1024 / 1024 < 2;
+  methods: {
+    handleAvatarSuccess(res, file) {
+      this.imageUrl = URL.createObjectURL(file.raw)
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg'
+      const isLt2M = file.size / 1024 / 1024 < 2
+
+      if (!isJPG) {
+        this.$message.error('上传头像图片只能是 JPG 格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isJPG && isLt2M
+    },
+
+    // 查看列表
+    checkList() {
+      var id = this.id
+      checkPersonnelInfo(id)
+        .then((res) => {
+          console.log(id, 'data')
+          console.log(res.data, 'res.data')
+
+          if (res.code == 200) {
+            this.personnel = res.data
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+
+    // 新增接口
+    addList() {
+      var data = this.personnel
+      addPersonnelInfo(data).then((res) => {
+        //  var data = this.personnel
+        this.$message.success('新增成功')
+        // 对表单数据进行重置
+
+        this.$router.push({
+          path:
+            '/systemManagement/organizationalStructureManagement/personnelOrganizationalStructureManagement'
+        })
+        bus.$emit('getList')
+      })
+    },
 
-        if (!isJPG) {
-          this.$message.error('上传头像图片只能是 JPG 格式!');
+    // 修改接口
+    editList() {
+      var data = this.personnel
+      updatePersonnelInfo(data).then((res) => {
+        if (res.code == 200) {
+          this.$message.success('修改成功')
+
+          this.$router.push({
+            path:
+              '/systemManagement/organizationalStructureManagement/personnelOrganizationalStructureManagement'
+          })
+          bus.$emit('getList')
         }
-        if (!isLt2M) {
-          this.$message.error('上传头像图片大小不能超过 2MB!');
+      })
+    },
+
+    // 保存按钮
+    btnSave(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          // this.addList();
+          console.log(this.type, 'this.type..')
+          if (this.type == 2) {
+            this.addList()
+          } else if (this.type == 3) {
+            this.editList()
+          }
+        } else {
+          console.log('error submit!!')
+          return false
         }
-        return isJPG && isLt2M;
-      }
-    
+      })
+    },
+
+    // 取消按钮
+    cancel() {
+      this.$router.push({
+        path:
+          '/systemManagement/organizationalStructureManagement/personnelOrganizationalStructureManagement'
+      })
+    }
   }
 }
 </script>
 <style lang="scss" scoped>
-#personel {
+.mainContainer {
   padding: 20px;
   .title {
-    margin-bottom: 20px;
+    margin-bottom: 10px;
+  }
+  .educational {
+    margin-top: 20px;
+    .education2 {
+      margin-top: 20px;
+    }
   }
   .company {
     margin-bottom: 20px;
@@ -155,32 +406,39 @@ export default {
   .el-form--inline .el-form-item {
     width: 30%;
   }
-
-  
+  .btns {
+    text-align: right;
+  }
 }
 </style>
 <style>
- .avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-  .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
-  }
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 178px;
-    height: 178px;
-    line-height: 178px;
-    text-align: center;
-  }
-  .avatar {
-    width: 178px;
-    height: 178px;
-    display: block;
-  }
-</style>
+.el-input--medium {
+  width: 220px;
+}
+.el-select > .el-input {
+  width: 220px;
+}
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

shanXiPlatform/src/views/systemManagement/organizationalStructureManagement/personnelOrganizationalStructureManagement/index.vue

@@ -1,60 +1,79 @@
 <template>
   <div>
-        <div class="button">
-      <el-button type="success" @click="addPersonel()">新增工作人员</el-button>
+    <div class="button">
+      <el-button type="success" @click="addPersonel(2)">新增工作人员</el-button>
     </div>
     <el-table
       border
       stripe
       :data="personnelData"
       highlight-current-row
-      @current-change="handleCurrentChange"
       style="width: 100%"
+      @current-change="handleCurrentChange"
     >
-      <el-table-column type="index" align="center" label="序号" width="50"> </el-table-column>
-      <el-table-column property="name" label="姓名" align="center">
-      </el-table-column>
-      <el-table-column property="company" label="所属公司" align="center">
-      </el-table-column>
-      <el-table-column property="positionName" label="职位名称" align="center">
-      </el-table-column>
-      <el-table-column property="telephone" label="手机号" align="center">
-      </el-table-column>
-      <el-table-column property="operation" label="操作" align="center" width='300'>
+      <el-table-column type="index" align="center" label="序号" width="50" />
+      <el-table-column property="uname" label="姓名" align="center" />
+      <el-table-column property="company" label="所属公司" align="center" />
+      <el-table-column property="ppost" label="职位名称" align="center" />
+      <el-table-column property="uphone" label="手机号" align="center" />
+      <el-table-column
+        property="operation"
+        label="操作"
+        align="center"
+        width="300"
+      >
         <template slot-scope="scope">
-
-              <el-button size="mini" @click="handleCheck(scope.$index, scope.row)"
-            >查看</el-button
-          >
-          <el-button size="mini" @click="handleEdit(scope.$index, scope.row)"
-            >编辑</el-button
-          >
+          <el-button
+            size="mini"
+            @click="handleCheck(1, scope.$index, scope.row)"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            @click="handleEdit(3, scope.$index, scope.row)"
+          >编辑</el-button>
           <el-button
             size="mini"
             type="danger"
             @click="handleDelete(scope.$index, scope.row)"
-            >删除</el-button
-          >
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="listQuery.page"
-          :limit.sync="listQuery.limit"
-          @pagination="getList"
-        />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="listQuery.page"
+      :limit.sync="listQuery.limit"
+      @pagination="getPageList"
+    />
   </div>
 </template>
 <script>
-import Pagination from "@/components/Pagination"
+// 中转站
+import bus from '@/utils/bus'
+// 分页
+import Pagination from '@/components/Pagination'
+import {
+  getPersonnelInfo,
+  checkPersonnelInfo,
+  updatePersonnelInfo,
+  deletePersonnelInfo,
+  addPersonnelInfo
+} from '@/api/system/organizationalStructure/personnel'
 export default {
-    components: { Pagination },
+  components: { Pagination },
   data() {
     return {
-        //分页
-          total: 30,
+
+      // 按钮类型
+      type: '',
+      // 索引
+      index: '',
+      // 每行数据
+      row: '',
+      id: '',
+      // 分页
+      total: 30,
       listLoading: true,
       listQuery: {
         page: 1,
@@ -62,48 +81,115 @@ export default {
         importance: undefined,
         title: undefined,
         type: undefined,
-        sort: "+id",
+        sort: '+id'
       },
-        //人员组织架构数据
-      personnelData: [
-        {
-          name: "王建国",
-          company: "山西分公司",
-          positionName: "操作员",
-          telephone: "13245678542",
-        },
-      ],
+      // 人员组织架构数据
+      personnelData: []
     }
   },
+  mounted() {
+    this.getList()
+    bus.$on('getList', function() {
+      this.getList()
+    })
+  },
 
-   methods:{
-     //新增跳转
-     addPersonel(){
-       this.$router.push({name:"AddPersonnel"});
-     },
-        getList() {},
+  methods: {
+    // 新增跳转
+    addPersonel(type) {
+      this.$router.push({
+        path: '/personnelOrganizationalStructureManagement/personnel',
+        query: { type: type }
+      })
+    },
+    getPageList() {},
     // 当表格的当前行发生变化的时候会触发该事件
-    handleCurrentChange(){},
-    //查看
+    handleCurrentChange() {},
+    // 查看
 
-     handleCheck(index, row) {
-        console.log(index, row);
-      },
-    //编辑
-       handleEdit(index, row) {
-        console.log(index, row);
-      },
-      //删除
-      handleDelete(index, row) {
-        console.log(index, row);
+    handleCheck(type, index, row) {
+      this.$router.push({
+        path: '/personnelOrganizationalStructureManagement/personnel',
+        query: { type: type, pid: row.pid }
+      })
+    },
+    // 编辑
+    handleEdit(type, index, row) {
+      console.log(row, 'row')
+      this.$router.push({
+        path: '/personnelOrganizationalStructureManagement/personnel',
+
+        query: { type: type, pid: row.pid }
+      })
+    },
+    // 删除功能
+    deleteList() {
+      console.log('shancuu')
+      this.$confirm('确定删除该项记录?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          console.log(11111)
+          var params = {
+            id: this.id
+          }
+          console.log(params, '删除id')
+          deletePersonnelInfo(params)
+            .then((res) => {
+              if (res.code == 200) {
+                this.getList()
+                this.$message({
+                  type: 'success',
+                  message: '删除成功!'
+                })
+              }
+            })
+            .catch(() => {
+              this.$message({
+                type: 'info',
+                message: '已取消删除'
+              })
+            })
+        })
+    },
+    handleDelete(index, row) {
+      // console.log(index, row)
+      this.id = row.pid
+      this.deleteList()
+    },
+
+    // 获取列表
+    getList() {
+      var data = {
+        pageIndex: this.listQuery.page,
+        pageSize: this.listQuery.limit
       }
+      getPersonnelInfo(data)
+        .then((res) => {
+          console.log(data, 'data')
+          console.log(res.data, ',,,,,,')
+
+          if (res.code == 200) {
+            console.log(res.data.records, 'res.data.records')
+            this.personnelData = res.data.records
+
+            this.listQuery.limit = res.data.size
+            this.total = res.data.total
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    }
   }
 }
 </script>
 <style lang="scss" scoped>
-    .button{
-  text-align:right;
-  margin-right:20px;
-  padding-bottom:20px;
+.button {
+  text-align: right;
+  margin-right: 20px;
+  padding-bottom: 20px;
 }
-</style>
+</style>

shanXiPlatform/src/views/systemManagement/userManagement/departmentManagement/addDepartment.vue

@@ -0,0 +1,50 @@
+<template>
+  <div class="global">
+    <div class="mainContainer">
+      <div class="title">新增部门</div>
+      <el-form label-width="120px" :model="addDepartment">
+        <el-form-item label="新增部门:">
+          <el-input v-model="addDepartment.name" />
+        </el-form-item>
+        <el-form-item label="备注:">
+          <el-input v-model="addDepartment.remak" />
+        </el-form-item>
+      </el-form>
+      <div class="btns">
+        <el-button type="success" plain>取消</el-button>
+        <el-button type="success">保存</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'AddPartment',
+  data() {
+    return {
+      addDepartment: {
+        name: '',
+        remark: ''
+      }
+    }
+  },
+  methods: {
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+    .mainContainer{
+        .title{
+            margin-bottom:20px;
+        }
+        .btns{
+            text-align:right;
+        }
+    }
+</style>
+<style>
+    .el-input{
+        width:30%;
+    }
+</style>

shanXiPlatform/src/views/systemManagement/userManagement/departmentManagement/index.vue

@@ -1,90 +1,84 @@
 <template>
-    <div class="container">
-        <div class="top">
-            <el-button>新增部门</el-button>
-        </div>
-      
-             <el-table
-          border
-          stripe
-          :data="departmentData"
-          highlight-current-row
-          @current-change="handleCurrentChange"
-          style="width:100%"
-        >
-          <el-table-column
-            type="index"
-            align="center"
-            label="序号"
-            width="50px"
-          >
-          </el-table-column>
-          <el-table-column prop="departmentName" label="部门名称" align="center">
-          </el-table-column>
-          <el-table-column prop="creatTime" label="创建时间" align="center">
-          </el-table-column>
-          <el-table-column prop="remark" label="备注" align="center">
-          </el-table-column>
-          
-          <el-table-column
-            prop="operation"
-            label="操作"
-            align="center"
-            width="200px"
-             fixed="right"
-          >
-            <template slot-scope="scope">
-              
-              <el-button
-                size="mini"
-                @click="handleEdit(scope.$index, scope.row)"
-                >修改</el-button
-              >
-              <el-button
-                size="mini"
-                @click="handleDeleat(scope.$index, scope.row)"
-                >删除</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-          <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="listQuery.page"
-          :limit.sync="listQuery.limit"
-          @pagination="getList"
-        />
+  <div class="container">
+    <div class="top">
+      <el-button type="success" @click="addDepaartment()">新增部门</el-button>
     </div>
+
+    <el-table
+      border
+      stripe
+      :data="departmentData"
+      highlight-current-row
+      style="width:100%"
+      @current-change="handleCurrentChange"
+    >
+      <el-table-column
+        type="index"
+        align="center"
+        label="序号"
+        width="50px"
+      />
+      <el-table-column prop="departmentName" label="部门名称" align="center" />
+      <el-table-column prop="creatTime" label="创建时间" align="center" />
+      <el-table-column prop="remark" label="备注" align="center" />
+
+      <el-table-column
+        prop="operation"
+        label="操作"
+        align="center"
+        width="200px"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+
+          <el-button
+            size="mini"
+            @click="handleEdit(scope.$index, scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            @click="handleDeleat(scope.$index, scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="listQuery.page"
+      :limit.sync="listQuery.limit"
+      @pagination="getList"
+    />
+  </div>
 </template>
 <script>
-//引入分页
-import Pagination from "@/components/Pagination"
+// 引入分页
+import Pagination from '@/components/Pagination'
 export default {
-    name:"DepartManagement",
-    components:{Pagination},
-    data(){
-      return{
-          //列表数据
-          departmentData:[
-              {
-                departmentName:"1qewdffg" ,
-                creatTime:"2020-2-2",
-                remark:"dehfuvcnigvvn hvvn vhvnavhaegieg"
-              },
-              {
-                departmentName:"1qewdffg" ,
-                creatTime:"2020-2-2",
-                remark:"dehfuvcnigvvn hvvn vhvnavhaegieg"
-              },
-              {
-                departmentName:"1qewdffg" ,
-                creatTime:"2020-2-2",
-                remark:"dehfuvcnigvvn hvvn vhvnavhaegieg"
-              },
-          ],
+  name: 'DepartManagement',
+  components: { Pagination },
+  data() {
+    return {
+      // 列表数据
+      departmentData: [
+        {
+          departmentName: '1qewdffg',
+          creatTime: '2020-2-2',
+          remark: 'dehfuvcnigvvn hvvn vhvnavhaegieg'
+        },
+        {
+          departmentName: '1qewdffg',
+          creatTime: '2020-2-2',
+          remark: 'dehfuvcnigvvn hvvn vhvnavhaegieg'
+        },
+        {
+          departmentName: '1qewdffg',
+          creatTime: '2020-2-2',
+          remark: 'dehfuvcnigvvn hvvn vhvnavhaegieg'
+        }
+      ],
 
-            //分页
+      // 分页
       total: 30,
       listLoading: true,
       listQuery: {
@@ -93,36 +87,40 @@ export default {
         importance: undefined,
         title: undefined,
         type: undefined,
-        sort: "+id",
-      },
+        sort: '+id'
       }
-    },
-    methods:{
-         getList() {},
-         // 当表格的当前行发生变化的时候会触发该事件
+    }
+  },
+  methods: {
+    getList() {},
+    // 当表格的当前行发生变化的时候会触发该事件
     handleCurrentChange() {},
-            //编辑
-       handleEdit(index, row) {
-        console.log(index, row);
-      },
-      //删除
-      handleDelete(index, row) {
-        console.log(index, row);
-      },
-
+    // 新增部门
+    addDepaartment() {
+      this.$router.push({ name: 'AddDepartment' })
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(index, row)
+    },
+    // 删除
+    handleDelete(index, row) {
+      console.log(index, row)
     }
+
+  }
 }
 </script>
 <style lang="scss" scoped>
 .container{
     width:100%;
       .top{
-        
+
         height:50px;
         line-height:50px;
         text-align: right;
         margin-bottom:20px;
     }
 }
-  
-</style>
+
+</style>

shanXiPlatform/src/views/systemManagement/userManagement/roleManagement/addRole.vue

@@ -0,0 +1,193 @@
+<template>
+  <div class="global">
+    <div class="mainContainer">
+      <el-form
+        ref="ruleForm"
+
+        :model="roleGroup"
+        :rules="rules"
+        label-width="120px"
+        class="demo-ruleForm"
+      >
+        <el-form-item label="新增角色组名:" prop="rname">
+          <el-input v-model="roleGroup.rname" />
+        </el-form-item>
+        <el-form-item label="备注:">
+          <el-input v-model="roleGroup.rremark" />
+        </el-form-item>
+      </el-form>
+      <div class="tree">
+        <div class="treeLabel">功能:</div>
+        <div class="treeShow">
+          <el-tree
+            ref="resourseTree"
+            :data="data"
+            show-checkbox
+            node-key="resourceCode"
+            :props="defaultProps"
+          />
+        </div>
+      </div>
+      <div>
+        <el-button type="success" plain @click="cancel()">取消</el-button>
+        <el-button
+          v-show="this.type == 2 || this.type == 3"
+          type="success"
+          @click="btnSave('ruleForm')"
+        >保存</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+// 中转站
+import bus from '@/utils/bus'
+// 引入接口
+import {
+  resourcesTree,
+  getUserInfo,
+  addUserInfo,
+  updateUserInfo,
+  roleIsExit
+} from '@/api/system/userManagement/role'
+export default {
+  name: 'AddRole',
+  data() {
+    return {
+      // 按钮类型
+      type: '',
+      // 校验规则
+      rules: {
+        rname: [{ required: true, message: '请输入角色组', trigger: 'blur' }]
+      },
+
+      // 初始化数据
+      roleGroup: {
+        rname: '',
+        rremark: ''
+
+      },
+      defaultProps: {
+        children: 'children',
+        label: 'resourceName'
+        // id:'resourceCode'
+      },
+      data: []
+    }
+  },
+
+  // 新增
+
+  mounted() {
+    var routeParams = this.$route.query
+    console.log(routeParams, 'routeParams')
+    // this.id = routeParams.pid
+    this.type = routeParams.type
+    console.log(this.id)
+
+    this.getTreeInfo()
+    this.rGroupExit()
+  },
+
+  methods: {
+    // 判断角色组是否存在
+    rGroupExit() {
+      var params = this.roleGroup.rname
+      roleIsExit(params)
+        .then(res => {
+          if (res.code == 200) {
+            console.log(res.data, 'juesezu')
+          }
+        })
+    },
+    // 获取资源树接口
+    getTreeInfo() {
+      resourcesTree()
+        .then((res) => {
+          if (res.code == 200) {
+            this.data = res.data
+          }
+        })
+        .catch(err => {
+          console.log(err)
+        })
+    },
+
+    // 新增接口
+    addList() {
+      var data = this.roleGroup
+      addUserInfo(data)
+        .then(res => {
+          console.log(data, '新增data')
+          if (res.code == 200) {
+            this.$message.success('新增成功')
+            this.$router.push({
+              path:
+            '/systemManagement/user/roleManagement'
+            })
+            bus.$emit('getList')
+          }
+        })
+    },
+    // 点保存按钮
+    btnSave(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          // this.addList();
+          console.log(this.type, 'this.type..')
+          if (this.type == 2) {
+            console.log(this.$refs.resourseTree.getCheckedNodes(), '资源树')
+            var checkedNodes = this.$refs.resourseTree.getCheckedNodes()
+            var resourceCodes = []
+            for (
+              let index = 0;
+              index < checkedNodes.length;
+              index++
+            ) {
+              const ele = checkedNodes[index]
+              resourceCodes.push(ele.resourceCode, ele.parentCode)
+            }
+            console.log(resourceCodes, '......')
+            resourceCodes = resourceCodes.join(',')
+            console.log(resourceCodes, '数组')
+            this.roleGroup.resourceCodes = resourceCodes
+            console.log(this.roleGroup.resourceCodes, 'this. roleGroup.resourceCodes')
+            this.addList()
+          } else if (this.type == 3) {
+            this.editList()
+          }
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.tree {
+  display: flex;
+  .treeLabel {
+    width: 120px;
+    text-align: right;
+  }
+  .treeShow {
+    width: 600px;
+
+    height: 400px;
+    // max-height: 100px;
+    // overflow-y:scroll ;
+    margin-left:20px;
+    // background:rgb(244, 240, 240);
+  }
+}
+</style>
+<style>
+.el-input {
+  width: 20%;
+}
+.el-tree{
+  background:rgb(245, 243, 243);
+}
+</style>

shanXiPlatform/src/views/systemManagement/userManagement/roleManagement/index.vue

@@ -1,89 +1,69 @@
 <template>
-    <div class="container">
-        <div class="top">
-            <el-button>新增角色</el-button>
-        </div>
-      
-             <el-table
-          border
-          stripe
-          :data="departmentData"
-          highlight-current-row
-          @current-change="handleCurrentChange"
-          style="width:100%"
-        >
-          <el-table-column
-            type="index"
-            align="center"
-            label="序号"
-            width="50px"
-          >
-          </el-table-column>
-          <el-table-column prop="roleName" label="角色名称" align="center">
-          </el-table-column>
-          <el-table-column prop="creatTime" label="创建时间" align="center">
-          </el-table-column>
-          <el-table-column prop="remark" label="备注" align="center">
-          </el-table-column>
-          
-          <el-table-column
-            prop="operation"
-            label="操作"
-            align="center"
-            width="200px"
-            fixed="right"
-          >
-            <template slot-scope="scope">
-              
-              <el-button
-                size="mini"
-                @click="handleEdit(scope.$index, scope.row)"
-                >修改</el-button
-              >
-              <el-button
-                size="mini"
-                @click="handleDeleat(scope.$index, scope.row)"
-                >删除</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-          <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="listQuery.page"
-          :limit.sync="listQuery.limit"
-          @pagination="getList"
-        />
+  <div class="container">
+    <div class="top">
+      <el-button type="success" @click="addRole(2)">新增角色组</el-button>
     </div>
+
+    <el-table
+      border
+      stripe
+      :data="departmentData"
+      highlight-current-row
+      style="width: 100%"
+    >
+      <el-table-column type="index" align="center" label="序号" width="50px" />
+      <el-table-column prop="rname" label="角色名称" align="center" />
+      <el-table-column prop="rCreateTime" label="创建时间" align="center" />
+      <el-table-column prop="rremark" label="备注" align="center" />
+
+      <el-table-column
+        prop="operation"
+        label="操作"
+        align="center"
+        width="200px"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            @click="handleEdit(3, scope.$index, scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            @click="handleDeleat(scope.$index, scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="listQuery.page"
+      :limit.sync="listQuery.limit"
+      @pagination="getPageList"
+    />
+  </div>
 </template>
 <script>
-import Pagination from "@/components/Pagination"
+// 中转站
+import bus from '@/utils/bus'
+import Pagination from '@/components/Pagination'
+// 引入接口
+import {
+  getUserInfo,
+  addUserInfo,
+  updateUserInfo,
+  userIsExit
+} from '@/api/system/userManagement/role'
 export default {
-    name:"DepartManagement",
-    components:{Pagination},
-    data(){
-      return{
-          //列表数据
-          departmentData:[
-              {
-                roleName:"1qewdffg" ,
-                creatTime:"2020-2-2",
-                remark:"dehfuvcnigvvn hvvn vhvnavhaegieg"
-              },
-              {
-                roleName:"1qewdffg" ,
-                creatTime:"2020-2-2",
-                remark:"dehfuvcnigvvn hvvn vhvnavhaegieg"
-              },
-              {
-                roleName:"1qewdffg" ,
-                creatTime:"2020-2-2",
-                remark:"dehfuvcnigvvn hvvn vhvnavhaegieg"
-              },
-          ],
+  name: 'DepartManagement',
+  components: { Pagination },
+  data() {
+    return {
+      // 列表数据
+      departmentData: [],
 
-            //分页
+      // 分页
       total: 30,
       listLoading: true,
       listQuery: {
@@ -92,36 +72,68 @@ export default {
         importance: undefined,
         title: undefined,
         type: undefined,
-        sort: "+id",
-      },
+        sort: '+id'
+      }
+    }
+  },
+
+  mounted() {
+    this.getList()
+    bus.$on('getList', function() {
+      this.getList()
+    })
+  },
+  methods: {
+    getPageList() {},
+
+    // 获取用户列表
+
+    getList() {
+      var data = {
+        pageIndex: this.listQuery.page,
+        pageSize: this.listQuery.limit
       }
+      getUserInfo(data)
+        .then((res) => {
+          console.log(data, 'data')
+          console.log(res.data, ',,,,,,')
+
+          if (res.code == 200) {
+            console.log(res.data.records, 'res.data.records')
+            this.departmentData = res.data.records
+
+            this.listQuery.limit = res.data.size
+            this.total = res.data.total
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
     },
-    methods:{
-         getList() {},
-         // 当表格的当前行发生变化的时候会触发该事件
-    handleCurrentChange() {},
-            //编辑
-       handleEdit(index, row) {
-        console.log(index, row);
-      },
-      //删除
-      handleDelete(index, row) {
-        console.log(index, row);
-      },
 
+    // 新增角色
+    addRole(type) {
+      this.$router.push({ path: '/roleManagement/addRole', query: { type: type }})
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(index, row)
+    },
+    // 删除
+    handleDelete(index, row) {
+      console.log(index, row)
     }
+  }
 }
 </script>
 <style lang="scss" scoped>
-.container{
-    width:100%;
-      .top{
-        
-        height:50px;
-        line-height:50px;
-        text-align: right;
-        margin-bottom:20px;
-    }
+.container {
+  width: 100%;
+  .top {
+    height: 50px;
+    line-height: 50px;
+    text-align: right;
+    margin-bottom: 20px;
+  }
 }
-  
-</style>
+</style>

shanXiPlatform/src/views/systemManagement/userManagement/userManagement/addUser.vue

@@ -10,8 +10,9 @@
               :model="user"
               class="demo-form-inline"
               label-width="100px"
+              :rules="rules"
             >
-              <el-form-item label="用户名:">
+              <el-form-item label="用户名:" prop="name">
                 <el-input v-model="user.name" />
               </el-form-item>
               <el-form-item label="生日:">
@@ -19,6 +20,7 @@
                   v-model="user.birthday"
                   type="date"
                   placeholder="选择日期"
+                  width="180px"
                 />
               </el-form-item>
               <el-form-item label="邮箱:">
@@ -27,10 +29,10 @@
               <el-form-item label="联系电话:">
                 <el-input v-model="user.phone" />
               </el-form-item>
-              <el-form-item label="密码:">
+              <el-form-item label="密码:" prop="password">
                 <el-input v-model="user.password" />
               </el-form-item>
-              <el-form-item label="确认密码:">
+              <el-form-item label="确认密码:" prop="confirmPassword">
                 <el-input v-model="user.confirmPassword" />
               </el-form-item>
             </el-form>
@@ -63,6 +65,91 @@
             </el-checkbox-group>
           </div>
         </div>
+
+        <div class="bottoms">
+          <el-form
+            :inline="true"
+            :rules="rules"
+            :model="user"
+            class="demo-form-inline"
+            label-width="100px"
+          >
+            <el-form-item label="所属粮库:" prop="grainDepot">
+              <el-select v-model="user.grainDepot">
+                <el-option label="区域一" value="shanghai" />
+                <el-option label="区域二" value="beijing" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="人员名称:">
+              <el-select v-model="user.personnelName">
+                <el-option label="区域一" value="shanghai" />
+                <el-option label="区域二" value="beijing" />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="职位:">
+              <el-select v-model="user.position">
+                <el-option label="区域一" value="shanghai" />
+                <el-option label="区域二" value="beijing" />
+              </el-select>
+            </el-form-item>
+          </el-form>
+
+          <div class="bottom_warehouse">
+            <div class="warehouse">仓房:</div>
+            <div class="check_div warehouse_div">
+              <el-checkbox-group v-model="checkList">
+                <div>
+                  <el-checkbox label="全选" />
+                </div>
+
+                <div class="checkGroup">
+                  <el-checkbox label="1号仓" />
+                  <el-checkbox label="2号仓" />
+                  <el-checkbox label="3号仓" />
+                  <el-checkbox label="4号仓" />
+                  <el-checkbox label="5号仓" />
+                  <el-checkbox label="6号仓" />
+                  <el-checkbox label="1号仓" />
+                  <el-checkbox label="2号仓" />
+                  <el-checkbox label="3号仓" />
+                  <el-checkbox label="4号仓" />
+                  <el-checkbox label="5号仓" />
+                  <el-checkbox label="6号仓" />
+                  <el-checkbox label="1号仓" />
+                  <el-checkbox label="2号仓" />
+                  <el-checkbox label="3号仓" />
+                  <el-checkbox label="4号仓" />
+                  <el-checkbox label="5号仓" />
+                  <el-checkbox label="6号仓" />
+                  <el-checkbox label="1号仓" />
+                  <el-checkbox label="2号仓" />
+                  <el-checkbox label="3号仓" />
+                  <el-checkbox label="4号仓" />
+                  <el-checkbox label="5号仓" />
+                  <el-checkbox label="6号仓" />
+                  <el-checkbox label="1号仓" />
+                  <el-checkbox label="2号仓" />
+                  <el-checkbox label="3号仓" />
+                  <el-checkbox label="4号仓" />
+                  <el-checkbox label="5号仓" />
+                  <el-checkbox label="6号仓" />
+                  <el-checkbox label="1号仓" />
+                  <el-checkbox label="2号仓" />
+                  <el-checkbox label="3号仓" />
+                  <el-checkbox label="4号仓" />
+                  <el-checkbox label="5号仓" />
+                  <el-checkbox label="6号仓" />
+                </div>
+              </el-checkbox-group>
+            </div>
+          </div>
+        </div>
+
+        <div class="btns">
+          <el-button type="success" plain>取消</el-button>
+          <el-button type="success">保存</el-button>
+        </div>
       </div>
     </div>
   </div>
@@ -82,7 +169,36 @@ export default {
         email: '',
         phone: '',
         password: '',
-        confirmPassword: ''
+        confirmPassword: '',
+        grainDepot: '',
+        personnelName: ''
+      },
+      // 验证规则
+      rules: {
+        name: [
+          {
+            required: true,
+            message: '用户名已经存在，请重新输入',
+            trigger: 'blur'
+          }
+        ],
+        password: [
+          {
+            required: true,
+            message: '密码长度6-14位，必须有数字和字母',
+            trigger: 'blur'
+          }
+        ],
+        confirmPassword: [
+          {
+            required: true,
+            message: '两次输入密码不一致',
+            trigger: 'blur'
+          }
+        ],
+        grainDepot: [
+          { required: true, message: '请选择所属粮库', trigger: 'blur' }
+        ]
       }
     }
   },
@@ -107,52 +223,75 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.title {
-  margin-bottom: 20px;
-}
-.main{
-   padding: 20px 30px;
-}
-.top {
+.mainContainer {
+  position: relative;
+  .title {
+    margin-bottom: 20px;
+  }
+  .main {
+    padding: 20px 30px;
+  }
+  .top {
+    display: flex;
+    .top_left {
+      width: 60%;
+      .el-form--inline .el-form-item {
+        width: 45%;
+        margin-bottom: 40px;
+      }
+    }
+    .top_right {
+      width: 40%;
+      text-align: center;
 
-  display: flex;
-  .top_left {
-    width: 60%;
-    .el-form--inline .el-form-item {
-      width: 45%;
-      margin-bottom: 40px;
+      .imageBtn {
+        margin-top: 10px;
+      }
     }
   }
-  .top_right {
-    width: 40%;
-    text-align: center;
+  .middle,
+  .bottom_warehouse {
+    margin: 20px 0;
+    display: flex;
+    align-items: center;
 
-    .imageBtn {
-      margin-top: 10px;
+    .check_div {
+      width: 1200px;
+      height: 100px;
+      display: flex;
+      padding-left: 20px;
+      align-items: center;
+      border: 1px solid #ccc;
     }
   }
+  .bottom_warehouse {
+    .warehouse_div {
+      width: 1200px;
+
+      .checkGroup
+      {
+        max-height: 70px;
+        overflow-y: scroll;
+      }
 
-}
-  .middle{
-    margin-top:20px;
-    display:flex;
-    align-items: center;
-    .roleGroup{
-      width:100px;
-      text-align:right;
-      margin-right:20px;
-    }
-    .check_div{
-      width:1200px;
-      height:100px;
-      display:flex;
-      padding-left:20px;
-      align-items: center;
-      border:1px solid #ccc;
     }
   }
+  .warehouse,
+  .roleGroup {
+    width: 100px;
+    text-align: right;
+    margin-right: 20px;
+    white-space: nowrap;
+  }
+  .btns {
+    text-align: right;
+  }
+}
 </style>
 <style>
+.el-date-editor {
+  width: 180px !important;
+}
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;

shanXiPlatform/src/views/systemManagement/userManagement/userManagement/index.vue

@@ -24,15 +24,15 @@
           </el-form-item>
 
           <el-form-item>
-            <el-button type="primary" @click="clear()">清空</el-button>
+            <el-button type="success" plain @click="clear()">清空</el-button>
           </el-form-item>
 
           <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
+            <el-button type="success" plain @click="search()">查询</el-button>
           </el-form-item>
         </el-form>
         <div>
-          <el-button @click="addUser">新增用户</el-button>
+          <el-button type="success" @click="addUser">新增用户</el-button>
         </div>
       </div>
     </div>
@@ -54,12 +54,13 @@
             label="序号"
             width="50px"
           />
-          <el-table-column prop="name" label="名称" align="center" />
-          <el-table-column prop="realName" label="真实姓名" align="center" />
-          <el-table-column prop="role" label="角色" align="center" />
-          <el-table-column prop="warehouse" label="仓库" align="center" />
-          <el-table-column prop="telephone" label="电话" align="center" />
+          <el-table-column prop="name" label="用户名" align="center" />
+          <el-table-column prop="realName" label="人员名称" align="center" />
+          <el-table-column prop="role" label="公司" align="center" />
           <el-table-column prop="position" label="职位" align="center" />
+          <el-table-column prop="telephone" label="电话" align="center" />
+          <el-table-column prop="warehouse" label="角色" align="center" />
+
           <el-table-column prop="btnStatus" label="禁用" align="center">
             <template slot-scope="scope">
               <el-switch

shanXiPlatform/vue.config.js

@@ -35,13 +35,36 @@ module.exports = {
   lintOnSave:false,
   productionSourceMap: false,
   devServer: {
+
+
+    proxy: {  //配置跨域
+      '/api': {
+        target: 'http://10.10.1.25:9099',  //这里后台的地址模拟的;应该填写你们真实的后台接口
+        changOrigin: true,  //允许跨域
+       
+        pathRewrite: {
+          /* 重写路径，当我们在浏览器中看到请求的地址为：http://localhost:8080/api/core/getData/userInfo 时
+            实际上访问的地址是：http://121.121.67.254:8185/core/getData/userInfo,因为重写了 /api
+           */
+          '^/api': '' 
+        }
+      },
+    },
+
+
+
+
+   
+
+
+   
     port: port,
     open: true,
     overlay: {
       warnings: false,
       errors: true
     },
-    before: require('./mock/mock-server.js')
+    //before: require('./mock/mock-server.js')  //注释，不然会先走mock，然后再走本地服务不，被mock拦截了
   },
   configureWebpack: {
     // provide the app's title in webpack's name field, so that