diff --git a/config/dev.env.js b/config/dev.env.js index 00b93d5..03cf79b 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,5 +1,8 @@ module.exports = { NODE_ENV: '"development"', - ENV_CONFIG: '"dev"', - BASE_API: '"api"' + ENV_CONFIG: '"dev"',//环境版本号 如npm run build:${ENV_CONFIG},建议与spring.profiles.active=${ENV_CONFIG}一一对应 + VERSION: '"m1"',//产品版本号，nginx中通过此版本号导航到不同的静态资源目录，请求路径中用法如下：静态页面url=${DOMAIN}/${CONTEXT}/${VERSION}/#/{router.path}?${queryString} + CONTEXT:'"form"',//对应spring中的server.context-path + BASE_API: '"api"',//api访问的统一入口,最后形成的apiUrl=${BASE_API}/${VERSION}/${spring.application.name}/${CONTEXT}/${ctrlUrl} + WEBSOCKET_URL:'"wss://www.qingqinkj.com/websocket/imsg/m1"'//本地环境是 ws://localhost:3333/websocket/im } diff --git a/config/m1prod.env.js b/config/m1prod.env.js new file mode 100644 index 0000000..ab2383d --- /dev/null +++ b/config/m1prod.env.js @@ -0,0 +1,8 @@ +module.exports = { + NODE_ENV: '"production"', + ENV_CONFIG: '"m1prod"',//环境版本号 如npm run build:${ENV_CONFIG},建议与spring.profiles.active=${ENV_CONFIG}一一对应 + VERSION: '"m1"',//产品版本号，nginx中通过此版本号导航到不同的静态资源目录，请求路径中用法如下：静态页面url=${curlDOMAIN}/${CONTEXT}/${VERSION}/#/{router.path}?${queryString} + CONTEXT:'"form"',//对应spring中的server.context-path + BASE_API: '"api"',//api访问的统一入口,最后形成的apiUrl=${BASE_API}/${VERSION}/${spring.application.name}/${CONTEXT}/${ctrlUrl} + WEBSOCKET_URL:'"${wsProtocol}://${curlHost}/websocket/imsg/m1"'//本地环境是 ws://localhost:3333/websocket/im +} diff --git a/config/prod.env.js b/config/prod.env.js index a39b9a4..d336dc8 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,7 @@ module.exports = { NODE_ENV: '"production"', - ENV_CONFIG: '"prod"', - BASE_API: '"https://www.qingqinkj.com/api"' + ENV_CONFIG: '"prod"',//环境版本号 如npm run build:${ENV_CONFIG},建议与spring.profiles.active=${ENV_CONFIG}一一对应 + VERSION: '"m1"',//产品版本号，nginx中通过此版本号导航到不同的静态资源目录，请求路径中用法如下：静态页面url=${DOMAIN}/${CONTEXT}/${VERSION}/#/{router.path}?${queryString} + CONTEXT:'"form"',//对应spring中的server.context-path + BASE_API: '"api"'//api访问的统一入口,最后形成的apiUrl=${BASE_API}/${VERSION}/${spring.application.name}/${CONTEXT}/${ctrlUrl} } diff --git a/config/sit.env.js b/config/sit.env.js index 93178e8..37f594c 100644 --- a/config/sit.env.js +++ b/config/sit.env.js @@ -1,5 +1,7 @@ module.exports = { NODE_ENV: '"production"', - ENV_CONFIG: '"sit"', - BASE_API: '"https://api-sit"' + ENV_CONFIG: '"sit"',//环境版本号 如npm run build:${ENV_CONFIG},建议与spring.profiles.active=${ENV_CONFIG}一一对应 + VERSION: '"m1"',//产品版本号，nginx中通过此版本号导航到不同的静态资源目录，请求路径中用法如下：静态页面url=${DOMAIN}/${CONTEXT}/${VERSION}/#/{router.path}?${queryString} + CONTEXT:'"form"',//对应spring中的server.context-path + BASE_API: '"api"'//api访问的统一入口,最后形成的apiUrl=${BASE_API}/${VERSION}/${spring.application.name}/${CONTEXT}/${ctrlUrl} } diff --git a/src/App.vue b/src/App.vue index 690cfc9..a28656a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,3 +9,4 @@ name: 'App' } + diff --git a/src/api/branch.js b/src/api/branch.js index 73c3744..f9da89c 100644 --- a/src/api/branch.js +++ b/src/api/branch.js @@ -11,7 +11,7 @@ let base=config.getSysBasePath(); **/ //普通查询 条件之间and关系 -export const listBranch = params => { return axios.get(`${base}/mdp/sys/branch/list`, { params: params }); }; +export const listBranchNoAuth = params => { return axios.get(`${base}/mdp/sys/branch/listBranchNoAuth`, { params: params }); }; //模糊查询管理端机构表（机构下面若干部门） 条件之间or关系 //export const listBranchKey = params => { return axios.get(`${base}/mdp/sys/branch/listKey`, { params: params }); }; @@ -26,4 +26,8 @@ export const batchDelBranch = params => { return axios.post(`${base}/mdp/sys/bra export const editBranch = params => { return axios.post(`${base}/mdp/sys/branch/edit`, params); }; //新增一条管理端机构表（机构下面若干部门） -export const addBranch = params => { return axios.post(`${base}/mdp/sys/branch/add`, params); }; \ No newline at end of file +export const addBranchNoAuth = params => { return axios.post(`${base}/mdp/sys/branch/addBranchNoAuth`, params); }; + + +//新增一条企业入驻审核流程 +export const addUserJoinBranchRequire = params => { return axios.post(`${base}/mdp/sys/userJoinBranchRequire/add`, params); }; \ No newline at end of file diff --git a/src/api/itemOption.js b/src/api/itemOption.js index e99a7ce..df96184 100644 --- a/src/api/itemOption.js +++ b/src/api/itemOption.js @@ -3,6 +3,7 @@ import axios from '@/utils/request' import config from '@/common/config' let base=config.getSysBasePath(); + /** * 数据项取值列表 *1 默认只开放普通查询，所有查询，只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， @@ -12,8 +13,99 @@ let base=config.getSysBasePath(); //普通查询 条件之间and关系 export const listItemOption = params => { return axios.get(`${base}/mdp/meta/itemOption/list`, { params: params }); }; + //普通查询 条件之间and关系 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} -export const listOption = params => { return axios.post(`${base}/mdp/meta/itemOption/list/byItemCode`, params ); }; +export const listOption = params => { + var date=new Date(); + var dateStr=date.getFullYear()+"-"+date.getMonth()+"-"+date.getDay() + var result={ + data:{ + tips:{ + isOk:true, + }, + data:{ + + } + } + } + var noExistsParams=params.filter(i=>{ + var key=i.categoryId+"-"+i.itemCode+"-"+dateStr; + var options = localStorage.getItem(key); + if(options){ + result.data.data[i.itemCode]=JSON.parse(options) + return false + }return true; + }); + return new Promise((resolve,reject) => { + if(noExistsParams.length>0){ + axios.post(`${base}/mdp/meta/itemOption/list/byItemCode`, noExistsParams ).then(res=>{ + var tips = res.data.tips; + if(tips.isOk){ + var data=res.data.data; + noExistsParams.forEach(k=>{ + var key=k.categoryId+"-"+k.itemCode+"-"+dateStr; + localStorage.setItem(key, JSON.stringify(data[k.itemCode])); + result.data.data[k.itemCode]= data[k.itemCode] + }) + }else{ + result.data.tips=tips; + } + resolve(result); + }).catch(e=>reject(e)); + }else{ + resolve(result); + } + + }); + +}; +export const listOptionByItemIds = params => { + var date=new Date(); + var dateStr=date.getFullYear()+"-"+date.getMonth()+"-"+date.getDay() + var result={ + data:{ + tips:{ + isOk:true, + }, + data:{ + + } + } + } + var noExistsParams=params.filter(i=>{ + var key=i+"-"+dateStr; + var options = localStorage.getItem(key); + + if(options){ + var optionsJson=JSON.parse(options); + result.data.data[i]=optionsJson + return false + }return true; + }); + return new Promise((resolve,reject) => { + if(noExistsParams.length>0){ + axios.post(`${base}/mdp/meta/itemOption/listItemOptionByItemIds`, noExistsParams ).then(res=>{ + var tips = res.data.tips; + if(tips.isOk){ + var data=res.data.data; + noExistsParams.forEach(k=>{ + var key= k+"-"+dateStr; + localStorage.setItem(key, JSON.stringify(data[k])); + result.data.data[k]= data[k] + }) + }else{ + result.data.tips=tips; + } + resolve(result); + }).catch(e=>reject(e)); + }else{ + resolve(result); + } + + }); + +}; + //params={id:''} 返回 {optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'} export const getSysParam = params => { return axios.post(`${base}/mdp/meta/itemOption/sysParam`, params ); }; diff --git a/src/api/login.js b/src/api/login.js index fac72c1..695083c 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -1,36 +1,111 @@ -import request from '@/utils/request' +import axios from '@/utils/request' +import { getToken, setToken, removeToken,getCacheUserInfo,setCacheUserInfo,removeCacheUserInfo} from '@/utils/auth' + import config from '@/common/config' -let base=config.getFormBasePath(); +let base=config.getOauth2LoginBasePath(); -export function loginByUsername(username, password) { +//let base=''; +export function doLoginByUserloginid(userloginid, password,grantType,authType,deptid) { + removeToken(); + const data = { + userloginid: userloginid, + password: password, + authType:authType, + deptid:deptid + } + return axios({ + url: base+'/login/token?grantType='+grantType, + method: 'post', + data + }) +} +export function checkUserid(userid ) { + removeToken(); + const data = { + userid: userid + } + return axios({ + url: base+'/user/check/userid', + method: 'post', + data + }) +} +export function checkDisplayUserid(displayUserid ) { + removeToken(); const data = { - displayUserid: username, - password: password + displayUserid: displayUserid } - return request({ - url: base+'/common/login', + return axios({ + url: base+'/user/check/displayUserid', method: 'post', data }) } +export function checkPhoneno(phoneno ) { + removeToken(); + const data = { + phoneno: phoneno + } + return axios({ + url: base+'/user/check/phoneno', + method: 'post', + data + }) +} +export function doRegister( userInfo ) { + removeToken(); + const data = { + username:userInfo.username, + userid:userInfo.displayUserid, + displayUserid:userInfo.displayUserid, + password:userInfo.password, + phoneno:userInfo.phoneno, + smsCode:userInfo.smsCode, + deptid:userInfo.deptid + } + return axios({ + url: base+'/user/register', + method: 'post', + data + }) +} + +export function resetPasswordByPhoneno( userInfo ) { + removeToken(); + const data = { + newPassword:userInfo.newPassword, + phoneno:userInfo.phoneno, + smsCode:userInfo.smsCode, + } + return axios({ + url: base+'/user/password/reset?type=sms', + method: 'post', + data + }) +} export function logout() { - return request({ + removeToken(); + /** + return axios({ url: base+'/logout', method: 'post' }) + */ } export function getUserInfo(params) { - return request({ - url: base+'/common/login/user/info/all', - method: 'get', - params: params + if( !params || !params.scopes ){ + params={ + scopes:['userInfo','roles','posts','menus','qxs','depts','branchs'] + } + } + const data=params; + return axios({ + url: base+'/user/info', + method: 'post', + data }) } - -export function switchDept(params) { - return request.post( base+'/common/login/user/switch', params ) - } diff --git a/src/api/mdp/arc/archive.js b/src/api/mdp/arc/archive.js new file mode 100644 index 0000000..adcc383 --- /dev/null +++ b/src/api/mdp/arc/archive.js @@ -0,0 +1,46 @@ +import axios from '@/utils/request' + +import config from '@/common/config' + +let base=config.getArcBasePath(); + +/** + * 档案信息表 + *1 默认只开放普通查询，所有查询，只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， + *2 查询、新增、修改的参数格式 params={id:'主键 主键',tagNames:'标签名多个,分割',deptid:'创建部门',userid:'创建人',isShare:'是否共享',url:'访问路径',archiveAbstract:'摘要',archiveContext:'内容',archiveTitle:'标题',archivingUserid:'归档人',isFromArchiving:'是否来自归档',archivingDate:'归档日期',createDate:'创建日期',authorUserid:'作者编号',authorName:'作者名称',canDel:'是否可删除',canEdit:'是否可修改',canRead:'是否可读',bizKey:'业务编号',encryptType:'加密方式0不加密1私钥2公钥',canComment:'开放评论',status:'0草稿1发布2取消发布',isStorageDir:'是否存到硬盘',branchId:'机构编号'} + **/ + +//普通查询 条件之间and关系 +export const listArchive = params => { return axios.get(`${base}/mdp/arc/archive/list`, { params: params }); }; + +export const getOneArchive = params => { return axios.get(`${base}/mdp/arc/archive/one`, { params: params }); }; + +//模糊查询档案信息表 条件之间or关系 +//export const listArchiveKey = params => { return axios.get(`${base}/mdp/arc/archive/listKey`, { params: params }); }; + +//删除一条档案信息表 params={id:'主键 主键'} +export const delArchive = params => { return axios.post(`${base}/mdp/arc/archive/del`,params); }; + +//批量删除档案信息表 params=[{id:'主键 主键'}] +export const batchDelArchive = params => { return axios.post(`${base}/mdp/arc/archive/batchDel`, params); }; + +//修改一条档案信息表记录 +export const editArchive = params => { return axios.post(`${base}/mdp/arc/archive/edit`, params); }; + +//新增一条档案信息表 +export const addArchive = params => { return axios.post(`${base}/mdp/arc/archive/add`, params); }; + +//打开评论 +export const openComment = params => { return axios.post(`${base}/mdp/arc/archive/comment/open`, params); }; + +//关闭评论 +export const closeComment = params => { return axios.post(`${base}/mdp/arc/archive/comment/close`, params); }; + +//发布 +export const publish = params => { return axios.post(`${base}/mdp/arc/archive/publish`, params); }; + +//取消发布 +export const unPublish = params => { return axios.post(`${base}/mdp/arc/archive/unpublish`, params); }; + +//新增一个 +export const addWorkflowArchive = params => { return axios.post(`${base}/mdp/arc/archive/add/workflow`, params); }; \ No newline at end of file diff --git a/src/api/mdp/arc/imageCategory.js b/src/api/mdp/arc/imageCategory.js index cf6c26e..0ba7274 100644 --- a/src/api/mdp/arc/imageCategory.js +++ b/src/api/mdp/arc/imageCategory.js @@ -26,4 +26,7 @@ export const batchDelImageCategory = params => { return axios.post(`${base}/mdp/ export const editImageCategory = params => { return axios.post(`${base}/mdp/arc/imageCategory/edit`, params); }; //新增一条图片分类 -export const addImageCategory = params => { return axios.post(`${base}/mdp/arc/imageCategory/add`, params); }; \ No newline at end of file +export const addImageCategory = params => { return axios.post(`${base}/mdp/arc/imageCategory/add`, params); }; + +//查分类树 +export const getImageCategoryTrees = params => { return axios.get(`${base}/mdp/arc/imageCategory/list/trees`, { params: params }); }; \ No newline at end of file diff --git a/src/api/mdp/meta/itemOption.js b/src/api/mdp/meta/itemOption.js index b1a646e..3bd6a82 100644 --- a/src/api/mdp/meta/itemOption.js +++ b/src/api/mdp/meta/itemOption.js @@ -16,9 +16,6 @@ export const listItemOption = params => { return axios.get(`${base}/mdp/meta/ite //普通查询 条件之间and关系 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} export const listOption = params => { return axios.post(`${base}/mdp/meta/itemOption/list/byItemCode`, params ); }; -//普通查询 条件之间and关系 params=[itemId1,itemId2] 返回结果 {'itemId1':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} -export const listOptionByItemIds = params => { return axios.post(`${base}/mdp/meta/itemOption/list/byItemIds`, params ); }; - //params={id:''} 返回 {optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'} export const getSysParam = params => { return axios.post(`${base}/mdp/meta/itemOption/sysParam`, params ); }; //模糊查询数据项取值列表 条件之间or关系 @@ -34,4 +31,8 @@ export const batchDelItemOption = params => { return axios.post(`${base}/mdp/met export const editItemOption = params => { return axios.post(`${base}/mdp/meta/itemOption/edit`, params); }; //新增一条数据项取值列表 -export const addItemOption = params => { return axios.post(`${base}/mdp/meta/itemOption/add`, params); }; \ No newline at end of file +export const addItemOption = params => { return axios.post(`${base}/mdp/meta/itemOption/add`, params); }; + + +//刷新缓存 +export const refresh = params => { return axios.post(`${base}/mdp/meta/itemOption/refresh`, params); }; diff --git a/src/assets/echars-theme/theme.js b/src/assets/echars-theme/theme.js new file mode 100644 index 0000000..47a404f --- /dev/null +++ b/src/assets/echars-theme/theme.js @@ -0,0 +1,492 @@ +const theme = +{ + "color": [ + "#3fb1e3", + "#6be6c1", + "#626c91", + "#a0a7e6", + "#c4ebad", + "#96dee8" + ], + "backgroundColor": "rgba(252,252,252,0)", + "textStyle": {}, + "title": { + "textStyle": { + "color": "#666666" + }, + "subtextStyle": { + "color": "#999999" + } + }, + "line": { + "itemStyle": { + "normal": { + "borderWidth": "2" + } + }, + "lineStyle": { + "normal": { + "width": "3" + } + }, + "symbolSize": "8", + "symbol": "emptyCircle", + "smooth": false + }, + "radar": { + "itemStyle": { + "normal": { + "borderWidth": "2" + } + }, + "lineStyle": { + "normal": { + "width": "3" + } + }, + "symbolSize": "8", + "symbol": "emptyCircle", + "smooth": false + }, + "bar": { + "itemStyle": { + "normal": { + "barBorderWidth": 0, + "barBorderColor": "#ccc" + }, + "emphasis": { + "barBorderWidth": 0, + "barBorderColor": "#ccc" + } + } + }, + "pie": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "scatter": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "boxplot": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "parallel": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "sankey": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "funnel": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "gauge": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "candlestick": { + "itemStyle": { + "normal": { + "color": "#e6a0d2", + "color0": "transparent", + "borderColor": "#e6a0d2", + "borderColor0": "#3fb1e3", + "borderWidth": "2" + } + } + }, + "graph": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + } + }, + "lineStyle": { + "normal": { + "width": "1", + "color": "#cccccc" + } + }, + "symbolSize": "8", + "symbol": "emptyCircle", + "smooth": false, + "color": [ + "#3fb1e3", + "#6be6c1", + "#626c91", + "#a0a7e6", + "#c4ebad", + "#96dee8" + ], + "label": { + "normal": { + "textStyle": { + "color": "#ffffff" + } + } + } + }, + "map": { + "itemStyle": { + "normal": { + "areaColor": "#eeeeee", + "borderColor": "#aaaaaa", + "borderWidth": 0.5 + }, + "emphasis": { + "areaColor": "rgba(63,177,227,0.25)", + "borderColor": "#3fb1e3", + "borderWidth": 1 + } + }, + "label": { + "normal": { + "textStyle": { + "color": "#ffffff" + } + }, + "emphasis": { + "textStyle": { + "color": "#3fb1e3" + } + } + } + }, + "geo": { + "itemStyle": { + "normal": { + "areaColor": "#eeeeee", + "borderColor": "#aaaaaa", + "borderWidth": 0.5 + }, + "emphasis": { + "areaColor": "rgba(63,177,227,0.25)", + "borderColor": "#3fb1e3", + "borderWidth": 1 + } + }, + "label": { + "normal": { + "textStyle": { + "color": "#ffffff" + } + }, + "emphasis": { + "textStyle": { + "color": "#3fb1e3" + } + } + } + }, + "categoryAxis": { + "axisLine": { + "show": true, + "lineStyle": { + "color": "#cccccc" + } + }, + "axisTick": { + "show": false, + "lineStyle": { + "color": "#333" + } + }, + "axisLabel": { + "show": true, + "textStyle": { + "color": "#999999" + } + }, + "splitLine": { + "show": true, + "lineStyle": { + "color": [ + "#eeeeee" + ] + } + }, + "splitArea": { + "show": false, + "areaStyle": { + "color": [ + "rgba(250,250,250,0.05)", + "rgba(200,200,200,0.02)" + ] + } + } + }, + "valueAxis": { + "axisLine": { + "show": true, + "lineStyle": { + "color": "#cccccc" + } + }, + "axisTick": { + "show": false, + "lineStyle": { + "color": "#333" + } + }, + "axisLabel": { + "show": true, + "textStyle": { + "color": "#999999" + } + }, + "splitLine": { + "show": true, + "lineStyle": { + "color": [ + "#eeeeee" + ] + } + }, + "splitArea": { + "show": false, + "areaStyle": { + "color": [ + "rgba(250,250,250,0.05)", + "rgba(200,200,200,0.02)" + ] + } + } + }, + "logAxis": { + "axisLine": { + "show": true, + "lineStyle": { + "color": "#cccccc" + } + }, + "axisTick": { + "show": false, + "lineStyle": { + "color": "#333" + } + }, + "axisLabel": { + "show": true, + "textStyle": { + "color": "#999999" + } + }, + "splitLine": { + "show": true, + "lineStyle": { + "color": [ + "#eeeeee" + ] + } + }, + "splitArea": { + "show": false, + "areaStyle": { + "color": [ + "rgba(250,250,250,0.05)", + "rgba(200,200,200,0.02)" + ] + } + } + }, + "timeAxis": { + "axisLine": { + "show": true, + "lineStyle": { + "color": "#cccccc" + } + }, + "axisTick": { + "show": false, + "lineStyle": { + "color": "#333" + } + }, + "axisLabel": { + "show": true, + "textStyle": { + "color": "#999999" + } + }, + "splitLine": { + "show": true, + "lineStyle": { + "color": [ + "#eeeeee" + ] + } + }, + "splitArea": { + "show": false, + "areaStyle": { + "color": [ + "rgba(250,250,250,0.05)", + "rgba(200,200,200,0.02)" + ] + } + } + }, + "toolbox": { + "iconStyle": { + "normal": { + "borderColor": "#999999" + }, + "emphasis": { + "borderColor": "#666666" + } + } + }, + "legend": { + "textStyle": { + "color": "#999999" + } + }, + "tooltip": { + "axisPointer": { + "lineStyle": { + "color": "#cccccc", + "width": 1 + }, + "crossStyle": { + "color": "#cccccc", + "width": 1 + } + } + }, + "timeline": { + "lineStyle": { + "color": "#626c91", + "width": 1 + }, + "itemStyle": { + "normal": { + "color": "#626c91", + "borderWidth": 1 + }, + "emphasis": { + "color": "#626c91" + } + }, + "controlStyle": { + "normal": { + "color": "#626c91", + "borderColor": "#626c91", + "borderWidth": 0.5 + }, + "emphasis": { + "color": "#626c91", + "borderColor": "#626c91", + "borderWidth": 0.5 + } + }, + "checkpointStyle": { + "color": "#3fb1e3", + "borderColor": "rgba(63,177,227,0.15)" + }, + "label": { + "normal": { + "textStyle": { + "color": "#626c91" + } + }, + "emphasis": { + "textStyle": { + "color": "#626c91" + } + } + } + }, + "visualMap": { + "color": [ + "#2a99c9", + "#afe8ff" + ] + }, + "dataZoom": { + "backgroundColor": "rgba(255,255,255,0)", + "dataBackgroundColor": "rgba(222,222,222,1)", + "fillerColor": "rgba(114,230,212,0.25)", + "handleColor": "#cccccc", + "handleSize": "100%", + "textStyle": { + "color": "#999999" + } + }, + "markPoint": { + "label": { + "normal": { + "textStyle": { + "color": "#ffffff" + } + }, + "emphasis": { + "textStyle": { + "color": "#ffffff" + } + } + } + } +} + +export default theme \ No newline at end of file diff --git a/src/assets/image/Car.png b/src/assets/image/Car.png new file mode 100644 index 0000000..ee7b1f7 Binary files /dev/null and b/src/assets/image/Car.png differ diff --git a/src/assets/image/Car2.png b/src/assets/image/Car2.png new file mode 100644 index 0000000..946855a Binary files /dev/null and b/src/assets/image/Car2.png differ diff --git a/src/assets/image/all.png b/src/assets/image/all.png new file mode 100644 index 0000000..b776e65 Binary files /dev/null and b/src/assets/image/all.png differ diff --git a/src/assets/image/belate.png b/src/assets/image/belate.png new file mode 100644 index 0000000..c7de5f6 Binary files /dev/null and b/src/assets/image/belate.png differ diff --git a/src/assets/image/bg.jpg b/src/assets/image/bg.jpg new file mode 100644 index 0000000..290aaeb Binary files /dev/null and b/src/assets/image/bg.jpg differ diff --git a/src/assets/image/bg2.jpg b/src/assets/image/bg2.jpg new file mode 100644 index 0000000..5b31e85 Binary files /dev/null and b/src/assets/image/bg2.jpg differ diff --git a/src/assets/image/bg3.jpg b/src/assets/image/bg3.jpg new file mode 100644 index 0000000..8b832f2 Binary files /dev/null and b/src/assets/image/bg3.jpg differ diff --git a/src/assets/image/bg4.jpg b/src/assets/image/bg4.jpg new file mode 100644 index 0000000..52a253b Binary files /dev/null and b/src/assets/image/bg4.jpg differ diff --git a/src/assets/image/daily_work1.jpg b/src/assets/image/daily_work1.jpg new file mode 100644 index 0000000..8963165 Binary files /dev/null and b/src/assets/image/daily_work1.jpg differ diff --git a/src/assets/image/daily_work2.png b/src/assets/image/daily_work2.png new file mode 100644 index 0000000..e1019b4 Binary files /dev/null and b/src/assets/image/daily_work2.png differ diff --git a/src/assets/image/daily_work3.jpg b/src/assets/image/daily_work3.jpg new file mode 100644 index 0000000..822f288 Binary files /dev/null and b/src/assets/image/daily_work3.jpg differ diff --git a/src/assets/image/daily_work4.png b/src/assets/image/daily_work4.png new file mode 100644 index 0000000..6cd29bb Binary files /dev/null and b/src/assets/image/daily_work4.png differ diff --git a/src/assets/image/daily_work5.jpg b/src/assets/image/daily_work5.jpg new file mode 100644 index 0000000..b10ef9b Binary files /dev/null and b/src/assets/image/daily_work5.jpg differ diff --git a/src/assets/image/datav_bg.png b/src/assets/image/datav_bg.png new file mode 100644 index 0000000..54aa045 Binary files /dev/null and b/src/assets/image/datav_bg.png differ diff --git a/src/assets/image/leakagesign.png b/src/assets/image/leakagesign.png new file mode 100644 index 0000000..f2b4777 Binary files /dev/null and b/src/assets/image/leakagesign.png differ diff --git a/src/assets/image/leaveearly.png b/src/assets/image/leaveearly.png new file mode 100644 index 0000000..f8949c7 Binary files /dev/null and b/src/assets/image/leaveearly.png differ diff --git a/src/assets/image/logo1.png b/src/assets/image/logo1.png new file mode 100644 index 0000000..a10f91d Binary files /dev/null and b/src/assets/image/logo1.png differ diff --git a/src/assets/image/logo2.png b/src/assets/image/logo2.png new file mode 100644 index 0000000..fe9ec92 Binary files /dev/null and b/src/assets/image/logo2.png differ diff --git a/src/assets/image/miner.png b/src/assets/image/miner.png new file mode 100644 index 0000000..79b388d Binary files /dev/null and b/src/assets/image/miner.png differ diff --git a/src/assets/image/nodata.jpg b/src/assets/image/nodata.jpg new file mode 100644 index 0000000..4cb0d7a Binary files /dev/null and b/src/assets/image/nodata.jpg differ diff --git a/src/assets/image/nodata.png b/src/assets/image/nodata.png new file mode 100644 index 0000000..ade8f6d Binary files /dev/null and b/src/assets/image/nodata.png differ diff --git a/src/assets/image/nodata2.jpg b/src/assets/image/nodata2.jpg new file mode 100644 index 0000000..bba4a1e Binary files /dev/null and b/src/assets/image/nodata2.jpg differ diff --git a/src/assets/image/normal.png b/src/assets/image/normal.png new file mode 100644 index 0000000..89785b9 Binary files /dev/null and b/src/assets/image/normal.png differ diff --git a/src/assets/image/portal-1.jpg b/src/assets/image/portal-1.jpg new file mode 100644 index 0000000..0ea0f2f Binary files /dev/null and b/src/assets/image/portal-1.jpg differ diff --git a/src/assets/image/portal-10.jpg b/src/assets/image/portal-10.jpg new file mode 100644 index 0000000..402da8c Binary files /dev/null and b/src/assets/image/portal-10.jpg differ diff --git a/src/assets/image/portal-2.jpg b/src/assets/image/portal-2.jpg new file mode 100644 index 0000000..f6d6f8e Binary files /dev/null and b/src/assets/image/portal-2.jpg differ diff --git a/src/assets/image/portal-3.jpg b/src/assets/image/portal-3.jpg new file mode 100644 index 0000000..a4d7f14 Binary files /dev/null and b/src/assets/image/portal-3.jpg differ diff --git a/src/assets/image/portal-4.jpg b/src/assets/image/portal-4.jpg new file mode 100644 index 0000000..179aaec Binary files /dev/null and b/src/assets/image/portal-4.jpg differ diff --git a/src/assets/image/portal-5.jpg b/src/assets/image/portal-5.jpg new file mode 100644 index 0000000..169a6b1 Binary files /dev/null and b/src/assets/image/portal-5.jpg differ diff --git a/src/assets/image/portal-9.jpg b/src/assets/image/portal-9.jpg new file mode 100644 index 0000000..3cafcc9 Binary files /dev/null and b/src/assets/image/portal-9.jpg differ diff --git a/src/assets/image/portal-icon1.png b/src/assets/image/portal-icon1.png new file mode 100644 index 0000000..a5d0ec5 Binary files /dev/null and b/src/assets/image/portal-icon1.png differ diff --git a/src/assets/image/portal-icon10.png b/src/assets/image/portal-icon10.png new file mode 100644 index 0000000..7a58512 Binary files /dev/null and b/src/assets/image/portal-icon10.png differ diff --git a/src/assets/image/portal-icon11.png b/src/assets/image/portal-icon11.png new file mode 100644 index 0000000..dec6496 Binary files /dev/null and b/src/assets/image/portal-icon11.png differ diff --git a/src/assets/image/portal-icon12.png b/src/assets/image/portal-icon12.png new file mode 100644 index 0000000..dec6496 Binary files /dev/null and b/src/assets/image/portal-icon12.png differ diff --git a/src/assets/image/portal-icon13.png b/src/assets/image/portal-icon13.png new file mode 100644 index 0000000..1f4b892 Binary files /dev/null and b/src/assets/image/portal-icon13.png differ diff --git a/src/assets/image/portal-icon14.png b/src/assets/image/portal-icon14.png new file mode 100644 index 0000000..f81dcdb Binary files /dev/null and b/src/assets/image/portal-icon14.png differ diff --git a/src/assets/image/portal-icon15.png b/src/assets/image/portal-icon15.png new file mode 100644 index 0000000..9b10b6a Binary files /dev/null and b/src/assets/image/portal-icon15.png differ diff --git a/src/assets/image/portal-icon16.png b/src/assets/image/portal-icon16.png new file mode 100644 index 0000000..dbb146e Binary files /dev/null and b/src/assets/image/portal-icon16.png differ diff --git a/src/assets/image/portal-icon17.png b/src/assets/image/portal-icon17.png new file mode 100644 index 0000000..4f36db7 Binary files /dev/null and b/src/assets/image/portal-icon17.png differ diff --git a/src/assets/image/portal-icon18.png b/src/assets/image/portal-icon18.png new file mode 100644 index 0000000..9e0ebdd Binary files /dev/null and b/src/assets/image/portal-icon18.png differ diff --git a/src/assets/image/portal-icon19.png b/src/assets/image/portal-icon19.png new file mode 100644 index 0000000..90167fa Binary files /dev/null and b/src/assets/image/portal-icon19.png differ diff --git a/src/assets/image/portal-icon2.png b/src/assets/image/portal-icon2.png new file mode 100644 index 0000000..1c837f5 Binary files /dev/null and b/src/assets/image/portal-icon2.png differ diff --git a/src/assets/image/portal-icon3.png b/src/assets/image/portal-icon3.png new file mode 100644 index 0000000..10deab8 Binary files /dev/null and b/src/assets/image/portal-icon3.png differ diff --git a/src/assets/image/portal-icon4.png b/src/assets/image/portal-icon4.png new file mode 100644 index 0000000..b12fab1 Binary files /dev/null and b/src/assets/image/portal-icon4.png differ diff --git a/src/assets/image/portal-icon5.png b/src/assets/image/portal-icon5.png new file mode 100644 index 0000000..ad134c2 Binary files /dev/null and b/src/assets/image/portal-icon5.png differ diff --git a/src/assets/image/portal-icon6.png b/src/assets/image/portal-icon6.png new file mode 100644 index 0000000..21dad91 Binary files /dev/null and b/src/assets/image/portal-icon6.png differ diff --git a/src/assets/image/portal-icon7.png b/src/assets/image/portal-icon7.png new file mode 100644 index 0000000..603468e Binary files /dev/null and b/src/assets/image/portal-icon7.png differ diff --git a/src/assets/image/portal-icon8.png b/src/assets/image/portal-icon8.png new file mode 100644 index 0000000..f244772 Binary files /dev/null and b/src/assets/image/portal-icon8.png differ diff --git a/src/assets/image/portal-icon9.png b/src/assets/image/portal-icon9.png new file mode 100644 index 0000000..6dc00c4 Binary files /dev/null and b/src/assets/image/portal-icon9.png differ diff --git a/src/assets/image/portal_page.png b/src/assets/image/portal_page.png new file mode 100644 index 0000000..f12e06d Binary files /dev/null and b/src/assets/image/portal_page.png differ diff --git a/src/assets/image/seriouslate.png b/src/assets/image/seriouslate.png new file mode 100644 index 0000000..a1379a3 Binary files /dev/null and b/src/assets/image/seriouslate.png differ diff --git a/src/assets/image/show-drawer.png b/src/assets/image/show-drawer.png new file mode 100644 index 0000000..ef13f1b Binary files /dev/null and b/src/assets/image/show-drawer.png differ diff --git a/src/assets/image/timg.jpg b/src/assets/image/timg.jpg new file mode 100644 index 0000000..fdc931c Binary files /dev/null and b/src/assets/image/timg.jpg differ diff --git a/src/assets/image/yxin_login_backgroup_pc.png b/src/assets/image/yxin_login_backgroup_pc.png new file mode 100644 index 0000000..e5353e7 Binary files /dev/null and b/src/assets/image/yxin_login_backgroup_pc.png differ diff --git a/src/assets/image/zhkj_logo.png b/src/assets/image/zhkj_logo.png new file mode 100644 index 0000000..b8ff1db Binary files /dev/null and b/src/assets/image/zhkj_logo.png differ diff --git a/src/common/config.js b/src/common/config.js index 83d9542..046d609 100644 --- a/src/common/config.js +++ b/src/common/config.js @@ -12,9 +12,15 @@ var arcUrlPrefix="workflow/"; var workFlowEditorUrl="https://www.qingqinkj.com/workflow/editor/indexIframe.html";//工作流流程编辑器 export default { + getOauth2LoginBasePath:function(){ + return "/oauth2client" + }, + getSmsBasePath:function(){ + return "/sms" + }, //图片内容服务api路径 getArcBasePath: function(){ - return 'https://www.qingqinkj.com/api/arc/arc' + return '/arc/arc' }, //商城后台 getMallmBasePath: function(){ diff --git a/src/icons/svg/auter-email.svg b/src/icons/svg/auter-email.svg new file mode 100644 index 0000000..24a11d6 --- /dev/null +++ b/src/icons/svg/auter-email.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/business.svg b/src/icons/svg/business.svg new file mode 100644 index 0000000..fd04549 --- /dev/null +++ b/src/icons/svg/business.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/capacity-form.svg b/src/icons/svg/capacity-form.svg new file mode 100644 index 0000000..22511f1 --- /dev/null +++ b/src/icons/svg/capacity-form.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/car.svg b/src/icons/svg/car.svg new file mode 100644 index 0000000..37bfaae --- /dev/null +++ b/src/icons/svg/car.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/checking-in.svg b/src/icons/svg/checking-in.svg new file mode 100644 index 0000000..1b3623c --- /dev/null +++ b/src/icons/svg/checking-in.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/client.svg b/src/icons/svg/client.svg new file mode 100644 index 0000000..7e551ab --- /dev/null +++ b/src/icons/svg/client.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/conference.svg b/src/icons/svg/conference.svg new file mode 100644 index 0000000..bfe52ce --- /dev/null +++ b/src/icons/svg/conference.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/contract.svg b/src/icons/svg/contract.svg new file mode 100644 index 0000000..95b5048 --- /dev/null +++ b/src/icons/svg/contract.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/flow.svg b/src/icons/svg/flow.svg new file mode 100644 index 0000000..697b69a --- /dev/null +++ b/src/icons/svg/flow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/history.svg b/src/icons/svg/history.svg new file mode 100644 index 0000000..51f82ce --- /dev/null +++ b/src/icons/svg/history.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/home-page.svg b/src/icons/svg/home-page.svg new file mode 100644 index 0000000..ee60241 --- /dev/null +++ b/src/icons/svg/home-page.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/internal-email.svg b/src/icons/svg/internal-email.svg new file mode 100644 index 0000000..c93cca2 --- /dev/null +++ b/src/icons/svg/internal-email.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/model.svg b/src/icons/svg/model.svg new file mode 100644 index 0000000..632b526 --- /dev/null +++ b/src/icons/svg/model.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/office-supplies.svg b/src/icons/svg/office-supplies.svg new file mode 100644 index 0000000..719cb2e --- /dev/null +++ b/src/icons/svg/office-supplies.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/performance.svg b/src/icons/svg/performance.svg new file mode 100644 index 0000000..3fe767a --- /dev/null +++ b/src/icons/svg/performance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/portal.svg b/src/icons/svg/portal.svg new file mode 100644 index 0000000..c99079e --- /dev/null +++ b/src/icons/svg/portal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/project.svg b/src/icons/svg/project.svg new file mode 100644 index 0000000..000c5a1 --- /dev/null +++ b/src/icons/svg/project.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/property.svg b/src/icons/svg/property.svg new file mode 100644 index 0000000..a5123a3 --- /dev/null +++ b/src/icons/svg/property.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/record.svg b/src/icons/svg/record.svg new file mode 100644 index 0000000..b5e5e9e --- /dev/null +++ b/src/icons/svg/record.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/schedule.svg b/src/icons/svg/schedule.svg new file mode 100644 index 0000000..3d11edb --- /dev/null +++ b/src/icons/svg/schedule.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/seal.svg b/src/icons/svg/seal.svg new file mode 100644 index 0000000..96a3434 --- /dev/null +++ b/src/icons/svg/seal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/supervise-and-handle-task.svg b/src/icons/svg/supervise-and-handle-task.svg new file mode 100644 index 0000000..eb2675d --- /dev/null +++ b/src/icons/svg/supervise-and-handle-task.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/supervise-and-handle.svg b/src/icons/svg/supervise-and-handle.svg new file mode 100644 index 0000000..0e9cea2 --- /dev/null +++ b/src/icons/svg/supervise-and-handle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/task.svg b/src/icons/svg/task.svg new file mode 100644 index 0000000..8442874 --- /dev/null +++ b/src/icons/svg/task.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/permission.js b/src/permission.js index 00555f8..9bdf326 100644 --- a/src/permission.js +++ b/src/permission.js @@ -59,15 +59,15 @@ router.beforeEach((to, from, next) => { return; } if(to!=null && to.fullPath!=null){ - var userToken=getQueryVariable("userToken",to.fullPath); - if(userToken!=null){ - setToken(userToken); + var accessToken=getQueryVariable("accessToken",to.fullPath); + if(accessToken!=null){ + setToken(accessToken); } } if (getToken()) { // determine if there has token /* has token*/ if (to.path === '/login') { - next({ path: '/' }) + next()// NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it } else { if(store.getters.isLoadOk==false ){ @@ -143,10 +143,10 @@ function getQueryVariable(variable,url){ } return null; } -var userToken=getQueryVariable('userToken'); -if(userToken!=null){ - //alert(userToken); - setToken(userToken); +var accessToken=getQueryVariable('accessToken'); +if(accessToken!=null){ + //alert(access_token); + setToken(accessToken); } router.afterEach(() => { NProgress.done() // finish progress bar diff --git a/src/store/getters.js b/src/store/getters.js index 41925b3..0bb6f96 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -5,6 +5,7 @@ const getters = { cachedViews: state => state.tagsView.cachedViews, token: state => state.user.token, userInfo: state => state.user.userInfo, + workShop:state=>state.user.workShop, introduction: state => state.user.introduction, status: state => state.user.status, roles: state => state.user.roles, @@ -13,6 +14,7 @@ const getters = { myLocations: state => state.user.myLocations, myBranchs: state => state.user.myBranchs, myMenus: state => state.user.myMenus, + myPosts: state => state.user.myPosts, setting: state => state.user.setting, permission_routers: state => state.permission.routers, addRouters: state => state.permission.addRouters, diff --git a/src/store/modules/app.js b/src/store/modules/app.js index bd44d2f..9042f48 100644 --- a/src/store/modules/app.js +++ b/src/store/modules/app.js @@ -3,7 +3,7 @@ import Cookies from 'js-cookie' const app = { state: { sidebar: { - opened: !+Cookies.get('sidebarStatus') + opened: Cookies.get('sidebarStatus')==1?true:false }, language: Cookies.get('language') || 'zh' }, @@ -11,10 +11,10 @@ const app = { TOGGLE_SIDEBAR: (state,toOpen) => { if(toOpen==true){ Cookies.set('sidebarStatus', 1) - state.sidebar.opened =1 + state.sidebar.opened =true }else if(toOpen==false){ Cookies.set('sidebarStatus', 0) - state.sidebar.opened =0 + state.sidebar.opened =false }else{ if (state.sidebar.opened) { Cookies.set('sidebarStatus', 1) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 2bd3f6d..be24162 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,10 +1,10 @@ -import { loginByUsername, logout, getUserInfo, switchDept } from '@/api/login' -import { getToken, setToken, removeToken } from '@/utils/auth' +import { doLoginByUserloginid, logout, getUserInfo } from '@/api/login' +import { getToken, setToken, removeToken,getCacheUserInfo,setCacheUserInfo,removeCacheUserInfo} from '@/utils/auth' const user = { state: { userInfo: { - userid:'a', + userid:'', jsessionid:'', displayUserid:'', username:'', @@ -23,6 +23,7 @@ const user = { isShopAdmin:false, isLocationAdmin:false }, + workShop:{}, status: '', code: '', token: getToken(), @@ -33,6 +34,7 @@ const user = { myLocations: [], myBranchs:[], myMenus:[], + myPosts:[], setting: { articlePlatform: [] }, @@ -45,6 +47,7 @@ const user = { }, SET_TOKEN: (state, token) => { state.token = token + setToken(token); }, SET_SETTING: (state, setting) => { state.setting = setting @@ -55,6 +58,9 @@ const user = { SET_USER_INFO: (state, userInfo) => { state.userInfo = userInfo }, + SET_WORK_SHOP:(state,workShop)=>{ + state.workShop = workShop + }, SET_ROLES: (state, roles) => { state.roles = roles }, @@ -82,6 +88,9 @@ const user = { SET_MYMENUS: (state, menus) => { state.myMenus = menus }, + SET_MYPOSTS: (state, posts) => { + state.myPosts = posts + }, SET_IS_LOAD_OK: (state, isLoadOk ) => { state.isLoadOk = isLoadOk } @@ -89,10 +98,10 @@ const user = { actions: { // 用户名登录 - LoginByUsername({ commit }, userInfo) { - const username = userInfo.username.trim() + LoginByUserloginid({ commit }, loginParams) { + removeToken(); return new Promise((resolve, reject) => { - loginByUsername(username, userInfo.password).then(res => { + doLoginByUserloginid(loginParams.userloginid, loginParams.password,loginParams.grantType,loginParams.authType,loginParams.deptid).then(res => { if(res.data.tips.isOk==true){ let data = res.data let userInfo=data.userInfo; @@ -119,8 +128,10 @@ const user = { commit('SET_USER_INFO', userInfo) commit('SET_ROLES', roles) commit('SET_QXS', data.qxs) - commit('SET_TOKEN', data.userInfo.jsessionid) - setToken(data.userInfo.jsessionid) + commit('SET_TOKEN', data.data.accessToken.tokenValue) + commit('SET_IS_LOAD_OK', false) + setToken( data.data.accessToken.tokenValue) + removeCacheUserInfo(); } resolve(res) }).catch(error => { @@ -128,151 +139,148 @@ const user = { }) }) }, + + ParseUserInfo({commit},res){ + return new Promise((resolve, reject) => { + if(res.data.tips.isOk==true){ + let userInfo = res.data.userInfo; + let roles = res.data.roles; + let qxs=res.data.qxs; + + if(roles!=null && roles.length>0){ + roles.forEach(role=>{ + if(role.roleid=='superAdmin'){ + userInfo.isSuperAdmin=true + } + if(role.roleid=='platformAdmin'){ + userInfo.isPlatformAdmin=true + } + if(role.roleid=='branchAdmin'){ + userInfo.isBranchAdmin=true + } + if(role.roleid=='shopAdmin'){ + userInfo.isShopAdmin=true + } + if(role.roleid=='locationAdmin'){ + userInfo.isLocationAdmin=true + } + }); + } + + + let branchs=res.data.branchs==null?[]:res.data.branchs; + let depts=res.data.depts==null?[]:res.data.depts; + let shops=res.data.shops==null?[]:res.data.shops; + let locations=res.data.locations==null?[]:res.data.locations + locations.forEach(l=>{ + shops.forEach(s=>{ + if(s.shopId==l.shopId){ + l.shopName=s.shopName + } + }) + depts.forEach(d=>{ + if(d.deptid==l.deptid){ + l.deptName=d.deptName + l.branchName=d.branchName + } + }) + }) + let posts=res.data.posts==null?[]:res.data.posts; + posts.forEach(post=>{ + depts.forEach(dept=>{ + if(dept.deptid==post.deptid){ + post.deptName=dept.deptName + post.branchId=dept.branchId + post.branchName=dept.branchName + } + }) + }) + depts.forEach(d=>{ + var branch=branchs.find(b=>b.branchId==d.branchId) + if(branch){ + d.branchName=branch.branchName + } + }) + commit('SET_MYBRANCHS',branchs); + commit('SET_MYDEPTS',depts); + commit('SET_MYLOCATIONS',locations); + commit('SET_MYMENUS',res.data.menus); + commit('SET_MYPOSTS', posts); + commit('SET_USER_INFO',userInfo); + commit('SET_ROLES', roles) + commit('SET_QXS', qxs) + commit('SET_WORK_SHOP',userInfo); + commit('SET_IS_LOAD_OK', true) + resolve(res); + }else{ + reject(res) + } + }) + + }, // 获取用户信息 GetUserInfo({ commit, state }) { return new Promise((resolve, reject) => { - getUserInfo({jsessionid:state.token,userid:state.userInfo.userid}).then(res=>{ - if(res.data.tips.isOk==true){ - let userInfo = res.data.userInfo; - let roles = res.data.roles; - let qxs=res.data.qxs; - - if(roles!=null && roles.length>0){ - roles.forEach(role=>{ - if(role.roleid=='superAdmin'){ - userInfo.isSuperAdmin=true - } - if(role.roleid=='platformAdmin'){ - userInfo.isPlatformAdmin=true - } - if(role.roleid=='branchAdmin'){ - userInfo.isBranchAdmin=true - } - if(role.roleid=='shopAdmin'){ - userInfo.isShopAdmin=true - } - if(role.roleid=='locationAdmin'){ - userInfo.isLocationAdmin=true - } - }); - } - - - let branchs=res.data.branchs==null?[]:res.data.branchs; - let depts=res.data.depts==null?[]:res.data.depts; - let shops=res.data.shops==null?[]:res.data.shops; - let locations=res.data.locations==null?[]:res.data.locations - locations.forEach(l=>{ - shops.forEach(s=>{ - if(s.shopId==l.shopId){ - l.shopName=s.shopName - } - }) - depts.forEach(d=>{ - if(d.deptid==l.deptid){ - l.deptName=d.deptName - l.branchName=d.branchName - } - }) - }) - commit('SET_MYBRANCHS',branchs); - commit('SET_MYDEPTS',depts); - commit('SET_MYLOCATIONS',locations); - commit('SET_MYMENUS',res.data.menus); - commit('SET_USER_INFO',userInfo); - commit('SET_ROLES', roles) - commit('SET_QXS', qxs) - commit('SET_TOKEN', userInfo.jsessionid) - commit('SET_IS_LOAD_OK', true) - } - resolve(res); - }).catch(error => { + var cacheUserInfo=getCacheUserInfo(); + if(cacheUserInfo){ + this.dispatch("ParseUserInfo",cacheUserInfo).then(res2=>{ + resolve(res2); + }).catch(error2=>{ + reject(error2) + }); + + }else{ + getUserInfo().then(res=>{ + this.dispatch("ParseUserInfo",res).then(res2=>{ + setCacheUserInfo(res); + resolve(res2); + }).catch(error2=>{ + reject(error2) + }); + }).catch(error => { reject(error) }); - /** - getUserInfo(state.token).then(response => { - if (!response.data) { // 由于mockjs 不支持自定义状态码只能这样hack - reject('error') - } - const data = response.data - commit('SET_USER_INFO', data.userInfo) - commit('SET_ROLES', data.roles) - commit('SET_TOKEN', data.userInfo.jsessionid) - setToken(data.userInfo.jsessionid) - resolve(response) - }).catch(error => { - reject(error) - }) - */ + } }) }, - // 获取用户信息 - SwitchDept({ commit,state } ,dept) { - return new Promise((resolve, reject) => { - let userInfo=state.userInfo; - let params={deptName:dept.deptName,deptid:dept.deptid,branchId:dept.branchId,branchName:dept.branchName,userid:userInfo.userid} - switchDept(params).then(res=>{ - if(res.data.tips.isOk){ - userInfo=Object.assign(userInfo,res.data.userInfo) - commit('SET_USER_INFO',userInfo); - } - resolve(res); - }).catch((res)=>{ - reject(res); - }); - }); - }, - - // 第三方验证登录 - // LoginByThirdparty({ commit, state }, code) { - // return new Promise((resolve, reject) => { - // commit('SET_CODE', code) - // loginByThirdparty(state.status, state.email, state.code).then(response => { - // commit('SET_TOKEN', response.data.token) - // setToken(response.data.token) - // resolve() - // }).catch(error => { - // reject(error) - // }) - // }) - // }, + // 登出 LogOut({ commit, state }) { return new Promise((resolve, reject) => { - commit('SET_TOKEN', '') + commit('SET_TOKEN', '') commit('SET_ROLES', []) commit('SET_MYDEPTS', []) commit('SET_MYLOCATIONS', []) commit('SET_MYBRANCHS', []) commit('SET_MYSHOPS', []) - commit('SET_USER_INFO', {}) + commit('SET_MYPOSTS', []) + commit('SET_USER_INFO', {}) + commit('SET_IS_LOAD_OK', false) removeToken() + removeCacheUserInfo(); resolve() - logout(state.token) + logout() }) }, // 前端 登出 FedLogOut({ commit }) { - return new Promise(resolve => { - commit('SET_TOKEN', '') - removeToken() - resolve() + return new Promise((resolve, reject) => { + resolve() }) }, // 动态修改权限 ChangeRoles({ commit }, role) { return new Promise(resolve => { - commit('SET_TOKEN', role) - setToken(role) + getUserInfo(role).then(response => { const data = response.data commit('SET_USER_INFO', data.userInfo) commit('SET_ROLES', data.roles) - commit('SET_TOKEN', data.userInfo.jsessionid) + commit('SET_TOKEN', data.access_token) setToken(data.userInfo.jsessionid) resolve() }) diff --git a/src/utils/auth.js b/src/utils/auth.js index 82b30e4..6ad43d2 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -1,15 +1,29 @@ import Cookies from 'js-cookie' -const TokenKey = 'SESSION' +const TokenKey = 'token' + +const UserInfoKey='userInfo' export function getToken() { - return Cookies.get(TokenKey) + return localStorage.getItem(TokenKey) } export function setToken(token) { - return Cookies.set(TokenKey, token) + return localStorage.setItem(TokenKey, token) } export function removeToken() { - return Cookies.remove(TokenKey) + return localStorage.removeItem(TokenKey) +} + +export function getCacheUserInfo(){ + var userInfo= localStorage.getItem(UserInfoKey); + return JSON.parse(userInfo); +} +export function setCacheUserInfo(userInfo){ + localStorage.setItem(UserInfoKey, JSON.stringify(userInfo)) + return; } +export function removeCacheUserInfo() { + return localStorage.removeItem(UserInfoKey) +} \ No newline at end of file diff --git a/src/utils/index.js b/src/utils/index.js index 285cd19..6b8ed16 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -261,3 +261,21 @@ export function deepClone(source) { }) return targetObj } +//获去一个时间距今天隔了几年几个月 +export function datemonth(date){ + //获取当前时间 + var myDate = new Date(); + var nowYear = myDate.getFullYear(); //获取完整的年份(4位,1970-????) + var nowMonth = myDate.getMonth() +1; //获取当前月份(0-11,0代表1月) + // 拆分年月日 + date = date.split('-'); + // 得到月数 + date = parseInt(date[0]) * 12 + parseInt(date[1]); + // 得到月数 + var numMonth = parseInt(nowYear) * 12 + parseInt(nowMonth); + var m = Math.abs(numMonth - date ); + var dateStr = m % 12 == 0 ? parseInt(m / 12) + "年" + "0个月" : parseInt(m / 12) + "年" + (m % 12) +"个月" + return dateStr; +} + + diff --git a/src/utils/moneyTransToChinese.js b/src/utils/moneyTransToChinese.js new file mode 100644 index 0000000..2f85d2f --- /dev/null +++ b/src/utils/moneyTransToChinese.js @@ -0,0 +1,78 @@ +export default { + + //格式化日期：yyyy-MM-dd + transToChinese: function (tranvalue) { + try { + var i = 1; + var dw2 = new Array("", "万", "亿");//大单位 + var dw1 = new Array("拾", "佰", "仟");//小单位 + var dw = new Array("零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖");//整数部分用 + //以下是小写转换成大写显示在合计大写的文本框中 + //分离整数与小数 + var source = this.splits(tranvalue + ""); + var num = source[0]; + var dig = source[1]; + //转换整数部分 + var k1 = 0;//计小单位 + var k2 = 0;//计大单位 + var sum = 0; + var str = ""; + var len = source[0].length;//整数的长度 + for (i = 1; i <= len; i++) { + var n = source[0].charAt(len - i);//取得某个位数上的数字 + var bn = 0; + if (len - i - 1 >= 0) { + bn = source[0].charAt(len - i - 1);//取得某个位数前一位上的数字 + } + sum = sum + Number(n); + if (sum != 0) { + str = dw[Number(n)].concat(str);//取得该数字对应的大写数字，并插入到str字符串的前面 + if (n == '0') sum = 0; + } + if (len - i - 1 >= 0) {//在数字范围内 + if (k1 != 3) {//加小单位 + if (bn != 0) { + str = dw1[k1].concat(str); + } + k1++; + } else {//不加小单位，加大单位 + k1 = 0; + var temp = str.charAt(0); + if (temp == "万" || temp == "亿")//若大单位前没有数字则舍去大单位 + str = str.substr(1, str.length - 1); + str = dw2[k2].concat(str); + sum = 0; + } + } + if (k1 == 3)//小单位到千则大单位进一 + { k2++; } + } + //转换小数部分 + var strdig = ""; + if (dig != "") { + var n = dig.charAt(0); + if (n != 0) { + strdig += dw[Number(n)] + "角";//加数字 + } + var n = dig.charAt(1); + if (n != 0) { + strdig += dw[Number(n)] + "分";//加数字 + } + } + str += "元" + strdig; + } catch (e) { + console.log(e, "e"); + return "0元"; + } + return str; + }, + + splits(tranvalue) { + var value = new Array('', ''); + let temp = tranvalue.split("."); + for (var i = 0; i < temp.length; i++) { + value[i] = temp[i]; + } + return value; + } +} \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 8dfe6c9..4f610c5 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,19 +3,40 @@ import { Message } from 'element-ui' import store from '@/store' import { getToken } from '@/utils/auth' import router from '@/router' - +var curlDomain=window.location.protocol+"//"+window.location.host; // 返回https://mp.csdn.net +var baseApiUrl=""; +if(process.env.BASE_API ){ + if(process.env.BASE_API.indexOf("http")<0 && process.env.BASE_API.indexOf("wwww.")<0){ + baseApiUrl=curlDomain+"/"+process.env.BASE_API+"/"+process.env.VERSION; + }else{ + baseApiUrl=process.env.BASE_API+"/"+process.env.VERSION; + } + +}else{ + baseApiUrl=curlDomain+"/api/"+process.env.VERSION +} +var indexOfHttp=baseApiUrl.indexOf("://"); +if(indexOfHttp>0){ + baseApiUrl=baseApiUrl.substr(0,indexOfHttp+3)+baseApiUrl.substr(indexOfHttp+3,baseApiUrl.length).replace("//","/"); +}else{ + baseApiUrl=baseApiUrl.replace("//","/") +} // create an axios instance const service = axios.create({ - baseURL: process.env.BASE_API, // api的base_url + baseURL:baseApiUrl, // api的base_url timeout: 15000 // request timeout }) // request interceptor service.interceptors.request.use(config => { - // Do something before request is sent - if (store.getters.token) { - config.headers['SESSION'] = getToken() // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改 - } + // Do something before request is sent + var token=getToken(); + if(token==null ||token=='' ||token=="" || token ==undefined ){ + return config; + }else{ + config.headers['Authorization'] = 'Bearer '+token // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改 + } + return config }, error => { // Do something with request error @@ -28,7 +49,7 @@ service.interceptors.response.use( response => { if(response.data && response.data.tips && response.data.tips.msg == 'Full authentication is required to access this resource'){ Message.error('会话过期，请重新登陆') - response.data.tips.msg="会话过期，请重新登陆"; + //response.data.tips.msg="会话过期，请重新登陆"; store.dispatch('FedLogOut').then(() => { router.replace({path: '/login'}) }) @@ -36,15 +57,16 @@ service.interceptors.response.use( return response }, error => { - console.log('err' + error)// for debug + console.log(error)// for debug if(error.response){ switch (error.response.status) { case 401: // 返回 401 清除token信息并跳转到登录页面 Message.error('会话过期，请重新登陆') - store.dispatch('FedLogOut').then(() => { + store.dispatch('FedLogOut').then(() => { router.replace({path: '/login'}) }) + return; } } diff --git a/src/views/layout/FullScreenLayout.vue b/src/views/layout/FullScreenLayout.vue new file mode 100644 index 0000000..0fe3636 --- /dev/null +++ b/src/views/layout/FullScreenLayout.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index f6ebb49..cf8e2dc 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -2,18 +2,25 @@ - +
- - - - - +
+ + {{workShop.branchName}} {{workShop.locationName}} + + + {{workShop.branchName}} {{workShop.deptName}} + + 切换商户 +
+ + + - + - + @@ -22,35 +29,64 @@ -
- + + {{$t('navbar.dashboard')}} - - {{$t('navbar.logOut')}} - 用户名：{{userInfo.username}} 公司：{{userInfo.branchName}} + + +
+ 部门及岗位： + +
+ + {{post.postName}} + +
+ + + +
- - 部门 ：{{userInfo.deptName}} - - - 商户：{{userInfo.shopName}} + +
+ 商户及门店： + + + {{location.locationName}} + + + + 无门店或者我不是该商户的门店管理员 + + + +
- - 门店：{{userInfo.locationName}} + +
+ 我拥有的角色： + + + {{role.rolename}} + + + +
- - 角色 ：{{item.rolename}} + + + {{$t('navbar.logOut')}} - + @@ -63,7 +99,8 @@ import Hamburger from '@/components/Hamburger' import ErrorLog from '@/components/ErrorLog' import Screenfull from '@/components/Screenfull' import LangSelect from '@/components/LangSelect' -import ThemePicker from '@/components/ThemePicker' +import ThemePicker from '@/components/ThemePicker'; +//import selectShopLocationBySysDept from '@/views/mdp/app/selectShopLocationBySysDept/selectShopLocationBySysDept'; export default { components: { @@ -74,21 +111,111 @@ export default { LangSelect, ThemePicker }, + data:function(){ + return { + selectShopVisible: false, + postChecked:'' + } + }, computed: { + screenWidth: function() { + return screen.width; + }, ...mapGetters([ 'sidebar', 'userInfo', - 'roles' - ]) - }, + 'roles', + 'myPosts', + 'myLocations', + 'myShops', + 'workShop' + ]), + 'deptPostsTree':function(){ + var deptPostsTree=[] + if(this.myPosts==null ||this.myPosts.length<=0){ + return deptPostsTree + } + var checkedPostId=this.myPosts.length>0?this.myPosts[0].postId:'' + this.postChecked=checkedPostId + this.myPosts.forEach(post=>{ + if(post.postId==checkedPostId){ + post.checked='1' + } + var deptPostArray=deptPostsTree.filter(dp=>dp.deptid==post.deptid) + if(deptPostArray!=null && deptPostArray.length>0){ + if(deptPostArray[0].children && deptPostArray[0].children.length>0){ + if(!deptPostArray[0].children.some(i=>i.postId==post.postId)){ + deptPostArray[0].children.push(post) + } + }else{ + deptPostArray[0].children=[] + deptPostArray[0].children.push(post) + } + }else{ + let deptPostsNode={deptid:post.deptid,deptName:post.deptName} + deptPostsNode.children=[post] + deptPostsTree.push(deptPostsNode) + } + }) + return deptPostsTree + }, + 'shopLocationsTree':function(){ + let myShops=this.myShops; + if(myShops==null||myShops.length<=0){ + return [] + } + let myLocations=this.myLocations; + myShops.forEach(shop=>{ + shop.locations=[]; + if(shop.shopId==this.userInfo.shopId){ + shop.checked=true + } + if(myLocations!=null && myLocations.length>0){ + myLocations.forEach(l=>{ + if(l.shopId==shop.shopId){ + + if(l.locationId==this.userInfo.locationId){ + l.checked=true + } + shop.locations.push(l) + } + }) + } + }) + return myShops + } + }, methods: { - toggleSideBar(opened) { - this.$store.dispatch('toggleSideBar',opened) + toggleSideBar(toOpen) { + this.$store.dispatch('toggleSideBar', toOpen) }, logout() { this.$store.dispatch('LogOut').then(() => { location.reload()// In order to re-instantiate the vue-router object to avoid bugs }) + }, + showSelectShopMethod() { + this.selectShopVisible = true; + }, + sureMethod(row) { + this.selectShopVisible = false; + this.workShop.shopId=row.shopId; + this.workShop.branchId=row.branchId; + this.workShop.branchName=row.sysBranchName; + this.workShop.locationId=row.id; + this.workShop.deptid=row.deptid; + this.workShop.locationName=row.businessName; + this.$store.commit('SET_WORK_SHOP',this.workShop); + }, + jumpToOtherSystem(name) { + let href = window.location.protocol + "//" + window.location.host + "/" + name + "/" + process.env.VERSION; + if(name=='im'){ + href=window.location.protocol + "//" + window.location.host + "/" + name + "/" + process.env.VERSION+"/#/mdp/im/messages/messageChat"; + } + console.log(href); + window.open(href, '_blank'); + NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it + } }, mounted() { @@ -101,7 +228,8 @@ export default { } - diff --git a/src/views/layout/components/ScrollPane.vue b/src/views/layout/components/ScrollPane.vue new file mode 100644 index 0000000..0ec76e7 --- /dev/null +++ b/src/views/layout/components/ScrollPane.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/src/views/layout/components/Sidebar/FixiOSBug.js b/src/views/layout/components/Sidebar/FixiOSBug.js new file mode 100644 index 0000000..bc14856 --- /dev/null +++ b/src/views/layout/components/Sidebar/FixiOSBug.js @@ -0,0 +1,26 @@ +export default { + computed: { + device() { + return this.$store.state.app.device + } + }, + mounted() { + // In order to fix the click on menu on the ios device will trigger the mouseleave bug + // https://github.com/PanJiaChen/vue-element-admin/issues/1135 + this.fixBugIniOS() + }, + methods: { + fixBugIniOS() { + const $subMenu = this.$refs.subMenu + if ($subMenu) { + const handleMouseleave = $subMenu.handleMouseleave + $subMenu.handleMouseleave = (e) => { + if (this.device === 'mobile') { + return + } + handleMouseleave(e) + } + } + } + } +} diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue new file mode 100644 index 0000000..b515f61 --- /dev/null +++ b/src/views/layout/components/Sidebar/Item.vue @@ -0,0 +1,29 @@ + diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue new file mode 100644 index 0000000..eb4dd10 --- /dev/null +++ b/src/views/layout/components/Sidebar/Link.vue @@ -0,0 +1,36 @@ + + + + diff --git a/src/views/layout/components/Sidebar/Logo.vue b/src/views/layout/components/Sidebar/Logo.vue new file mode 100644 index 0000000..68caea7 --- /dev/null +++ b/src/views/layout/components/Sidebar/Logo.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue index c8de97b..3418bf9 100644 --- a/src/views/layout/components/Sidebar/SidebarItem.vue +++ b/src/views/layout/components/Sidebar/SidebarItem.vue @@ -1,7 +1,6 @@ @@ -46,6 +44,11 @@ export default { default: false } }, + computed: { + isCollapse() { + return !this.$store.state.app.sidebar.opened; + } + }, methods: { hasOneShowingChildren(children) { const showingChildren = children.filter(item => { @@ -61,3 +64,9 @@ export default { } + + diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue index 007e792..7648f65 100644 --- a/src/views/layout/components/Sidebar/index.vue +++ b/src/views/layout/components/Sidebar/index.vue @@ -1,4 +1,4 @@ -