Skip to content

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

合并分支 'fc' 到 'master'

Fc 查看合并请求 !6
上级 b1575765 1989d447
显示空白字符变更
内嵌 并排
正在显示 包含 273 行增加 和 173 行删除
dist.zip
浏览文件 @ c0171b62
No preview for this file type
public/config.js
浏览文件 @ c0171b62
const urlConfig = {
// const urlConfig = {
// production_url: 'http://172.18.27.190:8080/confhd',//接口环境
// jump_url: 'http://hypz.hzswb.cn/confphone/#/',//跳转移动端路径
// unitAbbrevia_url:'http://172.18.27.190:8080/demo'
production_url: 'http://172.18.27.190:8080/confhd',//接口环境
jump_url: 'http://hypz.hzswb.cn/confphone/#/',//跳转移动端路径
unitAbbrevia_url:'http://172.18.27.190:8080/demo'
// production_url: 'http://120.27.238.48:9888',//接口环境
// jump_url: 'http://120.27.238.48:8080/confphone/#/'//跳转移动端路径
// unitAbbrevia_url:'http://120.27.238.48:8089/demo'
// // production_url: 'http://120.27.238.48:9888',//接口环境
// // jump_url: 'http://120.27.238.48:8080/confphone/#/'//跳转移动端路径
// // unitAbbrevia_url:'http://120.27.238.48:8089/demo'
// }
const urlConfig = {
production_url: 'https://lyfydp.longyou.gov.cn:9443/meeting/api/man',//接口环境
jump_url: 'https://lyfydp.longyou.gov.cn:9443/meeting/h5/#/'//跳转移动端路径
}
\ No newline at end of file
src/views/meeting/operation/chooseModule/timeList.vue
浏览文件 @ c0171b62
......@@ -7,7 +7,12 @@
:class="[selectFuc(item,index)?'selectTrue':'',selectClk(item,index)?'selClk':'',canClick?'boxHover':'']"
@click=" canClick?selectRange(item,index): ''"
>
<div class="boxHover" v-if="selectFuc(item,index)?'selectTrue':''">
<div
class="boxHover"
v-if="selectFuc(item,index)?'selectTrue':'' "
:id="index"
:class="rightOrLeft(item)"
>
<div class="once" v-for="(i,index) in setLenth(item,index) " :key="index">
<div>会议主题：{{setHover(item,index,'processName')[index]}}</div>
<div>预定时间：{{setHover(item,index,'time')[index]}}</div>
......@@ -104,6 +109,35 @@ export default {
}
},
methods: {
rightOrLeft(item) {
console.log(item == '12:00:00')
if (
item == '07:00:00' ||
item == '07:15:00' ||
item == '07:30:00' ||
item == '07:45:00' ||
item == '12:00:00' ||
item == '12:15:00' ||
item == '12:30:00' ||
item == '12:45:00' ||
item == '17:00:00' ||
item == '17:15:00' ||
item == '17:30:00' ||
item == '17:45:00'
) {
return 'right'
} else {
return 'left'
}
},
getDom(index) {
// console.log(index)
let dom = document.getElementById(`${index}`)
if (index == 9) {
// console.log(dom.style.left)
// console.log(dom.offsetParent)
}
},
setListTime(val) {
let arr = val.split(':')[0] + ':' + val.split(':')[1]
return arr
......@@ -185,7 +219,7 @@ export default {
this.timeStape(this.conferenceProcessReservationRecordList[i].reservationStartTime.split(' ')[1]) <= this.timeStape(item) &&
this.timeStape(this.conferenceProcessReservationRecordList[i].reservationEndTime.split(' ')[1]) >= this.timeStape(item)
) {
console.log('true', this.conferenceProcessReservationRecordList[i].processName)
// console.log('true', this.conferenceProcessReservationRecordList[i].processName)
if (str == 'processName') {
processName.push(this.conferenceProcessReservationRecordList[i].processName)
obj.push(this.conferenceProcessReservationRecordList[i].processName)
......@@ -264,7 +298,7 @@ export default {
},
watch: {
conferenceProcessReservationRecordList() {
console.log('conferenceProcessReservationRecordList', this.conferenceProcessReservationRecordList)
// console.log('conferenceProcessReservationRecordList', this.conferenceProcessReservationRecordList)
},
},
}
......@@ -277,6 +311,7 @@ export default {
display: flex;
flex-wrap: wrap;
justify-content: center;
overflow: visible;
.time_num {
width: 5%;
height: 112px;
......@@ -304,19 +339,29 @@ export default {
}
.box:hover {
position: relative;
// display: flex;
.boxHover {
position: absolute;
top: 40px;
left: 0;
width: 500px;
// height: 100px;
background-color: #fff;
display: inline-block;
width: 430px;
background-color: #fff;
text-align: left;
padding-left: 20px;
border-radius: 4px;
border: 1px solid gray;
.once {
margin-bottom: 20px;
// background-color: skyblue;
}
}
.left {
position: absolute;
top: 40px;
right: 0px;
}
.right {
position: absolute;
top: 40px;
left: 0px;
}
}
.boxHover {
......
src/views/meeting/operation/divideArea/index.vue
浏览文件 @ c0171b62
......@@ -2,16 +2,12 @@
<div class="main_wrap">
<!-------------------------新手引导---------------------------->
<div class="new_help" @click="showDirection"></div>
<div
class="direction"
:class="
dir === 1 ? 'direction1' : dir === 2 ? 'direction2' : 'direction3'
"
v-if="dir"
>
<div class="direction" :class="
dir === 1 ? 'direction1' : ''
" v-if="dir">
<div class="but but1" @click="iKnow()"></div>
<div class="but but2" @click="next()"></div>
<div class="but but3" @click="prev()"></div>
<!-- <div class="but but2" @click="next()"></div>
<div class="but but3" @click="prev()"></div>-->
</div>
<div class="body_content_wrap">
<div class="area_person_display">
......@@ -209,10 +205,9 @@
:setData="() => {}"
v-model="showPersonData"
:options="dragOptions"
@start="noticeStatus==1?'':personStart"
@start="personStart"
:move="personMove"
@end="noticeStatus==1?'':personEnd"
optinos
@end=" personEnd"
>
<div
class="person"
......@@ -241,7 +236,7 @@
<div class="sort_number">{{ index + 1 }}</div>
</div>
<div class="text_wrap">
<div class="name">{{ item.name }}</div>
<div class="name">{{ item.name }}{{noticeStatus}}</div>
<div class="position">{{ item.position }}</div>
</div>
</div>
......@@ -749,13 +744,14 @@ export default {
}
},
noticeStatus(newVal, oldVal) {
console.log('newVal', newVal, 'newVal', oldVal)
console.log(this.dragOptions)
// console.log('newVal', newVal, 'newVal', oldVal)
if (newVal == 2) {
this.dragOptions.sort = true
} else {
this.dragOptions.sort = false
}
console.log('dragOptions', this.dragOptions)
this.$emit('getNoticeStatus', newVal)
},
......@@ -1123,6 +1119,7 @@ export default {
this.dir++
},
iKnow() {
// if (this.dir == 1) {
this.dir = 0
let data = {
navigationStatus: 2,
......@@ -1137,6 +1134,7 @@ export default {
}
})
.catch((err) => {})
// }
},
opTree() {
this.clickArrow = !this.clickArrow
......@@ -1482,6 +1480,7 @@ export default {
// if(this.activeIndex === 0){ // 如果当前展示为未分区区域，阻止默认停靠
// return false
// }
this.disableFlag = false
this.$store.commit('changeSaveFlag', false)
// console.log("person", e.related);
......@@ -1527,7 +1526,10 @@ export default {
if (this.dragReleaseTarget === 'area') {
if (this.checkList.length === 0) {
// console.log("false");
//通知关闭状态（noticeStatus==2），才能拖拽
if (this.noticeStatus == 2) {
//单选拖拽
console.log(this.dragReleaseAreaDiv.id, this.confData.confPersonAreaVos),
/*********把被拖拽的人加入到目标区域中****************/
this.confData.confPersonAreaVos.forEach((item, index) => {
if (item.id === this.dragReleaseAreaDiv.id) {
......@@ -1540,11 +1542,15 @@ export default {
this.confData.confPersonAreaVos[this.activeIndex].personData = this.confData.confPersonAreaVos[
this.activeIndex
].personData.filter((item, index) => e.item._underlying_vm_.id !== item.id)
// console.log();
/*****************更新当前区域展示的人员***************/
this.showPersonData = this.confData.confPersonAreaVos[this.activeIndex].personData
if (this.search !== '') {
this.search()
}
} else {
this.$message.error('请在通知关闭情况下调整')
}
} else {
//多选拖拽
/*********把被拖拽的人加入到目标区域中****************/
......@@ -1952,12 +1958,13 @@ export default {
}
}
.direction1 {
background-image: url('../../../../assets/img/dir1.png');
background-image: url('../../../../assets/img/renyuanyingdao.png');
background-size: 100% 100%;
background-repeat: no-repeat;
.but1 {
display: block;
left: 741px;
// background-color: red;
left: 870px;
}
.but2 {
display: block;
......
src/views/meeting/operation/noticeMeeting/addNoticeUnitDialog.vue
浏览文件 @ c0171b62
......@@ -6,11 +6,11 @@
:before-close="dialogTableHandleClose"
append-to-body
class="table_dialog"
width="900px"
width="1100px"
>
<div class="body">
<div class="top">
<el-form ref="form" :model="form" label-width="80px" :inline="true">
<el-form ref="form" :model="form" label-width="110px" :inline="true">
<el-form-item label="选择参会单位：">
<el-select
v-model="form.unitId"
......@@ -214,7 +214,7 @@ export default {
}
}
.table_wai {
height: 600px;
height: 400px;
.tips {
height: 38px;
line-height: 38px;
......
src/views/meeting/operation/noticeMeeting/index.vue
浏览文件 @ c0171b62
......@@ -5,13 +5,13 @@
<div
class="direction"
:class="
dir === 1 ? 'direction1' : dir === 2 ? 'direction2' : 'direction3'
dir === 1 ? 'direction1' :'direction2'
"
v-if="dir"
>
<div class="but but1" @click="iKnow()"></div>
<div class="but but2" @click="next()"></div>
<div class="but but3" @click="prev()"></div>
<!-- <div class="but but3" @click="prev()"></div> -->
</div>
<div class="body_content_wrap">
<div class="area_person_display">
......@@ -1124,17 +1124,14 @@ export default {
},
//确定发送通知
sureTongzhi() {
// console.log('sendNoticePartForm', this.sendNoticePartForm)
// console.log('multipleSelection', this.multipleSelection)
// console.log('processId', this.$route.query.processId)
let list = this.multipleSelection.map((item) => {
return item.id
})
console.log('list', list)
let data = {
noticePartIdList: list,
sendNoticePart: this.sendNoticePartForm,
}
console.log('list', data)
this.$axios.sendNotification(data).then((res) => {
console.log(res)
if (res.data.code == 200) {
......@@ -1452,6 +1449,7 @@ export default {
})
}, //初始化
showDirection() {
console.log(111)
this.dir = 1
},
dbClickPerson(item) {
......@@ -1463,7 +1461,11 @@ export default {
this.dir--
},
next() {
if (this.dir == 2) {
this.dir = 0
} else {
this.dir++
}
},
iKnow() {
this.dir = 0
......@@ -2308,7 +2310,7 @@ export default {
}
}
.direction1 {
background-image: url('../../../../assets/img/dir1.png');
background-image: url('../../../../assets/img/yingdao1.png');
background-size: 100% 100%;
background-repeat: no-repeat;
.but1 {
......@@ -2324,12 +2326,12 @@ export default {
}
}
.direction2 {
background-image: url('../../../../assets/img/dir2.png');
background-image: url('../../../../assets/img/yingdao2.png');
background-size: 100% 100%;
background-repeat: no-repeat;
.but1 {
display: block;
left: 681px;
left: 751px;
}
.but3 {
display: block;
......@@ -2337,7 +2339,8 @@ export default {
}
.but2 {
display: block;
left: 1161px;
left: 990px;
background-color: green;
}
}
.direction3 {
......
src/views/meeting/operation/noticeMeeting/lableTable.vue
浏览文件 @ c0171b62
......@@ -22,7 +22,7 @@
</div>
<div class="table_wai">
<div class="tips">
<div>已选单位：{{tableData.length}}家</div>
<div>已选单位：{{selectArr.length}}家</div>
<!-- <div>批量删除</div> -->
</div>
<el-table
......@@ -118,6 +118,7 @@ export default {
// console.log(this.currentLabelObj)
// this.$set(this.selectArrObj, `${this.currentLabelObj.customOrgId}`, val)
// console.log(this.selectArrObj)
// console.log(this.currentLabelObj)
},
//选择标签 查询单位
getUnit(data) {
......@@ -241,13 +242,14 @@ export default {
height: 40px;
line-height: 40px;
text-align: center;
background: #5474e8;
color: #fff;
background: rgba(226, 226, 226, 0.5);
color: black;
}
.label_list {
width: 100%;
height: 100%;
background: #e2e2e2;
background: rgba(226, 226, 226, 0.24);
// text-align: center
display: flex;
flex-direction: column;
......
src/views/meeting/operation/overview/index.vue
浏览文件 @ c0171b62
......@@ -75,7 +75,12 @@
<div class="overview_model_2_children">
<div class="tag tag3">定制日程（非必填）</div>
<div class="mobile_wrap">
<div class="warp_left"></div>
<div class="warp_left">
<div class="img">
<img :src="switchData[0].imgSrc[1]" />
</div>
<el-button type="primary" class="yulan" @click="yulan()">预览</el-button>
</div>
<div class="warp_right">
<div>日程地址（外挂）：</div>
<div class="area">
......@@ -460,6 +465,9 @@ export default {
},
},
methods: {
yulan() {
window.open(this.schedulePath, '_blank')
},
submitArea() {
let data = {
processId: this.$route.query.processId,
......@@ -1002,6 +1010,23 @@ export default {
background-size: 100% 100%;
background-repeat: no-repeat;
}
.warp_left {
display: flex;
flex-direction: column;
align-items: center;
.yulan {
height: 36px;
margin-top: 15px;
}
.img {
width: 180px;
height: 364px;
img {
width: 100%;
height: 100%;
}
}
}
.warp_right {
// height: 70%;
padding-top: 100px;
......
src/views/meeting/state/beforeMeeting/index.vue
浏览文件 @ c0171b62
......@@ -14,9 +14,8 @@
<!-- 定制日程-->
<!-- </el-button>-->
<div class="header">
<!-- <div>会议管理</div> -->
<div>
<el-button type="primary" @click="toManageModule()">会议模板管理</el-button>
<!-- <el-button type="primary" @click="toManageModule()">会议模板管理</el-button> -->
</div>
</div>
<div class="content">
......@@ -371,7 +370,7 @@ export default {
.meeting_wrap {
height: 100%;
.header {
height: 55px;
height: 25px;
padding: 0 42px;
display: flex;
justify-content: flex-end;
......
src/views/moduleManage/module.vue
浏览文件 @ c0171b62
<template>
<div class="module">
<div class="top">
<!-- <div class="top">
<div class="title">会议管理>会议模板管理</div>
<div class="btns">
<el-button type="primary" size="small" @click="createModule"
......@@ -8,23 +8,15 @@
>
<el-button type="primary" size="small" @click="goback">返回</el-button>
</div>
</div>
</div>-->
<div class="main">
<div class="top_wrap">
<el-form
ref="form"
:inline="true"
:model="formData"
class="demo-form-inline"
>
<el-form ref="form" :inline="true" :model="formData" class="demo-form-inline">
<el-form-item label="会议模板名称:">
<el-input v-model="formData.tempName" placeholder=" "></el-input>
</el-form-item>
<el-form-item label="会议室:">
<el-input
v-model="formData.conferenceName"
placeholder=" "
></el-input>
<el-input v-model="formData.conferenceName" placeholder=" "></el-input>
</el-form-item>
<el-form-item label="更新时间:">
......@@ -36,16 +28,11 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="searchList"
>查询
</el-button>
<el-button size="small" class="mg_l_20" @click="reset"
>重置
</el-button>
<el-button size="small" type="primary" @click="searchList">查询</el-button>
<el-button size="small" class="mg_l_20" @click="reset">重置</el-button>
</el-form-item>
</el-form>
</div>
......@@ -64,40 +51,20 @@
height="650px"
>
<!-- <el-table-column type="index" label="序号" width="80">
</el-table-column> -->
<el-table-column
type="index"
label="序号"
width="80"
></el-table-column>
<el-table-column prop="tempName" label="会议模板"> </el-table-column>
<el-table-column prop="des" label="会议模板说明"> </el-table-column>
<el-table-column
prop="conferenceAddress"
label="会议地址"
width="300"
>
</el-table-column>
<el-table-column prop="personnelNum" label="参会人数" width="90">
</el-table-column>
<el-table-column prop="seatNum" label="座位数量" width="90">
</el-table-column>
<el-table-column prop="unitNum" label="人员分区" width="90">
</el-table-column>
<el-table-column prop="updateTime" label="更新时间" width="160">
</el-table-column>
</el-table-column>-->
<el-table-column type="index" label="序号" width="80"></el-table-column>
<el-table-column prop="tempName" label="会议模板"></el-table-column>
<el-table-column prop="des" label="会议模板说明"></el-table-column>
<el-table-column prop="conferenceAddress" label="会议地址" width="300"></el-table-column>
<el-table-column prop="personnelNum" label="参会人数" width="90"></el-table-column>
<el-table-column prop="seatNum" label="座位数量" width="90"></el-table-column>
<el-table-column prop="unitNum" label="人员分区" width="90"></el-table-column>
<el-table-column prop="updateTime" label="更新时间" width="160"></el-table-column>
<el-table-column label="操作" width="145">
<template slot-scope="scope">
<el-button type="text" @click="lookOnce(scope.row)"
>编辑</el-button
>
<el-button type="text" @click="lookOnce(scope.row)">编辑</el-button>
<el-button type="text" @click="upload(scope.row)">管理</el-button>
<el-button
type="text"
@click="deleteDetail(scope.row)"
class="delete"
>删除</el-button
>
<el-button type="text" @click="deleteDetail(scope.row)" class="delete">删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -112,8 +79,7 @@
:page-size="formData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
>
</el-pagination>
></el-pagination>
</div>
</div>
<el-dialog
......@@ -129,12 +95,7 @@
</div>
<div>
<div class="name">模板说明：</div>
<el-input
type="textarea"
maxlength="80"
show-word-limit
v-model="moduleDes"
></el-input>
<el-input type="textarea" maxlength="80" show-word-limit v-model="moduleDes"></el-input>
</div>
</div>
<span slot="footer" class="dialog-footer">
......@@ -163,120 +124,120 @@
export default {
data() {
return {
dialogTitle: "",
dates: "",
dialogTitle: '',
dates: '',
total: 0,
formData: {
conferenceName: "",
conferenceName: '',
currentPage: 1,
endTime: "",
endTime: '',
pageSize: 10,
startTime: "",
tempName: "",
startTime: '',
tempName: '',
date: [],
},
dataList: [],
loading: false,
changeModules: false,
moduleId: "",
moduleName: "",
moduleDes: "",
moduleId: '',
moduleName: '',
moduleDes: '',
toBack: false,
};
}
},
created() {
this.getData();
this.getData()
},
methods: {
goback() {
this.$router.push("/beforeMeeting");
this.$router.push('/beforeMeeting')
},
upload(row) {
let path = "";
let path = ''
if (row.tempShowStatus == 1) {
path = "/operation/chooseModule";
path = '/operation/chooseModule'
} else {
path = "/cavans";
path = '/cavans'
}
this.$router.push({
path,
query: { processId: row.id, isProcess: 2 },
});
})
},
deleteDetail(row) {
this.moduleId = row.id;
this.toBack = true;
this.moduleId = row.id
this.toBack = true
},
sureBack(row) {
this.$axios.deleteConfTemplate(this.moduleId).then((res) => {
if (res.data.code == 200) {
this.handlepic();
this.$message.success("删除成功！");
this.getData();
this.handlepic()
this.$message.success('删除成功！')
this.getData()
}
});
})
},
getData() {
this.$axios.findConfTemplateList(this.formData).then((res) => {
if (res.data.code == 200) {
this.dataList = res.data.data.conferenceTemplateShowVoList;
this.total = res.data.data.tempNum;
this.dataList = res.data.data.conferenceTemplateShowVoList
this.total = res.data.data.tempNum
}
});
})
},
handlepic() {
this.moduleId = "";
this.moduleName = "";
this.moduleDes = "";
this.toBack = false;
this.moduleId = ''
this.moduleName = ''
this.moduleDes = ''
this.toBack = false
this.changeModules = false;
this.changeModules = false
},
lookOnce(row) {
this.moduleId = row.id;
this.moduleName = row.tempName;
this.moduleDes = row.des;
this.dialogTitle = "修改模板";
this.changeModules = true;
this.moduleId = row.id
this.moduleName = row.tempName
this.moduleDes = row.des
this.dialogTitle = '修改模板'
this.changeModules = true
},
saveModuleChange() {
let data = {
id: this.moduleId,
des: this.moduleDes,
tempName: this.moduleName,
};
}
this.$axios.saveConfTemplate(data).then((res) => {
if (res.data.code == 200) {
this.$message.success("操作成功！");
if (this.dialogTitle == "新增模板") {
let path = "/operation/chooseModule";
this.$message.success('操作成功！')
if (this.dialogTitle == '新增模板') {
let path = '/operation/chooseModule'
this.$router.push({
path,
query: { processId: res.data.data, isProcess: 2 },
});
})
}
this.handlepic();
this.getData();
this.handlepic()
this.getData()
} else {
this.$message.error(res.data.data);
this.$message.error(res.data.data)
}
});
})
},
createModule() {
this.dialogTitle = "新增模板";
this.changeModules = true;
this.dialogTitle = '新增模板'
this.changeModules = true
},
handleSizeChange(val) {
this.formData.pageSize = val;
this.formData.pageSize = val
},
handleCurrentChange(val) {
this.formData.currentPage = val;
this.formData.currentPage = val
},
searchList() {},
reset() {},
},
};
}
</script>
<style scoped lang="less">
......
src/views/reserveRecord/allConfence.vue
浏览文件 @ c0171b62
......@@ -7,7 +7,7 @@
<div class="week">
<div
class="oneDay"
:class="[item.week=='周六' || item.week=='周日'?'greeyFont':'',checkDate==item.date?'bgc':'']"
:class="[checkDate==item.date?'bgc':'',item.week=='周六' || item.week=='周日'?'greeyFont':'']"
v-for="(item,index) in dateList"
:key="index"
@click="checkConferenceDate(item)"
......@@ -21,6 +21,7 @@
<img src="../../assets/meetingPalce/paiwei/right.png" />
</div>
</div>
<div class="wai">
<div class="confenceArea">
<div class="confenceOnce" v-for="(item,index) in allConfenceList" :key="index">
<div class="confence_title">
......@@ -46,6 +47,7 @@
</div>
</div>
</div>
</div>
</template>
<script>
......@@ -61,6 +63,7 @@ export default {
// deep: true,
// },
},
data() {
return {
canClick: false,
......@@ -84,8 +87,13 @@ export default {
}
},
methods: {
toTop() {
document.documentElement.scrollTop = 0
console.log(document.documentElement.scrollTop)
},
checkConferenceDate(item) {
console.log('单机日期', item)
// console.log('单机日期', item)
// this.$router.go(0)
this.$emit('getCheckDate', item.date, 1)
},
getLastWeekDate() {
......@@ -102,13 +110,13 @@ export default {
}
let date = new Date().getFullYear() + '-' + month + '-' + new Date().getDate()
if (new Date(item.date).getTime() == new Date(date).getTime()) {
console.log('等于')
// console.log('等于')
return 'blue'
} else if (new Date(item.date) < new Date(date)) {
console.log('小于当天')
// console.log('小于当天')
return 'gray'
} else if (new Date(item.date) > new Date(date)) {
console.log('大于今天')
// console.log('大于今天')
return 'yellow'
}
},
......@@ -127,6 +135,11 @@ export default {
.allConfence {
width: 100%;
height: 100%;
// overflow-y: auto;
// overflow-x: visible;
// overflow-x: visible;
// overflow-y: auto;
.topData {
width: 98%;
height: 50px;
......@@ -188,11 +201,17 @@ export default {
}
}
}
.wai {
// width: 100%;
height: calc(100% - 74px);
overflow-x: hidden;
// padding-left: -200px;
.confenceArea {
width: 100%;
height: calc(100% - 74px);
overflow: auto;
// height: calc(100% - 74px);
// height: 100%;
overflow-x: visible;
// padding-left: -300px;
.confenceOnce {
height: 435px;
width: 100%;
......@@ -223,6 +242,7 @@ export default {
}
}
}
}
}
</style>
src/views/reserveRecord/index.vue
浏览文件 @ c0171b62
......@@ -16,6 +16,9 @@
@click="getOneConfence(item,index)"
>
<div class="confence_name">{{item.conferenceName}}</div>
<div
:class="item.conferenceName.length>8?'hover_name':'none_hover' "
>{{item.conferenceName}}</div>
<div class="box"></div>
</div>
</div>
......@@ -353,7 +356,7 @@ export default {
overflow: auto;
.confence {
width: 172px;
height: 80px;
min-height: 80px;
background: #ffffff;
border-radius: 2px 2px 2px 2px;
text-align: center;
......@@ -361,10 +364,23 @@ export default {
cursor: pointer;
.confence_name {
width: 100%;
// min-height: 72px;
height: 72px;
line-height: 72px;
font-size: 18px;
padding: 10px;
// display: flex;
// align-items: center;
// justify-content: center;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.hover_name {
display: none;
}
.none_hover {
display: none;
}
.box {
width: 100%;
......@@ -373,6 +389,19 @@ export default {
background: #5474e8;
}
}
.confence:hover {
position: relative;
.hover_name {
display: inline-block;
position: absolute;
// left: 0;
// bottom: 0px;
transform: translate(-50%);
width: 150px;
border-radius: 4px;
background-color: skyblue;
}
}
.confenceActive {
background: #5474e8;
.confence_name {
......@@ -385,6 +414,7 @@ export default {
width: calc(100% - 210px);
height: 100%;
// background-color: #100;
// overflow: visible;
.list_data {
width: 100%;
width: 1622px;
......@@ -440,6 +470,7 @@ export default {
.list_table {
width: 100%;
height: calc(100% - 56px);
// overflow: visible;
}
}
}
......
src/views/system/personLabel.vue
浏览文件 @ c0171b62
......@@ -12,10 +12,10 @@
</div>
<div class="sousuo">
<el-form ref="form" :inline="true" :model="formData" class="demo-form-inline">
<el-form-item label="姓名:">
<el-form-item label="姓名:" v-if="personOrUnit==1">
<el-input v-model="formData.customUserName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="单位（浙政钉）:">
<el-form-item label="单位（浙政钉）:" v-if="personOrUnit==1">
<el-input v-model="formData.customUserUnit" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="参会单位（平台）:">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论