Skip to content

M
meet
Commit b2c6afaa authored by wangqinghua's avatar wangqinghua
Browse files
Options

quiet2

parent 5422a72c
Show whitespace changes
Inline Side-by-side
Showing with 268 additions and 41 deletions
src/http.js/http.js
View file @ b2c6afaa
......@@ -8,8 +8,8 @@ export const domin = '/api' //本地环境
// export const domin = '' //生产环境
//axios配置
let instance = axios.create({
baseURL:'/api',
// baseURL:'http://172.19.1.232:8085',
baseURL:'/api', //本地环境
// baseURL:'http://172.19.1.232:8085', //生产环境
// timeout:20000,
});
......
src/http.json 0 → 100644
View file @ b2c6afaa
{
"code": 0,
"message": "请求成功",
"data": {
"id": "56fea23cca374baeb5a919d2e8a3264b",
"title": "组织部部务会",
"meetingSort": 1,
"initiator": "管理员",
"initDepartment": "组织部办公室",
"meetingTime": "2019-04-16T00:00:00.000+0000",
"meetingAddress": "223会议室",
"remark": "无",
"secretLevel": 0,
"isEnd": 0,
"agendaList": [
{
"id": "8e0916c5a1f54f678e47736b864c0ce1",
"title": "学习文件",
"reportDep": "办公室",
"remark": "无",
"linkAttends": [
{
"id": "6940b3680bc74c8db284be7eaa51d8f8",
"refId": "8e0916c5a1f54f678e47736b864c0ce1",
"attendId": "d861b586c1084bbda6b8bc6a3e9853ec",
"name": "干部监察处"
},
{
"id": "85db43de0721434881b002cbf41c3325",
"refId": "8e0916c5a1f54f678e47736b864c0ce1",
"attendId": "e7c37b3947374366aebcd0c1a96ff23a",
"name": "办公室"
},
{
"id": "95e9fd43e73c4cd0b2eeccef44c1cbe4",
"refId": "8e0916c5a1f54f678e47736b864c0ce1",
"attendId": "b81561417082459a8f3543e16a850f44",
"name": "人事处"
},
{
"id": "e3a3aa8da3e94b7a8db399efa7a08949",
"refId": "8e0916c5a1f54f678e47736b864c0ce1",
"attendId": "2ece435c082945218caf09fbc63ae6af",
"name": "信息技术处"
}
],
"accessories": [
{
"id": "da858205aefa4b2e90cceab9f3a5e7cc",
"name": "用车管理.pdf",
"saveName": "https://mozilla.github.io/pdf.js/web/compressed.tracemonkey-pldi-09.pdf",
"sortNum": 1,
"createUser": null,
"createTime": "2019-04-15T09:33:31.000+0000",
"updateTime": "2019-04-15T09:33:31.000+0000",
"updateUser": null,
"isDelete": 0,
"refId": "8e0916c5a1f54f678e47736b864c0ce1"
},
{
"id": "c84318f5bfc8464483dfbab0b8bc0405",
"name": "物资管理需求.docx",
"saveName": "https://mozilla.github.io/pdf.js/web/compressed.tracemonkey-pldi-09.pdf",
"sortNum": 2,
"createUser": null,
"createTime": "2019-04-15T09:33:31.000+0000",
"updateTime": "2019-04-15T09:33:31.000+0000",
"updateUser": null,
"isDelete": 0,
"refId": "8e0916c5a1f54f678e47736b864c0ce1"
}
],
"linkSpecial": null,
"specialAgenda": null,
"createUser": null,
"createTime": "2019-04-15T09:33:31.000+0000",
"updateUser": null,
"updateTime": "2019-04-15T09:33:31.000+0000",
"isDelete": 0,
"sortNum": 1
},
{
"id": "f40d454ee4a846efaf432c142c8fd3cf",
"title": "学习资料",
"reportDep": "信息技术处",
"remark": "无",
"linkAttends": [
{
"id": "b97e5dfba23746549939027ff302339e",
"refId": "f40d454ee4a846efaf432c142c8fd3cf",
"attendId": "e7c37b3947374366aebcd0c1a96ff23a",
"name": "办公室"
},
{
"id": "ce5cb46bf6a94b3082ac0ff63f54eac3",
"refId": "f40d454ee4a846efaf432c142c8fd3cf",
"attendId": "2ece435c082945218caf09fbc63ae6af",
"name": "信息技术处"
},
{
"id": "dab8c09b23dc43ce82e2616fce49b31e",
"refId": "f40d454ee4a846efaf432c142c8fd3cf",
"attendId": "d861b586c1084bbda6b8bc6a3e9853ec",
"name": "干部监察处"
}
],
"accessories": [
{
"id": "f4d6bb2a42ae45d788626c2b50203aa5",
"name": "接待管理需求.pdf",
"saveName": "https://mozilla.github.io/pdf.js/web/compressed.tracemonkey-pldi-09.pdf",
"sortNum": 1,
"createUser": null,
"createTime": "2019-04-15T09:34:28.000+0000",
"updateTime": "2019-04-15T09:34:28.000+0000",
"updateUser": null,
"isDelete": 0,
"refId": "f40d454ee4a846efaf432c142c8fd3cf"
}
],
"linkSpecial": null,
"specialAgenda": null,
"createUser": null,
"createTime": "2019-04-15T09:34:28.000+0000",
"updateUser": null,
"updateTime": "2019-04-15T09:34:28.000+0000",
"isDelete": 0,
"sortNum": 2
},
{
"id": "4ba046a786614a74af3d0c7523be4c22",
"title": "干部评审",
"reportDep": "人事处",
"remark": "无",
"linkAttends": [
{
"id": "219ad42f97024b7c8d5fc51b8350663a",
"refId": "4ba046a786614a74af3d0c7523be4c22",
"attendId": "e7c37b3947374366aebcd0c1a96ff23a",
"name": "办公室"
},
{
"id": "2a6fc1377cab4756bdc2d77128a9e563",
"refId": "4ba046a786614a74af3d0c7523be4c22",
"attendId": "2ece435c082945218caf09fbc63ae6af",
"name": "信息技术处"
},
{
"id": "2e84b583a96b4feaa4f1f3d22ddf0748",
"refId": "4ba046a786614a74af3d0c7523be4c22",
"attendId": "b81561417082459a8f3543e16a850f44",
"name": "人事处"
},
{
"id": "b3bda651951b48ebbe1b1b48d13ea310",
"refId": "4ba046a786614a74af3d0c7523be4c22",
"attendId": "d861b586c1084bbda6b8bc6a3e9853ec",
"name": "干部监察处"
}
],
"accessories": [
{
"id": "f70befcaa1494e709d61890708a0a97f",
"name": "会议离线包.rar",
"saveName": "https://mozilla.github.io/pdf.js/web/compressed.tracemonkey-pldi-09.pdf",
"sortNum": 1,
"createUser": null,
"createTime": "2019-04-15T09:35:07.000+0000",
"updateTime": "2019-04-15T09:35:07.000+0000",
"updateUser": null,
"isDelete": 0,
"refId": "4ba046a786614a74af3d0c7523be4c22"
}
],
"linkSpecial": null,
"specialAgenda": null,
"createUser": null,
"createTime": "2019-04-15T09:35:07.000+0000",
"updateUser": null,
"updateTime": "2019-04-15T09:35:07.000+0000",
"isDelete": 0,
"sortNum": 3
}
],
"intentionList": [],
"updateUser": null,
"createUser": null,
"createTime": "2019-04-15T08:56:16.000+0000",
"updateTime": "2019-04-15T09:35:10.000+0000",
"isDelete": 0
}
}
\ No newline at end of file
src/views/quiet.vue
View file @ b2c6afaa
......@@ -69,7 +69,6 @@
title:'部委会',
meetingTime:'2019-04-08 00：00',
meetingAddress:'第一会议室',
},
pages: 0,
fileName:'',
......
src/views/quiet2.vue
View file @ b2c6afaa
......@@ -2,11 +2,10 @@
<div class="view-file">
<el-row class="margin-20-0">
<el-col class="left1" :span="24">
<div class="text-center">
<h1 class="margin-10-0">{{meet.title}}</h1>
<h1 class="margin-10-0">次序号：{{meet.meetingSort}}</h1>
<h2 class="margin-10-0">时间：{{meet.meetingTime | formatDate}}</h2>
<h3 class="margin-10-0">地点：{{meet.meetingAddress}}</h3>
<div>
<h1 class="margin-10-0 text-center">{{meet.meetingTime | formatDate1}}{{meet.title}}（{{meet.meetingSort}}）</h1>
<div style="margin: 10px auto;width: 40%;font-size: 25px">时间：{{chartTime}}</div>
<div style="margin: 10px auto;width: 40%;font-size: 25px">地点：{{meet.meetingAddress}}</div>
</div>
<template v-for="(item,index) of meet.agendaList">
<p style="cursor: pointer" @click="openFile(item)">{{index +2}}、{{item.title}}</p>
......@@ -23,7 +22,7 @@
列席：
</el-col>
<el-col :span="20" class="padding-10-0">
{{item.attendPerson}}
<template v-for="attend of item.linkAttends">{{attend.name}} &nbsp;&nbsp;</template>
</el-col>
</el-row>
</template>
......@@ -32,9 +31,11 @@
<!--弹窗文件-->
<div class="file-mask" v-if="show">
<img src="../assets/shrink.png" class="shrink" @click="shrink">
<el-row>
<el-col :span="6" style="text-align: center;padding-top: 60px;">
<el-select v-model="agenda" placeholder="请选择" @change="selectAgenda">
<el-col :span="24 - isCol" style="padding-top: 15px;">
<div class="text-right">
<el-select style="padding-bottom: 20px" v-model="agenda" placeholder="请选择" @change="selectAgenda">
<el-option
v-for="item in meet.agendaList"
:key="item.title"
......@@ -43,11 +44,13 @@
</el-option>
</el-select>
<p style="margin-top: 20px;cursor: pointer" @click="getFile(name)" v-for="name of fileList">
</div>
<p v-for="name of fileList" style="text-align:center;padding: 10px 0;cursor: pointer" :class="{bgc_196cc3:clickFileId == name.id}" @click="getFile(name)" >
{{name.name}}
</p>
</el-col>
<el-col :span="18" style="padding: 20px;background-color: #9bcdfd;">
<el-col :span="isCol" style="background-color: #9bcdfd;">
<div class="pdf">
<div class="mask">
<div class="left">
......@@ -57,6 +60,8 @@
<v-touch style="height: 100%" v-on:swipeleft="changePdfPage(1)"></v-touch>
</div>
</div>
<h2 class="text-center" style="padding: 20px; background-color:#3a6dfe;">{{clickAgenda}}</h2>
<div style="padding: 20px;">
<p class="arrow">
{{currentPage}} / {{pageCount}}
</p>
......@@ -70,6 +75,8 @@
@loaded="loadPdfHandler"
></pdf>
</div>
</div>
</el-col>
</el-row>
<span @click="close" class="close">X</span>
......@@ -93,6 +100,9 @@
return {
src: "",
url: "",
isCol:18, //侧边栏显示
clickFileId:'', //选择的文件
clickAgenda:"", //选中的议程信息
currentPage: 0, // pdf文件页码
pageCount: 0, // pdf文件总页数
loadedRatio: 0,
......@@ -105,14 +115,16 @@
meet: {},
pages: 0,
fileName: '',
chartTime:"", //周 下午 时间
publicPath: process.env.BASE_URL
}
},
methods: {
openFile(item) {
console.log(item)
this.agenda = item.id;
this.clickAgenda = item.title
this.fileList = item.accessories
this.getFile(this.fileList[0])
this.show = true
},
close() {
......@@ -135,11 +147,12 @@
this.meet.agendaList.forEach(e => {
if (e.id === this.agenda) {
this.fileList = e.accessories
this.clickAgenda = e.title
}
})
console.log(this.agenda)
},
getFile(name) {
this.clickFileId = name.id
let url
if (name.saveName.includes('.doc') || name.saveName.includes('.docx')) {
const fileName = name.saveName.split('.doc')[0] + '.pdf'
......@@ -148,40 +161,50 @@
url = domin + '/common/file/download?fileName=' + name.saveName
}
this.src = pdf.createLoadingTask(url)
},
shrink(){
if(this.isCol === 24){
this.isCol = 18
}else{
this.isCol = 24
}
}
},
mounted() {
const weekArray =["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
this.$store.commit(types.SIDEWIDTH, 0) //隐藏侧边栏
if (this.$route.query.id) {
this.meet = require('../http').data
this.id = this.$route.query.id
getMeetingById({id: this.id}).then(
(res) => {
this.meet = res.data
const meetTime = new Date( this.meet.meetingTime )
this.chartTime = this.meet.meetingTime
let weekStr = weekArray[meetTime.getDay()]
let hourStr = meetTime.getHours();
let minuStr = meetTime.getMinutes();
let timeStr
if(hourStr === 0 || 0 < ~~hourStr && ~~hourStr < 12){
timeStr = '上午'
}else if(hourStr === 12 || 12 < ~~hourStr && ~~hourStr < 18){
timeStr = '下午'
}else if(hourStr === 18 || 18 < ~~hourStr && ~~hourStr < 24){
timeStr = '晚上'
}
)
} else if (this.$route.query.previewId) {
this.id = this.$route.query.previewId
this.meet = JSON.parse(localStorage.getItem(this.id))
console.log(this.meet)
this.meet.intentionList.forEach(e => { //意向
this.list.push(e)
})
this.meet.agendaList.forEach(e => { //议程
this.list.push(e)
this.agendaInfo.push(e.title)
e.linkAttends.forEach(e => {
this.attendPerson += e.name + "、"
})
})
this.attendPerson = this.attendPerson.substr(0, this.attendPerson.length - 1)
hourStr = hourStr > 9 ? hourStr:'0'+hourStr
minuStr = minuStr > 9 ? minuStr:'0'+minuStr
this.chartTime = weekStr + '' +timeStr +' ' +hourStr +':' +minuStr
}
)
},
filters: {
formatDate(time) {
formatDate1(time) {
let date = new Date(time);
return formatDate(date, 'yyyy-MM-dd hh:mm');
return formatDate(date, 'yyyy年MM月dd日');
}
}
......@@ -209,12 +232,12 @@
}
.close {
position: absolute;
top: 10px;
right: 10px;
color: #ffffff;
font-size: 20px;
z-index: 4;
position: fixed;
top: 40px;
right: 60px;
color: red;
font-size: 40px;
z-index: 99999999;
cursor: pointer;
}
......@@ -286,5 +309,17 @@
.grey {
color: #999999;
}
.bgc_196cc3{
background-color: #196cc3;
}
.shrink{
position: absolute;
top:15px;
left: 0px;
z-index: 4;
width: 40px;
height: 40px;
cursor: pointer;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment