微调公告布局
parent
eee0b981c2
commit
edc6752f55
|
@ -56,7 +56,8 @@
|
||||||
</div>
|
</div>
|
||||||
<div style="width: 50%;">
|
<div style="width: 50%;">
|
||||||
<p class="p-subtitle" style="margin-left: 10px;margin-top: 10px">个人</p>
|
<p class="p-subtitle" style="margin-left: 10px;margin-top: 10px">个人</p>
|
||||||
<echartsBar @mounted="getselfTaskStats" :task="selftaskStat" style="height: 190px; weight: 100%"></echartsBar>
|
<echartsBar @mounted="getselfTaskStats" :task="selftaskStat"
|
||||||
|
style="height: 190px; weight: 100%"></echartsBar>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
@ -162,33 +163,44 @@
|
||||||
<div>
|
<div>
|
||||||
<p class="p-title" style="margin-left: 10px;width: 40%;float: left;">公告</p>
|
<p class="p-title" style="margin-left: 10px;width: 40%;float: left;">公告</p>
|
||||||
<div style="width: 80px;height: 40px;float:right;">
|
<div style="width: 80px;height: 40px;float:right;">
|
||||||
<el-button v-if="!project.completed&&projectAccessLevel<3" @click="addggboxbtn()" type="primary">新增</el-button>
|
<el-button v-if="!project.completed&&projectAccessLevel<3" @click="addggboxbtn()" type="primary">新增
|
||||||
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- 公告具体内容 -->
|
<!-- 公告具体内容 -->
|
||||||
<div
|
|
||||||
style="margin-top: 15px;padding: 8px;background-color: white; border-radius: 10px;flex:1;overflow: auto;position: relative;">
|
|
||||||
|
|
||||||
|
|
||||||
|
<el-scrollbar
|
||||||
|
wrap-style="overflow-x:hidden;"
|
||||||
|
style="margin-top: 15px;padding: 16px;background-color: white; border-radius: 10px;flex:1;position: relative;">
|
||||||
<div v-if="findGgBoxShow "
|
<div v-if="findGgBoxShow "
|
||||||
style="position: absolute;width:100%;height: 470px;left:0;top:0;background-color: #ffffff;z-index: 999;">
|
style="position: absolute;margin-top: 16px;margin-bottom: 16px;width:100%;height: 470px;left:0;top:0;background-color: #ffffff;z-index: 999;">
|
||||||
<div style="width:100%;height:10%;float:left;">
|
<div style="width:100%;height:10%;float:left;">
|
||||||
<p @click="gbGgBosShow()"
|
<p @click="gbGgBosShow()"
|
||||||
style="width:18%;height:100%;float:left;color: #606266;line-height: 250%;cursor: pointer;margin-left: 7%;"> <i class="el-icon" style="margin: 13px 4px 0 0;float: left;"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><path fill="currentColor" d="M609.408 149.376 277.76 489.6a32 32 0 0 0 0 44.672l331.648 340.352a29.12 29.12 0 0 0 41.728 0 30.592 30.592 0 0 0 0-42.752L339.264 511.936l311.872-319.872a30.592 30.592 0 0 0 0-42.688 29.12 29.12 0 0 0-41.728 0z"></path></svg></i>返回</p>
|
style="width:18%;height:100%;float:left;color: #606266;line-height: 250%;cursor: pointer;margin-left: 7%;">
|
||||||
|
<i class="el-icon" style="margin: 13px 4px 0 0;float: left;">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024">
|
||||||
|
<path fill="currentColor"
|
||||||
|
d="M609.408 149.376 277.76 489.6a32 32 0 0 0 0 44.672l331.648 340.352a29.12 29.12 0 0 0 41.728 0 30.592 30.592 0 0 0 0-42.752L339.264 511.936l311.872-319.872a30.592 30.592 0 0 0 0-42.688 29.12 29.12 0 0 0-41.728 0z"></path>
|
||||||
|
</svg>
|
||||||
|
</i>返回
|
||||||
|
</p>
|
||||||
<div style="min-width:50%;height:100%;float:left;line-height: 250%;text-align: center;">
|
<div style="min-width:50%;height:100%;float:left;line-height: 250%;text-align: center;">
|
||||||
<h3>{{ findGgInfoContent.announcementTitle }} </h3></div>
|
<h3>{{ findGgInfoContent.announcementTitle }} </h3></div>
|
||||||
<!-- //level为几能看公告不确定 看起来是只有1才可以删?还是等后续确定了我再改下面的吧 -->
|
<!-- //level为几能看公告不确定 看起来是只有1才可以删?还是等后续确定了我再改下面的吧 -->
|
||||||
<div v-if="!project.completed&&findGgInfoContent.announcementPublisherAccessLevel>=projectAccessLevel" @click="showDelbox(findGgInfoContent.announcementId)"
|
<div v-if="!project.completed&&findGgInfoContent.announcementPublisherAccessLevel>=projectAccessLevel"
|
||||||
|
@click="showDelbox(findGgInfoContent.announcementId)"
|
||||||
style="width:18%;height:100%;float:right;color: #409EFF;line-height: 250%;text-align: right;cursor: pointer;margin-right: 7%;box-sizing: border-box;padding-right: 3px;">
|
style="width:18%;height:100%;float:right;color: #409EFF;line-height: 250%;text-align: right;cursor: pointer;margin-right: 7%;box-sizing: border-box;padding-right: 3px;">
|
||||||
删除
|
删除
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
style="width:90%;height:7%;font-size:12px;float:left;margin-left:5%;line-height: 250%;text-align: center;background:#EBEFF1;color: #898989;font-size:14px ">
|
style="width:90%;height:7%;font-size:12px;float:left;margin-left:5%;line-height: 250%;text-align: center;color: #898989;font-size:14px ">
|
||||||
日期:{{ findGgInfoContent.announcementPublishTime }}
|
日期:{{ findGgInfoContent.announcementPublishTime }}
|
||||||
发布人:{{ findGgInfoContent.announcementPublisherName }}</div>
|
发布人:{{ findGgInfoContent.announcementPublisherName }}
|
||||||
<div style="width:100%;height:110%;float:left;line-height: 120%;text-align: left;overflow: auto;padding: 0px 8% 0px 10%;box-sizing: border-box;margin-top: 20px;">
|
</div>
|
||||||
|
<div
|
||||||
|
style="width:100%;height:110%;float:left;line-height: 120%;text-align: left;overflow: auto;padding: 0px 8% 0px 10%;box-sizing: border-box;margin-top: 20px;">
|
||||||
{{ findGgInfoContent.announcementContent }}
|
{{ findGgInfoContent.announcementContent }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -197,7 +209,7 @@
|
||||||
<div v-if="!findGgBoxShow">
|
<div v-if="!findGgBoxShow">
|
||||||
<el-timeline>
|
<el-timeline>
|
||||||
<el-timeline-item timestamp="" placement="top" v-for="(item, index) in ggList" :key="index">
|
<el-timeline-item timestamp="" placement="top" v-for="(item, index) in ggList" :key="index">
|
||||||
<el-row :gutter="12">
|
<el-row >
|
||||||
<el-card style="width:96%;" @click="findggInfo(item.announcementId)">
|
<el-card style="width:96%;" @click="findggInfo(item.announcementId)">
|
||||||
<h3 class="xfH3"
|
<h3 class="xfH3"
|
||||||
style="white-space: nowrap;text-overflow: ellipsis;-o-text-overflow: ellipsis; overflow: hidden;width:524px;cursor: pointer;height:100%;">
|
style="white-space: nowrap;text-overflow: ellipsis;-o-text-overflow: ellipsis; overflow: hidden;width:524px;cursor: pointer;height:100%;">
|
||||||
|
@ -214,19 +226,19 @@
|
||||||
</el-timeline-item>
|
</el-timeline-item>
|
||||||
</el-timeline>
|
</el-timeline>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</el-scrollbar>
|
||||||
<!-- 公告具体内容结束 -->
|
<!-- 公告具体内容结束 -->
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="!project.completed" style="height: 500px;margin: 0 30px 30px 30px;
|
<div v-if="project.completed===false" style="height: 500px;margin: 0 30px 30px 30px;
|
||||||
display: flex;flex-direction: row;justify-content: space-between">
|
display: flex;flex-direction: row;justify-content: space-between">
|
||||||
<div style="flex: 1;height: 100%;display: flex;flex-direction: column">
|
<div style="flex: 1;height: 100%;display: flex;flex-direction: column">
|
||||||
<p class="p-title" style="margin-left: 10px">工作项完成趋势</p>
|
<p class="p-title" style="margin-left: 10px">工作项完成趋势</p>
|
||||||
<div style="flex:1;margin-top: 30px;padding: 20px;
|
<div style="flex:1;margin-top: 30px;padding: 20px;
|
||||||
display: flex;flex-direction: column; justify-content: space-between;background-color: white; border-radius: 10px;align-items: stretch">
|
display: flex;flex-direction: column; justify-content: space-between;background-color: white; border-radius: 10px;align-items: stretch">
|
||||||
<TendencyChart :enable="!project.completed&&project.completed===false" style="flex: 1;"></TendencyChart>
|
<TendencyChart :enable="project.completed===false" style="flex: 1;"></TendencyChart>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -245,7 +257,8 @@
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="内容" prop="addggtextarea">
|
<el-form-item label="内容" prop="addggtextarea">
|
||||||
<el-input type="textarea" placeholder="请输入项目公告内容" v-model="messageForm.addggtextarea" maxlength="1000" show-word-limit
|
<el-input type="textarea" placeholder="请输入项目公告内容" v-model="messageForm.addggtextarea" maxlength="1000"
|
||||||
|
show-word-limit
|
||||||
:rows="12">
|
:rows="12">
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -695,7 +708,12 @@ export default {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
|
|
||||||
}
|
}
|
||||||
.xfH3:hover{color: #409eff;text-decoration: underline;}
|
|
||||||
|
.xfH3:hover {
|
||||||
|
color: #409eff;
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
.gg-info-txt {
|
.gg-info-txt {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -763,4 +781,11 @@ p.p-subtitle {
|
||||||
background-color: darkgray;
|
background-color: darkgray;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.el-scrollbar__wrap {
|
||||||
|
|
||||||
|
overflow-x: hidden !important;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
Loading…
Reference in New Issue