Commit 0a83415d authored by zhengke's avatar zhengke

修改

parent d8e1b9fa
......@@ -45,25 +45,38 @@
overflow: hidden;
}
.noticeFile {
.noticeContent .noticeFile {
color: #2961FE;
font-size: 13px;
}
.notice_Page {
.noticeContent .notice_Page {
display: inline-block;
width: 30px;
height: 30px;
background-color: #DFE7FF;
cursor: pointer;
}
.noticeContent .expandName{
font-size:14px;
color:#2961FE;
margin-left:10px;
cursor: pointer;
}
.noticeContent .noticeNameList{
max-width:680px;
height:20px;
overflow: hidden;
}
.noticeContent .noticeZhan{
height:auto!important;
}
</style>
<template>
<q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale" transition-hide="scale">
<q-card style="width: 800px;max-width:800px;">
<div class="noticeTopBg">
<img style="width:100%;height:100%;" src="../../assets/images/noticeImg.png" />
<img style="width:100%;height:100%;" :src="dataList[0].BgImage" />
</div>
<div class="noticeContent">
<div class="notice_dix">
......@@ -76,15 +89,19 @@
<span class="notice_Span">{{dataList[0].Number}}</span>
</div>
</div>
<div style="margin:5px 0;">
<div>
<span class="noticeBlue">To:</span>
<span class="notice_Span">
<div style="margin:15px 0;">
<div style="display:flex;">
<div class="noticeBlue">To:</div>
<div class="notice_Span noticeNameList" ref="noticeKia" :class="{'noticeZhan':isShowMore}">
<span v-for="(item,index) in dataList[0].toList">
{{item}}
<template v-if="index!=dataList[0].toList.length-1"></template>
</span>
</span>
</div>
<template v-if="isShowBtn">
<div class="expandName" v-if="!isShowMore" @click="isShowMore=true">展开</div>
<div class="expandName" v-else @click="isShowMore=false">收起</div>
</template>
</div>
</div>
<div>
......@@ -97,7 +114,7 @@
</span>
</div>
</div>
<div style="margin:5px 0;">
<div style="margin:15px 0;">
<div>
<span class="noticeBlue">Time:</span>
<span class="notice_Span">{{dataList[0].UpdateTime}}</span>
......@@ -108,8 +125,8 @@
</div>
<div class="notice_dix" style="margin-top:20px;">
<div>
<div class="noticeFile" v-if="dataList[0].fileList.length>0">
<span v-for="item in dataList[0].fileList" style="cursor:pointer;">
<div class="noticeFile" v-if="dataList[0].fileList.length>0" v-for="item in dataList[0].fileList">
<span style="cursor:pointer;">
<a :href="item.FileUrl" style="color:#2961FE;text-decoration:none;" target="_blank">
<i class="iconfont icon-Download"
style="margin-right:5px;"></i>{{item.FileName}}</a>
......@@ -151,7 +168,9 @@
data() {
return {
persistent: true,
dataList: []
dataList: [],
isShowMore:false,
isShowBtn:false
}
},
created() {
......@@ -167,7 +186,16 @@
immediate: true
}
},
mounted() {},
mounted() {
this.$nextTick(() => {
var _width = this.$refs.noticeKia.clientWidth;
if(_width<680){
this.isShowBtn=false;
}else{
this.isShowBtn=true;
}
})
},
methods: {
//关闭弹窗
closeSaveForm() {
......
......@@ -144,16 +144,18 @@
if(res.Data.PageData.length>0){
this.isShowNotice=true;
}
this.TimeList.push(new Date(res.Data.PageData[0].UpdateTimeStr));
var maxDate=new Date(Math.max.apply(null,this.TimeList));
var date = new Date(maxDate);
var y = date.getFullYear();
var m = date.getMonth() + 1;
m = m < 10 ? ('0' + m) : m;
var d = date.getDate();
d = d < 10 ? ('0' + d) : d;
var notifyData = y+'-'+m+'-'+d+' '+ date.getHours() + ':' +date.getMinutes() + ':' + date.getSeconds();
localStorage.setItem("notifyTime", notifyData);
if(res.Data.PageData[0]&&res.Data.PageData[0].UpdateTimeStr){
this.TimeList.push(new Date(res.Data.PageData[0].UpdateTimeStr));
var maxDate=new Date(Math.max.apply(null,this.TimeList));
var date = new Date(maxDate);
var y = date.getFullYear();
var m = date.getMonth() + 1;
m = m < 10 ? ('0' + m) : m;
var d = date.getDate();
d = d < 10 ? ('0' + d) : d;
var notifyData = y+'-'+m+'-'+d+' '+ date.getHours() + ':' +date.getMinutes() + ':' + date.getSeconds();
localStorage.setItem("notifyTime", notifyData);
}
}
})
},
......
......@@ -177,7 +177,7 @@
<q-dialog v-model="persistent2" maximized full-height seamless position="right">
<q-card style="margin-top:21px;width:800px" class="no-border-radius classinfo_Dialog">
<q-img :src="NInfo.BgImage" v-if="NInfo.BgImage" spinner-color="white"
style=" width: 100%;height: 120px" />
style=" width: 100%;height: 76px" />
<div style="padding: 20px">
<div class="col-12 g row" style="margin-bottom:10px;">
<div class="col-6">
......@@ -198,23 +198,20 @@
<div class="col-12 row" style="margin-bottom:10px;">
Time:{{NInfo.UpdateTime}}
</div>
<div class="col-12 row" style="margin-top: 20px">
<div class="col-12 row" style="margin-top: 20px;line-height:26px;">
<span v-html="NInfo.Content"></span>
</div>
<div class="col-12 row" style="margin-top: 20px" v-if="NInfo.fileList&&NInfo.fileList.length>0">
<div>附件:</div>
<div style="margin-top:3px;">附件:</div>
<template>
<div class="q-pa-md" style="max-width: 350px">
<q-list dense padding class="rounded-borders">
<q-item clickable v-ripple v-for="(file,fIndex) in NInfo.fileList" :key="fIndex">
<q-item-section>
<div class="row" @click="wopen(file)">
<i class="iconfont icon-xiazai2" style="margin-right: 10px"></i>
{{file.FileName}}
</div>
</q-item-section>
</q-item>
</q-list>
<div style="max-width: 350px;margin-left:10px;">
<div class="noticeFile" v-if="NInfo.fileList.length>0" v-for="(file,fIndex) in NInfo.fileList" :key="fIndex">
<span style="cursor:pointer;">
<a :href="file.FileUrl" style="color:#2961FE;text-decoration:none;" target="_blank">
<i class="iconfont icon-Download"
style="margin-right:5px;"></i>{{file.FileName}}</a>
</span>
</div>
</div>
</template>
</div>
......@@ -654,7 +651,7 @@
},
EditConfig(id) {
this.persistent2 = true;
this.getNInfo(id)
this.getNInfo(id);
},
setNoticeOtion(id, type) {
setNoticeOperation({
......@@ -699,5 +696,9 @@
.document .q-pr-lg {
padding-right: 0;
}
.document .noticeFile {
color: #2961FE;
font-size: 13px;
}
</style>
......@@ -90,8 +90,8 @@
</div>
<div style="margin-top:20px;">
<div class="noticeFile" v-if="dataList.fileList.length>0">
<span v-for="item in dataList.fileList" style="cursor:pointer;">
<div class="noticeFile" v-if="dataList.fileList.length>0" v-for="item in dataList.fileList">
<span style="cursor:pointer;">
<a :href="item.FileUrl" style="color:#2961FE;text-decoration:none;" target="_blank">
<i class="iconfont icon-Download" style="margin-right:5px;"></i>{{item.FileName}}</a>
</span>
......
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