|
|
|
|
@ -3,11 +3,11 @@
|
|
|
|
|
<div style="height: 40%; width: 100%;display: flex;justify-content: stretch;" > |
|
|
|
|
<!--待办任务--> |
|
|
|
|
|
|
|
|
|
<a-card id="todo" style="float: left; width: 33%; height: 100%;padding-bottom: 10px;" :body-style="{height: '95%', overflow:'hidden'}"> |
|
|
|
|
<a-card id="todo" style="float: left; width: 33%; height: 100%;" :body-style="{height: '98%', overflow:'hidden'}"> |
|
|
|
|
<div style="height: 40px;font-weight: 600; font-size: 16px;line-height: 40px"> |
|
|
|
|
公司风采 |
|
|
|
|
</div> |
|
|
|
|
<div id="messageDiv" style="height: 280px;overflow-y: auto;margin: 0 0 0 0;" > |
|
|
|
|
<div id="messageDiv" style="height: 290px;overflow-y: auto;margin: 0 0 0 0;" > |
|
|
|
|
<!-- <div id="messageDiv" style="height: 250px;overflow-y: auto;margin: 0 0 0 0;" @scroll="heightScrollTodo()">--> |
|
|
|
|
<!-- <a-table--> |
|
|
|
|
<!-- rowKey="id"--> |
|
|
|
|
@ -51,7 +51,7 @@
|
|
|
|
|
<a-icon type="right-circle" /> |
|
|
|
|
</div> |
|
|
|
|
<div v-for="item in this.listMien" style="height: 300px" > |
|
|
|
|
<img class="rightulliimg" :src="item.url" /> |
|
|
|
|
<img class="rightulliimg" :src="item.url" style="height: 290px"/> |
|
|
|
|
</div> |
|
|
|
|
</a-carousel> |
|
|
|
|
</div> |
|
|
|
|
@ -113,14 +113,14 @@
|
|
|
|
|
</a-card> |
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
|
<a-modal v-model="visible" title="" width="1200px" |
|
|
|
|
<a-modal v-model="visible" :title=titles width="1200px" |
|
|
|
|
@cancel="handlerOk" |
|
|
|
|
cancelText="关闭"> |
|
|
|
|
<template slot="footer"> |
|
|
|
|
<a-button @click="handlerOk">关闭</a-button> |
|
|
|
|
</template> |
|
|
|
|
<p v-html="regimeConter" :style="{'max-height': this.timeLineHeight + 'px' }" |
|
|
|
|
style="overflow-y:scroll;margin-top: 2%"></p> |
|
|
|
|
style="overflow:auto;"></p> |
|
|
|
|
|
|
|
|
|
</a-modal> |
|
|
|
|
|
|
|
|
|
@ -231,6 +231,7 @@ export default {
|
|
|
|
|
order: 'desc', |
|
|
|
|
}, |
|
|
|
|
visible: false, |
|
|
|
|
titles: null, |
|
|
|
|
//待办 登录日志 站内消息查询地址 |
|
|
|
|
url: { |
|
|
|
|
listCementByUser:"/sys/annountCement/listByUser", |
|
|
|
|
@ -327,9 +328,9 @@ export default {
|
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
this.timeLineHeight = document.documentElement.clientHeight - 300; |
|
|
|
|
this.timeLineHeight = document.documentElement.clientHeight - 330; |
|
|
|
|
window.onresize = () => { |
|
|
|
|
this.timeLineHeight = document.documentElement.clientHeight - 300; |
|
|
|
|
this.timeLineHeight = document.documentElement.clientHeight - 330; |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
created() { |
|
|
|
|
@ -587,13 +588,13 @@ export default {
|
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
handleDetail(record){ |
|
|
|
|
|
|
|
|
|
console.log(record,"-=-="); |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.visible = true; |
|
|
|
|
this.regimeConter = record.contentDetails; |
|
|
|
|
// console.log("=edrsfg-q=wse0gf=",record.contentDetails); |
|
|
|
|
// this.$refs.modalForm.edit(record); |
|
|
|
|
// this.$refs.modalForm.title="详情"; |
|
|
|
|
this.titles=record.title; |
|
|
|
|
// this.$refs.modalForm.disableSubmit = true; |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
@ -687,12 +688,12 @@ export default {
|
|
|
|
|
border: 0; |
|
|
|
|
border-radius: 2px; |
|
|
|
|
pointer-events: auto; |
|
|
|
|
width: 1500px; |
|
|
|
|
width: 1300px; |
|
|
|
|
display: inline-block; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/*风采*/ |
|
|
|
|
.ant-carousel >>> .slick-slide img { |
|
|
|
|
border: 5px solid #fff; |
|
|
|
|
border: 2px solid #fff; |
|
|
|
|
display: block; |
|
|
|
|
margin: 5px auto; |
|
|
|
|
height: 90%; |
|
|
|
|
@ -703,7 +704,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
.ant-carousel >>> .slick-slide { |
|
|
|
|
text-align: center; |
|
|
|
|
height: 260px; |
|
|
|
|
height: 282px; |
|
|
|
|
line-height: 160px; |
|
|
|
|
/*background: #888a8d;*/ |
|
|
|
|
overflow: hidden; |
|
|
|
|
@ -846,7 +847,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
/deep/.ant-card-body{ |
|
|
|
|
height: 80%; |
|
|
|
|
padding: 0px 24px; |
|
|
|
|
padding: 0px 12px; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
