Merge branch 'dev_4newlayout' of http://182.92.169.222:3000/zhc077/projectManagement into dev_4newlayout

ant-design-vue-jeecg/src/api/api.js

@@ -1,109 +1,150 @@
-import { getAction, deleteAction, putAction, postAction, httpAction } from '@/api/manage'
+import {
+  getAction,
+  deleteAction,
+  putAction,
+  postAction,
+  httpAction
+} from '@/api/manage'
 import Vue from 'vue'
-import {UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
+import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
 
 //角色管理
-const addRole = (params)=>postAction("/sys/role/add",params);
-const editRole = (params)=>putAction("/sys/role/edit",params);
-const checkRoleCode = (params)=>getAction("/sys/role/checkRoleCode",params);
-const queryall = (params)=>getAction("/sys/role/queryall",params);
+const addRole = (params) => postAction('/sys/role/add', params)
+const editRole = (params) => putAction('/sys/role/edit', params)
+const checkRoleCode = (params) => getAction('/sys/role/checkRoleCode', params)
+const queryall = (params) => getAction('/sys/role/queryall', params)
 
 //用户管理
-const addUser = (params)=>postAction("/sys/user/add",params);
-const editUser = (params)=>putAction("/sys/user/edit",params);
-const queryUserRole = (params)=>getAction("/sys/user/queryUserRole",params);
-const getUserList = (params)=>getAction("/sys/user/list",params);
-const getStudentList = (params)=>getAction("/sys/user/student",params);
-const frozenBatch = (params)=>putAction("/sys/user/frozenBatch",params);
+const addUser = (params) => postAction('/sys/user/add', params)
+const editUser = (params) => putAction('/sys/user/edit', params)
+const queryUserRole = (params) => getAction('/sys/user/queryUserRole', params)
+const getUserList = (params) => getAction('/sys/user/list', params)
+const getStudentList = (params) => getAction('/sys/user/student', params)
+const frozenBatch = (params) => putAction('/sys/user/frozenBatch', params)
 //验证用户是否存在
-const checkOnlyUser = (params)=>getAction("/sys/user/checkOnlyUser",params);
+const checkOnlyUser = (params) => getAction('/sys/user/checkOnlyUser', params)
 //改变密码
-const changePassword = (params)=>putAction("/sys/user/changePassword",params);
+const changePassword = (params) => putAction('/sys/user/changePassword', params)
 
 //权限管理
-const addPermission= (params)=>postAction("/sys/permission/add",params);
-const editPermission= (params)=>putAction("/sys/permission/edit",params);
-const getPermissionList = (params)=>getAction("/sys/permission/list",params);
-const getSystemMenuList = (params)=>getAction("/sys/permission/getSystemMenuList",params);
-const getSystemSubmenu = (params)=>getAction("/sys/permission/getSystemSubmenu",params);
-const getSystemSubmenuBatch = (params) => getAction('/sys/permission/getSystemSubmenuBatch', params)
-const queryTreeList = (params)=>getAction("/sys/permission/queryTreeList",params);
-const queryTreeListForRole = (params)=>getAction("/sys/role/queryTreeList",params);
-const queryListAsync = (params)=>getAction("/sys/permission/queryListAsync",params);
-const queryRolePermission = (params)=>getAction("/sys/permission/queryRolePermission",params);
-const saveRolePermission = (params)=>postAction("/sys/permission/saveRolePermission",params);
-const queryPermissionsByUser = ()=>getAction("/sys/permission/getUserPermissionByToken");
-const loadAllRoleIds = (params)=>getAction("/sys/permission/loadAllRoleIds",params);
-const getPermissionRuleList = (params)=>getAction("/sys/permission/getPermRuleListByPermId",params);
-const queryPermissionRule = (params)=>getAction("/sys/permission/queryPermissionRule",params);
+const addPermission = (params) => postAction('/sys/permission/add', params)
+const editPermission = (params) => putAction('/sys/permission/edit', params)
+const getPermissionList = (params) => getAction('/sys/permission/list', params)
+const getSystemMenuList = (params) =>
+  getAction('/sys/permission/getSystemMenuList', params)
+const getSystemSubmenu = (params) =>
+  getAction('/sys/permission/getSystemSubmenu', params)
+const getSystemSubmenuBatch = (params) =>
+  getAction('/sys/permission/getSystemSubmenuBatch', params)
+const queryTreeList = (params) =>
+  getAction('/sys/permission/queryTreeList', params)
+const queryTreeListForRole = (params) =>
+  getAction('/sys/role/queryTreeList', params)
+const queryListAsync = (params) =>
+  getAction('/sys/permission/queryListAsync', params)
+const queryRolePermission = (params) =>
+  getAction('/sys/permission/queryRolePermission', params)
+const saveRolePermission = (params) =>
+  postAction('/sys/permission/saveRolePermission', params)
+const queryPermissionsByUser = () =>
+  getAction('/sys/permission/getUserPermissionByToken')
+const loadAllRoleIds = (params) =>
+  getAction('/sys/permission/loadAllRoleIds', params)
+const getPermissionRuleList = (params) =>
+  getAction('/sys/permission/getPermRuleListByPermId', params)
+const queryPermissionRule = (params) =>
+  getAction('/sys/permission/queryPermissionRule', params)
 
 // 部门管理
-const fzr =(params) =>getAction("/fdy/findAll",params)
-const jiaoxue =(params) =>getAction("/sys/sysDepart/jiaoxue",params);
-const queryDepartTreeList = (params)=>getAction("/sys/sysDepart/queryTreeList",params);
-const queryDepartTreeSync = (params)=>getAction("/sys/sysDepart/queryDepartTreeSync",params);
-const queryIdTree = (params)=>getAction("/sys/sysDepart/queryIdTree",params);
-const queryParentName   = (params)=>getAction("/sys/sysDepart/queryParentName",params);
-const searchByKeywords   = (params)=>getAction("/sys/sysDepart/searchBy",params);
-const deleteByDepartId   = (params)=>deleteAction("/sys/sysDepart/delete",params);
-const startorstop = (params)=>deleteAction("/sys/sysDepart/startorstop",params);
-
+const fzr = (params) => getAction('/fdy/findAll', params)
+const jiaoxue = (params) => getAction('/sys/sysDepart/jiaoxue', params)
+const queryDepartTreeList = (params) =>
+  getAction('/sys/sysDepart/queryTreeList', params)
+const queryDepartTreeSync = (params) =>
+  getAction('/sys/sysDepart/queryDepartTreeSync', params)
+const queryIdTree = (params) => getAction('/sys/sysDepart/queryIdTree', params)
+const queryParentName = (params) =>
+  getAction('/sys/sysDepart/queryParentName', params)
+const searchByKeywords = (params) =>
+  getAction('/sys/sysDepart/searchBy', params)
+const deleteByDepartId = (params) =>
+  deleteAction('/sys/sysDepart/delete', params)
+const startorstop = (params) =>
+  deleteAction('/sys/sysDepart/startorstop', params)
 
 //二级部门管理
-const queryDepartPermission = (params)=>getAction("/sys/permission/queryDepartPermission",params);
-const saveDepartPermission = (params)=>postAction("/sys/permission/saveDepartPermission",params);
-const queryTreeListForDeptRole = (params)=>getAction("/sys/sysDepartPermission/queryTreeListForDeptRole",params);
-const queryDeptRolePermission = (params)=>getAction("/sys/sysDepartPermission/queryDeptRolePermission",params);
-const saveDeptRolePermission = (params)=>postAction("/sys/sysDepartPermission/saveDeptRolePermission",params);
-const queryMyDepartTreeList = (params)=>getAction("/sys/sysDepart/queryTreeList",params);
+const queryDepartPermission = (params) =>
+  getAction('/sys/permission/queryDepartPermission', params)
+const saveDepartPermission = (params) =>
+  postAction('/sys/permission/saveDepartPermission', params)
+const queryTreeListForDeptRole = (params) =>
+  getAction('/sys/sysDepartPermission/queryTreeListForDeptRole', params)
+const queryDeptRolePermission = (params) =>
+  getAction('/sys/sysDepartPermission/queryDeptRolePermission', params)
+const saveDeptRolePermission = (params) =>
+  postAction('/sys/sysDepartPermission/saveDeptRolePermission', params)
+const queryMyDepartTreeList = (params) =>
+  getAction('/sys/sysDepart/queryTreeList', params)
 
 //日志管理
-const deleteLog = (params)=>deleteAction("/sys/log/delete",params);
-const deleteLogList = (params)=>deleteAction("/sys/log/deleteBatch",params);
+const deleteLog = (params) => deleteAction('/sys/log/delete', params)
+const deleteLogList = (params) => deleteAction('/sys/log/deleteBatch', params)
 
 //数据字典
-const addDict = (params)=>postAction("/sys/dict/add",params);
-const editDict = (params)=>putAction("/sys/dict/edit",params);
-const treeList = (params)=>getAction("/sys/dict/treeList",params);
-const addDictItem = (params)=>postAction("/sys/dictItem/add",params);
-const editDictItem = (params)=>putAction("/sys/dictItem/edit",params);
+const addDict = (params) => postAction('/sys/dict/add', params)
+const editDict = (params) => putAction('/sys/dict/edit', params)
+const treeList = (params) => getAction('/sys/dict/treeList', params)
+const addDictItem = (params) => postAction('/sys/dictItem/add', params)
+const editDictItem = (params) => putAction('/sys/dictItem/edit', params)
 
 //字典标签专用（通过code获取字典数组）
-export const ajaxGetDictItems = (code, params)=>getAction(`/sys/dict/getDictItems/${code}`,params);
+export const ajaxGetDictItems = (code, params) =>
+  getAction(`/sys/dict/getDictItems/${code}`, params)
 
 //从缓存中获取字典配置
 function getDictItemsFromCache(dictCode) {
-  if (Vue.ls.get(UI_CACHE_DB_DICT_DATA) && Vue.ls.get(UI_CACHE_DB_DICT_DATA)[dictCode]) {
-    let dictItems = Vue.ls.get(UI_CACHE_DB_DICT_DATA)[dictCode];
+  if (
+    Vue.ls.get(UI_CACHE_DB_DICT_DATA) &&
+    Vue.ls.get(UI_CACHE_DB_DICT_DATA)[dictCode]
+  ) {
+    let dictItems = Vue.ls.get(UI_CACHE_DB_DICT_DATA)[dictCode]
     //console.log("-----------getDictItemsFromCache----------dictCode="+dictCode+"---- dictItems=",dictItems)
-    return dictItems;
+    return dictItems
   }
 }
 
 //系统通告
-const doReleaseData = (params)=>getAction("/sys/annountCement/doReleaseData",params);
-const doReovkeData = (params)=>getAction("/sys/annountCement/doReovkeData",params);
+const doReleaseData = (params) =>
+  getAction('/sys/annountCement/doReleaseData', params)
+const doReovkeData = (params) =>
+  getAction('/sys/annountCement/doReovkeData', params)
 //获取系统访问量
-const getLoginfo = (params)=>getAction("/sys/loginfo",params);
-const getVisitInfo = (params)=>getAction("/sys/visitInfo",params);
+const getLoginfo = (params) => getAction('/sys/loginfo', params)
+const getVisitInfo = (params) => getAction('/sys/visitInfo', params)
 
 // 根据部门主键查询用户信息
-const queryUserByDepId = (params)=>getAction("/sys/user/queryUserByDepId",params);
+const queryUserByDepId = (params) =>
+  getAction('/sys/user/queryUserByDepId', params)
 
 // 重复校验
-const duplicateCheck = (params)=>getAction("/sys/duplicate/check",params);
+const duplicateCheck = (params) => getAction('/sys/duplicate/check', params)
 // 加载分类字典
-const loadCategoryData = (params)=>getAction("/sys/category/loadAllData",params);
-const checkRuleByCode = (params) => getAction('/sys/checkRule/checkByCode', params)
+const loadCategoryData = (params) =>
+  getAction('/sys/category/loadAllData', params)
+const checkRuleByCode = (params) =>
+  getAction('/sys/checkRule/checkByCode', params)
 //加载我的通告信息
-const getUserNoticeInfo= (params)=>getAction("/sys/sysAnnouncementSend/getMyAnnouncementSend",params);
-const getTransitURL = url => `/sys/common/transitRESTful?url=${encodeURIComponent(url)}`
+const getUserNoticeInfo = (params) =>
+  getAction('/sys/sysAnnouncementSend/getMyAnnouncementSend', params)
+const getTransitURL = (url) =>
+  `/sys/common/transitRESTful?url=${encodeURIComponent(url)}`
+
 // 中转HTTP请求
 export const transitRESTful = {
   get: (url, parameter) => getAction(getTransitURL(url), parameter),
   post: (url, parameter) => postAction(getTransitURL(url), parameter),
   put: (url, parameter) => putAction(getTransitURL(url), parameter),
-  http: (url, parameter) => httpAction(getTransitURL(url), parameter),
+  http: (url, parameter) => httpAction(getTransitURL(url), parameter)
 }
 
 export {
@@ -170,6 +211,3 @@ export {
   startorstop,
   getStudentList
 }
-
-
-

ant-design-vue-jeecg/src/api/manage.js

@@ -7,62 +7,72 @@ const api = {
   role: '/mock/api/role',
   service: '/mock/api/service',
   permission: '/mock/api/permission',
-  permissionNoPager: '/mock/api/permission/no-pager'
+  permissionNoPager: '/mock/api/permission/no-pager',
+  myTaskData: 'task/task/list'
 }
 
 export default api
 
 //post
-export function postAction(url,parameter) {
-  let sign = signMd5Utils.getSign(url, parameter);
+export function postAction(url, parameter) {
+  let sign = signMd5Utils.getSign(url, parameter)
   //将签名和时间戳，添加在请求接口 Header
-  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()};
+  let signHeader = {
+    'X-Sign': sign,
+    'X-TIMESTAMP': signMd5Utils.getDateTimeToString()
+  }
 
   return axios({
     url: url,
-    method:'post' ,
+    method: 'post',
     data: parameter,
     headers: signHeader
   })
 }
 
 //post
-export function postFormAction(url,parameter) {
+export function postFormAction(url, parameter) {
   return axios({
     url: url,
-    method:'post' ,
+    method: 'post',
     params: parameter
   })
 }
 
 //post method= {post | put}
-export function httpAction(url,parameter,method) {
-  let sign = signMd5Utils.getSign(url, parameter);
+export function httpAction(url, parameter, method) {
+  let sign = signMd5Utils.getSign(url, parameter)
   //将签名和时间戳，添加在请求接口 Header
-  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()};
+  let signHeader = {
+    'X-Sign': sign,
+    'X-TIMESTAMP': signMd5Utils.getDateTimeToString()
+  }
 
   return axios({
     url: url,
-    method:method ,
+    method: method,
     data: parameter,
     headers: signHeader
   })
 }
 
 //put
-export function putAction(url,parameter) {
+export function putAction(url, parameter) {
   return axios({
     url: url,
-    method:'put',
+    method: 'put',
     data: parameter
   })
 }
 
 //get
-export function getAction(url,parameter) {
-  let sign = signMd5Utils.getSign(url, parameter);
+export function getAction(url, parameter) {
+  let sign = signMd5Utils.getSign(url, parameter)
   //将签名和时间戳，添加在请求接口 Header
-  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()};
+  let signHeader = {
+    'X-Sign': sign,
+    'X-TIMESTAMP': signMd5Utils.getDateTimeToString()
+  }
 
   return axios({
     url: url,
@@ -73,7 +83,7 @@ export function getAction(url,parameter) {
 }
 
 //deleteAction
-export function deleteAction(url,parameter) {
+export function deleteAction(url, parameter) {
   return axios({
     url: url,
     method: 'delete',
@@ -129,11 +139,11 @@ export function saveService(parameter) {
  * @param parameter
  * @returns {*}
  */
-export function downFile(url,parameter){
+export function downFile(url, parameter) {
   return axios({
     url: url,
     params: parameter,
-    method:'get' ,
+    method: 'get',
     responseType: 'blob'
   })
 }
@@ -173,14 +183,14 @@ export function downloadFile(url, fileName, parameter) {
  * @param parameter
  * @returns {*}
  */
-export function uploadAction(url,parameter){
+export function uploadAction(url, parameter) {
   return axios({
     url: url,
     data: parameter,
-    method:'post' ,
+    method: 'post',
     headers: {
-      'Content-Type': 'multipart/form-data',  // 文件上传
-    },
+      'Content-Type': 'multipart/form-data' // 文件上传
+    }
   })
 }
 
@@ -190,17 +200,26 @@ export function uploadAction(url,parameter){
  * @param subStr
  * @returns {*}
  */
-export function getFileAccessHttpUrl(avatar,subStr) {
-  if(!subStr) subStr = 'http'
+export function getFileAccessHttpUrl(avatar, subStr) {
+  if (!subStr) subStr = 'http'
   try {
-    if(avatar && avatar.startsWith(subStr)){
-      return avatar;
-    }else{
-      if(avatar &&　avatar.length>0 && avatar.indexOf('[')==-1){
-        return window._CONFIG['staticDomainURL'] + "/" + avatar;
+    if (avatar && avatar.startsWith(subStr)) {
+      return avatar
+    } else {
+      if (avatar && avatar.length > 0 && avatar.indexOf('[') == -1) {
+        return window._CONFIG['staticDomainURL'] + '/' + avatar
       }
     }
-  }catch(err){
-   return;
+  } catch (err) {
+    return
   }
 }
+
+// 大禹项目管理系统中的个人任务管理
+export function getMyTaskData(parameter) {
+  return axios({
+    url: api.myTaskData,
+    method: 'get',
+    params: parameter
+  })
+}

ant-design-vue-jeecg/src/config/router.config.js

@@ -17,6 +17,7 @@ import {
   UserLayoutSchedule,
   UserLayoutEquip,
   PageView
+  PageView
 } from '@/components/layouts'
 
 /**
@@ -300,13 +301,13 @@ export const asyncRouterMap = [
       //     },
       //   ]
       // }
-      // #endregion
+      //#endregion
     ]
   },
   {
     path: '*',
     redirect: '/404',
-    hidden: true // 没有匹配到 就会显示404
+    hidden: true //没有匹配到 就会显示404
   },
   {
     path: '/page1',
@@ -315,6 +316,8 @@ export const asyncRouterMap = [
     meta: { title: '首页' },
     redirect: '/dashboard/analysis'
   }
+    redirect: '/dashboard/analysis'
+  }
 ]
 
 /**
@@ -331,7 +334,8 @@ export const constantRouterMap = [
       {
         path: 'loginmall',
         name: 'loginmall',
-        component: () => import(/* webpackChu nkName: "user" */ '@/views/user/Login')
+        component: () =>
+          import(/* webpackChu nkName: "user" */ '@/views/user/Login')
       }
     ]
   },
@@ -344,7 +348,8 @@ export const constantRouterMap = [
       {
         path: 'loginbigdata',
         name: 'loginbigdata',
-        component: () => import(/* webpackChu nkName: "user" */ '@/views/user/Login')
+        component: () =>
+          import(/* webpackChu nkName: "user" */ '@/views/user/Login')
       }
     ]
   },
@@ -359,6 +364,10 @@ export const constantRouterMap = [
         name: 'loginbx',
         component: () => import(/* webpackChu nkName: "user" */ '@/views/user/Login')
       }
+    ]
+        component: () =>
+          import(/* webpackChu nkName: "user" */ '@/views/user/Login')
+      }
     ]
   },
   {
@@ -370,7 +379,8 @@ export const constantRouterMap = [
       {
         path: 'logindata',
         name: 'logindata',
-        component: () => import(/* webpackChu nkName: "user" */ '@/views/user/Login')
+        component: () =>
+          import(/* webpackChu nkName: "user" */ '@/views/user/Login')
       }
     ]
   },
@@ -385,6 +395,10 @@ export const constantRouterMap = [
         name: 'logindroduction',
         component: () => import(/* webpackChu nkName: "user" */ '@/views/user/Login')
       }
+    ]
+        component: () =>
+          import(/* webpackChu nkName: "user" */ '@/views/user/Login')
+      }
     ]
   },
   {
@@ -398,6 +412,10 @@ export const constantRouterMap = [
         name: 'loginfitting',
         component: () => import(/* webpackChu nkName: "user" */ '@/views/user/Login')
       }
+    ]
+        component: () =>
+          import(/* webpackChu nkName: "user" */ '@/views/user/Login')
+      }
     ]
   },
   {
@@ -411,6 +429,10 @@ export const constantRouterMap = [
         name: 'loginglobal',
         component: () => import(/* webpackChu nkName: "user" */ '@/views/user/Login')
       }
+    ]
+        component: () =>
+          import(/* webpackChu nkName: "user" */ '@/views/user/Login')
+      }
     ]
   },
   {
@@ -424,6 +446,10 @@ export const constantRouterMap = [
         name: 'loginworkmanship',
         component: () => import(/* webpackChu nkName: "user" */ '@/views/user/Login')
       }
+    ]
+        component: () =>
+          import(/* webpackChu nkName: "user" */ '@/views/user/Login')
+      }
     ]
   },
   {
@@ -437,6 +463,10 @@ export const constantRouterMap = [
         name: 'loginworkorder',
         component: () => import(/* webpackChu nkName: "user" */ '@/views/user/Login')
       }
+    ]
+        component: () =>
+          import(/* webpackChu nkName: "user" */ '@/views/user/Login')
+      }
     ]
   },
   {
@@ -450,6 +480,10 @@ export const constantRouterMap = [
         name: 'loginequip',
         component: () => import(/* webpackChu nkName: "user" */ '@/views/user/Login')
       }
+    ]
+        component: () =>
+          import(/* webpackChu nkName: "user" */ '@/views/user/Login')
+      }
     ]
   },
   {
@@ -463,6 +497,10 @@ export const constantRouterMap = [
         name: 'loginschedule',
         component: () => import(/* webpackChu nkName: "user" */ '@/views/user/Login')
       }
+    ]
+        component: () =>
+          import(/* webpackChu nkName: "user" */ '@/views/user/Login')
+      }
     ]
   },
   {
@@ -476,6 +514,10 @@ export const constantRouterMap = [
         name: 'loginsimulation',
         component: () => import(/* webpackChu nkName: "user" */ '@/views/user/Login')
       }
+    ]
+        component: () =>
+          import(/* webpackChu nkName: "user" */ '@/views/user/Login')
+      }
     ]
   },
   {
@@ -488,22 +530,38 @@ export const constantRouterMap = [
         path: 'login',
         name: 'login',
         component: () => import(/* webpackChunkName: "user" */ '@/views/user/Login')
+        component: () =>
+          import(/* webpackChunkName: "user" */ '@/views/user/Login')
       },
       {
         path: 'register',
         name: 'register',
         component: () => import(/* webpackChunkName: "user" */ '@/views/user/register/Register')
+        component: () =>
+          import(
+            /* webpackChunkName: "user" */ '@/views/user/register/Register'
+          )
       },
       {
         path: 'register-result',
         name: 'registerResult',
         component: () => import(/* webpackChunkName: "user" */ '@/views/user/register/RegisterResult')
+        component: () =>
+          import(
+            /* webpackChunkName: "user" */ '@/views/user/register/RegisterResult'
+          )
       },
       {
         path: 'alteration',
         name: 'alteration',
         component: () => import(/* webpackChunkName: "user" */ '@/views/user/alteration/Alteration')
       }
+    ]
+        component: () =>
+          import(
+            /* webpackChunkName: "user" */ '@/views/user/alteration/Alteration'
+          )
+      }
     ]
   },
 
@@ -541,16 +599,23 @@ export const constantRouterMap = [
         name: 'TestHome',
         component: () => import('@/views/Home')
       }
+    ]
+        component: () => import('@/views/Home')
+      }
     ]
   },
   {
     path: '/404',
     component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
+    component: () =>
+      import(/* webpackChunkName: "fail" */ '@/views/exception/404')
   },
 
   {
     path: '/atlas',
     component: () => import(/* webpackChunkName: "fail" */ '@/views/xmtp/SeKnowAtlasList')
+    component: () =>
+      import(/* webpackChunkName: "fail" */ '@/views/xmtp/SeKnowAtlasList')
   },
 
   // cms首页，免登录，单独访问页面
@@ -559,43 +624,49 @@ export const constantRouterMap = [
   {
     path: '/cms/home', // 这里是你需要设置新窗口打开的页面的路径
     component: () => import('@/views/cms/home')
+    path: '/cms/home', //这里是你需要设置新窗口打开的页面的路径
+    component: () => import('@/views/cms/home')
   },
   {
     path: '/cms/major', // 这里是你需要设置新窗口打开的页面的路径
     component: () => import('@/views/cms/pages/Major/MajorView')
+    path: '/cms/major', //这里是你需要设置新窗口打开的页面的路径
+    component: () => import('@/views/cms/pages/Major/MajorView')
   },
   {
     path: '/cms/detail', // 这里是你需要设置新窗口打开的页面的路径
     component: () => import('@/views/cms/pages/Detail/DetailView')
+    path: '/cms/detail', //这里是你需要设置新窗口打开的页面的路径
+    component: () => import('@/views/cms/pages/Detail/DetailView')
   },
   {
     path: '/newLayout/dayu', // 这里是你需要设置新窗口打开的页面的路径
+    path: '/newLayout/dayu', //这里是你需要设置新窗口打开的页面的路径
     redirect: '/home/lnfo',
-    component: () => import(/* webpackChunkName: "fail" */ '@/views/newLayout/module/Demo4NewLayoutList'),
+    component: () =>
+      import(
+        /* webpackChunkName: "fail" */ '@/views/newLayout/module/Demo4NewLayoutList'
+      ),
     children: [
       {
         path: '/home/lnfo',
         // name: '学生列表',
         // iconChildClass: 'el-icon-watermelon',
         component: () => import('@/views/newLayout/module/Main')
-
       },
       {
-        path: '/home/lnfos',
-        // name: '列表',
-        // iconChildClass: 'el-icon-watermelon',
-        component: () => import('@/views/newLayout/module/Msg')
-
-      },
-       {
-        path: '/home/taskadmin',
-        // name: '列表',
-        // iconChildClass: 'el-icon-watermelon',
-        component: () => import('@/views/newLayout/task_admin/TaskAdmin')
-
+        path: '/myTask',
+        component: () => import('@/views/newLayout/myTask/index'),
+        redirect: '/myTask/assignment',
+        children: [
+          {
+            path: '/myTask/assignment',
+            component: () => import('@/views/newLayout/myTask/list/assignment')
+          }
+        ]
       }
-
     ]
   }
 
+  }
 ]

ant-design-vue-jeecg/src/views/newLayout/module/Demo4NewLayoutList.vue

@@ -35,6 +35,27 @@
             <i :class="'el-icon-' + item.icon" style="color: #cad5f6"></i>
             <span slot="title">{{ item.label }}</span>
           </el-menu-item>
+          <!-- 多级菜单 -->
+          <!-- <el-submenu
+            index="index"
+            v-for="(item, index) in asideMenu"
+            :key="index"
+          >
+            <template slot="title">
+              <i class="el-icon-menu" style="color: #cad5f6"></i>
+              <span>{{ item.label }}</span>
+            </template>
+            <el-menu-item-group>
+              <el-menu-item
+                :index="subItem.path"
+                v-for="(subItem, subIndex) in item.children"
+                :key="subIndex"
+              >
+                {{ subItem.label }}
+              </el-menu-item>
+            </el-menu-item-group>
+          </el-submenu> -->
+
           <div class="logout-button" @click="logout">
             <i class="el-icon-switch-button" style="color: #2042e3"></i>
             <span style="color: #121213">退出</span>
@@ -67,23 +88,32 @@
 // import Main from '../../newLayout/module/Main.vue'
 // import Menu from './Msg'
 export default {
+  name: 'Demo4NewLayoutList',
+  data() {
   name: 'Demo4NewLayoutList',
   data() {
     return {
-      show2: true, // 图标文字的显示状态
+      show2: true, //图标文字的显示状态
       menus: [],
-      isCollapse: true, // 保持折叠状态
-      show: false, // 保持文字的隐藏状态
+      isCollapse: true, //保持折叠状态
+      show: false, //保持文字的隐藏状态
       asideMenu: [
         {
           path: '/home/lnfo', // 地址
           label: '首页', // 菜单标识
-          icon: 'menu' // 图标选取的是element图表，然后拼接到上面
+          icon: 'menu' //图标选取的是element图表，然后拼接到上面
         },
         {
-          path: '/home/lnfos',
-          label: '视频管理',
+          path: '/myTask',
+          label: '个人任务管理',
           icon: 'menu'
+          // children: [
+          //   {
+          //     path: '/myTask/assignment',
+          //     label: '我的任务',
+          //     icon: 'menu'
+          //   }
+          // ]
         },
         {
           path: '/home/taskadmin',
@@ -98,36 +128,6 @@ export default {
       ]
     }
   },
-  methods: {
-    // popTimeline () {
-    //   // 改变show的值true/false
-    //   this.lesteps = !this.lesteps
-    // },
-    handleOpen(key, keyPath) {
-      console.log(key, keyPath)
-    },
-    handleClose(key, keyPath) {
-      console.log(key, keyPath)
-    },
-    toggleCollapse() {
-      this.isCollapse = !this.isCollapse
-      // 改变show的值true/false
-      this.show = !this.show
-      // 改变show2的值true/false
-      this.show2 = !this.show2
-    },
-    // 退出功能
-    logout() {
-      console.log('退出')
-      // 清空token
-      // window.sessionStorage.clear()
-      // this.$router.push('/login')
-    }
-  },
-  components: {
-    // Main,
-    // Menu
-  }
 }
 </script>
 <style lang="less">
@@ -192,6 +192,7 @@ export default {
   }
   .el-main {
     background-color: #ffffff;
+    padding: 0;
   }
 }
 .el-aside {

ant-design-vue-jeecg/src/views/newLayout/myTask/index.vue

@@ -0,0 +1,101 @@
+<template>
+  <div class="assignmnet">
+    <!-- <div class="handoff">
+      <el-collapse v-model="activeName" accordion>
+        <el-collapse-item title="我的任务" name="1">
+          <div class="select">
+            <router-link to="/myTask/assignment">待分配</router-link>
+          </div>
+
+          <div class="select">
+            <router-link to="/myTask/carryOut">进行中</router-link>
+          </div>
+          <div class="select">待测试</div>
+          <div class="select">已完成</div>
+        </el-collapse-item>
+        <el-collapse-item title="所有任务" name="2">
+          <div class="select">1</div>
+          <div class="select">2</div>
+        </el-collapse-item>
+      </el-collapse>
+    </div> -->
+    <div class="taskMain">
+      <route-view></route-view>
+    </div>
+  </div>
+</template>
+
+<script>
+import RouteView from '../../../components/layouts/RouteView.vue'
+export default {
+  components: { RouteView },
+  data() {
+    return {
+      activeName: '1'
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+// /deep/ .el-collapse-item {
+// }
+// /deep/.el-collapse-item__header.is-active {
+//   font-size: 20px;
+//   font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+//   font-weight: 400;
+//   color: #333333;
+// }
+// /deep/ .el-collapse-item__header {
+//   display: block;
+//   border: none;
+//   font-size: 20px;
+//   font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+//   font-weight: 400;
+//   color: #333333;
+// }
+// /deep/ .el-collapse {
+//   border: none;
+// }
+// /deep/ .el-collapse-item__wrap {
+//   border: none;
+// }
+.assignmnet {
+  // display: flex;
+  // flex-flow: row nowrap;
+  // justify-content: left;
+  // align-items: start;
+  background-color: #f0f4fa;
+  padding: 50px 100px 0 100px;
+  // .handoff {
+  //   flex: 1;
+  //   height: 350px;
+  //   background-color: #fff;
+  //   border-radius: 10px 10px 10px 10px;
+  //   margin-right: 30px;
+  //   padding: 10px;
+  //   text-align: center;
+  // }
+  // .taskMain {
+  //   flex: 7;
+  // }
+}
+// .select {
+//   background-color: #fff;
+//   width: 197px;
+//   height: 40px;
+//   line-height: 40px;
+//   border-radius: 10px 10px 10px 10px;
+//   text-align: center;
+//   font-size: 15px;
+//   font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+//   font-weight: 400;
+//   color: #2147fb;
+// }
+// .select:hover {
+//   background-color: pink;
+// }
+// .select:hover {
+//   background: #e9f1ff;
+// }
+</style>