diff --git a/src/api/caseManagement/caseManagement.js b/src/api/caseManagement/caseManagement.js index abb0f0e..4a4aae8 100644 --- a/src/api/caseManagement/caseManagement.js +++ b/src/api/caseManagement/caseManagement.js @@ -245,4 +245,4 @@ export function getIdType() { url: '/system/dict/data/type/id_type', method: 'get', }) -} +} \ No newline at end of file diff --git a/src/api/deliveryRecord/deliveryRecord.js b/src/api/deliveryRecord/deliveryRecord.js index 9e3b5cb..a7299e7 100644 --- a/src/api/deliveryRecord/deliveryRecord.js +++ b/src/api/deliveryRecord/deliveryRecord.js @@ -25,4 +25,36 @@ export function updateSendContent(data) { method: 'post', data: data, }) +} +// 分页查询短信 +export function recordList(data) { + return request({ + url: '/shortMessage/recordList', + method: 'get', + params: data + }) +} +// 重新发送短信 +export function reSendShortMessage(data) { + return request({ + url: 'shortMessage/reSendShortMessage', + method: 'post', + data: data, + }) +} +// 重新发送邮件 +export function reSendMailRecord(data) { + return request({ + url: 'sendMailRecord/reSendMailRecord', + method: 'post', + data: data, + }) +} +// 更新邮件发送记录 +export function update(data) { + return request({ + url: 'sendMailRecord/update', + method: 'post', + data: data, + }) } \ No newline at end of file diff --git a/src/api/login.js b/src/api/login.js index d7c1700..2651bc8 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -65,6 +65,14 @@ export function sendCode(data) { params:data }) } +// 获取邮箱验证码 +export function sendEmailCode(data) { + return request({ + url: '/weChatUser/sendEmailCode', + method: 'get', + params:data + }) +} // 注册方法 export function wxregister(data) { return request({ diff --git a/src/main.js b/src/main.js index 5d51bfd..716f7e5 100644 --- a/src/main.js +++ b/src/main.js @@ -4,7 +4,7 @@ import Cookies from 'js-cookie' import Element from 'element-ui' import './assets/styles/element-variables.scss' - +import './assets/icons' // icon import '@/assets/styles/index.scss' // global css import '@/assets/styles/ruoyi.scss' // ruoyi css import App from './App' diff --git a/src/utils/permission.js b/src/utils/permission.js index 603426a..25299ca 100644 --- a/src/utils/permission.js +++ b/src/utils/permission.js @@ -47,4 +47,23 @@ export function checkRole(value) { console.error(`need roles! Like checkRole="['admin','editor']"`) return false } +} + +/** + * 状态权限校验 + * @param {Number} value 校验值 + * @returns {Boolean} + */ +export function statusRole(value) { + let caseStatusStr = sessionStorage.getItem('caseStatus'); + let caseStatus = []; + caseStatus = JSON.parse(caseStatusStr); + if (caseStatus.length == 0) { + return false + } + if (caseStatus.includes(value)) { + return true + } else { + return false + } } \ No newline at end of file diff --git a/src/views/caseManagement/components/addCase.vue b/src/views/caseManagement/components/addCase.vue index 081d6ea..3906589 100644 --- a/src/views/caseManagement/components/addCase.vue +++ b/src/views/caseManagement/components/addCase.vue @@ -104,15 +104,15 @@ - + + 新增申请人信息 @@ -124,8 +124,16 @@ - - + + + 自然人 + 机构 + + + + + - + - + + + + - + - - + + + + + + + + + 男 + 女 + + + + + - - + - + - - - + - - + + - - + - - + + @@ -337,8 +366,8 @@ - - + - - + - + 删除 - + 新增被申请人信息 @@ -383,8 +412,16 @@ - - + + + 自然人 + 机构 + + + + + - - + - + - + @@ -414,8 +451,39 @@ - - + + + + + + + + + + + + + + + + + + + - - + - - + + + + + + - - + - + - + - - + + - - + - + - - + + - - + - + + - - + - - + - + 删除 @@ -700,7 +779,8 @@ export default { nationality: 1, birth: "", sex: "1", - operatorFlag: 1 + operatorFlag: 1, + organizeFlag: 0, }, applicantAgent: { roleType: 2, @@ -716,7 +796,8 @@ export default { nationality: 1, birth: "", sex: "1", - operatorFlag: 1 + operatorFlag: 1, + organizeFlag: 0, }, }, ], @@ -736,7 +817,8 @@ export default { nationality: 1, birth: "", sex: "0", - operatorFlag: 1 + operatorFlag: 1, + organizeFlag: 0, }, resAgent: { roleType: 4, @@ -752,7 +834,8 @@ export default { nationality: 1, birth: "", sex: "", - operatorFlag: 1 + operatorFlag: 1, + organizeFlag: 0, } } ] @@ -854,7 +937,8 @@ export default { nationality: 1, birth: "", sex: "1", - operatorFlag: 1 + operatorFlag: 1, + organizeFlag: 0, }, applicantAgent: { roleType: 2, @@ -870,7 +954,8 @@ export default { nationality: 1, birth: "", sex: "1", - operatorFlag: 1 + operatorFlag: 1, + organizeFlag: 0, } }, ], @@ -890,7 +975,8 @@ export default { nationality: 1, birth: "", sex: "0", - operatorFlag: 1 + operatorFlag: 1, + organizeFlag: 0, }, resAgent: { roleType: 4, @@ -906,7 +992,8 @@ export default { nationality: 1, birth: "", sex: "", - operatorFlag: 1 + operatorFlag: 1, + organizeFlag: 0, } } ] @@ -920,6 +1007,8 @@ export default { this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber); this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType); this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality); + this.$set(this.formData.affiliate.applicant[0].applicant, "sex", this.getUserInfoList.sex); + this.$set(this.formData.affiliate.applicant[0].applicant, "birth", this.getUserInfoList.birth); } this.activeName = "first"; this.showmediate = false; @@ -953,12 +1042,15 @@ export default { getUserInfoFn() { getUserInfo().then(res => { this.getUserInfoList = res.data; + console.log(this.getUserInfoList.sex) this.$set(this.formData.affiliate.applicant[0].applicant, "name", this.getUserInfoList.nickName); this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard); this.$set(this.formData.affiliate.applicant[0].applicant, "email", this.getUserInfoList.email); this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber); this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType); this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality); + this.$set(this.formData.affiliate.applicant[0].applicant, "sex", this.getUserInfoList.sex); + this.$set(this.formData.affiliate.applicant[0].applicant, "birth", this.getUserInfoList.birth); }) }, /** 根据案件id获取对应信息 */ @@ -1072,14 +1164,40 @@ export default { }, successZip(res) { this.formZipData = res.data; - this.$set(this.formData, 'organizeFlag', 0); - this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims); - this.$set(this.formData, 'facts', this.formZipData.facts); - this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData.affiliate.applicant[0].applicant.home); - this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.formZipData.affiliate.applicant[0].applicant.address); - this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone); - this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name); - this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email); + if (this.formData.affiliate.applicant[0].applicant.organizeFlag == 0) { + this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims); + this.$set(this.formData, 'facts', this.formZipData.facts); + this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData.affiliate.applicant[0].applicant.home); + this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.formZipData.affiliate.applicant[0].applicant.address); + this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone); + this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name); + this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email); + this.$set(this.formData.affiliate.applicant[0].applicant, 'sex', this.formZipData.affiliate.applicant[0].applicant.sex); + this.$set(this.formData.affiliate.applicant[0].applicant, 'birth', this.formZipData.affiliate.applicant[0].applicant.birth); + } else if (this.formData.affiliate.applicant[0].applicant.organizeFlag == 1) { + this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims); + this.$set(this.formData, 'facts', this.formZipData.facts); + this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData + .affiliate.applicant[0] + .applicant.name); + this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData + .affiliate.applicant[0].applicant.code); + this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData + .affiliate.applicant[0] + .applicant.home); + this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this + .formZipData.affiliate.applicant[0] + .applicant.address); + this.$set(this.formData.affiliate.applicant[0].applicant, 'compLegalPerson', this + .formZipData.affiliate.applicant[0] + .applicant.compLegalPerson); + this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData + .affiliate.applicant[0] + .applicant.email); + this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData + .affiliate.applicant[0] + .applicant.phone); + } this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name); this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone); this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard); @@ -1109,27 +1227,25 @@ export default { }); }, clearValidate(val) { + console.log(val) if (val == 0) { this.$set(this.formData.affiliate.applicant[0].applicant, "name", this.getUserInfoList.nickName); this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard); this.$set(this.formData.affiliate.applicant[0].applicant, "email", this.getUserInfoList.email); this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber); + this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType); + this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality); if (this.formZipData.affiliate) { - this.$set(this.formData, 'organizeFlag', 0); + this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 0); this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims); this.$set(this.formData, 'facts', this.formZipData.facts); - this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData.affiliate.applicant[0].applicant.name); - this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.formZipData.affiliate.applicant[0].applicant.address); - this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone); - this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name); - this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email); - this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name); - this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone); - this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard); - this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex)); - this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth); - this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home); - this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email); + this.$set(this.formData.affiliate.applicant[0].applicant, "name", this.getUserInfoList.nickName); + this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard); + this.$set(this.formData.affiliate.applicant[0].applicant, "email", this.getUserInfoList.email); + this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber); + this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType); + this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality); + } else { this.formData.affiliate.applicant[0].applicantAgent.name = null; this.formData.affiliate.applicant[0].applicantAgent.email = null; @@ -1140,20 +1256,29 @@ export default { this.$set(this.formData.affiliate.applicant[0].applicantAgent, "email", this.getUserInfoList.email); this.$set(this.formData.affiliate.applicant[0].applicantAgent, "phone", this.getUserInfoList.phonenumber); if (this.formZipData.affiliate) { - this.$set(this.formData, 'organizeFlag', 1); + this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 1); this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims); this.$set(this.formData, 'facts', this.formZipData.facts); - this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData.affiliate.applicant[0].applicant.name); - this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData.affiliate.applicant[0].applicant.code); - this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData.affiliate.applicant[0].applicant.email); - this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData.affiliate.applicant[0].applicant.phone); - this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name); - this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone); - this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard); - this.$set(this.formData.affiliate.res[0].res, 'sex', this.formZipData.affiliate.res[0].res.sex); - this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth); - this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home); - this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email); + this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData + .affiliate.applicant[0] + .applicant.name); + this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData + .affiliate.applicant[0].applicant.code); + this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData + .affiliate.applicant[0] + .applicant.home); + this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this + .formZipData.affiliate.applicant[0] + .applicant.address); + this.$set(this.formData.affiliate.applicant[0].applicant, 'compLegalPerson', this + .formZipData.affiliate.applicant[0] + .applicant.compLegalPerson); + this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData + .affiliate.applicant[0] + .applicant.email); + this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData + .affiliate.applicant[0] + .applicant.phone); } else { this.$set(this.formData.affiliate.applicant[0].applicant, 'name', null); this.$set(this.formData.affiliate.applicant[0].applicant, 'idCard', null); @@ -1163,6 +1288,33 @@ export default { } this.$refs["ruleForm"].clearValidate() }, + clearValidateRes(val) { + if (val == 0) { + if (this.formZipData.affiliate) { + this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0); + this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name); + this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone); + this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard); + this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex)); + this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth); + this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home); + this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email); + } + } else if (val == 1) { + if (this.formZipData.affiliate) { + this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 1); + this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name); + this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone); + this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard); + this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex)); + this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth); + this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home); + this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email); + } + } + console.log(val) + this.$refs["ruleForm"].clearValidate() + }, cancel() { this.$emit("cancelCaseAdd"); }, @@ -1180,6 +1332,18 @@ export default { this.formData.affiliate.res[index].res.birth = res.respondentBirth; }); }, + // 申请人身份证 + handleBlurApplicant(index) { + console.log(index) + let idCards = { + idCard: this.formData.affiliate.applicant[index].applicant.idCard, + }; + getInfoByIdCard(idCards).then((res) => { + this.formData.affiliate.applicant[index].applicant.sex = res.respondentSex; + // console.log(res.respondentBirth); + this.formData.affiliate.applicant[index].applicant.birth = res.respondentBirth; + }); + }, /**删除新增信息某一项 */ deleteDetali(item) { var index = this.formData.affiliate.indexOf(item) @@ -1204,7 +1368,8 @@ export default { nationality: 1, birth: "", sex: "1", - operatorFlag: 1 + operatorFlag: 1, + organizeFlag: 0, }, applicantAgent: { roleType: 2, @@ -1220,7 +1385,8 @@ export default { nationality: 1, birth: "", sex: "1", - operatorFlag: 1 + operatorFlag: 1, + organizeFlag: 0, }, },); }, @@ -1241,7 +1407,8 @@ export default { nationality: 1, birth: "", sex: "1", - operatorFlag: 1 + operatorFlag: 1, + organizeFlag: 0, }, resAgent: { roleType: 4, @@ -1257,7 +1424,8 @@ export default { nationality: 1, birth: "", sex: "1", - operatorFlag: 1 + operatorFlag: 1, + organizeFlag: 0, }, },); }, diff --git a/src/views/caseManagement/components/mediation.vue b/src/views/caseManagement/components/mediation.vue index bafe207..4d2c028 100644 --- a/src/views/caseManagement/components/mediation.vue +++ b/src/views/caseManagement/components/mediation.vue @@ -57,7 +57,7 @@ - + 是 否 @@ -156,7 +156,8 @@ export default { // isReconci:0, formData: { affiliate: {}, - mediaResult:1 + mediaResult:1, + sealFlag:1, }, user: "", userId: null, @@ -177,7 +178,8 @@ export default { }, watch: { mediationVisable(val) { - this.formData.mediaResult = 1 + this.formData.mediaResult = 1; + this.formData.sealFlag = 1; this.recordArr = []; this.recordArrMediate = []; if (this.mediationData.mediationMethod == "1") { @@ -238,8 +240,12 @@ export default { this.formData = res.data; this.formData.mediaResult = 1; } - - console.log(this.formData) + if(res.data.sealFlag==1||res.data.sealFlag==0){ + this.formData = res.data; + }else{ + this.formData = res.data; + this.formData.sealFlag = 1; + } this.applicateArr = res.data.caseAttachList; res.data.caseAttachList.forEach(item => { if (item.annexType == 6) { @@ -282,6 +288,7 @@ export default { caseFlowId: this.mediationData.caseFlowId, batchNumber: "", mediaResult: this.formData.mediaResult, + sealFlag:this.formData.sealFlag }).then(res => { caseApplicationSelectById({ id: this.mediationData.id diff --git a/src/views/deliveryRecord/components/emailEdits.vue b/src/views/deliveryRecord/components/emailEdits.vue new file mode 100644 index 0000000..ec26b13 --- /dev/null +++ b/src/views/deliveryRecord/components/emailEdits.vue @@ -0,0 +1,57 @@ + + + + + \ No newline at end of file diff --git a/src/views/deliveryRecord/components/resend.vue b/src/views/deliveryRecord/components/resend.vue index 9262c62..6c3f6c4 100644 --- a/src/views/deliveryRecord/components/resend.vue +++ b/src/views/deliveryRecord/components/resend.vue @@ -2,10 +2,12 @@
-
- - -
+
发送内容:{{ sendData }}
+ + + + +
取 消 确 认 @@ -22,7 +24,10 @@ export default { props: ["resendVidable", "rowData","queryParams"], data() { return { - sendData:'' + sendData:'', + param:"", + paramValue:"" + }; }, watch: { @@ -37,9 +42,10 @@ export default { this.$emit("cancelSend"); }, submitSend() { + console.log(this.rowData) this.updateSendContentFn({ id:this.rowData.id, - sendContent:this.sendData + templateParams:this.rowData.templateParams }) }, updateSendContentFn(data){ @@ -48,6 +54,13 @@ export default { this.$emit("cancelSend"); this.$emit('getList',this.queryParams); }) + }, + changeContent(){ + let templateContent = this.rowData.templateContent + this.rowData.templateParams.forEach(item => { + templateContent = templateContent.replace(item.param,item.paramValue) + }); + this.sendData = templateContent } }, }; diff --git a/src/views/deliveryRecord/emailRecord.vue b/src/views/deliveryRecord/emailRecord.vue index 90f858b..12e4631 100644 --- a/src/views/deliveryRecord/emailRecord.vue +++ b/src/views/deliveryRecord/emailRecord.vue @@ -27,7 +27,14 @@ + + + + @@ -36,14 +43,14 @@ diff --git a/src/views/deliveryRecord/smsRecord.vue b/src/views/deliveryRecord/smsRecord.vue index ec3fbae..715cf63 100644 --- a/src/views/deliveryRecord/smsRecord.vue +++ b/src/views/deliveryRecord/smsRecord.vue @@ -23,11 +23,13 @@ + @@ -41,7 +43,7 @@ diff --git a/src/views/register.vue b/src/views/register.vue index 23dc9c7..091979f 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -1,5 +1,9 @@ @@ -304,9 +344,25 @@ export default { display: flex; justify-content: center; align-items: center; - //height: 100%; - background-image: url("../assets/images/login-background.jpg"); + // height: 100%; + // background-image: url("../assets/images/login-background.jpg"); + background-image: url("../assets/images/login.svg"); background-size: cover; + .leftIcon { + position: relative; + width: 200px; + height: 155px; + top:-300px; + left: -300px; + + .Icon { + width: 100px; + height: 105px; + background-image: url("../assets/images/logos.png"); + background-size: cover; + } + } + } .title { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index c55e903..25fcfec 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -189,6 +189,13 @@ + + + + + + + diff --git a/vue.config.js b/vue.config.js index dfb7aa2..c4fc8c2 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,10 +12,10 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口 // const API = 'http://121.40.189.20:7001' //生产 -const API = 'http://121.40.189.20:6001' //测试 +// const API = 'http://121.40.189.20:6001' //测试 // const API = 'http://192.168.3.18:6001' //B // const API = 'http://172.16.0.237:6001' //Q -// const API = 'http://172.16.1.26:6001' //w +const API = 'http://172.16.1.26:6001' //w // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions