Commit d9e83ddf authored by zhangderong's avatar zhangderong

20190819修改代理

parent ddf2d0c1
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<h3>登录</h3> <h3>登录</h3>
</div> </div>
<div class="login_content"> <div class="login_content">
<Form ref="formInline" :model="formInline" :rules="ruleInline" style="height:120px;width:92%"> <Form ref="formInline" :model="formInline" :rules="ruleInline" style="height:120px">
<FormItem prop="user"> <FormItem prop="user">
<Input type="text" v-model="formInline.user" placeholder="请输入11位默认手机号" class="wordStyle" > <Input type="text" v-model="formInline.user" placeholder="请输入11位默认手机号" class="wordStyle" >
<Icon type="ios-person-outline" slot="prepend"></Icon> <Icon type="ios-person-outline" slot="prepend"></Icon>
......
...@@ -69,6 +69,26 @@ export default { ...@@ -69,6 +69,26 @@ export default {
password:this.formInline.password, password:this.formInline.password,
confirmPassWord:this.formInline.passwordTwo confirmPassWord:this.formInline.passwordTwo
} }
// if(this.formInline.password==123456){
// console.log(4444444)
// this.$Notice.error({
// title: '提示',
// desc: '请您填写正确的手机号',
// });
// this.twocontentmessage='输入密码与初始密码相同,请重新输入'
// setInterval(() => {
// this.twocontent=false
// }, 3000)
// return
// }
// if(this.formInline.passwordTwo==123456){
// console.log(4444444)
// this.twocontentmessage='输入密码与初始密码相同,请重新输入'
// setInterval(() => {
// this.twocontent=false
// }, 3000)
// return
// }
if(this.formInline.passwordTwo!==this.formInline.password){ if(this.formInline.passwordTwo!==this.formInline.password){
this.twocontentmessage='输入密码不一致,请重新输入' this.twocontentmessage='输入密码不一致,请重新输入'
this.twocontent=true this.twocontent=true
...@@ -76,6 +96,13 @@ export default { ...@@ -76,6 +96,13 @@ export default {
this.twocontent=false this.twocontent=false
}, 3000) }, 3000)
return return
}else{
if(this.formInline.password==123456||this.formInline.passwordTwo==123456){
console.log(636467)
this.twocontentmessage='输入密码与初始密码相同,请重新输入'
console.log(this.twocontentmessage)
return
}
} }
if(this.formInline.password.length>20){ if(this.formInline.password.length>20){
this.twocontentmessage='请输入4-20位密码' this.twocontentmessage='请输入4-20位密码'
...@@ -117,6 +144,12 @@ export default { ...@@ -117,6 +144,12 @@ export default {
}) })
}, },
verification(){ verification(){
if(this.formInline.password==123456){
this.twocontentmessage='输入密码与初始密码相同,请重新输入'
setInterval(() => {
this.twocontent=false
}, 3000)
}
if(this.formInline.password.length==0){ if(this.formInline.password.length==0){
this.fistcontent=true this.fistcontent=true
......
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
</p> </p>
<p style="border-bottom:1px solid black;line-height:30px" > <p style="border-bottom:1px solid black;line-height:30px" >
<input type='checkbox' class='input-checkbox' v-model='checked' v-on:click='checkedAll' style="margin-left:25px" v-show="idAdmin==true"> <input type='checkbox' class='input-checkbox' v-model='checked' v-on:click='checkedAll' style="margin-left:25px" v-show="this.idAdmin=='true'">
<span style="margin-left:15px;cursor:pointer" v-show="idAdmin==true">全选</span> <span style="margin-left:10px;cursor:pointer" v-show="this.idAdmin=='true'" >全选</span>
<span style="margin-left:40px;color:#2d8cf0" @click="UntyingAll" v-show="idAdmin==true">解绑</span> <span style="margin-left:40px;color:#2d8cf0" @click="UntyingAll" v-show="this.idAdmin=='true'">解绑</span>
</p> </p>
<!-- <Spin size="large" fix v-if="spinShow" style="font-size:25px" v-show="idAdmin==true">加载中...</Spin> --> <!-- <Spin size="large" fix v-if="spinShow" style="font-size:25px" v-show="idAdmin==true">加载中...</Spin> -->
<div v-for='item in ajaxData' :key="item.id" class="emailList"> <div v-for='item in ajaxData' :key="item.id" class="emailList">
...@@ -43,9 +43,6 @@ ...@@ -43,9 +43,6 @@
<span style="margin-left:10px">新建时间 | {{item.createTime}}</span> <span style="margin-left:10px">新建时间 | {{item.createTime}}</span>
<span style="margin-left:35px;color:#2d8cf0;cursor:pointer" @click="UpdateEMAIL(item.emailName,item.belongs,item.id)">修改</span> <span style="margin-left:35px;color:#2d8cf0;cursor:pointer" @click="UpdateEMAIL(item.emailName,item.belongs,item.id)">修改</span>
<span style="margin-left:35px;color:#2d8cf0;cursor:pointer" @click="UnbindingModal(item.id)">解绑</span> <span style="margin-left:35px;color:#2d8cf0;cursor:pointer" @click="UnbindingModal(item.id)">解绑</span>
<!-- <span style="margin-left:150px" v-if="item.c=='正常'" >{{item.syncMailMsg}}</span>
<span style="margin-left:150px;color:red" v-if="item.c=='系统'" >{{item.syncMailMsg}}</span> -->
<!-- <span style="margin-left:150px" >{{item.syncMailMsg}}</span> -->
<span style="margin-left:150px" v-if="item.c=='正常'" >{{item.syncMailMsg}}</span> <span style="margin-left:150px" v-if="item.c=='正常'" >{{item.syncMailMsg}}</span>
<span style="margin-left:150px;color:red" v-if="item.c=='系统'" >{{item.syncMailMsg}}</span> <span style="margin-left:150px;color:red" v-if="item.c=='系统'" >{{item.syncMailMsg}}</span>
</div> </div>
...@@ -253,6 +250,9 @@ export default { ...@@ -253,6 +250,9 @@ export default {
} }
queryemailList(parmars).then(res=>{ queryemailList(parmars).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
let condition=localStorage.getItem('isADMIN')
this.idAdmin=condition
console.log(this.idAdmin)
this.spinShow=false this.spinShow=false
this.totalSize=res.data.body.totalNumber this.totalSize=res.data.body.totalNumber
this.ajaxData=res.data.body.items.map((item,index)=>{ this.ajaxData=res.data.body.items.map((item,index)=>{
...@@ -308,7 +308,13 @@ export default { ...@@ -308,7 +308,13 @@ export default {
this.modal4=false this.modal4=false
this.SearchList() this.SearchList()
}else{ }else{
this.modal4=false this.$Notice.error({
title: '提示',
desc: '你填写的密码有误',
duration:'2'
});
this.UpassWord=''
// this.modal4=false
} }
}) })
}, },
...@@ -361,8 +367,8 @@ export default { ...@@ -361,8 +367,8 @@ export default {
}, },
mounted(){ mounted(){
let condition=localStorage.getItem('isADMIN')
this.idAdmin=condition console.log(this.idAdmin)
this.SearchList() this.SearchList()
} }
......
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
<h4 style="font-size:20px;text-align:center;margin-bottom:20px">上传文件</h4> <h4 style="font-size:20px;text-align:center;margin-bottom:20px">上传文件</h4>
<div v-for='(item,index) in dataList' class='process' :key='index'> <div v-for='(item,index) in dataList' class='process' :key='index'>
<p style='padding-top:5px;'>{{item.name}}</p> <p style='padding-top:5px;'>{{item.name}}</p>
<span class='title' style="float:right">{{item.title}}</span> <span class='title' style="float:right;" v-show="item.Code==0">{{item.title}}</span>
<span class='title' style="float:right;color:red" v-show="item.Code==1||item.Code==2">{{item.title}}</span>
<Progress :percent="item.percentage" hide-info :status='item.status'></Progress> <Progress :percent="item.percentage" hide-info :status='item.status'></Progress>
</div> </div>
</div> </div>
...@@ -35,42 +36,6 @@ ...@@ -35,42 +36,6 @@
<Button @click='closeModal' v-show="activeT==true">完成</Button> <Button @click='closeModal' v-show="activeT==true">完成</Button>
</div> </div>
</Modal> </Modal>
<!-- 单个文件不得大于2M -->
<Modal v-model='modal1' width="320" :closable='false'>
<div>
<h4 style="font-size:20px;text-align:center;margin-bottom:20px">提示</h4>
<div>
<h5 style="font-size:20px;text-align:center;margin-bottom:20px">单份文档不得大于2M</h5>
</div>
</div>
<div slot='footer'>
<Button @click='modal1=false'>确定</Button>
</div>
</Modal>
<!-- 未选择文件上传 -->
<Modal v-model='modal2' width="320" :closable='false'>
<div>
<h4 style="font-size:20px;text-align:center;margin-bottom:20px">提示</h4>
<div>
<h5 style="font-size:20px;text-align:center;margin-bottom:20px">请选择文件在上传</h5>
</div>
</div>
<div slot='footer'>
<Button @click='modal2=false'>确定</Button>
</div>
</Modal>
<!-- 批量上传文件大于20个 -->
<Modal v-model='modal3' width="320" :closable='false'>
<div>
<h4 style="font-size:20px;text-align:center;margin-bottom:20px">提示</h4>
<div>
<h5 style="font-size:20px;text-align:center;margin-bottom:20px">批量上传文件请不要大于20个</h5>
</div>
</div>
<div slot='footer'>
<Button @click='modal3=false'>确定</Button>
</div>
</Modal>
</div> </div>
<div class="leftcontrentFotter"> <div class="leftcontrentFotter">
...@@ -91,7 +56,7 @@ ...@@ -91,7 +56,7 @@
<span style="color:Grey;margin:5px 0 0 10px;display:inline-block">{{item.createTime}}入库|</span> <span style="color:Grey;margin:5px 0 0 10px;display:inline-block">{{item.createTime}}入库|</span>
<span>{{item.creator}}</span> <span>{{item.creator}}</span>
</p> </p>
<Button type='primary' style="margin:-60px 0 0 80%;width:80px" @click="delateONE(item.resumeId)">删除</Button> <Button type='primary' style="margin:-55px 0 0 82%;width:80px" @click="delateONE(item.resumeId)">删除</Button>
</div> </div>
</div> </div>
</div> </div>
...@@ -240,6 +205,7 @@ import ajax from '../../service/ajax' ...@@ -240,6 +205,7 @@ import ajax from '../../service/ajax'
activeT:false, activeT:false,
massage:'', massage:'',
Massage:'', Massage:'',
Code:'',
action: '/text/api/resume/upload', action: '/text/api/resume/upload',
batchNum: '', batchNum: '',
modal3:false, modal3:false,
...@@ -333,10 +299,12 @@ import ajax from '../../service/ajax' ...@@ -333,10 +299,12 @@ import ajax from '../../service/ajax'
}, },
onSuccess: res => { onSuccess: res => {
this.handleSuccess(res, this.files); this.handleSuccess(res, this.files);
// this.getnumber()
this.activeT=true this.activeT=true
}, },
onError: (err, response) => { onError: (err, response) => {
this.handleError(err, response, this.files); this.handleError(err, response, this.files);
// this.activeT=true
} }
}) })
}, },
...@@ -349,11 +317,13 @@ import ajax from '../../service/ajax' ...@@ -349,11 +317,13 @@ import ajax from '../../service/ajax'
let data = res.body let data = res.body
for(let key in data){ for(let key in data){
let code = data[key].code let code = data[key].code
this.Code=data[key].code
this.Massage=data[key].message this.Massage=data[key].message
this.dataList.map(item => { this.dataList.map(item => {
if (key == item.name) { if (key == item.name) {
item.title = this.Massage item.title = this.Massage
item.status = this.progressStatus[code] item.status = this.progressStatus[code]
item.Code=this.Code
} }
}) })
} }
...@@ -379,6 +349,7 @@ import ajax from '../../service/ajax' ...@@ -379,6 +349,7 @@ import ajax from '../../service/ajax'
this.$refs.input.value = '' this.$refs.input.value = ''
this.dataList = [] this.dataList = []
this.fileName = '' this.fileName = ''
this.activeT=false
this.serchlist() this.serchlist()
}, },
//下载单条简历 //下载单条简历
...@@ -500,10 +471,10 @@ import ajax from '../../service/ajax' ...@@ -500,10 +471,10 @@ import ajax from '../../service/ajax'
cursor:pointer cursor:pointer
} }
.contentMASSAGE{ .contentMASSAGE{
width:90%; width:96%;
height:70px; height:70px;
margin-top: 3%; margin-top: 3%;
margin-left: 5%; margin-left: 2%;
background: white; background: white;
border-radius: 5px border-radius: 5px
} }
......
...@@ -26,7 +26,8 @@ instance.interceptors.response.use(function (response) { ...@@ -26,7 +26,8 @@ instance.interceptors.response.use(function (response) {
if(response.status >= 200 && response.status < 300){ if(response.status >= 200 && response.status < 300){
if (response.data.body.code == '900'){ if (response.data.body.code == '900'){
this.$Message.error('您的账号已在其他地方登录,如不是您个人操作,请及时修改密码') console.log(666666666666)
Notice.error('您的账号已在其他地方登录,如不是您个人操作,请及时修改密码')
window.location.href = `${window.location.origin}/login` window.location.href = `${window.location.origin}/login`
} }
if(response.data.success){ if(response.data.success){
......
...@@ -3,9 +3,7 @@ export default{ ...@@ -3,9 +3,7 @@ export default{
init: function (router) { init: function (router) {
router.beforeEach((to, form, next) => { router.beforeEach((to, form, next) => {
let token = Cookie.get('quantgroup_token') let token = Cookie.get('quantgroup_token')
if (!token&&to.name!=='login'&&to.name!=='text') { if (!token&&to.name!=='login'&&to.name!=='text'&&to.name!=='sweepCode') {
console.log(32322)
console.log(to.name!=='text',to.name!=='login',!token,token)
window.location.href = `${window.location.origin}/login` window.location.href = `${window.location.origin}/login`
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment