提交 d97b31b6 authored 作者: FC's avatar FC

fc

上级 32130e52
...@@ -457,7 +457,7 @@ td.el-table__cell, ...@@ -457,7 +457,7 @@ td.el-table__cell,
border-radius: 4px; border-radius: 4px;
} }
.el-message-box{ .el-message-box{
width: 460px !important; min-width: 460px !important;
} }
.el-message-box__message{ .el-message-box__message{
height: 100px; height: 100px;
......
...@@ -23,8 +23,8 @@ const env = { ...@@ -23,8 +23,8 @@ const env = {
// API_TEST_ORIGIN: 'http://172.18.27.190:8080/confhd', // API_TEST_ORIGIN: 'http://172.18.27.190:8080/confhd',
// API_BASE_ORIGIN: 'http://192.168.102.146:6888', //越越 // API_BASE_ORIGIN: 'http://192.168.102.146:6888', //越越
// API_TEST_ORIGIN: 'http://192.168.102.146:6888', // API_TEST_ORIGIN: 'http://192.168.102.146:6888',
API_BASE_ORIGIN: 'http://192.168.102.53:6888', //赵璐 API_BASE_ORIGIN: 'http://192.168.102.19:6888', //赵璐
API_TEST_ORIGIN: 'http://192.168.102.53:6888', API_TEST_ORIGIN: 'http://192.168.102.19:6888',
}, },
development_ssj: { development_ssj: {
// API_BASE_ORIGIN: 'http://192.168.100.248:6888', // API_BASE_ORIGIN: 'http://192.168.100.248:6888',
......
...@@ -1332,7 +1332,8 @@ saveScheduleAddress(data){ ...@@ -1332,7 +1332,8 @@ saveScheduleAddress(data){
//三合一 //三合一
fingAllPeopleByDing() { fingAllPeopleByDing() {
return axios('/ding/threeAndOne', { return axios('/ding/threeAndOne', {
method: 'get' method: 'get',
}) })
}, },
addPerson(data) { //人员库新增、修改人员 addPerson(data) { //人员库新增、修改人员
...@@ -1677,10 +1678,22 @@ findUnitByCustomOrgId(data){ ...@@ -1677,10 +1678,22 @@ findUnitByCustomOrgId(data){
}) })
}, },
// 会议配置-查询通知结果 // 会议配置-查询通知结果
findNoticeResult(data){ findNoticeResult(data){
return axios('/conferenceProcess/findNoticeResult?sendNoticeId=' + data,{ return axios('/conferenceProcess/findNoticeResult?sendNoticeId=' + data,{
method:'get',
})
},
//人员库-是否可以同步(获取累计人数和同步时间)
findIsSync(){
return axios('/ding/findIsSync',{
method:'get', method:'get',
}) })
},
//更新同步状态为正在同步人员
updateStatus(){
return axios('/ding/updateStatus',{
method:'get'
})
} }
} }
......
...@@ -7,51 +7,32 @@ ...@@ -7,51 +7,32 @@
</span> </span>
</div> </div>
</div> </div>
<div <div class="meeting_item item" :class="[
class="meeting_item item"
:class="[
{ green_item: item.processStatus === 1 }, { green_item: item.processStatus === 1 },
{ orange_item: item.processStatus === 2 }, { orange_item: item.processStatus === 2 },
{ blue_item: item.processStatus === 3 }, { blue_item: item.processStatus === 3 },
]" ]" v-for="(item, index) of meetingLists" :key="index" @click="enterConf(item)">
v-for="(item, index) of meetingLists"
:key="index"
@click="enterConf(item)"
>
<div class="meeting_item_part1"> <div class="meeting_item_part1">
<div class="meeting_item_text" v-if="flash"> <div class="meeting_item_text" v-if="flash">
<el-tooltip <el-tooltip :content="item.processName" effect="light" placement="bottom"
:content="item.processName" v-if="item.processName !== item.showName">
effect="light"
placement="bottom"
v-if="item.processName !== item.showName"
>
<span class="text_name">{{ item.showName }}</span> <span class="text_name">{{ item.showName }}</span>
</el-tooltip> </el-tooltip>
<span class="text_name" v-else>{{ item.showName }}</span> <span class="text_name" v-else>{{ item.showName }}</span>
<div class="time_record" @click.stop v-if="item.processStatus === 3"> <div class="time_record" @click.stop v-if="item.processStatus === 3">
<time-record :startTime="item.processDate" :tagFlag="true"></time-record> <time-record :startTime="item.processDate" :tagFlag="true"></time-record>
</div> </div>
<div <div class="time_record" :class="
class="time_record"
:class="
new Date(item.processDate).getTime() - new Date().getTime() < 0 new Date(item.processDate).getTime() - new Date().getTime() < 0
? 'overdue' ? 'overdue'
: '' : ''
" " @click.stop v-else>
@click.stop <time-count-down :endTime="item.processDate" @modifyDate="modifyDate" :item="item"
v-else :tagFlag="
>
<time-count-down
:endTime="item.processDate"
@modifyDate="modifyDate"
:item="item"
:tagFlag="
new Date(item.processDate).getTime() - new Date().getTime() < 0 new Date(item.processDate).getTime() - new Date().getTime() < 0
? false ? false
: true : true
" "></time-count-down>
></time-count-down>
</div> </div>
</div> </div>
<div class="publish_tag"> <div class="publish_tag">
...@@ -73,12 +54,9 @@ ...@@ -73,12 +54,9 @@
<div class="meeting_item_text" v-for="(msg, index) of item.data" :key="index"> <div class="meeting_item_text" v-for="(msg, index) of item.data" :key="index">
<span class="text_key" v-if="msg.key !=='来源' & msg.key !=='联系人'">{{ msg.key }}</span> <span class="text_key" v-if="msg.key !=='来源' & msg.key !=='联系人'">{{ msg.key }}</span>
<span class="text_value" v-if="msg.key !=='来源' & msg.key !=='联系人'">{{ msg.value }}</span> <span class="text_value" v-if="msg.key !=='来源' & msg.key !=='联系人'">{{ msg.value }}</span>
<span <span class="address_des" v-if="
class="address_des"
v-if="
msg.key === '地址' && (msg.value === '' || msg.value === null) msg.key === '地址' && (msg.value === '' || msg.value === null)
" ">请在排座时选厅</span>
>请在排座时选厅</span>
</div> </div>
</div> </div>
<div class="foot_but"> <div class="foot_but">
...@@ -162,7 +140,7 @@ export default { ...@@ -162,7 +140,7 @@ export default {
}) })
this.$emit('getMeetingLists') this.$emit('getMeetingLists')
}) })
.catch((err) => {}) .catch((err) => { })
}, },
editMeeting(data) { editMeeting(data) {
this.$emit('editM', data.processId) this.$emit('editM', data.processId)
...@@ -193,7 +171,7 @@ export default { ...@@ -193,7 +171,7 @@ export default {
}) })
} }
}) })
.catch((err) => {}) .catch((err) => { })
}) })
.catch(() => { .catch(() => {
this.$message({ this.$message({
...@@ -224,7 +202,7 @@ export default { ...@@ -224,7 +202,7 @@ export default {
this.$emit('getData') this.$emit('getData')
} }
}) })
.catch((err) => {}) .catch((err) => { })
}) })
.catch((action) => { .catch((action) => {
// if (action === "cancel") { // if (action === "cancel") {
...@@ -254,7 +232,7 @@ export default { ...@@ -254,7 +232,7 @@ export default {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.wrap { .wrap {
font-family: 'Regular'; font-family: "Regular";
height: 100%; height: 100%;
padding: 0px 32px 34px 32px; padding: 0px 32px 34px 32px;
overflow: auto; overflow: auto;
...@@ -265,7 +243,7 @@ export default { ...@@ -265,7 +243,7 @@ export default {
position: relative; position: relative;
&:after { &:after {
//实现flex布局space-between最后一行左对齐 //实现flex布局space-between最后一行左对齐
content: ' '; content: " ";
flex: auto; flex: auto;
} }
.before_none { .before_none {
...@@ -415,11 +393,11 @@ export default { ...@@ -415,11 +393,11 @@ export default {
height: 47px; height: 47px;
font-size: 18px; font-size: 18px;
color: #3a3c4b; color: #3a3c4b;
font-family: 'Medium'; font-family: "Medium";
font-weight: 500; font-weight: 500;
line-height: 30px; line-height: 30px;
.time_record { .time_record {
font-family: 'Regular'; font-family: "Regular";
height: 24px; height: 24px;
line-height: 24px; line-height: 24px;
padding: 0 10px; padding: 0 10px;
......
...@@ -118,9 +118,9 @@ ...@@ -118,9 +118,9 @@
<div class="box" v-if="trueList.length==0"></div> <div class="box" v-if="trueList.length==0"></div>
<time-list <time-list
class="time_list"
v-if="trueList.length>0"
ref="timeList" ref="timeList"
class="time_list"
:canClick="canClick" :canClick="canClick"
:conferenceProcessReservationRecordList="conferenceProcessReservationRecordList" :conferenceProcessReservationRecordList="conferenceProcessReservationRecordList"
:isHover="false :isHover="false
...@@ -168,8 +168,9 @@ ...@@ -168,8 +168,9 @@
<div></div> <div></div>
</div> </div>
</div> </div>
<div class="you" @click="showModuleRight()"></div> <div class="you" @click="showModuleRight()"
<!-- :class="{ showYou: moduleIndex + 3 < originModuleList.length }" --> :class="{ showYou: moduleIndex + 3 < originModuleList.length }" ></div>
<!-- -->
</div> </div>
</div> </div>
</div> </div>
...@@ -343,6 +344,7 @@ export default { ...@@ -343,6 +344,7 @@ export default {
// console.log(); // console.log();
// console.log(new Date().toDateString()) // console.log(new Date().toDateString())
this.getDate() this.getDate()
}, },
methods: { methods: {
...@@ -356,7 +358,7 @@ export default { ...@@ -356,7 +358,7 @@ export default {
lastSet() { lastSet() {
this.isActive = 1 this.isActive = 1
this.$emit('getPredetermine', this.isActive) this.$emit('getPredetermine', this.isActive)
this.getConferenceList(this.ruleForm) this.getConferenceList(this.ruleForm,this.currentConfenrence)
}, },
//下一步 //下一步
nextSet() { nextSet() {
...@@ -396,13 +398,14 @@ export default { ...@@ -396,13 +398,14 @@ export default {
}, },
selectConfence() { selectConfence() {
console.log('ruleFom', this.ruleForm) console.log('ruleFom', this.ruleForm)
this.getConferenceList(this.ruleForm) this.getConferenceList(this.ruleForm,this.currentConfenrence)
}, },
//获取布局 //获取布局
getCvans(data) { getCvans(data) {
this.$axios.findConferenceLayOut(data).then((res) => { this.$axios.findConferenceLayOut(data).then((res) => {
console.log(res) console.log(res)
if (res.data.code == 200) { if (res.data.code == 200) {
this.originModuleList = res.data.data.confLayoutList
this.moduleList = res.data.data.confLayoutList this.moduleList = res.data.data.confLayoutList
this.moduleId = res.data.data.confLayoutList[0].id this.moduleId = res.data.data.confLayoutList[0].id
this.confenceObj = { this.confenceObj = {
...@@ -423,12 +426,14 @@ export default { ...@@ -423,12 +426,14 @@ export default {
if (d < 10) { if (d < 10) {
d = '0' + d d = '0' + d
} }
console.log(y + '-' + m + '-' + d) // console.log(y + '-' + m + '-' + d)
return y + '-' + m + '-' + d return y + '-' + m + '-' + d
}, },
//查询会议室 //查询会议室
getConferenceList(data) { getConferenceList(data,currentConfenrence) {
console.log('curr',this.currentConfenrence);
// console.log();
this.$axios.findReservationConference(data).then((res) => { this.$axios.findReservationConference(data).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
console.log('resresresres', res) console.log('resresresres', res)
...@@ -439,17 +444,24 @@ export default { ...@@ -439,17 +444,24 @@ export default {
if (res.data.data.conferenceName) { if (res.data.data.conferenceName) {
for (let i in this.trueList) { for (let i in this.trueList) {
if (res.data.data.conferenceName == this.trueList[i].conferenceName) { if (res.data.data.conferenceName == this.trueList[i].conferenceName) {
this.chooseConfs(this.trueList[i]) this.chooseConfs(this.trueList[i],currentConfenrence)
this.$refs.timeList.selectRange(res.data.data.reservationStartTime.split(' ')[1]) this.$nextTick(()=>{
this.$refs.timeList.selectRange(res.data.data.reservationStartTime.split(' ')[1])
this.$refs.timeList.selectRange(res.data.data.reservationEndTime.split(' ')[1]) this.$refs.timeList.selectRange(res.data.data.reservationEndTime.split(' ')[1])
})
} }
} }
} else { } else {
this.choosePei(this.radio) // this.choosePei(this.radio)
} }
this.choosePei(this.radio,currentConfenrence)
} }
}) })
// this.$forceUpdate() // this.$forceUpdate()
},
setCurrentConference(){
}, },
//子组件返回选中的时间段 //子组件返回选中的时间段
getTimeRange(value) { getTimeRange(value) {
...@@ -461,7 +473,7 @@ export default { ...@@ -461,7 +473,7 @@ export default {
}, },
switchOperation(val) { switchOperation(val) {
console.log(val) console.log(val)
console.log('currentConfenrence', this.currentConfenrence) // console.log('currentConfenrence', this.currentConfenrence)
if (val === 1) { if (val === 1) {
this.isActive = 1 this.isActive = 1
this.getConferenceList(this.ruleForm) this.getConferenceList(this.ruleForm)
...@@ -481,28 +493,34 @@ export default { ...@@ -481,28 +493,34 @@ export default {
// console.log('radio', this.radio) // console.log('radio', this.radio)
this.choosePei(this.radio) this.choosePei(this.radio)
}, },
choosePei(val) { choosePei(val,currentConfenrence) {
console.log('val', val) // console.log('val', val)
// console.log('currentConfenrence',currentConfenrence);
if (val == 2) { if (val == 2) {
console.log('dataLists', this.dataLists) // console.log('dataLists', this.dataLists)
this.confList = this.dataLists.conferenceAndUseInfoVoList this.confList = this.dataLists.conferenceAndUseInfoVoList
console.log('confList', this.confList)
// let obj = [...this.confList[0].conferenceProcessReservationRecordList]
if (this.confList.length > 0) { if (this.confList.length > 0) {
this.conferenceProcessReservationRecordList = this.confList[0].conferenceProcessReservationRecordList this.conferenceProcessReservationRecordList = this.confList[0].conferenceProcessReservationRecordList
this.conferenceId = this.confList[0].conferenceId this.conferenceId = this.confList[0].conferenceId
this.moduleId = this.confList[0].conferenceId this.moduleId = this.confList[0].conferenceId
if(currentConfenrence){
this.conferenceId = currentConfenrence.conferenceId
console.log(2313232);
this.conferenceProcessReservationRecordList = currentConfenrence.conferenceProcessReservationRecordList
}else {
this.currentConfenrence = this.confList[0] this.currentConfenrence = this.confList[0]
this.conferenceProcessReservationRecordList = this.confList[0].conferenceProcessReservationRecordList
}
} else { } else {
this.currentConfenrence = {} this.currentConfenrence = {}
} }
if (this.confList.length > 7) { if (this.confList.length > 7) {;
this.trueList = this.confList.slice(this.listIndex, 7) this.trueList = this.confList.slice(this.listIndex, 7)
this.originModuleList = this.trueList[0].confLayoutVoList console.log(this.trueList);
// this.originModuleList = this.trueList[0].confLayoutVoList
this.originModuleList = this.trueList
//
// if (this.trueList[0].confLayoutVoList.length > 3) { // if (this.trueList[0].confLayoutVoList.length > 3) {
// this.moduleList = this.trueList[0].confLayoutVoList.slice(this.moduleIndex, 3) // this.moduleList = this.trueList[0].confLayoutVoList.slice(this.moduleIndex, 3)
// } else { // } else {
...@@ -510,7 +528,8 @@ export default { ...@@ -510,7 +528,8 @@ export default {
// } // }
} else { } else {
this.trueList = this.confList this.trueList = this.confList
this.originModuleList = this.trueList[0].confLayoutVoList // this.originModuleList = this.trueList[0].confLayoutVoList
this.originModuleList = this.trueList
// if (this.trueList[0].confLayoutVoList.length > 3) { // if (this.trueList[0].confLayoutVoList.length > 3) {
// this.moduleList = this.trueList[0].confLayoutVoList.slice(this.moduleIndex, 3) // this.moduleList = this.trueList[0].confLayoutVoList.slice(this.moduleIndex, 3)
// } else { // } else {
...@@ -568,13 +587,20 @@ export default { ...@@ -568,13 +587,20 @@ export default {
if (this.moduleIndex > 0) { if (this.moduleIndex > 0) {
this.moduleIndex-- this.moduleIndex--
this.moduleList = this.originModuleList.slice(this.moduleIndex, this.moduleIndex + 3) this.moduleList = this.originModuleList.slice(this.moduleIndex, this.moduleIndex + 3)
// this.moduleList = this.moduleList.slice(this.moduleIndex, this.moduleIndex + 3)
} }
}, },
showModuleRight() { showModuleRight() {
console.log(222);
console.log('moduleIndex',this.moduleIndex);
console.log('originModuleList',this.originModuleList);
if (this.moduleIndex + 3 < this.originModuleList.length) { if (this.moduleIndex + 3 < this.originModuleList.length) {
this.moduleIndex++ this.moduleIndex++
this.moduleList = this.originModuleList.slice(this.moduleIndex, this.moduleIndex + 3) this.moduleList = this.originModuleList.slice(this.moduleIndex, this.moduleIndex + 3)
// this.moduleList = this.moduleList.slice(this.moduleIndex, this.moduleIndex + 3)
} }
console.log(this.moduleList);
}, },
showConfLeft() { showConfLeft() {
if (this.listIndex > 0) { if (this.listIndex > 0) {
...@@ -583,6 +609,8 @@ export default { ...@@ -583,6 +609,8 @@ export default {
} }
}, },
showConfRight() { showConfRight() {
console.log(this.listIndex);
console.log(this.confList);
if (this.listIndex + 7 < this.confList.length) { if (this.listIndex + 7 < this.confList.length) {
this.listIndex++ this.listIndex++
this.trueList = this.confList.slice(this.listIndex, this.listIndex + 7) this.trueList = this.confList.slice(this.listIndex, this.listIndex + 7)
...@@ -624,12 +652,30 @@ export default { ...@@ -624,12 +652,30 @@ export default {
return `${this.GLOBAL}/conf/img/${i}` return `${this.GLOBAL}/conf/img/${i}`
}, },
chooseConfs(item) { chooseConfs(item,currentConfenrence) {
console.log('item', item) console.log('item', item)
// this.originModuleList = item.confLayoutVoList
console.log(this.currentConfenrence);
console.log(currentConfenrence);
this.moduleIndex = 0 this.moduleIndex = 0
// if(this.currentConfenrence){
// this.conferenceId = item.conferenceId
// }else {
// this.conferenceId = item.conferenceId
// }
this.conferenceId = item.conferenceId this.conferenceId = item.conferenceId
this.conferenceProcessReservationRecordList = item.conferenceProcessReservationRecordList this.conferenceProcessReservationRecordList = item.conferenceProcessReservationRecordList
this.currentConfenrence = item let {reservationEndTime,reservationStartTime} = this.currentConfenrence
this.currentConfenrence = {...item,reservationEndTime,reservationStartTime}
// this.currentConfenrence = item
console.log(this.currentConfenrence);
// if (item.confLayoutVoList.length > 3) {
// this.moduleList = item.confLayoutVoList.slice(this.moduleIndex, 3)
// } else {
// this.moduleList = item.confLayoutVoList
// }
// if (this.radio == 1) { // if (this.radio == 1) {
// this.originModuleList = item.conferenceTemplateList // this.originModuleList = item.conferenceTemplateList
// console.log(this.conferenceTemplateList) // console.log(this.conferenceTemplateList)
...@@ -890,7 +936,7 @@ export default { ...@@ -890,7 +936,7 @@ export default {
} }
.modules { .modules {
width: 90%; width: 88%;
margin: 0 auto; margin: 0 auto;
border-bottom: 1px solid #e5ebef; border-bottom: 1px solid #e5ebef;
min-height: 300px; min-height: 300px;
...@@ -986,7 +1032,7 @@ export default { ...@@ -986,7 +1032,7 @@ export default {
//选择会议室 //选择会议室
.confs { .confs {
width: 90%; width: 89%;
margin: 0 auto; margin: 0 auto;
margin-top: -20px; margin-top: -20px;
border-bottom: 1px solid #e5ebef; border-bottom: 1px solid #e5ebef;
...@@ -995,11 +1041,11 @@ export default { ...@@ -995,11 +1041,11 @@ export default {
align-items: center; align-items: center;
.showZuo { .showZuo {
background-image: url('../../../../assets/meetingPalce/paiwei/left.png') !important; background-image: url('../../../../assets/meetingPalce/paiwei/left.png') !important;
cursor: pointer; cursor: pointer !important;
} }
.showYou { .showYou {
background-image: url('../../../../assets/meetingPalce/paiwei/right.png') !important; background-image: url('../../../../assets/meetingPalce/paiwei/right.png') !important;
cursor: pointer; cursor: pointer !important;
} }
.zuo { .zuo {
width: 14px; width: 14px;
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
<script> <script>
export default { export default {
name:'timeList',
props: ['conferenceProcessReservationRecordList', 'canClick', 'isHover'], props: ['conferenceProcessReservationRecordList', 'canClick', 'isHover'],
data() { data() {
return { return {
...@@ -144,7 +145,7 @@ export default { ...@@ -144,7 +145,7 @@ export default {
//比较时间 //比较时间
timeStape(time) { timeStape(time) {
// console.log('time', time) // console.log('time', time)
if (time !== null) { if (time !== null && time) {
let s = '' let s = ''
let hour = time.split(':')[0] let hour = time.split(':')[0]
let min = time.split(':')[1] let min = time.split(':')[1]
......
...@@ -7,65 +7,65 @@ ...@@ -7,65 +7,65 @@
<template> <template>
<!-- 缓存三级嵌套路由 使用keep-alive --> <!-- 缓存三级嵌套路由 使用keep-alive -->
<!--  <keep-alive> --> <!--  <keep-alive> -->
<router-view ref="lib" /> <router-view v-bind="$attrs" ref="lib" />
<!-- </keep-alive> --> <!-- </keep-alive> -->
</template> </template>
<script> <script>
export default { export default {
name: 'bankMangager', name: 'bankMangager',
data() { data () {
return {} return {}
}, },
components: {}, components: {},
methods: { methods: {
managesLei() { managesLei () {
this.$refs['lib'].managesLei() this.$refs['lib'].managesLei()
}, },
importData() { importData () {
this.$refs['lib'].importData() this.$refs['lib'].importData()
}, },
callPush() { callPush () {
this.$refs['lib'].callPush() this.$refs['lib'].callPush()
}, },
abbunit() { abbunit () {
console.log(2) console.log(2)
this.$refs['lib'].abbunit() this.$refs['lib'].abbunit()
}, },
callImport() { callImport () {
this.$refs['lib'].importData() this.$refs['lib'].importData()
}, },
callUpdate() { callUpdate () {
this.$refs['lib'].openUpdateDialog() this.$refs['lib'].openUpdateDialog()
}, },
outData() { outData () {
this.$refs['lib'].outData() this.$refs['lib'].outData()
}, },
areaName() { areaName () {
this.$refs['lib'].areaName() this.$refs['lib'].areaName()
}, },
importAbbrevia() { importAbbrevia () {
console.log(2)
this.$refs['lib'].importAbbrevia() this.$refs['lib'].importAbbrevia()
}, },
syncUnit() { syncUnit () {
this.$refs['lib'].syncUnit() this.$refs['lib'].syncUnit()
}, },
personLabel() { personLabel () {
console.log(1);
// console.log(this.titleForm);
this.$refs['lib'].personLabel() this.$refs['lib'].personLabel()
}, },
manageTags() { manageTags () {
this.$refs['lib'].manageTags() this.$refs['lib'].manageTags()
}, },
importLabel() { importLabel () {
this.$refs['lib'].importLabel() this.$refs['lib'].importLabel()
}, },
exportLabel() { exportLabel () {
this.$refs['lib'].exportLabel() this.$refs['lib'].exportLabel()
}, },
}, },
} }
</script> </script>
<style> <style></style>
</style>
...@@ -6,54 +6,57 @@ ...@@ -6,54 +6,57 @@
--> -->
<template> <template>
<div class="confindex"> <div class="confindex">
<router-view ref="middleChange"></router-view> <router-view v-bind="$attrs" ref="middleChange"></router-view>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: '', name: '',
data() {
data () {
return {} return {}
}, },
created () {
},
components: {}, components: {},
methods: { methods: {
areaName() { areaName () {
this.$refs['middleChange'].areaName() this.$refs['middleChange'].areaName()
}, },
managesLei() { managesLei () {
this.$refs['middleChange'].managesLei() this.$refs['middleChange'].managesLei()
}, },
callPush() { callPush () {
this.$refs['middleChange'].callPush() this.$refs['middleChange'].callPush()
}, },
abbunit() { abbunit () {
console.log(3) console.log(3)
this.$refs['middleChange'].abbunit() this.$refs['middleChange'].abbunit()
}, },
importData() { importData () {
this.$refs['middleChange'].importData() this.$refs['middleChange'].importData()
}, },
outData() { outData () {
this.$refs['middleChange'].outData() this.$refs['middleChange'].outData()
}, },
importAbbrevia() { importAbbrevia () {
console.log(3)
this.$refs['middleChange'].importAbbrevia() this.$refs['middleChange'].importAbbrevia()
}, },
syncUnit() { syncUnit () {
this.$refs['middleChange'].syncUnit() this.$refs['middleChange'].syncUnit()
}, },
personLabel() { personLabel () {
console.log(2);
this.$refs['middleChange'].personLabel() this.$refs['middleChange'].personLabel()
}, },
manageTags() { manageTags () {
this.$refs['middleChange'].manageTags() this.$refs['middleChange'].manageTags()
}, },
importLabel() { importLabel () {
this.$refs['middleChange'].importLabel() this.$refs['middleChange'].importLabel()
}, },
exportLabel() { exportLabel () {
this.$refs['middleChange'].exportLabel() this.$refs['middleChange'].exportLabel()
}, },
......
...@@ -7,10 +7,8 @@ ...@@ -7,10 +7,8 @@
<div class="system_main_wrap"> <div class="system_main_wrap">
<div class="header_wrap"> <div class="header_wrap">
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item <el-breadcrumb-item v-for="(item, index) of path.slice(1)" :key="index">{{ item.meta.title
v-for="(item, index) of path.slice(1)" }}</el-breadcrumb-item>
:key="index"
>{{ item.meta.title }}</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<div class="but_wrap" v-if="$route.name === 'userLibrary'"> <div class="but_wrap" v-if="$route.name === 'userLibrary'">
<!-- <div class="but" @click="callLibs()">会议数据{{confNum}}条--更新</div> <!-- <div class="but" @click="callLibs()">会议数据{{confNum}}条--更新</div>
...@@ -18,8 +16,10 @@ ...@@ -18,8 +16,10 @@
<!-- <div class="but" @click="areaName()">分区名称模板配置</div> --> <!-- <div class="but" @click="areaName()">分区名称模板配置</div> -->
<!-- <div class="but" @click="abbLib()">单位简称管理</div> --> <!-- <div class="but" @click="abbLib()">单位简称管理</div> -->
<!-- <div class="but" @click="callLibs()">管理自定义人员库</div> --> <!-- <div class="but" @click="callLibs()">管理自定义人员库</div> -->
<div class="but" @click="personLabel()">人员标签库</div> <div class="but" :class="titleForm.syncType == 0 ? '' : 'notAsyc'"
<div class="but" @click="autoPerson()">同步人员信息</div> @click="titleForm.syncType == 0 ? personLabel() : ''">人员标签库</div>
<div class="but" :class="titleForm.syncType == 0 ? '' : 'notAsyc'"
@click="titleForm.syncType == 0 ? autoPerson() : ''">同步人员信息</div>
</div> </div>
<div class="but_wrap" v-if="$route.name === 'customizeUser'"> <div class="but_wrap" v-if="$route.name === 'customizeUser'">
<!-- <div class="but" @click="callLibs()">会议数据{{confNum}}条--更新</div> <!-- <div class="but" @click="callLibs()">会议数据{{confNum}}条--更新</div>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</div> </div>
</div> </div>
</div> </div>
<router-view ref="sysRouter"></router-view> <router-view ref="sysRouter" :titleForm="titleForm"></router-view>
</div> </div>
</div> </div>
<el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose"> <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
components: { components: {
MenuList, MenuList,
}, },
data() { data () {
return { return {
confNum: 0, confNum: 0,
dialogVisible: false, dialogVisible: false,
...@@ -161,16 +161,27 @@ export default { ...@@ -161,16 +161,27 @@ export default {
}, },
], ],
path: '', path: '',
titleForm: {
id: "",
personNum: 0, //累计人数
syncInfo: "", //同步信息
syncSuccess: 0, //是否同步成功(2-同步成功,3同步失败)
syncTime: "",//同步时间
syncType: 0,//同步状态(0-可以同步,1-正在同步)
}
} }
}, },
computed: {}, computed: {},
created() { created () {
this.getIsSync()
// this.fetchConf(); // this.fetchConf();
this.path = this.$route.matched this.path = this.$route.matched
this.path = this.path.filter((item, index) => item.meta.title !== '') this.path = this.path.filter((item, index) => item.meta.title !== '')
// console.log(this.path) // console.log(this.path)
let sysRoles = sessionStorage.getItem('sysRoles') let sysRoles = sessionStorage.getItem('sysRoles')
switch (sysRoles) { switch (sysRoles)
{
case 'ROLE_SUPERADMIN': case 'ROLE_SUPERADMIN':
break break
case 'ROLE_XITONGADMIN': case 'ROLE_XITONGADMIN':
...@@ -196,13 +207,14 @@ export default { ...@@ -196,13 +207,14 @@ export default {
this.$router.push({ path: '/login' }) this.$router.push({ path: '/login' })
} }
}, },
beforeRouteUpdate(to, from, next) { beforeRouteUpdate (to, from, next) {
let sysRoles = sessionStorage.getItem('sysRoles') let sysRoles = sessionStorage.getItem('sysRoles')
/*****路由跳转时更新面包屑********/ /*****路由跳转时更新面包屑********/
this.path = to.matched this.path = to.matched
this.path = this.path.filter((item, index) => item.meta.title !== '') this.path = this.path.filter((item, index) => item.meta.title !== '')
/****************************/ /****************************/
switch (sysRoles) { switch (sysRoles)
{
case 'ROLE_SUPERADMIN': case 'ROLE_SUPERADMIN':
next() next()
break break
...@@ -212,9 +224,11 @@ export default { ...@@ -212,9 +224,11 @@ export default {
to.path == '/system/bankMangager/confLibrary' || to.path == '/system/bankMangager/confLibrary' ||
to.path == '/system/bankMangager/confLibrary/second' || to.path == '/system/bankMangager/confLibrary/second' ||
to.path == '/system/bankMangager/confLibrary/HallSeat' to.path == '/system/bankMangager/confLibrary/HallSeat'
) { )
{
next() next()
} else { } else
{
next({ path: '/' }) next({ path: '/' })
} }
break break
...@@ -223,90 +237,116 @@ export default { ...@@ -223,90 +237,116 @@ export default {
to.path == '/system/bankMangager/confLibrary' || to.path == '/system/bankMangager/confLibrary' ||
to.path == '/system/bankMangager/confLibrary/second' || to.path == '/system/bankMangager/confLibrary/second' ||
to.path == '/system/bankMangager/confLibrary/HallSeat' to.path == '/system/bankMangager/confLibrary/HallSeat'
) { )
{
next() next()
} else { } else
{
next({ path: '/' }) next({ path: '/' })
} }
break break
default: default:
this.$router.push({ path: '/login' }) this.$router.push({ path: '/login' })
} }
}, },
methods: { methods: {
sureTongbu() { //能否更新人员
if (this.diaoyongFlag) { getIsSync () {
this.$axios.findIsSync().then(res => {
console.log('能否更新人员', res);
if (res.data.code == 200) {
this.titleForm = res.data.data
}
})
},
sureTongbu () {
if (this.diaoyongFlag)
{
this.diaoyongFlag = false this.diaoyongFlag = false
this.handleClose()
this.$axios.updateStatus().then(response => {
if (response.data.code == 200){
this.titleForm.syncType = 1
} else{
this.$message.error(response.data.data)
}
})
this.$axios.fingAllPeopleByDing().then((res) => { this.$axios.fingAllPeopleByDing().then((res) => {
this.diaoyongFlag = true this.diaoyongFlag = true
if (res.data.code != 200) { if (res.data.code != 200){
this.$message.error(res.data.data) this.$message.error(res.data.data)
} }
}) })
} }
}, },
handleClose() { handleClose () {
this.dialogVisible = false this.dialogVisible = false
}, },
fetchConf() { fetchConf () {
this.$axios.getConfEnd().then((res) => { this.$axios.getConfEnd().then((res) => {
console.log(res) console.log(res)
this.confNum = res.data.data.length this.confNum = res.data.data.length
}) })
}, },
autoPerson() { autoPerson () {
this.dialogVisible = true this.dialogVisible = true
}, },
areaName() { areaName () {
this.$refs['sysRouter'].areaName() this.$refs['sysRouter'].areaName()
}, },
managesLei() { managesLei () {
this.$refs['sysRouter'].managesLei() this.$refs['sysRouter'].managesLei()
}, },
callLibs() { callLibs () {
this.$refs['sysRouter'].callPush() this.$refs['sysRouter'].callPush()
}, },
abbLib() { abbLib () {
this.$refs['sysRouter'].abbunit() this.$refs['sysRouter'].abbunit()
}, },
importData() { importData () {
this.$refs['sysRouter'].importData() this.$refs['sysRouter'].importData()
}, },
callUnitLib() { callUnitLib () {
this.$refs['sysRouter'].callImport() this.$refs['sysRouter'].callImport()
}, },
outData() { outData () {
this.$refs['sysRouter'].outData() this.$refs['sysRouter'].outData()
}, },
importAbbrevia() { importAbbrevia () {
this.$refs['sysRouter'].importAbbrevia() this.$refs['sysRouter'].importAbbrevia()
}, },
syncUnit() { syncUnit () {
this.$refs['sysRouter'].syncUnit() this.$refs['sysRouter'].syncUnit()
}, },
unitLibrary() { unitLibrary () {
console.log(1) console.log(1)
this.$refs['sysRouter'].unitLibrary() this.$refs['sysRouter'].unitLibrary()
}, },
authorityUnit() { authorityUnit () {
this.$refs['sysRouter'].authorityUnit() this.$refs['sysRouter'].authorityUnit()
}, },
personLabel() { personLabel () {
console.log(0);
this.$refs['sysRouter'].personLabel() this.$refs['sysRouter'].personLabel()
}, },
manageTags() { manageTags () {
this.$refs['sysRouter'].manageTags() this.$refs['sysRouter'].manageTags()
}, },
importLabel() { importLabel () {
this.$refs['sysRouter'].importLabel() this.$refs['sysRouter'].importLabel()
}, },
exportLabel() { exportLabel () {
this.$refs['sysRouter'].exportLabel() this.$refs['sysRouter'].exportLabel()
}, },
goback() { goback () {
this.$router.go(-1) this.$router.go(-1)
}, },
callExport() {}, callExport () { },
}, },
} }
</script> </script>
...@@ -315,23 +355,28 @@ export default { ...@@ -315,23 +355,28 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
.system_router { .system_router {
padding-top: 20px; padding-top: 20px;
width: 200px; width: 200px;
} }
.system_mian { .system_mian {
width: calc(100% - 200px); width: calc(100% - 200px);
padding: 0px 20px 20px 20px; padding: 0px 20px 20px 20px;
.system_main_wrap { .system_main_wrap {
height: 100%; height: 100%;
/*background: #fff;*/ /*background: #fff;*/
border-radius: 4px; border-radius: 4px;
.header_wrap { .header_wrap {
height: 66px; height: 66px;
width: 100%; width: 100%;
padding: 13px 0; padding: 13px 0;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
/deep/ .el-breadcrumb { /deep/ .el-breadcrumb {
line-height: 40px; line-height: 40px;
font-size: 18px; font-size: 18px;
...@@ -339,8 +384,10 @@ export default { ...@@ -339,8 +384,10 @@ export default {
font-weight: 400; font-weight: 400;
color: #3a3c4b; color: #3a3c4b;
} }
.but_wrap { .but_wrap {
display: flex; display: flex;
.back { .back {
height: 40px; height: 40px;
display: flex; display: flex;
...@@ -348,6 +395,7 @@ export default { ...@@ -348,6 +395,7 @@ export default {
margin-left: 15px; margin-left: 15px;
cursor: pointer; cursor: pointer;
} }
.but { .but {
cursor: pointer; cursor: pointer;
height: 40px; height: 40px;
...@@ -359,11 +407,19 @@ export default { ...@@ -359,11 +407,19 @@ export default {
color: #ffffff; color: #ffffff;
margin-left: 20px; margin-left: 20px;
} }
.notAsyc {
cursor: not-allowed;
color: #fff;
background-color: #c8c9cc;
border-color: #c8c9cc;
}
} }
} }
} }
} }
} }
a { a {
text-decoration: none; text-decoration: none;
color: black; color: black;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论