Skip to content

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

合并分支 'fc' 到 'master'

Fc 查看合并请求 !4
上级 492db797 490cfc03
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 881 行增加 和 73 行删除
src/axios/services.js
浏览文件 @ 745a0309
...@@ -1376,6 +1376,102 @@ const server = { ...@@ -1376,6 +1376,102 @@ const server = {
data data
}) })
}, },
//LY新增接口
//查询权限专用单位信息
getUnitAuth(){
return axios('/sysUnitAuth/findByUnitAuth',{
method:'get'
})
},
//新增修改权限专用单位
saveUnitAuth(data){
return axios('/sysUnitAuth/saveSysUnitAuth',{
method:'post',
data
})
},
//删除权限专用单位
delUnitAuth(data){
return axios('/sysUnitAuth/deleteSysUnitAuth?unitId='+data,{
method:'get'
})
},
//删除用户
delUser(data){
return axios('/sysUser/deleteUser?id='+data,{
method:'get'
})
},
//查询参会单位授权信息-分页
getUnitAuthPerson(data){
return axios('/sysUnitAuthPerson/findByUnitAuthPerson',{
method:'post',
data
})
},
//新增或修改参会单位授权
saveUnitAuthPerson(data){
return axios('/sysUnitAuthPerson/saveUnitAuthPerson',{
method:'post',
data
})
},
//删除参会单位授权
deleteUnitAuthPerson(data){
return axios('/sysUnitAuthPerson/deleteUnitAuthPerson?id='+data,{
method:'get'
})
},
// (新)人员库-查询所有自定义分类（ly）
findAllCustomOrg(){
return axios('/person/findAllCustomOrg',{
method:'get'
})
},
//(新)人员库-新增修改自定义分类（ly）
saveCustomOrgO(data){
return axios('/person/saveCustomOrg',{
method:'post',
data
})
},
//(新)人员库-删除自定义分类（ly）
deleteCustomOrg(data){
return axios('/person/deleteCustomOrg?customOrgId='+data,{
method:'get',
})
},
// (新)人员库-根据自定义分类编号查询按参会人员展示自定义人员（ly）
baseCustomOrgIdPerson(data){
return axios('/person/findAllCustomUserByCustomOrgIdShowPerson',{
method:'post',
data
})
},
// (新)人员库-根据自定义分类编号查询按参会单位展示自定义人员（ly）
baseCustomOrgIdUnit(data){
return axios('/person/findAllCustomUserByCustomOrgIdShowUnit',{
method:'post',
data
})
},
// (新)人员库-批量关联参会人员以及参会单位（ly）
batchAssociationCustomUse(data){
return axios('/person/batchAssociationCustomUser',{
method:'post',
data
})
},
//查询会议室预定记录日期条
getConfenceDataBar(data){
return axios('/conferenceProcessReservationRecord/findDateBar',{
method:'post',
data
})
}
} }
export default server export default server
src/router/index.js
浏览文件 @ 745a0309
...@@ -6,12 +6,12 @@ Vue.use(VueRouter) ...@@ -6,12 +6,12 @@ Vue.use(VueRouter)
const routes = [ const routes = [
{ {
path: '/', path: '/',
name: 'homes', // name: 'homes',
component: () => import('../views/home.vue'), component: () => import('../views/home.vue'),
children: [ children: [
{ {
path: '/', path: '/',
name: 'meeting', // name: 'meeting',
component: () => import('../views/meeting/index.vue'), component: () => import('../views/meeting/index.vue'),
meta: { meta: {
title: '会议智能管理系统', title: '会议智能管理系统',
...@@ -222,7 +222,7 @@ const routes = [ ...@@ -222,7 +222,7 @@ const routes = [
meta: { meta: {
title: '系统管理', title: '系统管理',
}, },
redirect: '/system/jurisdiction', redirect: '/system/power/jurisdiction',
beforeEnter: (to, from, next) => { beforeEnter: (to, from, next) => {
let sysRoles = sessionStorage.getItem('sysRoles') let sysRoles = sessionStorage.getItem('sysRoles')
switch (sysRoles) { switch (sysRoles) {
...@@ -243,13 +243,49 @@ const routes = [ ...@@ -243,13 +243,49 @@ const routes = [
}, },
children: [ children: [
{ {
path: 'jurisdiction', path: 'power',
name: 'jurisdiction', name: 'power',
component: () => component: () =>
import('../views/system/jurisdiction.vue'), import('../views/system/jurisdic/index.vue'),
meta: { meta: {
title: '权限管理', title: '权限管理',
}, },
children:[
{
path:"jurisdiction",
name:'jurisdiction',
component: () =>
import('../views/system/jurisdiction.vue'),
meta: {
title: '超管',
},
},
{
path:"unitEmpower",
// name:'unitEmpower',
component: () =>
import('../views/system/jurisdic/index.vue'),
meta: {
title: '参会单位授权',
},
children:[
{
path:'/',
name:'unitEmpower',
component:()=>
import('../views/system/unitEmpower.vue')
},
{
path: 'unitLibrary',
// name: 'unitLibrary',
component: () =>
import('../views/system/unitLibrary.vue'),
meta: {
title: '参会单位库管理',
},
}]
}
],
beforeEnter: (to, from, next) => { beforeEnter: (to, from, next) => {
let sysRoles = sessionStorage.getItem('sysRoles') let sysRoles = sessionStorage.getItem('sysRoles')
switch (sysRoles) { switch (sysRoles) {
...@@ -281,7 +317,7 @@ const routes = [ ...@@ -281,7 +317,7 @@ const routes = [
children: [ children: [
{ {
path: 'confLibrary', path: 'confLibrary',
name: 'confindex', // name: 'confindex',
component: () => component: () =>
import('../views/system/conindex.vue'), import('../views/system/conindex.vue'),
meta: { meta: {
...@@ -334,7 +370,6 @@ const routes = [ ...@@ -334,7 +370,6 @@ const routes = [
}, },
{ {
path: 'userLibrary', path: 'userLibrary',
name: 'userLibrary',
component: () => component: () =>
import('../views/system/conindex.vue'), import('../views/system/conindex.vue'),
meta: { meta: {
...@@ -352,7 +387,7 @@ const routes = [ ...@@ -352,7 +387,7 @@ const routes = [
}, },
{ {
path: 'customizeUser', path: 'customizeUser',
name: 'customizeUser', // name: 'customizeUser',
component: () => component: () =>
import('../views/system/customizeUser.vue'), import('../views/system/customizeUser.vue'),
meta: { meta: {
...@@ -366,6 +401,14 @@ const routes = [ ...@@ -366,6 +401,14 @@ const routes = [
meta:{ meta:{
title:'单位简称管理' title:'单位简称管理'
} }
},
{
path:'personlabel',
name:'personlabel',
component:()=>import('../views/system/personLabel.vue'),
meta:{
title:'人员标签库'
}
} }
] ]
}, },
......
src/views/meeting/componets/ConfDialog.vue
浏览文件 @ 745a0309
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
<el-select <el-select
v-model="formData.unitName" v-model="formData.unitName"
filterable filterable
@change="selectChange"
:disabled="dialogTitle == '修改会议' || user == 'ROLE_HUIYIADMIN'" :disabled="dialogTitle == '修改会议' || user == 'ROLE_HUIYIADMIN'"
placeholder=" " placeholder=" "
> >
......
src/views/meeting/operation/chooseModule/timeList.vue
浏览文件 @ 745a0309
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<div class="time">{{item}}</div> <div class="time">{{item}}</div>
<div <div
class="box" class="box"
:class="[selectFuc(item,index)?'selectTrue':'',selectClk(item,index)?'selClk':'']" :class="[selectFuc(item,index)?'selectTrue':'',selectClk(item,index)?'selClk':'',canClick?'boxHover':'']"
@click="selectRange(item,index)" @click=" canClick?selectRange(item,index): ''"
></div> ></div>
</div> </div>
</div> </div>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<script> <script>
export default { export default {
props: ['conferenceProcessReservationRecordList'], props: ['conferenceProcessReservationRecordList', 'canClick'],
data() { data() {
return { return {
hours: [ hours: [
...@@ -175,11 +175,16 @@ export default { ...@@ -175,11 +175,16 @@ export default {
height: 80px; height: 80px;
background: #fff; background: #fff;
border-bottom: 1px solid #ebecee; border-bottom: 1px solid #ebecee;
// cursor: pointer;
}
.boxHover {
cursor: pointer; cursor: pointer;
} }
.box:hover { .boxHover:hover {
background: rgba(57, 135, 240, 0.2); background: rgba(57, 135, 240, 0.2);
} }
.box:hover {
}
.selectTrue { .selectTrue {
background: rgba(119, 140, 162, 0.2); background: rgba(119, 140, 162, 0.2);
} }
......
src/views/meeting/operation/noticeMeeting/index.vue
浏览文件 @ 745a0309
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<div class="area_display_wrap"> <div class="area_display_wrap">
<div class="data_left"> <div class="data_left">
<div> <div>
参会总人数： <!-- 参会总人数： -->
<!-- <span--> <!-- <span-->
<!-- :style="{--> <!-- :style="{-->
<!-- color:--> <!-- color:-->
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
<!-- }">--> <!-- }">-->
<!-- {{ confData.personnels.length }}人--> <!-- {{ confData.personnels.length }}人-->
<!-- </span>--> <!-- </span>-->
<span>{{ confData.personnels.length }}人</span> <!-- <span>{{ confData.personnels.length }}人</span> -->
<div>通知开启</div>
<div>通知关闭</div>
</div> </div>
</div> </div>
<div class="area_display"> <div class="area_display">
......
src/views/meetingPlace/pages/edit/components/ControllerAside.vue
浏览文件 @ 745a0309
...@@ -1785,7 +1785,7 @@ export default { ...@@ -1785,7 +1785,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
...@@ -2187,13 +2187,18 @@ export default { ...@@ -2187,13 +2187,18 @@ export default {
return val.colIndex >= medianColIndex return val.colIndex >= medianColIndex
}) })
} }
if(aArr.length==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)
bArr[0].leftRightCenter2 = 1 if (bArr.length > 1) {
if (isCenterY) { bArr[0].leftRightCenter2 = 1
this.getCurrentIndex[`${editorAreaId}`].push(bArr[0].colIndex) if (isCenterY) {
this.getCurrentIndex[`${editorAreaId}`].push(bArr[0].colIndex)
}
} }
let a = 0 let a = 0
......
src/views/meetingPlace/pages/edit/components/CoordinateSystem.vue
浏览文件 @ 745a0309
...@@ -2603,6 +2603,7 @@ export default { ...@@ -2603,6 +2603,7 @@ 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)
......
src/views/meetingPlace/pages/edit/suanfa.js
浏览文件 @ 745a0309
...@@ -54,7 +54,8 @@ function division_arr(arr) { ...@@ -54,7 +54,8 @@ function division_arr(arr) {
} }
//左中右 //左中右
function setArr1(arr, median, rowMinNum) { function setArr1(arr, median, rowMinNum) {
// console.log('setAtt1...median', median) console.log('setAtt1...median', median)
// console.log('setAtt1...median', median)
// console.log('setArr1rowMinNum', rowMinNum) // console.log('setArr1rowMinNum', rowMinNum)
let rArr = [] let rArr = []
...@@ -72,6 +73,7 @@ function setArr1(arr, median, rowMinNum) { ...@@ -72,6 +73,7 @@ function setArr1(arr, median, rowMinNum) {
median = parseInt(arrList[index].length / 2) median = parseInt(arrList[index].length / 2)
median = arrList[index][median].colIndex median = arrList[index][median].colIndex
} }
console.log(median);
let aArr = valArr let aArr = valArr
.filter((val) => { .filter((val) => {
return val.colIndex < median return val.colIndex < median
...@@ -159,6 +161,8 @@ function setArr1(arr, median, rowMinNum) { ...@@ -159,6 +161,8 @@ function setArr1(arr, median, rowMinNum) {
function setArr2(arr, median, rowMinNum) { function setArr2(arr, median, rowMinNum) {
let rArr = [] let rArr = []
let arrList = JSON.parse(JSON.stringify(arr)) let arrList = JSON.parse(JSON.stringify(arr))
console.log('arrList',arrList);
console.log('median',median);
if (!median) { if (!median) {
let orderMarkIndex = 0 let orderMarkIndex = 0
arrList.map((valArr, index) => { arrList.map((valArr, index) => {
...@@ -166,19 +170,35 @@ function setArr2(arr, median, rowMinNum) { ...@@ -166,19 +170,35 @@ function setArr2(arr, median, rowMinNum) {
median = parseInt(arrList[index].length / 2) median = parseInt(arrList[index].length / 2)
median = arrList[index][median].colIndex median = arrList[index][median].colIndex
} else { } else {
median = parseInt(arrList[index].length / 2) + 1 if(arrList[index].length>1){
median = parseInt(arrList[index].length / 2) +1
console.log('list',median);
}else{
// median = parseInt(arrList[index].length / 2)-1
median = 0
}
median = arrList[index][median].colIndex median = arrList[index][median].colIndex
console.log(median);
} }
let aArr = valArr let aArr = valArr
.filter((val) => { .filter((val) => {
return val.colIndex < median return val.colIndex < median
}) })
.reverse() .reverse()
console.log(aArr);
aArr[0].rightLeftCenter = 1 if(aArr.length>0 || aArr.length==1){
aArr[0].rightLeftCenter = 1
}
console.log('aArr',aArr);
let bArr = valArr.filter((val) => { let bArr = valArr.filter((val) => {
return val.colIndex >= median return val.colIndex >= median
}) })
////// 一行只有一个座位时，此位置就是中心点，
if( bArr.length==1){
bArr[0].rightLeftCenter = 1
}
/////
let aNum = aArr.length let aNum = aArr.length
let bNum = bArr.length let bNum = bArr.length
let a = 0 let a = 0
...@@ -210,7 +230,7 @@ function setArr2(arr, median, rowMinNum) { ...@@ -210,7 +230,7 @@ function setArr2(arr, median, rowMinNum) {
// console.log(rArr) // console.log(rArr)
return rArr return rArr
} else { } else {
// console.log('收到收到中心点') console.log('收到收到中心点')
let orderMarkIndex = --rowMinNum let orderMarkIndex = --rowMinNum
arrList.map((valArr, index) => { arrList.map((valArr, index) => {
// if (parseInt(arrList[index].length % 2) == 0) { // if (parseInt(arrList[index].length % 2) == 0) {
......
src/views/reserveRecord/allConfence.vue
浏览文件 @ 745a0309
<template> <template>
<div class="allConfence"> <div class="allConfence">
<div class="topData"> <div class="topData">
<div>src</div> <div class="left_icon" @click="getLastWeekDate()">
<div></div> <img src="../../assets/meetingPalce/paiwei/left.png" />
<div></div> </div>
<div class="week">
<div
class="oneDay"
:class="item.week=='周六' || item.week=='周日'?'greeyFont':''"
v-for="(item,index) in dateList"
:key="index"
>
<div>{{item.week}}</div>
<div>{{item.date}}</div>
<div class="tips" v-if="item.isReservation==1" :class="haveConfence(item)">会</div>
</div>
</div>
<div class="right_icon" @click="getNextWeekDate()">
<img src="../../assets/meetingPalce/paiwei/right.png" />
</div>
</div>
<div class="confenceArea">
<div class="confenceOnce" v-for="(item,index) in confenceList" :key="index">
<div class="confence_title">
<span class="name">会议室</span>
<span>
<span class="key">地址：</span>
<span class="value">G楼7号厅</span>
</span>
<span>
<span class="key">容纳人数：</span>
<span class="value">XXX人</span>
</span>
<span>
<span class="key">配置：</span>
<span class="value">投影、电视、白板、视频</span>
</span>
</div>
<itmeList
class="timeList"
:conferenceProcessReservationRecordList="conferenceProcessReservationRecordList"
:canClick="canClick"
></itmeList>
</div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default {} import itmeList from '../meeting/operation/chooseModule/timeList.vue'
export default {
props: { dateList: Array },
components: { itmeList },
watch: {
// dateList: {
// handler(newVal, oldVal) {
// console.log(newVal)
// },
// deep: true,
// },
},
data() {
return {
canClick: false,
weekArr: this.dateList,
confenceList: [{}, {}],
conferenceProcessReservationRecordList: [
{
conferenceId: '',
id: '',
processId: '',
processName: '',
processPerson: '',
processPhone: '',
processStatus: 0,
reservationEndTime: '08:00',
reservationStartTime: '10:00',
unitId: '',
unitName: '',
},
],
}
},
methods: {
getLastWeekDate() {
this.$emit('getLastWeekDate')
},
getNextWeekDate() {
this.$emit('getNextWeekDate')
},
haveConfence(item) {
let month = new Date().getMonth()
if (month + 1 < 10) {
month = '0' + (month + 1)
}
let date = new Date().getFullYear() + '-' + month + '-' + new Date().getDate()
if (new Date(item.date).getTime() == new Date(date).getTime()) {
console.log('等于')
return 'blue'
} else if (new Date(item.date) < new Date(date)) {
console.log('小于当天')
return 'gray'
} else if (new Date(item.date) > new Date(date)) {
console.log('大于今天')
return 'yellow'
}
},
},
created() {
console.log(this.weekArr)
},
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
// 去除滚动条
::-webkit-scrollbar {
display: none; /* Chrome Safari */
}
.allConfence { .allConfence {
width: 100%; width: 100%;
height: 100%; height: 100%;
.topData {
width: 98%;
height: 50px;
background: #f7f8fa;
border-radius: 2px 2px 2px 2px;
margin: 0 auto;
display: flex;
align-items: center;
padding: 0 11px;
margin-bottom: 24px;
.right_icon,
.left_icon {
height: 21px;
img {
width: 100%;
height: 100%;
cursor: pointer;
}
}
.week {
width: 90%;
display: flex;
justify-content: space-around;
margin: 0 auto;
text-align: center;
color: #778ca2;
.oneDay {
position: relative;
.tips {
position: absolute;
top: 2px;
right: 0;
width: 18px;
height: 18px;
font-size: 14px;
border-radius: 50%;
// background-color: red;
line-height: 18px;
color: #fff;
}
.blue {
background: #5474e8;
}
.gray {
background: #a6b5c6;
}
.yellow {
background: #fab200;
}
}
.greeyFont {
color: #36beac;
}
}
}
.confenceArea {
width: 100%;
height: calc(100% - 74px);
overflow: auto;
.confenceOnce {
height: 435px;
width: 100%;
.confence_title {
width: 100%;
height: 32px;
background: rgba(118, 144, 237, 0.2);
display: flex;
align-items: center;
padding-left: 24px;
margin-bottom: 25px;
.name {
color: #5474e8;
margin-right: 50px;
}
.key {
color: #778ca2;
}
.value {
color: #3a3c4b;
margin-right: 50px;
}
}
.timeList {
height: 263px;
width: 98%;
margin: 0 auto;
}
}
}
} }
</style> </style>
src/views/reserveRecord/confenceTable.vue
浏览文件 @ 745a0309
<template> <template>
<div class="confenceTable">单个</div> <div class="confenceTable">
<div class="title">
<span class="name">XXX号会议室</span>
<span>
<span class="key">地址</span>
<span class="value">G楼七号厅</span>
</span>
<span>
<span class="key">容纳人数：</span>
<span class="value">XXX人</span>
</span>
<span>
<span class="key">配置：</span>
<span class="value">投影、电视、白板、视频</span>
</span>
</div>
<div class="data">
<div class="left_icon" @click="getLastWeekDate()">
<img src="../../assets/meetingPalce/paiwei/left.png" />
</div>
<div class="week">
<div class="oneDay" v-for="(item,index) in dateList" :key="index">
<div>{{item.week}}</div>
<div>{{item.date}}</div>
<div class="tips" :class="haveConfence(item)">会</div>
</div>
</div>
<div class="right_icon" @click="getNextWeekDate()">
<img src="../../assets/meetingPalce/paiwei/right.png" />
</div>
</div>
<div class="table_list">
<el-table
:data="tableData"
style="width: 100%"
height="100%"
:row-class-name="tableRowClassName"
>
<el-table-column prop="date" label="预定使用时间" width="180"></el-table-column>
<el-table-column prop="name" label="会议主题" width="180"></el-table-column>
<el-table-column prop="address" label="会议状态"></el-table-column>
<el-table-column prop="address" label="办会单位"></el-table-column>
<el-table-column prop="address" label="联系人"></el-table-column>
<el-table-column prop="address" label="联系电话"></el-table-column>
</el-table>
</div>
</div>
</template> </template>
<script> <script>
export default {} export default {
props: { dateList: Array },
data() {
return {
weekArr: [
{ day: '周一', date: '2023-02-13' },
{ day: '周二', date: '2023-02-14' },
{ day: '周三', date: '2023-02-15' },
{ day: '周四', date: '2023-02-16' },
{ day: '周五', date: '2023-02-17' },
{ day: '周六', date: '2023-02-18' },
{ day: '周日', date: '2023-02-19' },
],
tableData: [
{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
{
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
},
],
}
},
methods: {
getLastWeekDate() {
this.$emit('getLastWeekDate')
},
getNextWeekDate() {
this.$emit('getNextWeekDate')
},
haveConfence(item) {
console.log(item)
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) {
return 'warning-row'
} else if (rowIndex % 2 == 0) {
return 'success-row'
}
return ''
},
},
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.coonfencenTable { .confenceTable {
width: 100%; width: 100%;
height: 100%; height: 100%;
.title {
width: 98%;
height: 32px;
background: rgba(118, 144, 237, 0.2);
line-height: 32px;
padding-left: 24px;
margin: 0 auto;
margin-bottom: 24px;
.name {
color: #5474e8;
margin-right: 50px;
}
.key {
color: #778ca2;
}
.value {
color: #3a3c4b;
margin-right: 50px;
}
}
.data {
width: 98%;
height: 50px;
background: #f7f8fa;
border-radius: 2px 2px 2px 2px;
margin: 0 auto;
display: flex;
align-items: center;
padding: 0 11px;
margin-bottom: 24px;
.right_icon,
.left_icon {
height: 21px;
img {
width: 100%;
height: 100%;
cursor: pointer;
}
}
.week {
width: 90%;
display: flex;
justify-content: space-around;
margin: 0 auto;
text-align: center;
color: #778ca2;
.oneDay {
position: relative;
cursor: pointer;
.tips {
position: absolute;
top: 2px;
right: 0;
width: 18px;
height: 18px;
font-size: 14px;
border-radius: 50%;
background-color: red;
line-height: 18px;
color: #fff;
}
}
}
}
.table_list {
width: 98%;
height: calc(100% - 130px);
margin: 0 auto;
/deep/.el-table {
.warning-row {
background: #f7f8fd;
}
}
}
} }
</style> </style>
\ No newline at end of file
src/views/reserveRecord/index.vue
浏览文件 @ 745a0309
...@@ -6,9 +6,15 @@ ...@@ -6,9 +6,15 @@
</div> </div>
<div class="content"> <div class="content">
<div class="content_nav"> <div class="content_nav">
<div class="all">全部会议室</div> <div class="all" :class="isActive==='1'?'allActive':''" @click="getAllConfence()">全部会议室</div>
<div class="nav_list"> <div class="nav_list">
<div class="confence" v-for="(item,index) in confenceList" :key="index"> <div
:class="isActive===index?'confenceActive':''"
class="confence"
v-for="(item,index) in confenceList"
:key="index"
@click="getOneConfence(item,index)"
>
<div class="confence_name">{{item.name}}</div> <div class="confence_name">{{item.name}}</div>
<div class="box"></div> <div class="box"></div>
</div> </div>
...@@ -17,7 +23,12 @@ ...@@ -17,7 +23,12 @@
<div class="content_list"> <div class="content_list">
<div class="list_data"> <div class="list_data">
<div class="data_num_select"> <div class="data_num_select">
<el-select class="year_select" v-model="yearValue" placeholder="请选择"> <el-select
class="year_select"
v-model="formData.selectYear"
placeholder="请选择"
@change="yearChange()"
>
<el-option <el-option
v-for="item in yearList" v-for="item in yearList"
:key="item.value" :key="item.value"
...@@ -25,7 +36,12 @@ ...@@ -25,7 +36,12 @@
:value="item.value" :value="item.value"
></el-option> ></el-option>
</el-select> </el-select>
<el-select class="month_select" v-model="monthValue" placeholder="请选择"> <el-select
class="month_select"
v-model="formData.selectMonth"
placeholder="请选择"
@change="monthChange()"
>
<el-option <el-option
v-for="item in monthList" v-for="item in monthList"
:key="item.value" :key="item.value"
...@@ -40,8 +56,18 @@ ...@@ -40,8 +56,18 @@
</div> </div>
</div> </div>
<div class="list_table"> <div class="list_table">
<allConfence v-if="isOnce"></allConfence> <allConfence
<confenceTable v-if="!isOnce"></confenceTable> v-if="!isOnce"
:dateList="dateList"
@getLastWeekDate="getLastWeekDate"
@getNextWeekDate="getNextWeekDate"
></allConfence>
<confenceTable
v-if="isOnce"
:dateList="dateList"
@getLastWeekDate="getLastWeekDate"
@getNextWeekDate="getNextWeekDate"
></confenceTable>
</div> </div>
</div> </div>
</div> </div>
...@@ -54,9 +80,9 @@ import confenceTable from './confenceTable.vue' ...@@ -54,9 +80,9 @@ import confenceTable from './confenceTable.vue'
export default { export default {
components: { allConfence, confenceTable }, components: { allConfence, confenceTable },
watch: { watch: {
yearValue(newVal, oldVal) { // yearValue(newVal, oldVal) {
console.log(newVal, oldVal) // console.log(newVal, oldVal)
}, // },
}, },
data() { data() {
return { return {
...@@ -68,29 +94,88 @@ export default { ...@@ -68,29 +94,88 @@ export default {
}, },
], ],
yearList: [ yearList: [
{ name: '2020年', value: 2020 }, { name: '2020年', value: '2020' },
{ name: '2021年', value: 2021 }, { name: '2021年', value: '2021' },
{ name: '2022年', value: 2022 }, { name: '2022年', value: '2022' },
], ],
monthList: [ monthList: [
{ name: '1月', value: 1 }, { name: '1月', value: '1' },
{ name: '2月', value: 2 }, { name: '2月', value: '2' },
{ name: '3月', value: 3 }, { name: '3月', value: '3' },
{ name: '4月', value: 4 }, { name: '4月', value: '4' },
{ name: '5月', value: 5 }, { name: '5月', value: '5' },
{ name: '6月', value: 6 }, { name: '6月', value: '6' },
{ name: '7月', value: 7 }, { name: '7月', value: '7' },
{ name: '8月', value: 8 }, { name: '8月', value: '8' },
{ name: '9月', value: 9 }, { name: '9月', value: '9' },
{ name: '10月', value: 10 }, { name: '10月', value: '10' },
{ name: '11月', value: 11 }, { name: '11月', value: '11' },
{ name: '12月', value: 12 }, { name: '12月', value: '12' },
], ],
yearValue: '', isOnce: false,
monthValue: '', isActive: '1',
isOnce: true, formData: {
moveDownDate: '',
moveUpDate: '',
selectMonth: '',
selectYear: '',
type: 1,
},
dateList: [],
} }
}, },
methods: {
monthChange() {
console.log(this.formData.selectMonth)
this.formData.type = 4
console.log(this.formData)
if (this.formData.selectYear) {
this.getDateList(this.formData)
} else {
this.$message.error('请先选择年份')
}
},
yearChange() {
this.formData.type = 4
console.log(this.formData)
if (this.formData.selectMonth) {
this.getDateList(this.formData)
}
console.log(this.formData.selectYear)
},
//选择全部会议室
getAllConfence() {
this.isActive = '1'
this.isOnce = false
},
//点击某一个会议室
getOneConfence(item, index) {
this.isActive = index
this.isOnce = true
},
//获取上一周的日期
getLastWeekDate() {
this.formData.type = 2
this.formData.moveUpDate = this.dateList[0].date
this.getDateList(this.formData)
},
//获取下一周的日期
getNextWeekDate() {
this.formData.type = 3
this.formData.moveDownDate = this.dateList[6].date
this.getDateList(this.formData)
},
//查询会议室预订记录日期条
getDateList(data) {
this.$axios.getConfenceDataBar(data).then((res) => {
console.log(res)
this.dateList = res.data.data
})
},
},
created() {
this.getDateList(this.formData)
},
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
...@@ -136,13 +221,18 @@ export default { ...@@ -136,13 +221,18 @@ export default {
.all { .all {
width: 100%; width: 100%;
height: 60px; height: 60px;
background: #5474e8;
background: #d3dade;
border-radius: 2px 2px 2px 2px; border-radius: 2px 2px 2px 2px;
color: #ffffff; color: #ffffff;
font-size: 18px; font-size: 18px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
cursor: pointer;
}
.allActive {
background: #5474e8;
} }
.nav_list { .nav_list {
width: 100%; width: 100%;
...@@ -176,6 +266,12 @@ export default { ...@@ -176,6 +266,12 @@ export default {
background: #5474e8; background: #5474e8;
} }
} }
.confenceActive {
background: #5474e8;
.confence_name {
color: #ffffff;
}
}
} }
} }
.content_list { .content_list {
...@@ -210,6 +306,7 @@ export default { ...@@ -210,6 +306,7 @@ export default {
width: 100%; width: 100%;
background-color: transparent; background-color: transparent;
border: none; border: none;
color: #5474e8;
} }
.el-input__inner:focus { .el-input__inner:focus {
box-shadow: none !important; box-shadow: none !important;
...@@ -236,7 +333,6 @@ export default { ...@@ -236,7 +333,6 @@ export default {
.list_table { .list_table {
width: 100%; width: 100%;
height: calc(100% - 56px); height: calc(100% - 56px);
padding: 0 30px 0 20px;
} }
} }
} }
......
src/views/system/bankmanager.vue
浏览文件 @ 745a0309
...@@ -29,6 +29,7 @@ export default { ...@@ -29,6 +29,7 @@ export default {
this.$refs['lib'].callPush() this.$refs['lib'].callPush()
}, },
abbunit() { abbunit() {
console.log(2)
this.$refs['lib'].abbunit() this.$refs['lib'].abbunit()
}, },
callImport() { callImport() {
...@@ -44,11 +45,24 @@ export default { ...@@ -44,11 +45,24 @@ export default {
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() {
this.$refs['lib'].personLabel()
},
manageTags() {
this.$refs['lib'].manageTags()
},
importLabel() {
this.$refs['lib'].importLabel()
},
exportLabel() {
this.$refs['lib'].exportLabel()
},
}, },
} }
</script> </script>
......
src/views/system/conindex.vue
浏览文件 @ 745a0309
...@@ -28,6 +28,7 @@ export default { ...@@ -28,6 +28,7 @@ export default {
this.$refs['middleChange'].callPush() this.$refs['middleChange'].callPush()
}, },
abbunit() { abbunit() {
console.log(3)
this.$refs['middleChange'].abbunit() this.$refs['middleChange'].abbunit()
}, },
importData() { importData() {
...@@ -37,11 +38,29 @@ export default { ...@@ -37,11 +38,29 @@ export default {
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() {
this.$refs['middleChange'].personLabel()
},
manageTags() {
this.$refs['middleChange'].manageTags()
},
importLabel() {
this.$refs['middleChange'].importLabel()
},
exportLabel() {
this.$refs['middleChange'].exportLabel()
},
// unitLibrary() {
// console.log(3)
// this.$refs['middleChange'].unitLibrary()
// },
}, },
} }
</script> </script>
......
src/views/system/index.vue
浏览文件 @ 745a0309
...@@ -15,9 +15,10 @@ ...@@ -15,9 +15,10 @@
<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>
<div class="but" @click="callLib()">导入人员信息</div>--> <div class="but" @click="callLib()">导入人员信息</div>-->
<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" @click="autoPerson()">同步人员信息</div> <div class="but" @click="autoPerson()">同步人员信息</div>
</div> </div>
<div class="but_wrap" v-if="$route.name === 'customizeUser'"> <div class="but_wrap" v-if="$route.name === 'customizeUser'">
...@@ -32,13 +33,28 @@ ...@@ -32,13 +33,28 @@
</div> </div>
<div class="but_wrap" v-if="$route.name === 'unitLibrary'"> <div class="but_wrap" v-if="$route.name === 'unitLibrary'">
<div class="but" @click="callUnitLib()">导入单位库</div> <div class="but" @click="callUnitLib()">导入单位库</div>
<div class="back" @click="goback()">
<img src="../../assets/img/return_img.png" />
</div>
</div> </div>
<div class="but_wrap" v-if="$route.name === 'abbreviaLibrary'"> <div class="but_wrap" v-if="$route.name === 'abbreviaLibrary'">
<div class="but" @click="importAbbrevia()">导入单位简称</div> <div class="but" @click="importAbbrevia()">导入单位简称</div>
<!-- <div class="but" @click="syncUnit()">同步单位信息</div> --> <!-- <div class="but" @click="syncUnit()">同步单位信息</div> -->
<div class="back" @click="goback()"> </div>
<img src="../../assets/img/return_img.png" /> <div class="but_wrap" v-if="$route.name === 'unitEmpower'">
</div> <!-- <div class="but" @click="callLibs()">会议数据{{confNum}}条--更新</div>
<div class="but" @click="callLib()">导入人员信息</div>-->
<div class="but" @click="unitLibrary()">参会单位库管理</div>
</div>
<div class="but_wrap" v-if="$route.name === 'jurisdiction'">
<!-- <div class="but" @click="callLibs()">会议数据{{confNum}}条--更新</div>
<div class="but" @click="callLib()">导入人员信息</div>-->
<div class="but" @click="authorityUnit()">权限专用单位管理</div>
</div>
<div class="but_wrap" v-if="$route.name === 'personlabel'">
<div class="but" @click="manageTags()">管理标签</div>
<div class="but" @click="importLabel()">导入</div>
<div class="but" @click="exportLabel()">导出</div>
</div> </div>
</div> </div>
<router-view ref="sysRouter"></router-view> <router-view ref="sysRouter"></router-view>
...@@ -70,10 +86,22 @@ export default { ...@@ -70,10 +86,22 @@ export default {
linkList: [ linkList: [
{ {
name: '权限管理', name: '权限管理',
path: '/system/jurisdiction', path: '/system/power',
Rindex: 1, Rindex: 1,
pic1: 'system_icon1', pic1: 'system_icon1',
pic2: 'system_icon5', pic2: 'system_icon5',
children: [
{
name: '操作管理员-超管',
path: '/system/power/jurisdiction',
Rindex: 1 - 1,
},
{
name: '参会单位授权',
path: '/system/power/unitEmpower',
Rindex: 1 - 2,
},
],
}, },
{ {
name: '配置管理', name: '配置管理',
...@@ -116,11 +144,11 @@ export default { ...@@ -116,11 +144,11 @@ export default {
path: '/system/bankMangager/templateLibrary', path: '/system/bankMangager/templateLibrary',
Rindex: 4 - 4, Rindex: 4 - 4,
}, },
{ // {
name: '单位库管理', // name: '单位库管理',
path: '/system/bankMangager/unitLibrary', // path: '/system/bankMangager/unitLibrary',
Rindex: 4 - 4, // Rindex: 4 - 4,
}, // },
// { // {
// name: "领导库管理", // name: "领导库管理",
// path: "/system/bankMangager/leaderLibrary", // path: "/system/bankMangager/leaderLibrary",
...@@ -253,6 +281,25 @@ export default { ...@@ -253,6 +281,25 @@ export default {
syncUnit() { syncUnit() {
this.$refs['sysRouter'].syncUnit() this.$refs['sysRouter'].syncUnit()
}, },
unitLibrary() {
console.log(1)
this.$refs['sysRouter'].unitLibrary()
},
authorityUnit() {
this.$refs['sysRouter'].authorityUnit()
},
personLabel() {
this.$refs['sysRouter'].personLabel()
},
manageTags() {
this.$refs['sysRouter'].manageTags()
},
importLabel() {
this.$refs['sysRouter'].importLabel()
},
exportLabel() {
this.$refs['sysRouter'].exportLabel()
},
goback() { goback() {
this.$router.go(-1) this.$router.go(-1)
}, },
......
src/views/system/jurisdic/index.vue 0 → 100644
浏览文件 @ 745a0309
<template>
<div class="jurisdic">
<router-view ref="jur"></router-view>
</div>
</template>
<script>
export default {
methods: {
unitLibrary() {
console.log(2)
this.$refs['jur'].unitLibrary()
},
authorityUnit() {
this.$refs['jur'].authorityUnit()
},
},
}
</script>
<style lang="less" scoped>
.jurisdic {
width: 100%;
height: 100%;
}
</style>
\ No newline at end of file
src/views/system/personLabel.vue 0 → 100644
浏览文件 @ 745a0309
差异被折叠。
src/views/system/personLabel/dialogTable.vue 0 → 100644
浏览文件 @ 745a0309
差异被折叠。
src/views/system/unitEmpower.vue 0 → 100644
浏览文件 @ 745a0309
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论