diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss index 0ab683a6d..5f5f5eb75 100644 --- a/src/assets/scss/modules/shequzhili/event-info.scss +++ b/src/assets/scss/modules/shequzhili/event-info.scss @@ -1,11 +1,13 @@ @import "../../c/config"; @import "../../c/function"; - +.h3-title{ + display: flex; + align-items: center; +} .g-add{ - - .g-add-page{ display: flex; + .g-left { box-sizing: border-box; width:40%; @@ -117,7 +119,7 @@ } .div-btn{ - margin-top:50px; + margin-top:38px; display: flex; justify-content: right; .item_btn { @@ -179,6 +181,8 @@ margin-top:20px; .process-title { + display: flex; + align-items: center; margin-bottom: 25px; margin-left: -5px; font-size: 16px; @@ -329,6 +333,26 @@ } } } + .stat-be{ + display: flex; + justify-content: space-between; + font-size: 16px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: rgba(0,0,0,0.85); + .stat-item{ + width: 50%; + display: flex; + align-items: center; + justify-content: center; + span{ + color: rgba(0,0,0,0.45); + font-size: 12px; + font-weight: 300; + margin: 0 10px; + } + } + } } .m-process { @@ -344,6 +368,8 @@ font-weight: bold; color: #333; line-height: 18px; + display: flex; + align-items: center; } .process-title-vis{ @@ -494,7 +520,7 @@ } .m-chart { - min-height: 200px; + min-height: 220px; } .div-satisfy{ diff --git a/src/assets/scss/modules/shequzhili/project-info.scss b/src/assets/scss/modules/shequzhili/project-info.scss index d55deb94c..9c9a026e6 100644 --- a/src/assets/scss/modules/shequzhili/project-info.scss +++ b/src/assets/scss/modules/shequzhili/project-info.scss @@ -405,7 +405,7 @@ } .m-chart { - min-height: 200px; + min-height: 220px; } .box-card{ diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index c074cd4cb..d3c841b56 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -5,7 +5,7 @@ :class="{ 'box-card': source === 'visiual' }" v-if="showType == ''" > -

+

-

新增事件

+

新增事件

-

处理

+

处理

确定保存
@@ -76,7 +76,7 @@ { 'process-title-vis': source === 'visiual' }, ]" > - 处理 + 处理 确定保存 diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue index 466897617..9ce0976f6 100644 --- a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue +++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue @@ -2,6 +2,7 @@

@@ -64,17 +65,19 @@ class="line" @click="handleToTopic" > - 查看话题 + 查看话题

- 查看事件 + 查看事件
-
查看话题>--
+
+ 查看话题>-- +
意见和建议: -
查看全部
+
+ 查看全部 +
- 更改 + 更改
更改
@@ -205,8 +210,8 @@ >
- 更改 + 更改
更改
@@ -249,9 +254,17 @@ }}
-
- +
+
+ + 支持 {{ issueTrend.supportAmount }} +
+
+ + 反对 {{ issueTrend.oppositionAmount }} +
+
@@ -262,7 +275,7 @@ 1、状态=完成 (已评价)||(没评价&&不是本人) 2、状态=未完成 (有操作id) --> -
+
关闭
@@ -333,7 +346,19 @@ export default { data: iniData, - computed: {}, + computed: { + containerStyle() { + if (this.type === "info") { + return { + minHeight: "calc(88vh - 50px)", + overflow: "auto", + position: "relative", + }; + } else { + return {}; + } + }, + }, watch: { selectedCateData(val) { diff --git a/src/views/modules/visual/cpts/line-chart.vue b/src/views/modules/visual/cpts/line-chart.vue index a94449882..00b7c5052 100644 --- a/src/views/modules/visual/cpts/line-chart.vue +++ b/src/views/modules/visual/cpts/line-chart.vue @@ -1,6 +1,6 @@ @@ -85,13 +85,19 @@ export default { tooltip: { trigger: "axis", }, + color:['#1664d9','#fab616'], legend: { data: ["支持", "反对"], + top:'92%', + icon: 'rect', + itemWidth: 20, + itemHeight: 5, + itemGap: 150, }, grid: { left: "3%", right: "4%", - bottom: "3%", + bottom: "10%", containLabel: true, }, toolbox: {