Commit 3df2b64f authored by xuezj's avatar xuezj

合并代码

parents 887db0d8 931cc5b5
<template> <template>
<Row id="home" class="home"> <Row id="home" class="home">
<Col span="3" class="aside" style="width:15%;height:100%"> <Col span="3" class="aside" style="width:17%;height:100%">
<img src="../assets/homelogo.png" alt="" style="height:60px"> <img src="../assets/homelogo.png" alt="" style="height:60px">
<Menu style="width: 100%;" ref='subMenu' :active-name="vSubName" :open-names="vName" @on-select="go"> <Menu style="width: 100%;" ref='subMenu' :active-name="vSubName" :open-names="vName" @on-select="go">
<Submenu v-for="menu in childMenu" :name="menu.name" :key="menu.name"> <Submenu v-for="menu in childMenu" :name="menu.name" :key="menu.name">
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</Submenu> </Submenu>
</Menu> </Menu>
</Col> </Col>
<Col span="21" class="content" style="width:85%"> <Col span="21" class="content" style="width:83%">
<Row class="header"> <Row class="header">
<Col span="20"> <Col span="20">
<Menu mode="horizontal" :active-name="hName" @on-select="selectMenu"> <Menu mode="horizontal" :active-name="hName" @on-select="selectMenu">
......
const sapi = "//recruit-ai3.liangkebang.net"
const sapi = "http://recruit-ai3.liangkebang.net"
export { export {
sapi sapi
} }
\ No newline at end of file
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<span style="color:red;margin-top;5px" v-show="noteconTime==true">{{notecontent}}</span> <span style="color:red;margin-top;5px" v-show="noteconTime==true">{{notecontent}}</span>
</FormItem> </FormItem>
</Form> </Form>
<Button type="primary" class="loginBtu" @click="login">登录</Button> <Button type="primary" class="loginBtu" @click.prevent="login">登录</Button>
</div> </div>
<div class="copy"> <div class="copy">
...@@ -119,14 +119,13 @@ export default { ...@@ -119,14 +119,13 @@ export default {
} }
.loginBtu{ .loginBtu{
width:440px; width:90%;
} }
.loginContent-right{ .loginContent-right{
float: left; float: left;
width: 40%; width: 40%;
height: 760px; height: 760px;
border: 1px solid rgba(241,241,241,1) border: 1px solid rgba(241,241,241,1)
/* background:rgba(241,241,241,1) */
} }
.loginContent-left img{ .loginContent-left img{
width: 100%; width: 100%;
...@@ -162,7 +161,7 @@ export default { ...@@ -162,7 +161,7 @@ export default {
margin-left: 30px margin-left: 30px
} }
.wordStyle{ .wordStyle{
width: 440px; width: 90%;
/* margin-left: 30px */ /* margin-left: 30px */
} }
</style> </style>
...@@ -420,7 +420,7 @@ import Router from 'vue-router'; ...@@ -420,7 +420,7 @@ import Router from 'vue-router';
TOSEE(parmars).then(res=>{ TOSEE(parmars).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
this.modal2=false this.modal2=false
this.SearchList() this.SearchList(this.pageT)
} }
}) })
...@@ -446,7 +446,7 @@ import Router from 'vue-router'; ...@@ -446,7 +446,7 @@ import Router from 'vue-router';
this.SearchList() this.SearchList()
} }
}) })
this.SearchList() this.SearchList(this.pageT)
} }
// 简历备选 // 简历备选
...@@ -460,7 +460,7 @@ import Router from 'vue-router'; ...@@ -460,7 +460,7 @@ import Router from 'vue-router';
this.SearchList() this.SearchList()
} }
}) })
this.SearchList() this.SearchList(this.pageT)
} }
}, },
addINTERVIEW(){ addINTERVIEW(){
...@@ -486,7 +486,7 @@ import Router from 'vue-router'; ...@@ -486,7 +486,7 @@ import Router from 'vue-router';
this.SearchList() this.SearchList()
} }
if(res.data.body.code==0){ if(res.data.body.code==0){
this.SearchList() this.SearchList(this.pageT)
} }
}) })
}, },
...@@ -513,7 +513,7 @@ import Router from 'vue-router'; ...@@ -513,7 +513,7 @@ import Router from 'vue-router';
// this.SearchList() // this.SearchList()
} }
}) })
this.SearchList() this.SearchList(this.pageT)
} }
// 简历备选 // 简历备选
...@@ -527,7 +527,7 @@ import Router from 'vue-router'; ...@@ -527,7 +527,7 @@ import Router from 'vue-router';
// this.SearchList() // this.SearchList()
} }
}) })
this.SearchList() this.SearchList(this.pageT)
} }
}, },
selectFn3(e,SID) { selectFn3(e,SID) {
...@@ -553,7 +553,7 @@ import Router from 'vue-router'; ...@@ -553,7 +553,7 @@ import Router from 'vue-router';
// this.SearchList() // this.SearchList()
} }
}) })
this.SearchList() this.SearchList(this.pageT)
} }
// 简历备选 // 简历备选
if(e.target.value==1){ if(e.target.value==1){
...@@ -566,7 +566,7 @@ import Router from 'vue-router'; ...@@ -566,7 +566,7 @@ import Router from 'vue-router';
// this.SearchList() // this.SearchList()
} }
}) })
this.SearchList() this.SearchList(this.pageT)
} }
}, },
selectFn4(e,SID) { selectFn4(e,SID) {
...@@ -592,7 +592,7 @@ import Router from 'vue-router'; ...@@ -592,7 +592,7 @@ import Router from 'vue-router';
// this.SearchList() // this.SearchList()
} }
}) })
this.SearchList() this.SearchList(this.pageT)
} }
// 简历备选 // 简历备选
if(e.target.value==3){ if(e.target.value==3){
...@@ -605,7 +605,7 @@ import Router from 'vue-router'; ...@@ -605,7 +605,7 @@ import Router from 'vue-router';
// this.SearchList() // this.SearchList()
} }
}) })
this.SearchList() this.SearchList(this.pageT)
} }
}, },
//查询简历列表 //查询简历列表
...@@ -997,7 +997,6 @@ import Router from 'vue-router'; ...@@ -997,7 +997,6 @@ import Router from 'vue-router';
//改变页码 //改变页码
pageChange(page){ pageChange(page){
this.pageT=page this.pageT=page
console.log(this.pageT)
this.SearchList(page) this.SearchList(page)
}, },
pageSizeChange(page){ pageSizeChange(page){
...@@ -1021,7 +1020,7 @@ import Router from 'vue-router'; ...@@ -1021,7 +1020,7 @@ import Router from 'vue-router';
this.SearchList(this.pageT) this.SearchList(this.pageT)
} }
}) })
this.SearchList(this.pageT)
}, },
// 鼠标滑过事件 // 鼠标滑过事件
ahove(){ ahove(){
......
...@@ -296,6 +296,7 @@ export default { ...@@ -296,6 +296,7 @@ export default {
clickIndex1: 0, clickIndex1: 0,
clickIndex2: 0, clickIndex2: 0,
clickIndex3:0, clickIndex3:0,
pageT:'',
spinShow:true, spinShow:true,
keywords:'', keywords:'',
biaoshi:'', biaoshi:'',
...@@ -464,10 +465,10 @@ export default { ...@@ -464,10 +465,10 @@ export default {
} }
PASS(parmars).then(res=>{ PASS(parmars).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
}) })
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
// 简历备选 // 简历备选
...@@ -478,10 +479,10 @@ export default { ...@@ -478,10 +479,10 @@ export default {
} }
OPTION(parmars).then(res=>{ OPTION(parmars).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
}) })
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
}, },
selectFn2(e,SID) { selectFn2(e,SID) {
...@@ -503,10 +504,10 @@ export default { ...@@ -503,10 +504,10 @@ export default {
} }
PASS(parmars).then(res=>{ PASS(parmars).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
}) })
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
// 简历备选 // 简历备选
if(e.target.value==2){ if(e.target.value==2){
...@@ -516,10 +517,10 @@ export default { ...@@ -516,10 +517,10 @@ export default {
} }
OPTION(parmars).then(res=>{ OPTION(parmars).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
}) })
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
}, },
selectFn3(e,SID) { selectFn3(e,SID) {
...@@ -540,10 +541,10 @@ export default { ...@@ -540,10 +541,10 @@ export default {
} }
PASS(parmars).then(res=>{ PASS(parmars).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
}) })
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
// 简历备选 // 简历备选
if(e.target.value==1){ if(e.target.value==1){
...@@ -553,10 +554,10 @@ export default { ...@@ -553,10 +554,10 @@ export default {
} }
OPTION(parmars).then(res=>{ OPTION(parmars).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
}) })
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
}, },
selectFn4(e,SID) { selectFn4(e,SID) {
...@@ -577,10 +578,10 @@ export default { ...@@ -577,10 +578,10 @@ export default {
} }
PASS(parmars).then(res=>{ PASS(parmars).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
}) })
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
// 简历备选 // 简历备选
if(e.target.value==3){ if(e.target.value==3){
...@@ -610,11 +611,11 @@ export default { ...@@ -610,11 +611,11 @@ export default {
addinterview(parmars).then(res=>{ addinterview(parmars).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
this.modal2=false this.modal2=false
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
if(res.data.body.code==0){ if(res.data.body.code==0){
this.modal2=false this.modal2=false
this.quxiaoxi() this.quxiaoxi(this.pageT)
} }
}) })
}, },
...@@ -838,7 +839,7 @@ export default { ...@@ -838,7 +839,7 @@ export default {
// 刷新列表 // 刷新列表
pushlist(){ pushlist(){
this.modal2=false this.modal2=false
this.quxiaoxi() this.quxiaoxi(this.pageT)
}, },
// 批量导出 // 批量导出
......
...@@ -115,6 +115,7 @@ export default { ...@@ -115,6 +115,7 @@ export default {
modal4:false, modal4:false,
checkboxList:[], checkboxList:[],
checked: false, checked: false,
pageT:'',
userName:'', userName:'',
userCode:'', userCode:'',
spinShow:true, spinShow:true,
...@@ -250,9 +251,9 @@ export default { ...@@ -250,9 +251,9 @@ export default {
Delateaccount(parmars).then(res=>{ Delateaccount(parmars).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
this.modal2=false this.modal2=false
this.SearchList() this.SearchList(this.pageT)
} }
this.SearchList() this.SearchList(this.pageT)
}) })
}, },
// 批量删除弹出框 // 批量删除弹出框
...@@ -277,7 +278,7 @@ export default { ...@@ -277,7 +278,7 @@ export default {
duration:'2' duration:'2'
}); });
this.modal3=false this.modal3=false
this.SearchList() this.SearchList(this.pageT)
} }
}) })
}, },
...@@ -304,6 +305,7 @@ export default { ...@@ -304,6 +305,7 @@ export default {
}, },
//改变页码 //改变页码
pageChange(page){ pageChange(page){
this.pageT=page
this.SearchList(page) this.SearchList(page)
}, },
pageSizeChange(page){ pageSizeChange(page){
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<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>
<div class="pageBottom" v-show="idAdmin==true"> <div class="pageBottom" v-show="this.idAdmin==true">
<Page :total="totalSize" show-elevator show-total @on-change="pageChange" @on-page-size-change="pageSizeChange" :current='pageIndex' :page-size='pageSize' style="text-align:center;margin-top:8px"></Page> <Page :total="totalSize" show-elevator show-total @on-change="pageChange" @on-page-size-change="pageSizeChange" :current='pageIndex' :page-size='pageSize' style="text-align:center;margin-top:8px"></Page>
</div> </div>
</div> </div>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
v-model="modal4" v-model="modal4"
:closable="false" :closable="false"
width='460px'> width='460px'>
<span>修改绑定邮箱</span> <span style="margin-left:180px;font-size:18px">修改绑定邮箱</span>
<div style="height:260px"> <div style="height:260px">
<Form> <Form>
<FormItem label="邮箱账号" style="margin-top:20px" prop="emailNumber"> <FormItem label="邮箱账号" style="margin-top:20px" prop="emailNumber">
...@@ -134,6 +134,7 @@ export default { ...@@ -134,6 +134,7 @@ export default {
modal4:false, modal4:false,
modal5:false, modal5:false,
condition:'', condition:'',
pageT:'',
spinShow:true, spinShow:true,
idAdmin:'', idAdmin:'',
NAme:"", NAme:"",
...@@ -272,6 +273,7 @@ export default { ...@@ -272,6 +273,7 @@ export default {
}, },
//改变页码 //改变页码
pageChange(page){ pageChange(page){
this.pageT=page
this.SearchList(page) this.SearchList(page)
}, },
pageSizeChange(page){ pageSizeChange(page){
...@@ -306,7 +308,7 @@ export default { ...@@ -306,7 +308,7 @@ export default {
updateemailTWO(parmars).then(res=>{ updateemailTWO(parmars).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
this.modal4=false this.modal4=false
this.SearchList() this.SearchList(this.pageT)
}else{ }else{
this.$Notice.error({ this.$Notice.error({
title: '提示', title: '提示',
...@@ -329,7 +331,7 @@ export default { ...@@ -329,7 +331,7 @@ export default {
if(res.data.success==true){ if(res.data.success==true){
this.$Message.success('解绑成功') this.$Message.success('解绑成功')
this.modal5=false this.modal5=false
this.SearchList() this.SearchList(this.pageT)
} }
}) })
}, },
...@@ -342,14 +344,14 @@ export default { ...@@ -342,14 +344,14 @@ export default {
UntyingAll(this.UntyingAllARR).then(res=>{ UntyingAll(this.UntyingAllARR).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
this.$Message.success('解绑成功') this.$Message.success('解绑成功')
this.SearchList() this.SearchList(this.pageT)
} }
}) })
}, },
pushlist(){ pushlist(){
this.modal2=false this.modal2=false
this.SearchList() this.SearchList(this.pageT)
} }
}, },
......
...@@ -2,14 +2,13 @@ import axios from 'axios' ...@@ -2,14 +2,13 @@ import axios from 'axios'
import Promise from './promise.service.js' import Promise from './promise.service.js'
import {Notice} from 'iview' import {Notice} from 'iview'
import Vue from 'vue' import Vue from 'vue'
// axios.defaults.withCredentials = true
var instance = axios.create({}); var instance = axios.create({});
instance.defaults.timeout = 2500; instance.defaults.timeout = 2500;
instance.defaults.withCredentials = true; instance.defaults.withCredentials = true;
// instance.defaults.headers.common['Authorization'] = AUTH_TOKEN;
instance.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'; instance.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
instance.defaults.headers['X-Requested-With'] = 'XMLHttpRequest' instance.defaults.headers['X-Requested-With'] = 'XMLHttpRequest'
instance.defaults.headers['X-auth-Token'] = 'XMLHttpRequest'
instance.interceptors.request.use(function (config) { instance.interceptors.request.use(function (config) {
// 在发送请求之前做些什么 // 在发送请求之前做些什么
...@@ -25,11 +24,14 @@ instance.interceptors.response.use(function (response) { ...@@ -25,11 +24,14 @@ 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'){
console.log(666666666666) // Notice.error('您的账号已在其他地方登录,如不是您个人操作,请及时修改密码')
Notice.error('您的账号已在其他地方登录,如不是您个人操作,请及时修改密码') // window.location.href = `${window.location.origin}/login`
window.location.href = `${window.location.origin}/login` // }
} // if (response.data.body.code == '901'){
// Notice.error('cookie已失效,请重新登录')
// window.location.href = `${window.location.origin}/login`
// }
if(response.data.success){ if(response.data.success){
return Promise.resolve(response) return Promise.resolve(response)
} }
......
...@@ -3,7 +3,7 @@ export default{ ...@@ -3,7 +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'&&to.name!=='sweepCode') { if (!token&&to.name!=='login'&&to.name!=='text') {
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