From 5234dda354cb3f767f58f671a977e03e419a4041 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 9 Jun 2023 18:25:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=9B=BE=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/shequzhili/event-info.scss   | 36 ++++++++++++--
 .../scss/modules/shequzhili/project-info.scss |  2 +-
 .../shequzhili/event/cpts/event-detail.vue    |  2 +-
 .../shequzhili/event/cpts/event-info.vue      | 10 ++--
 .../shequzhili/issue/cpts/issue-detail.vue    | 49 ++++++++++++++-----
 src/views/modules/visual/cpts/line-chart.vue  | 10 +++-
 6 files changed, 83 insertions(+), 26 deletions(-)

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 == ''"
     >
-      <h3 v-if="source === 'manage'">
+      <h3 v-if="source === 'manage'" class="h3-title">
         <img
           src="../../../../../assets/images/index/title-icon-sqzl.png"
           width="30px"
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index 3b78b3c7c..c04ef21e7 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -2,7 +2,7 @@
   <div class="">
     <div v-if="pageTypeCopy == 'add'">
       <el-card>
-        <h3>新增事件</h3>
+        <h3 class="h3-title"><img src="../../../../../assets/images/index/title-icon-zntb.png" width="30px" height="30px" alt=""> 新增事件</h3>
         <event-add
           ref="ref_add"
           @changeName="changeName"
@@ -14,7 +14,7 @@
 
       <div class="process-form">
         <el-card>
-          <h3>处理</h3>
+          <h3 class="h3-title"><img src="../../../../../assets/images/index/title-icon-chuli.png" width="30px" height="30px" alt=""> 处理</h3>
           <process-form
             ref="ref_processinfo_add"
             :demandUserId="demandUserId"
@@ -30,7 +30,7 @@
               type="primary"
               size="small"
               @click="handleComfirm"
-              >确定</el-button
+              >保存</el-button
             >
           </div>
         </el-card>
@@ -76,7 +76,7 @@
                 { 'process-title-vis': source === 'visiual' },
               ]"
             >
-              处理
+            <img src="../../../../../assets/images/index/title-icon-chuli.png" width="30px" height="30px" alt=""> 处理 
             </div>
             <process-form
               ref="ref_processinfo_dispose"
@@ -92,7 +92,7 @@
                 type="primary"
                 size="small"
                 @click="handleComfirm"
-                >确定</el-button
+                >保存</el-button
               >
             </div>
           </el-card>
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 @@
   <div class="">
     <el-card
       :class="{ 'box-card': source === 'visiual' }"
+      :style="containerStyle"
       v-if="showType == ''"
     >
       <h3 v-if="source === 'manage'">
@@ -64,17 +65,19 @@
               class="line"
               @click="handleToTopic"
             >
-            <i class="el-icon-view"></i> 查看话题
+              <i class="el-icon-view"></i> 查看话题
             </div>
             <div
               v-else-if="issueInfo.sourceType === 'ic_event'"
               class="line"
               @click="handleToEvent"
             >
-            <i class="el-icon-view"></i> 查看事件
+              <i class="el-icon-view"></i> 查看事件
             </div>
             <!-- <div v-else>--</div> -->
-            <div v-else class="line" @click="handleToTopic"><i class="el-icon-view"></i> 查看话题>--</div>
+            <div v-else class="line" @click="handleToTopic">
+              <i class="el-icon-view"></i> 查看话题>--
+            </div>
           </div>
 
           <div
@@ -84,7 +87,9 @@
             ]"
           >
             <span class="u-info-title-2">意见和建议：</span>
-            <div class="line" @click="handleToSuggest"><i class="el-icon-view"></i> 查看全部</div>
+            <div class="line" @click="handleToSuggest">
+              <i class="el-icon-view"></i> 查看全部
+            </div>
           </div>
 
           <div
@@ -134,8 +139,8 @@
                 >
               </div>
               <div slot="reference">
-                <el-button v-if="source === 'manage'" type="text" size="small" 
-                  > <i class="el-icon-edit"></i> 更改</el-button
+                <el-button v-if="source === 'manage'" type="text" size="small">
+                  <i class="el-icon-edit"></i> 更改</el-button
                 >
 
                 <div v-else class="one-btn">更改</div>
@@ -205,8 +210,8 @@
                 >
               </div>
               <div slot="reference">
-                <el-button v-if="source === 'manage'" size="small" type="text"
-                  > <i class="el-icon-edit"></i>更改</el-button
+                <el-button v-if="source === 'manage'" size="small" type="text">
+                  <i class="el-icon-edit"></i>更改</el-button
                 >
 
                 <div v-else class="one-btn">更改</div>
@@ -249,9 +254,17 @@
                 }}
               </div>
             </div>
-            <div></div>
           </div>
-
+          <div class="stat-be">
+            <div class="stat-item">
+              <img src="../../../../../assets/images/index/zhichi.png" alt="" />
+              <span>支持</span> {{ issueTrend.supportAmount }}
+            </div>
+            <div class="stat-item">
+              <img src="../../../../../assets/images/index/fandui.png" alt="" />
+              <span>反对</span> {{ issueTrend.oppositionAmount }}
+            </div>
+          </div>
           <div v-if="issueChartData.length > 0" class="m-chart">
             <line-chart :list="issueChartData" />
           </div>
@@ -262,7 +275,7 @@
 1、状态=完成    (已评价)||(没评价&&不是本人)
 
 2、状态=未完成 （有操作id） -->
-      <div v-if="type === 'info'" class="div-btn">
+      <div v-if="type === 'info'" class="div-btn-info">
         <el-button size="small" @click="handleCloseEvent">关闭</el-button>
       </div>
     </el-card>
@@ -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 @@
 <template>
   <div class="m-chart">
-    <div :id="id" style="width: 400px; height: 200px"></div>
+    <div :id="id" style="width: 400px; height: 230px"></div>
   </div>
 </template>
 
@@ -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: {