From 35bb01523032da9981cdb872965d64cecfe13a1e Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 9 Jun 2023 15:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/index/bubble.png            | Bin 0 -> 1751 bytes
 src/assets/images/index/title-icon-cljz.png   | Bin 0 -> 2268 bytes
 .../scss/modules/shequzhili/event-info.scss   |  40 +++++++++------
 .../shequzhili/event/cpts/event-detail.vue    |  25 +++++++--
 .../shequzhili/event/cpts/event-info.vue      |  48 ++++++++++++++++--
 5 files changed, 89 insertions(+), 24 deletions(-)
 create mode 100644 src/assets/images/index/bubble.png
 create mode 100644 src/assets/images/index/title-icon-cljz.png

diff --git a/src/assets/images/index/bubble.png b/src/assets/images/index/bubble.png
new file mode 100644
index 0000000000000000000000000000000000000000..0230352906d37ece0ab3901ea51c669095789b8d
GIT binary patch
literal 1751
zcmbVNYitx%6rNTJwoU6R6=D#FX^I*;JCA+N$O`T5Lf3T5X1m%267B8G-QA%(bEh-2
z-Px+K5}HUfhCgUQe?Y_pOfWuzh7cbZ^p`O)M58}w3JIDvF~lDdO-%64?C!9bB9TpI
z_s+fF`OZ1tJ?HF!^vI5`j)yu3g6K*P#WVPK8-CW`y&8Xi-*?8@XxE2!nFP`Kfb+Bv
zN8VmX5N*emY|hH1hD8afJ|LqB=(ANFqX}ZmR$B+sB(%s0SWvVmb@l8Q6sgEjYAl#y
zQ+f;*m7y5}j?Ro^rI|@dkg2Utl3Q#M6R6Mvq^*`TQ?#R$%PZowv&~SX3$Z4n)PUoV
z%%##~3>lCN`a-nC1tMfv@NuC4>ksvlJj)3T8(}y<&2l0e5`$r~{-LlpL(Yqt`1ZOl
z{1&B(mZggfQ>j#Z6~7M|1%?v@%)v7}Ph$jaRy7OQv}X1;7~;^B3`MsTq>&CIm_TJK
zO5sRrDX6+ftC@9~uwaZ0bcXY>PD(CNmOPwZHcGB@Sz=%bs!+2`jO9G6UPKl$i|7{A
z-tkQiu(YX^=VQfKRMm4~T8U|#MqQ8<(Pp-)LnZ@FR5m1-n8soDI@#!A%z(f`Mi!w`
z<D$}ykVzhAO+GfJXfmppk2e{>IIv)p;#nTwSBPeXEEf<tUgY`BY(!+)8Z?DuC0|_;
zDu`_GCMYf$8Cc-9U|ACL$WQ@JSW!U%GP+ivNKZyFhDyl5j&XGU=KW+WmNrmcDd7V%
zvty7<CSoB@2!&|g$GPFAQesjwEucv-8IMv}9G{}dA_z<fJS#yu7!Cw!!5;v$5SGI<
zABY5?9|nXl7i!qYkyLg{pkXinPy3yQf?E)j?wAL+$_**9(6)v_6&hx}g9bsNzA7nA
zlDU`>pkigNeEQLqxsR9LJk>0nd+v}mpEH<=ahj+`%G|=OTgl>(V&WRB)}4>SsT*Oq
z#VZ2IY04-iIn@YdimYubcYGf;`$`dF(*LN^8q7p_s{#x-P{4P0+b-}jujRq~J4IKO
zrcu)n3ePWR=?zZ&;*DOY;dyJ|!P@>__bEJ-e@?~+vbnk64xj7#id?t-k#BkeQ>(hW
zFJJtrW%;QMPY~klJCT=9F5PdZU+df7`&`C;wD`PzeeItcPyW6z>fd~N_DFg8*wO}K
z%{VdLH`l?oepb2G{a4Qi=PzFxy>RcQGsGLY7Z%6%{1H9ccJ#sYh1PWEiNhD~`ux|I
zo<9D}m#g)66WR0ObG>@YC#`GSr-<-@xr57Zjj!LfX1L?No+)B%d}m_M#?x(^7PGtK
zU-uJN`xkZ{dUgMgtA1$RyPMeC5~OFpJ^SH&qWUa2*tz)k^-KHg))(jJuN6)h3*Y_n
W@boM9ynf92>q#a?;_nZR@B0Tz^gcHL

literal 0
HcmV?d00001

diff --git a/src/assets/images/index/title-icon-cljz.png b/src/assets/images/index/title-icon-cljz.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2484902141ef5b58d6d59a494cfd452bb398fe1
GIT binary patch
literal 2268
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

literal 0
HcmV?d00001

diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss
index ab2b0cc79..922683d66 100644
--- a/src/assets/scss/modules/shequzhili/event-info.scss
+++ b/src/assets/scss/modules/shequzhili/event-info.scss
@@ -119,8 +119,10 @@
 .div-btn{
   margin-top:50px;
   display: flex;
-  justify-content: center;
-
+  justify-content: right;
+  position: absolute;
+  bottom: 20px;
+  width: calc(100% - 40px);
   .item_btn {
     font-size: 14px;
     padding: 8px 16px;
@@ -222,7 +224,6 @@
       padding-left: 15px;
 
       .line{
-        text-decoration:underline;
         color: #3e8ef7;
       }
       .line:hover{
@@ -339,9 +340,8 @@
         margin-left: 50px/2;
         padding: 0 0 0 30px/2;
         width: 680px/2;
-        border-left: 3px solid #0c81fe;
         padding-right: 10px;
-
+        margin-left: 10px;
         &::before {
             content: "";
             position: absolute;
@@ -353,7 +353,7 @@
             height: 20px/2;
             background-color: #333;
         }
-
+    
         .item {
             position: relative;
             z-index: 2;
@@ -361,6 +361,7 @@
             padding-bottom: 8px;
             font-size: 16px;
             font-family: PingFang SC;
+            border-left: 1px solid  #E6F0FF;;
             font-weight: 400;
             color: #333;
             line-height: 24px;
@@ -375,15 +376,23 @@
                 left: -11px;
                 width: 18px;
                 height: 18px;
-                background: #0c81fe;
-                border: 4px solid lighten(#0c81fe, 15);
+                background: #ffffff;
+                padding: 5px;
+                border: 1px solid #0056d6;
                 border-radius: 100%;
             }
 
             &.z-on {
-                &::before {
-                    background: #e08400;
-                    border-color: lighten(#e08400, 15);
+                &::after {
+                content: "";
+                display: block;
+                position: absolute;
+                top: -1px;
+                left: -7px;
+                width: 10px;
+                height: 10px;
+                background: #0056d6;
+                border-radius: 100%;
                 }
             }
 
@@ -401,15 +410,14 @@
 
             .name {
                 position: relative;
-                padding: 0 10px;
                 font-size: 12px;
                 font-family: PingFang SC;
                 font-weight: 500;
-                color: #fff;
                 line-height: 22px;
                 height: 22px;
-                border-radius: 10px 0 10px 0;
-                background-color: #0c81fe;
+                color: #0056d6;
+                // border-radius: 10px 0 10px 0;
+                // background-color: #0c81fe;
                 // background-color: #e08400;
             }
 
@@ -418,7 +426,7 @@
                 font-size: 12px;
                 font-family: PingFang SC;
                 font-weight: 500;
-                color: #7ca1d2;
+                color: rgba(0,0,0,0.45);
                 line-height: 25px;
             }
 
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index cb88506df..39b561599 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="">
-    <el-card :class="{'box-card':source==='visiual'}"
+    <el-card  style="min-height: calc(88vh - 50px); overflow: auto;position: relative;" :class="{'box-card':source==='visiual'}"
              v-if="showType==''">
-      <h3 v-if="source==='manage'">事件详情</h3>
+      <h3 v-if="source==='manage'"> <img src="../../../../../assets/images/index/title-icon-sqzl.png" width="30px" height="30px" alt=""> 事件详情</h3>
       <div class="m-detail-main">
         <div class="m-info">
           <div :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
@@ -79,7 +79,7 @@
                :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
             <span class="u-info-title-2">已转议题：</span>
             <div class="line"
-                 @click="handleToIssue">查看议题</div>
+                 @click="handleToIssue"><i class="el-icon-view"></i> 查看议题</div>
           </div>
           <div v-if="info.satisfactionName"
                :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
@@ -365,5 +365,24 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
+.m-info{
+  padding-left: 0px !important;
+}
+.m-info-prop{
+  margin: 25px 0 !important;
+  padding-left: 0px !important;
+  &::before {
+          content: "";
+          display: block;
+          position: absolute;
+          top: 9px;
+          left: 0;
+          width: 7px;
+          height: 7px;
+          background: none !important;
+          border-radius: 3px;
+          margin-right: 10px;
+      }
+}
 </style>
 
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index e73c17299..54ea579d3 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -41,6 +41,13 @@
       v-if="pageTypeCopy == 'dispose' || pageTypeCopy == 'info'"
       class="g-page"
     >
+      <!-- 面包屑放到这里-->
+      <div class="tabs" v-if="pageTypeCopy == 'info'">
+        <i class="el-icon-arrow-left"></i>
+        <el-button class="diy-button--white" style="height: 20px" @click="handleClose">
+          查看详情</el-button
+        >
+      </div>
       <div :class="['g-total', { 'g-left': projectProcess.length > 0 }]">
         <event-detail
           ref="ref_detail"
@@ -58,7 +65,7 @@
           v-if="!eventDetailData.operationId && pageTypeCopy == 'dispose'"
           class="process-form"
         >
-          <el-card :class="{ 'box-card': source === 'visiual' }">
+          <el-card   :class="{ 'box-card': source === 'visiual' }">
             <div
               :class="[
                 'process-title',
@@ -91,7 +98,7 @@
       <div v-if="projectProcess.length > 0" class="g-right">
         <el-card
           :class="{ 'box-card': source === 'visiual' }"
-          style="max-height: 90vh; overflow: auto"
+          style="min-height: calc(88vh - 50px); overflow: auto"
         >
           <div class="m-process">
             <div
@@ -100,7 +107,7 @@
                 { 'process-title-vis': source === 'visiual' },
               ]"
             >
-              处理进展
+            <img src="../../../../../assets/images/index/title-icon-cljz.png" width="30px" height="30px" alt=""> 处理进展
             </div>
             <div class="list">
               <div
@@ -544,8 +551,8 @@ export default {
         } else {
           this.$message.error(msg);
         }
-      }else if(this.formData.operationType == ''){
-        this.$message.error('请选择处理方式!')
+      } else if (this.formData.operationType == "") {
+        this.$message.error("请选择处理方式!");
       }
     },
 
@@ -683,4 +690,35 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
+.tabs {
+  position: absolute;
+  margin-left: 30px;
+  height: 50px;
+  line-height: 50px;
+  .diy-button--white {
+    border: none !important;
+    color: rgba(0,0,0,0.65) !important;
+    height: 30px !important;
+    padding: 0 12px!important;
+    margin-left: 10px;
+  }
+}
+.list{
+  &>:first-child{//
+    border: none !important;
+          .name{
+            background: url('../../../../../assets/images/index/bubble.png') no-repeat;
+            color: #fff !important;
+            padding: 0px 10px 3px 13px!important;
+            background-size: 100% 100%;
+            border: none !important;
+          }
+        }
+}
+.g-left {
+  margin-top: 40px;
+}
+.g-right {
+  margin-top: 40px;
+}
 </style>