Skip to content

C
conferenceLy
提交 5ba2a1df authored 作者: FC's avatar FC
浏览文件
操作

合并分支 'fc' 到 'master'

Fc 查看合并请求 !11
上级 17a62262 14c78412
隐藏空白字符变更
内嵌 并排
正在显示 包含 1489 行增加 和 907 行删除
src/assets/less/reset.less
浏览文件 @ 5ba2a1df
...@@ -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;
......
src/axios/index.js
浏览文件 @ 5ba2a1df
...@@ -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',
......
src/axios/services.js
浏览文件 @ 5ba2a1df
...@@ -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'
})
} }
} }
......
src/views/meeting/componets/MeetingItem.vue
浏览文件 @ 5ba2a1df
...@@ -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;
......
src/views/meeting/operation/chooseModule/index.vue
浏览文件 @ 5ba2a1df
...@@ -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;
......
src/views/meeting/operation/chooseModule/timeList.vue
浏览文件 @ 5ba2a1df
...@@ -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]
......
src/views/meetingPlace/pages/edit/HallSeat.vue
浏览文件 @ 5ba2a1df
...@@ -2,33 +2,32 @@ ...@@ -2,33 +2,32 @@
<el-container class="hallSeat" v-loading="flages"> <el-container class="hallSeat" v-loading="flages">
<el-container class="top"> <el-container class="top">
<el-header class="header"> <el-header class="header">
<div class="name">{{ conferenceName }}会议室：{{ layoutName }}</div> <div class="name">
<div class="num">座位数量：{{ row * clo }}个、{{ row }}排、{{ clo }}列</div> {{ conferenceName }}会议室：{{ layoutName }}
</div>
<div class="num">
座位数量：{{ row * clo }}个、{{ row }}排、{{ clo }}列
</div>
<div class="btn"> <div class="btn">
<div <div class="back" @click="goBack" v-show="
class="back" (isShow == 3 || isShow == 2) &&
@click="goBack" !$route.query.tableTag
v-show="(isShow == 3 || isShow == 2)&& !$route.query.tableTag" ">
>上一步</div> 上一步
<div class="next" @click="showArea()" v-show="isShow == 1 || isShow == 2">下一步</div> </div>
<div <div class="next" @click="showArea()" v-show="isShow == 1 || isShow == 2">
class="preserve" 下一步
@click.stop="confirm()" </div>
v-loading="$store.state.conFlag" <div class="preserve" @click.stop="confirm()" v-loading="$store.state.conFlag" v-show="isShow == 3">
v-show="isShow == 3" 保存
>保存</div> </div>
<div class="quit" @click="dialogVisible = true">退出</div> <div class="quit" @click="dialogVisible = true">退出</div>
</div> </div>
</el-header> </el-header>
</el-container> </el-container>
<el-container class="bottom"> <el-container class="bottom">
<el-main> <el-main>
<coordinate-system <coordinate-system ref="coordinateSystem" :prop_x="x" :prop_y="y" :prop_seatList="seatList" @nextStepClick="nextStepClick" />
ref="coordinateSystem"
:prop_x="x"
:prop_y="y"
:prop_seatList="seatList"
/>
</el-main> </el-main>
<el-aside :width="lableRightWidth"> <el-aside :width="lableRightWidth">
<!-- <div class="iconss"> <!-- <div class="iconss">
...@@ -57,16 +56,7 @@ ...@@ -57,16 +56,7 @@
<img src="../../../../assets/img/组 42.png" <img src="../../../../assets/img/组 42.png"
alt=""> alt="">
</div>--> </div>-->
<controller-aside <controller-aside @markSeats="markSeats" @confirm="confirm" @next="nexts" @cleanAraeList="cleanAraeList" :prop_x="x" :prop_y="y" :prop_templetelayout="layoutName" ref="controllerAside" :nextStep="nextStep" />
@markSeats="markSeats"
@confirm="confirm"
@next="nexts"
@cleanAraeList="cleanAraeList"
:prop_x="x"
:prop_y="y"
:prop_templetelayout="layoutName"
ref="controllerAside"
/>
</el-aside> </el-aside>
<el-dialog title="提示" :visible.sync="dialogVisible" width="30%"> <el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
<span style="font-size: 17px">退出将不会保存数据,是否选择退出？</span> <span style="font-size: 17px">退出将不会保存数据,是否选择退出？</span>
...@@ -80,11 +70,11 @@ ...@@ -80,11 +70,11 @@
</template> </template>
<script> <script>
import { mapActions, mapState, mapMutations } from 'vuex' import { mapActions, mapState, mapMutations } from 'vuex';
import ControllerAside from './components/ControllerAside' import ControllerAside from './components/ControllerAside';
import CoordinateSystem from './components/CoordinateSystem' import CoordinateSystem from './components/CoordinateSystem';
//映入bus //映入bus
import bus from './eventBus' import bus from './eventBus';
export default { export default {
name: '', name: '',
components: { components: {
...@@ -107,7 +97,8 @@ export default { ...@@ -107,7 +97,8 @@ export default {
row: '', row: '',
clo: '', clo: '',
lableRightWidth: '320px', lableRightWidth: '320px',
} nextStep: false,
};
}, },
computed: { computed: {
...mapState({ ...mapState({
...@@ -119,191 +110,206 @@ export default { ...@@ -119,191 +110,206 @@ export default {
}), }),
}, },
methods: { methods: {
nextStepClick(val) {
console.log('父nextStepClick', val);
this.nextStep = val;
},
//返回上一页 //返回上一页
back() { back() {
// this.changeorderIndex(0) // this.changeorderIndex(0)
this.dialogVisible = false this.dialogVisible = false;
// this.$router.go(-1) // this.$router.go(-1)
}, },
//调用vuex的辅助函数 把vuex的方法暴露在组件里 //调用vuex的辅助函数 把vuex的方法暴露在组件里
...mapMutations(['changeX', 'changeY', 'changeTempleteName', 'changeLayoutName', 'changeorderIndex']), ...mapMutations([
'changeX',
'changeY',
'changeTempleteName',
'changeLayoutName',
'changeorderIndex',
]),
...mapActions(['clear']), ...mapActions(['clear']),
nexts() { nexts() {
// console.log("触发nexts"); // console.log("触发nexts");
// debugger // debugger
this.$refs.coordinateSystem.next() this.$refs.coordinateSystem.next();
}, },
contrue() { contrue() {
// this.dialogVisible = false // this.dialogVisible = false
this.$router.go(-1) this.$router.go(-1);
// this.confirm() // this.confirm()
// this.changeorderIndex(0) // this.changeorderIndex(0)
}, },
getSeatList() { getSeatList() {
const seatLists = null const seatLists = null;
const { index } = this.$route.query const { index } = this.$route.query;
//判断是修改还是新增 -1新增 //判断是修改还是新增 -1新增
if (index && index != '-1') { if (index && index != '-1') {
const id = sessionStorage.getItem('coId') const id = sessionStorage.getItem('coId');
this.$axios this.$axios
.getdetailLayout(id) .getdetailLayout(id)
.then((res) => { .then((res) => {
bus.$emit('getSeatList', res) bus.$emit('getSeatList', res);
// const data = JSON.parse(sessionStorage.getItem("oldconference")); // const data = JSON.parse(sessionStorage.getItem("oldconference"));
//交换rowindex 和colindex 数据是相反的 再获取时直接交换提交时在交换回去 //交换rowindex 和colindex 数据是相反的 再获取时直接交换提交时在交换回去
for (let i in res.data.data.confSeatVoList) { for (let i in res.data.data.confSeatVoList) {
;[res.data.data.confSeatVoList[i].colIndex, res.data.data.confSeatVoList[i].rowIndex] = [ [
res.data.data.confSeatVoList[i].rowIndex,
res.data.data.confSeatVoList[i].colIndex, res.data.data.confSeatVoList[i].colIndex,
] res.data.data.confSeatVoList[i].rowIndex,
] = [
res.data.data.confSeatVoList[i].rowIndex,
res.data.data.confSeatVoList[i].colIndex,
];
} }
this.seatList = res.data.data.confSeatVoList this.seatList = res.data.data.confSeatVoList;
this.seatLists = res.data.data this.seatLists = res.data.data;
bus.$emit('upList', this.seatList) bus.$emit('upList', this.seatList);
bus.$emit('iscraryy', res.data.data.isCarryOut, false) bus.$emit('iscraryy', res.data.data.isCarryOut, false);
this.changeY(this.seatLists.col) this.changeY(this.seatLists.col);
this.changeX(this.seatLists.row) this.changeX(this.seatLists.row);
this.changeLayoutName(this.seatLists.confLayoutName) this.changeLayoutName(this.seatLists.confLayoutName);
// console.log( // console.log(
// 'this.$route.query.conference', // 'this.$route.query.conference',
// this.$route.query.conference // this.$route.query.conference
// ) // )
const conferenceDeatil = JSON.parse(sessionStorage.getItem('conferenceDeatil')) const conferenceDeatil = JSON.parse(
this.isShow = 3 sessionStorage.getItem('conferenceDeatil')
);
this.isShow = 3;
}) })
.then((res) => { .then((res) => {
this.flages = false this.flages = false;
}) });
} else { } else {
this.flages = false this.flages = false;
} }
}, },
handleClose(done) { handleClose(done) {
this.$confirm('确认关闭？') this.$confirm('确认关闭？')
.then((_) => { .then((_) => {
done() done();
}) })
.catch((_) => {}) .catch((_) => { });
}, },
// 根据点击的按钮设置框选的状态是1.座位 2.主席台 3.舞台 4.橡皮擦 // 根据点击的按钮设置框选的状态是1.座位 2.主席台 3.舞台 4.橡皮擦
markSeats(e) { markSeats(e) {
this.$refs.coordinateSystem.markSeats(e) this.$refs.coordinateSystem.markSeats(e);
}, },
//清空区域 //清空区域
cleanAraeList(msg) { cleanAraeList(msg) {
this.$refs.coordinateSystem.cleanAreaList() this.$refs.coordinateSystem.cleanAreaList();
}, },
//调用组件的保存方法 //调用组件的保存方法
confirm() { confirm() {
if (!this.$store.state.conFlag) { if (!this.$store.state.conFlag) {
this.intercept = true this.intercept = true;
} }
this.$store.commit('changeFlags', true) this.$store.commit('changeFlags', true);
if (this.intercept) { if (this.intercept) {
console.log(112321321) console.log(112321321);
this.$refs.coordinateSystem.confirm() this.$refs.coordinateSystem.confirm();
this.changeorderIndex(0) this.changeorderIndex(0);
this.intercept = false this.intercept = false;
} }
}, },
leave() { leave() {
const _this = this const _this = this;
window.onbeforeunload = function (e) { window.onbeforeunload = function (e) {
if (_this.$route.name == '') { if (_this.$route.name == '') {
e = e || window.event e = e || window.event;
// 兼容IE8和Firefox 4之前的版本 // 兼容IE8和Firefox 4之前的版本
if (e) { if (e) {
e.returnValue = '关闭提示1111' e.returnValue = '关闭提示1111';
} }
// Chrome, Safari, Firefox 4+, Opera 12+ , IE 9+ // Chrome, Safari, Firefox 4+, Opera 12+ , IE 9+
return '关闭提示222' return '关闭提示222';
} }
window.onbeforeunload = null window.onbeforeunload = null;
} };
}, },
showArea() { showArea() {
if (this.isShow == 1) { if (this.isShow == 1) {
if (this.$refs.controllerAside.showArea()) { if (this.$refs.controllerAside.showArea()) {
this.isShow++ this.isShow++;
} }
} else if (this.isShow == 2) { } else if (this.isShow == 2) {
this.$refs.controllerAside.showRule() this.$refs.controllerAside.showRule();
console.log(this.isShow) console.log(this.isShow);
} }
}, },
goBack() { goBack() {
// console.log(this.$store.state.index) // console.log(this.$store.state.index)
// const { index } = this.$route.query // const { index } = this.$route.query
// console.log(index) // console.log(index)
console.log(this.isShow) console.log(this.isShow);
if (this.isShow == 2) { if (this.isShow == 2) {
this.$refs.controllerAside.showXY() this.$refs.controllerAside.showXY();
console.log(this.isShow) console.log(this.isShow);
} else if (this.isShow == 3) { } else if (this.isShow == 3) {
console.log(this.isShow) console.log(this.isShow);
this.$refs.controllerAside.showareas() this.$refs.controllerAside.showareas();
this.isShow-- this.isShow--;
} }
}, },
}, },
beforeUpdate() { beforeUpdate() {
bus.$on('showXY', (msg) => { bus.$on('showXY', (msg) => {
if (msg) { if (msg) {
this.isShow = 1 this.isShow = 1;
} }
}) });
}, },
destroyed() { destroyed() {
this.$store.commit('changeFlags', false) this.$store.commit('changeFlags', false);
}, },
mounted() { mounted() {
bus.$on('prop_x', (value) => { bus.$on('prop_x', (value) => {
this.row = value - 2 this.row = value - 2;
}) });
bus.$on('prop_y', (value) => { bus.$on('prop_y', (value) => {
this.clo = value - 2 this.clo = value - 2;
}) });
bus.$on('isShow', (value) => { bus.$on('isShow', (value) => {
console.log(value) console.log(value);
this.isShow = 3 this.isShow = 3;
}) });
this.isShow = 1 this.isShow = 1;
this.conferenceName = this.$route.query.conference this.conferenceName = this.$route.query.conference;
// console.log(this.$route.query.tableTag) // console.log(this.$route.query.tableTag)
if (this.$route.query.tableTag) { if (this.$route.query.tableTag) {
this.lableRightWidth = '380px' this.lableRightWidth = '380px';
bus.$emit('tableTag', true) bus.$emit('tableTag', true);
} }
bus.$on('btnflag', (msg) => { bus.$on('btnflag', (msg) => {
this.$store.commit('changeFlags', msg) this.$store.commit('changeFlags', msg);
}) });
bus.$on('left', (msg) => { bus.$on('left', (msg) => {
this.left = msg this.left = msg;
}) });
this.getSeatList() this.getSeatList();
}, },
beforeDestroy() { beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题 //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
bus.$off('backList') bus.$off('backList');
bus.$off('showRule1') bus.$off('showRule1');
bus.$off('iscraryy') bus.$off('iscraryy');
bus.$off('btnshow') bus.$off('btnshow');
bus.$off('showArea') bus.$off('showArea');
bus.$off('showRule2') bus.$off('showRule2');
bus.$off('deleteList') bus.$off('deleteList');
bus.$off('Multiple') bus.$off('Multiple');
this.changeLayoutName('') this.changeLayoutName('');
this.changeTempleteName('') this.changeTempleteName('');
this.changeorderIndex(0) this.changeorderIndex(0);
sessionStorage.removeItem('newconference') sessionStorage.removeItem('newconference');
sessionStorage.removeItem('oldconference') sessionStorage.removeItem('oldconference');
}, },
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.hallSeat { .hallSeat {
height: 100%; height: 100%;
display: flex; display: flex;
......
src/views/meetingPlace/pages/edit/components/ControllerAside.vue
浏览文件 @ 5ba2a1df
...@@ -13,13 +13,7 @@ ...@@ -13,13 +13,7 @@
<div class="value">{{tableTagShow?'电子桌签':'编辑'}}</div> <div class="value">{{tableTagShow?'电子桌签':'编辑'}}</div>
</div> </div>
<el-timeline class="items"> <el-timeline class="items">
<el-timeline-item <el-timeline-item placement="top" size="large" color="#C6E2FF" v-show="visibleText" style="width:300px">
placement="top"
size="large"
color="#C6E2FF"
v-show="visibleText"
style="width:300px"
>
<el-card v-show="visibleText"> <el-card v-show="visibleText">
<div slot="header"> <div slot="header">
<span>编辑布局</span> <span>编辑布局</span>
...@@ -30,13 +24,7 @@ ...@@ -30,13 +24,7 @@
<div class="dec_add"> <div class="dec_add">
<!-- <span @click="cutsY" <!-- <span @click="cutsY"
class="el-input-number__decrease">-</span>--> class="el-input-number__decrease">-</span>-->
<el-input <el-input v-model="y1" class="num" controls-position="right" placeholder @input="ChangeY" />
v-model="y1"
class="num"
controls-position="right"
placeholder
@input="ChangeY"
/>
<div class="right"> <div class="right">
<div class="el-input-number__add" @click="addY"> <div class="el-input-number__add" @click="addY">
<div class="img"></div> <div class="img"></div>
...@@ -85,11 +73,7 @@ ...@@ -85,11 +73,7 @@
</div> </div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div <div :class="[active == 2 ? 'active2' : 'unchecked']" class="seatButton" @click="markSeats('leader')">
:class="[active == 2 ? 'active2' : 'unchecked']"
class="seatButton"
@click="markSeats('leader')"
>
主席台 主席台
<div v-show="active != 2" class="box"> <div v-show="active != 2" class="box">
<img src="../../../../../assets/img/角标.png" /> <img src="../../../../../assets/img/角标.png" />
...@@ -99,33 +83,17 @@ ...@@ -99,33 +83,17 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div <div :class="[active == 3 ? 'active3' : 'unchecked']" class="seatButton" @click="markSeats('stage')">
:class="[active == 3 ? 'active3' : 'unchecked']"
class="seatButton"
@click="markSeats('stage')"
>
主席台背景 主席台背景
<img <img v-show="active != 3" class="box" src="../../../../../assets/img/矩形 2425(1).png" />
v-show="active != 3"
class="box"
src="../../../../../assets/img/矩形 2425(1).png"
/>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div <div :class="[active == 1 ? 'active1' : 'unchecked']" class="seatButton" @click="markSeats('normal')">
:class="[active == 1 ? 'active1' : 'unchecked']"
class="seatButton"
@click="markSeats('normal')"
>
普通座位 普通座位
<img <img v-show="active != 1" class="box" src="../../../../../assets/img/矩形 2425.png" />
v-show="active != 1"
class="box"
src="../../../../../assets/img/矩形 2425.png"
/>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -139,19 +107,12 @@ ...@@ -139,19 +107,12 @@
</el-timeline-item> </el-timeline-item>
<!-- 第二步 --> <!-- 第二步 -->
<el-timeline-item <el-timeline-item placement="top" size="large" color="#C6E2FF" v-show="araeShow" class="two" style="width:300px">
placement="top"
size="large"
color="#C6E2FF"
v-show="araeShow"
class="two"
style="width:300px"
>
<el-card> <el-card>
<div slot="header"> <div slot="header">
<span>座位号编辑</span> <span>座位号编辑</span>
</div> </div>
<div class="explain" style="height: 110px; "> <div class="explain" style="height: 115px; ">
操作说明： 操作说明：
<br />先在左侧，划选座位范围，点击“新增区域”；再选择“座位编号规则”，设置起始排、列的编号。支持手工调整座位号 <br />先在左侧，划选座位范围，点击“新增区域”；再选择“座位编号规则”，设置起始排、列的编号。支持手工调整座位号
（若座位号规则为“中左右、中右左”，需手工选定“1号位”。） （若座位号规则为“中左右、中右左”，需手工选定“1号位”。）
...@@ -170,12 +131,7 @@ ...@@ -170,12 +131,7 @@
<el-card style="width:300px"> <el-card style="width:300px">
<div v-show="upperStrata(i,index)" @click="notClick" class="upperStrata"></div> <div v-show="upperStrata(i,index)" @click="notClick" class="upperStrata"></div>
<div class="close"> <div class="close">
<img <img @click="delform(index)" src="../../../../../assets/img/关闭 .png" alt="删除" title="删除" />
@click="delform(index)"
src="../../../../../assets/img/关闭 .png"
alt="删除"
title="删除"
/>
</div> </div>
<el-form :model="i"> <el-form :model="i">
...@@ -183,46 +139,22 @@ ...@@ -183,46 +139,22 @@
<el-input v-model="i.areaName" placeholder /> <el-input v-model="i.areaName" placeholder />
</el-form-item> </el-form-item>
<el-form-item label="座位编号：" label-width="80px"> <el-form-item label="座位编号：" label-width="80px">
<el-select <el-select v-model="i.sortType" clearable placeholder="请选择" @change="chooseRule1(i,index)">
v-model="i.sortType" <el-option v-for="item in ruleList" :key="item.value" :label="item.label" :value="item.value"></el-option>
clearable
placeholder="请选择"
@change="chooseRule1(i,index)"
>
<el-option
v-for="item in ruleList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label label-width="80px"> <el-form-item label label-width="80px">
<label slot="label">&nbsp;</label> <label slot="label">&nbsp;</label>
<!-- <div class="buttonFun"> --> <!-- <div class="buttonFun"> -->
<div <div class="oneBtn" v-show="i.sortType==2||i.sortType==6" :class="i.btnFun==0?'formBtnActive':''" @click="changeOne(index)">更改1号位</div>
class="oneBtn" <div class="towBtn" :class="i.btnFun==1?'formBtnActive':''" @click="adjustTheSeat(index)">调整座位号</div>
v-show="i.sortType==2||i.sortType==6"
:class="i.btnFun==0?'formBtnActive':''"
@click="changeOne(index)"
>更改1号位</div>
<div
class="towBtn"
:class="i.btnFun==1?'formBtnActive':''"
@click="adjustTheSeat(index)"
>调整座位号</div>
<!-- </div> --> <!-- </div> -->
</el-form-item> </el-form-item>
<el-form-item label="分组Id" label-width="70px" v-show="false"> <el-form-item label="分组Id" label-width="70px" v-show="false">
<el-input v-model="i.areaId" placeholder /> <el-input v-model="i.areaId" placeholder />
</el-form-item> </el-form-item>
<el-form-item label="起始列：" label-width="80px"> <el-form-item label="起始列：" label-width="80px">
<el-input <el-input v-model="i.row" placeholder onkeyup="value=value.replace(/[^\d]/g,'')" style="text-align: center">
v-model="i.row"
placeholder
onkeyup="value=value.replace(/[^\d]/g,'')"
style="text-align: center"
>
<template slot="append">列</template> <template slot="append">列</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -236,24 +168,13 @@ ...@@ -236,24 +168,13 @@
label-width="90px"> label-width="90px">
<el-color-picker v-model="form.color1"></el-color-picker> <el-color-picker v-model="form.color1"></el-color-picker>
</el-form-item>--> </el-form-item>-->
<el-button <el-button type="primary" :class="isConfirm[index] || isSaved[index]?'unsaved':'saved'" @click="isConfirm[index] || isSaved[index]? setForm(i.sortType,index):''">保存区域</el-button>
type="primary"
:class="isConfirm[index] || isSaved[index]?'unsaved':'saved'"
@click="isConfirm[index] || isSaved[index]? setForm(i.sortType,index):''"
>保存区域</el-button>
</el-form> </el-form>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
</div> </div>
<!-------------------------第三步---------------------------------------> <!-------------------------第三步--------------------------------------->
<el-timeline-item <el-timeline-item placement="top" size="large" color="#C6E2FF" v-if="ruleShow" class="three" style="width:300px">
placement="top"
size="large"
color="#C6E2FF"
v-if="ruleShow"
class="three"
style="width:300px"
>
<el-card> <el-card>
<div slot="header"> <div slot="header">
<span>排座中心位编辑</span> <span>排座中心位编辑</span>
...@@ -266,50 +187,21 @@ ...@@ -266,50 +187,21 @@
<div v-for="(item,index) in ruleLists" :key="index" class="list"> <div v-for="(item,index) in ruleLists" :key="index" class="list">
<div class="list_lable">{{item.label}}：</div> <div class="list_lable">{{item.label}}：</div>
<div class="click"> <div class="click">
<div <div class="check" :class="isActive==index && isCheck?'isActive':''" v-if="item.value == 1 || item.value == 2" @click="switchClick(item.value,index)">调整中心位</div>
class="check" <div class="check" :class="isActive==index && !isCheck?'isActive':''" @click="chooseRule(item.value,index)">查看</div>
:class="isActive==index && isCheck?'isActive':''"
v-if="item.value == 1 || item.value == 2"
@click="switchClick(item.value,index)"
>调整中心位</div>
<div
class="check"
:class="isActive==index && !isCheck?'isActive':''"
@click="chooseRule(item.value,index)"
>查看</div>
</div> </div>
</div> </div>
<div class="custom"> <!-- <div class="custom">
<div>自定义排座规则：</div> <div>自定义排座规则：</div>
<el-select <el-select size="small" v-model="customType" placeholder="请选择" @change="customChange()">
size="small" <el-option v-for="item in ruleLists2" :key="item.value" :label="item.label" :value="item.value"></el-option>
v-model="customType"
placeholder="请选择"
@change="customChange()"
>
<el-option
v-for="item in ruleLists2"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select> </el-select>
<div <div class="check" :class="isActive==6 && !isCheck?'isActive':''" @click="customClick">手工排序</div>
class="check" </div> -->
:class="isActive==6 && !isCheck?'isActive':''"
@click="customClick"
>手工排序</div>
</div>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<!-- 电子桌签 --> <!-- 电子桌签 -->
<el-timeline-item <el-timeline-item style="width:350px" ref="tableTag" id="tableTag" class="three" v-show="tableTagShow">
style="width:350px"
ref="tableTag"
id="tableTag"
class="three"
v-show="tableTagShow"
>
<el-card> <el-card>
<div slot="header"> <div slot="header">
<!-- <span>已绑定电子桌签{{(tableSignCardIdNum())}}个</span> --> <!-- <span>已绑定电子桌签{{(tableSignCardIdNum())}}个</span> -->
...@@ -339,12 +231,7 @@ ...@@ -339,12 +231,7 @@
</div> </div>
<div class="table_body" v-for="(item,index) in tableData" :key="index"> <div class="table_body" v-for="(item,index) in tableData" :key="index">
<span class="name" v-if="getOnceTableNum(item.arr)">{{item.name}}</span> <span class="name" v-if="getOnceTableNum(item.arr)">{{item.name}}</span>
<div <div class="table_body_row" v-for="(val, i) in item.arr" :key="i" :class="getTableSignCardId(val,item.arr)">
class="table_body_row"
v-for="(val, i) in item.arr"
:key="i"
:class="getTableSignCardId(val,item.arr)"
>
<div class="row" v-if="val.tableSignCardId"> <div class="row" v-if="val.tableSignCardId">
<div class="trueID">{{val.trueId.split(',')[1]}}</div> <div class="trueID">{{val.trueId.split(',')[1]}}</div>
<div class="cardID" :title="val.tableSignCardId">{{val.tableSignCardId}}</div> <div class="cardID" :title="val.tableSignCardId">{{val.tableSignCardId}}</div>
...@@ -382,7 +269,7 @@ import setDataList from '../suanfa' ...@@ -382,7 +269,7 @@ import setDataList from '../suanfa'
export default { export default {
name: 'ControllerAside', name: 'ControllerAside',
components: {}, components: {},
props: ['prop_x', 'prop_y', 'prop_templeteName', 'prop_templeteAddress', 'prop_templeteDetail', 'prop_templetelayout'], props: ['prop_x', 'prop_y', 'prop_templeteName', 'prop_templeteAddress', 'prop_templeteDetail', 'prop_templetelayout', "nextStep"],
data() { data() {
return { return {
idCardNum: 0, idCardNum: 0,
...@@ -409,6 +296,7 @@ export default { ...@@ -409,6 +296,7 @@ export default {
{ label: 'S型排座规则', value: 4 }, { label: 'S型排座规则', value: 4 },
{ label: '左→右排座规则', value: 5 }, { label: '左→右排座规则', value: 5 },
{ label: '右→左排座规则', value: 6 }, { label: '右→左排座规则', value: 6 },
// { label: 'N型排座规则', value: 7 },
], ],
ruleLists2: [ ruleLists2: [
// { lable: '请选择', value: 0 }, // { lable: '请选择', value: 0 },
...@@ -1762,14 +1650,15 @@ export default { ...@@ -1762,14 +1650,15 @@ export default {
if (this.newform.length != this.areaList.length) { if (this.newform.length != this.areaList.length) {
this.newform.shift() this.newform.shift()
} }
bus.$on('judgeSeat', (msg) => { // bus.$on('judgeSeat', (msg) => {
isNext = msg // isNext = msg
console.log(isNext) // console.log(isNext)
console.log(1111) // console.log(1111)
// console.log(this.isNext) // // console.log(this.isNext)
}) // })
bus.$emit('isNext') // bus.$emit('isNext')
if (isNext) { console.log('newxtStep', this.nextStep);
if (this.nextStep) {
// console.log('进') // console.log('进')
this.ruleShow = true this.ruleShow = true
this.araeShow = false this.araeShow = false
...@@ -1785,7 +1674,7 @@ export default { ...@@ -1785,7 +1674,7 @@ export default {
median = arrList[0][median].colIndex median = arrList[0][median].colIndex
} }
//传入所有的座位格子 //传入所有的座位格子
// let data = setDataList(this.allCheckList, median) // let data = setDataList(this.allCheckList, median)
let data = setDataList(this.allCheckList) let data = setDataList(this.allCheckList)
let areaList = this.areaList let areaList = this.areaList
...@@ -1959,7 +1848,7 @@ export default { ...@@ -1959,7 +1848,7 @@ export default {
// //
bus.$emit('cleanAraeList') bus.$emit('cleanAraeList')
}) })
.catch((_) => {}) .catch((_) => { })
} else { } else {
this.$message.error({ this.$message.error({
message: '暂无可清空分组', message: '暂无可清空分组',
...@@ -2187,13 +2076,15 @@ export default { ...@@ -2187,13 +2076,15 @@ export default {
return val.colIndex >= medianColIndex return val.colIndex >= medianColIndex
}) })
} }
if(aArr.length==1){ //特殊情况，只有一个坐位置时 ，直接认为就是中心位
if (aArr.length == 1) {
aArr[0].leftRightCenter2 = 1 aArr[0].leftRightCenter2 = 1
} }
let aNum = aArr.length let aNum = aArr.length
let bNum = bArr.length let bNum = bArr.length
// that.$set(bArr[0], 'leftRightCenter2', 1) // that.$set(bArr[0], 'leftRightCenter2', 1)
console.log('barr', bArr) console.log('barr', bArr)
//防止报错
if (bArr.length > 1) { if (bArr.length > 1) {
bArr[0].leftRightCenter2 = 1 bArr[0].leftRightCenter2 = 1
if (isCenterY) { if (isCenterY) {
...@@ -3805,14 +3696,14 @@ export default { ...@@ -3805,14 +3696,14 @@ export default {
right: 0; right: 0;
bottom: 0; bottom: 0;
margin: auto; margin: auto;
background-image: url('../../../../../assets/img/形状 2216.png'); background-image: url("../../../../../assets/img/形状 2216.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
.el-input-number__dec:hover { .el-input-number__dec:hover {
.img { .img {
background-image: url('../../../../../assets/img/形状 2216(1).png'); background-image: url("../../../../../assets/img/形状 2216(1).png");
} }
} }
.el-input-number__add { .el-input-number__add {
...@@ -3831,14 +3722,14 @@ export default { ...@@ -3831,14 +3722,14 @@ export default {
right: 0; right: 0;
bottom: 0; bottom: 0;
margin: auto; margin: auto;
background-image: url('../../../../../assets/img/形状 2216 拷贝(1).png'); background-image: url("../../../../../assets/img/形状 2216 拷贝(1).png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
.el-input-number__add:hover { .el-input-number__add:hover {
.img { .img {
background-image: url('../../../../../assets/img/形状 2216 拷贝.png'); background-image: url("../../../../../assets/img/形状 2216 拷贝.png");
} }
} }
} }
...@@ -4183,6 +4074,10 @@ export default { ...@@ -4183,6 +4074,10 @@ export default {
box-shadow: 0px 1px 8px 0px rgba(84, 116, 232, 0.2); box-shadow: 0px 1px 8px 0px rgba(84, 116, 232, 0.2);
border: 1px solid #5474e8; border: 1px solid #5474e8;
cursor: pointer; cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
} }
.check:first-child { .check:first-child {
margin-right: 8px; margin-right: 8px;
...@@ -4190,7 +4085,7 @@ export default { ...@@ -4190,7 +4085,7 @@ export default {
.revise { .revise {
width: 18px; width: 18px;
height: 18px; height: 18px;
background-image: url('../../../../../assets/img/编辑 拷贝.png'); background-image: url("../../../../../assets/img/编辑 拷贝.png");
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-left: 13px; margin-left: 13px;
...@@ -4521,7 +4416,7 @@ export default { ...@@ -4521,7 +4416,7 @@ export default {
border-radius: 4px; border-radius: 4px;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
font-family: 'Regular'; font-family: "Regular";
cursor: pointer; cursor: pointer;
} }
} }
...@@ -4552,7 +4447,7 @@ export default { ...@@ -4552,7 +4447,7 @@ export default {
// height: 32px; // height: 32px;
background: #fff; background: #fff;
border-radius: 2px; border-radius: 2px;
line-height: 32px; // line-height: 32px;
color: #5474e8; color: #5474e8;
font-weight: 400; font-weight: 400;
font-size: 14px; font-size: 14px;
......
src/views/meetingPlace/pages/edit/components/CoordinateSystem.vue
浏览文件 @ 5ba2a1df
<template> <template>
<div <div v-loading="loading" class="pages" @mousemove.stop.prevent.left="drag($event)"
v-loading="loading" @mouseup.stop.prevent.left="end($event)" @mouseleave.stop.prevent.left="fix($event)" @click="cleanActive()">
class="pages"
@mousemove.stop.prevent.left="drag($event)"
@mouseup.stop.prevent.left="end($event)"
@mouseleave.stop.prevent.left="fix($event)"
@click="cleanActive()"
>
<div class="seatSelectArea" ref="seatSelectArea" id="seatSelectArea"> <div class="seatSelectArea" ref="seatSelectArea" id="seatSelectArea">
<div <div @mousedown.stop.prevent.left="move ? start($event) : false"
@mousedown.stop.prevent.left="move ? start($event) : false" @click.stop.prevent="onClick ? toChangeSeat($event) : ''" class="seatArea" ref="select" :style="{
@click.stop.prevent="onClick?toChangeSeat($event):''"
class="seatArea"
ref="select"
:style="{
width: seatAreaWidth + 'px', width: seatAreaWidth + 'px',
height: seatAreaHeight + 'px', height: seatAreaHeight + 'px',
}" }" v-show="x !== 0 && y !== 0">
v-show="x !== 0 && y !== 0"
>
<!-- @click.stop.prevent="onClick?toChangeSeat($event):''" --> <!-- @click.stop.prevent="onClick?toChangeSeat($event):''" -->
<template v-for="(seatItem, index) in seatList"> <template v-for="(seatItem, index) in seatList">
<div <div v-show="confimFlag" class="title" :id="index" :key="index" :style="`top: ${getHalfTop(
v-show="confimFlag" seatItem,
class="title" index
:id="index" )}px;left: ${getHalfDistance(seatItem, index)}px;`">
:key="index"
:style="`top: ${getHalfTop(
seatItem,
index
)}px;left: ${getHalfDistance(seatItem, index)}px;`"
>
<span :style="`color:${color(seatItem)}`"> <span :style="`color:${color(seatItem)}`">
{{ {{ generateTitle(seatItem, index) }}
generateTitle(seatItem, index)
}}
</span> </span>
</div> </div>
<div <div ref="seatItem" :x="seatItem.y" :y="seatItem.x" class="seatItem" :id="seatItem.x + '-' + seatItem.y" :class="{
ref="seatItem" active: active == seatItem.x + '-' + seatItem.y,
:x="seatItem.y" }" :data-index="seatItem.x + '-' + seatItem.y" :straIndex="index"
:y="seatItem.x" :key="'x' + seatItem.y + 'y' + seatItem.x" :style="
class="seatItem" confimFlag ? getBorder(seatItem) : getBorders(seatItem)
:id="seatItem.x + '-' + seatItem.y" " @contextmenu.prevent="
:class="{ active: active == seatItem.x + '-' + seatItem.y }" nextr ? rightClick($event, index) : false
:data-index="seatItem.x + '-' + seatItem.y" " @click="
:straIndex="index" nextr
:key="'x' + seatItem.y + 'y' + seatItem.x" ? handleClick($event, index)
:style="confimFlag ? getBorder(seatItem) : getBorders(seatItem)" : custom($event, index)
@contextmenu.prevent="nextr ? rightClick($event, index) : false" ">
@click="nextr ? handleClick($event, index) : custom($event, index)"
>
<span class="areaName" v-if="confimFlag"> <span class="areaName" v-if="confimFlag">
{{ {{ getName(seatItem) }}
getName(seatItem)
}}
</span> </span>
<!-- 第二步的座位显示 --> <!-- 第二步的座位显示 -->
<span <span id="areas" class="areaNames" :class="[
id="areas" seatItem.leftRightCenter2 == 1 ||
class="areaNames" seatItem.rightLeftCenter2 == 1
:class="[seatItem.leftRightCenter2==1 || seatItem.rightLeftCenter2==1?'center':'',pointer(seatItem)==true&& isPointer?'pointer':'',tableTag&&seatItem.tableSignCardId?'bind':'']" ? 'center'
@mousedown="tableTag?binding(seatItem): seatItemClick2(seatItem)" : '',
v-show="confimFlag" pointer(seatItem) == true && isPointer
> ? 'pointer'
{{ : '',
getName2(seatItem) tableTag && seatItem.tableSignCardId ? 'bind' : '',
}} ]" @mousedown="
tableTag
? binding(seatItem)
: seatItemClick2(seatItem)
" v-show="confimFlag">
{{ getName2(seatItem) }}
</span> </span>
<!-- @click.stop="switchClick2? seatItemClick2(seatItem):''" --> <!-- @click.stop="switchClick2? seatItemClick2(seatItem):''" -->
<!-- 第三步的座位显示 --> <!-- 第三步的座位显示 -->
<span <span class="areaNames" :class="[
class="areaNames" seatItem.leftRightCenter == 1 && sortType == 1
:class="[seatItem.leftRightCenter == 1 && sortType == 1 ?'center':seatItem.rightLeftCenter==1 && sortType==2?'center':'',pointer2(seatItem) && isPointer2?'pointer':'']" ? 'center'
@mousedown="(sortType == 1 && switchClick==1 && seatItem.orderArr != null)|| (sortType==2 && switchClick==2 && seatItem.orderArr != null) ?seatItemClick3(seatItem):''" : seatItem.rightLeftCenter == 1 && sortType == 2
v-show="ruleFlag" ? 'center'
> : '',
{{ pointer2(seatItem) && isPointer2 ? 'pointer' : '',
getOrderIndex(seatItem) ]" @mousedown="
}} ; (sortType == 1 &&
switchClick == 1 &&
seatItem.orderArr != null) ||
(sortType == 2 &&
switchClick == 2 &&
seatItem.orderArr != null)
? seatItemClick3(seatItem)
: ''
" v-show="ruleFlag">
{{ getOrderIndex(seatItem) }}
</span> </span>
<span <span v-show="confimFlag" class="doorcoord" :style="{
v-show="confimFlag" transform:
class="doorcoord" 'translate(' +
:style="{ `${seatItem.coordx}` +
transform: 'px,' +
'translate(' + `${seatItem.coordy}` +
`${seatItem.coordx}` + 'px)',
'px,' + }">
`${seatItem.coordy}` +
'px)',
}"
>
{{ {{
seatItem.notShow === false seatItem.notShow === false
? "" ? ''
: seatItem.x == 1 : seatItem.x == 1
? seatItem.y - 1 ? seatItem.y - 1
: seatItem.y == 1 : seatItem.y == 1
? seatItem.x - 1 ? seatItem.x - 1
: seatItem.y == y : seatItem.y == y
? seatItem.x - 1 ? seatItem.x - 1
: seatItem.x == x : seatItem.x == x
? seatItem.y - 1 ? seatItem.y - 1
: "" : ''
}} }}
</span> </span>
<span <span v-if="seatItem.backimg" class="doorName" :data-span="seatItem.y + '-' + seatItem.x" :style="{
v-if="seatItem.backimg" transform:
class="doorName" 'translate(' +
:data-span="seatItem.y + '-' + seatItem.x" `${seatItem.offectO}` +
:style="{ 'rem,' +
transform: `${seatItem.offectT}` +
'translate(' + 'rem)',
`${seatItem.offectO}` + }">{{ seatItem.name }}</span>
'rem,' + <img v-if="seatItem.backimg" :src="seatItem.backimg" :style="{
`${seatItem.offectT}` + transform: 'rotate(' + `${seatItem.rotate}` + 'deg)',
'rem)', }" />
}"
>{{ seatItem.name }}</span>
<img
v-if="seatItem.backimg"
:src="seatItem.backimg"
:style="{
transform: 'rotate(' + `${seatItem.rotate}` + 'deg)',
}"
/>
</div> </div>
</template> </template>
</div> </div>
</div> </div>
<!-- 门名称弹窗 --> <!-- 门名称弹窗 -->
<el-dialog <el-dialog title="设置门" :visible.sync="dialogVisible" width="300px" :before-close="handleClose" append-to-body>
title="设置门"
:visible.sync="dialogVisible"
width="300px"
:before-close="handleClose"
append-to-body
>
<el-form :model="formDoor" label-width="80px"> <el-form :model="formDoor" label-width="80px">
<el-form-item label="门名称"> <el-form-item label="门名称">
<el-input v-model="formDoor.name"></el-input> <el-input v-model="formDoor.name"></el-input>
...@@ -161,24 +132,30 @@ ...@@ -161,24 +132,30 @@
<div v-show="menuVisible"> <div v-show="menuVisible">
<ul id="menu" class="menu"> <ul id="menu" class="menu">
<li class="menu__item" @click="cleanChart()">清空</li> <li class="menu__item" @click="cleanChart()">清空</li>
<li class="menu__item" @click="insertPeople(3)" v-if="flag">向上插入过道</li> <li class="menu__item" @click="insertPeople(3)" v-if="flag">
<li class="menu__item" @click="insertPeople(4)" v-if="flag">向下插入过道</li> 向上插入过道
<li class="menu__item" @click="insertPeople(1)" v-if="flag">向左插入过道</li> </li>
<li class="menu__item" @click="insertPeople(2)" v-if="flag">向右插入过道</li> <li class="menu__item" @click="insertPeople(4)" v-if="flag">
<li class="menu__item" @click="deleteRowOrCol(1)" v-if="flag">删除行</li> 向下插入过道
<li class="menu__item" @click="deleteRowOrCol(2)" v-if="flag">删除列</li> </li>
<li class="menu__item" @click="insertPeople(1)" v-if="flag">
向左插入过道
</li>
<li class="menu__item" @click="insertPeople(2)" v-if="flag">
向右插入过道
</li>
<li class="menu__item" @click="deleteRowOrCol(1)" v-if="flag">
删除行
</li>
<li class="menu__item" @click="deleteRowOrCol(2)" v-if="flag">
删除列
</li>
</ul> </ul>
</div> </div>
<drag-div :left="left" :top="top" :width="width" :height="height" v-show="showDrag"></drag-div> <drag-div :left="left" :top="top" :width="width" :height="height" v-show="showDrag"></drag-div>
<el-dialog <el-dialog title="调整座位号" :visible.sync="changeSeat" class="saveCon" width="500px" append-to-body
title="调整座位号" :before-close="handleClose">
:visible.sync="changeSeat"
class="saveCon"
width="500px"
append-to-body
:before-close="handleClose"
>
<div class="changeSeats"> <div class="changeSeats">
<div>原座位号：{{ changeSeatName }}</div> <div>原座位号：{{ changeSeatName }}</div>
<div class="newSeat"> <div class="newSeat">
...@@ -192,12 +169,8 @@ ...@@ -192,12 +169,8 @@
/>排 />排
</div>--> </div>-->
<div> <div>
<input <input type="text" oninput="value = value.replace(/[^0-9]/g,'')" class="seatInput"
type="text" v-model="seatNum.col" />&nbsp;座
oninput="value = value.replace(/[^0-9]/g,'')"
class="seatInput"
v-model="seatNum.col"
/>&nbsp;座
</div> </div>
</div> </div>
</div> </div>
...@@ -207,14 +180,8 @@ ...@@ -207,14 +180,8 @@
<el-button type="primary" @click="surechange()">确认</el-button> <el-button type="primary" @click="surechange()">确认</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog title="调整排位规则号" :visible.sync="changeSeat2" class="saveCon" width="500px" append-to-body
title="调整排位规则号" :before-close="handleClose2">
:visible.sync="changeSeat2"
class="saveCon"
width="500px"
append-to-body
:before-close="handleClose2"
>
<div class="changeSeats"> <div class="changeSeats">
<div>原排位规则号：{{ changeSeatName }}</div> <div>原排位规则号：{{ changeSeatName }}</div>
<div class="newSeat"> <div class="newSeat">
...@@ -228,12 +195,8 @@ ...@@ -228,12 +195,8 @@
/>排 />排
</div>--> </div>-->
<div> <div>
<input <input type="text" oninput="value = value.replace(/[^0-9]/g,'')" class="seatInput"
type="text" v-model="seatNum.col" />&nbsp;座
oninput="value = value.replace(/[^0-9]/g,'')"
class="seatInput"
v-model="seatNum.col"
/>&nbsp;座
</div> </div>
</div> </div>
</div> </div>
...@@ -249,17 +212,13 @@ ...@@ -249,17 +212,13 @@
<el-input class="trueId" disabled v-model="tableTagVal.trueId" autocomplete="off"></el-input> <el-input class="trueId" disabled v-model="tableTagVal.trueId" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="电子桌签：" :label-width="formLabelWidth"> <el-form-item label="电子桌签：" :label-width="formLabelWidth">
<el-input <el-input class="number" placeholder="请输入电子桌签编码" type="number" v-model="tableTagVal.tableSignCardId"
class="number" oninput="if(value.length > 20) value=value.slice(0, 20)" autocomplete="off"></el-input>
placeholder="请输入电子桌签编码"
type="number"
v-model="tableTagVal.tableSignCardId"
oninput="if(value.length > 20) value=value.slice(0, 20)"
autocomplete="off"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label :label-width="formLabelWidth"> <el-form-item label :label-width="formLabelWidth">
<div class="zhu">注：一个座位只能绑定一个电子桌签，支持更换、解绑。</div> <div class="zhu">
注：一个座位只能绑定一个电子桌签，支持更换、解绑。
</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -268,23 +227,12 @@ ...@@ -268,23 +227,12 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 上传桌签ID --> <!-- 上传桌签ID -->
<el-dialog <el-dialog :before-close="closeDownLoad" class="uploadCardId" title="批量绑定" :visible.sync="dialogUploadCardId">
:before-close="closeDownLoad" <el-upload class="upload-demo" :on-change="handleChange" :action="actionUrl" :http-request="
class="uploadCardId" data => {
title="批量绑定" upload(data)
:visible.sync="dialogUploadCardId" }
> " :file-list="fileList">
<el-upload
class="upload-demo"
:on-change="handleChange"
:action="actionUrl"
:http-request="
(data) => {
upload(data);
}"
:file-list="fileList"
:auto-upload='false'
>
<div class="upload"> <div class="upload">
<el-button size="small" type="primary">点击上传</el-button> <el-button size="small" type="primary">点击上传</el-button>
</div> </div>
...@@ -306,6 +254,7 @@ import menu from './right-click-menu/index.vue' ...@@ -306,6 +254,7 @@ import menu from './right-click-menu/index.vue'
import bus from '../eventBus' import bus from '../eventBus'
import setDataList from '../suanfa' import setDataList from '../suanfa'
import baseUrl from '@/axios/index' import baseUrl from '@/axios/index'
import { Promise } from 'q'
export default { export default {
name: 'CoordinateSystem', name: 'CoordinateSystem',
components: { components: {
...@@ -313,7 +262,13 @@ export default { ...@@ -313,7 +262,13 @@ export default {
menu, menu,
}, },
props: ['prop_x', 'prop_y', 'prop_seatList', 'prop_templeteId', 'prop_editorAreaList'], props: [
'prop_x',
'prop_y',
'prop_seatList',
'prop_templeteId',
'prop_editorAreaList',
],
data() { data() {
return { return {
newSeatList: null, newSeatList: null,
...@@ -439,14 +394,15 @@ export default { ...@@ -439,14 +394,15 @@ export default {
Time: null, Time: null,
onClick: false, onClick: false,
seatList2: [], seatList2: [],
nextStep: true,
} }
}, },
watch: { watch: {
screenWidth: { screenWidth: {
handler(newv, oldv) {}, handler(newv, oldv) { },
}, },
scrollTop: { scrollTop: {
handler(newv, oldv) {}, handler(newv, oldv) { },
}, },
move: { move: {
handler(newv, oldv) { handler(newv, oldv) {
...@@ -454,7 +410,7 @@ export default { ...@@ -454,7 +410,7 @@ export default {
}, },
}, },
scrollLeft: { scrollLeft: {
handler(newv, oldv) {}, handler(newv, oldv) { },
}, },
seatListBack(newval, oldval) { seatListBack(newval, oldval) {
if (newval) { if (newval) {
...@@ -482,8 +438,8 @@ export default { ...@@ -482,8 +438,8 @@ export default {
}, },
computed: { computed: {
...mapState({ ...mapState({
orderIndex: (state) => state.orderIndex, orderIndex: state => state.orderIndex,
layoutName: (state) => state.layoutName, layoutName: state => state.layoutName,
}), }),
seatAreaWidth() { seatAreaWidth() {
return (this.seatItemWidth + this.shifting) * this.y return (this.seatItemWidth + this.shifting) * this.y
...@@ -516,7 +472,11 @@ export default { ...@@ -516,7 +472,11 @@ export default {
if (this.newSeatList[i].tableSignCardId != null) { if (this.newSeatList[i].tableSignCardId != null) {
console.log(this.newSeatList[i]) console.log(this.newSeatList[i])
console.log(this.seatList[i]) console.log(this.seatList[i])
this.$set(this.seatList[i], 'tableSignCardId', this.newSeatList[i].tableSignCardId) this.$set(
this.seatList[i],
'tableSignCardId',
this.newSeatList[i].tableSignCardId
)
let obj = this.seatListBack[i] let obj = this.seatListBack[i]
obj.tableSignCardId = this.seatList[i].tableSignCardId obj.tableSignCardId = this.seatList[i].tableSignCardId
this.fileList = [] this.fileList = []
...@@ -537,12 +497,12 @@ export default { ...@@ -537,12 +497,12 @@ export default {
console.log('11111') console.log('11111')
this.$axios this.$axios
.getCardExcel() .getCardExcel()
.then((res) => { .then(res => {
console.log(res) console.log(res)
window.open(this.actionUrl + res.data.data) window.open(this.actionUrl + res.data.data)
// window.open() // window.open()
}) })
.catch((err) => { .catch(err => {
// console.log(err) // console.log(err)
this.$message.error(`${err.data.msg}`) this.$message.error(`${err.data.msg}`)
}) })
...@@ -560,25 +520,34 @@ export default { ...@@ -560,25 +520,34 @@ export default {
uploadFile.append('file', data.file) uploadFile.append('file', data.file)
// this.uploadFile = uploadFile // this.uploadFile = uploadFile
console.log(uploadFile) console.log(uploadFile)
this.$axios.uploadCardExcel(this.layoutId, uploadFile).then((res) => { this.$axios
console.log(res) .uploadCardExcel(this.layoutId, uploadFile)
if (res.data.code == 200) { .then(res => {
// this.seatList console.log(res)
this.$message.success('上传成功！') if (res.data.code == 200) {
// this.seatList = res.data.data.confSeatVoList // this.seatList
this.newSeatList = res.data.data.confSeatVoList this.$message.success('上传成功！')
} else { // this.seatList = res.data.data.confSeatVoList
this.message.warning(`${res.data.msg}`) this.newSeatList = res.data.data.confSeatVoList
} } else {
}) this.message.warning(`${res.data.msg}`)
}
})
}, },
tableTagValConfirm() { tableTagValConfirm() {
// console.log(this.seatListBack) // console.log(this.seatListBack)
this.dialogFormVisible = false this.dialogFormVisible = false
this.$set(this.tableTagVal2, 'tableSignCardId', this.tableTagVal.tableSignCardId) this.$set(
this.tableTagVal2,
'tableSignCardId',
this.tableTagVal.tableSignCardId
)
// console.log('tableTagVal2', JSON.parse(JSON.stringify(this.tableTagVal2))) // console.log('tableTagVal2', JSON.parse(JSON.stringify(this.tableTagVal2)))
for (let i in this.seatList) { for (let i in this.seatList) {
if (this.seatList[i].x == this.tableTagVal2.x && this.seatList[i].y == this.tableTagVal2.y) { if (
this.seatList[i].x == this.tableTagVal2.x &&
this.seatList[i].y == this.tableTagVal2.y
) {
this.$set(this.seatList, i, this.tableTagVal2) this.$set(this.seatList, i, this.tableTagVal2)
let obj = this.seatListBack[i] let obj = this.seatListBack[i]
obj.tableSignCardId = this.seatList[i].tableSignCardId obj.tableSignCardId = this.seatList[i].tableSignCardId
...@@ -641,21 +610,35 @@ export default { ...@@ -641,21 +610,35 @@ export default {
// 清除原标记 // 清除原标记
if (this.sortType == 2) { if (this.sortType == 2) {
for (let i = 0; i < this.seatList.length; i++) { for (let i = 0; i < this.seatList.length; i++) {
if (obj.x == this.seatList[i].x && this.seatList[i].leftRightCenter2 == 1 && obj.editorAreaId == this.seatList[i].editorAreaId) { if (
obj.x == this.seatList[i].x &&
this.seatList[i].leftRightCenter2 == 1 &&
obj.editorAreaId == this.seatList[i].editorAreaId
) {
this.seatList[i].leftRightCenter2 = undefined this.seatList[i].leftRightCenter2 = undefined
console.log(this.seatList[i]) console.log(this.seatList[i])
} }
if (obj.x == this.seatList[i].x && obj.y == this.seatList[i].y) { if (
obj.x == this.seatList[i].x &&
obj.y == this.seatList[i].y
) {
this.seatList[i].leftRightCenter2 = 1 this.seatList[i].leftRightCenter2 = 1
} }
} }
} else if (this.sortType == 6) { } else if (this.sortType == 6) {
for (let i = 0; i < this.seatList.length; i++) { for (let i = 0; i < this.seatList.length; i++) {
if (obj.x == this.seatList[i].x && this.seatList[i].rightLeftCenter2 == 1 && obj.editorAreaId == this.seatList[i].editorAreaId) { if (
obj.x == this.seatList[i].x &&
this.seatList[i].rightLeftCenter2 == 1 &&
obj.editorAreaId == this.seatList[i].editorAreaId
) {
this.seatList[i].rightLeftCenter2 = null this.seatList[i].rightLeftCenter2 = null
console.log(this.seatList[i]) console.log(this.seatList[i])
} }
if (obj.x == this.seatList[i].x && obj.y == this.seatList[i].y) { if (
obj.x == this.seatList[i].x &&
obj.y == this.seatList[i].y
) {
this.seatList[i].rightLeftCenter2 = 1 this.seatList[i].rightLeftCenter2 = 1
} }
} }
...@@ -664,14 +647,26 @@ export default { ...@@ -664,14 +647,26 @@ export default {
this.currentIndex = {} this.currentIndex = {}
for (let i in this.seatList) { for (let i in this.seatList) {
if ( if (
(this.seatList[i].trueId && this.sortType == 2 && this.seatList[i].leftRightCenter2 != null) || (this.seatList[i].trueId &&
(this.seatList[i].trueId && this.sortType == 6 && this.seatList[i].rightLeftCenter2 != null) this.sortType == 2 &&
this.seatList[i].leftRightCenter2 != null) ||
(this.seatList[i].trueId &&
this.sortType == 6 &&
this.seatList[i].rightLeftCenter2 != null)
) { ) {
if (this.currentIndex.hasOwnProperty(`${this.seatList[i].editorAreaId}`)) { if (
this.currentIndex[`${this.seatList[i].editorAreaId}`].push(this.seatList[i].y) this.currentIndex.hasOwnProperty(
`${this.seatList[i].editorAreaId}`
)
) {
this.currentIndex[
`${this.seatList[i].editorAreaId}`
].push(this.seatList[i].y)
} else { } else {
this.currentIndex[`${this.seatList[i].editorAreaId}`] = [] this.currentIndex[`${this.seatList[i].editorAreaId}`] = []
this.currentIndex[`${this.seatList[i].editorAreaId}`].push(this.seatList[i].y) this.currentIndex[
`${this.seatList[i].editorAreaId}`
].push(this.seatList[i].y)
} }
} }
} }
...@@ -686,7 +681,10 @@ export default { ...@@ -686,7 +681,10 @@ export default {
//将每行座位有人的位置(除去要改中心点的这一行)摘取出来 //将每行座位有人的位置(除去要改中心点的这一行)摘取出来
let arr = [] let arr = []
for (let i = 0; i < this.seatListBack.length; i++) { for (let i = 0; i < this.seatListBack.length; i++) {
if (this.seatListBack[i].orderArr != null && this.seatListBack[i].colIndex != obj.x) { if (
this.seatListBack[i].orderArr != null &&
this.seatListBack[i].colIndex != obj.x
) {
arr.push(this.seatListBack[i]) arr.push(this.seatListBack[i])
} }
} }
...@@ -695,20 +693,32 @@ export default { ...@@ -695,20 +693,32 @@ export default {
// console.log(this.sortType) // console.log(this.sortType)
if (this.sortType == 1) { if (this.sortType == 1) {
for (let i = 0; i < this.seatList.length; i++) { for (let i = 0; i < this.seatList.length; i++) {
if (obj.x == this.seatList[i].x && this.seatList[i].leftRightCenter == 1) { if (
obj.x == this.seatList[i].x &&
this.seatList[i].leftRightCenter == 1
) {
this.seatList[i].leftRightCenter = undefined this.seatList[i].leftRightCenter = undefined
// console.log(i) // console.log(i)
} }
if (obj.x == this.seatList[i].x && obj.y == this.seatList[i].y) { if (
obj.x == this.seatList[i].x &&
obj.y == this.seatList[i].y
) {
this.seatList[i].leftRightCenter = 1 this.seatList[i].leftRightCenter = 1
} }
} }
} else if (this.sortType == 2) { } else if (this.sortType == 2) {
for (let i = 0; i < this.seatList.length; i++) { for (let i = 0; i < this.seatList.length; i++) {
if (obj.x == this.seatList[i].x && this.seatList[i].rightLeftCenter == 1) { if (
obj.x == this.seatList[i].x &&
this.seatList[i].rightLeftCenter == 1
) {
this.seatList[i].rightLeftCenter = undefined this.seatList[i].rightLeftCenter = undefined
} }
if (obj.x == this.seatList[i].x && obj.y == this.seatList[i].y) { if (
obj.x == this.seatList[i].x &&
obj.y == this.seatList[i].y
) {
this.seatList[i].rightLeftCenter = 1 this.seatList[i].rightLeftCenter = 1
} }
} }
...@@ -728,10 +738,19 @@ export default { ...@@ -728,10 +738,19 @@ export default {
//oldOrderArr 用来存放用之前中心点但未改变中心点的排列顺序 //oldOrderArr 用来存放用之前中心点但未改变中心点的排列顺序
let oldOrderArr = [] let oldOrderArr = []
for (let i in replaceArr) { for (let i in replaceArr) {
;[replaceArr[i].colIndex, replaceArr[i].rowIndex] = [replaceArr[i].rowIndex, replaceArr[i].colIndex] ;[replaceArr[i].colIndex, replaceArr[i].rowIndex] = [
if (this.sortType == 1 && replaceArr[i].leftRightCenter != undefined) { replaceArr[i].rowIndex,
replaceArr[i].colIndex,
]
if (
this.sortType == 1 &&
replaceArr[i].leftRightCenter != undefined
) {
delete replaceArr[i].leftRightCenter delete replaceArr[i].leftRightCenter
} else if (this.sortType == 2 && replaceArr[i].rightLeftCenter != undefined) { } else if (
this.sortType == 2 &&
replaceArr[i].rightLeftCenter != undefined
) {
delete replaceArr[i].rightLeftCenter delete replaceArr[i].rightLeftCenter
} }
// console.log('replaceArr', replaceArr) // console.log('replaceArr', replaceArr)
...@@ -775,19 +794,28 @@ export default { ...@@ -775,19 +794,28 @@ export default {
// console.log(JSON.parse(JSON.stringify(data))) // console.log(JSON.parse(JSON.stringify(data)))
// console.log(this.seatList) // console.log(this.seatList)
for (let i in data) { for (let i in data) {
;[data[i].colIndex, data[i].rowIndex] = [data[i].rowIndex, data[i].colIndex] ;[data[i].colIndex, data[i].rowIndex] = [
data[i].rowIndex,
data[i].colIndex,
]
} }
//initconfSeatVoList行列要颠倒 //initconfSeatVoList行列要颠倒
for (let i = 0; i < this.initconfSeatVoList.length; i++) { for (let i = 0; i < this.initconfSeatVoList.length; i++) {
for (let k in arr) { for (let k in arr) {
if (this.initconfSeatVoList[i].rowIndex == arr[k].rowIndex && this.initconfSeatVoList[i].colIndex == arr[k].colIndex) { if (
this.initconfSeatVoList[i].rowIndex == arr[k].rowIndex &&
this.initconfSeatVoList[i].colIndex == arr[k].colIndex
) {
this.initconfSeatVoList[i] = arr[k] this.initconfSeatVoList[i] = arr[k]
} }
} }
} }
for (let i = 0; i < this.initconfSeatVoList.length; i++) { for (let i = 0; i < this.initconfSeatVoList.length; i++) {
for (let j in data) { for (let j in data) {
if (this.initconfSeatVoList[i].rowIndex == data[j].rowIndex && this.initconfSeatVoList[i].colIndex == data[j].colIndex) { if (
this.initconfSeatVoList[i].rowIndex == data[j].rowIndex &&
this.initconfSeatVoList[i].colIndex == data[j].colIndex
) {
this.initconfSeatVoList[i] = data[j] this.initconfSeatVoList[i] = data[j]
// console.log('dataJ', data[j]) // console.log('dataJ', data[j])
} }
...@@ -804,8 +832,12 @@ export default { ...@@ -804,8 +832,12 @@ export default {
if ( if (
this.seatList[i].trueId != undefined && this.seatList[i].trueId != undefined &&
this.seatList[i].x == this.seatList[this.straIndexs].x && this.seatList[i].x == this.seatList[this.straIndexs].x &&
this.seatList[i].trueId.split(',')[0] == this.seatList[this.straIndexs].trueId.split(',')[0] && this.seatList[i].trueId.split(',')[0] ==
this.seatList[i].trueId.split(',')[1].split('排')[1].split('座')[0] == this.seatNum.col this.seatList[this.straIndexs].trueId.split(',')[0] &&
this.seatList[i].trueId
.split(',')[1]
.split('排')[1]
.split('座')[0] == this.seatNum.col
) { ) {
// console.log(this.seatList[i]) // console.log(this.seatList[i])
isExist = false isExist = false
...@@ -816,7 +848,9 @@ export default { ...@@ -816,7 +848,9 @@ export default {
let trueId = let trueId =
this.seatList[this.straIndexs].trueId.split(',')[0] + this.seatList[this.straIndexs].trueId.split(',')[0] +
',' + ',' +
this.seatList[this.straIndexs].trueId.split(',')[1].split('排')[0] + this.seatList[this.straIndexs].trueId
.split(',')[1]
.split('排')[0] +
'排' + '排' +
this.seatNum.col + this.seatNum.col +
'座' '座'
...@@ -840,9 +874,12 @@ export default { ...@@ -840,9 +874,12 @@ export default {
} }
} }
if (!isExist) { if (!isExist) {
this.seatList[this.straIndexs].orderArr[0] = this.seatNum.col this.seatList[this.straIndexs].orderArr[0] =
this.seatNum.col
} else { } else {
this.$message.warning({ message: '规则号已有，请重新编辑！' }) this.$message.warning({
message: '规则号已有，请重新编辑！',
})
} }
} }
}, },
...@@ -852,14 +889,18 @@ export default { ...@@ -852,14 +889,18 @@ export default {
let isExist = false let isExist = false
for (let i in this.seatList) { for (let i in this.seatList) {
if (this.seatList[i].orderArr) { if (this.seatList[i].orderArr) {
if (this.seatList[i].orderArr[this.sortType - 1] == this.seatNum.col) { if (
this.seatList[i].orderArr[this.sortType - 1] ==
this.seatNum.col
) {
isExist = true isExist = true
} }
} }
} }
if (!isExist) { if (!isExist) {
// console.log(this.sortType) // console.log(this.sortType)
this.seatList[this.straIndexs].orderArr[this.sortType - 1] = Number(this.seatNum.col) this.seatList[this.straIndexs].orderArr[this.sortType - 1] =
Number(this.seatNum.col)
} else { } else {
this.$message.warning({ message: '规则号已有，请重新编辑！' }) this.$message.warning({ message: '规则号已有，请重新编辑！' })
} }
...@@ -896,7 +937,10 @@ export default { ...@@ -896,7 +937,10 @@ export default {
getName(item) { getName(item) {
if (item.trueId) { if (item.trueId) {
if (item.border.borderLeft) { if (item.border.borderLeft) {
const _res1 = item.trueId.toString().split(',')[1].split('排')[0] const _res1 = item.trueId
.toString()
.split(',')[1]
.split('排')[0]
const _res = `${_res1}排` const _res = `${_res1}排`
return _res return _res
} }
...@@ -909,9 +953,19 @@ export default { ...@@ -909,9 +953,19 @@ export default {
}, },
getName2(item) { getName2(item) {
if (item.trueId && item.backimg) { if (item.trueId && item.backimg) {
let _res2 = item.trueId.toString().split(',')[1].split('排')[1].split('座')[0] let _res2 = item.trueId
.toString()
.split(',')[1]
.split('排')[1]
.split('座')[0]
const _res = `${_res2}` const _res = `${_res2}`
if (item.trueId.toString().split(',')[1].split('排')[1].split('座')[0] == 1) { if (
item.trueId
.toString()
.split(',')[1]
.split('排')[1]
.split('座')[0] == 1
) {
return _res + '号' return _res + '号'
} }
return _res return _res
...@@ -920,7 +974,10 @@ export default { ...@@ -920,7 +974,10 @@ export default {
getOrderIndex(item) { getOrderIndex(item) {
if (item.orderArr) { if (item.orderArr) {
const _res2 = item.orderArr[this.sortType - 1] const _res2 = item.orderArr[this.sortType - 1]
if ((item.rightLeftCenter == 1 && this.sortType == 2) || (item.leftRightCenter == 1 && this.sortType == 1)) { if (
(item.rightLeftCenter == 1 && this.sortType == 2) ||
(item.leftRightCenter == 1 && this.sortType == 1)
) {
const _res = '中心' const _res = '中心'
return _res return _res
} else { } else {
...@@ -932,16 +989,25 @@ export default { ...@@ -932,16 +989,25 @@ export default {
getHalfDistance(item, index) { getHalfDistance(item, index) {
let res = '' let res = ''
const tID = item.editorAreaId const tID = item.editorAreaId
if (item.border && item.border.borderTop && item.border.borderLeft) { if (
item.border &&
item.border.borderTop &&
item.border.borderLeft
) {
for (let i = 0; i < this.seatList.length; i++) { for (let i = 0; i < this.seatList.length; i++) {
if (i + this.y < this.seatList.length) { if (i + this.y < this.seatList.length) {
if ( if (
!this.seatList[i + this.y].editorAreaId || !this.seatList[i + this.y].editorAreaId ||
(this.seatList[i + this.y].editorAreaId && this.seatList[i + this.y].editorAreaId != tID) (this.seatList[i + this.y].editorAreaId &&
this.seatList[i + this.y].editorAreaId != tID)
) { ) {
for (let x = 0; x < this.areaList.length; x++) { for (let x = 0; x < this.areaList.length; x++) {
if (item.editorAreaId == this.areaList[x].editorAreaId) { if (
res = (this.seatItemWidth + this.shifting) * item.y - this.shifting item.editorAreaId == this.areaList[x].editorAreaId
) {
res =
(this.seatItemWidth + this.shifting) * item.y -
this.shifting
return res return res
} }
} }
...@@ -953,7 +1019,11 @@ export default { ...@@ -953,7 +1019,11 @@ export default {
getHalfTop(item, index) { getHalfTop(item, index) {
let res = '' let res = ''
if (item.border && item.border.borderTop && item.border.borderLeft) { if (
item.border &&
item.border.borderTop &&
item.border.borderLeft
) {
for (let x = 0; x < this.areaList.length; x++) { for (let x = 0; x < this.areaList.length; x++) {
if (item.editorAreaId == this.areaList[x].editorAreaId) { if (item.editorAreaId == this.areaList[x].editorAreaId) {
// if (item.y == 2) { // if (item.y == 2) {
...@@ -961,7 +1031,10 @@ export default { ...@@ -961,7 +1031,10 @@ export default {
// } else { // } else {
// console.log('222', item) // console.log('222', item)
res = (this.seatItemWidth + this.shifting) * (item.x - 1) - this.shifting + 25 res =
(this.seatItemWidth + this.shifting) * (item.x - 1) -
this.shifting +
25
// } // }
return res return res
...@@ -971,7 +1044,11 @@ export default { ...@@ -971,7 +1044,11 @@ export default {
}, },
generateTitle(item, index) { generateTitle(item, index) {
let res = '' let res = ''
if (item.border && item.border.borderTop && item.border.borderLeft) { if (
item.border &&
item.border.borderTop &&
item.border.borderLeft
) {
for (let x = 0; x < this.areaList.length; x++) { for (let x = 0; x < this.areaList.length; x++) {
if (item.editorAreaId == this.areaList[x].editorAreaId) { if (item.editorAreaId == this.areaList[x].editorAreaId) {
res = this.areaList[x].areaName res = this.areaList[x].areaName
...@@ -995,7 +1072,8 @@ export default { ...@@ -995,7 +1072,8 @@ export default {
const seatItemWidths = this.seatItemWidth + 10 const seatItemWidths = this.seatItemWidth + 10
res += `width:${seatItemWidths}px;height:${this.seatItemWidth}px;transform:translate3d( ${item.translateX}px,${item.translateY}px,0);background: ${item.background};` res += `width:${seatItemWidths}px;height:${this.seatItemWidth}px;transform:translate3d( ${item.translateX}px,${item.translateY}px,0);background: ${item.background};`
if (item.border) { if (item.border) {
const { borderLeft, borderRight, borderTop, borderBottom } = item.border const { borderLeft, borderRight, borderTop, borderBottom } =
item.border
const weight = '2px' const weight = '2px'
const lineStyle = 'dashed' const lineStyle = 'dashed'
...@@ -1031,26 +1109,36 @@ export default { ...@@ -1031,26 +1109,36 @@ export default {
} }
const tID = item.editorAreaId const tID = item.editorAreaId
if (i + 1 < len) { if (i + 1 < len) {
if (!this.seatList[i + 1].editorAreaId || (this.seatList[i + 1].editorAreaId && this.seatList[i + 1].editorAreaId != tID)) { if (
!this.seatList[i + 1].editorAreaId ||
(this.seatList[i + 1].editorAreaId &&
this.seatList[i + 1].editorAreaId != tID)
) {
item.border.borderRight = true item.border.borderRight = true
} }
if (i + this.y < len) { if (i + this.y < len) {
if ( if (
!this.seatList[i + this.y].editorAreaId || !this.seatList[i + this.y].editorAreaId ||
(this.seatList[i + this.y].editorAreaId && this.seatList[i + this.y].editorAreaId != tID) (this.seatList[i + this.y].editorAreaId &&
this.seatList[i + this.y].editorAreaId != tID)
) { ) {
item.border.borderBottom = true item.border.borderBottom = true
} }
} }
} }
if (i - 1 >= 0) { if (i - 1 >= 0) {
if (!this.seatList[i - 1].editorAreaId || (this.seatList[i - 1].editorAreaId && this.seatList[i - 1].editorAreaId != tID)) { if (
!this.seatList[i - 1].editorAreaId ||
(this.seatList[i - 1].editorAreaId &&
this.seatList[i - 1].editorAreaId != tID)
) {
item.border.borderLeft = true item.border.borderLeft = true
} }
if (i - this.y >= 0) { if (i - this.y >= 0) {
if ( if (
!this.seatList[i - this.y].editorAreaId || !this.seatList[i - this.y].editorAreaId ||
(this.seatList[i - this.y].editorAreaId && this.seatList[i - this.y].editorAreaId != tID) (this.seatList[i - this.y].editorAreaId &&
this.seatList[i - this.y].editorAreaId != tID)
) { ) {
item.border.borderTop = true item.border.borderTop = true
} }
...@@ -1081,13 +1169,17 @@ export default { ...@@ -1081,13 +1169,17 @@ export default {
temp.type = 1 temp.type = 1
// temp.editorAreaId = 666; // temp.editorAreaId = 666;
// temp.boxType = 1; // temp.boxType = 1;
} else if (this.seatList[index].backimg === this.leaderImg) { } else if (
this.seatList[index].backimg === this.leaderImg
) {
temp.type = 2 temp.type = 2
// temp.editorAreaId = 666; // temp.editorAreaId = 666;
// temp.boxType = 1; // temp.boxType = 1;
} }
confSeatVoList.push(temp) confSeatVoList.push(temp)
} else if (this.seatList[index].background === this.unSelect) { } else if (
this.seatList[index].background === this.unSelect
) {
temp.type = 0 temp.type = 0
confSeatVoList.push(temp) confSeatVoList.push(temp)
} }
...@@ -1169,18 +1261,26 @@ export default { ...@@ -1169,18 +1261,26 @@ export default {
temp.rowIndex = this.seatList[index].y temp.rowIndex = this.seatList[index].y
if (this.seatList[index].background === this.stageting) { if (this.seatList[index].background === this.stageting) {
temp.type = 4 temp.type = 4
} else if (this.seatList[index].background === this.selected) { } else if (
this.seatList[index].background === this.selected
) {
if (this.seatList[index].backimg === this.normalImg) { if (this.seatList[index].backimg === this.normalImg) {
temp.type = 1 temp.type = 1
} else if (this.seatList[index].backimg === this.doorImg) { } else if (
this.seatList[index].backimg === this.doorImg
) {
temp.type = 3 temp.type = 3
} else if (this.seatList[index].backimg === this.leaderImg) { } else if (
this.seatList[index].backimg === this.leaderImg
) {
temp.type = 2 temp.type = 2
} }
} else { } else {
temp.type = 0 temp.type = 0
} }
confSeatVoListTwoDimen[confSeatVoListTwoDimen.length - 1].push(JSON.parse(JSON.stringify(temp))) confSeatVoListTwoDimen[
confSeatVoListTwoDimen.length - 1
].push(JSON.parse(JSON.stringify(temp)))
} }
} }
}) })
...@@ -1197,7 +1297,11 @@ export default { ...@@ -1197,7 +1297,11 @@ export default {
value.rowIndex++ value.rowIndex++
} }
}) })
v.splice(row - 1, 0, { colIndex: i + 1, rowIndex: row, type: 0 }) v.splice(row - 1, 0, {
colIndex: i + 1,
rowIndex: row,
type: 0,
})
}) })
this.changeY(this.y + 1) this.changeY(this.y + 1)
} else { } else {
...@@ -1219,7 +1323,11 @@ export default { ...@@ -1219,7 +1323,11 @@ export default {
value.rowIndex++ value.rowIndex++
} }
}) })
v.splice(row, 0, { colIndex: i + 1, rowIndex: row + 1, type: 0 }) v.splice(row, 0, {
colIndex: i + 1,
rowIndex: row + 1,
type: 0,
})
}) })
this.changeY(this.y + 1) this.changeY(this.y + 1)
} else { } else {
...@@ -1304,18 +1412,26 @@ export default { ...@@ -1304,18 +1412,26 @@ export default {
temp.rowIndex = this.seatList[index].y temp.rowIndex = this.seatList[index].y
if (this.seatList[index].background === this.stageting) { if (this.seatList[index].background === this.stageting) {
temp.type = 4 temp.type = 4
} else if (this.seatList[index].background === this.selected) { } else if (
this.seatList[index].background === this.selected
) {
if (this.seatList[index].backimg === this.normalImg) { if (this.seatList[index].backimg === this.normalImg) {
temp.type = 1 temp.type = 1
} else if (this.seatList[index].backimg === this.doorImg) { } else if (
this.seatList[index].backimg === this.doorImg
) {
temp.type = 3 temp.type = 3
} else if (this.seatList[index].backimg === this.leaderImg) { } else if (
this.seatList[index].backimg === this.leaderImg
) {
temp.type = 2 temp.type = 2
} }
} else { } else {
temp.type = 0 temp.type = 0
} }
confSeatVoListTwoDimen[confSeatVoListTwoDimen.length - 1].push(JSON.parse(JSON.stringify(temp))) confSeatVoListTwoDimen[
confSeatVoListTwoDimen.length - 1
].push(JSON.parse(JSON.stringify(temp)))
} }
} }
}) })
...@@ -1356,8 +1472,10 @@ export default { ...@@ -1356,8 +1472,10 @@ export default {
let seatScale = 1 let seatScale = 1
let seatScaleX = 1 let seatScaleX = 1
let seatScaleY = 1 let seatScaleY = 1
const seatSelectAreaWidth = that.$refs.seatSelectArea.offsetWidth const seatSelectAreaWidth =
const seatSelectAreaHeight = that.$refs.seatSelectArea.offsetHeight that.$refs.seatSelectArea.offsetWidth
const seatSelectAreaHeight =
that.$refs.seatSelectArea.offsetHeight
const seatAreaWidth = 50 * that.y - that.shifting const seatAreaWidth = 50 * that.y - that.shifting
const seatAreaHeight = 50 * that.x - that.shifting const seatAreaHeight = 50 * that.x - that.shifting
...@@ -1381,8 +1499,13 @@ export default { ...@@ -1381,8 +1499,13 @@ export default {
for (let x = 1; x <= that.x; x++) { for (let x = 1; x <= that.x; x++) {
for (let y = 1; y <= that.y; y++) { for (let y = 1; y <= that.y; y++) {
let data = {} let data = {}
if (that.seatListBack != null && that.seatListBack.length > 0) { if (
const temp = that.seatListBack.find((el) => el.rowIndex === y && el.colIndex === x) that.seatListBack != null &&
that.seatListBack.length > 0
) {
const temp = that.seatListBack.find(
el => el.rowIndex === y && el.colIndex === x
)
// console.log(temp) // console.log(temp)
if (temp) { if (temp) {
...@@ -1622,7 +1745,7 @@ export default { ...@@ -1622,7 +1745,7 @@ export default {
this.seatList2 = JSON.parse(JSON.stringify(this.seatList)) this.seatList2 = JSON.parse(JSON.stringify(this.seatList))
} }
// 四個角落判斷 // 四個角落判斷
that.seatList.map((v) => { that.seatList.map(v => {
if (v.x == 1) { if (v.x == 1) {
v.coordx = -2 v.coordx = -2
v.coordy = -25 v.coordy = -25
...@@ -1665,7 +1788,9 @@ export default { ...@@ -1665,7 +1788,9 @@ export default {
const clientRect = item.getBoundingClientRect() const clientRect = item.getBoundingClientRect()
// console.log(item.attributes); // console.log(item.attributes);
const index = that.seatList.findIndex( const index = that.seatList.findIndex(
(el) => el.x === parseInt(item.attributes.y.value) && el.y === parseInt(item.attributes.x.value) el =>
el.x === parseInt(item.attributes.y.value) &&
el.y === parseInt(item.attributes.x.value)
) )
const newObject = { const newObject = {
...that.seatList[index], ...that.seatList[index],
...@@ -1692,7 +1817,10 @@ export default { ...@@ -1692,7 +1817,10 @@ export default {
}, 100) }, 100)
for (const i in seatList) { for (const i in seatList) {
if (seatList[i].background == that.selecting) { if (seatList[i].background == that.selecting) {
if (seatList[i].backimg === '' || seatList[i].backimg === null) { if (
seatList[i].backimg === '' ||
seatList[i].backimg === null
) {
seatList[i].background = that.unSelect seatList[i].background = that.unSelect
} else { } else {
seatList[i].background = that.selected seatList[i].background = that.selected
...@@ -1737,23 +1865,32 @@ export default { ...@@ -1737,23 +1865,32 @@ export default {
} }
} }
} }
if (e.target.parentNode.getAttribute('straindex') && this.confimFlag) {
if (
e.target.parentNode.getAttribute('straindex') &&
this.confimFlag
) {
let index = e.target.parentNode.getAttribute('straindex') let index = e.target.parentNode.getAttribute('straindex')
console.log(this.sortType, this.seatList[index]) console.log(this.sortType, this.seatList[index])
console.log(this.seatList[index].trueId) console.log(this.seatList[index].trueId)
if (this.seatList[index].trueId != null) { if (this.seatList[index].trueId != null) {
this.changeSeatName = this.seatList[index].trueId.split(',')[1] this.changeSeatName =
this.seatList[index].trueId.split(',')[1]
this.changeSeat = true this.changeSeat = true
this.straIndexs = index this.straIndexs = index
} else { } else {
return return
} }
} }
if (e.target.parentNode.getAttribute('straindex') && this.confimFlag2) { if (
e.target.parentNode.getAttribute('straindex') &&
this.confimFlag2
) {
let index = e.target.parentNode.getAttribute('straindex') let index = e.target.parentNode.getAttribute('straindex')
if (this.seatList[index].orderArr != null) { if (this.seatList[index].orderArr != null) {
this.changeSeatName = this.seatList[index].orderArr[this.sortType - 1] this.changeSeatName =
this.seatList[index].orderArr[this.sortType - 1]
this.changeSeat2 = true this.changeSeat2 = true
this.straIndexs = index this.straIndexs = index
} else { } else {
...@@ -1812,32 +1949,76 @@ export default { ...@@ -1812,32 +1949,76 @@ export default {
// 获取框选分组的列长度 // 获取框选分组的列长度
if (this.boxFlag) { if (this.boxFlag) {
//判断背景颜色是选中还是未选中 //判断背景颜色是选中还是未选中
if (that.seatList[index].background === that.unSelect || that.seatList[index].background === that.selected) { if (
that.seatList[index].background === that.unSelect ||
that.seatList[index].background === that.selected
) {
if (this.btnControl == 1) { if (this.btnControl == 1) {
// 普通座位 // 普通座位
this.$set(that.seatList[index], 'backimg', that.normalImg) this.$set(
this.$set(that.seatList[index], 'background', that.selected) that.seatList[index],
'backimg',
that.normalImg
)
this.$set(
that.seatList[index],
'background',
that.selected
)
} else if (this.btnControl == 2) { } else if (this.btnControl == 2) {
// 主席台 // 主席台
this.$set(that.seatList[index], 'backimg', that.leaderImg) this.$set(
this.$set(that.seatList[index], 'background', that.selected) that.seatList[index],
'backimg',
that.leaderImg
)
this.$set(
that.seatList[index],
'background',
that.selected
)
} else if (this.btnControl == 3) { } else if (this.btnControl == 3) {
// 舞台 // 舞台
if (that.seatList[index].backimg) { if (that.seatList[index].backimg) {
} else { } else {
this.$set(that.seatList[index], 'background', that.stageting) this.$set(
that.seatList[index],
'background',
that.stageting
)
} }
} else if (this.btnControl == 4) { } else if (this.btnControl == 4) {
// 过道 // 过道
this.$set(that.seatList[index], 'backimg', '') this.$set(that.seatList[index], 'backimg', '')
this.$set(that.seatList[index], 'background', that.unSelect) this.$set(
that.seatList[index],
'background',
that.unSelect
)
} else { } else {
this.$set(that.seatList[index], 'background', that.selecting) this.$set(
that.seatList[index],
'background',
that.selecting
)
} }
} else if (that.seatList[index].background === that.selected && that.seatList[index].backimg !== that.doorImg) { } else if (
this.$set(that.seatList[index], 'background', that.selecting) that.seatList[index].background === that.selected &&
} else if (that.seatList[index].background === that.stageting) { that.seatList[index].backimg !== that.doorImg
this.$set(that.seatList[index], 'background', that.stageting) ) {
this.$set(
that.seatList[index],
'background',
that.selecting
)
} else if (
that.seatList[index].background === that.stageting
) {
this.$set(
that.seatList[index],
'background',
that.stageting
)
} }
} else if ( } else if (
(that.seatList[index].background === that.unSelect || (that.seatList[index].background === that.unSelect ||
...@@ -1846,33 +2027,78 @@ export default { ...@@ -1846,33 +2027,78 @@ export default {
that.seatList[index].backimg !== that.doorImg that.seatList[index].backimg !== that.doorImg
) { ) {
if (this.btnControl == 1) { if (this.btnControl == 1) {
this.$set(that.seatList[index], 'backimg', that.normalImg) this.$set(
this.$set(that.seatList[index], 'background', that.selected) that.seatList[index],
'backimg',
that.normalImg
)
this.$set(
that.seatList[index],
'background',
that.selected
)
} else if (this.btnControl == 2) { } else if (this.btnControl == 2) {
this.$set(that.seatList[index], 'backimg', that.leaderImg) this.$set(
this.$set(that.seatList[index], 'background', that.selected) that.seatList[index],
'backimg',
that.leaderImg
)
this.$set(
that.seatList[index],
'background',
that.selected
)
} else if (this.btnControl == 3) { } else if (this.btnControl == 3) {
if (that.seatList[index].backimg) { if (that.seatList[index].backimg) {
} else { } else {
this.$set(that.seatList[index], 'background', that.stageting) this.$set(
that.seatList[index],
'background',
that.stageting
)
} }
} else if (this.btnControl == 4) { } else if (this.btnControl == 4) {
this.$set(that.seatList[index], 'backimg', '') this.$set(that.seatList[index], 'backimg', '')
this.$set(that.seatList[index], 'background', that.unSelect) this.$set(
that.seatList[index],
'background',
that.unSelect
)
} else if (this.btnControl == 5) { } else if (this.btnControl == 5) {
// 合并 // 合并
sortList.push(that.seatList[index]) sortList.push(that.seatList[index])
// console.log('let sortList = []', sortList) // console.log('let sortList = []', sortList)
} else { } else {
this.$set(that.seatList[index], 'background', that.selecting) this.$set(
that.seatList[index],
'background',
that.selecting
)
} }
} else if (that.seatList[index].background === that.selected && that.seatList[index].backimg !== that.doorImg) { } else if (
this.$set(that.seatList[index], 'background', that.selecting) that.seatList[index].background === that.selected &&
} else if (that.seatList[index].background === that.stageting) { that.seatList[index].backimg !== that.doorImg
) {
this.$set(
that.seatList[index],
'background',
that.selecting
)
} else if (
that.seatList[index].background === that.stageting
) {
if (this.boxFlag) { if (this.boxFlag) {
this.$set(that.seatList[index], 'background', that.stageting) this.$set(
that.seatList[index],
'background',
that.stageting
)
} else { } else {
this.$set(that.seatList[index], 'background', that.unSelect) this.$set(
that.seatList[index],
'background',
that.unSelect
)
} }
} }
} }
...@@ -1886,12 +2112,17 @@ export default { ...@@ -1886,12 +2112,17 @@ export default {
temp.colIndex = this.seatList[index].y temp.colIndex = this.seatList[index].y
temp.rowIndex = this.seatList[index].x temp.rowIndex = this.seatList[index].x
temp.trueId = this.seatList[index].trueId temp.trueId = this.seatList[index].trueId
temp.editorAreaColor = this.seatList[index].editorAreaColor ? this.seatList[index].editorAreaColor : null temp.editorAreaColor = this.seatList[index]
.editorAreaColor
? this.seatList[index].editorAreaColor
: null
temp.editorAreaId = this.seatList[index].editorAreaId temp.editorAreaId = this.seatList[index].editorAreaId
if (this.seatList[index].background === this.selecting) { if (this.seatList[index].background === this.selecting) {
if (this.seatList[index].backimg === this.normalImg) { if (this.seatList[index].backimg === this.normalImg) {
temp.type = 1 temp.type = 1
} else if (this.seatList[index].backimg === this.leaderImg) { } else if (
this.seatList[index].backimg === this.leaderImg
) {
temp.type = 2 temp.type = 2
} else { } else {
temp.type = 0 temp.type = 0
...@@ -1923,7 +2154,10 @@ export default { ...@@ -1923,7 +2154,10 @@ export default {
custom(e, index) { custom(e, index) {
if (this.customFlag) { if (this.customFlag) {
// this.changeorderIndex(1) // this.changeorderIndex(1)
if (this.seatList[index].backimg && this.seatList[index].background == this.selected) { if (
this.seatList[index].backimg &&
this.seatList[index].background == this.selected
) {
this.dialogVisible1 = true this.dialogVisible1 = true
this.formIndex.orderNum = this.seatList[index].orderNum this.formIndex.orderNum = this.seatList[index].orderNum
...@@ -1945,7 +2179,11 @@ export default { ...@@ -1945,7 +2179,11 @@ export default {
return val.orderNum == num return val.orderNum == num
}) })
if (p < 0) { if (p < 0) {
this.$set(this.seatList[this.numIndex], 'orderNum', this.formIndex.orderNum) this.$set(
this.seatList[this.numIndex],
'orderNum',
this.formIndex.orderNum
)
this.dialogVisible1 = false this.dialogVisible1 = false
this.formIndex.orderNum = null this.formIndex.orderNum = null
} else { } else {
...@@ -1968,7 +2206,12 @@ export default { ...@@ -1968,7 +2206,12 @@ export default {
const row = rotateIndex.split('-')[0] const row = rotateIndex.split('-')[0]
const col = rotateIndex.split('-')[1] const col = rotateIndex.split('-')[1]
if (that.seatList[index].background === that.doorSected) { if (that.seatList[index].background === that.doorSected) {
if (rotateIndex == '1-1' || rotateIndex == `1-${this.y}` || rotateIndex == `${this.x}-${this.y}` || rotateIndex == `${this.x}-1`) { if (
rotateIndex == '1-1' ||
rotateIndex == `1-${this.y}` ||
rotateIndex == `${this.x}-${this.y}` ||
rotateIndex == `${this.x}-1`
) {
this.$set(that.seatList[index], 'background', '') this.$set(that.seatList[index], 'background', '')
this.$set(that.seatList[index], 'backimg', that.OldDoorImg) this.$set(that.seatList[index], 'backimg', that.OldDoorImg)
} else { } else {
...@@ -2000,11 +2243,21 @@ export default { ...@@ -2000,11 +2243,21 @@ export default {
} else { } else {
bus.$emit('changeSilder', true) bus.$emit('changeSilder', true)
this.$set(that.seatList[index], 'rotate', 0) this.$set(that.seatList[index], 'rotate', 0)
this.$set(that.seatList[index], 'background', that.doorSected) this.$set(
that.seatList[index],
'background',
that.doorSected
)
this.$set(that.seatList[index], 'backimg', that.OldDoorImg) this.$set(that.seatList[index], 'backimg', that.OldDoorImg)
} }
} else if (that.seatList[index].background === that.selecting && that.seatList[index].backimg != this.OldDoorImg) { } else if (
if (that.seatList[index].backimg === '' || that.seatList[index].backimg === null) { that.seatList[index].background === that.selecting &&
that.seatList[index].backimg != this.OldDoorImg
) {
if (
that.seatList[index].backimg === '' ||
that.seatList[index].backimg === null
) {
this.$set(that.seatList[index], 'background', that.unSelect) this.$set(that.seatList[index], 'background', that.unSelect)
} else { } else {
this.$set(that.seatList[index], 'background', that.selected) this.$set(that.seatList[index], 'background', that.selected)
...@@ -2023,15 +2276,30 @@ export default { ...@@ -2023,15 +2276,30 @@ export default {
} else if (this.btnControl == 3) { } else if (this.btnControl == 3) {
// this.$set(that.seatList[index], 'backimg', that.); // this.$set(that.seatList[index], 'backimg', that.);
this.$set(that.seatList[index], 'backimg', '') this.$set(that.seatList[index], 'backimg', '')
this.$set(that.seatList[index], 'background', that.stageting) this.$set(
that.seatList[index],
'background',
that.stageting
)
} else if (this.btnControl == 4) { } else if (this.btnControl == 4) {
// this.$set(that.seatList[index], 'backimg', that.); // this.$set(that.seatList[index], 'backimg', that.);
this.$set(that.seatList[index], 'backimg', '') this.$set(that.seatList[index], 'backimg', '')
this.$set(that.seatList[index], 'background', that.unSelect) this.$set(that.seatList[index], 'background', that.unSelect)
} else if (this.boxFlag && that.seatList[index].background == that.stageting) { } else if (
this.$set(that.seatList[index], 'background', that.stageting) this.boxFlag &&
that.seatList[index].background == that.stageting
) {
this.$set(
that.seatList[index],
'background',
that.stageting
)
} else { } else {
this.$set(that.seatList[index], 'background', that.selecting) this.$set(
that.seatList[index],
'background',
that.selecting
)
} }
} }
}, },
...@@ -2043,10 +2311,19 @@ export default { ...@@ -2043,10 +2311,19 @@ export default {
this.$set(this.seatList[index], 'backimg', '') this.$set(this.seatList[index], 'backimg', '')
} }
} }
if (this.seatList[this.cleanIndex].background === this.selected) { if (
if (this.seatList[this.cleanIndex].name != '' && this.seatList[this.cleanIndex].backimg === this.doorImg) { this.seatList[this.cleanIndex].background === this.selected
) {
if (
this.seatList[this.cleanIndex].name != '' &&
this.seatList[this.cleanIndex].backimg === this.doorImg
) {
this.$set(this.seatList[this.cleanIndex], 'background', '') this.$set(this.seatList[this.cleanIndex], 'background', '')
this.$set(this.seatList[this.cleanIndex], 'backimg', this.OldDoorImg) this.$set(
this.seatList[this.cleanIndex],
'backimg',
this.OldDoorImg
)
this.cleanDom.lastElementChild.innerHTML = '' this.cleanDom.lastElementChild.innerHTML = ''
this.$set(this.seatList[this.cleanIndex], 'name', '') this.$set(this.seatList[this.cleanIndex], 'name', '')
this.$set(this.seatList[this.cleanIndex], 'rotate', 0) this.$set(this.seatList[this.cleanIndex], 'rotate', 0)
...@@ -2056,15 +2333,27 @@ export default { ...@@ -2056,15 +2333,27 @@ export default {
this.seatList[this.cleanIndex].backimg === this.leaderImg || this.seatList[this.cleanIndex].backimg === this.leaderImg ||
this.seatList[this.cleanIndex].backimg === this.stageImg this.seatList[this.cleanIndex].backimg === this.stageImg
) { ) {
this.$set(this.seatList[this.cleanIndex], 'background', this.unSelect) this.$set(
this.seatList[this.cleanIndex],
'background',
this.unSelect
)
this.$set(this.seatList[this.cleanIndex], 'backimg', '') this.$set(this.seatList[this.cleanIndex], 'backimg', '')
} else { } else {
this.$set(this.seatList[this.cleanIndex], 'rotate', 0) this.$set(this.seatList[this.cleanIndex], 'rotate', 0)
this.$set(this.seatList[this.cleanIndex], 'background', '') this.$set(this.seatList[this.cleanIndex], 'background', '')
this.$set(this.seatList[this.cleanIndex], 'backimg', this.OldDoorImg) this.$set(
this.seatList[this.cleanIndex],
'backimg',
this.OldDoorImg
)
} }
} else { } else {
this.$set(this.seatList[this.cleanIndex], 'background', this.unSelect) this.$set(
this.seatList[this.cleanIndex],
'background',
this.unSelect
)
this.$set(this.seatList[this.cleanIndex], 'backimg', '') this.$set(this.seatList[this.cleanIndex], 'backimg', '')
} }
}, },
...@@ -2080,7 +2369,11 @@ export default { ...@@ -2080,7 +2369,11 @@ export default {
} else if (e === 'door') { } else if (e === 'door') {
for (const index in seatList) { for (const index in seatList) {
if (that.seatList[index].background === that.selecting) { if (that.seatList[index].background === that.selecting) {
this.$set(that.seatList[index], 'background', that.selected) this.$set(
that.seatList[index],
'background',
that.selected
)
this.$set(that.seatList[index], 'backimg', that.doorImg) this.$set(that.seatList[index], 'backimg', that.doorImg)
} }
} }
...@@ -2097,9 +2390,17 @@ export default { ...@@ -2097,9 +2390,17 @@ export default {
for (const index in that.seatList) { for (const index in that.seatList) {
if (that.seatList[index].background === that.selecting) { if (that.seatList[index].background === that.selecting) {
if (that.seatList[index].backimg === null) { if (that.seatList[index].backimg === null) {
this.$set(that.seatList[index], 'background', that.unSelect) this.$set(
that.seatList[index],
'background',
that.unSelect
)
} else { } else {
this.$set(that.seatList[index], 'background', that.selected) this.$set(
that.seatList[index],
'background',
that.selected
)
} }
} }
} }
...@@ -2165,8 +2466,11 @@ export default { ...@@ -2165,8 +2466,11 @@ export default {
const confSeatVoList = [] const confSeatVoList = []
let isCarryOut = 2 let isCarryOut = 2
this.conferenceId = sessionStorage.getItem('conferenceId') this.conferenceId = sessionStorage.getItem('conferenceId')
let res = this.seatList.some((item) => { let res = this.seatList.some(item => {
if (item.backimg === this.normalImg || item.backimg == this.leaderImg) { if (
item.backimg === this.normalImg ||
item.backimg == this.leaderImg
) {
return item.editorAreaId == undefined return item.editorAreaId == undefined
} }
}) })
...@@ -2180,7 +2484,8 @@ export default { ...@@ -2180,7 +2484,8 @@ export default {
for (const index in this.seatList) { for (const index in this.seatList) {
if (this.seatList[index]) { if (this.seatList[index]) {
const temp = {} const temp = {}
temp.editorAreaColor = this.seatList[index].editorAreaColor temp.editorAreaColor =
this.seatList[index].editorAreaColor
temp.rowIndex = this.seatList[index].x temp.rowIndex = this.seatList[index].x
temp.colIndex = this.seatList[index].y temp.colIndex = this.seatList[index].y
temp.angle = this.seatList[index].rotate temp.angle = this.seatList[index].rotate
...@@ -2190,25 +2495,42 @@ export default { ...@@ -2190,25 +2495,42 @@ export default {
temp.orderNum = this.seatList[index].orderNum temp.orderNum = this.seatList[index].orderNum
temp.orderArr = this.seatList[index].orderArr temp.orderArr = this.seatList[index].orderArr
temp.editorAreaId = this.seatList[index].editorAreaId temp.editorAreaId = this.seatList[index].editorAreaId
temp.leftRightCenter = this.seatList[index].leftRightCenter temp.leftRightCenter =
temp.rightLeftCenter = this.seatList[index].rightLeftCenter this.seatList[index].leftRightCenter
temp.leftRightCenter2 = this.seatList[index].leftRightCenter2 temp.rightLeftCenter =
temp.rightLeftCenter2 = this.seatList[index].rightLeftCenter2 this.seatList[index].rightLeftCenter
temp.tableSignCardId = this.seatList[index].tableSignCardId temp.leftRightCenter2 =
this.seatList[index].leftRightCenter2
temp.rightLeftCenter2 =
this.seatList[index].rightLeftCenter2
temp.tableSignCardId =
this.seatList[index].tableSignCardId
if (this.seatList[index].backimg === this.OldDoorImg) { if (this.seatList[index].backimg === this.OldDoorImg) {
temp.type = 8 temp.type = 8
} else if (this.seatList[index].background === this.stageting) { } else if (
this.seatList[index].background === this.stageting
) {
temp.type = 4 temp.type = 4
} else if (this.seatList[index].background == this.unSelect) { } else if (
this.seatList[index].background == this.unSelect
) {
temp.type = 0 temp.type = 0
} else if (this.seatList[index].background === this.selected) { } else if (
this.seatList[index].background === this.selected
) {
if (this.seatList[index].backimg === this.normalImg) { if (this.seatList[index].backimg === this.normalImg) {
temp.type = 1 temp.type = 1
} else if (this.seatList[index].backimg === this.doorImg) { } else if (
this.seatList[index].backimg === this.doorImg
) {
temp.type = 3 temp.type = 3
} else if (this.seatList[index].backimg === this.leaderImg) { } else if (
this.seatList[index].backimg === this.leaderImg
) {
temp.type = 2 temp.type = 2
} else if (this.seatList[index].backimg === this.MergeLImg) { } else if (
this.seatList[index].backimg === this.MergeLImg
) {
temp.type = 9 temp.type = 9
} }
} else { } else {
...@@ -2219,7 +2541,7 @@ export default { ...@@ -2219,7 +2541,7 @@ export default {
} }
//没有编辑座位时 //没有编辑座位时
let chartFlag = false let chartFlag = false
confSeatVoList.map((v) => { confSeatVoList.map(v => {
if (v.type == 1 || v.type == 2) { if (v.type == 1 || v.type == 2) {
chartFlag = true chartFlag = true
} }
...@@ -2238,11 +2560,11 @@ export default { ...@@ -2238,11 +2560,11 @@ export default {
} }
// 存储布局信息 // 存储布局信息
html2canvas(this.$refs.seatSelectArea) html2canvas(this.$refs.seatSelectArea)
.then((canvas) => { .then(canvas => {
// 转成图片，生成图片地址 // 转成图片，生成图片地址
this.imgUrl = canvas.toDataURL('/assets/png') this.imgUrl = canvas.toDataURL('/assets/png')
}) })
.then((res) => { .then(res => {
let ids = null let ids = null
if (index != '-1') { if (index != '-1') {
ids = sessionStorage.getItem('coId') ids = sessionStorage.getItem('coId')
...@@ -2265,7 +2587,7 @@ export default { ...@@ -2265,7 +2587,7 @@ export default {
// return // return
// console.log('newObj', JSON.stringify(newObj)) // console.log('newObj', JSON.stringify(newObj))
this.$axios.addLayoutList(newObj).then( this.$axios.addLayoutList(newObj).then(
(response) => { response => {
if (response.data.code == 200) { if (response.data.code == 200) {
setTimeout(() => { setTimeout(() => {
this.$router.go(-1) this.$router.go(-1)
...@@ -2278,7 +2600,7 @@ export default { ...@@ -2278,7 +2600,7 @@ export default {
}) })
} }
}, },
(err) => { err => {
this.loading = false this.loading = false
bus.$emit('btnflag', false) bus.$emit('btnflag', false)
that.$notify.error({ that.$notify.error({
...@@ -2291,7 +2613,10 @@ export default { ...@@ -2291,7 +2613,10 @@ export default {
}) })
}, 800) }, 800)
} else { } else {
this.$message.warning(`${seat.split(',')[0]}分组${seat.split(',')[1]}存在重复座位号！`) this.$message.warning(
`${seat.split(',')[0]}分组${seat.split(',')[1]
}存在重复座位号！`
)
this.repeat = true this.repeat = true
let oDom = document.querySelectorAll('#areas') let oDom = document.querySelectorAll('#areas')
// console.log(oDom.length, this.seatList.length); // console.log(oDom.length, this.seatList.length);
...@@ -2348,7 +2673,11 @@ export default { ...@@ -2348,7 +2673,11 @@ export default {
for (let i in res.data.data.forms) { for (let i in res.data.data.forms) {
let newArr = [] let newArr = []
for (const index in msg) { for (const index in msg) {
if (msg[index].trueId != null && msg[index].type != 0 && msg[index].editorAreaId == res.data.data.forms[i].areaId) { if (
msg[index].trueId != null &&
msg[index].type != 0 &&
msg[index].editorAreaId == res.data.data.forms[i].areaId
) {
const temp = {} const temp = {}
// temp.colIndex = msg[index].rowIndex // temp.colIndex = msg[index].rowIndex
// temp.rowIndex = msg[index].colIndex // temp.rowIndex = msg[index].colIndex
...@@ -2365,7 +2694,9 @@ export default { ...@@ -2365,7 +2694,9 @@ export default {
tempList.areaName = res.data.data.forms[i].areaName tempList.areaName = res.data.data.forms[i].areaName
tempList.arr = newArr tempList.arr = newArr
tempList.editorAreaColor = '#276CDE' tempList.editorAreaColor = '#276CDE'
tempList.editorAreaId = Number(res.data.data.forms[i].areaId) tempList.editorAreaId = Number(
res.data.data.forms[i].areaId
)
tempList.startrow = Number(res.data.data.forms[i].row) tempList.startrow = Number(res.data.data.forms[i].row)
tempList.stratcol = Number(res.data.data.forms[i].col) tempList.stratcol = Number(res.data.data.forms[i].col)
newGetData.push(tempList) newGetData.push(tempList)
...@@ -2446,8 +2777,10 @@ export default { ...@@ -2446,8 +2777,10 @@ export default {
temp.rowIndex = this.seatList[index].y temp.rowIndex = this.seatList[index].y
temp.angle = this.seatList[index].rotate temp.angle = this.seatList[index].rotate
temp.name = this.seatList[index].name temp.name = this.seatList[index].name
temp.leftRightCenter2 = this.seatList[index].leftRightCenter2 temp.leftRightCenter2 =
temp.rightLeftCenter2 = this.seatList[index].rightLeftCenter2 this.seatList[index].leftRightCenter2
temp.rightLeftCenter2 =
this.seatList[index].rightLeftCenter2
temp.tableSignCardId = this.seatList[index].tableSignCardId temp.tableSignCardId = this.seatList[index].tableSignCardId
// temp.leftRightCenter2 = null // temp.leftRightCenter2 = null
// temp.rightLeftCenter2 = null // temp.rightLeftCenter2 = null
...@@ -2459,24 +2792,40 @@ export default { ...@@ -2459,24 +2792,40 @@ export default {
//根据背景色给给座位加类型 //根据背景色给给座位加类型
if (this.seatList[index].backimg === this.OldDoorImg) { if (this.seatList[index].backimg === this.OldDoorImg) {
temp.type = 8 temp.type = 8
} else if (this.seatList[index].background === this.stageting) { } else if (
this.seatList[index].background === this.stageting
) {
temp.type = 4 temp.type = 4
} else if (this.seatList[index].background == this.unSelect) { } else if (
this.seatList[index].background == this.unSelect
) {
temp.type = 0 temp.type = 0
} else if (this.seatList[index].background === this.selected) { } else if (
this.seatList[index].background === this.selected
) {
if (this.seatList[index].backimg === this.normalImg) { if (this.seatList[index].backimg === this.normalImg) {
temp.type = 1 temp.type = 1
} else if (this.seatList[index].backimg === this.doorImg) { } else if (
this.seatList[index].backimg === this.doorImg
) {
temp.type = 3 temp.type = 3
} else if (this.seatList[index].backimg === this.leaderImg) { } else if (
this.seatList[index].backimg === this.leaderImg
) {
temp.type = 2 temp.type = 2
} }
} else if (this.seatList[index].background === this.selecting) { } else if (
this.seatList[index].background === this.selecting
) {
if (this.seatList[index].backimg === this.normalImg) { if (this.seatList[index].backimg === this.normalImg) {
temp.type = 1 temp.type = 1
} else if (this.seatList[index].backimg === this.doorImg) { } else if (
this.seatList[index].backimg === this.doorImg
) {
temp.type = 3 temp.type = 3
} else if (this.seatList[index].backimg === this.leaderImg) { } else if (
this.seatList[index].backimg === this.leaderImg
) {
temp.type = 2 temp.type = 2
} }
} else { } else {
...@@ -2488,8 +2837,43 @@ export default { ...@@ -2488,8 +2837,43 @@ export default {
this.initconfSeatVoList = JSON.parse(JSON.stringify(arr)) this.initconfSeatVoList = JSON.parse(JSON.stringify(arr))
}, },
nextStepCan() {
console.log('nextStepCan')
if (this.seatListBack == null) {
this.nextStep = false
this.$emit('nextStepClick', this.nextStep)
console.log('false')
} else {
let bloon = true
for (let i in this.seatListBack) {
if (this.seatListBack[i].type) {
if (
this.seatListBack[i].type != 0 &&
this.seatListBack[i].type != 8 &&
this.seatListBack[i].type != 4 &&
!this.seatListBack[i].trueId
) {
console.log('i', i)
console.log('this.seatListBack[i]', this.seatListBack)
console.log(
'this.seatListBack[i]',
i,
this.seatListBack[i]
)
//bus.$emit('judgeSeat', false)
// this.nextStep = false;
bloon = false
break
}
}
}
console.log('bloon', bloon)
this.$emit('nextStepClick', bloon)
}
},
}, },
created() {}, created() { },
mounted() { mounted() {
let app = document.querySelectorAll('.app') let app = document.querySelectorAll('.app')
app[0].style.boxSizing = 'unset' app[0].style.boxSizing = 'unset'
...@@ -2498,17 +2882,20 @@ export default { ...@@ -2498,17 +2882,20 @@ export default {
this.ruleFlag = false this.ruleFlag = false
this.onClick = false this.onClick = false
} }
bus.$on('tableTag', (bolen) => { bus.$on('tableTag', bolen => {
this.confimFlag = bolen this.confimFlag = bolen
this.ruleFlag = !bolen this.ruleFlag = !bolen
this.isPointer = true this.isPointer = true
this.tableTag = true this.tableTag = true
}) })
bus.$on('unbind', (val) => { bus.$on('unbind', val => {
console.log('解除那个座位', val) console.log('解除那个座位', val)
console.log(this.seatList) console.log(this.seatList)
for (let i = 0; i < this.seatList.length; i++) { for (let i = 0; i < this.seatList.length; i++) {
if (this.seatList[i].x === val.colIndex && this.seatList[i].y === val.rowIndex) { if (
this.seatList[i].x === val.colIndex &&
this.seatList[i].y === val.rowIndex
) {
console.log(i) console.log(i)
this.$set(this.seatList[i], 'tableSignCardId', null) this.$set(this.seatList[i], 'tableSignCardId', null)
// this.seatList[i].tableSignCardId = null // this.seatList[i].tableSignCardId = null
...@@ -2517,13 +2904,13 @@ export default { ...@@ -2517,13 +2904,13 @@ export default {
} }
} }
}) })
bus.$on('getSeatList', (val) => { bus.$on('getSeatList', val => {
this.getAreaAxis(val) this.getAreaAxis(val)
}) })
bus.$on('uploadCardId', (blone) => { bus.$on('uploadCardId', blone => {
this.dialogUploadCardId = blone this.dialogUploadCardId = blone
}) })
bus.$on('boxFlag', (blone) => { bus.$on('boxFlag', blone => {
// this.boxFlag = blone // this.boxFlag = blone
// console.log('confimFlag',blone) // console.log('confimFlag',blone)
}) })
...@@ -2534,7 +2921,10 @@ export default { ...@@ -2534,7 +2921,10 @@ export default {
// console.log('editorAreaIdArr.', this.editorAreaIdArr) // console.log('editorAreaIdArr.', this.editorAreaIdArr)
// console.log(Object.keys(this.currentIndex)) // console.log(Object.keys(this.currentIndex))
for (let i in this.formList) { for (let i in this.formList) {
if (this.formList[i].sortType == 2 || this.formList[i].sortType == 6) { if (
this.formList[i].sortType == 2 ||
this.formList[i].sortType == 6
) {
let objID = Object.keys(this.currentIndex) let objID = Object.keys(this.currentIndex)
for (let j in objID) { for (let j in objID) {
if (this.formList[i].areaId == objID[j]) { if (this.formList[i].areaId == objID[j]) {
...@@ -2542,11 +2932,20 @@ export default { ...@@ -2542,11 +2932,20 @@ export default {
let index = 0 let index = 0
for (let k in this.seatList2) { for (let k in this.seatList2) {
if (this.formList[i].areaId == this.seatList2[k].editorAreaId) { if (
if (this.seatList2[k].leftRightCenter2 || this.seatList2[k].rightLeftCenter2) { this.formList[i].areaId ==
this.seatList2[k].editorAreaId
) {
if (
this.seatList2[k].leftRightCenter2 ||
this.seatList2[k].rightLeftCenter2
) {
// console.log(this.currentIndex[objID[j]][index]) // console.log(this.currentIndex[objID[j]][index])
// console.log(this.seatList2[k].y) // console.log(this.seatList2[k].y)
if (this.seatList2[k].y == this.currentIndex[objID[j]][index]) { if (
this.seatList2[k].y ==
this.currentIndex[objID[j]][index]
) {
index++ index++
} else { } else {
// console.log(123) // console.log(123)
...@@ -2554,14 +2953,24 @@ export default { ...@@ -2554,14 +2953,24 @@ export default {
// if(this.formList) // if(this.formList)
// } // }
this.$confirm('新增前未保存已修改的数据, 是否需要保存?', '提示', { this.$confirm(
confirmButtonText: '确定', '新增前未保存已修改的数据, 是否需要保存?',
cancelButtonText: '取消', '提示',
type: 'warning', {
}) confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
.then(() => { .then(() => {
bus.$emit('setForm', this.formList[i].sortType, i) bus.$emit(
this.seatList2 = JSON.parse(JSON.stringify(this.seatList)) 'setForm',
this.formList[i].sortType,
i
)
this.seatList2 = JSON.parse(
JSON.stringify(this.seatList)
)
console.log('保存') console.log('保存')
this.$message({ this.$message({
type: 'success', type: 'success',
...@@ -2579,14 +2988,30 @@ export default { ...@@ -2579,14 +2988,30 @@ export default {
this.currentIndex = {} this.currentIndex = {}
for (let i in this.seatList2) { for (let i in this.seatList2) {
if ( if (
(this.seatList2[i].trueId && this.sortType == 2 && this.seatList2[i].leftRightCenter2 != null) || (this.seatList2[i].trueId &&
(this.seatList2[i].trueId && this.sortType == 6 && this.seatList2[i].rightLeftCenter2 != null) this.sortType == 2 &&
this.seatList2[i].leftRightCenter2 !=
null) ||
(this.seatList2[i].trueId &&
this.sortType == 6 &&
this.seatList2[i].rightLeftCenter2 !=
null)
) { ) {
if (this.currentIndex.hasOwnProperty(`${this.seatList2[i].editorAreaId}`)) { if (
this.currentIndex[`${this.seatList2[i].editorAreaId}`].push(this.seatList[i].y) this.currentIndex.hasOwnProperty(
`${this.seatList2[i].editorAreaId}`
)
) {
this.currentIndex[
`${this.seatList2[i].editorAreaId}`
].push(this.seatList[i].y)
} else { } else {
this.currentIndex[`${this.seatList2[i].editorAreaId}`] = [] this.currentIndex[
this.currentIndex[`${this.seatList2[i].editorAreaId}`].push(this.seatList2[i].y) `${this.seatList2[i].editorAreaId}`
] = []
this.currentIndex[
`${this.seatList2[i].editorAreaId}`
].push(this.seatList2[i].y)
} }
} }
} }
...@@ -2604,7 +3029,6 @@ export default { ...@@ -2604,7 +3029,6 @@ export default {
} }
}) })
bus.$on('isNext', () => { bus.$on('isNext', () => {
console.log(this.seatList)
console.log('this.seatListBack[i]', this.seatListBack) console.log('this.seatListBack[i]', this.seatListBack)
if (this.seatListBack == null) { if (this.seatListBack == null) {
bus.$emit('judgeSeat', false) bus.$emit('judgeSeat', false)
...@@ -2619,7 +3043,11 @@ export default { ...@@ -2619,7 +3043,11 @@ export default {
!this.seatListBack[i].trueId !this.seatListBack[i].trueId
) { ) {
console.log('this.seatListBack[i]', this.seatListBack) console.log('this.seatListBack[i]', this.seatListBack)
console.log('this.seatListBack[i]', i, this.seatListBack[i]) console.log(
'this.seatListBack[i]',
i,
this.seatListBack[i]
)
bus.$emit('judgeSeat', false) bus.$emit('judgeSeat', false)
break break
} }
...@@ -2632,20 +3060,33 @@ export default { ...@@ -2632,20 +3060,33 @@ export default {
if (sortType == 2) { if (sortType == 2) {
for (let i in this.seatList) { for (let i in this.seatList) {
if (this.seatList[i].leftRightCenter2) { if (this.seatList[i].leftRightCenter2) {
if (this.seatList[i].leftRightCenter2 == this.seatList2[i].leftRightCenter2) { if (
this.seatList[i].leftRightCenter2 ==
this.seatList2[i].leftRightCenter2
) {
// console.log(i) // console.log(i)
// console.log('!!!!匹配') // console.log('!!!!匹配')
} else { } else {
console.log('不匹配??????????') console.log('不匹配??????????')
bus.$emit('isSaved', false, this.seatList[i].editorAreaId) bus.$emit(
this.$confirm('已修改的数据未保存, 是否需要保存?', '提示', { 'isSaved',
confirmButtonText: '确定', false,
cancelButtonText: '取消', this.seatList[i].editorAreaId
type: 'warning', )
}) this.$confirm(
'已修改的数据未保存, 是否需要保存?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
.then(() => { .then(() => {
bus.$emit('setForm', sortType, index) bus.$emit('setForm', sortType, index)
this.seatList2 = JSON.parse(JSON.stringify(this.seatList)) this.seatList2 = JSON.parse(
JSON.stringify(this.seatList)
)
console.log('保存') console.log('保存')
// this.$message({ // this.$message({
// type: 'success', // type: 'success',
...@@ -2668,7 +3109,10 @@ export default { ...@@ -2668,7 +3109,10 @@ export default {
} else if (sortType == 6) { } else if (sortType == 6) {
for (let i in this.seatList) { for (let i in this.seatList) {
if (this.seatList[i].rightLeftCenter2) { if (this.seatList[i].rightLeftCenter2) {
if (this.seatList[i].rightLeftCenter2 == this.seatList2[i].rightLeftCenter2) { if (
this.seatList[i].rightLeftCenter2 ==
this.seatList2[i].rightLeftCenter2
) {
// console.log(i) // console.log(i)
// console.log('!!!!匹配') // console.log('!!!!匹配')
} else { } else {
...@@ -2676,15 +3120,25 @@ export default { ...@@ -2676,15 +3120,25 @@ export default {
// console.log('不匹配??????????') // console.log('不匹配??????????')
// console.log(this.seatList[i]) // console.log(this.seatList[i])
console.log(this.seatList2[i]) console.log(this.seatList2[i])
bus.$emit('isSaved', false, this.seatList[i].editorAreaId) bus.$emit(
this.$confirm('此操作未保存已修改的数据, 是否需要保存?', '提示', { 'isSaved',
confirmButtonText: '确定', false,
cancelButtonText: '取消', this.seatList[i].editorAreaId
type: 'warning', )
}) this.$confirm(
'此操作未保存已修改的数据, 是否需要保存?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
.then(() => { .then(() => {
bus.$emit('setForm', sortType, index) bus.$emit('setForm', sortType, index)
this.seatList2 = JSON.parse(JSON.stringify(this.seatList)) this.seatList2 = JSON.parse(
JSON.stringify(this.seatList)
)
}) })
.catch(() => { .catch(() => {
this.$message({ this.$message({
...@@ -2703,13 +3157,15 @@ export default { ...@@ -2703,13 +3157,15 @@ export default {
this.onClick = true this.onClick = true
console.log(this.onClick) console.log(this.onClick)
}) })
bus.$on('custom', (val) => { bus.$on('custom', val => {
for (let i in this.seatList) { for (let i in this.seatList) {
if (this.seatList[i].orderArr) { if (this.seatList[i].orderArr) {
if (this.seatList[i].orderArr[6] != undefined) { if (this.seatList[i].orderArr[6] != undefined) {
this.seatList[i].orderArr[6] = this.seatList[i].orderArr[val - 1] this.seatList[i].orderArr[6] =
this.seatList[i].orderArr[val - 1]
} else { } else {
this.seatList[i].orderArr[6] = this.seatList[i].orderArr[0] this.seatList[i].orderArr[6] =
this.seatList[i].orderArr[0]
bus.$emit('customType', 1) bus.$emit('customType', 1)
} }
} }
...@@ -2720,14 +3176,14 @@ export default { ...@@ -2720,14 +3176,14 @@ export default {
this.refreshDom() this.refreshDom()
// console.log(this.seatList) // console.log(this.seatList)
}) })
bus.$on('newform', (value) => { bus.$on('newform', value => {
// console.log('收到的form表单', value) // console.log('收到的form表单', value)
this.formList = value this.formList = value
}) })
bus.$on('switchClick2', (value) => { bus.$on('switchClick2', value => {
this.sortType = 1 this.sortType = 1
}) })
bus.$on('changePositionOne', (value) => { bus.$on('changePositionOne', value => {
console.log(value) console.log(value)
// console.log(this.formName) // console.log(this.formName)
if (value.areaName == this.formName) { if (value.areaName == this.formName) {
...@@ -2739,7 +3195,7 @@ export default { ...@@ -2739,7 +3195,7 @@ export default {
this.isPointer = true this.isPointer = true
} }
}) })
bus.$on('deleteList', (msg) => { bus.$on('deleteList', msg => {
let delId = msg let delId = msg
this.px1 = true this.px1 = true
this.init() this.init()
...@@ -2760,10 +3216,10 @@ export default { ...@@ -2760,10 +3216,10 @@ export default {
} }
// console.log('currentIndex', this.currentIndex) // console.log('currentIndex', this.currentIndex)
}) })
bus.$on('formList', (value) => { bus.$on('formList', value => {
console.log('接收到的表单', value) console.log('接收到的表单', value)
}) })
bus.$on('formBtnFun', (value) => { bus.$on('formBtnFun', value => {
// console.log('现在存在的表单', JSON.parse(JSON.stringify(this.formList))) // console.log('现在存在的表单', JSON.parse(JSON.stringify(this.formList)))
// console.log('修改事件后的表单', value) // console.log('修改事件后的表单', value)
for (let i in this.formList) { for (let i in this.formList) {
...@@ -2782,11 +3238,11 @@ export default { ...@@ -2782,11 +3238,11 @@ export default {
delete this.initconfSeatVoList[i].rightLeftCenter2 delete this.initconfSeatVoList[i].rightLeftCenter2
} }
}) })
bus.$on('getCurrentIndex', (value) => { bus.$on('getCurrentIndex', value => {
this.currentIndex = value this.currentIndex = value
// console.log('接收到的this.currentindex', this.currentIndex) // console.log('接收到的this.currentindex', this.currentIndex)
}) })
bus.$on('data', (value) => { bus.$on('data', value => {
// console.log('座位表格收到的data', value) // console.log('座位表格收到的data', value)
this.getData.push(value) this.getData.push(value)
}) })
...@@ -2799,7 +3255,7 @@ export default { ...@@ -2799,7 +3255,7 @@ export default {
// console.log('switchClick', this.switchClick) // console.log('switchClick', this.switchClick)
// console.log('sort', this.sortType) // console.log('sort', this.sortType)
}) })
bus.$emit('sortType2', (value) => { bus.$emit('sortType2', value => {
this.sortType = value this.sortType = value
}) })
bus.$on('switchClick', (value, bloen) => { bus.$on('switchClick', (value, bloen) => {
...@@ -2811,7 +3267,7 @@ export default { ...@@ -2811,7 +3267,7 @@ export default {
this.confimFlag2 = false this.confimFlag2 = false
// console.log('switchClick', this.switchClick) // console.log('switchClick', this.switchClick)
}) })
bus.$on('sortType1', (value) => { bus.$on('sortType1', value => {
console.log('sortType1', value) console.log('sortType1', value)
this.sortType = value this.sortType = value
this.seatList2 = JSON.parse(JSON.stringify(this.seatList)) this.seatList2 = JSON.parse(JSON.stringify(this.seatList))
...@@ -2835,7 +3291,10 @@ export default { ...@@ -2835,7 +3291,10 @@ export default {
this.init() this.init()
let editroList = data.flat(2) let editroList = data.flat(2)
for (let i in editroList) { for (let i in editroList) {
;[editroList[i].colIndex, editroList[i].rowIndex] = [editroList[i].rowIndex, editroList[i].colIndex] ;[editroList[i].colIndex, editroList[i].rowIndex] = [
editroList[i].rowIndex,
editroList[i].colIndex,
]
} }
// console.log('editroList', editroList) // console.log('editroList', editroList)
// console.log('initconfSeatVoList', this.initconfSeatVoList) // console.log('initconfSeatVoList', this.initconfSeatVoList)
...@@ -2844,15 +3303,29 @@ export default { ...@@ -2844,15 +3303,29 @@ export default {
for (let j in editroList) { for (let j in editroList) {
// console.log(j) // console.log(j)
if ( if (
this.initconfSeatVoList[i].rowIndex == editroList[j].rowIndex && this.initconfSeatVoList[i].rowIndex ==
this.initconfSeatVoList[i].colIndex == editroList[j].colIndex editroList[j].rowIndex &&
this.initconfSeatVoList[i].colIndex ==
editroList[j].colIndex
) { ) {
this.$set(this.initconfSeatVoList[i], 'orderArr', JSON.parse(JSON.stringify(editroList[j].orderArr))) this.$set(
this.initconfSeatVoList[i],
'orderArr',
JSON.parse(JSON.stringify(editroList[j].orderArr))
)
if (editroList[j].leftRightCenter !== undefined) { if (editroList[j].leftRightCenter !== undefined) {
this.$set(this.initconfSeatVoList[i], 'leftRightCenter', editroList[j].leftRightCenter) this.$set(
this.initconfSeatVoList[i],
'leftRightCenter',
editroList[j].leftRightCenter
)
} }
if (editroList[j].rightLeftCenter !== undefined) { if (editroList[j].rightLeftCenter !== undefined) {
this.$set(this.initconfSeatVoList[i], 'rightLeftCenter', editroList[j].rightLeftCenter) this.$set(
this.initconfSeatVoList[i],
'rightLeftCenter',
editroList[j].rightLeftCenter
)
} }
} }
} }
...@@ -2863,7 +3336,9 @@ export default { ...@@ -2863,7 +3336,9 @@ export default {
// console.log(JSON.parse(JSON.stringify(this.initconfSeatVoList))); // console.log(JSON.parse(JSON.stringify(this.initconfSeatVoList)));
for (let i = 0; i < this.initconfSeatVoList.length; i++) { for (let i = 0; i < this.initconfSeatVoList.length; i++) {
if (this.initconfSeatVoList[i].orderArr) { if (this.initconfSeatVoList[i].orderArr) {
this.seatList[i].orderArr = JSON.parse(JSON.stringify(this.initconfSeatVoList[i].orderArr)) this.seatList[i].orderArr = JSON.parse(
JSON.stringify(this.initconfSeatVoList[i].orderArr)
)
// console.log(this.seatList[i]) // console.log(this.seatList[i])
} }
} }
...@@ -2885,7 +3360,7 @@ export default { ...@@ -2885,7 +3360,7 @@ export default {
// console.log('move',this.move) // console.log('move',this.move)
// console.log('返回上一步的getData', this.getData) // console.log('返回上一步的getData', this.getData)
}) })
bus.$on('updateName', (msg) => { bus.$on('updateName', msg => {
this.areaList = msg this.areaList = msg
}) })
...@@ -2907,7 +3382,10 @@ export default { ...@@ -2907,7 +3382,10 @@ export default {
// console.log('editroList', JSON.parse(JSON.stringify(editroList))) // console.log('editroList', JSON.parse(JSON.stringify(editroList)))
// 更换列和行的序号。现在为正常 // 更换列和行的序号。现在为正常
for (let i in editroList) { for (let i in editroList) {
;[editroList[i].colIndex, editroList[i].rowIndex] = [editroList[i].rowIndex, editroList[i].colIndex] ;[editroList[i].colIndex, editroList[i].rowIndex] = [
editroList[i].rowIndex,
editroList[i].colIndex,
]
} }
// console.log('editroList操作后', editroList) // console.log('editroList操作后', editroList)
// console.log('initconfSeatVoList', this.initconfSeatVoList) // console.log('initconfSeatVoList', this.initconfSeatVoList)
...@@ -2916,27 +3394,51 @@ export default { ...@@ -2916,27 +3394,51 @@ export default {
for (let i = 0; i < this.initconfSeatVoList.length; i++) { for (let i = 0; i < this.initconfSeatVoList.length; i++) {
for (let j in editroList) { for (let j in editroList) {
if ( if (
this.initconfSeatVoList[i].rowIndex == editroList[j].rowIndex && this.initconfSeatVoList[i].rowIndex ==
this.initconfSeatVoList[i].colIndex == editroList[j].colIndex editroList[j].rowIndex &&
this.initconfSeatVoList[i].colIndex ==
editroList[j].colIndex
) { ) {
if (type == 'area') { if (type == 'area') {
this.initconfSeatVoList[i] = JSON.parse(JSON.stringify(editroList[j])) this.initconfSeatVoList[i] = JSON.parse(
JSON.stringify(editroList[j])
)
} else { } else {
this.$set(this.initconfSeatVoList[i], 'orderNum', JSON.parse(JSON.stringify(editroList[j].orderNum))) this.$set(
this.$set(this.initconfSeatVoList[i], 'leftRightCenter2', JSON.parse(JSON.stringify(editroList[j].leftRightCenter2))) this.initconfSeatVoList[i],
'orderNum',
JSON.parse(JSON.stringify(editroList[j].orderNum))
)
this.$set(
this.initconfSeatVoList[i],
'leftRightCenter2',
JSON.parse(
JSON.stringify(editroList[j].leftRightCenter2)
)
)
} }
} }
} }
if (this.initconfSeatVoList[i].trueId) { if (this.initconfSeatVoList[i].trueId) {
// console.log(this.initconfSeatVoList[i]) // console.log(this.initconfSeatVoList[i])
if (this.currentIndex.hasOwnProperty(`this.initconfSeatVoList[i].editorAreaId`) == false) { if (
this.$set(this.currentIndex, this.initconfSeatVoList[i].editorAreaId, []) this.currentIndex.hasOwnProperty(
`this.initconfSeatVoList[i].editorAreaId`
) == false
) {
this.$set(
this.currentIndex,
this.initconfSeatVoList[i].editorAreaId,
[]
)
} }
} }
} }
for (let i = 0; i < this.initconfSeatVoList.length; i++) { for (let i = 0; i < this.initconfSeatVoList.length; i++) {
if (this.seatList[i].orderArr) { if (this.seatList[i].orderArr) {
this.initconfSeatVoList[i].orderArr = JSON.parse(JSON.stringify(this.seatList[i].orderArr)) this.initconfSeatVoList[i].orderArr = JSON.parse(
JSON.stringify(this.seatList[i].orderArr)
)
// console.log(this.seatList[i]) // console.log(this.seatList[i])
} }
} }
...@@ -2948,8 +3450,11 @@ export default { ...@@ -2948,8 +3450,11 @@ export default {
// console.log('seatList', JSON.parse(JSON.stringify(this.seatList))) // console.log('seatList', JSON.parse(JSON.stringify(this.seatList)))
// console.log('seatList2', JSON.parse(JSON.stringify(this.seatList2))) // console.log('seatList2', JSON.parse(JSON.stringify(this.seatList2)))
// debugger // debugger
console.log('..........')
this.nextStepCan()
}) })
bus.$on('click', (msg) => { bus.$on('click', msg => {
this.onClick = msg this.onClick = msg
console.log('msg', msg) console.log('msg', msg)
}) })
...@@ -2960,7 +3465,7 @@ export default { ...@@ -2960,7 +3465,7 @@ export default {
// this.move = true // this.move = true
// console.log('move', this.move) // console.log('move', this.move)
}), }),
bus.$on('btnshow', (msg) => { bus.$on('btnshow', msg => {
if (msg) { if (msg) {
this.btnControl = 1 this.btnControl = 1
} else { } else {
...@@ -2969,7 +3474,7 @@ export default { ...@@ -2969,7 +3474,7 @@ export default {
} }
}), }),
//初始化判断是否完成来控制 分组框功能 //初始化判断是否完成来控制 分组框功能
bus.$on('iscraryy', (msg) => { bus.$on('iscraryy', msg => {
if (msg) { if (msg) {
this.btnControl = 0 this.btnControl = 0
this.nextr = false this.nextr = false
...@@ -2990,18 +3495,21 @@ export default { ...@@ -2990,18 +3495,21 @@ export default {
} }
</script> </script>
<style scoped> <style scoped>
.center { .center {
background: #00e5fa; background: #00e5fa;
} }
.bind {
background-color: pink; .bind {
} background-color: pink;
.blueBorder { }
border: 5px solid blue;
} .blueBorder {
.pointer { border: 5px solid blue;
cursor: pointer; }
}
.pointer {
cursor: pointer;
}
</style> </style>
<style lang="stylus" scoped> <style lang="stylus" scoped>
.areaName { .areaName {
......
src/views/system/bankmanager.vue
浏览文件 @ 5ba2a1df
...@@ -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>
src/views/system/conindex.vue
浏览文件 @ 5ba2a1df
...@@ -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()
}, },
......
src/views/system/index.vue
浏览文件 @ 5ba2a1df
...@@ -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;
......
src/views/system/userLibrary.vue
浏览文件 @ 5ba2a1df
...@@ -93,7 +93,13 @@ ...@@ -93,7 +93,13 @@
<div class="header"> <div class="header">
<div class="header_title_wrap"> <div class="header_title_wrap">
<div class="left_huizong">汇总</div> <div class="left_huizong">汇总</div>
<div class="right_huizong"></div> <div class="right_huizong">
<div>累计人数：<span>{{ titleForm.personNum }}</span></div>
<div>上次更新时间: <span>{{ titleForm.syncTime }}</span><span>({{ titleForm.syncSuccess ==
2 ? '同步成功' : '同步失败' }})</span>
</div>
</div>
</div> </div>
<!-- <div class="switch_but_wrap"> <!-- <div class="switch_but_wrap">
<div <div
...@@ -124,14 +130,7 @@ ...@@ -124,14 +130,7 @@
<el-tree :props="treeData" :load="loadNode" lazy @node-click="chooseRen"></el-tree> <el-tree :props="treeData" :load="loadNode" lazy @node-click="chooseRen"></el-tree>
</div> </div>
<div class="content" v-if="!switchFlag"> <div class="content" v-if="!switchFlag">
<el-table <el-table :data="tableData" stripe height="100%" ref="table" class="template_table" v-loading="loading">
:data="tableData"
stripe
height="100%"
ref="table"
class="template_table"
v-loading="loading"
>
<el-table-column label="序号" width="100" prop="orderInOrganization"></el-table-column> <el-table-column label="序号" width="100" prop="orderInOrganization"></el-table-column>
<el-table-column prop="employeeName" label="姓名" width="150"></el-table-column> <el-table-column prop="employeeName" label="姓名" width="150"></el-table-column>
<!-- <el-table-column label="手机号" width="200"> <!-- <el-table-column label="手机号" width="200">
...@@ -178,15 +177,9 @@ ...@@ -178,15 +177,9 @@
</el-table-column>--> </el-table-column>-->
</el-table> </el-table>
<div class="ty_pagination"> <div class="ty_pagination">
<el-pagination <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
@size-change="handleSizeChange" :page-sizes="[10, 20, 30, 40]" :current-page="form.pageNum" :page-size="form.pageSize"
@current-change="handleCurrentChange" layout="total, sizes, prev, pager, next, jumper" :total="count"></el-pagination>
:page-sizes="[10, 20, 30, 40]"
:current-page="form.pageNum"
:page-size="form.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count"
></el-pagination>
</div> </div>
</div> </div>
</div> </div>
...@@ -225,7 +218,9 @@ import BatchImportDialog from '../meeting/operation/Administration/components/Ba ...@@ -225,7 +218,9 @@ import BatchImportDialog from '../meeting/operation/Administration/components/Ba
import { Loading } from 'element-ui' import { Loading } from 'element-ui'
export default { export default {
name: 'jurisdiction', name: 'jurisdiction',
data() {
props: ['titleForm'],
data () {
return { return {
treeData: { treeData: {
label: 'organizationName', label: 'organizationName',
...@@ -319,6 +314,15 @@ export default { ...@@ -319,6 +314,15 @@ export default {
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)', background: 'rgba(0, 0, 0, 0.7)',
}, },
// titleForm: {
// id: "",
// personNum: 0, //累计人数
// syncInfo: "", //同步信息
// syncSuccess: 0, //是否同步成功（2-同步成功，3同步失败）
// syncTime: "",//同步时间
// syncType: 0,//同步状态（0-可以同步，1-正在同步）
// }
} }
}, },
components: { components: {
...@@ -326,10 +330,11 @@ export default { ...@@ -326,10 +330,11 @@ export default {
BatchImportDialog, BatchImportDialog,
}, },
filters: { filters: {
showName(val) { showName (val) {
// console.log(val); // console.log(val);
let obj = '' let obj = ''
switch (val) { switch (val)
{
case true: case true:
obj = '是' obj = '是'
break break
...@@ -339,10 +344,11 @@ export default { ...@@ -339,10 +344,11 @@ export default {
} }
return obj return obj
}, },
check(val) { check (val) {
// console.log(val); // console.log(val);
let obj = '' let obj = ''
switch (val) { switch (val)
{
case true: case true:
obj = '通过' obj = '通过'
break break
...@@ -354,65 +360,76 @@ export default { ...@@ -354,65 +360,76 @@ export default {
return obj return obj
}, },
}, },
created() { created () {
// this.init(); // this.init();
// this.getTaList(); // this.getTaList();
// this.cardQuery(); // this.cardQuery();
// console.log(this.titleForm);
}, },
methods: { methods: {
changeCustomOrgName(index) {
changeCustomOrgName (index) {
this.manageLists[index].updateStatus = 1 this.manageLists[index].updateStatus = 1
}, },
sureFen() { sureFen () {
let flag = true let flag = true
for (let i = 0; i < this.manageLists.length; i++) { for (let i = 0; i < this.manageLists.length; i++)
if (this.manageLists[i].customOrgName == '') { {
if (this.manageLists[i].customOrgName == '')
{
flag = false flag = false
} }
} }
if (flag) { if (flag)
{
this.$axios.updateAreaName(this.manageLists).then((res) => { this.$axios.updateAreaName(this.manageLists).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200)
{
this.manageCategores = false this.manageCategores = false
this.init() this.init()
} else { } else
{
this.$message.error(res.data.data) this.$message.error(res.data.data)
} }
}) })
} else { } else
{
this.$message.error('分区名称不能为空！') this.$message.error('分区名称不能为空！')
} }
}, },
deleteFenLei(index) { deleteFenLei (index) {
this.manageLists[index].updateStatus = 2 this.manageLists[index].updateStatus = 2
this.$forceUpdate() this.$forceUpdate()
}, },
handleClose() { handleClose () {
this.manageCategores = false this.manageCategores = false
}, },
insertFen() { insertFen () {
let data = { let data = {
confAreaName: '分区' + (this.manageLists.length + 1), confAreaName: '分区' + (this.manageLists.length + 1),
updateStatus: 1, updateStatus: 1,
} }
this.manageLists.push(data) this.manageLists.push(data)
}, },
areaName() { areaName () {
let data = { let data = {
info: '', info: '',
} }
this.$axios.findAllAreaName(data).then((res) => { this.$axios.findAllAreaName(data).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200)
{
this.manageLists = res.data.data this.manageLists = res.data.data
this.manageCategores = true this.manageCategores = true
} else { } else
{
this.$message.error(res.data.data) this.$message.error(res.data.data)
} }
}) })
}, },
chooseRen(node) { chooseRen (node) {
if (node.leaf) { if (node.leaf)
{
this.loading = true this.loading = true
this.form.pageNum = 1 this.form.pageNum = 1
this.form.organizationCode = node.organizationCode this.form.organizationCode = node.organizationCode
...@@ -420,29 +437,33 @@ export default { ...@@ -420,29 +437,33 @@ export default {
this.getDatas() this.getDatas()
} }
}, },
getDatas() { getDatas () {
this.$axios.fingdAllDingUser(this.form).then((res) => { this.$axios.fingdAllDingUser(this.form).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200)
{
this.loading = false this.loading = false
this.tableData = res.data.data.content this.tableData = res.data.data.content
this.count = res.data.data.totalElements this.count = res.data.data.totalElements
} }
}) })
}, },
callPush() { callPush () {
this.$router.push('/system/bankMangager/userLibrary/customizeUser') this.$router.push('/system/bankMangager/userLibrary/customizeUser')
}, },
abbunit() { abbunit () {
this.$router.push('/system/bankMangager/userLibrary/abbreviaLibrary') this.$router.push('/system/bankMangager/userLibrary/abbreviaLibrary')
}, },
personLabel() { personLabel () {
console.log('personLabel') console.log('personLabel')
this.$router.push('/system/bankMangager/userLibrary/personLabel') this.$router.push('/system/bankMangager/userLibrary/personLabel')
}, },
loadNode(node, resolve) { loadNode (node, resolve) {
if (node.level === 0) { if (node.level === 0)
{
this.$axios.getAllUnitByDing({ organizationCode: '' }).then((res) => { this.$axios.getAllUnitByDing({ organizationCode: '' }).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200)
{
return resolve(res.data.data) return resolve(res.data.data)
} }
}) })
...@@ -451,14 +472,16 @@ export default { ...@@ -451,14 +472,16 @@ export default {
// console.log(333333333333, node.level); // console.log(333333333333, node.level);
// return resolve([]); // return resolve([]);
// } // }
if (node.data) { if (node.data)
{
setTimeout(() => { setTimeout(() => {
this.$axios this.$axios
.getAllUnitByDing({ .getAllUnitByDing({
organizationCode: node.data.organizationCode, organizationCode: node.data.organizationCode,
}) })
.then((res) => { .then((res) => {
if (res.data.code == 200) { if (res.data.code == 200)
{
resolve(res.data.data) resolve(res.data.data)
} }
}) })
...@@ -466,12 +489,12 @@ export default { ...@@ -466,12 +489,12 @@ export default {
} }
}, },
handleSizeChange(val) { handleSizeChange (val) {
this.form.pageSize = val this.form.pageSize = val
this.getDatas() this.getDatas()
}, },
//分页查询 //分页查询
handleCurrentChange(val) { handleCurrentChange (val) {
this.form.pageNum = val this.form.pageNum = val
this.getDatas() this.getDatas()
}, },
...@@ -485,54 +508,67 @@ export default { ...@@ -485,54 +508,67 @@ export default {
flex-direction: column; flex-direction: column;
padding: 20px 10px 20px 20px; padding: 20px 10px 20px 20px;
background-color: white; background-color: white;
.content_wrap { .content_wrap {
height: 100%; height: 100%;
.top_wrap_2 { .top_wrap_2 {
width: calc(100% - 10px); width: calc(100% - 10px);
.el-button { .el-button {
margin-left: 20px; margin-left: 20px;
} }
.el-input, .el-input,
/deep/ .el-input .el-input__inner { /deep/ .el-input .el-input__inner {
width: 390px !important; width: 390px !important;
} }
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
} }
/deep/ .el-form .el-form-item { /deep/ .el-form .el-form-item {
margin-right: 10px !important; margin-right: 10px !important;
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
/deep/ .el-form { /deep/ .el-form {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.header { .header {
display: flex; display: flex;
margin-top: 10px; margin-top: 10px;
width: calc(100% - 10px); width: calc(100% - 10px);
} }
} }
/deep/.el-range-editor.el-input__inner { /deep/.el-range-editor.el-input__inner {
width: 350px !important; width: 350px !important;
} }
.top_container { .top_container {
height: 50px; height: 50px;
display: flex; display: flex;
justify-content: end; justify-content: end;
margin-bottom: 10px; margin-bottom: 10px;
.el-button { .el-button {
margin-right: 10px; margin-right: 10px;
} }
} }
.header_title_wrap { .header_title_wrap {
width: calc(100% - 92px); width: calc(100% - 10px);
margin-right: 12px; margin-right: 12px;
height: 40px; height: 40px;
// border: 1px solid red; // border: 1px solid red;
// padding: 0px 24px; // padding: 0px 24px;
line-height: 40px; line-height: 40px;
display: flex; display: flex;
.left_huizong { .left_huizong {
height: 100%; height: 100%;
width: 60px; width: 60px;
...@@ -541,22 +577,28 @@ export default { ...@@ -541,22 +577,28 @@ export default {
text-align: center; text-align: center;
color: #fff; color: #fff;
} }
.right_huizong { .right_huizong {
padding-left: 16px; padding: 0 16px;
height: 100%; height: 100%;
width: 100%; width: 100%;
background: #e5e8eb50; background: #e5e8eb50;
color: #778ca2; color: #778ca2;
border-radius: 0px 4px 4px 0px; border-radius: 0px 4px 4px 0px;
display: flex;
justify-content: space-between;
} }
} }
.up_btn { .up_btn {
margin: 10px 0 18px 0; margin: 10px 0 18px 0;
} }
.main { .main {
height: calc(100% - 100px); height: calc(100% - 100px);
display: flex; display: flex;
margin-top: 10px; margin-top: 10px;
.tree { .tree {
box-shadow: 0px 0px 16px 0px rgba(84, 116, 235, 0.12); box-shadow: 0px 0px 16px 0px rgba(84, 116, 235, 0.12);
border-radius: 2px; border-radius: 2px;
...@@ -566,6 +608,7 @@ export default { ...@@ -566,6 +608,7 @@ export default {
padding: 10px; padding: 10px;
} }
} }
.content { .content {
width: calc(100% - 300px); width: calc(100% - 300px);
// border: 1px solid #3a3c4b; // border: 1px solid #3a3c4b;
...@@ -579,11 +622,13 @@ export default { ...@@ -579,11 +622,13 @@ export default {
// overflow-y: auto; // overflow-y: auto;
font-size: 16px; font-size: 16px;
} }
span { span {
cursor: pointer; cursor: pointer;
color: #5474e8; color: #5474e8;
} }
} }
.card_wrap { .card_wrap {
max-height: calc(100% - 150px); max-height: calc(100% - 150px);
width: calc(100% + 8px); width: calc(100% + 8px);
...@@ -591,6 +636,7 @@ export default { ...@@ -591,6 +636,7 @@ export default {
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 10px; margin-top: 10px;
overflow: auto; overflow: auto;
.person { .person {
position: relative; position: relative;
width: 250px; width: 250px;
...@@ -603,6 +649,7 @@ export default { ...@@ -603,6 +649,7 @@ export default {
padding: 18px 12px; padding: 18px 12px;
display: flex; display: flex;
cursor: pointer; cursor: pointer;
.leave_tag { .leave_tag {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
...@@ -615,12 +662,14 @@ export default { ...@@ -615,12 +662,14 @@ export default {
top: 0; top: 0;
right: 0; right: 0;
} }
.portrait_number { .portrait_number {
width: 44px; width: 44px;
height: 44px; height: 44px;
background-color: #778ca2; background-color: #778ca2;
opacity: 0.24; opacity: 0.24;
border-radius: 8px; border-radius: 8px;
.sort_number { .sort_number {
line-height: 44px; line-height: 44px;
text-align: center; text-align: center;
...@@ -630,6 +679,7 @@ export default { ...@@ -630,6 +679,7 @@ export default {
color: #ffffff; color: #ffffff;
} }
} }
.portrait { .portrait {
width: 44px; width: 44px;
height: 44px; height: 44px;
...@@ -637,11 +687,13 @@ export default { ...@@ -637,11 +687,13 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.text_wrap { .text_wrap {
width: 178px; width: 178px;
height: 44px; height: 44px;
display: inline; display: inline;
padding-left: 14px; padding-left: 14px;
.name { .name {
font-size: 16px; font-size: 16px;
color: #3a3c4b; color: #3a3c4b;
...@@ -649,11 +701,13 @@ export default { ...@@ -649,11 +701,13 @@ export default {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.position, .position,
.require { .require {
font-size: 12px; font-size: 12px;
color: #778ca2; color: #778ca2;
} }
.position { .position {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -675,6 +729,7 @@ export default { ...@@ -675,6 +729,7 @@ export default {
.main_content /deep/ .el-table::before { .main_content /deep/ .el-table::before {
width: 0 !important; width: 0 !important;
} }
.main_content /deep/.el-table th.el-table__cell { .main_content /deep/.el-table th.el-table__cell {
font-size: 16px; font-size: 16px;
color: #778ca2; color: #778ca2;
...@@ -685,47 +740,59 @@ export default { ...@@ -685,47 +740,59 @@ export default {
justify-content: end; justify-content: end;
margin-top: 20px; margin-top: 20px;
} }
.row { .row {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.sortDialog.el-form { .sortDialog.el-form {
width: 100%; width: 100%;
padding: 0 20px; padding: 0 20px;
.name_input { .name_input {
margin-right: 20px; margin-right: 20px;
} }
.el-form-item { .el-form-item {
margin-right: 0 !important; margin-right: 0 !important;
} }
.name_input /deep/ .el-input, .name_input /deep/ .el-input,
.el-input .el-input__inner { .el-input .el-input__inner {
width: 220px; width: 220px;
} }
} }
.add_but { .add_but {
margin-bottom: 20px; margin-bottom: 20px;
} }
.s_padding_but { .s_padding_but {
padding: 0 10px !important; padding: 0 10px !important;
} }
.save_order_but { .save_order_but {
background: #fab200 !important; background: #fab200 !important;
box-shadow: 0px 1px 8px 0px rgba(84, 116, 232, 0.16) !important; box-shadow: 0px 1px 8px 0px rgba(84, 116, 232, 0.16) !important;
} }
.save_order_but.is-disabled { .save_order_but.is-disabled {
background: #c2c6ca !important; background: #c2c6ca !important;
} }
/deep/ .el-dialog__body { /deep/ .el-dialog__body {
.el-form { .el-form {
max-height: 500px !important; max-height: 500px !important;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
} }
.asy_phone { .asy_phone {
.el-form-item__content { .el-form-item__content {
position: relative; position: relative;
} }
.asy_but { .asy_but {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
...@@ -746,18 +813,22 @@ export default { ...@@ -746,18 +813,22 @@ export default {
} }
} }
} }
.editForm /deep/ .el-form-item { .editForm /deep/ .el-form-item {
width: 76%; width: 76%;
/*margin-right: 50px !important;*/ /*margin-right: 50px !important;*/
} }
.input_number, .input_number,
.input_number /deep/ .el-input-number { .input_number /deep/ .el-input-number {
width: 100% !important; width: 100% !important;
} }
.update_dialog /deep/ .el-dialog__body { .update_dialog /deep/ .el-dialog__body {
height: 500px; height: 500px;
flex-direction: column; flex-direction: column;
padding-bottom: 0px; padding-bottom: 0px;
.text { .text {
color: #778ca2; color: #778ca2;
text-align: left; text-align: left;
...@@ -770,26 +841,31 @@ export default { ...@@ -770,26 +841,31 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 60%; width: 60%;
.btns { .btns {
width: 100%; width: 100%;
// border: 1px solid red; // border: 1px solid red;
} }
} }
.manageItem { .manageItem {
.contents { .contents {
display: flex; display: flex;
align-items: center; align-items: center;
margin: 10px 0; margin: 10px 0;
justify-content: space-around; justify-content: space-around;
.delete { .delete {
color: red; color: red;
cursor: pointer; cursor: pointer;
width: 50px; width: 50px;
text-align: right; text-align: right;
} }
.mian { .mian {
display: flex; display: flex;
align-items: center; align-items: center;
.title { .title {
margin-right: 5px; margin-right: 5px;
width: 80px; width: 80px;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论