Commit b3e356e9 authored by zhangderong's avatar zhangderong

合并代码

parent b5e7ab92
...@@ -28,4 +28,10 @@ export function getChannelMassage() { ...@@ -28,4 +28,10 @@ export function getChannelMassage() {
return axios.get(`${sapi}/api/resume/getSourceList`,{headers: { return axios.get(`${sapi}/api/resume/getSourceList`,{headers: {
'Content-Type':'application/json' 'Content-Type':'application/json'
}}) }})
}
// 判断是否为超级管理员
export function judeAdmin() {
return axios.get(`${sapi}/api/user/isAdmin`,{headers: {
'Content-Type':'application/json'
}})
} }
\ No newline at end of file
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</Row> </Row>
</template> </template>
<script> <script>
import {getpersonMassage,loginOUT,adoptOneSeeResumeList,getChannelMassage} from '../api/home.server.js' import {getpersonMassage,loginOUT,adoptOneSeeResumeList,getChannelMassage,judeAdmin} from '../api/home.server.js'
import localstorage from '../service/localstorage.service.js' import localstorage from '../service/localstorage.service.js'
export default{ export default{
data() { data() {
...@@ -136,17 +136,25 @@ import localstorage from '../service/localstorage.service.js' ...@@ -136,17 +136,25 @@ import localstorage from '../service/localstorage.service.js'
// 普通用户权限 // 普通用户权限
getMenu(){ getMenu(){
let condition=localstorage.get('isADMIN') let condition=localstorage.get('isADMIN')
this.isadmin=condition let c=JSON.parse(condition)
if(condition == 'false'){ this.isadmin=c.isAdmin
if(this.isadmin == false){
this.menuList[3].child.splice(0,1) this.menuList[3].child.splice(0,1)
} }
// this.selectMenu(this.name) },
} // 判断是否为超级管理员
// judgeadmin(){
// judeAdmin().then(res=>{
// this.isadmin=res.data.body
// // console.log(this.isadmin)
// })
// }
}, },
mounted() { mounted() {
this.getmassage() this.getmassage()
this.getMenu() this.getMenu()
this.getActiveName() this.getActiveName()
// this.judgeadmin()
} }
} }
</script> </script>
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
<div class="leftcontentContent" v-for="(item,index) in Essentialinformation " :key='index'> <div class="leftcontentContent" v-for="(item,index) in Essentialinformation " :key='index'>
<div class="contentMassage"> <div class="contentMassage">
<p style="margin-top:7px"> <p style="margin-top:7px">
<span style="margin-left:10px;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;display:inline-block;" @click="Seedetail(item.id)">{{item.ownerName}} |</span> <span style="margin-left:10px;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;display:inline-block;cursor:pointer" @click="Seedetail(item.id)">{{item.ownerName}} |</span>
<span @click="Seedetail(item.id)" style="overflow: hidden;text-overflow:ellipsis;white-space: nowrap;display:inline-block;">{{item.ownerMobile}} |</span> <span @click="Seedetail(item.id)" style="overflow: hidden;text-overflow:ellipsis;white-space: nowrap;display:inline-block;cursor:pointer">{{item.ownerMobile}} |</span>
<span @click="Seedetail(item.id)" style="overflow: hidden;text-overflow:ellipsis;white-space: nowrap;display:inline-block;width:20%">{{item.ownerExpectTitles}}</span> <span @click="Seedetail(item.id)" style="overflow: hidden;text-overflow:ellipsis;white-space: nowrap;display:inline-block;width:20%;cursor:pointer">{{item.ownerExpectTitles}}</span>
<span style="color:#2d8cf0;float:right;margin-right:35px" @click="updateInterview(item.id,item.interviewerName,item.seeTime,item.inviterName)">更改约面信息</span> <span style="color:#2d8cf0;float:right;margin-right:35px;cursor:pointer" @click="updateInterview(item.id,item.interviewerName,item.seeTime,item.inviterName)">更改约面信息</span>
</p> </p>
<p style="margin-top:8px"> <p style="margin-top:8px">
<span style="margin-left:10px;display:inline-block;width:22%;">邀约人: {{item.inviterName}} </span> <span style="margin-left:10px;display:inline-block;width:22%;">邀约人: {{item.inviterName}} </span>
...@@ -26,18 +26,18 @@ ...@@ -26,18 +26,18 @@
<div class="contentState"> <div class="contentState">
<p style="margin-top:8px"> <p style="margin-top:8px">
<span style="margin-left:20px" @click="modal4=true">当前状态</span> <span style="margin-left:20px" @click="modal4=true">当前状态</span>
<span style="float:right;margin:0 20px 0 0px;color:#2d8cf0" @click="Stopinterview(item.id)" v-if="item.flowStatus=='OPTION'">终止面试</span> <span style="float:right;margin:0 20px 0 0px;color:#2d8cf0;cursor:pointer" @click="Stopinterview(item.id)" v-if="item.flowStatus=='OPTION'">终止面试</span>
<span style="float:right;margin:0 20px 0 0px;color:#2d8cf0" @click="Stopinterview(item.id)" v-if="item.flowStatus=='TO_SEE'">终止面试</span> <span style="float:right;margin:0 20px 0 0px;color:#2d8cf0;cursor:pointer" @click="Stopinterview(item.id)" v-if="item.flowStatus=='TO_SEE'">终止面试</span>
<span style="float:right;margin:0 20px 0 0px;color:#2d8cf0" @click="Stopinterview(item.id)" v-if="item.flowStatus=='HAS_SEE'">终止面试</span> <span style="float:right;margin:0 20px 0 0px;color:#2d8cf0;cursor:pointer" @click="Stopinterview(item.id)" v-if="item.flowStatus=='HAS_SEE'">终止面试</span>
<span style="float:right;margin:0 20px 0 0px;color:#2d8cf0" @click="Stopinterview(item.id)" v-if="item.flowStatus=='SEE_FAIL'">终止面试</span> <span style="float:right;margin:0 20px 0 0px;color:#2d8cf0;cursor:pointer" @click="Stopinterview(item.id)" v-if="item.flowStatus=='SEE_FAIL'">终止面试</span>
<span style="float:right;margin:0 20px 0 0px;color:#2d8cf0" @click="Stopinterview(item.id)" v-if="item.flowStatus=='INTERVIEW_FAIL'">终止面试</span> <span style="float:right;margin:0 20px 0 0px;color:#2d8cf0;cursor:pointer" @click="Stopinterview(item.id)" v-if="item.flowStatus=='INTERVIEW_FAIL'">终止面试</span>
<span style="float:right;margin:0 20px 0 0px;color:#2d8cf0" @click="Stopinterview(item.id)" v-if="item.flowStatus=='TO_SENT_OFFER'">终止面试</span> <span style="float:right;margin:0 20px 0 0px;color:#2d8cf0;cursor:pointer" @click="Stopinterview(item.id)" v-if="item.flowStatus=='TO_SENT_OFFER'">终止面试</span>
<span style="float:right;margin:0 20px 0 0px;color:#2d8cf0" @click="Stopinterview(item.id)" v-if="item.flowStatus=='TO_ENTRY'">终止面试</span> <span style="float:right;margin:0 20px 0 0px;color:#2d8cf0;cursor:pointer" @click="Stopinterview(item.id)" v-if="item.flowStatus=='TO_ENTRY'">终止面试</span>
<span style="float:right;margin:0 20px 0 0px;color:#2d8cf0" @click="Stopinterview(item.id)" v-if="item.flowStatus=='HAS_ENTRY'">终止面试</span> <span style="float:right;margin:0 20px 0 0px;color:#2d8cf0;cursor:pointer" @click="Stopinterview(item.id)" v-if="item.flowStatus=='HAS_ENTRY'">终止面试</span>
<span style="float:right;margin:0 20px 0 0px;color:#2d8cf0" @click="Stopinterview(item.id)" v-if="item.flowStatus=='NO_ENTRY'">终止面试</span> <span style="float:right;margin:0 20px 0 0px;color:#2d8cf0;cursor:pointer" @click="Stopinterview(item.id)" v-if="item.flowStatus=='NO_ENTRY'">终止面试</span>
<span style="float:right;margin:0 20px 0 0px;color:#2d8cf0" @click="Stopinterview(item.id)" v-if="item.flowStatus=='PASS'">终止面试</span> <span style="float:right;margin:0 20px 0 0px;color:#2d8cf0;cursor:pointer" @click="Stopinterview(item.id)" v-if="item.flowStatus=='PASS'">终止面试</span>
<span style="float:right;margin:0 20px 0 0px;color:#2d8cf0" @click="Stopinterview(item.id)" v-if="item.flowStatus=='HAS_SENT_OFFER'">终止面试</span> <span style="float:right;margin:0 20px 0 0px;color:#2d8cf0;cursor:pointer" @click="Stopinterview(item.id)" v-if="item.flowStatus=='HAS_SENT_OFFER'">终止面试</span>
<span style="float:right;margin:0 20px 0 10px;color:#2d8cf0" @click="OPPeninterview(item.id)" v-if="item.flowStatus=='END'">重启面试</span> <span style="float:right;margin:0 20px 0 10px;color:#2d8cf0;cursor:pointer" @click="OPPeninterview(item.id)" v-if="item.flowStatus=='END'">重启面试</span>
</p> </p>
<p class="nowstatus" style="margin-top:8px"> <p class="nowstatus" style="margin-top:8px">
<span style="margin:0 20px 0 20px" v-if="item.flowStatus=='OPTION'">备选</span> <span style="margin:0 20px 0 20px" v-if="item.flowStatus=='OPTION'">备选</span>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<!-- <Select style="width:40%;float:right;color:#1E90FF" placeholder="变更状态" :label-in-value='true' @on-change="selectchangeElement($event,item.id)" size="small"> <!-- <Select style="width:40%;float:right;color:#1E90FF" placeholder="变更状态" :label-in-value='true' @on-change="selectchangeElement($event,item.id)" size="small">
<Option v-for="(item,index) in nowstate" :key="index" :value="index" >{{item.label}}</Option> <Option v-for="(item,index) in nowstate" :key="index" :value="index" >{{item.label}}</Option>
</Select> --> </Select> -->
<select style="border:0;margin-right:10px;float:right" @change="selectchangeElement($event,item.id)"> <select style="border:0;margin-right:10px;float:right;cursor:pointer" @change="selectchangeElement($event,item.id)">
<option value="0" style="color:#2d8cf0">变更状态 ∨</option> <option value="0" style="color:#2d8cf0">变更状态 ∨</option>
<option value="2" style="color:#2d8cf0">已邀约 </option> <option value="2" style="color:#2d8cf0">已邀约 </option>
<option value="3" style="color:#2d8cf0">邀约失败</option> <option value="3" style="color:#2d8cf0">邀约失败</option>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</p> </p>
</div> </div>
<div class="contentRecord" style="text-align:center"> <div class="contentRecord" style="text-align:center">
<p style="margin-top:3px"><span style="color:#2d8cf0;" @click="RecordSEE(item.id,item.ownerName)">操作记录</span></p> <p style="margin-top:3px"><span style="color:#2d8cf0;cursor:pointer" @click="RecordSEE(item.id,item.ownerName)">操作记录</span></p>
<p style="font-size:12px">最后操作人|<span style="margin-left:8px;text-align:center">{{item.d}}</span></p> <p style="font-size:12px">最后操作人|<span style="margin-left:8px;text-align:center">{{item.d}}</span></p>
<p>{{item.modifyTime}}</p> <p>{{item.modifyTime}}</p>
</div> </div>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="login"> <div class="login">
<div class="login-content"> <div class="login-content">
<div class="loginContent-left"> <div class="loginContent-left">
<img src="https://o7oe0d6qz.qnssl.com/image/login.jpg"> <img src="https://o7oe0d6qz.qnssl.com/image/login.jpg" class="logimg">
</div> </div>
<div class="loginContent-right"> <div class="loginContent-right">
<div class="logo"> <div class="logo">
...@@ -82,7 +82,7 @@ export default { ...@@ -82,7 +82,7 @@ export default {
} }
login(params).then(res=>{ login(params).then(res=>{
if(res.data.body.code=='100'){ if(res.data.body.code=='100'){
this.$router.push({name:'text',params:{userCode:this.formInline.user}}) this.$router.push({name:'updatepsd',params:{userCode:this.formInline.user}})
} }
if(res.data.success==true){ if(res.data.success==true){
this.ISIDMIN=res.data.body this.ISIDMIN=res.data.body
...@@ -110,28 +110,27 @@ export default { ...@@ -110,28 +110,27 @@ export default {
height:100%; height:100%;
} }
.login-content{ .login-content{
width: 65%; width: 100%;
height:760px; max-height:858px;
margin:2.5% auto overflow: hidden;
} }
.loginContent-left { .loginContent-left {
float: left; float: left;
width: 60%; width: 68%;
height: 760px; height:858px;
} }
.loginBtu{ .loginBtu{
width:90%; width:90%;
} }
.loginContent-right{ .loginContent-right{
float: left; float: left;
width: 40%; width: 32%;
height: 760px; height:858px;
border: 1px solid rgba(241,241,241,1) border: 1px solid rgba(241,241,241,1)
} }
.loginContent-left img{ .logimg{
width: 100%; width: 100%;
height: 100%; max-height:858px
} }
.logo{ .logo{
width:100%; width:100%;
......
...@@ -134,6 +134,7 @@ export default { ...@@ -134,6 +134,7 @@ export default {
} }
updatePsd(params).then(res=>{ updatePsd(params).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
console.log(1234444)
this.ISIDMIN=res.data.body this.ISIDMIN=res.data.body
localStorage.setItem('isADMIN',JSON.stringify(this.ISIDMIN)) localStorage.setItem('isADMIN',JSON.stringify(this.ISIDMIN))
this.$router.replace({name:'allResume'}) this.$router.replace({name:'allResume'})
......
This diff is collapsed.
This diff is collapsed.
...@@ -140,9 +140,10 @@ export default { ...@@ -140,9 +140,10 @@ export default {
mobile:this.formInline.phoneNUmber, mobile:this.formInline.phoneNUmber,
takeResume:this.formInline.model2 takeResume:this.formInline.model2
} }
console.log(parmars)
submitMassage(parmars).then(res=>{ submitMassage(parmars).then(res=>{
console.log(9898787887)
if(res.data.success==true){ if(res.data.success==true){
console.log(9898787887)
this.modal4=true this.modal4=true
} }
}) })
......
...@@ -210,7 +210,14 @@ export default { ...@@ -210,7 +210,14 @@ export default {
this.formInline.PerName='' this.formInline.PerName=''
} }
if(res.data.body.code==0){ if(res.data.body.code==0){
this.$Notice.error({
title: '提示',
desc: '该账户已存在,请勿重复添加',
duration:2
});
this.formInline.PhoneNumber=''
this.formInline.PerName=''
return
} }
}) })
......
...@@ -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="this.idAdmin=='true'"> <input type='checkbox' class='input-checkbox' v-model='checked' v-on:click='checkedAll' style="margin-left:25px" v-show="idAdmin==true">
<span style="margin-left:10px;cursor:pointer" v-show="this.idAdmin=='true'" >全选</span> <span style="margin-left:10px;cursor:pointer" v-show="idAdmin==true" >全选</span>
<span style="margin-left:40px;color:#2d8cf0" @click="UntyingAll" v-show="this.idAdmin=='true'">解绑</span> <span style="margin-left:40px;color:#2d8cf0" @click="UntyingAll" v-show="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">
...@@ -137,6 +137,7 @@ export default { ...@@ -137,6 +137,7 @@ export default {
pageT:'', pageT:'',
spinShow:true, spinShow:true,
idAdmin:'', idAdmin:'',
admin:'',
NAme:"", NAme:"",
DATA:"", DATA:"",
Tname:'', Tname:'',
...@@ -251,8 +252,6 @@ export default { ...@@ -251,8 +252,6 @@ 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
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)=>{
...@@ -351,6 +350,11 @@ export default { ...@@ -351,6 +350,11 @@ export default {
pushlist(){ pushlist(){
this.modal2=false this.modal2=false
this.SearchList(this.pageT) this.SearchList(this.pageT)
},
isadminmethods(){
this.admin=localStorage.getItem('isADMIN')
let c=JSON.parse(this.admin)
this.idAdmin=c.isAdmin
} }
}, },
...@@ -368,6 +372,7 @@ export default { ...@@ -368,6 +372,7 @@ export default {
}, },
mounted(){ mounted(){
this.isadminmethods()
this.SearchList() this.SearchList()
} }
......
...@@ -70,9 +70,9 @@ export default function upload(option) { ...@@ -70,9 +70,9 @@ export default function upload(option) {
const headers = option.headers || {}; const headers = option.headers || {};
// if (headers['X-Requested-With'] !== null) { if (headers['X-Requested-With'] !== null) {
// xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
// } }
for (let item in headers) { for (let item in headers) {
if (headers.hasOwnProperty(item) && headers[item] !== null) { if (headers.hasOwnProperty(item) && headers[item] !== null) {
......
...@@ -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 = localstorage.get('token') let token = localstorage.get('token')
if (!token&&to.name!=='login'&&to.name!=='text') { if (!token&&to.name!=='login'&&to.name!=='updatepsd'&&to.name!=='sweepCode') {
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