From f787a4982d694439bd579640cdcf25142d8b89c9 Mon Sep 17 00:00:00 2001
From: dong_bo0602 <358256383@qq.com>
Date: Thu, 15 Apr 2021 18:24:17 +0800
Subject: [PATCH] 0415

---
 .../static/assets/web/images/logout-bg.png    | Bin 1910 -> 1926 bytes
 .../resources/static/route/web/public.html    |   1 +
 src/main/resources/templates/index.html       |  42 +++++++++---------
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/static/assets/web/images/logout-bg.png b/src/main/resources/static/assets/web/images/logout-bg.png
index 61737ed6636ec5d4e0bdc61a425b9ed7a09ea05b..e7f591d06171c3d3361ecd624ebaecb983ecdcad 100644
GIT binary patch
delta 1256
zcmeyy*T%oWjVZ?5)Xl)j)x^Nk#l_Ij(ACMp)X3Pv%)r3Z%+<}<$k9Yep(3}y*VoD=
zKe;qFHLt|e#a0O@qL-4HVg=P}h)eI}MN9@z3yfWHDN<4>E(uCavr55ffw3Ddy_5Br
zo$5aZhRkPRVE*Ol;uunK>&a|iAK^fO<I6KXFnKMS;o#_?FO{UUby~ho2m507kKHWm
zrIZYhahHGb@G%kk`e14Tlj9x<XC(zuRjD4eQ%Cu|yt*fLXr6Lyy7E8g{-vN>mzL_5
z-1qy${qo(XZ-2|5y{)#k&i>@<A3Q0CU4uO=fTydzK{BP0r|^u;2c~yNSR~k!6GYA&
zEtxh)#&@ofYD9rt21~kw=8a9~%KkN)KQMg3xb6t&w+bP}Eo@twgbO=*)c#5CU~LP3
zd-m+rD-lt1=5Azee{o`^N{8x2we5eM=A4%EPkt?Wrtk`9n}ccYoY3y#vM##}v&rY*
zUi)SL{GfATaQ!Wx$Fpyx8qKbr^z>oL1;$;$4r{EqOC}$`%((67yN4@RM)aL#seK@^
zblJxnc?<UJiSPVSuuZ~zrB>KnRko9F&&Az7tam*s(U?PL34b+zmZp7uo~@jpxbXhC
zBb%mb)Xtmb)vt5o`C^VcY^8zUmTQ%I-8Ze8v3#D`rS)4UoGw-TQ!g=Z4$s|V+<*L&
zCazC^+&-x}B;WzxM}tENsxz`{BNMm1=Dk)>zO{Ysxd->RK3b<U`D$?D!-ikUtBo!&
zmrZ`M*~~ydZ;4^$?^P-sPXkt+unZJ7(bavQJ=H&Z!nUV|f8J{Uzsqam)p0tr`_!Aw
z<@bB6+GeYWc{@pG?^)dTC9?By{mf~mT8e+48rv(JQPZ@Y>~(DC#<?<=MA-yZKRc!s
zv7xmm`I<@U-b@+oG=6bOj{-sNbEXp#jJeMlO?dFurp=f~#lrYYre|4n!okmMpFY`K
zn_;)Uk>!75`_$<dE7=79G&|2KwlQnwDBF~9F2GF6<%5O4_j{g_>2k^Z`^EbG-0CZA
zWKs|QdDOW&ZIz0+jaR$Zo~&z|ra$qo{IV&_^yp<)G1Y6kS7a=4P^x45(mZ)mTd{p4
z-}xW5GCO$Q3bhySUS(q;_?|&o=#{Ku_f<iGJw^GmTkh=@l)1gIzx~gp&ef$-Dw4Zv
zQ?}aj-<u%zY*7qz9Os<Zp<7xac8EX9yP)G(uVH>!@b)UB!yc0S>$Yuf*0$n(%ATVA
zns2*u)Xht!pTal1IxDm2eWGrZUpC_$<$BS1ag)BvcXnU)J}s^!yCLkQ;{KG??D8c_
z+vJkc7t4xxUz;>N#r>f0C-J>Y7VTwOzH*I{;?bo!`%lK-tJh~edXN2hvY_<p_R!zl
z>n82LV=r3Ib>t@J^c8!IGFcz3`pC)Gu+CTHH^&?CTE*O^>){7}%Eqv4O-Nzpc8~9T
zbW!ah`z1XKyT_HgqI81hH7!-CDE8cvE1tPxVTF`;$kTHh68LvG{Nvx6BXYkzD*t5s
z`m@?<;fvPIJ8AyN<C+EcKaqZMy+4m?#asW2yjNF0c{FC#Te;vpUb*ptf5j6Ryyu!0
Th0gVBU;qM7S3j3^P6<r_TPPtR

delta 1240
zcmZqU|Hik$jVZ>`%)-*p$=Sft#mU&v(ACMw(8Scu#N5Qt$lS@o#LQSpp(3}y*VoD=
zKe;qFHLt|e#a0O@qL-4HVg=P}h)eI}MN9@z3!GeWDN<4>E(uCavr55ffs-39y_5Br
zo$BqKzojuSFu(G2aSW-r^<;Lehe)8v@$-4!OV)~hS((@PWucgDN?2A}+Sd!o@@g-#
zA9#E4f0cT+Sj2HY|K7I7Np`LrKXbhTMV8zUcfG{!d2Cjc%GGc7#^t9<(~r-*TRL}V
z@dNfv*7tV)w@rVyxA@)8dDrcoOx(ALh&0t~U`=VP_u0Vn<EW{y0*76bd4hlq)8B+M
zXMC^eZ@Q-G-^9x9z-qx%*2rqO?X$EE!`TI#Jhy!dI4zj@jw)XA_!C<oS8`PM$JOsU
zSf)2wZD^mAZ2Lgx#TC076Oz_4=J%NUv70-(3mu)bBfNb_d6f?D5v3h6JdIkj>{kob
zYHa`2KX3Xo=lUwe9SnYx_P*h=*lXBYH%r(i)2l!#gYoytdDnRP@_m-B@8ozn_0i6a
zt0Qu!Wz>I-eYtvLd%Q&T3~~Oq3jK2u{SWN(U3pPlH!f-KFCCV%3g;h4?cUh?`%h7j
zWWG-O7uNu{bDNDWmj9hlXD8TY_SIz4=Cw-Ig-h7ZfBwjEaL)nxdV%g5b?N<6a?XCc
z{QIWUuT3mTo*6qt9zI-H!2e!&@g|=#h2#FY7u{Z3vG<-xTgl7)GV}h_hNPcgf<9i@
zvB{wG!v{&uy}#pUf8*ir(>(t{>jUEt55M0>H=lo|YO<(uhtLm|ZyWqCTD+CC(^`M6
zUMAG3N<re0c*{l06RtPUT9|LEza!2SIFb9vqze&GN-wOASJIhpyXUHF)AkMRn`2Zg
zx^3q?R5~~_&huW+nOj2NHr#h@y1eI!-t14US9HC%S5!7#pW!IZDVNUwIj!V?YLoru
z_WO_e=jsXmnZ~}BQJgob*+$p4Y~lm=HxKPTzEat}@mSqAgM6F9t3Df_H2vPbe%XTh
zZ69{LW#ZSC+A8AD{6n>{s(q`eM$=Js<prUSTEepbWo0b+;8L^qh}^pCkE*Ja_DO&7
zTCuJCxYSa%mb9uFE2m!A{d`$}jIsIUTMpeWS<z+7F7GusXm$N+!vdD7NawR>c6#bF
z9<Y9PRp`v_tGkU3mH+?h6t!3|rhG&7dgnEHy<PR^7kIrEIib2W>6+&?-Cygn-7ME?
z7Vy{<Pl$N;dSa8$()WQZ((T7IEEwilDfG-Qj8`nX@<ROMtc+}yH>|Q|*KRX=aWlR8
zbTMGV$$+13S(X1orQ1H57Hlvus8-dTy*&TMCqagFmv%d5J$zXsW&P0QVboKBj?B-;
z1nhhj!uJH7s}JY6&t$2%N$r}K$N4S(OQt<6R*cRU+FLdM%A<>37umh0C7iYLw5>Q;
z{8jctI-kow!QAOxCL!)Ny@h_-g4a|d*!w0|1#}nR{U~##%Hx%zZk!>n`m5`ozwGlq
z6=<{0=t1vy(IxdF@43}a9zAsMQsADuuh*2mTF=1Dz+l{OSbl;}Zvz7mc)I$ztaD0e
F0sw#7D?9)I

diff --git a/src/main/resources/static/route/web/public.html b/src/main/resources/static/route/web/public.html
index 16aa0f2..74d4e73 100644
--- a/src/main/resources/static/route/web/public.html
+++ b/src/main/resources/static/route/web/public.html
@@ -357,6 +357,7 @@
             // 获取右侧列表
             getMainList: function (id) {
                 var self = this;
+                self.mainList = []
                 // var loadLayerIndex;
                 top.restAjax.get(top.restAjax.path('api/indexlib/listpageweb/{indexLibParentId}', [id]), self.page, null, function(code, data) {
                     self.mainList = data.rows
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index ff892b1..02dddfb 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -121,8 +121,8 @@
         </div>
         <div class="news-box">
             <div class="box-title">
-                <span>信息公开</span>
-                <a href="route/web/list.html?title=信息公开&id=e1b31bdd-4537-4c97-ae59-d2a922a61cbd">更多+</a>
+                <span>通知公告</span>
+                <a href="route/web/list.html?title=通知公告&id=e1b31bdd-4537-4c97-ae59-d2a922a61cbd">更多+</a>
             </div>
             <div class="news-list">
                 <ul v-cloak>
@@ -137,23 +137,12 @@
     <div class="slide-news">
         <div class="slide">
             <div class="bd">
-                <ul>
-                    <li>
-                        <a href="javascript: void(0);">
-                            <img src="assets/web/images/slide.png" alt="">
-                            <div class="slide-text">公安厅党委委员、副厅长（正厅级）赵云辉接受纪律审查和监察调查</div>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="javascript: void(0);">
-                            <img src="assets/web/images/slide.png" alt="">
-                            <div class="slide-text">公安厅党委委员、副厅长（正厅级）赵云辉接受纪律审查和监察调查</div>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="javascript: void(0);">
-                            <img src="assets/web/images/slide.png" alt="">
-                            <div class="slide-text">公安厅党委委员、副厅长（正厅级）赵云辉接受纪律审查和监察调查</div>
+                <ul v-cloak>
+                    <li v-for="banner in bannerList">
+                        <a :href="'route/web/detail.html?contentId=' + banner.contentId">
+                            <img :src="'route/file/download/true/' + banner.coverPhotos" alt="" v-if="banner.coverPhotos">
+                            <img src="assets/web/images/slide.png" alt="" v-else>
+                            <div class="slide-text">{{banner.subTitle}}</div>
                         </a>
                     </li>
                 </ul>
@@ -207,7 +196,8 @@
             dynamicList: [],
             infoPublic: [],
             exposureList: [],
-            exposureFirst: {}
+            exposureFirst: {},
+            bannerList: []
         },
         methods: {
             // 获取顶部导航
@@ -294,7 +284,14 @@
                     rows: 5,
                     categoryId: '7a9b2dcb-8d24-4d05-8f57-2ebbd63a8d90'
                 }, null, function(code, data) {
-                    self.infoPublic = data.rows
+                    for (let i = 0; i < data.rows.length; i++) {
+                        data.rows[i].coverPhotos = data.rows[i].coverPhotos.split(',')[0]
+                    }
+                    console.log(data.rows)
+                    self.bannerList = data.rows
+                    self.$nextTick(function () {
+                        jQuery(".slide").slide({mainCell:".bd ul",effect:"left",autoPlay:true,delayTime:500});
+                    })
                 }, function(code, data) {
                     layer.msg(data.msg);
                 }, function() {
@@ -326,7 +323,8 @@
             this.getLatestDynamic()
             this.getInfoPublic()
             this.getExposure()
-            jQuery(".slide").slide({mainCell:".bd ul",effect:"left",autoPlay:true,delayTime:700});
+            this.getBanner()
+
         }
     })
 </script>