From 71782f35090664455de46380e84e13d3e12a863e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 30 Apr 2022 18:11:23 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 8 ++++---- src/views/login/components/login.vue | 27 ++++----------------------- src/views/login/index.vue | 2 ++ 3 files changed, 10 insertions(+), 27 deletions(-) diff --git a/config/index.js b/config/index.js index 029c2cfb..371874da 100644 --- a/config/index.js +++ b/config/index.js @@ -17,9 +17,9 @@ module.exports = { '^/api/m1/xm': '/xm' } }, - + /** '/api/m1/sys': { - target: 'http://192.168.0.103:7015', + target: 'http://localhost:7015', changeOrigin: true, pathRewrite: { '^/api/m1/sys': '/sys' @@ -27,13 +27,13 @@ module.exports = { }, '/api/m1/pay': { - target: 'http://192.168.0.103:7125', + target: 'http://localhost:7125', changeOrigin: true, pathRewrite: { '^/api/m1/pay': '/pay' } }, - + **/ /** '/api/m1/workflow': { target: 'http://localhost:7080', diff --git a/src/views/login/components/login.vue b/src/views/login/components/login.vue index d60ce41d..cb8019ca 100644 --- a/src/views/login/components/login.vue +++ b/src/views/login/components/login.vue @@ -265,33 +265,14 @@ export default { loginParams.branchId=params.branchId } this.$store.dispatch("LoginByUserloginid",loginParams).then(res => { - this.loading = false + this.loading = false if(res.data.tips.isOk==true){ this.loading = true; - this.$store.dispatch('GetUserInfo').then((res2)=>{ - //this.userDeptid=res2.data.userInfo.deptid + this.$store.dispatch('GetUserInfo').then((res2)=>{ this.loading = false - if(res2.data.tips.isOk==true){ - if(this.$store.state.user.myBranchs==null ||this.$store.state.user.myBranchs.length==0||this.$store.state.user.myDepts==null || this.$store.state.user.myDepts.length<=0){ - //if(1==1){ - //this.$message.error("亲，您不在任何一个公司或者部门中，需要【先创建公司】\n 或者请【管理员加您进入公司】哦"); - this.addBranchFormVisible=true; - }else if(this.$store.state.user.myDepts.length>1 ){ - //this.$message.info("亲，您在多个部门中任职，我分不清您要登陆哪个部门，请选择一个部门登陆吧"); - if( !this.userDeptid ){ - this.userDeptid=res2.data.userInfo.deptid - this.deptSelectVisible=true; - }else{ - this.rolesChecked(); - } - //this.$router.push({ path: 'mdp/sys/branch/BranchAdd' }) - }else if(this.$store.state.user.myDepts.length==1){ - //进行角色身份验证 + if(res2.data.tips.isOk==true){ this.userDeptid=res2.data.userInfo.deptid - this.rolesChecked(); - }else{ - this.rolesChecked(); - } + this.rolesChecked(); }else{ this.$message.error(res2.data.tips.msg); } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index bb6c0bb9..88f74b67 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -270,11 +270,13 @@ export default { } this.$store.dispatch("LoginByUserloginid",loginParams).then(res => { this.loading = false + debugger; if(res.data.tips.isOk==true){ console.log(this.$store); this.loading = true; this.$store.dispatch('GetUserInfo').then((res2)=>{ //this.userDeptid=res2.data.userInfo.deptid + debugger; this.loading = false if(res2.data.tips.isOk==true){ if(this.$store.state.user.myDepts.length>1 ){ From 678654839ae637ae3592912f81528fd2d372c9c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 30 Apr 2022 21:26:38 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/xmMenu/XmMenuAdd.vue | 2 +- src/views/xm/core/xmMenu/XmMenuEdit.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue index a444a75a..f00ebbf9 100644 --- a/src/views/xm/core/xmMenu/XmMenuAdd.vue +++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue @@ -71,7 +71,7 @@ - + diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index 2d264137..2a3d972f 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -71,7 +71,7 @@ - + From 871526dadae3afb281fdb7dcd86395174b5e1dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 30 Apr 2022 22:02:48 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/xmMenu/XmMenuEdit.vue | 50 ++++++++++++---------- src/views/xm/core/xmRecord/XmRecord.vue | 16 ++++--- src/views/xm/core/xmRecord/XmRecordMng.vue | 9 +--- 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index 2a3d972f..8bccb49a 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -70,7 +70,7 @@ - + @@ -118,19 +118,19 @@ - + - + - + - + - - + +  h @@ -138,16 +138,16 @@  h - -  h + +  h - - 元 + + 元 - - 元 + + 元 @@ -174,6 +174,9 @@ 上传附件 + + + @@ -204,6 +207,7 @@ import XmMenuOverview from './XmMenuOverview.vue'; import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; import TagMng from "@/views/mdp/arc/tag/TagMng"; import XmSubWorkItem from "@/views/xm/core/xmMenuWorkItem/XmSubWorkItem"; + import XmRecord from '../xmRecord/XmRecord' export default { computed: { @@ -255,28 +259,28 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; } } }, - 'editForm.mactWorkload':function(val,oldVal){ + 'editForm.actWorkload':function(val,oldVal){ if(!this.editForm.budgetWorkload){ return; } if(val==0||!val){ return; } - this.editForm.mactRate=Math.round(val/this.editForm.budgetWorkload*100) - if( this.editForm.mactRate>100){ - this.editForm.mactRate=100; + this.editForm.finishRate=Math.round(val/this.editForm.budgetWorkload*100) + if( this.editForm.finishRate>100){ + this.editForm.finishRate=100; } }, 'editForm.budgetWorkload':function(val,oldVal){ - if(!this.editForm.mactWorkload){ + if(!this.editForm.actWorkload){ return; } if(val==0||!val){ return; } - this.editForm.mactRate=Math.round(this.editForm.mactWorkload/val*100) - if( this.editForm.mactRate>100){ - this.editForm.mactRate=100; + this.editForm.finishRate=Math.round(this.editForm.actWorkload/val*100) + if( this.editForm.finishRate>100){ + this.editForm.finishRate=100; } } }, @@ -301,7 +305,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; //新增界面数据 项目需求表 editForm: { menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',seqNo:'1',mmUserid:'',mmUsername:'',ntype:'0',childrenCnt:0,sinceVersion:'', - proposerId:'',proposerName:'',dlvl:'',dtype:'',priority:'',source:'',calcType:'1',mactWorkload:0,mactAmount:0,mactRate:0,ctime:'',dclass:'1' + proposerId:'',proposerName:'',dlvl:'',dtype:'',priority:'',source:'',calcType:'1',actWorkload:0,actAt:0,finishRate:0,ctime:'',dclass:'1' }, proposerSelectVisible:false, mmUserSelectVisible:false, @@ -323,6 +327,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; tagSelectVisible:false, dateRanger:[], subWorkItemNum:-1, + activateTabPaneName:'1' /**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**end 在上面加自定义属性**/ @@ -489,6 +494,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; TagMng, XmMenuExchangeMng, XmSubWorkItem, + XmRecord }, mounted() { diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue index 4fd9df83..5af03cf4 100644 --- a/src/views/xm/core/xmRecord/XmRecord.vue +++ b/src/views/xm/core/xmRecord/XmRecord.vue @@ -2,7 +2,7 @@
- {{i.name}} + {{i.name}} 查询 @@ -65,12 +65,15 @@ 'userInfo','roles' ]) }, - props:["projectId","objType","objId","simple" ,"visible"], + props:["projectId",'productId',"objType","bizId","simple" ,"visible"], watch:{ visible:function(visible){ if( visible ==true ){ - this.getXmRecords(); + this.searchXmRecords(); } + }, + bizId:function(bizId){ + this.searchXmRecords(); } }, data() { @@ -157,8 +160,11 @@ if(this.projectId){ params.projectId=this.projectId; } - if(this.objId){ - params.taskId=this.objId; + if(this.productId){ + params.productId=this.productId; + } + if(this.bizId){ + params.bizId=this.bizId; } this.load.list = true; listXmRecord(params).then((res) => { diff --git a/src/views/xm/core/xmRecord/XmRecordMng.vue b/src/views/xm/core/xmRecord/XmRecordMng.vue index 151aa02d..d2fc7847 100644 --- a/src/views/xm/core/xmRecord/XmRecordMng.vue +++ b/src/views/xm/core/xmRecord/XmRecordMng.vue @@ -9,12 +9,7 @@ import Vue from 'vue' import { mapGetters } from 'vuex' - import XmRecord from './XmRecord' - if(!Vue.component("xm-record")){ - - Vue.component('xm-record',XmRecord) - Vue.use(XmRecord); - } + import XmRecord from './XmRecord' export default { computed: { @@ -32,7 +27,7 @@ },//end methods components: { - + XmRecord }, mounted() { From 25188c2b942dcda1479ddaf1004de8c5c4b54e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 30 Apr 2022 22:56:19 +0800 Subject: [PATCH 04/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/xmTask/XmTaskEdit.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index d8630f07..9ff3e1a6 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -92,7 +92,7 @@ - + @@ -164,10 +164,10 @@ - + - + @@ -218,6 +218,9 @@ + + + @@ -273,6 +276,7 @@ import XmGroupSelect from '../xmGroup/XmGroupSelect.vue'; import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail'; import TagMng from "@/views/mdp/arc/tag/TagMng"; + import XmRecord from '../xmRecord/XmRecord' import XmSubWorkItem from "@/views/xm/core/xmTaskWorkItem/XmSubWorkItem"; import XmTaskWorkloadRecord from "../xmTaskWorkload/XmTaskWorkloadRecord" @@ -375,6 +379,7 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; pickerOptions: util.getPickerOptions('datarange'), tagSelectVisible:false, subWorkItemNum:0, + activateTabPaneName:'1' /**end 在上面加自定义属性**/ }//end return },//end data @@ -649,6 +654,7 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; components: { xmSkillMng, skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmGroupSelect,XmMenuRichDetail,TagMng,XmSubWorkItem,XmTaskWorkloadRecord,XmMenuEdit, + XmRecord, //在下面添加其它组件 'xm-task-edit':XmTaskEdit }, mounted() { From 314bdbfdcfeafa406ffbae4370d9495755526eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 30 Apr 2022 23:01:41 +0800 Subject: [PATCH 05/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/xmTask/XmTaskMng.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index b9531938..18eeb510 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -2497,7 +2497,9 @@ export default { mounted() { this.initData(); this.$nextTick(() => { - this.getXmTasks(); + if(this.isTaskCenter ||(this.selProject && this.selProject.id)){ + this.getXmTasks(); + } this.tableHeight = this.source == 'GZT' ? this.tableHeight : util.calcTableMaxHeight(this.$refs.table.$el); initSimpleDicts( "all", ["planType","taskType","priority","xmTaskSettleSchemel","priority","taskState" ]).then((res) => { this.dicts = res.data.data; From 310d14d0a92f06e14167304ac436ecc6f642609f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 30 Apr 2022 23:23:09 +0800 Subject: [PATCH 06/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/xmProject/XmProjectMng.vue | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue index da176e63..52b83ebe 100644 --- a/src/views/xm/core/xmProject/XmProjectMng.vue +++ b/src/views/xm/core/xmProject/XmProjectMng.vue @@ -99,8 +99,9 @@
{{p.name}}
-
{{p.code}} {{formatProjectStatus(dicts,'projectStatus',p.status)}} - 删除 +
{{p.code}} + {{item.name}} + 删除 复制 统计
@@ -159,13 +160,8 @@ - - + - + - + - + - + @@ -197,7 +197,7 @@ {{scope.row.startTime? scope.row.startTime.substr(0,10) : ""}}~{{scope.row.endTime? scope.row.endTime.substr(0,10) : ""}} - + From c54f7d5156b87ad06e62c7515335740aa5365048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 30 Apr 2022 23:38:00 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/xmProduct/XmProductMng.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue index 217f5591..56aa3bc7 100644 --- a/src/views/xm/core/xmProduct/XmProductMng.vue +++ b/src/views/xm/core/xmProduct/XmProductMng.vue @@ -159,16 +159,16 @@ - + - + - + - + - + From bb920e9a6044958969f88e5a406d03d914142dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 1 May 2022 16:33:44 +0800 Subject: [PATCH 09/27] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/api/login.js | 14 ++++++++++ src/views/login/components/login.vue | 41 ++++++++++++++++++++++++---- 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d7632c75..c8fecee1 100644 --- a/package.json +++ b/package.json @@ -121,6 +121,7 @@ "vue-loader": "^15.9.8", "vue-style-loader": "^4.1.3", "vue-template-compiler": "^2.6.14", + "vue-wxlogin": "^1.0.4", "webpack": "^5.59.1", "webpack-bundle-analyzer": "2.9.1", "webpack-cli": "^4.9.1", diff --git a/src/api/login.js b/src/api/login.js index f01c13ec..da260998 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -143,3 +143,17 @@ export function validEmailCode(params) { params:params }) } + + +/** + * 获取第三方登录需要state参数，防止crfs攻击 + * @param + * @returns + */ +export function getTpaState( ) { + return axios({ + url: '/tpa/login/wechat/wxpub/state', + method: 'post', + data:{} + }) +} \ No newline at end of file diff --git a/src/views/login/components/login.vue b/src/views/login/components/login.vue index cb8019ca..1b4746da 100644 --- a/src/views/login/components/login.vue +++ b/src/views/login/components/login.vue @@ -1,5 +1,6 @@ @@ -80,8 +83,7 @@ import { sendSmsCode } from '@/api/sms/sms'; import { mapGetters } from 'vuex'; import md5 from 'js-md5'; -import { resetPasswordByPhoneno } from '@/api/login'; - +import { resetPasswordByPhoneno,getTpaState } from '@/api/login'; export default { name: 'login', @@ -178,6 +180,7 @@ export default { abledBut: false, //是否禁止 setTimeNum: 60, // 倒计时时间 timeWrap: null, // 定时器标识 + wxLoginCodeVisible:false, } }, @@ -324,6 +327,26 @@ export default { this.addBranchFormVisible=false; this.handleLogin(); }, + weixinLogin(){ + getTpaState().then(res=>{ + var tips = res.data.tips; + if(tips.isOk){ + this.wxLoginCodeVisible=true; + var state=res.data.data + var obj = new WxLogin({ + self_redirect:true, + id:"login_container", + appid: "wx2671d5db8346b6fc", + scope: "snsapi_login", + redirect_uri: encodeURIComponent("https://www.maimengcloud.com/api/m1/tpa/login/token?authType=wechat_wxpub&authId=mmxmcloud_wxopen_pc"), + state: state, + style: "", + href: "" + }); + } + }) + + }, afterQRScan() { // const hash = window.location.hash.slice(1) @@ -350,6 +373,12 @@ export default { destroyed() { // window.removeEventListener('hashchange', this.afterQRScan) }, + mounted(){ + const s = document.createElement('script'); + s.type = 'text/javascript'; + s.src = 'https://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js'; + document.body.appendChild(s); + } } From 343d01a16ff6817941a84fd73c66e0e70488448e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 1 May 2022 17:05:07 +0800 Subject: [PATCH 10/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/layout/components/Navbar.vue | 3 ++- src/views/login/components/login.vue | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 9c5c5e2f..63b4b100 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -223,7 +223,8 @@ export default { }, logout() { this.$store.dispatch('LogOut').then(() => { - location.reload()// In order to re-instantiate the vue-router object to avoid bugs + //location.reload()// In order to re-instantiate the vue-router object to avoid bugs + this.$router.push({path:'/login'}) }) }, showSelectShopMethod() { diff --git a/src/views/login/components/login.vue b/src/views/login/components/login.vue index 1b4746da..38054d5f 100644 --- a/src/views/login/components/login.vue +++ b/src/views/login/components/login.vue @@ -328,17 +328,18 @@ export default { this.handleLogin(); }, weixinLogin(){ + var mdpRedirectUri="https://www.qingqinkj.com/xm/m1/" getTpaState().then(res=>{ var tips = res.data.tips; if(tips.isOk){ this.wxLoginCodeVisible=true; var state=res.data.data var obj = new WxLogin({ - self_redirect:true, + self_redirect:false, id:"login_container", appid: "wx2671d5db8346b6fc", scope: "snsapi_login", - redirect_uri: encodeURIComponent("https://www.maimengcloud.com/api/m1/tpa/login/token?authType=wechat_wxpub&authId=mmxmcloud_wxopen_pc"), + redirect_uri: encodeURIComponent("https://www.maimengcloud.com/api/m1/tpa/login/token?authType=wechat_wxpub&authId=mmxmcloud_wxopen_pc&redirectUri="+mdpRedirectUri), state: state, style: "", href: "" From 201afece0a66d27145507478bdf553d414cc3bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 1 May 2022 17:21:58 +0800 Subject: [PATCH 11/27] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/layout/components/Navbar.vue | 3 ++- src/views/login/components/login.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 63b4b100..ad9ff825 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -224,7 +224,8 @@ export default { logout() { this.$store.dispatch('LogOut').then(() => { //location.reload()// In order to re-instantiate the vue-router object to avoid bugs - this.$router.push({path:'/login'}) + //this.$router.replace({path:'/login'}) + location.replace('/'); }) }, showSelectShopMethod() { diff --git a/src/views/login/components/login.vue b/src/views/login/components/login.vue index 38054d5f..79c3cd50 100644 --- a/src/views/login/components/login.vue +++ b/src/views/login/components/login.vue @@ -328,7 +328,8 @@ export default { this.handleLogin(); }, weixinLogin(){ - var mdpRedirectUri="https://www.qingqinkj.com/xm/m1/" + var curlDomain=window.location.protocol+"//"+window.location.host; // + var mdpRedirectUri=curlDomain+"/"+process.env.CONTEXT+"/"+process.env.VERSION+"/" getTpaState().then(res=>{ var tips = res.data.tips; if(tips.isOk){ From 5b8ec89e29c64c5f0699013e8cfacb6c15186b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 2 May 2022 02:22:25 +0800 Subject: [PATCH 12/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/login.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/login/components/login.vue b/src/views/login/components/login.vue index 79c3cd50..15c70dd9 100644 --- a/src/views/login/components/login.vue +++ b/src/views/login/components/login.vue @@ -17,7 +17,7 @@ - + 发送验证码 ({{setTimeNum}}s) @@ -39,7 +39,7 @@
- 关闭 + 关闭刷新二维码
@@ -55,7 +55,7 @@ - + 发送验证码 ({{setTimeNum}}s) @@ -193,10 +193,10 @@ export default { } }, - sendPhonenoSmsCode(){ + sendPhonenoSmsCode(scene){ var params={ phoneno:this.loginForm.phoneno, - scene:"login" + scene:scene } sendSmsCode(params).then(res=>{ if(res.data.tips.isOk){ From f427966c5ed1694377e3a09ed84fc3244cd01028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 2 May 2022 03:43:12 +0800 Subject: [PATCH 13/27] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/api/mdp/sys/userLoginRecord.js | 44 +++ src/router/routes_my_work.js | 12 + src/views/login/components/register.vue | 33 +- src/views/mdp/sys/branch/BranchEdit.vue | 182 +++++++++ src/views/myWork/set/BranchEdit.vue | 182 +++++++++ src/views/myWork/set/ChangeEmailStepOne.vue | 163 ++++++++ src/views/myWork/set/ChangeEmailStepTwo.vue | 109 ++++++ src/views/myWork/set/UpdateUserInfo.vue | 327 ++++++++++++++++ src/views/myWork/set/index.vue | 185 +++++---- src/views/myWork/userLoginRecord/index.vue | 396 ++++++++++++++++++++ 11 files changed, 1558 insertions(+), 76 deletions(-) create mode 100644 src/api/mdp/sys/userLoginRecord.js create mode 100644 src/views/mdp/sys/branch/BranchEdit.vue create mode 100644 src/views/myWork/set/BranchEdit.vue create mode 100644 src/views/myWork/set/ChangeEmailStepOne.vue create mode 100644 src/views/myWork/set/ChangeEmailStepTwo.vue create mode 100644 src/views/myWork/set/UpdateUserInfo.vue create mode 100644 src/views/myWork/userLoginRecord/index.vue diff --git a/package.json b/package.json index c8fecee1..e2ae66fe 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "vue-i18n": "7.3.2", "vue-okr-tree": "^1.0.10", "vue-print-nb": "^1.7.5", + "vue-qr": "^4.0.6", "vue-router": "3.0.1", "vuedraggable": "2.15.0", "vuex": "3.0.1", diff --git a/src/api/mdp/sys/userLoginRecord.js b/src/api/mdp/sys/userLoginRecord.js new file mode 100644 index 00000000..06796f75 --- /dev/null +++ b/src/api/mdp/sys/userLoginRecord.js @@ -0,0 +1,44 @@ +import axios from '@/utils/request' + +import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表 +import config from '@/common/config' + +let base = config.getSysBasePath(); + +/**-------------------------与后端通讯接口------------------请写在下面-------------------------------------------- */ +/** + * 用户登录信息登记 + *1 默认只开放普通查询，所有查询，只要上传 分页参数 {pageNum:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， + *2 查询、新增、修改的参数格式 params={id:'主键 主键',userid:'用户编号',shopId:'商户编号',locationId:'门店编号',loginShopid:'登录的商户编号',loginLocationid:'登录的门店编号',branchId:'机构编号',loginType:'1-微信扫门店二维码，2-点击小程序登录，3-账户密码登录，4-手机号码登录',loginTime:'登录时间',loginBranchId:'登录机构号',username:'登录用户名',authId:'授权码',mdpAppid:'mdp平台appid',lockNo:'批处理编号',lockStatus:'批处理状态0-待处理1-处理中2处理完毕',lockTime:'批处理时间',phoneno:'登录手机号',loginIp:'登录ip',userType:'mem-会员端用户，adm-管理端用户',loginDeviceId:'登录设备编号',loginDeviceSn:'设备特征码',userAgent:'请求特征码',reqNo:'请求特征码-方便前端补充回填部分信息',deviceType:'设备类型COMPUTER/MOBILE/TABLET/GAME_CONSOLE/DMR/WEARABLE/UNKNOWN',os:'操作系统Windows/ios/Android',osVersion:'操作系统版本如Android',osName:'操作系统名称如Android',renderingEngine:'浏览器渲染引擎如WEBKIT',deviceManufacturer:'设备生产厂商',browerGroup:'浏览器组',borderName:'浏览器名称',borderVersion:'浏览器版本',longitude:'经度',latitude:'纬度',regionId:'区域编号精确到4级镇、街道',regionName:'定位街道名称',formatAddress:'定位格式化地址名称',districtId:'定位区县编号',memType:'用户类型',loginStatus:'1-登录成功，0-登录失败',loginMsg:'登录成功或者失败的说明',authType:'授权码',grantType:'授权码'} + **/ + +//普通查询 条件之间and关系 +export const listUserLoginRecord = params => { return axios.get(`${base}/mdp/sys/userLoginRecord/list`, { params: params }); }; + +//删除一条用户登录信息登记 params={id:'主键 主键'} +export const delUserLoginRecord = params => { return axios.post(`${base}/mdp/sys/userLoginRecord/del`,params); }; + +//批量删除用户登录信息登记 params=[{id:'主键 主键'}] +export const batchDelUserLoginRecord = params => { return axios.post(`${base}/mdp/sys/userLoginRecord/batchDel`, params); }; + +//修改一条用户登录信息登记记录 +export const editUserLoginRecord = params => { return axios.post(`${base}/mdp/sys/userLoginRecord/edit`, params); }; + +//新增一条用户登录信息登记 +export const addUserLoginRecord = params => { return axios.post(`${base}/mdp/sys/userLoginRecord/add`, params); }; + +//批量修改某些字段 +export const editSomeFieldsUserLoginRecord = params => { return axios.post(`${base}/mdp/sys/userLoginRecord/editSomeFields`, params); }; + + + +/**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */ +//初始化页面上的字典 +export const initDicts = (that) => { + var itemCodes=[];//在此添加要加载的字典 如['sex','grade','lvl'] + if(itemCodes.length>0){ + initSimpleDicts('all',itemCodes).then(res=>{ + Object.assign(that.dicts,res.data.data) + }); + } +}; \ No newline at end of file diff --git a/src/router/routes_my_work.js b/src/router/routes_my_work.js index e3d222ed..04b17c68 100644 --- a/src/router/routes_my_work.js +++ b/src/router/routes_my_work.js @@ -4,6 +4,9 @@ const _import = require('./_import_' + process.env.NODE_ENV) export default { routes: [ + + { path: '/changeEmailStepOne', component: _import('myWork/set/ChangeEmailStepOne'), hidden: true }, + { path: '/changeEmailStepTwo', component: _import('myWork/set/ChangeEmailStepTwo'), hidden: true }, { path: '/my/work', component: Layout, @@ -42,6 +45,15 @@ export default { icon: 'component' } }, + { + path: 'userLoginRecord', + component: _import('myWork/userLoginRecord/index'), + name: '登录日志', + meta: { + title: '登录日志', + icon: 'component' + } + }, ] } ] diff --git a/src/views/login/components/register.vue b/src/views/login/components/register.vue index 909f9f52..da0c3ce3 100644 --- a/src/views/login/components/register.vue +++ b/src/views/login/components/register.vue @@ -10,7 +10,10 @@ - 发送验证码 + 发送验证码 + 该手机号已注册有{{phonenoUsers.length}}个账户 + 查看明细 + @@ -36,6 +39,23 @@ + + + + + + + + + + + + + + @@ -44,7 +64,7 @@ + + \ No newline at end of file diff --git a/src/views/myWork/set/BranchEdit.vue b/src/views/myWork/set/BranchEdit.vue new file mode 100644 index 00000000..b6e03c69 --- /dev/null +++ b/src/views/myWork/set/BranchEdit.vue @@ -0,0 +1,182 @@ + + + + + \ No newline at end of file diff --git a/src/views/myWork/set/ChangeEmailStepOne.vue b/src/views/myWork/set/ChangeEmailStepOne.vue new file mode 100644 index 00000000..c81dbec7 --- /dev/null +++ b/src/views/myWork/set/ChangeEmailStepOne.vue @@ -0,0 +1,163 @@ + + + + + \ No newline at end of file diff --git a/src/views/myWork/set/ChangeEmailStepTwo.vue b/src/views/myWork/set/ChangeEmailStepTwo.vue new file mode 100644 index 00000000..0901a275 --- /dev/null +++ b/src/views/myWork/set/ChangeEmailStepTwo.vue @@ -0,0 +1,109 @@ + + + + + \ No newline at end of file diff --git a/src/views/myWork/set/UpdateUserInfo.vue b/src/views/myWork/set/UpdateUserInfo.vue new file mode 100644 index 00000000..a0fcece0 --- /dev/null +++ b/src/views/myWork/set/UpdateUserInfo.vue @@ -0,0 +1,327 @@ + + + + + \ No newline at end of file diff --git a/src/views/myWork/set/index.vue b/src/views/myWork/set/index.vue index 98df6e58..e7372c52 100644 --- a/src/views/myWork/set/index.vue +++ b/src/views/myWork/set/index.vue @@ -5,13 +5,20 @@
- {{userInfo.username}} + {{userInfo.username}} + + 个人账户 + 企业管理员账户 + 企业员工账户 + {{editForm.branchName}} + 升级为企业账户 + 所在部门：{{userInfo.deptName}} 修改头像
-
+

基本信息

@@ -21,13 +28,39 @@ - + + 绑定邮箱 + 更换邮箱 保存 + 绑定主账户
+
+

绑定主账户

+ + + 主账号指平台统一账户，一般同一个手机号、微信号、邮箱认为是同一个账户 +
+ 绑定主账户后，可以实现微信、app、公众号、小程序等各个应用账户互通 + + + +
+ 扫描绑定{{editForm.username}}主账号 + + + 返回 + + +

密码设置

@@ -57,74 +90,35 @@ :remark="userInfo.username" > 商品高清大图 - -
- - - - - + + + + + + +
+ + \ No newline at end of file From 05d236d8d01c207a58a46ec28f53923a08ee3921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 2 May 2022 03:50:16 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mdp/sys/branch.js | 30 +++++++++++++++++++++++------- src/views/myWork/set/index.vue | 5 +++-- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/api/mdp/sys/branch.js b/src/api/mdp/sys/branch.js index 73c3744f..e00a7192 100644 --- a/src/api/mdp/sys/branch.js +++ b/src/api/mdp/sys/branch.js @@ -1,21 +1,20 @@ import axios from '@/utils/request' +import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表 import config from '@/common/config' -let base=config.getSysBasePath(); +let base = config.getSysBasePath(); +/**-------------------------与后端通讯接口------------------请写在下面-------------------------------------------- */ /** * 管理端机构表（机构下面若干部门） - *1 默认只开放普通查询，所有查询，只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， - *2 查询、新增、修改的参数格式 params={id:'机构编号 主键',branchName:'机构名称',enabled:'是否可用',industryCategory:'行业分类',cuserid:'创建人编号',cdate:'创建日期',cusername:'创建人姓名',phoneNo:'联系电话',emaill:'邮件'} + *1 默认只开放普通查询，所有查询，只要上传 分页参数 {pageNum:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， + *2 查询、新增、修改的参数格式 params={id:'机构编号 主键',branchName:'机构名称',enabled:'是否可用',industryCategory:'行业分类',cuserid:'创建人编号-可以转让,创建人与机构管理员有同样的权限',cdate:'创建日期',cusername:'创建人姓名-可以转让',lphoneNo:'联系电话',emaill:'邮件',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态',pbranchId:'上级机构',admUserid:'管理员编号（==机构编号，不允许修改，即机构主账户）',admUsername:'管理员名称（==机构名称+'管理员'，不允许修改）',lusername:'联系人姓名',luserid:'联系人编号',address:'公司地址'} **/ //普通查询 条件之间and关系 export const listBranch = params => { return axios.get(`${base}/mdp/sys/branch/list`, { params: params }); }; -//模糊查询管理端机构表（机构下面若干部门） 条件之间or关系 -//export const listBranchKey = params => { return axios.get(`${base}/mdp/sys/branch/listKey`, { params: params }); }; - //删除一条管理端机构表（机构下面若干部门） params={id:'机构编号 主键'} export const delBranch = params => { return axios.post(`${base}/mdp/sys/branch/del`,params); }; @@ -26,4 +25,21 @@ 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 addBranch = params => { return axios.post(`${base}/mdp/sys/branch/add`, params); }; + +//批量修改某些字段 +export const editSomeFieldsBranch = params => { return axios.post(`${base}/mdp/sys/branch/editSomeFields`, params); }; + + + +/**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */ +//初始化页面上的字典 +export const initDicts = (that) => { + var itemCodes=['industryCategory'];//在此添加要加载的字典 如['sex','grade','lvl'] + that.dicts['enabled']=[{id:"0",name:'停用'},{id:"1",name:'启用'}]; + if(itemCodes.length>0){ + initSimpleDicts('all',itemCodes).then(res=>{ + Object.assign(that.dicts,res.data.data) + }); + } +}; \ No newline at end of file diff --git a/src/views/myWork/set/index.vue b/src/views/myWork/set/index.vue index e7372c52..70a05250 100644 --- a/src/views/myWork/set/index.vue +++ b/src/views/myWork/set/index.vue @@ -10,7 +10,7 @@ 个人账户 企业管理员账户 企业员工账户 - {{editForm.branchName}} + {{editForm.branchName}} 升级为企业账户 所在部门：{{userInfo.deptName}} @@ -269,7 +269,8 @@ import md5 from "js-md5"; }, registerEmail(){ if(this.editForm.email){ - sendEmail({codeScene:'1',codeEmail:this.editForm.email,userType:'staff',callbackUri:'http://localhost:8015/#/updateUserInfo'}).then(res=>{ + var curlDomain=window.location.protocol+"//"+window.location.host+"/"+process.env.CONTEXT+"/"+process.env.VERSION; + sendEmail({codeScene:'1',codeEmail:this.editForm.email,userType:'staff',callbackUri:curlDomain+'/#/myWork/set/index'}).then(res=>{ var tips = res.data.tips; if(tips.isOk){ this.$message({ message: "邮件已发送，请到收件箱收取邮件，并点击其链接进行自动验证。", type: 'success' }); From 0e6757a96b9cbc669510f5d1ea14b36bcb46b830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 2 May 2022 04:05:28 +0800 Subject: [PATCH 15/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/myWork/set/index.vue | 2 +- src/views/myWork/userLoginRecord/index.vue | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/myWork/set/index.vue b/src/views/myWork/set/index.vue index 70a05250..dc7eda80 100644 --- a/src/views/myWork/set/index.vue +++ b/src/views/myWork/set/index.vue @@ -119,8 +119,8 @@ import { sendEmail,validEmailCode } from '@/api/login'; import SingleShearUpload from "@/components/Image/Single/Index"; import VueQr from 'vue-qr' import BranchAdd from "@/views/mdp/sys/branch/BranchEdit"; - import md5 from "js-md5"; + export default { computed: { ...mapGetters([ diff --git a/src/views/myWork/userLoginRecord/index.vue b/src/views/myWork/userLoginRecord/index.vue index 9a45cfdd..6b875788 100644 --- a/src/views/myWork/userLoginRecord/index.vue +++ b/src/views/myWork/userLoginRecord/index.vue @@ -194,8 +194,8 @@ pageSize:10,//每页数据 count:false,//是否需要重新计算总记录数 pageNum:1,//当前页码、从1开始计算 - orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段 - orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc'] + orderFields:['login_time'],//排序列 如 ['sex','student_id']，必须为数据库字段 + orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc'] }, load:{ list: false, edit: false, del: false, add: false },//查询中... sels: [],//列表选中数据 @@ -266,6 +266,7 @@ if(this.filters.key){ params.key=this.filters.key } + params.userid=this.userInfo.userid; this.load.list = true; listUserLoginRecord(params).then((res) => { From de9fbbbc06a57b991b6b669522c5ae6ec4f87ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 2 May 2022 04:15:21 +0800 Subject: [PATCH 16/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/routes_my_work.js | 1 + src/views/myWork/set/index.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/router/routes_my_work.js b/src/router/routes_my_work.js index 04b17c68..f67f4c78 100644 --- a/src/router/routes_my_work.js +++ b/src/router/routes_my_work.js @@ -7,6 +7,7 @@ export default { { path: '/changeEmailStepOne', component: _import('myWork/set/ChangeEmailStepOne'), hidden: true }, { path: '/changeEmailStepTwo', component: _import('myWork/set/ChangeEmailStepTwo'), hidden: true }, + { path: '/updateUserInfo', component: _import('myWork/set/index'), hidden: true }, { path: '/my/work', component: Layout, diff --git a/src/views/myWork/set/index.vue b/src/views/myWork/set/index.vue index dc7eda80..5586009f 100644 --- a/src/views/myWork/set/index.vue +++ b/src/views/myWork/set/index.vue @@ -270,7 +270,7 @@ import md5 from "js-md5"; registerEmail(){ if(this.editForm.email){ var curlDomain=window.location.protocol+"//"+window.location.host+"/"+process.env.CONTEXT+"/"+process.env.VERSION; - sendEmail({codeScene:'1',codeEmail:this.editForm.email,userType:'staff',callbackUri:curlDomain+'/#/myWork/set/index'}).then(res=>{ + sendEmail({codeScene:'1',codeEmail:this.editForm.email,userType:'staff',callbackUri:curlDomain+'/#/updateUserInfo'}).then(res=>{ var tips = res.data.tips; if(tips.isOk){ this.$message({ message: "邮件已发送，请到收件箱收取邮件，并点击其链接进行自动验证。", type: 'success' }); From 4b1ae732664dc53bcefe25ee0b0690a02e2b21c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 2 May 2022 05:47:18 +0800 Subject: [PATCH 17/27] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.js | 13 +- src/views/myWork/set/UpdateUserInfo.vue | 327 ------------------------ src/views/myWork/set/index.vue | 68 ++++- 3 files changed, 79 insertions(+), 329 deletions(-) delete mode 100644 src/views/myWork/set/UpdateUserInfo.vue diff --git a/src/api/login.js b/src/api/login.js index da260998..6c9dfca9 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -156,4 +156,15 @@ export function getTpaState( ) { method: 'post', data:{} }) -} \ No newline at end of file +} +/** + * 获取查询当前登录账户的所有关联账户 + * @returns + */ + export function queryMyUsers( ) { + return axios({ + url: base+'/user/queryMyUsers', + method: 'get' + }) +} + diff --git a/src/views/myWork/set/UpdateUserInfo.vue b/src/views/myWork/set/UpdateUserInfo.vue deleted file mode 100644 index a0fcece0..00000000 --- a/src/views/myWork/set/UpdateUserInfo.vue +++ /dev/null @@ -1,327 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/myWork/set/index.vue b/src/views/myWork/set/index.vue index 5586009f..717a139b 100644 --- a/src/views/myWork/set/index.vue +++ b/src/views/myWork/set/index.vue @@ -12,6 +12,7 @@ 企业员工账户 {{editForm.branchName}} 升级为企业账户 + 切换账户 所在部门：{{userInfo.deptName}} 修改头像 @@ -109,13 +110,33 @@ @submit="afterAddSubmit" > + + + + + + + + + + + + + + +
- - + + -.login-container { - position:absolute; - height: 100%; - width: 100%; - background-color: $bg; - background-size: 100%; - background:url(../../assets/image/yxin_login_backgroup_pc.png) center center; - .login-form { - position: absolute; - left: 0; - right: 0; - max-width: 520px; - padding: 35px 35px 15px 35px; - margin: 180px auto; - border-radius: 20px; - background-color:#f5f7faee; - } - .tips { - font-size: 14px; - color: #fff; - margin-bottom: 10px; - span { - &:first-of-type { - margin-right: 16px; - } - } - } - .svg-container { - padding: 6px 5px 6px 15px; - color: $dark_gray; - vertical-align: middle; - width: 30px; - display: inline-block; - &_login { - font-size: 20px; - } - } - .title-container { - position: relative; - .title { - font-size: 26px; - font-weight: 400; - color: $light_gray; - margin: 0px auto 40px auto; - text-align: center; - font-weight: bold; - } - .set-language { - color: rgb(95, 41, 221); - position: absolute; - top: 5px; - right: 0px; - } - } - .show-pwd { - position: absolute; - right: 10px; - top: 7px; - font-size: 16px; - color: $dark_gray; - cursor: pointer; - user-select: none; - } - .thirdparty-button { - position: absolute; - right: 35px; - bottom: 28px; - } - .register-button { - position: absolute; - bottom: 28px; - } -} -.logo { - height: 100px; - width: 100%; - // padding: 0 20px; - display: flex; - align-items: left; - justify-content: center; - img { - height: 100%; - } - .logo-text { - display: flex; - align-items: center; - justify-content: center; - color: $light_gray; - .main-title { - font-size: 35px; - font-weight: 400; - color: $light_gray; - text-align: center; - font-weight: bold; - } - } -} - \ No newline at end of file diff --git a/src/views/login/index2.vue b/src/views/login/index2.vue deleted file mode 100644 index 0fc0a62b..00000000 --- a/src/views/login/index2.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - diff --git a/src/views/login/register.vue b/src/views/login/register.vue deleted file mode 100644 index fb879e04..00000000 --- a/src/views/login/register.vue +++ /dev/null @@ -1,378 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/views/xm/XmOverview.vue b/src/views/xm/XmOverview.vue index 6776fd97..c714272d 100644 --- a/src/views/xm/XmOverview.vue +++ b/src/views/xm/XmOverview.vue @@ -1,355 +1,154 @@ - - \ No newline at end of file diff --git a/src/views/xm/XmOverview2.vue b/src/views/xm/XmOverview2.vue deleted file mode 100644 index c714272d..00000000 --- a/src/views/xm/XmOverview2.vue +++ /dev/null @@ -1,1163 +0,0 @@ - - - - - From 274409a0c73f093a13027a9e155bbdf01a91228e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 4 May 2022 20:48:16 +0800 Subject: [PATCH 23/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/myWork/set/index.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/myWork/set/index.vue b/src/views/myWork/set/index.vue index 891a74ac..1fbf4f84 100644 --- a/src/views/myWork/set/index.vue +++ b/src/views/myWork/set/index.vue @@ -27,7 +27,12 @@ - + + + + 绑定手机 + 更换手机 + 绑定邮箱 From 88d642bd7426349c879768a16f49da228ce693a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 4 May 2022 22:54:33 +0800 Subject: [PATCH 24/27] =?UTF-8?q?=E4=BC=98=E5=8C=96bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xm/core/components/XmProjectSelect.vue | 6 +- src/views/xm/core/xmGroup/XmGroupMng.vue | 80 +++++-------------- src/views/xm/core/xmMenu/XmMenuMngBatch.vue | 6 +- src/views/xm/core/xmMenu/XmMenuWithPlan.vue | 12 +-- src/views/xm/core/xmProduct/XmProductMng.vue | 12 +-- .../xm/core/xmProduct/XmProductTplMng.vue | 6 +- .../xm/core/xmQuestion/XmQuestionAdd.vue | 7 +- 7 files changed, 34 insertions(+), 95 deletions(-) diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue index b083e1fd..eae4de7a 100644 --- a/src/views/xm/core/components/XmProjectSelect.vue +++ b/src/views/xm/core/components/XmProjectSelect.vue @@ -241,11 +241,11 @@ rowClick: function(row, event, column){ this.editForm=row this.$emit('row-click',row, event, column);// @row-click="rowClick" - this.selectedProduct(row) + this.selectedProject(row) this.projectVisible=false; this.moreVisible=false; }, - selectedProduct:function(row){ + selectedProject:function(row){ this.editForm=row this.$emit('selected',row); this.projectVisible=false; @@ -283,7 +283,7 @@ clearSelect(){ this.$refs.table.setCurrentRow(); this.$emit("clear"); - this.selectedProduct(null); + this.selectedProject(null); this.projectVisible=false; this.moreVisible=false; }, diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue index 5fa13710..e91d7832 100644 --- a/src/views/xm/core/xmGroup/XmGroupMng.vue +++ b/src/views/xm/core/xmGroup/XmGroupMng.vue @@ -1,7 +1,7 @@