From 4aef24c7348fe25e2a84023a0e10690f50fced44 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Thu, 7 Jul 2022 13:34:29 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E9=97=A8=E6=88=B7=EF=BC=9A=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8+=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85+=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/location.js        |    1 +
 front/src/api/home.js                         |   20 +
 front/src/assets/home/rhfw_square.png         |  Bin 0 -> 12809 bytes
 front/src/router/index.js                     |   18 +
 .../Application/ApplicationCommonProblem.vue  |   13 +-
 front/src/views/home/DetailsPageconetent.vue  | 2671 +++++++----------
 front/src/views/home/components/header.vue    |    9 +
 .../home/components/searchResultList.vue      | 1503 +++++-----
 front/src/views/home/constantData/showData.js |   68 +
 front/src/views/home/integrationServices.vue  |  317 ++
 .../views/home/integrationServicesDetails.vue |  452 +++
 .../personalCenter/components/Collection.vue  |  722 +++--
 12 files changed, 3149 insertions(+), 2645 deletions(-)
 create mode 100644 front/src/assets/home/rhfw_square.png
 create mode 100644 front/src/views/home/constantData/showData.js
 create mode 100644 front/src/views/home/integrationServices.vue
 create mode 100644 front/src/views/home/integrationServicesDetails.vue

diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 8329cebe..895db563 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -36,6 +36,7 @@ if (newLocation === 'qingdao') {
     { name: '区市站点', key: 'mapTest' },
     // { name: '后台管理', key: 'houtaiguanli' },
     { name: '赋能案例', key: 'assignCase' },
+    { name: '融合服务', key: 'integrationServices' },
   ]
   footerDataList.footerList = {
     company: {
diff --git a/front/src/api/home.js b/front/src/api/home.js
index 2f536134..f5e9d1fa 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -329,3 +329,23 @@ export function getApplyCameraList(id) {
     method: 'get',
   })
 }
+
+// 融合服务--start
+// 融合服务--列表
+export function getIntegrationServicesList(params) {
+  return request({
+    url: '/fuse/page',
+    method: 'get',
+    params
+  })
+}
+
+// 融合服务--详情
+export function getIntegrationDetail(id) {
+  return request({
+    url: '/fuse/' + id,
+    method: 'get',
+  })
+}
+
+// 融合服务--end
diff --git a/front/src/assets/home/rhfw_square.png b/front/src/assets/home/rhfw_square.png
new file mode 100644
index 0000000000000000000000000000000000000000..c257bb0afa304e51ecf480fc66aa1fee5ae8bf3a
GIT binary patch
literal 12809
zcmV+kGWN}hP)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz001BWNkl<Zc%1FM
zS+8ZumEZSU5qmh(opY|t8dxNYQ<H4D)h$`*h7AaA7_cP6dhnAU{o*g-SHIW~{sabO
zLk4U?umM4UMZjtaO<K(+8)B2JVik+5tjc+~^O^SE5z7xN;+%8GyqRV<L|6;Rs?2-O
zuy?G8HT>6qtu252kB*frvhqJU`7;C@@XnT_3s4o%MR;%=QC)ejEdTBt+!{K(K)-~e
zR(U#6`@O7ukEHi;!QbVa&rk0cfvuh}Dun$`IcgQ}V6zg&0h(yvCl21~J4y%pt#Z)m
zna|y-g!Mvr)+jU8GuH@EJK<JOC<XR9WiRM*eFWa?Io7-o(k;wXx!**(yvhPzV5<;X
zg~PbA`~pSkg)XWs>Z?Rx+A2@SN?i!sJyTM+<SoaIqCgZuL=f!XzcERR7J$mx^^6K(
z9$_AJv7c1o@hsv5!pa6(m2rS+Q07S)=Sd+@r$t>WWT}uOt->TILEu{9xal4Dn|R_i
z4v0WJXCaE(+r@TQStSMU1Sd-6!8x%XULds>cKUW_RRO!RSAU5BYo*XH?3xZ*C0_Oh
zg(gC+c7qCxJGD)6YEh%I_^k8Rd$WY?LU`8N?mthaQF%Crp@+(!{FJEh#oWH3cEXJk
zemv>UtZh)3UvN`J7thz!d7{{{{9wo71a_x->3iovc|5lFM4;94Plpq`xi%`!!A?(@
z2UxFc#~oj?TNL|!8zG48><E<3j!x89C^U%(jJ)9F@=d0gQW}NgqD2+>8zawyCbHk1
zJ#AjVbG~IMW>-2IOL=gZu42``UUczlO6e7{`1ffMV7(GXrEuKBB-qbh=c*jAS;0o_
zcsW<PX#Oh-%!ANe!5#~?YbQY&Ut)s`f!noX;NfMb%)7I{|MsBZMH~5I9+&>`#CO>b
z+jB0<RbFtHEb3|L7s9oH{mBb`nF!}AV)1*i;NZz5(ndQiB6efWUG18p!f|KcGmG~A
zh?$0~DmE%Soku1?iLX$g6DUO(o-$biyjME{%BL6EB%o6}Vds5IQF%~=7_P931a6Lm
z5TWqU_wZ<Zx!F>(Nj(2Ws!%w%({miP%0a8Vm_g6ObOzHaoL~{ysDvj|WfGLNLd;AF
z)DGIqqK*~WD1?C*B*5VX>(MDZX_Nz}RHt^b2<&#sXY<R=WaWg7LWrsyM4?^T0Lh13
z-HEt#QG(gRSIHvEx%eZQcHl*sw5FiLMmbDxUJau!ljk#~(`8gu3TTd~t|(4mb_Itz
zkIFoP$VvYY)yx=Ne$AD@&_N}RDk_gwY**pMoXb@<kpfT0%Af>9uA~qJ!YdR$Dq*8G
zr`~jzzVuv)3T@PdsTv2x>(Z%TRb~;^3t@7eabJ-_V9g7a7Y>77Nr|h{L>NbiqMWwM
z#p~EvfN`sgTPVD;UdbyruV8*BU=IE~Ic`Bw!o}hLr7|dlL1DqclbQLVH<9CDJHNdo
z4}s*Luw8y|MRT|+UZ6<-KdnpW-O}s7j)VyNbG?#Dh-$CDNajJ=pDWYw`bnc;zHFy*
z{MYZ-yfgHy6~fS4uHerLb1sltgq`x$uXn(}36B~*k$ehva&`(~JN>E7`F>$(`u9&Q
zVBv%}%AFT}`U>~!Qq&Z}@-3_1I4Fdzp3nqkw|UL05lbXX5C7NWmcu3{UtnSH>zFLA
zb~^y<wn~H2_rkT(EWkmh+^)o;J4uV)DXWQk&dHv2N_)=A7nkka^JKFYMztUU2Q$Nt
zE|qkLQQ^G}M=8R`hvCGphov3go;SbLU2zd>Z)iXp;n^(m>oK%J8Kz7hpcA<;Vmd9I
zD#uqaL0*KBhjA1tXFj2D(03MP?RMtRl(g|ywCsR22jYZh?OD@UR36%RwNy+5w)?_i
zV_4Q^PZ)QXhrOuf83DzREQ_Qh;ZDi-qARe*s}}^eduC{lI_2TS7NB%y2AXJ}+b?V}
zh9ZowpcF3_F6Ui*k!%)rDxS2Fd4zpcYHwEHMj>o@A*O8ndC)Uv36V3-JWFxZDDkQ*
zkrr*M777pZSL~*&W)Z`7o=+9TF3w@jej1eH);_$`%OkSVL*EO-(#%5_paVvwuwDsG
zRQ4LBjY@|wjUXufLRc$=Y1B)j$<0zI1n6LVg~+KCVJ^zON>G6pt+L-)4x=dtI_;8z
z+V2AwB!;yY8VqiDl_>D}L8Np-zl2d`S^nv3|KoQ{{)1bd|L)(+0O+FG(NVSB8Tq8-
zi|o=#x@Z~JN{ggAg%>lWV+p^PZuvQofYJ=R18r+&Y&}JLhvy`lg87?S<du$Ozq4$9
z91ULoESdsJ5w531TSckeN!X?o;dWj#;BgDxsXKP12YHQ1Bqn_7xK$44=bNi%lgOw0
zreRyKWzLe5TjitzhJ|pwe>UD*FNN)%Ff8EdRN0;D3G`HfX|Tn-(Q}9_zr)FLZO5H5
z?#zj9m1n<4F>I-F^2)F|s4|K6ddss?E~JKo)s97Uwd#{Ly!n}NP<jqF{n^hhjxJc#
zS4kJ)s5w7g|BGjVzjzkN=)A}>{9LK$EJW3Q{%B&?B55IS^v&nY0_@H&zQ`^r*K5yz
ze5>Fee-@c*x@j-WS3>DVq3O)tj|#y%%RRD!_giHjeI+_zKE&~)jVJPusPHsvGrfQH
zvpR($1q3}gzcN%*sX%oVlLgQ#gzdhq*wIX135^TOI>l<3tZK(qG2bxmbdfmj^pY*d
zAQ4u8#+;33sXe?q@@&__uZ|-hY<TvX$cx4t`|KR2F;6F|z%ujW&P>j=jN-P+KfG1(
z-oWwSe>OW4r4<RK=sV%yHL#h(sC4sa!3>=1*b6(>SBtX1%B4MT+P=y=7CKl_1b}xi
z@D}}4Vj=MtN0HiF{&3JJ(~trJFWemoWePE$&ut^z><jO%dDbi8s4*<d3*7EI`UO0n
z#|tZzokAB3yBZeu*}W7g^*nrQ<hfM~JqL%Ulsbt@KNzO<Dp_6GsBoMU$y8=|zxE8A
z@X@TJ1B%k~dQgKZZ8TF-7goQx6kaF!3Q<aT(st*=^*cMB|NQ-u|LMay_s1)_jV%8c
z6`ElGxYHL3@3>Z5UApO%wNfY?>@^lZte3D^JJw2rQ!c6if}Kv6@`i|A=YRX@lu==3
z?6e#QLzNdH`^voz@;#>C%{V`@I|`<l|76{>;e}7KLL9tSJtS9LN(a6Y_AasQSuCos
z7~ij~^{|8@3WrVPfB&@MsDb1263yhOw@Tsm(9x+yO5={jLI$9}yga5|B3bktxBHHl
zP2{7aKy$%0YP!ym7n&#>hsbd_zX(^0EOMUd%5K~!gqx)>U-5%ayOXau{hdFWbPT;P
zOYbR;nycYaS@veiMr{$scz*fm$Y0u~u&{?PNjvrCz@ciake}{F28Bg8s|=PbJr8dU
z99y-)67!(UL)u8mr!;YCnrdfIibY`Nq_5SE-!FyFXOYh*XH9|=xKRm(2rpZ+^IN45
z)k?PQ%4>r{p|+cSWC4nLf#+Sy_R~EC&JTRD%vDc7?Zs7{d6rqH%(~@HybAbJIy)W5
zt#WV8>g9qJq8e4!Dq*7%cISEm9`gcshmN;Kj*U_liRft)TRZb>s%GB}j)z`hCoo_k
zZ@+-At$A+Mj?bon=gq~tsZofXGVqpE9tT~NT)n6j^;Z07&Z~AxVc_g^mIC`7>|Nq(
z9D-jlQN^p5^Q_z%IezD+(D%ZhJ_@{;T>OPXvWvjGYmQk^jyrfUS4M?ZA9I3NdCMul
zBCWe4$FMX?&li)JXhdgAyD@@#MRLX^XNzY}%m+15Sucg}Rs~Pzk&h>VSuh{<V5StJ
zOws~&YS0YHTn6B7?dX7C%>sdyjR_pA_!SiXXszVSeaHXsWOnI#t|BFGq>$rQxz;Oq
zZ_DxLPa~JbTOyXBix@}i`P7`8I5Q`K<&MuA<?EZC8w266wfc*9vPfR@0<12?T$Q1S
zfqTJruv_3}CryUKPB~)4xp#(+zdQ_P^OHZ?MtIUBepZsb&Z0pu$Gu$$<9O0PNV*qI
z|M+;;u@~H>F>F||3BnsH<Z!P1@NvhVKZQrf=i5BNOvcTTL!%{jlVmm~!NSYZ2_ae?
z<Z((0l|+09<~!!m@}%M%LO~ZTD!Sft-0cfJFBCrVc&hBSN-v(ZsM)*^ywId_K+g%0
zB|^JiI9iQ7I%U!tg-@n|xBHGtKnj?yIG0L<o0XX|#7Y1^8iz~M1HTfOE0-uF-^l3?
z6X5omqhAU?eSZFzt=B@|Tf+DFIO0X<RH=()QkSEeynC`Q6R{H*6?&!BN?ajKBE+D$
z!ftpLl-dh#4;<I~=8QXqJAKDa4Ns<#$8*D+`d$_ZW#3!U*+%6cKpEh$i|n?R8%2d1
zb>yOCz3;@}bzK(6x(F@izkZd;fMRIxdCZw__B{yvY#N9ttzN;0<ei#%W2*~)+$j4q
zT~H#kl-_C@8x_2q!E~CkY%$wfu#C!74KV!5mSfs!IzblEl+Jv>VPgTrMr{?q&Iz+c
zRxRA<J4OYl8er$dcvS;0e6a4h)hb_1A}?D-qVavfa*J`Nl->e@%~E))Z!714+dYfM
zp0{VYQ!y>tI2zJWrBE43FwCiSJgrm#zSH+~m_h<4Gj{poe{`%18@G~(oyKDRiw{b?
zga7R#JEMQ+UV#_**AMIx?rjLu)?kSYr-(qAvTW}S#&|N0Z1jY8*B#e-jwn_qDGPXb
z9Qf&O<knEQ)^iJ9RlxknS}EKd2*ZR!IhL9HpfH6@6S!A6J6$p1T90RuUmQiE7zem=
zlHO}M%`6qRwo6ClE&7{Bs|?<sg+<sqDumiEfyHrDJeHRYlVWBm+FM;e!OZl636s|M
zRzkoZwPrGl%3Fpz?aqf7G6r?fSY4s?Rv-VxZm>d8-xlMzG2fE;P+6|`h3f;yK@<7X
zhU2~UgvdHe-WmlFWuS0t;OG~QX)u4|oGmtL6~K*3tj6HXyyT)*CN5_)n7_Z(bP@|;
zYu(fH!q1MvBAJ{ArSig^+EJ(adzYxEO%M>}Ztd8qgojPw!Ay<O;>3z<i(JDNdDa;W
zQwwOmzH~jAl%6S6M%tEy4lJcuDB+xhY*oJZ>ka`n`c@3Ovo7q^j_-ZmayVmgR8J%M
z3fw;oR0V9+4kyaPV_WRXgVVIbOPI7UD3tftJ%_Dw|2Q&ktvXpd%Z`KE2^^KedMOL$
zMrJ&g*a;C4VyaYn6+(dR%5sWlbERJ>JC$%};4B<gMMMoYPv)n=AdcF@SNa9FOQrD2
zL1(5JU_V42&Xo?s(I!EeV5jgO?$q2Vh5zx{j0K>P)~66*-HR3ER@SUgRf1lkiBmEx
zY!TiXc|_pGKzMX~-q|u)tAwqdnSr3XtTKwh=E@TJtUMgH=5TKfgpJDcWEOcmu}a`9
z81?983RnB-q!cTqSBIIXgU&E1r@~&N?6wwib?L<19azDtc9s)8ok!{-6`7NAvtKeG
zQrReld$s2vM823s=D?lGF^iGC0M|?5VH4Rd1aa`B4Se2Q-dPZ_O}S8r%Y?Tp>Lf4V
zj~;i-gYx&kQu6bckzecvUQCyt+$-STn&T^*j_U(MW7jI-(RlfqLS#`f%b%M=&uPM`
zzO?4J)>B^0Oeu$rGAK+r`{`z#D8uAK)=RhOLpf}f7xTzb@+;ewaJ#o8R5S`Mo`u1M
z^P%zmR%tabEQ}<#+bX-WNRc9{0=QNR9+)dUoJSsCfZT@UXN-omq7V_=WmlD`iW6D%
zhy0U|Tk2#=zO?BWw@OvO^}b_R2`{F~G(pb$Eelql7jw)x+-)Pw5@9+oh+=U2dgZv$
zH$V1tW+Cz3TzNcIuJ?p~Asi(I4hzML@NlBMNLkvb6t*hiM(wEDXcV5f5=CAj`PU+r
zXIw7@=PWsVr)NL^i{rpvr`)O?2W@1gFmlGx+6`7>IDJT3RSpAeC0J>xko2ELXVEKU
zcWS1lPD#;zPM*Z_kKesfP<VJcv7U`_XU<6hw+i*DE`Y+qThyZkgdEPK2&kVTm!5~Z
z@7SuX7P3{#Vxekhgo%6)2Tf!al&#X#x>cFKDI5#dxvcy-z4%>%U#e3j){Vl55Yq^g
zXfLWo_}0)<JK;sUT=@KdFPHP0v;SKtqzOuha^*5^8<m$+tA(s4&-d1a_col>+Q-VR
zp*6oaXIM>0AxDmm<`G8TA}g@|!=TGuD;R5C(M1DJ#B!gvhmM{XHp^vpU!<^l7Of=f
z9E=J>c||PSKTTDYQ-5g_Fu7gX1?+W7fl#kxYma7;u^Kcpj!HynqVjev9CpGFj$6xJ
z1isaGuk-|2DGP-_$|kSKQ57t=sEdRXt-Np2+UeQs2?vcW=BNVa0TCv_>hP6^+e62-
zo;B)J1<X76^f2;l7Kv&(!YD;it(rpWRH>XtTlg2VTqP9V8k(|WD^$+v>6H^C)k6nG
zCgGjjl};>-pGCM?8I^Ravdwhdnb~{MTI+!?g|})kL>W76PGGNv=h+lvS-VTueNp{o
zRUxZqp;)i25AflU!4a>L>jNXmIS)s(WkD%K^ABy}K8-31Q}^c<?W|R1c6xo`=Fl-H
zEs>f>MLSc>2b+%diJ6@?+GkF&*uIx`X^aYLr=^V+b-g=sT(8Y!&4cwN?zQ0r&&#V}
zUE7t=L_>WGXMZmp-0M5;^z53mO}|zNTczh_r#x*Vhn=!n7+l_|vhIbc8WC<5l~OFa
zBBRHh8cUIj&DLqwQ88^{Pn2*)n<eR{HQJ)BewlX=FgpLNgRPXaG{G3|*ZRVjHr!%Y
zOjjtElTIlde0jqR_p@n4MY-E|6mA)LWz^RrygL%^4jjYMu4xuvP{1uO2%cw+-It`=
zMH7`$;ASn%qftzIPPo&{=EqK7=~8<Gh9KYVId0a%C)3C$lR)XsTu-Cb$O~c7yrU}~
zIz}a=<nJOm<3mahgHkxWLMawte+FAUWmF6OzOXwxS#cDsfl~xtOd@qDyghQ<9GO#n
zI*ANQVY3$MN*2`5wL~DBbjsb4<Id1C3-EFl*=^LAD9$Q|o29VRGlU?jDJsh>5hJ#0
zVXGF7JJ@TC^6A8W-zGnC(-}Mc@jNmOb`moyeLeAv74szn58oVm=25vnkNo90&~vHd
zDt-6qVAaX1St+L}v_;ef$?r<yoh`U`Fz=SFTauEpMOjs0SPIvN#&Vpe`t*7w%pyFS
zC^rXo(}QA3ILl?-t;#VfVNiPHIC9u1w+3*t@7Sp9yQbaABkxEKGPySIV7s#1<gkT@
zGi%@<6_!b_rRM#J?eLIx>oE0QHfq<@OM%EVSW)deBTwH6Kbr&s=J>%N{jUxD62}65
zcUbb1S>VIz`A%9-A-6^DKDugMecCAxkCeJhAGi|9x|P^juw&gttJHa?Op=mDi3EMv
z7=*G`SqU~q2o9c471hY7w1vqf-a7+36@euRyP7A6-Qm)VrqkyIHcAL;Z1ubeAIvP{
zMlBkvTn-wPIY#~LrEMRvJfu^L2rFk$e6up~p;dS^k4(+YvE~e_xh%~)z3fH5Fs{}9
zO3(Rwn~wkH_iO&;XC43Sm+i?9NV_llk5v(Dhk0kmRZ)%_>$ti;FiL0>5`0mT2-2pA
zd4fPUYr%_f|2T5oMZUY^d2h`eavPTkU1mhCZi;*j3+2c%#0G=xuh+uUx$^zpj*pKc
zUm7{CC8BmrO2|aGY`zL-F#T~*4jQFZO>E4Q-xu=F({~TO@V)((&o1Fvo&HU6+=5I_
zo{+oij&EIeJUw>&vtOQk!=SX9gm;#-9W=|a9Qne$7+BZ@W64AAwo<lxR&ARHyP+~c
z<vu~M&nC)IXH7TX-S*t-3tcp}dtEGxND+&|GUl{^UdW5X0wnXPzA{bq76HDy;kjNr
z9?qhDcFLGLv3g2gtXk}pJ!|ZBl{31J-SW~JfDsn9vl$fQ@-`}Pa!;QS<>baL`h}T<
zgZa{y{osp^fAXQ@d%rr{fw@szXjpp7jt^7E(_&X*c5xmgO=w6;a(1eAXOXR*u$KB0
zqo$}P7*_S`BRds;aKlqLQ{1F8`#p<hLV88&1qn-{bKwkeXp$lnQ$n5Cj)$EE41t7e
zm5y6Ae0k{j^Mk<4CUT>8)X86z&T^B3*23DkDnl;||8m;YI4m#wVs6k00{e*rd|BA5
zCtZm7kX5`M?3nIN_1sRTX{X#A8kTj`p8T-9TfG=tJ+sLnIm^-%6r+(BP@(k7!?7)V
z7ma~<ttY8fI-MRdQ<6>AESeuG{L)<Yyq&TloJ5q5Iyh{tl2?hb&o$j^?rFc<6AoKp
z7L<rE^veF+x}iWB6vA)?^vaOGoyO(QdtP|Ec1%*FvFYWq!vUOQvbqS9bI5XqKcCUK
zKeO^}zZAB5O9z@w1=tCh#bsI53k)i&d*s@-K|xCCg~?1&47BWfbN2HPSuZVVEz?OU
z(=k*vh#iIP+A{KNp@!Z*V;q!cGi4SmqN>yPs#=uTMEhNCG#wR2bQTP84QZ+RUg(L1
z?D>AOugsGDNKl(7lut-h>qERu&N%hDumtX4o@PrW36V=#iA_-UrYB!x4&8353szWK
zukDoN-5k`+-Fi>hO!T0&)MoT#5}8G1P&kH#7(6nyQ&lDCWEPT>^|F{^BvEnBqM6*b
zR|#CNg=sKuRZvq*P(v3QRSL1_&ZTX<UI?41Ml$e@onVU1_-QGotRj6*(Co<V`a89Z
zJ}ac3%eoiHYQ1HlkXZ*uO~R#C<f8udY?2UNa*$v_Vrzp^7Q)>%X9R+3*&!ujM1zfL
z3D`BkLgS6v>L-(2SQ0CS70#~jd5G-v3}?!LKvwWfp-9a4oR?UrE3B8$Yi$<FizZqp
zS79W-e5z_E+^ij2r7TQ$P<!2GY1q{`m{JQ_{@E#om#GZh)7RuklTJKV)y(Tyc(DZU
z^x|LCojWXroq=V|M{^^-DRw;P!TLw8_ie&kj<7<?KQ<CQNRmQPLybdcj#q%~+Mtk_
z!d1lr0*MwS4T~i#o-Z+H)ESq`PPa`9xLFEoh2<fKok1O%7O)m!Bj;4<GadH6m<s0`
zxkoW5)0n_cu@hA}GgHS2DV9}d{0hmi$qA?4EkZ{*VSl=Ketl#fj0Q9)t!kDRc33*T
zy6uQ*k-<*OTIpD;4Y@5+L8^4d@QCTVC!H=RrNJqMv(UIoCSekcTXmyvW@_A8tt21$
zpvw?Cxu%8b%s1@?-tId-IgW-R6t+WaZ<tiX>hXD(=Z>!&LKgyCrDH8k@)-vk8c>LE
zt%MyhviPG$=p~0*3xrpkn(TiUCq!grH>^m8G0uE|uD)jZkG)wWs!>44DMIQM2Agao
zUlG&7sagnJr4%+dZRRK~|GgG#*{+>s&$}}gr)=C=RJM_`{B%>f>or7UhZJcCj)R$4
ztL>Ya%D^VrsmO^QE7y^oc)s_Z6Dl=-+e?}H(Az+_&)UdFA&k;0uY2KGbvcmclw@MY
z3FxG9u+bCtXD1u>gPuQ!aZp;1xc9I>U4GcpvGTuu*znEkp1*m^^Uj7{<Y8-d@P3iX
zzUd0OXoWGKXg#Gf21b#5QHJ278h*6pt(D=?Br@#`cHgQTlLU45i{);P*n+oFdD$9E
zWmpKCB?~5dqt>h96LRYp5mXA(69(f*$O8uX9|tpyl@mVbJC39Bvq|9lM;)_tVn|B8
zUct3XW{P>vq8-JwQ=W}aMpyuCcm4@EY?N`kWQ&}ze*!Njk)OUWxclC^W4mX}#91(Q
zOYL=m27{TkpjIh!ZaG*WCw7A(_k^T{PtN$Tg{YBRiE%iO_Wc?1crw#e?6MQ;SCm{Q
zrFYn8c8l+`i^^s$n>xi#Xnx($o4MNykq2|-d7})Ro#s0!;Z=ckZ^`9FlFii#g;ZYH
z=n1p#WPvL0v@;*F5;1vM`mZ}9;cMHTX|Ou_&tG<YvhVovmg9ph$DnkK8;kve8jZ7b
zLRAQwewJsUtd(Zl!9HtuZV^<!u!M7~a?GNgyrb64)-d^y{RUp7p)doVDw47?W27-9
z-L4(|^c`KQK)MvxmZ|LA>Jp}jN(zVVgnc{>{CXDYP&U2rANC6NJLQvkSj;-fomLmg
zEY0^iv8j87WzeS&LwA7>*{Fr<gH*d{l}8gZZKXG$&<Si*j>0Q@Gv)h_I_@7j{@}Lf
z?wVuTDo3qtjX@$)_q>I_hY4q@)0Bwkv&cbXpx^bLTlASk?0v?^GL~cIgo74-eQY$H
z&B_4D>{DFwm4flGI*sg9!cHX&3SqCa>#w|_xIJe*=HsA?cDh#K(`n$7Y2+vsw>G_f
z&tXEDrh!GK-cO0|MRFQ80VtXP2Q$u83`0EoVz9dTvx!yrw(7(rSEcEc-I<}C>$MS(
zH)=s7@@%a9^UpfIw&nPpYo5C!hpL&qHds=(k(eR7t@2<TnY3miGV!`fL~db8h*P)B
zf51-opfC<_A+mJTvNUIQ0_?M&&JBv`RLvO|=Eq_}ZP&deinFNvY8v^)G$epgSo5hk
zCB_Y&L}k4YzT9(6k}VpD%{n>XrP~QYj5WE4vMO)1|Jn=PN;J@3P}1G#*+d{GsqUSQ
zktCBb3l?$J-cflQyHq;Mj(>R&7m!Szc%7k*(pmDhJB^E6z=^>bmA4a7Cmd>#fTf*i
z#5WQ-VafT*j@r9KWD}w9jR3LCRg_0FB@p?>$TLhQUBs?y8f=ut^EPta*$EqZ<7LfM
zIqd8+`rZm}A5MbNM#cPHb&1J3Pl`zkB5EziE0UevY3UcnLTsbabWZEd3si+M*Y_t8
z=S+e3)*XY=BA*{W3)~(l?{8Rd$E1V%N0BF!Na2KUY&jd%*BKF^a;b;hovJ}+=w6l~
z<iMK(GZ{KN`5Z(Hys%v^VULZ{anuEV9zT$e000rhNkl<Zau}IJ8x?-HZw;xR&mzy~
z5f%7S-}83Q9QeZ~azBlLHJogjv%pEqa+yBz9F&uRk(hZpJ%y)>W=>AaxKXy!Op@c)
zT9cI}{B9tdGHoTn*k(dD64%KkN4GmOBK2EC$8l$~Q*vkwuu}^+`<84?R*>IZW)&<l
zOF0-$ghG@~mLq0Yt#>wGIdbbc%iMiBg~Qak@bM&YnEb|GYmmDQEHG2`{=odsN0Y#_
zR!^Y4r@h51dDC*1pjd=x*<^;{vs?r&?#`5hxh|`9t2gaHLcVD$&TQ3YJ`NijsGMh5
z^{{aE!8lT<nv5eYcsf-<!KLzY7tPsMZka1&%bU4Z*;nMv;nD_h>DHPAZ&Yb#XBtu)
ztw1$QlYI7C^O0-CvT_J{T9EmV_xql`E)WwhEN_fe#Z=BZat|*EeM|B*CA*VCptzYv
zR`g069iFvy`g9CRVZDN?5H@Q2)^TI7hcOFnVVu|nI<e64#Y`z0*y$UfIO{AK>ldlF
zPgy|Qxmfk^Sa~rG+#5MIYjfyLus_v8DK?BCFMt#C6Y7@!$BE@1Iggm7D6r@4H6I^G
zel-mor=CZ!gtBtW)09nQ<xF|c=5f&sT8a_j@&>4#aJP0$V<I1_a&(bL$ND2><pg<z
z;;l7Dnasqedyz*+rp|69Q!gC+?YAuZwwi*bj63BI3cuWoi(-FN>zfmnMWj54|9W2*
z<<vo8)xVsu^%Dg0>0#iDv9%=p;jM!A)*Wkw6_lDZIHq#T0W}NwLry9~Fo)Yl^M}I(
z<G*Z_KY7{lgT0oG!tte{^-Q*ET&htDRhwvx6A^gYMD|*1r&}+?64`{~<<rqiLC0Jb
zABAmiL({G*ElTl|r`EW6cYT?R0Vk#d_0ygI-}gJC!*oiS60SU%VZCP&l`V`dy7y40
zP_oP!c4NTeAR(+d%IbMIXbk2EDtv3p(MvP3#$DiA&vAE{$2D0!qf40768{o>+AOvy
zOj}+IN}mShCx?MACN@(1>uUuEt@12&er=Y<)0#&s0rZ_se|y#_Q#C~mohjoy*1Re_
zYm}p?AWF|U{3QikA+>_6`jFqd<5A2MeEf2$g%DRVbum-(<T%rIY$rXRXLdW(<<hBV
zU$C8O=P#$qdSxt=aZAe9VXZQZY1}E#Q`65z&*p`!m)3V!IpNtf^3g%Z2OEyBY&b^A
z0Z$TzGoKcZkqbhivkF#I0fSP0xYzN#QEt}4JAJczlc2n8te?;@FY_Ip!h^=>qlFVT
zQmC9A@zP(UO_&!{7E5-<$)8amr<!IFiXT4?ln$;9WRVF2XXa;R_+ZxBNN`E9{i<YT
zNX}6rZ1#lGJGOh0h|ad~t(sywRlXQU9K!9PERsOP>h5j&l6h2q@GS82{lM>CFZjxu
zDW*wIS<*4d7NY0uv&KRB>46QNDV%V-XGDfp4NbmXJ4#WWwUNrn0$P8bp0cx^NZYxG
zCI<-FJm$sE_kVQ*#fg9ctWZ^a`=(z2c^|!8CL^sbd8#4WvpoLro?nc<$WXaRf<2nJ
zvTFb}^EB<uL{(1kD3qocuNKKnTQfWT!b0Sn6P3<t-@U@f6hYy7&lK?E7agA+JMIk}
z-`KQU$}vbbVNFziydU}HkvZ+H%1m;^O2oOkm}?=GoW#7mz`9G<Ez3+lXZt~yljtP<
zM}T{^uo+B&wOFs>MUwHt9N-3p;?vz=?O9V@_yZxa2-6!a5;D7ArrA=G&ZH`AjD)8X
zStOTvbj4QB;jsGq7>nd`k4E7PF^z@N3wcVL!6>;rn@{PmFca1Ui{REPqv!nSi<Vg^
z_|}#?@uY(1Gv#N8fnSYn*RL0Ok*#u=sX?9E@PS2HHo@!&)T!}rp$L}Qe(9i83zK&{
zn}AwiEox61U5;9MMNPNBLhy`fDNyWAm0^`=Ijeby>f$LdrMIz6KYbQX^q}V>`oXs2
z?wX@XRmSz6vEH|O)<$hvzcTG)!DP27I8cyo&{>r)@4{>%+JpeFmqILrNic`|P8tLF
zXD<VvO(K8mTERvIA09*=O(V4ves{~;9K>0qQ5dAw=S(E5R=&@8U9xDUD-&zo%jzFF
zVX}5gN9puLedSnf5*`8rSWr<<iva)CPQ{1w$e$j!i&Ii`YB@$sCWdrDvlWiq-+iy(
zgB{OLo`yvz>;#-H+o3BDZ?6dfNi_^z+_b8}(Ur5Ps}07JD#V;{R!AY4Whe{BnJJ`Q
zRJLo!^#rL0HB)-CZ`c0)7ahaG@UWfA7J44xRxRvQo}dQHkE61cAYe_qv=CE3w&}`p
zf>9~Us4>?_GJ-4^0J-L^d9_v0$#UIFF|&1A5&2OX|8m@MaEiQ82xd}dr$~y6EL~Ff
zQeny5Gz|_Dw}dY;NO)slr(%Du%u+Eq`;ZJ}2znx4SnN)hIl<|s)88kZ`Jqv1*DxyV
zM7^AAnv<A^y=XE|x)=gbB&BRuvQYMesg2bb73pU=L>E2bWOKBXH%Er=bFchSSTZ&@
zz4g(5I0+|4akR>ULX<x<`>syy0b-{MiiNWBaIXtY-v9B7mgC0r_r6*fpqT8QkWpUY
z`;R)l|FGltZx?*?nq#9D_8XgD64Y9vdqv6>Tuv@m*okhr3(Mp~?3q*s)8zj6r_;!|
zvq-3mHrCI~VoF4v0V%Vf6v+>b6G@`y4AmZYHi4*@(AZKqu}M^y)kDw8Q!!38k~W#Z
z^}=Sj|J%ckU(X^#zl_LgXRp0iIqp@CAC9}Fg2a>(I0Y__Qj+#;axrc{56YiC4qWfs
zNbS6vJ2mIuM1wn;V6#s?-V^@zTLtfL8tS_@GZuWncv2qH(*q1@$!zl?!7oiT0z(^(
ztuiQ$Y4YQ}z^{%Xw+4=TBb$iTMVr1*IWwE{6iS!Q3SZCX%IAlX+QB#0?NJt`SZQ?@
zP1)IeW<o^9#8j7Pa;xUF+i3TGD-AUJ**Ng0hn<Zubk>8I8jsoV!hSG-vJzP|gXVo7
z&_!K+p{IZFkH^|C;9%vsNwWCQ$^WnZye#0q{948R!^ppR+$|hsj=liCan17ww>@`8
zZZX+sSlWroW@;WRDJz`q^d>d-^b28FnZNnuF!Je9WFD5|04s090dC|eJ}KLu2HUlB
zRbDhUIG~>pTc3yzw-dyk>*R;&8b*bMzd@JEQY@#+_|-<r=I_q~KRoJqveKwBOtqW+
zPT46f!ENB=1Hx9;u}mz;SzMaGqKjtlFEd%^NgLo#K5uz<)AQ9W&)z(q8L{!<%fN@b
zfj@k!;BVdW?DW#3@zP+KVdB#^s*7P_QLPuT=Y?M%MSijycrXs!7<#U!hg8<7Hgb@_
z%{=qO7%R%>lgNw2yc;I7l;<-3WTO21sO8%mp0BQXwkx5V!%-KR1R***abC>+=f=^s
zLKu1Bc^mmxM;#xg=liWfD2hE&wN7UIX{$DT<^stP+o}|mw+`7RTy1c`sysMS9vpWJ
zO8CmQr(ak@%ga+w^!(QkJAQo>_`7eHyuab;c^3YqbmqT;+RomngyUBE>C28^9tOM!
z@2q+2Nla!kk7vpb_n<Xe&?G3oJc=MTm!wP)UiNi`v*Oe|2!DAPc{o$Pz2Ui83Aby<
zQ7}X}rfcd_HosXp#!>mR!;b&wpu3R#b}!Lf4?6=RbD!cxlJlEYk^l66KGwRBll_8=
z|8SwnI`7}_ZyIWfz|UTU6XuKLtpDg<!FR8DcKVK4r|dUM&l|)t>)`Wo<UyKXKP;_Z
zyi;R94of>3mA9GhvyjF&VW{$Pr#zoW-s*cqtf?q7B7H&wet8^u(O4ulOFac4!n;Gq
zx7R#Q%;X3LHZ}?$CqJ><>Y00TVl%INGC@(&kmPhakK?K5hnzB5PL?%w5h!wT<u@Up
z?ps;&>(@N*Z(95F<4IhG)B+#9jQr?n;M><d-`w_mWy|q=qWs`V;4hwc>^AV;ns96A
zd7gSyyfc_yG5bDErQ^!6=)@IgQO(FZyrj*glEPVoP0EyIcZt>5_tt>(!-I~Wj{~1h
zB3~alzPaY<6#nf|;KQ-eeNHcukOumvpC1Gpw{fd-tb18RqL)22boKd#i_iVf{+F@#
zOBO7T{AF))LSX6CbMNB4b<d{<f!$PPEX9(j%u@fOw+cQ!2t1uGzx<oqK0V4v*{p^2
zTDaabUl3S!`uddZD=b<SUN(`9(k+4pNXqjT1wEbH2{}&0>CF=EPa~gAmy7=Ok*C3!
zCX0JqxxbxC7SrP%=SOp|-v2r4v8u^)*EhYkP>j;~y8h!;GVNeCR$k0I-d%It895H-
z#$cQTS-|%H>QQ&bIYzZ-8?IL_W#zi;J<%m><5=>7bJ(0uL8hpNq<P1(rF)|^GG2ZX
z_33;6XdF%`A<IUQO_SBzkD{Kq?%#ws?}YW<>pc(mb)*gO$$n&a8rkj(w+1H*Vdu%M
zf$*Ijdjv&>>oZY1KkF$gAdmc8&G0oL)tMDjB!@oj3_#6KQFv$I_{zv#>Ugu<sjZF9
zi9LGt=#m|rbDB4iB1Gk2mRro;>_e_1568-rY2Z88JR7CW)B1S-d;|NlJ*!=OY27g>
zgrm-SPm~0q_+=v1skL8MiFJ~RaoIFvWlcLXQ-aOq9i%58e0UIfIK7yFdm}OT+h_x3
z&X}Nc<n2^fzi4>bWm0&tmVq{$|2XO2qzLfEaij@wdn9~$(=qOBi1MmDpDN#b(DLrO
z<8NN~yft*zn${YZw^JJ+uxQRn(}UbfW}Qz^7p<kOO(le#+9I@{9R&XTuw%NK(5{FV
zdth=C?eRvJoru%Yb3*%CrK+VA+423ReaLwtvLxXBVn1+uAoNS&+t(a_`SR>(`Rpii
z|2XnDt{437j^pmor3by}A|F{VvAPU~la*qO!8R3;a)04gWse)bKZ*QsujAp&2ymx&
zd*55Qs$x&tndSn{Ygmt{Z}u1|fWpw!v%IXo3Nf0{vdsEqq98Wx>}#8zCMu7n@yz4+
ze*B{2qXYOmH%q>?<=FO)!#0zw%~3m+b(D<Cbt%~#mBN0j{EH_opG@Mytm%nsGevHd
z_C6~-z3GzVCpNym6z4Ip|Efe$=H0SZlI6)nIcfuIrSSfmXB?FKM<?y?q=SF)u;u6b
z!tY%#cxU8zt9DE}BU)tSwux3w7#5E08lFs*AMFKxxZf>W-xl3rX|=b~lR*`DI9u@(
zZ@fX@<YBfZZ#0bmO(i$poOh#>G-=`4Jn+>G&zCpsNjmpW4f}sIQU1@*TXy=we{{3p
zJ6i>_uzcED<zPE?R{h{*$Dh9F7SATk`Ag1<*9!ARlK{Joa>WT%R}kS%xA|YILacIl
zxqVfIj}HRdJ;Sv=*znvRhclf>FK5a>z2EZLvGRvEJ-5;`3@4rP(Lv--UbMVu^h6T2
zQi|YaFR@aR)4xjebXCbA_?yUIt3n_>E943{zdN(esk=kroskVp`NgS+mn-n&-HyN9
z@A!Lfm)sjT{`sSh$FoS`%;~R=Q15%=hE*cGNYAl-jTzEcmZwd8<w%W-<gZ;JuPYBH
zO0Nm5*TOe8Jul`)URy0Ov<m<9^Ol{Su-n+Y6fc%E&N4}&Fyi-Im8Y|`V1GqH%*({O
zc@z0}ULlaizfP5L8@W4l+#JBeNnFkh#^8)Dk(`1W10-S)N#7eP{KX_LPQ-5-^7u{3
zZ-qj#j63Dy!+>}2!KP=uG#cnQ*f8dvx9LAsN(!&nvUm>R{Ym^QSArAkPXrdhLxY~%
zJbRJ+Rw*P)Q26<N;8tI_ktnJUrn(>~3{vzo?vy9f*H7%;RPI!cuMfOYTgB)@A5H^L
zUgJ@Czm*Ef@^q?{PI-IH@uiV)t#*7mHZtEd*fi0<F3Ti9PwW|0hp9j{^2;vZtIBV+
zLckpQr$=Uvel@n8`2Rhzd-H2Ki1w(AO!FCC1xj9#3y6;YUfx8UoZR8LFaEVY<2QLh
z|9_XLCz*=P1-<^4$#1>M`gchx2k)0|(ZxG(!r^PezW-h!zadfViEh_QXG8gut$Og9
bMXLW7#ywfTZ!Cbk00000NkvXXu0mjf;5Ap%

literal 0
HcmV?d00001

diff --git a/front/src/router/index.js b/front/src/router/index.js
index 6db96ff7..1810bdec 100644
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@@ -444,6 +444,24 @@ export const constantRoutes = [
       icon: 'error-warning-line',
     },
   },
+  {
+    path: '/integrationServicesDetails',
+    name: 'integrationServicesDetails',
+    component: () => import('@/views/home/integrationServicesDetails'),
+    meta: {
+      title: '详情',
+      icon: 'error-warning-line',
+    },
+  },
+  {
+    path: '/integrationServices',
+    name: 'integrationServices',
+    component: () => import('@/views/home/integrationServices'),
+    meta: {
+      title: '列表',
+      icon: 'error-warning-line',
+    },
+  },
 ]
 export const asyncRoutes = [
   {
diff --git a/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue b/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue
index 967a2296..834c6104 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue
@@ -4,7 +4,7 @@
     <div class="title">
       <DetalsTitle title="常见问题" type="Q&A"></DetalsTitle>
     </div>
-    <div class="content">
+    <div class="content" v-if="dataFrom.length > 0">
       <div v-for="(item, index) in dataFrom" :key="index" class="content-son">
         <div class="content-top">
           <div class="top-img"></div>
@@ -16,6 +16,9 @@
         </div>
       </div>
     </div>
+    <div v-else class="no-data">
+      暂无数据
+    </div>
   </div>
 </template>
 
@@ -120,4 +123,12 @@
       }
     }
   }
+
+  .no-data {
+    background: transparent !important; 
+    color: #212121;
+    text-align: center;
+    padding: 0.5rem 0;
+    font-size: 0.2rem;
+  }
 </style>
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index b2645069..72ba016f 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -10,106 +10,60 @@
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
       <div class="top-title">
-        <div
-          v-for="item in titleName"
-          :key="item.name"
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
-              backgroundImage: `url(${item.photo}) `,
-              backgroundSize: 'cover',
-            }"
-          ></span>
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)">
+          <span class="photo" :style="{
+            backgroundImage: `url(${item.photo}) `,
+            backgroundSize: 'cover',
+          }"></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
-            v-model:value="searchValue"
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
           <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <div class="top-content-father" :key="listKey">
-        <template
-          v-if="
-            Cardsname == '组件服务' ||
-            Cardsname == '应用资源' ||
-            Cardsname == ''
-          "
-        >
+        <template v-if="
+          Cardsname == '组件服务' ||
+          Cardsname == '应用资源' ||
+          Cardsname == ''
+        ">
           <div class="top-content-son">
-            <div
-              v-for="(item, index) in ListContent.records"
-              :key="index"
-              class="top-content"
-            >
+            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div
-                class="leixingsumfather"
-                :class="!item.shrinkFlag ? 'shrink' : ''"
-              >
-                <div
-                  v-for="(item2, index2) in item.typeList"
-                  :key="index2"
-                  class="leixingsum"
-                >
-                  <a-checkable-tag
-                    :checked="
-                      item.selectedTags &&
-                      item.selectedTags.indexOf(item2.dict_label) !== -1
-                    "
-                    @change="
-                      (checked) => handleChange(item2, checked, item.name)
-                    "
-                  >
+              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
+                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
+                  <a-checkable-tag :checked="
+                    item.selectedTags &&
+                    item.selectedTags.indexOf(item2.dict_label) !== -1
+                  " @change="
+  (checked) => handleChange(item2, checked, item.name)
+">
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div
-                class="shrinkTag"
-                v-if="item.showShrink"
-                :key="item.shrinkFlag"
-              >
-                <up-outlined
-                  v-show="!item.shrinkFlag"
-                  @click="changeShrink(item.name)"
-                />
-                <down-outlined
-                  v-show="item.shrinkFlag"
-                  @click="changeShrink(item.name)"
-                />
+              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
+                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
+                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
               </div>
             </div>
             <div class="top-content">
               <span class="top-content-title">共享条件</span>
               <div class="leixingsumfather">
                 <div class="leixingsum">
-                  <a-checkable-tag
-                    :checked="tagFlag == '申请'"
-                    @change="() => chagneTag('申请')"
-                  >
+                  <a-checkable-tag :checked="tagFlag == '申请'" @change="() => chagneTag('申请')">
                     申请
                   </a-checkable-tag>
-                  <a-checkable-tag
-                    :checked="tagFlag == '免批申请'"
-                    @change="() => chagneTag('免批申请')"
-                  >
+                  <a-checkable-tag :checked="tagFlag == '免批申请'" @change="() => chagneTag('免批申请')">
                     免批申请
                   </a-checkable-tag>
                 </div>
@@ -118,49 +72,25 @@
           </div>
         </template>
       </div>
-      <searchResultList
-        v-show="resourceList.data && resourceList.data.length > 0"
-        :key="listKey2"
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-        :select-cardsname="Cardsname"
-      />
+      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :key="listKey2"
+        :resourceList="resourceList" :resourceTotal="resourceTotal" :select-cardsname="Cardsname" />
       <div class="pagination">
-        <a-pagination
-          v-if="resourceList.data && resourceList.data.length > 0"
-          v-model:current="currentPage"
-          v-model:pageSize="currentPageSize"
-          show-size-changer
-          show-less-items
-          show-quick-jumper
-          :total="resourceTotal"
-          :page-size-options="pageSizeOptions"
-          @change="pageChange"
-          @showSizeChange="onShowSizeChange"
-        />
+        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
+          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
+          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
       </div>
-      <div
-        v-if="resourceList.data && resourceList.data.length <= 0"
-        style="margin-top: 2rem"
-      >
+      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
         <a-empty />
       </div>
     </div>
     <div class="top" v-else-if="Cardsname === '基础设施'">
       <div class="top-title">
-        <div
-          v-for="item in titleName"
-          :key="item.name"
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
-              backgroundImage: `url(${item.photo}) `,
-              backgroundSize: 'cover',
-            }"
-          ></span>
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)">
+          <span class="photo" :style="{
+            backgroundImage: `url(${item.photo}) `,
+            backgroundSize: 'cover',
+          }"></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
@@ -170,41 +100,24 @@
     </div>
     <div class="top" v-else>
       <div class="top-title">
-        <div
-          v-for="item in titleName"
-          :key="item.name"
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
-              backgroundImage: `url(${item.photo}) `,
-              backgroundSize: 'cover',
-            }"
-          ></span>
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)">
+          <span class="photo" :style="{
+            backgroundImage: `url(${item.photo}) `,
+            backgroundSize: 'cover',
+          }"></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father" style="background: unset">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
-            v-model:value="searchValue"
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
           <button class="button-reset" @click="chongzhi()">重置</button>
         </div>
       </div>
-      <KnowledgeBase
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-      ></KnowledgeBase>
+      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
     </div>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
@@ -214,118 +127,68 @@
     </div>
   </div>
   <!-- 西海岸 -->
-  <div
-    class="details-pageconetent"
-    v-else-if="whoShow1 && whoShow1.itShowXiHaiAn"
-  >
+  <div class="details-pageconetent" v-else-if="whoShow1 && whoShow1.itShowXiHaiAn">
     <home-header></home-header>
     <div class="details-pageconetent-left">
       <detailsPageconetentTree />
     </div>
     <div class="top" v-if="Cardsname != '知识库'">
       <div class="top-title">
-        <div
-          v-for="item in titleName"
-          :key="item.name"
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
-              backgroundImage: `url(${item.photo}) `,
-            }"
-          ></span>
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)">
+          <span class="photo" :style="{
+            backgroundImage: `url(${item.photo}) `,
+          }"></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
-      <!-- v-show="Cardsname !== '基础设施'" -->
       <!-- 搜索框 -->
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
-            v-model:value="searchValue"
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
           <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <!-- 分类 -->
       <div class="top-content-father" :key="listKey">
-        <template
-          v-if="
-            Cardsname == '组件服务' ||
-            Cardsname == '应用资源' ||
-            Cardsname == ''
-          "
-        >
+        <template v-if="
+          Cardsname == '组件服务' ||
+          Cardsname == '应用资源' ||
+          Cardsname == ''
+        ">
           <div class="top-content-son">
-            <div
-              v-for="(item, index) in ListContent.records"
-              :key="index"
-              class="top-content"
-            >
+            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div
-                class="leixingsumfather"
-                :class="!item.shrinkFlag ? 'shrink' : ''"
-              >
-                <div
-                  v-for="(item2, index2) in item.typeList"
-                  :key="index2"
-                  class="leixingsum"
-                >
-                  <a-checkable-tag
-                    :checked="
-                      item.selectedTags &&
-                      item.selectedTags.indexOf(item2.dict_label) !== -1
-                    "
-                    @change="
-                      (checked) => handleChange(item2, checked, item.name)
-                    "
-                  >
+              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
+                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
+                  <a-checkable-tag :checked="
+                    item.selectedTags &&
+                    item.selectedTags.indexOf(item2.dict_label) !== -1
+                  " @change="
+  (checked) => handleChange(item2, checked, item.name)
+">
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div
-                class="shrinkTag"
-                v-if="item.showShrink"
-                :key="item.shrinkFlag"
-              >
-                <up-outlined
-                  v-show="!item.shrinkFlag"
-                  @click="changeShrink(item.name)"
-                />
-                <down-outlined
-                  v-show="item.shrinkFlag"
-                  @click="changeShrink(item.name)"
-                />
+              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
+                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
+                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
               </div>
             </div>
             <div class="top-content">
               <span class="top-content-title">共享条件</span>
               <div class="leixingsumfather">
                 <div class="leixingsum">
-                  <a-checkable-tag
-                    :checked="tagFlag == '申请'"
-                    @change="() => chagneTag('申请')"
-                  >
+                  <a-checkable-tag :checked="tagFlag == '申请'" @change="() => chagneTag('申请')">
                     申请
                   </a-checkable-tag>
-                  <a-checkable-tag
-                    :checked="tagFlag == '免批申请'"
-                    @change="() => chagneTag('免批申请')"
-                  >
+                  <a-checkable-tag :checked="tagFlag == '免批申请'" @change="() => chagneTag('免批申请')">
                     免批申请
                   </a-checkable-tag>
                 </div>
@@ -335,71 +198,37 @@
         </template>
       </div>
       <!-- 中心内容 -->
-      <searchResultList
-        v-show="resourceList.data && resourceList.data.length > 0"
-        :key="listKey2"
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-        :select-cardsname="Cardsname"
-      />
+      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :key="listKey2"
+        :resourceList="resourceList" :resourceTotal="resourceTotal" :select-cardsname="Cardsname" />
       <!-- 分页 -->
       <div class="pagination">
-        <a-pagination
-          v-if="resourceList.data && resourceList.data.length > 0"
-          v-model:current="currentPage"
-          v-model:pageSize="currentPageSize"
-          show-size-changer
-          show-less-items
-          show-quick-jumper
-          :total="resourceTotal"
-          :page-size-options="pageSizeOptions"
-          @change="pageChange"
-          @showSizeChange="onShowSizeChange"
-        />
+        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
+          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
+          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
       </div>
-      <div
-        v-if="resourceList.data && resourceList.data.length <= 0"
-        style="margin-top: 200px"
-      >
+      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 200px">
         <a-empty />
       </div>
     </div>
     <div class="top" v-else>
       <div class="top-title">
-        <div
-          v-for="item in titleName"
-          :key="item.name"
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
-              backgroundImage: `url(${item.photo}) `,
-            }"
-          ></span>
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)">
+          <span class="photo" :style="{
+            backgroundImage: `url(${item.photo}) `,
+          }"></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father" style="background: unset">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
-            v-model:value="searchValue"
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
           <button class="button-reset" @click="chongzhi()">重置</button>
         </div>
       </div>
-      <KnowledgeBase
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-      ></KnowledgeBase>
+      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
     </div>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
@@ -409,119 +238,67 @@
     </div>
   </div>
   <!-- 包头 -->
-  <div
-    class="details-pageconetent"
-    v-else-if="whoShow1 && whoShow1.itShowBaoTou"
-  >
+  <div class="details-pageconetent" v-else-if="whoShow1 && whoShow1.itShowBaoTou">
     <home-header></home-header>
     <div class="details-pageconetent-left">
       <detailsPageconetentTree />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '数据资源'">
       <div class="top-title">
-        <div
-          v-for="item in titleName"
-          :key="item.name"
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
-              backgroundImage: `url(${item.photo}) `,
-              backgroundSize: 'cover',
-            }"
-          ></span>
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)">
+          <span class="photo" :style="{
+            backgroundImage: `url(${item.photo}) `,
+            backgroundSize: 'cover',
+          }"></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
-      <div
-        v-show="Cardsname !== '数据资源'"
-        class="resultListSearchInput-father"
-      >
+      <div v-show="Cardsname !== '数据资源'" class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
-            v-model:value="searchValue"
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
           <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <div class="top-content-father" :key="listKey">
-        <template
-          v-if="
-            Cardsname == '组件服务' ||
-            Cardsname == '应用资源' ||
-            Cardsname == ''
-          "
-        >
+        <template v-if="
+          Cardsname == '组件服务' ||
+          Cardsname == '应用资源' ||
+          Cardsname == ''
+        ">
           <div class="top-content-son">
-            <div
-              v-for="(item, index) in ListContent.records"
-              :key="index"
-              class="top-content"
-            >
+            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div
-                class="leixingsumfather"
-                :class="!item.shrinkFlag ? 'shrink' : ''"
-              >
-                <div
-                  v-for="(item2, index2) in item.typeList"
-                  :key="index2"
-                  class="leixingsum"
-                >
-                  <a-checkable-tag
-                    :checked="
-                      item.selectedTags &&
-                      item.selectedTags.indexOf(item2.dict_label) !== -1
-                    "
-                    @change="
-                      (checked) => handleChange(item2, checked, item.name)
-                    "
-                  >
+              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
+                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
+                  <a-checkable-tag :checked="
+                    item.selectedTags &&
+                    item.selectedTags.indexOf(item2.dict_label) !== -1
+                  " @change="
+  (checked) => handleChange(item2, checked, item.name)
+">
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div
-                class="shrinkTag"
-                v-if="item.showShrink"
-                :key="item.shrinkFlag"
-              >
-                <up-outlined
-                  v-show="!item.shrinkFlag"
-                  @click="changeShrink(item.name)"
-                />
-                <down-outlined
-                  v-show="item.shrinkFlag"
-                  @click="changeShrink(item.name)"
-                />
+              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
+                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
+                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
               </div>
             </div>
             <div class="top-content">
               <span class="top-content-title">共享条件</span>
               <div class="leixingsumfather">
                 <div class="leixingsum">
-                  <a-checkable-tag
-                    :checked="tagFlag == '申请'"
-                    @change="() => chagneTag('申请')"
-                  >
+                  <a-checkable-tag :checked="tagFlag == '申请'" @change="() => chagneTag('申请')">
                     申请
                   </a-checkable-tag>
-                  <a-checkable-tag
-                    :checked="tagFlag == '免批申请'"
-                    @change="() => chagneTag('免批申请')"
-                  >
+                  <a-checkable-tag :checked="tagFlag == '免批申请'" @change="() => chagneTag('免批申请')">
                     免批申请
                   </a-checkable-tag>
                 </div>
@@ -530,35 +307,18 @@
           </div>
         </template>
       </div>
-      <searchResultList
-        v-show="resourceList.data && resourceList.data.length"
-        :key="listKey2"
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-        :select-cardsname="Cardsname"
-      />
+      <searchResultList v-show="resourceList.data && resourceList.data.length" :key="listKey2"
+        :resourceList="resourceList" :resourceTotal="resourceTotal" :select-cardsname="Cardsname" />
       <div class="pagination">
-        <a-pagination
-          v-if="resourceList.data && resourceList.data.length > 0"
-          v-model:current="currentPage"
-          v-model:pageSize="currentPageSize"
-          show-size-changer
-          show-less-items
-          show-quick-jumper
-          :total="resourceTotal"
-          :page-size-options="pageSizeOptions"
-          @change="pageChange"
-          @showSizeChange="onShowSizeChange"
-        />
+        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
+          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
+          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
       </div>
       <div class="shujuziyuan" v-if="Cardsname == '数据资源'">
         <div class="yunziyuan">
           <div class="yunziyuan-title">
             <div class="tupian"></div>
-            <div
-              class="title"
-              @click="dianjitiaozhaun('青岛市政务资源管理平台')"
-            >
+            <div class="title" @click="dianjitiaozhaun('青岛市政务资源管理平台')">
               青岛市政务资源管理平台{{ dataShowdev }}
             </div>
           </div>
@@ -574,28 +334,18 @@
           </div>
         </div>
       </div>
-      <div
-        v-if="resourceList.data && resourceList.data.length <= 0"
-        style="margin-top: 2rem"
-      >
+      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
         <a-empty v-if="!(Cardsname == '数据资源')" />
       </div>
     </div>
     <div class="top" v-else-if="Cardsname == '数据资源'">
       <div class="top-title">
-        <div
-          v-for="item in titleName"
-          :key="item.name"
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
-              backgroundImage: `url(${item.photo}) `,
-              backgroundSize: 'cover',
-            }"
-          ></span>
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)">
+          <span class="photo" :style="{
+            backgroundImage: `url(${item.photo}) `,
+            backgroundSize: 'cover',
+          }"></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
@@ -603,41 +353,24 @@
     </div>
     <div class="top" v-else>
       <div class="top-title">
-        <div
-          v-for="item in titleName"
-          :key="item.name"
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
-              backgroundImage: `url(${item.photo}) `,
-              backgroundSize: 'cover',
-            }"
-          ></span>
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)">
+          <span class="photo" :style="{
+            backgroundImage: `url(${item.photo}) `,
+            backgroundSize: 'cover',
+          }"></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father" style="background: unset">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
-            v-model:value="searchValue"
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
           <button class="button-reset" @click="chongzhi()">重置</button>
         </div>
       </div>
-      <KnowledgeBase
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-      ></KnowledgeBase>
+      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
     </div>
     <!--<div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
@@ -649,1168 +382,1094 @@
   <home-footer></home-footer>
 </template>
 <script>
-  import HomeFooter from '@/views/newHome/components/Footer'
-  import mybus from '@/myplugins/mybus'
-  import {
-    defineComponent,
-    reactive,
-    ref,
-    toRefs,
-    onMounted,
-    // computed,
-    watch,
-  } from 'vue'
-  import {
-    UpOutlined,
-    DownOutlined,
-    // VideoCameraOutlined,
-  } from '@ant-design/icons-vue'
-  import {
-    selectDicStoreAll,
-    pageWithAttrs,
-    // zywMessage,
-    getDataResource,
-  } from '@/api/home.js'
-  import { getSgcList } from '@/api/personalCenter'
-  import { useRouter } from 'vue-router'
-  // import { useStore } from 'vuex'
-  import HomeHeader from '@/views/home/components/header'
-  import detailsPageconetentTree from '@/views/home/detailsPageconetentTree.vue'
-  import searchResultList from '@/views/home/components/searchResultList.vue'
-  import KnowledgeBase from '@/views/home/components/KnowledgeBase.vue'
-  // import VideoSurveillance from '@/views/home/videoSurveillance'
-  // 数据资源引用
-  import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
-  // 基础设施引用
-  import infrastructurePage from '@/views/home/infrastructurePage.vue'
-  import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
+import HomeFooter from '@/views/newHome/components/Footer'
+import mybus from '@/myplugins/mybus'
+import {
+  defineComponent,
+  reactive,
+  ref,
+  toRefs,
+  onMounted,
+  watch,
+} from 'vue'
+import {
+  UpOutlined,
+  DownOutlined,
+} from '@ant-design/icons-vue'
+import {
+  selectDicStoreAll,
+  pageWithAttrs,
+  getDataResource,
+  getIntegrationServicesList,
+} from '@/api/home.js'
+import { getSgcList } from '@/api/personalCenter'
+import { useRouter } from 'vue-router'
+import HomeHeader from '@/views/home/components/header'
+import detailsPageconetentTree from '@/views/home/detailsPageconetentTree.vue'
+import searchResultList from '@/views/home/components/searchResultList.vue'
+import KnowledgeBase from '@/views/home/components/KnowledgeBase.vue'
+// 数据资源引用
+import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
+// 基础设施引用
+import infrastructurePage from '@/views/home/infrastructurePage.vue'
+import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
+import { message } from 'ant-design-vue'
+import { titleNameArray, keyongziyuanqingkaungArray, shujuziyuanqingkuangArray } from './constantData/showData.js'
 
-  export default defineComponent({
-    setup() {
-      // const store = useStore()
-      const titleName = ref([
-        {
-          photo: require('@/assets/newHome/banner-zj.png'),
-          name: '组件服务',
-        },
-        {
-          photo: require('@/assets/newHome/banner-yy.png'),
-          name: '应用资源',
-        },
-        {
-          photo: require('@/assets/newHome/banner-jc.png'),
-          name: '基础设施',
-        },
-        {
-          photo: require('@/assets/newHome/banner-sj.png'),
-          name: '数据资源',
-        },
-        {
-          photo: require('@/assets/newHome/banner-zs.png'),
-          name: '知识库',
-        },
-      ])
-      const openMonitor = () => {
-        window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
+export default defineComponent({
+  setup() {
+    const titleName = ref(titleNameArray)
+
+    const openMonitor = () => {
+      window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
+    }
+    // 模糊查询
+    const keyongziyuanqingkaung = ref(keyongziyuanqingkaungArray)
+    const shujuziyuanqingkuang = ref(shujuziyuanqingkuangArray)
+
+    // 西海岸数据资源页
+    // const dataShowbt = ref(whoShow.itshow)
+    // 青岛数据资源页
+    const whoShow1 = ref(whoShow)
+    // 分页
+    const loading = ref(true)
+    const currentPage = ref(1)
+    const currentPageSize = ref(5)
+    const pageSizeOptions = ref(['5', '10', '20', '50'])
+    const router = useRouter()
+    const select = router.currentRoute.value.query.select
+    const str = router.currentRoute.value.query.str
+    const searchValue = ref(str)
+    let tecHnosphere = router.currentRoute.value.query.tecHnosphere
+    let appLiCation = router.currentRoute.value.query.appLiCation
+    const Cardsname = ref(select)
+    // 刷新筛选条件组件
+    let listKey = ref(0)
+    // 刷新筛选列表信息组件
+    const listKey2 = ref(0)
+    // 储存筛选条件状态
+    const state = reactive({
+      selectedTags: [],
+      diyici: [],
+    })
+    // 查询参数
+    const paramsGetResources = {
+      districtId: '',
+      deptIds: [],
+      pageNum: 1,
+      pageSize: currentPageSize.value,
+      type: Cardsname.value,
+      name: '',
+      infoList: [],
+      orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+      orderType: 'DESC', // ASC 升序  DESC 降序
+    }
+    
+    // 查询
+    const onSearch = () => {
+      loading.value = true
+      paramsGetResources.name = searchValue.value
+      currentPage.value = 1
+    }
+    // 免批
+    const tagFlag = ref('')
+    // 视频资源
+    const stateTags = ref(['在线', '离线'])
+    const selStateTags = ref([])
+    const handleChangeStateTag = (tag, checked) => {
+      loading.value = true
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      paramsGetResources.infoList = paramsGetResources.infoList.filter(
+        (item) => item.attrType !== 'status'
+      )
+      if (checked) {
+        selStateTags.value = [tag]
+        paramsGetResources.infoList.push({
+          attrType: 'status',
+          attrValue: tag == '在线' ? 1 : 0,
+        })
+      } else {
+        selStateTags.value = selStateTags.value.filter((t) => t !== tag)
       }
-      // const jichusheshi=ref([
-      //   {
-      //     name:'青岛市云资源管理平台'
-      //   }
-      // ])
-      // 模糊查询
-      const keyongziyuanqingkaung = ref([
-        {
-          name: 'CPU/核：',
-          value: 2102,
-        },
-        {
-          name: '内存/T：',
-          value: 6.68,
-        },
-        {
-          name: '存储/T：',
-          value: 2102,
-        },
-        {
-          name: 'RDS for Mysql/G：',
-          value: 982.82,
-        },
-        {
-          name: 'RDS for SqlServer/G：',
-          value: 997.17,
-        },
-      ])
-      const shujuziyuanqingkuang = ref([
-        {
-          name: '已上线目录：',
-          value: 10372,
-          danwei: '条',
-        },
-        {
-          name: '已发布服务：',
-          value: 1080,
-          danwei: '条',
-        },
-        {
-          name: '已发布接口：',
-          value: 976,
-          danwei: '条',
-        },
-        {
-          name: '更新时间：',
-          value: '2022-05-06',
-        },
-      ])
-      // 西海岸数据资源页
-      // const dataShowbt = ref(whoShow.itshow)
-      // 青岛数据资源页
-      const whoShow1 = ref(whoShow)
-      console.log(whoShow, 'dataShowdev==========================>')
-      // 分页
-      const loading = ref(true)
-      const currentPage = ref(1)
-      const currentPageSize = ref(5)
-      const pageSizeOptions = ref(['5', '10', '20', '50'])
-      // 从store获取选中的类型
-      // const Cardsname = computed(() => store.getters['home/selectCardsnum'])
-      const router = useRouter()
-      const select = router.currentRoute.value.query.select
-      const str = router.currentRoute.value.query.str
-      const searchValue = ref(str)
-      let tecHnosphere = router.currentRoute.value.query.tecHnosphere
-      let appLiCation = router.currentRoute.value.query.appLiCation
-      const Cardsname = ref(select)
-      // 刷新筛选条件组件
-      let listKey = ref(0)
-      // 刷新筛选列表信息组件
-      const listKey2 = ref(0)
-      // 储存筛选条件状态
-      const state = reactive({
-        selectedTags: [],
-        diyici: [],
+      getAppResources()
+      console.log(tag, checked)
+    }
+    const selBqTags = ref([])
+    const handleChangeBqTags = (tag, checked) => {
+      loading.value = true
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      paramsGetResources.infoList = paramsGetResources.infoList.filter(
+        (item) => item.attrType !== 'labelName'
+      )
+      if (checked) {
+        selBqTags.value = [tag]
+        paramsGetResources.infoList.push({
+          attrType: 'labelName',
+          attrValue: tag,
+        })
+      } else {
+        selBqTags.value = selBqTags.value.filter((t) => t !== tag)
+      }
+      getAppResources()
+    }
+    const current = ref(5)
+    const chagneTag = (name) => {
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      if (tagFlag.value == name) {
+        tagFlag.value = ''
+        paramsGetResources.shareCondition = ''
+      } else {
+        tagFlag.value = name
+        paramsGetResources.shareCondition = name
+      }
+      listKey.value++
+      getAppResources()
+    }
+
+    // 重置数据
+    const chongzhi = () => {
+      loading.value = true
+      // 重置模糊查字段
+      searchValue.value = ''
+      paramsGetResources.name = searchValue.value
+      // 重置筛选条件
+      ListContent.records.forEach((val) => {
+        val.selectedTags = []
       })
-      // 查询参数
-      const paramsGetResources = {
-        districtId: '',
-        deptIds: [],
-        pageNum: 1,
-        pageSize: currentPageSize.value,
-        type: Cardsname.value,
-        name: '',
-        infoList: [],
-        orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-        orderType: 'DESC', // ASC 升序  DESC 降序
+      // 分页
+      currentPage.value = 1
+      currentPageSize.value = 5
+      // 重置查询条件
+      paramsGetResources.districtId = ''
+      paramsGetResources.deptIds = []
+      paramsGetResources.pageNum = 1
+      paramsGetResources.pageSize = 5
+      paramsGetResources.name = ''
+      paramsGetResources.shareCondition = ''
+      paramsGetResources.infoList = []
+      paramsGetResources.orderField = 'total'
+      paramsGetResources.orderType = 'DESC'
+      mybus.emit('chongzhi')
+      getAppResources()
+    }
+
+    //跳转链接
+    function dianjitiaozhaun(name) {
+      switch (name) {
+        case '青岛市政务资源管理平台':
+          window.open('http://15.72.158.81/web/root/homepage.aspx')
+          console.log('name', name)
+          break
+        case '青岛市视频资源管理平台':
+          window.open('http://15.72.183.88:8760/yzy/main')
+          console.log('name', name)
+          break
       }
-      // 查询
-      const onSearch = () => {
-        loading.value = true
-        paramsGetResources.name = searchValue.value
-        currentPage.value = 1
-      }
-      // 免批
-      const tagFlag = ref('')
-      // 视频资源
-      const stateTags = ref(['在线', '离线'])
-      const selStateTags = ref([])
-      const handleChangeStateTag = (tag, checked) => {
-        loading.value = true
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        paramsGetResources.infoList = paramsGetResources.infoList.filter(
-          (item) => item.attrType !== 'status'
-        )
-        if (checked) {
-          selStateTags.value = [tag]
-          paramsGetResources.infoList.push({
-            attrType: 'status',
-            attrValue: tag == '在线' ? 1 : 0,
-          })
-        } else {
-          selStateTags.value = selStateTags.value.filter((t) => t !== tag)
+    }
+
+    // 点击筛选条件回调
+    const handleChange = (tag, checked, name) => {
+      loading.value = true
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      console.log('点击筛选条件=================>', tag, checked, name)
+      ListContent.records.forEach((val) => {
+        if (val.name === name) {
+          paramsGetResources.infoList = paramsGetResources.infoList.filter(
+            (item) => item.attrType !== name
+          )
+          if (val.selectedTags.indexOf(tag.dict_label) == -1) {
+            val.selectedTags = [tag.dict_label]
+            paramsGetResources.infoList.push({
+              attrType: name,
+              attrValue: tag.dict_label,
+            })
+          } else {
+            val.selectedTags.splice(
+              val.selectedTags.indexOf(tag.dict_label),
+              1
+            )
+          }
         }
-        getAppResources()
-        console.log(tag, checked)
+      })
+      listKey.value++
+      getAppResources()
+    }
+
+    // 获取筛选条件
+    const getNewList = () => {
+      tecHnosphere = router.currentRoute.value.query.tecHnosphere
+      appLiCation = router.currentRoute.value.query.appLiCation
+      const params = {
+        topCategoryName: Cardsname.value,
       }
-      const bqTags = ref([
-        '火车站',
-        '长途汽车站',
-        '轮渡码头',
-        '景区景点',
-        '公园广场',
-        '海水浴场',
-        '商业街区',
-        '建筑工地',
-        '农贸市场',
-        '渔港',
-        '河道',
-        '水库',
-        '积水点',
-        '加油站',
-        '山区/林区',
-        '墓地',
-        '旅游景点',
-        '输油管道',
-        '危化企业',
-        '学校',
-        '广场',
-        '公园',
-        '政府',
-        '桥梁',
-        '隧道',
-        '物资储备库',
-        '地铁站',
-        '安全生产企业',
-        '敬老院',
-        '医院',
-        '港口',
-        '高速',
-      ])
-      const selBqTags = ref([])
-      const handleChangeBqTags = (tag, checked) => {
-        loading.value = true
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        paramsGetResources.infoList = paramsGetResources.infoList.filter(
-          (item) => item.attrType !== 'labelName'
-        )
-        if (checked) {
-          selBqTags.value = [tag]
-          paramsGetResources.infoList.push({
-            attrType: 'labelName',
-            attrValue: tag,
-          })
-        } else {
-          selBqTags.value = selBqTags.value.filter((t) => t !== tag)
-        }
-        getAppResources()
-        console.log(tag, checked)
-      }
-      const current = ref(2)
-      const chagneTag = (name) => {
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        if (tagFlag.value == name) {
-          tagFlag.value = ''
-          paramsGetResources.shareCondition = ''
-        } else {
-          tagFlag.value = name
-          paramsGetResources.shareCondition = name
-        }
-        listKey.value++
-        getAppResources()
-        console.log('点击筛选条件=================>', tagFlag.value)
-      }
-      // 重置数据
-      const chongzhi = () => {
-        loading.value = true
-        // 重置模糊查字段
-        searchValue.value = ''
-        paramsGetResources.name = searchValue.value
-        // 重置筛选条件
+      selectDicStoreAll(params).then((res) => {
+        console.log('selectDicStoreAll============>', res)
+        const { data } = res.data
+        ListContent.records = []
+        ListContent.records = data
+        tecHnosphere = router.currentRoute.value.query.tecHnosphere
+        appLiCation = router.currentRoute.value.query.appLiCation
+        mybus.emit('getDeptList')
         ListContent.records.forEach((val) => {
           val.selectedTags = []
-        })
-        // 分页
-        currentPage.value = 1
-        currentPageSize.value = 5
-        // 重置查询条件
-        paramsGetResources.districtId = ''
-        paramsGetResources.deptIds = []
-        paramsGetResources.pageNum = 1
-        paramsGetResources.pageSize = 5
-        paramsGetResources.name = ''
-        paramsGetResources.shareCondition = ''
-        paramsGetResources.infoList = []
-        paramsGetResources.orderField = 'total'
-        paramsGetResources.orderType = 'DESC'
-        mybus.emit('chongzhi')
-        getAppResources()
-      }
-      //跳转链接
-      function dianjitiaozhaun(name) {
-        switch (name) {
-          case '青岛市政务资源管理平台':
-            window.open('http://15.72.158.81/web/root/homepage.aspx')
-            console.log('name', name)
-            break
-          case '青岛市视频资源管理平台':
-            window.open('http://15.72.183.88:8760/yzy/main')
-            console.log('name', name)
-            break
-        }
-      }
-      // 点击筛选条件回调
-      const handleChange = (tag, checked, name) => {
-        loading.value = true
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        console.log('点击筛选条件=================>', tag, checked, name)
-        ListContent.records.forEach((val) => {
-          if (val.name === name) {
-            paramsGetResources.infoList = paramsGetResources.infoList.filter(
-              (item) => item.attrType !== name
-            )
-            if (val.selectedTags.indexOf(tag.dict_label) == -1) {
-              val.selectedTags = [tag.dict_label]
-              paramsGetResources.infoList.push({
-                attrType: name,
-                attrValue: tag.dict_label,
-              })
-            } else {
-              val.selectedTags.splice(
-                val.selectedTags.indexOf(tag.dict_label),
-                1
-              )
+          if (val.name == '应用领域' && appLiCation) {
+            val.selectedTags[0] = []
+            val.selectedTags[0] = appLiCation
+            paramsGetResources.infoList.push({
+              attrType: '应用领域',
+              attrValue: appLiCation,
+            })
+            if (searchValue.value) {
+              paramsGetResources.name = searchValue.value
             }
+            pageWithAttrs(paramsGetResources).then((res) => {
+              resourceList.data = []
+              resourceList.data = res.data.data.records || []
+              resourceTotal.value = res.data.data.total || ''
+            })
+          }
+          tecHnosphere = router.currentRoute.value.query.tecHnosphere
+          appLiCation = router.currentRoute.value.query.appLiCation
+          if (val.name == '技术领域' && tecHnosphere) {
+            val.selectedTags[1] = tecHnosphere
+            paramsGetResources.infoList.push({
+              attrType: '技术领域',
+              attrValue: tecHnosphere,
+            })
+            if (searchValue.value) {
+              paramsGetResources.name = searchValue.value
+            }
+            pageWithAttrs(paramsGetResources).then((res) => {
+              resourceList.data = []
+              resourceList.data = res.data.data.records || []
+              resourceTotal.value = res.data.data.total || ''
+            })
+            console.log('paramsGetResources', paramsGetResources)
+          }
+          tecHnosphere = router.currentRoute.value.query.tecHnosphere
+          appLiCation = router.currentRoute.value.query.appLiCation
+          if (val.typeList && val.typeList.length > 6) {
+            val.showShrink = true
+            val.shrinkFlag = true
           }
         })
         listKey.value++
-        getAppResources()
-      }
-      const getNewList = () => {
-        tecHnosphere = router.currentRoute.value.query.tecHnosphere
-        appLiCation = router.currentRoute.value.query.appLiCation
-        const params = {
-          topCategoryName: Cardsname.value,
-        }
-        selectDicStoreAll(params).then((res) => {
-          console.log('selectDicStoreAll============>', res)
-          const { data } = res.data
-          ListContent.records = []
-          ListContent.records = data
-          tecHnosphere = router.currentRoute.value.query.tecHnosphere
-          appLiCation = router.currentRoute.value.query.appLiCation
-          mybus.emit('getDeptList')
-          ListContent.records.forEach((val) => {
-            val.selectedTags = []
-            if (val.name == '应用领域' && appLiCation) {
-              val.selectedTags[0] = []
-              val.selectedTags[0] = appLiCation
-              paramsGetResources.infoList.push({
-                attrType: '应用领域',
-                attrValue: appLiCation,
-              })
-              if (searchValue.value) {
-                paramsGetResources.name = searchValue.value
-              }
-              pageWithAttrs(paramsGetResources).then((res) => {
-                resourceList.data = []
-                resourceList.data = res.data.data.records || []
-                resourceTotal.value = res.data.data.total || ''
-              })
-            }
-            tecHnosphere = router.currentRoute.value.query.tecHnosphere
-            appLiCation = router.currentRoute.value.query.appLiCation
-            if (val.name == '技术领域' && tecHnosphere) {
-              val.selectedTags[1] = tecHnosphere
-              paramsGetResources.infoList.push({
-                attrType: '技术领域',
-                attrValue: tecHnosphere,
-              })
-              if (searchValue.value) {
-                paramsGetResources.name = searchValue.value
-              }
-              pageWithAttrs(paramsGetResources).then((res) => {
-                resourceList.data = []
-                resourceList.data = res.data.data.records || []
-                resourceTotal.value = res.data.data.total || ''
-              })
-              console.log('paramsGetResources', paramsGetResources)
-            }
-            tecHnosphere = router.currentRoute.value.query.tecHnosphere
-            appLiCation = router.currentRoute.value.query.appLiCation
-            if (val.typeList && val.typeList.length > 6) {
-              val.showShrink = true
-              val.shrinkFlag = true
-            }
-          })
-          listKey.value++
-          listKey2.value++
-        })
-        console.log('selectDicStoreAll', ListContent)
-      }
-      // 筛选条件
-      let ListContent = reactive({
-        records: [],
+        listKey2.value++
       })
-      const resourceList = reactive({ data: [] })
-      const videoList = reactive({ data: [] })
-      const resourceTotal = ref('')
-      const getAppResources = (switchIndex) => {
-        //switchIndex这个参数是下面的分页传过来的参数
-        paramsGetResources.name = searchValue.value
-        paramsGetResources.type = Cardsname.value
-        console.log(
-          '执行getAppResources====================》',
-          paramsGetResources
-        )
-        if (
-          !whoShow1.value.itShowBaoTou &&
-          paramsGetResources.type === '数据资源'
-        ) {
-          if (switchIndex != '分页查询') {
-            paramsGetResources.pageNum = 1
-          }
-          let dataResourceParams = {
-            serviceName: paramsGetResources.name, //资源名称
-            orderField: whoShow1.value.itShowQingDao
-              ? paramsGetResources.orderField == 'applyCount'
-                ? 'syqk'
-                : 'fbrq'
-              : paramsGetResources.orderField == 'applyCount'
+      console.log('selectDicStoreAll', ListContent)
+    }
+    // 筛选条件
+    let ListContent = reactive({
+      records: [],
+    })
+    const resourceList = reactive({ data: [] })
+    const videoList = reactive({ data: [] })
+    const resourceTotal = ref('')
+    const getAppResources = (switchIndex) => {
+      //switchIndex这个参数是下面的分页传过来的参数
+      paramsGetResources.name = searchValue.value
+      paramsGetResources.type = Cardsname.value
+      console.log(
+        '执行getAppResources====================》',
+        paramsGetResources
+      )
+      if (
+        !whoShow1.value.itShowBaoTou &&
+        paramsGetResources.type === '数据资源'
+      ) {
+        if (switchIndex != '分页查询') {
+          paramsGetResources.pageNum = 1
+        }
+        let dataResourceParams = {
+          serviceName: paramsGetResources.name, //资源名称
+          orderField: whoShow1.value.itShowQingDao
+            ? paramsGetResources.orderField == 'applyCount'
+              ? 'syqk'
+              : 'fbrq'
+            : paramsGetResources.orderField == 'applyCount'
               ? 'requestCount'
               : 'createTime', //排序字段
-            orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
-            pageNum: paramsGetResources.pageNum, //页码
-            pageSize: paramsGetResources.pageSize, //分页大小
-          }
-          getDataResource(dataResourceParams).then((res) => {
-            console.log('数据资源==================>', res.data.data)
-            if (whoShow1.value.itShowQingDao) {
-              res.data.data.data.forEach((val) => {
-                val.id = val.guid // id
-                val.name = val.zyname // 名字
-                val.sjlCount = val.sjcczl // 数据量
-                val.applyCount = val.syqk // 申请量
-                val.deptName = val.TGBM // 部门
-                val.createDate = val.fbrq // 发布时间
-              })
-              resourceList.data = res.data.data.data || []
-              resourceTotal.value = res.data.data.rows || ''
-              loading.value = false
-            } else if (whoShow1.value.itShowXiHaiAn) {
-              res.data.data.list.forEach((val) => {
-                val.id = val.serviceId // id
-                val.name = val.serviceName // 名字
-                val.sjlCount = val.requestQuantity // 数据量
-                val.applyCount = val.requestCount // 申请量
-                val.deptName = val.departmentName // 部门
-                val.createTime = val.createTime.split('.')[0]
-                val.createDate = val.createTime // 发布时间
-              })
-              resourceList.data = res.data.data.list || []
-              resourceTotal.value = res.data.data.total || ''
-              loading.value = false
-            }
-          })
-        } else if (paramsGetResources.type !== '数据资源') {
-          if (switchIndex != '分页查询') {
-            paramsGetResources.pageNum = 1
-          }
-          pageWithAttrs(paramsGetResources).then((res) => {
-            console.log('查询列表============>', resourceList, res.data.data)
-            resourceList.data = []
-            videoList.data = []
-            if (Cardsname.value === '基础设施') {
-              console.log('基础设施~~~~~~~~~~~')
-              resourceList.data = res.data.data.records || []
-              resourceTotal.value = res.data.data.total || ''
-              loading.value = false
-            } else {
-              // resourceList.data = res.data.data.records || []
-              resourceTotal.value = res.data.data.total || ''
-              getShoppingCartList(res.data.data.records)
-              console.log(
-                '其他~~~~~~~~~~~',
-                resourceList.data,
-                resourceTotal.value
-              )
-            }
-          })
+          orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
+          pageNum: paramsGetResources.pageNum, //页码
+          pageSize: paramsGetResources.pageSize, //分页大小
         }
-      }
-      let shoppingCartList = ref([])
-      // 获取申购车列表
-      const getShoppingCartList = (list) => {
-        getSgcList({
-          pageNum: 1,
-          pageSize: 500,
-          name: '',
-          type: '',
-        }).then((res) => {
-          console.log('申购车列表================>', res.data.data.records)
-          shoppingCartList.value = res.data.data.records
-          list.map((item) => {
-            item.isInShoppingCart = false
-            item.isInShoppingCart = shoppingCartList.value.some((item2) => {
-              return item.id === item2.resourceId
+        getDataResource(dataResourceParams).then((res) => {
+          if (whoShow1.value.itShowQingDao) {
+            res.data.data.data.forEach((val) => {
+              val.id = val.guid // id
+              val.name = val.zyname // 名字
+              val.sjlCount = val.sjcczl // 数据量
+              val.applyCount = val.syqk // 申请量
+              val.deptName = val.TGBM // 部门
+              val.createDate = val.fbrq // 发布时间
             })
-          })
-          console.log('经过过滤后的列表信息', list)
-          resourceList.data = list
-        })
-      }
-      mybus.on('paramsGetResources', (ids) => {
-        if (ids && ids.length > 0) {
-          paramsGetResources.deptIds = ids
-        } else {
-          delete paramsGetResources.deptIds
-        }
-        getAppResources()
-        console.log('paramsGetResources', paramsGetResources)
-      })
-      mybus.on('changePage', (page) => {
-        paramsGetResources.pageNum = page
-        console.log('changePage', paramsGetResources.pageNum)
-        getAppResources('分页查询')
-        console.log('paramsGetResources', paramsGetResources)
-      })
-      mybus.on('changeSelcted', () => {
-        getAppResources()
-      })
-      mybus.on('changeInfo', (info) => {
-        paramsGetResources.pageNum = 1
-        console.log('paramsGetResources.infoList', paramsGetResources.infoList)
-        paramsGetResources.infoList = paramsGetResources.infoList.filter(
-          (item) => item.attrType !== '文件类型'
-        )
-        if (info) {
-          paramsGetResources.infoList.push(info)
-        }
-        getAppResources()
-        console.log('paramsGetResources', paramsGetResources)
-      })
-      mybus.on('refresh', () => {
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        getAppResources()
-        // listKey.value++
-      })
-      mybus.on('changeCondition', (condition) => {
-        //  orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-        // orderType: 'ASC'  ASC 升序  DESC 降序
-        paramsGetResources.orderField = condition.orderField
-        paramsGetResources.orderType = condition.orderType
-        getAppResources()
-        console.log('paramsGetResources', paramsGetResources)
-      })
-      const pageChange = (val) => {
-        console.log(val)
-        loading.value = true
-        currentPage.value = val
-        paramsGetResources.pageNum = val
-        let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-        getAppResources(params)
-      }
-      // const findZywMessage = () => {
-      //   zywMessage().then((res) => {
-      //     console.log('findMessage============>', res)
-      //     const { data } = res.data
-      //     shujuziyuanqingkuang.value[0].value = data.sxmlcount
-      //     shujuziyuanqingkuang.value[1].value = data.yfbfwcount
-      //     shujuziyuanqingkuang.value[2].value = data.yfbjk
-      //     shujuziyuanqingkuang.value[3].value = new Date().toLocaleString()
-      //   })
-      // }
-      onMounted(() => {
-        listKey2.value++
-        console.log('45345345', Cardsname.value, tecHnosphere, appLiCation)
-        getNewList()
-        // findZywMessage()
-        // onSearch()
-        if (!tecHnosphere && !appLiCation) {
-          getAppResources()
-        } else {
-          // getNewList()
-        }
-      })
-      // 分页
-      const onShowSizeChange = (current, pageSize) => {
-        currentPage.value = current
-        currentPageSize.value = pageSize
-        paramsGetResources.pageNum = current
-        paramsGetResources.pageSize = pageSize
-        console.log('执行onShowSizeChange', paramsGetResources)
-        getAppResources()
-        console.log(current, pageSize)
-      }
-      watch(currentPageSize, () => {
-        console.log('pageSize', currentPageSize.value)
-      })
-      const changeShrink = (name) => {
-        ListContent.records.forEach((val) => {
-          if (val.name === name) {
-            console.log(val)
-            val.shrinkFlag = !val.shrinkFlag
+            resourceList.data = res.data.data.data || []
+            resourceTotal.value = res.data.data.rows || ''
+            loading.value = false
+          } else if (whoShow1.value.itShowXiHaiAn) {
+            res.data.data.list.forEach((val) => {
+              val.id = val.serviceId // id
+              val.name = val.serviceName // 名字
+              val.sjlCount = val.requestQuantity // 数据量
+              val.applyCount = val.requestCount // 申请量
+              val.deptName = val.departmentName // 部门
+              val.createTime = val.createTime.split('.')[0]
+              val.createDate = val.createTime // 发布时间
+            })
+            resourceList.data = res.data.data.list || []
+            resourceTotal.value = res.data.data.total || ''
+            loading.value = false
           }
         })
       }
-      const changeCards = (name) => {
-        resourceList.data = []
-        videoList.data = []
-        resourceTotal.value = ''
-        router.currentRoute.value.query.tecHnosphere = ''
-        router.currentRoute.value.query.appLiCation = ''
-        tecHnosphere = router.currentRoute.value.query.tecHnosphere
-        appLiCation = router.currentRoute.value.query.appLiCation
-        let newQuery = JSON.parse(
-          JSON.stringify(router.currentRoute.value.query)
-        )
-        // if (Cardsname.value == name) {
-        //   Cardsname.value = ''
-        // } else {
-        Cardsname.value = name
-        // }
-        console.log(
-          '更改前url中的select=====================>',
-          router.currentRoute.value.query.select
-        )
-        newQuery.select = Cardsname.value
-        router
-          .replace({
-            query: newQuery,
-          })
-          .then(() => {
-            console.log(
-              '更改后url中的select=====================>',
-              router.currentRoute.value.query.select
-            )
-            tagFlag.value = false
-            chongzhi()
-            getNewList()
-          })
+      else if (paramsGetResources.type !== '数据资源') {
+        if (switchIndex != '分页查询') {
+          paramsGetResources.pageNum = 1
+        }
+        pageWithAttrs(paramsGetResources).then((res) => {
+          console.log('查询列表============>', resourceList, res.data.data)
+          resourceList.data = []
+          videoList.data = []
+          if (Cardsname.value === '基础设施') {
+            resourceList.data = res.data.data.records || []
+            resourceTotal.value = res.data.data.total || ''
+            loading.value = false
+          } else {
+            resourceTotal.value = res.data.data.total || ''
+            getShoppingCartList(res.data.data.records)
+          }
+        })
       }
-      // 监听地址栏变化
-      window.addEventListener('hashchange', () => {
-        location.reload()
-        console.log('URL发生变化了')
+    }
+
+    let shoppingCartList = ref([])
+    // 获取申购车列表
+    const getShoppingCartList = (list) => {
+      getSgcList({
+        pageNum: 1,
+        pageSize: 500,
+        name: '',
+        type: '',
+      }).then((res) => {
+        console.log('申购车列表================>', res.data.data.records)
+        shoppingCartList.value = res.data.data.records
+        list.map((item) => {
+          item.isInShoppingCart = false
+          item.isInShoppingCart = shoppingCartList.value.some((item2) => {
+            return item.id === item2.resourceId
+          })
+        })
+        console.log('经过过滤后的列表信息', list)
+        resourceList.data = list
       })
-      return {
-        listKey,
-        ListContent,
-        searchValue,
-        currentPage,
-        ...toRefs(state),
-        changeCards,
-        handleChange,
-        resourceList,
-        videoList,
-        resourceTotal,
-        pageChange,
-        listKey2,
-        Cardsname,
-        getNewList,
-        getAppResources,
-        chongzhi,
-        onSearch,
-        onShowSizeChange,
-        currentPageSize,
-        pageSizeOptions,
-        changeShrink,
-        titleName,
-        keyongziyuanqingkaung,
-        shujuziyuanqingkuang,
-        dianjitiaozhaun,
-        chagneTag,
-        tagFlag,
-        current,
-        openMonitor,
-        stateTags,
-        selStateTags,
-        handleChangeStateTag,
-        bqTags,
-        selBqTags,
-        handleChangeBqTags,
-        loading,
-        getShoppingCartList,
-        whoShow1,
+    }
+    mybus.on('paramsGetResources', (ids) => {
+      if (ids && ids.length > 0) {
+        paramsGetResources.deptIds = ids
+      } else {
+        delete paramsGetResources.deptIds
       }
-    },
-    components: {
-      HomeHeader,
-      HomeFooter,
-      detailsPageconetentTree,
-      searchResultList,
-      UpOutlined,
-      DownOutlined,
-      KnowledgeBase,
-      // VideoCameraOutlined,
-      // VideoSurveillance,
-      DetailsPageResource,
-      infrastructurePage,
-      detailsPageInfrastructureTree,
-    },
-    beforeUnmount() {
-      mybus.off('selectCardsitem')
-      mybus.off('paramsGetResources')
-      mybus.off('changeCondition')
-      mybus.off('refresh')
-      mybus.off('changePage')
-      mybus.off('changeInfo')
-    },
-  })
+      getAppResources()
+      console.log('paramsGetResources', paramsGetResources)
+    })
+    mybus.on('changePage', (page) => {
+      paramsGetResources.pageNum = page
+      console.log('changePage', paramsGetResources.pageNum)
+      getAppResources('分页查询')
+      console.log('paramsGetResources', paramsGetResources)
+    })
+    mybus.on('changeSelcted', () => {
+      getAppResources()
+    })
+    mybus.on('changeInfo', (info) => {
+      paramsGetResources.pageNum = 1
+      console.log('paramsGetResources.infoList', paramsGetResources.infoList)
+      paramsGetResources.infoList = paramsGetResources.infoList.filter(
+        (item) => item.attrType !== '文件类型'
+      )
+      if (info) {
+        paramsGetResources.infoList.push(info)
+      }
+      getAppResources()
+      console.log('paramsGetResources', paramsGetResources)
+    })
+    mybus.on('refresh', () => {
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      getAppResources()
+    })
+    mybus.on('changeCondition', (condition) => {
+      //  orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+      // orderType: 'ASC'  ASC 升序  DESC 降序
+      paramsGetResources.orderField = condition.orderField
+      paramsGetResources.orderType = condition.orderType
+      getAppResources()
+      console.log('paramsGetResources', paramsGetResources)
+    })
+    const pageChange = (val) => {
+      console.log(val)
+      loading.value = true
+      currentPage.value = val
+      paramsGetResources.pageNum = val
+      let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+      getAppResources(params)
+    }
+
+    onMounted(() => {
+      listKey2.value++;
+
+      // 获取筛选条件
+      getNewList()
+
+      if (!tecHnosphere && !appLiCation) {
+        getAppResources()
+      }
+    })
+
+    // 分页
+    const onShowSizeChange = (current, pageSize) => {
+      currentPage.value = current
+      currentPageSize.value = pageSize
+      paramsGetResources.pageNum = current
+      paramsGetResources.pageSize = pageSize
+      console.log('执行onShowSizeChange', paramsGetResources)
+      getAppResources()
+    }
+    watch(currentPageSize, () => {
+      console.log('pageSize', currentPageSize.value)
+    })
+
+    const changeShrink = (name) => {
+      ListContent.records.forEach((val) => {
+        if (val.name === name) {
+          console.log(val)
+          val.shrinkFlag = !val.shrinkFlag
+        }
+      })
+    }
+    const changeCards = (name) => {
+      resourceList.data = []
+      videoList.data = []
+      resourceTotal.value = ''
+      router.currentRoute.value.query.tecHnosphere = ''
+      router.currentRoute.value.query.appLiCation = ''
+      tecHnosphere = router.currentRoute.value.query.tecHnosphere
+      appLiCation = router.currentRoute.value.query.appLiCation
+      let newQuery = JSON.parse(
+        JSON.stringify(router.currentRoute.value.query)
+      )
+      Cardsname.value = name
+      console.log(
+        '更改前url中的select=====================>',
+        router.currentRoute.value.query.select
+      )
+      newQuery.select = Cardsname.value
+      router
+        .replace({
+          query: newQuery,
+        })
+        .then(() => {
+          console.log(
+            '更改后url中的select=====================>',
+            router.currentRoute.value.query.select
+          )
+          // router.currentRoute.value.query.select
+          tagFlag.value = false
+          chongzhi()
+          getNewList()
+        })
+    }
+    // 监听地址栏变化
+    window.addEventListener('hashchange', () => {
+      location.reload()
+      console.log('URL发生变化了')
+    })
+    return {
+      listKey,
+      ListContent,
+      searchValue,
+      currentPage,
+      ...toRefs(state),
+      changeCards,
+      handleChange,
+      resourceList,
+      videoList,
+      resourceTotal,
+      pageChange,
+      listKey2,
+      Cardsname,
+      getNewList,
+      getAppResources,
+      chongzhi,
+      onSearch,
+      onShowSizeChange,
+      currentPageSize,
+      pageSizeOptions,
+      changeShrink,
+      titleName,
+      keyongziyuanqingkaung,
+      shujuziyuanqingkuang,
+      dianjitiaozhaun,
+      chagneTag,
+      tagFlag,
+      current,
+      openMonitor,
+      stateTags,
+      selStateTags,
+      handleChangeStateTag,
+      // bqTags,
+      selBqTags,
+      handleChangeBqTags,
+      loading,
+      getShoppingCartList,
+      whoShow1,
+    }
+  },
+  components: {
+    HomeHeader,
+    HomeFooter,
+    detailsPageconetentTree,
+    searchResultList,
+    UpOutlined,
+    DownOutlined,
+    KnowledgeBase,
+    // VideoCameraOutlined,
+    // VideoSurveillance,
+    DetailsPageResource,
+    infrastructurePage,
+    detailsPageInfrastructureTree,
+  },
+  beforeUnmount() {
+    mybus.off('selectCardsitem')
+    mybus.off('paramsGetResources')
+    mybus.off('changeCondition')
+    mybus.off('refresh')
+    mybus.off('changePage')
+    mybus.off('changeInfo')
+  },
+})
 </script>
 <style lang="less" scoped>
-  .resultListSearchInput-father {
-    background: #f3f5f9;
-    padding-left: 0.2rem;
-    padding-top: 0.2rem;
-    .resultListSearchInput-son {
-      background: #fff;
-      padding: 0.2rem 0.2rem 0rem 0.3rem;
-      margin-right: 0.2rem;
-      .hengxian {
-        width: 100%;
-        height: 0.01rem;
-        background: rgba(150, 144, 144, 0.3);
-        margin-top: 0.2rem;
-      }
+.resultListSearchInput-father {
+  background: #f3f5f9;
+  padding: 0.2rem;
+
+  // padding-left: 0.2rem;
+  // padding-top: 0.2rem;
+  .resultListSearchInput-son {
+    background: #fff;
+    padding: 0.2rem 0.2rem 0rem 0.3rem;
+
+    .hengxian {
+      width: 100%;
+      height: 0.01rem;
+      background: rgba(150, 144, 144, 0.3);
+      margin-top: 0.2rem;
     }
   }
-  .resultListSearchInput {
-    margin-left: 0.1rem;
-    :deep(.ant-input) {
-      width: 4rem;
-      height: 0.36rem;
-      background: #fff;
-      border-radius: 0.04rem;
-    }
-    :deep(.ant-input-search-button) {
-      width: 0.8rem;
-      height: 0.36rem;
-      background: #0087ff;
-      border-radius: 0.04rem !important;
-      font-size: 0.14rem;
-      font-weight: 400;
-      color: #fff;
-      line-height: 0.34rem;
-      margin-left: 0.1rem;
-    }
-    :deep(.ant-input-group-addon) {
-      left: 0 !important;
-    }
+}
+
+.resultListSearchInput {
+  margin-left: 0.1rem;
+
+  :deep(.ant-input) {
+    width: 4rem;
+    height: 0.36rem;
+    background: #fff;
+    border-radius: 0.04rem;
   }
-  .button-reset {
-    border: 0;
-    outline: none;
+
+  :deep(.ant-input-search-button) {
     width: 0.8rem;
     height: 0.36rem;
-    background: #e1edfa;
-    border-radius: 0.04rem;
+    background: #0087ff;
+    border-radius: 0.04rem !important;
     font-size: 0.14rem;
     font-weight: 400;
-    color: #0087ff;
+    color: #fff;
     line-height: 0.34rem;
-    margin-left: 2.5rem;
-    cursor: pointer;
+    margin-left: 0.1rem;
   }
-  .details-pageconetent {
-    height: 100%;
-    width: 100%;
-    display: flex;
-    // flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    margin-top: 0.67rem;
+
+  :deep(.ant-input-group-addon) {
+    left: 0 !important;
+  }
+}
+
+.button-reset {
+  border: 0;
+  outline: none;
+  width: 0.8rem;
+  height: 0.36rem;
+  background: #e1edfa;
+  border-radius: 0.04rem;
+  font-size: 0.14rem;
+  font-weight: 400;
+  color: #0087ff;
+  line-height: 0.34rem;
+  margin-left: 2.5rem;
+  cursor: pointer;
+}
+
+.details-pageconetent {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 0.67rem;
+  position: relative;
+  background: rgba(245, 243, 243, 0.3);
+
+  .details-pageconetent-left {
+    max-height: 6.9rem;
+    position: absolute;
+    width: 2.5rem;
+    top: 0.17rem;
+    left: 2.5rem;
+    margin-right: 0.17rem;
+    overflow: auto;
+  }
+
+  .top {
+    min-height: 7.2rem;
     position: relative;
-    background: rgba(245, 243, 243, 0.3);
-    .details-pageconetent-left {
-      max-height: 6.9rem;
-      position: absolute;
-      width: 2.5rem;
-      top: 0.17rem;
-      left: 2.5rem;
-      margin-right: 0.17rem;
-      overflow: auto;
+    width: 11.5rem;
+    display: flex;
+    padding-top: 0.2rem;
+    flex-direction: column;
+    font-size: 0.16rem;
+    justify-content: left;
+    margin-left: 2.5rem;
+    background: #f3f5f9;
+
+    .pagination {
+      background: #f3f5f9;
+      padding-bottom: 0.6rem;
     }
-    .top {
-      min-height: 7.2rem;
-      position: relative;
-      width: 10.87rem;
-      display: flex;
-      padding-top: 0.2rem;
-      flex-direction: column;
-      // align-items: center;
-      font-size: 0.16rem;
-      justify-content: left;
-      margin-left: 2.5rem;
-      .pagination {
-        background: #f3f5f9;
-        padding-bottom: 0.6rem;
-      }
-      .jichusheshi {
-        // display: flex;
-        // flex-direction: column;
-        // justify-content: center;
-        // padding-top: .4rem;
-        height: 4.45rem;
-        // overflow: hidden;
-        .yunziyuan {
-          width: 100%;
-          position: relative;
-          .shuoming {
-            position: absolute;
-            right: 0.2rem;
-            top: 0.15rem;
-            font-size: 0.12rem;
-          }
-          .yunziyuan-title {
-            display: flex;
-            align-items: center;
-            .tupian {
-              // width: .89rem;
-              // height: .74rem;
-              // background: url('~@/assets/home/yunziyuan.png');
-            }
-            .title {
-              margin-left: 0.1rem;
-              font-weight: 600;
-              text-decoration: underline;
-              cursor: pointer;
-            }
-          }
-          .fenlei {
-            display: flex;
-            margin-left: 0.2rem;
-            margin-right: 0.3rem;
-            justify-content: space-between;
-          }
-          .keyongziyuan {
-            display: flex;
-            justify-content: space-between;
-            margin-left: 0.3rem;
-            margin-right: 0.3rem;
-            div {
-              display: flex;
-              div:last-child {
-                font-weight: 600;
-              }
-            }
-          }
+
+    .jichusheshi {
+      height: 4.45rem;
+
+      .yunziyuan {
+        width: 100%;
+        position: relative;
+
+        .shuoming {
+          position: absolute;
+          right: 0.2rem;
+          top: 0.15rem;
+          font-size: 0.12rem;
         }
-        .yunziyuan > div {
-          margin-bottom: 0.1rem;
-        }
-        .shipin {
-          width: 100%;
-          .shipin-title {
-            display: flex;
-            align-items: center;
-            .tupian {
-              // width: .56rem;
-              // height: .5rem;
-              // background: url('~@/assets/home/shipin.png');
-            }
-            .title {
-              margin-left: 0.1rem;
-              font-weight: 600;
-              text-decoration: underline;
-              cursor: pointer;
-            }
-          }
-          .fenlei {
-            display: flex;
-            margin-left: 0.2rem;
-            div {
-              margin-right: 0.6rem;
-            }
-            .shuzi {
-              font-weight: 600;
-            }
-          }
-        }
-        .shipin > div {
-          margin-bottom: 0.1rem;
-        }
-      }
-      .jichusheshi > div {
-        // background: #eaf4ff;
-        padding-top: 0.1rem;
-        border-radius: 0.04rem;
-        margin-bottom: 0.2rem;
-        padding-bottom: 0.4rem;
-      }
-      .shujuziyuan {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        padding-top: 0.4rem;
-        .yunziyuan {
-          width: 100%;
-          position: relative;
-          .shuoming {
-            position: absolute;
-            right: 0.2rem;
-            top: 0.15rem;
-            font-size: 0.12rem;
-          }
-          .yunziyuan-title {
-            display: flex;
-            align-items: center;
-            margin-left: 0.2rem;
-            .tupian {
-              // width: .51rem;
-              // height: .5rem;
-              // background: url('~@/assets/home/shujuziyuan.png');
-            }
-            .title {
-              margin-left: 0.1rem;
-              font-weight: 600;
-              text-decoration: underline;
-              cursor: pointer;
-            }
-          }
-          .fenlei {
-            display: flex;
-            margin-left: 0.2rem;
-            margin-right: 0.3rem;
-            justify-content: space-between;
-          }
-          .keyongziyuan {
-            display: flex;
-            justify-content: space-between;
-            margin-left: 0.3rem;
-            margin-right: 0.3rem;
-            div {
-              display: flex;
-              div:last-child {
-                font-weight: 600;
-              }
-            }
-          }
-        }
-        .yunziyuan > div {
-          margin-bottom: 0.1rem;
-        }
-      }
-      .shujuziyuan > div {
-        background: #eaf4ff;
-        padding-top: 0.1rem;
-        border-radius: 0.04rem;
-        margin-bottom: 0.2rem;
-        padding-bottom: 0.4rem;
-      }
-      .top-title {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        font-size: 0.2rem;
-        font-family: 'Alibaba PuHuiTi';
-        color: #000000;
-        line-height: 0.34rem;
-        .photo {
-          display: inline-block;
-          height: 0.44rem;
-          width: 0.44rem;
-          margin-right: 0.1rem;
-        }
-        div {
-          margin: 0 0.2rem;
-          padding: 0 0.1rem;
-          cursor: pointer;
+
+        .yunziyuan-title {
           display: flex;
           align-items: center;
+
+          .tupian {}
+
+          .title {
+            margin-left: 0.1rem;
+            font-weight: 600;
+            text-decoration: underline;
+            cursor: pointer;
+          }
         }
-        div:hover {
-          color: #0087ff;
+
+        .fenlei {
+          display: flex;
+          margin-left: 0.2rem;
+          margin-right: 0.3rem;
+          justify-content: space-between;
         }
-        .sel {
-          font-weight: 600;
-          color: #0087ff;
-          border-bottom: 0.02rem solid #0087ff;
+
+        .keyongziyuan {
+          display: flex;
+          justify-content: space-between;
+          margin-left: 0.3rem;
+          margin-right: 0.3rem;
+
+          div {
+            display: flex;
+
+            div:last-child {
+              font-weight: 600;
+            }
+          }
         }
       }
-      .top-content-father {
-        width: 10.87rem;
-        // padding-left: 0.2rem;
-        // margin-bottom: .2rem;
-        padding: 0.16rem;
-        background: #f3f5f9;
-        .top-content-son {
-          background: #fff;
-          margin: 0rem 0.2rem 0.2rem 0rem;
-          padding-top: 0.2rem;
-          padding-bottom: 0.2rem;
-        }
-        .top-content {
+
+      .yunziyuan>div {
+        margin-bottom: 0.1rem;
+      }
+
+      .shipin {
+        width: 100%;
+
+        .shipin-title {
           display: flex;
-          margin-top: 0rem;
-          span:nth-child(1) {
-            display: inline-block;
-            position: relative;
-            // width: .7rem;
-            line-height: 0.3614rem;
-            white-space: normal;
-            text-align: center;
-            vertical-align: middle;
-          }
-          // .top-content-title {
-          //   top: -0.2rem;
-          // }
-          .leixingsumfather {
-            width: 8.1rem;
-            display: inline-block;
-            height: 0.3014rem;
-            overflow: hidden;
-            // width: 7.18rem;
-          }
-          .leixingsumfather2 {
-            width: 9.2rem;
-          }
-          .leixingsum {
-            display: inline-block;
+          align-items: center;
+
+          .tupian {}
+
+          .title {
+            margin-left: 0.1rem;
+            font-weight: 600;
+            text-decoration: underline;
             cursor: pointer;
-            text-align: center;
-            margin-top: 0.05rem;
-            // margin-bottom: .1rem;
-            .ant-tag-checkable {
-              width: 0.83rem;
-              height: 0.25rem;
-              display: flex;
-              justify-content: center;
-              align-items: center;
-              padding-left: 0.05rem;
-              padding-right: 0.05rem;
-              float: left;
-              margin: 0 0.15rem;
-              font-family: 'AlibabaPuHuiTiR';
-              font-size: 0.14rem;
-              color: #333333;
-              font-weight: 500;
-              text-align: center;
-              line-height: 0.14rem;
-            }
-            :deep(.ant-tag-checkable-checked) {
-              // width: .67rem;
-              margin-left: 0.15rem;
-              margin-right: 0.15rem;
-              text-align: center;
-            }
-            .ant-tag-checkable:active,
-            .ant-tag-checkable-checked {
-              width: 0.85rem;
-              font-family: 'Alibaba PuHuiTi';
-              font-weight: 500;
-              background-color: #0087ff;
-              color: #ffffff;
-              border-radius: 0.16rem;
+          }
+        }
+
+        .fenlei {
+          display: flex;
+          margin-left: 0.2rem;
+
+          div {
+            margin-right: 0.6rem;
+          }
+
+          .shuzi {
+            font-weight: 600;
+          }
+        }
+      }
+
+      .shipin>div {
+        margin-bottom: 0.1rem;
+      }
+    }
+
+    .jichusheshi>div {
+      padding-top: 0.1rem;
+      border-radius: 0.04rem;
+      margin-bottom: 0.2rem;
+      padding-bottom: 0.4rem;
+    }
+
+    .shujuziyuan {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      padding-top: 0.4rem;
+
+      .yunziyuan {
+        width: 100%;
+        position: relative;
+
+        .shuoming {
+          position: absolute;
+          right: 0.2rem;
+          top: 0.15rem;
+          font-size: 0.12rem;
+        }
+
+        .yunziyuan-title {
+          display: flex;
+          align-items: center;
+          margin-left: 0.2rem;
+
+          .tupian {}
+
+          .title {
+            margin-left: 0.1rem;
+            font-weight: 600;
+            text-decoration: underline;
+            cursor: pointer;
+          }
+        }
+
+        .fenlei {
+          display: flex;
+          margin-left: 0.2rem;
+          margin-right: 0.3rem;
+          justify-content: space-between;
+        }
+
+        .keyongziyuan {
+          display: flex;
+          justify-content: space-between;
+          margin-left: 0.3rem;
+          margin-right: 0.3rem;
+
+          div {
+            display: flex;
+
+            div:last-child {
+              font-weight: 600;
             }
           }
-          .active {
-            font-family: Alibaba PuHuiTi;
+        }
+      }
+
+      .yunziyuan>div {
+        margin-bottom: 0.1rem;
+      }
+    }
+
+    .shujuziyuan>div {
+      background: #eaf4ff;
+      padding-top: 0.1rem;
+      border-radius: 0.04rem;
+      margin-bottom: 0.2rem;
+      padding-bottom: 0.4rem;
+    }
+
+    .top-title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      font-size: 0.2rem;
+      font-family: 'Alibaba PuHuiTi';
+      color: #000000;
+      line-height: 0.34rem;
+
+      .photo {
+        display: inline-block;
+        height: 0.44rem;
+        width: 0.44rem;
+        margin-right: 0.1rem;
+      }
+
+      div {
+        margin: 0 0.2rem;
+        padding: 0 0.1rem;
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+      }
+
+      div:hover {
+        color: #0087ff;
+      }
+
+      .sel {
+        font-weight: 600;
+        color: #0087ff;
+        border-bottom: 0.02rem solid #0087ff;
+      }
+    }
+
+    .top-content-father {
+      width: 100%;
+      padding: 0 0.2rem 0.2rem 0.2rem;
+      background: #f3f5f9;
+      margin-bottom: 0.2rem;
+
+      .top-content-son {
+        background: #fff;
+        padding: 0.2rem 0;
+      }
+
+      .top-content {
+        display: flex;
+        margin-top: 0rem;
+
+        span:nth-child(1) {
+          display: inline-block;
+          position: relative;
+          line-height: 0.3614rem;
+          white-space: normal;
+          text-align: center;
+          vertical-align: middle;
+        }
+
+        .leixingsumfather {
+          width: 8.1rem;
+          display: inline-block;
+          height: 0.3014rem;
+          overflow: hidden;
+        }
+
+        .leixingsumfather2 {
+          width: 9.2rem;
+        }
+
+        .leixingsum {
+          display: inline-block;
+          cursor: pointer;
+          text-align: center;
+          margin-top: 0.05rem;
+
+          .ant-tag-checkable {
+            width: 0.83rem;
+            height: 0.25rem;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            padding-left: 0.05rem;
+            padding-right: 0.05rem;
+            float: left;
+            margin: 0 0.15rem;
+            font-family: 'AlibabaPuHuiTiR';
+            font-size: 0.14rem;
+            color: #333333;
+            font-weight: 500;
+            text-align: center;
+            line-height: 0.14rem;
+          }
+
+          :deep(.ant-tag-checkable-checked) {
+            margin-left: 0.15rem;
+            margin-right: 0.15rem;
+            text-align: center;
+          }
+
+          .ant-tag-checkable:active,
+          .ant-tag-checkable-checked {
+            width: 0.85rem;
+            font-family: 'Alibaba PuHuiTi';
             font-weight: 500;
             background-color: #0087ff;
             color: #ffffff;
+            border-radius: 0.16rem;
           }
         }
-        .top-content:nth-child(1) {
-          margin-top: 0rem !important;
-        }
-      }
-    }
-  }
-  .shrinkTag {
-    width: 0.5rem;
-    display: flex;
-    justify-content: center;
-    align-items: flex-end;
-    margin-bottom: 0.05rem;
-    span {
-      cursor: pointer;
-    }
-  }
-  .shrink {
-    height: unset !important;
-    overflow: unset !important;
-  }
-  .talk-monitor {
-    position: fixed;
-    bottom: 0.5rem;
-    right: 0.1rem;
-    z-index: 9999;
-    cursor: pointer;
-    i {
-      width: 0.64rem;
-      height: 0.64rem;
-      display: inline-block;
-      background: url('~@/assets/home/icon-talk.png');
-      background-size: cover;
-    }
-  }
-  .top-content-father {
-    width: 10.87rem;
-    padding-left: 0.2rem;
-    // margin-bottom: .2rem;
-    .top-content {
-      display: flex;
-      margin-top: 0.23rem;
-      span:nth-child(1) {
-        display: inline-block;
-        position: relative;
-        width: 0.68rem;
-        font-weight: 600;
-        white-space: normal;
-        text-align: center;
-        vertical-align: middle;
-        font-size: 0.16rem;
-        margin-left: 0.3rem;
-      }
-      // .top-content-title {
-      //   top: -0.2rem;
-      // }
-      .leixingsumfather {
-        width: 7.7rem;
-        display: inline-block;
-        height: 0.3014rem;
-        overflow: hidden;
-        // width: 7.18rem;
-      }
-      .leixingsum {
-        width: 0.93rem;
-        display: inline-block;
-        cursor: pointer;
-        text-align: center;
-        margin-top: 0.05rem;
-        // margin-bottom: .1rem;
-        .ant-tag-checkable {
-          width: 0.85rem;
-          height: 0.25rem;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          padding-left: 0.05rem;
-          padding-right: 0.05rem;
-          float: left;
-          margin: 0 0.15rem;
-          font-family: 'AlibabaPuHuiTiR';
-          font-size: 0.14rem;
-          color: #333333;
-          font-weight: 500;
-          text-align: center;
-          line-height: 0.14rem;
-        }
-        :deep(.ant-tag-checkable-checked) {
-          // width: .67rem;
-          margin-left: 0.15rem;
-          margin-right: 0.15rem;
-          text-align: center;
-        }
-        .ant-tag-checkable:active,
-        .ant-tag-checkable-checked {
-          width: 0.85rem;
-          font-family: 'Alibaba PuHuiTi';
+
+        .active {
+          font-family: Alibaba PuHuiTi;
           font-weight: 500;
           background-color: #0087ff;
           color: #ffffff;
-          border-radius: 0.16rem;
         }
       }
-      .active {
-        font-family: Alibaba PuHuiTi;
+
+      .top-content:nth-child(1) {
+        margin-top: 0rem !important;
+      }
+    }
+  }
+}
+
+.shrinkTag {
+  width: 0.5rem;
+  display: flex;
+  justify-content: center;
+  align-items: flex-end;
+  margin-bottom: 0.05rem;
+
+  span {
+    cursor: pointer;
+  }
+}
+
+.shrink {
+  height: unset !important;
+  overflow: unset !important;
+}
+
+.talk-monitor {
+  position: fixed;
+  bottom: 0.5rem;
+  right: 0.1rem;
+  z-index: 9999;
+  cursor: pointer;
+
+  i {
+    width: 0.64rem;
+    height: 0.64rem;
+    display: inline-block;
+    background: url('~@/assets/home/icon-talk.png');
+    background-size: cover;
+  }
+}
+
+.top-content-father {
+  width: 10.87rem;
+  padding-left: 0.2rem;
+
+  // margin-bottom: .2rem;
+  .top-content {
+    display: flex;
+    margin-top: 0.23rem;
+
+    span:nth-child(1) {
+      display: inline-block;
+      position: relative;
+      width: 0.68rem;
+      font-weight: 600;
+      white-space: normal;
+      text-align: center;
+      vertical-align: middle;
+      font-size: 0.16rem;
+      margin-left: 0.3rem;
+    }
+
+    // .top-content-title {
+    //   top: -0.2rem;
+    // }
+    .leixingsumfather {
+      width: 7.7rem;
+      display: inline-block;
+      height: 0.3014rem;
+      overflow: hidden;
+      // width: 7.18rem;
+    }
+
+    .leixingsum {
+      width: 0.93rem;
+      display: inline-block;
+      cursor: pointer;
+      text-align: center;
+      margin-top: 0.05rem;
+
+      // margin-bottom: .1rem;
+      .ant-tag-checkable {
+        width: 0.85rem;
+        height: 0.25rem;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding-left: 0.05rem;
+        padding-right: 0.05rem;
+        float: left;
+        margin: 0 0.15rem;
+        font-family: 'AlibabaPuHuiTiR';
+        font-size: 0.14rem;
+        color: #333333;
+        font-weight: 500;
+        text-align: center;
+        line-height: 0.14rem;
+      }
+
+      :deep(.ant-tag-checkable-checked) {
+        // width: .67rem;
+        margin-left: 0.15rem;
+        margin-right: 0.15rem;
+        text-align: center;
+      }
+
+      .ant-tag-checkable:active,
+      .ant-tag-checkable-checked {
+        width: 0.85rem;
+        font-family: 'Alibaba PuHuiTi';
         font-weight: 500;
         background-color: #0087ff;
         color: #ffffff;
+        border-radius: 0.16rem;
       }
     }
-    .top-content:nth-child(1) {
-      margin-top: 0.41rem !important;
+
+    .active {
+      font-family: Alibaba PuHuiTi;
+      font-weight: 500;
+      background-color: #0087ff;
+      color: #ffffff;
     }
   }
-  :deep(.ant-card-grid) {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    -webkit-line-clamp: 1;
+
+  .top-content:nth-child(1) {
+    margin-top: 0.41rem !important;
   }
+}
+
+:deep(.ant-card-grid) {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 1;
+}
 </style>
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 19bc6095..0c509723 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -205,6 +205,15 @@
           path: '/assignCase',
         })
         break
+      case '融合服务':
+        router.push({
+          path: '/integrationServices',
+          //  path: '/DetailsPageconetent',
+            query: {
+              select: '融合服务',
+            },
+        })
+        break
       default:
         router.push('/home')
         break
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index a17ce205..5b8574a2 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -6,91 +6,67 @@
         检测结果:
         <span>{{ resourceTotal || '' }}</span>
         个{{
-          cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
+            cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
         }}
       </div>
       <div class="condition" :key="showKey">
-        <ul>
-          <li
-            v-for="item in selList"
-            :key="item.value"
-            @click="changeCondition(item.value)"
-            v-show="item.show"
-          >
+        <ul v-if="selectCardsname == '融合服务'">
+          <li v-for="(item, i) in orderList" :key="item.value" @click="changeOrder(i, item.value, item.orderType)">
             {{ item.name }}
-            <span
-              class="arrow"
-              :class="item.value == selData ? 'down' : ''"
-            ></span>
+            <span class="arrow" :class="item.orderType == 'ASC' ? 'down' : ''"></span>
+          </li>
+        </ul>
+        <ul v-else>
+          <li v-for="item in selList" :key="item.value" @click="changeCondition(item.value)" v-show="item.show">
+            {{ item.name }}
+            <span class="arrow" :class="item.value == selData ? 'down' : ''"></span>
           </li>
         </ul>
       </div>
     </div>
-    <div
-      class="result-list"
-      v-for="(item, index) in resourceList.data"
-      :key="item.index"
-    >
+    <div class="result-list" v-for="(item, index) in resourceList.data" :key="item.index">
       <div class="item" :key="showKey">
-        <div
-          class="left"
-          :class="
-            item.type == '应用资源'
-              ? 'yyzy'
-              : item.type == '数据资源'
+        <div class="left" :class="
+          item.type == '应用资源'
+            ? 'yyzy'
+            : item.type == '数据资源'
               ? 'sjzy'
               : item.infoList &&
                 item.infoList.filter((val) => val.attrType == '组件类型')[0]
                   .attrValue == '智能算法'
-              ? 'znsf'
-              : item.infoList &&
-                item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                  .attrValue == '图层服务'
-              ? 'tcfw'
-              : item.infoList &&
-                item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                  .attrValue == '开发组件'
-              ? 'kfzj'
-              : item.infoList &&
-                item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                  .attrValue == '业务组件'
-              ? 'ywzj'
-              : ''
-          "
-          v-if="selectCardsname !== '基础设施'"
-        ></div>
-        <div class="left jcss" v-else></div>
+                ? 'znsf'
+                : item.infoList &&
+                  item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                    .attrValue == '图层服务'
+                  ? 'tcfw'
+                  : item.infoList &&
+                    item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                      .attrValue == '开发组件'
+                    ? 'kfzj'
+                    : item.infoList &&
+                      item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                        .attrValue == '业务组件'
+                      ? 'ywzj'
+                      : ''
+        " v-if="selectCardsname !== '基础设施' && selectCardsname !== '融合服务'"></div>
+        <div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
+        <div class="left rhfw" v-else-if="selectCardsname === '融合服务'"></div>
         <div class="right">
           <div class="header">
             <span style="display: flex; align-items: center; width: 680px">
               {{ item.name }}
-              <svg
-                t="1652322568870"
-                class="icon"
-                viewBox="0 0 3072 1024"
-                version="1.1"
-                xmlns="http://www.w3.org/2000/svg"
-                p-id="3062"
-                width="40"
-                height="40"
-                v-if="item.applyState == '通过'"
-                style="margin-left: 10px"
-              >
+              <svg t="1652322568870" class="icon" viewBox="0 0 3072 1024" version="1.1"
+                xmlns="http://www.w3.org/2000/svg" p-id="3062" width="40" height="40" v-if="item.applyState == '通过'"
+                style="margin-left: 10px">
                 <path
                   d="M2958.222222 0a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H500.053333a113.777778 113.777778 0 0 1-85.617777-38.798222L32.824889 549.432889a56.888889 56.888889 0 0 1 0-74.922667L414.435556 38.798222A113.777778 113.777778 0 0 1 499.996444 0H2958.222222z m0 56.888889H500.053333a56.888889 56.888889 0 0 0-42.837333 19.399111L75.605333 512l381.610667 435.712a56.888889 56.888889 0 0 0 42.780444 19.399111H2958.222222a56.888889 56.888889 0 0 0 56.888889-56.888889V113.777778a56.888889 56.888889 0 0 0-56.888889-56.888889z"
-                  fill="#d81e06"
-                  p-id="3063"
-                ></path>
+                  fill="#d81e06" p-id="3063"></path>
                 <path
                   d="M398.222222 398.222222a113.777778 113.777778 0 1 1 0 227.555556 113.777778 113.777778 0 0 1 0-227.555556z m0 56.888889a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z"
-                  fill="#d81e06"
-                  p-id="3064"
-                ></path>
+                  fill="#d81e06" p-id="3064"></path>
                 <path
                   d="M1309.582222 491.064889v-273.066667h-505.173333v47.786667h455.338667v178.176h-378.88V342.926222h-49.152v358.4c0 55.978667 27.306667 84.650667 82.602666 84.650667h370.005334c28.672-1.365333 51.2-8.874667 66.218666-23.210667 16.384-17.749333 27.989333-68.266667 34.816-152.917333l-47.786666-15.018667-1.706667 26.737778c-4.664889 58.766222-12.970667 93.582222-24.917333 104.334222-10.24 8.192-23.893333 12.288-40.277334 12.288h-342.698666c-31.402667 0-47.104-15.701333-47.104-45.738666v-201.386667h428.714666z m430.08-307.2v102.4h-219.136v386.389333h48.469334v-46.421333h170.666666v178.858667h50.517334v-178.858667h167.936v41.642667h48.469333V286.264889h-216.405333v-102.4h-50.517334z m-170.666666 395.946667v-102.4h170.666666v102.4h-170.666666z m221.184 0v-102.4h167.936v102.4h-167.936z m-221.184-146.773334V332.003556h170.666666v101.034666h-170.666666z m221.184 0V332.003556h167.936v101.034666h-167.936z m733.866666-251.221333v44.373333h-165.205333v40.277334h165.205333v45.738666h-137.898666v39.594667h137.898666V398.222222h-184.32v40.96h417.792V398.222222h-186.368v-46.421333h144.725334v-39.594667h-144.725334v-45.738666h169.301334v-40.277334h-169.301334v-44.373333h-47.104z m-85.333333 429.397333h220.501333v49.834667h-220.501333v-49.834667z m220.501333-38.229333h-220.501333v-50.517333h220.501333v50.517333z m-220.501333 126.293333h220.501333v38.912c0 15.701333-8.874667 23.893333-25.258666 23.893334l-54.613334-2.048 11.605334 43.690666h57.344c38.229333 0 58.026667-18.432 58.026666-55.296v-266.24H2391.608889V807.822222h47.104v-108.544z m-222.549333-509.952l-34.816 33.450667c49.152 36.864 88.064 71.68 116.736 104.448l33.450666-34.133333a795.079111 795.079111 0 0 0-115.370666-103.765334z m-82.602667 201.386667h144.725333v299.690667c20.48-19.114667 41.642667-40.277333 64.853334-64.170667l12.970666 51.882667a923.932444 923.932444 0 0 1-121.514666 105.813333l-19.114667-43.690667c10.24-9.557333 15.701333-19.797333 15.701333-31.402666V437.816889h-97.621333v-47.104z"
-                  fill="#d81e06"
-                  p-id="3065"
-                ></path>
+                  fill="#d81e06" p-id="3065"></path>
               </svg>
             </span>
             <div class="header-right">
@@ -103,30 +79,23 @@
                   <span>{{ item.createDate.substring(11, 19) }}</span>
                 </template>
                 <template v-else>--</template>
-                <!-- <span>{{ item.createDate || '--' }}</span> -->
               </div>
-              <!-- <div>
-                更新时间：
-                <span>{{ item.updateDate || '--' }}</span> -->
-              <!-- </div> -->
             </div>
           </div>
           <div class="dec">
-            <div
-              v-if="
-                selectCardsname !== '基础设施' && selectCardsname !== '数据资源'
-              "
-            >
+            <div v-if="
+              selectCardsname !== '基础设施' && selectCardsname !== '数据资源' && selectCardsname !== '融合服务'
+            ">
               <span>{{ item.shareType || '--' }}</span>
             </div>
-            <div>
+            <div v-if="selectCardsname !== '融合服务'">
               <span>{{ item.deptName || '--' }}</span>
             </div>
             <div v-if="selectCardsname !== '基础设施'">
               {{ item.description || '--' }}
             </div>
           </div>
-          <div class="bottom" v-if="selectCardsname !== '基础设施'">
+          <div class="bottom" v-if="selectCardsname !== '基础设施' && selectCardsname !== '融合服务'">
             <div>
               <div v-if="selectCardsname !== '数据资源'">
                 浏览量：{{ item.visits || 0 }}次
@@ -141,14 +110,7 @@
             </div>
             <div class="pingfen">
               <a-tooltip placement="top" mouseEnterDelay="1">
-                <!-- <template #title>
-                <span>{{ item.score || 0 }}分</span>
-              </template> -->
-                <a-rate
-                  :value="item.score || 0"
-                  disabled
-                  v-if="item.score != 0"
-                />
+                <a-rate :value="item.score || 0" disabled v-if="item.score != 0" />
               </a-tooltip>
             </div>
           </div>
@@ -156,60 +118,29 @@
             <div class="right" v-if="selectCardsname !== '基础设施'">
               <div class="shopping" :key="shoppingKey">
                 <template v-if="selectCardsname == '组件服务'">
-                  <span
-                    class="shopping-down"
-                    v-if="item.isInShoppingCart"
-                  ></span>
-                  <span
-                    class="shopping-on"
-                    v-else
-                    @click="addShoppingCart(item, index)"
-                  ></span>
+                  <span class="shopping-down" v-if="item.isInShoppingCart"></span>
+                  <span class="shopping-on" v-else @click="addShoppingCart(item, index)"></span>
                 </template>
               </div>
               <div class="sc">
-                <span
-                  class="sc-down"
-                  v-if="item.isCollect == 'false'"
-                  @click="addCollect(item)"
-                ></span>
-                <span
-                  class="sc-on"
-                  v-if="item.isCollect == 'true'"
-                  @click="addCollect(item)"
-                ></span>
+                <span class="sc-down" v-if="item.isCollect == 'false'" @click="addCollect(item)"></span>
+                <span class="sc-on" v-if="item.isCollect == 'true'" @click="addCollect(item)"></span>
               </div>
-              <div
-                class="shopping pk"
-                :key="pk"
-                v-show="
-                  cardType == '组件服务' && findComponentName(item, '智能算法')
-                "
-              >
+              <div class="shopping pk" :key="pk" v-show="
+                cardType == '组件服务' && findComponentName(item, '智能算法')
+              ">
                 <span class="pk-on" @click="goComparePk(item, index)"></span>
               </div>
-              <a-button
-                type="primary"
-                @click="toView('details', item)"
-                v-if="whoShow1.itShowQingDao"
-              >
+              <a-button type="primary" @click="toView('details', item)" v-if="whoShow1.itShowQingDao">
                 查看详情
               </a-button>
-              <!-- <a-button
-                style="margin-left: 10px"
-                v-show="
-                  cardType == '组件服务' && findComponentName(item, '智能算法')
-                "
-              >
-                免费试用
-              </a-button> -->
-              <a-button
-                type="primary"
-                @click="toView('apply', item)"
-                v-show="cardType == '组件服务'"
-              >
+              <a-button style="margin-left: 10px" v-show="selectCardsname === '融合服务'"
+                @click="handleAKeyApplication(item)">
+                一键申请
+              </a-button>
+              <a-button type="primary" @click="toView('apply', item)" v-show="cardType == '组件服务'">
                 {{
-                  item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
+                    item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
               </a-button>
             </div>
@@ -222,12 +153,7 @@
         </div>
       </div>
     </div>
-    <a-modal
-      v-model:visible="visible"
-      title="视频预览"
-      :width="750"
-      destroyOnClose
-    >
+    <a-modal v-model:visible="visible" title="视频预览" :width="750" destroyOnClose>
       <template #footer></template>
       <div style="width: 100%; display: flex; justify-content: center">
         <div style="width: 100%; height: 100%">
@@ -238,708 +164,755 @@
   </div>
 </template>
 <script>
-  import { ref, reactive } from 'vue'
-  import { message } from 'ant-design-vue'
-  import { useRouter } from 'vue-router'
-  import { getUser, sgcInsert } from '@/api/home'
-  import { scInsert, scDel } from '@/api/personalCenter'
-  import mybus from '@/myplugins/mybus'
-  import { getHls } from '@/api/home.js'
-  export default {
-    name: '',
-    // props: ['resourceList', 'resourceTotal', 'selectCardsname'],
-    props: {
-      resourceList: {
-        type: Object,
-        default: () => {},
-      },
-      resourceTotal: {
-        type: String,
-        default: '0',
-      },
-      selectCardsname: {
-        type: String,
-        default: '组件服务',
-      },
+import { ref, reactive } from 'vue'
+import { message } from 'ant-design-vue'
+import { useRouter } from 'vue-router'
+import { getUser, sgcInsert } from '@/api/home'
+import { scInsert, scDel } from '@/api/personalCenter'
+import mybus from '@/myplugins/mybus'
+import { getHls } from '@/api/home.js'
+export default {
+  name: '',
+  props: {
+    resourceList: {
+      type: Object,
+      default: () => { },
     },
-    computed: {
-      dataList() {
-        const newArr = []
-        for (let i = 0; i < this.resourceList.data.length; i++) {
-          let arr = [
-            {
-              name: '应用名称',
-              value: '',
-            },
-            {
-              name: '应用ID',
-              value: '',
-              dataResourceId: '',
-            },
-            {
-              name: '应用领域',
-              value: '',
-            },
-            {
-              name: '组件类型',
-              value: '',
-            },
-            {
-              name: '技术领域',
-              value: '',
-            },
-            {
-              name: '共享类型',
-              value: '',
-            },
-            {
-              name: '共享条件',
-              value: '',
-            },
-          ]
-          arr.map((item) => {
-            if (item.name === '应用名称') {
-              item.value = this.resourceList.data[i].name
-            }
-            if (item.name === '应用ID') {
-              item.value = this.resourceList.data[i].id
-              item.dataResourceId =
-                this.resourceList.data[i].infoList[0].dataResourceId
-            }
-            if (item.name === '应用领域') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '应用领域' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '组件类型') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '组件类型' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '技术领域') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '技术领域' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '共享类型') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '共享类型' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '共享条件') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '共享条件' ? (item.value = aa.attrValue) : ''
-              })
-            }
-          })
-          newArr.push(arr)
-        }
-        console.log(
-          'dataList======================>',
-          newArr,
-          this.resourceList
-        )
-        return newArr
-      },
-      isShoppingCartOrNot() {
-        return ''
-      },
+    resourceTotal: {
+      type: String,
+      default: '0',
     },
-    components: {},
-    setup(props) {
-      // eslint-disable-next-line no-undef
-      const whoShow1 = whoShow
-      const showKey = ref(0)
-      let shoppingKey = ref(1)
-      // 购物车id列表
-      const selList = ref([
-        { name: '发布时间', value: 'tdr.create_date', show: true },
-        { name: '浏览量', value: 'visits', show: true },
-        { name: '申请量', value: 'applyCount', show: true },
-        { name: '收藏量', value: 'collectCount', show: true },
-        { name: '评分', value: 'score', show: true },
-      ])
-      if (props.selectCardsname === '基础设施') {
-        selList.value.map((val) => (val.show = false))
-      } else if (props.selectCardsname === '数据资源') {
-        selList.value.map(
-          (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
-        )
-      }
-      const findComponentName = (list, name) => {
-        if (list.infoList) {
-          return list.infoList.find((item) => {
-            if (item.attrType === '组件类型') {
-              return item.attrValue === name
-            }
-          })
-        }
-      }
-      console.log('this.resourceList', props.resourceList.data)
-      props.resourceList.data.map((val) => {
-        if (val.infoList) {
-          let obj = val.infoList.filter(
-            (item) => item.attrType == '组件类型'
-          )[0]
-          if (obj) {
-            switch (obj.attrValue) {
-              case '智能算法':
-                val.applicationType = 'znsf'
-                break
-              case '图层服务':
-                val.applicationType = 'tcfw'
-                break
-              case '开发组件':
-                val.applicationType = 'kfzj'
-                break
-              case '业务组件':
-                val.applicationType = 'ywzj'
-                break
-            }
-            console.log('obj', val.applicationType)
+    selectCardsname: {
+      type: String,
+      default: '组件服务',
+    },
+  },
+  computed: {
+    dataList() {
+      const newArr = []
+      for (let i = 0; i < this.resourceList.data.length; i++) {
+        let arr = [
+          {
+            name: '应用名称',
+            value: '',
+          },
+          {
+            name: '应用ID',
+            value: '',
+            dataResourceId: '',
+          },
+          {
+            name: '应用领域',
+            value: '',
+          },
+          {
+            name: '组件类型',
+            value: '',
+          },
+          {
+            name: '技术领域',
+            value: '',
+          },
+          {
+            name: '共享类型',
+            value: '',
+          },
+          {
+            name: '共享条件',
+            value: '',
+          },
+        ]
+        arr.map((item) => {
+          if (item.name === '应用名称') {
+            item.value = this.resourceList.data[i].name
           }
-        }
-      })
-      showKey.value++
-      const selData = ref('total')
-      const flag = ref(true)
-      // userId
-      const userId = ref('')
-      getUser().then((res) => {
-        console.log('getUser============>', res)
-        userId.value = res.data.data.id
-      })
-      const resultList = [1, 2, 3, 4]
-      const router = useRouter()
-      const cardType = router.currentRoute.value.query.select
-      const onSearch = (searchValue) => {
-        console.log('use value', searchValue)
-        console.log('or use this.value', searchValue.value)
-      }
-      function toView(type, item) {
-        if (props.selectCardsname == '数据资源') {
-          window.open(
-            'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
-              item.guid
-          )
-        } else {
-          if (type === 'apply') {
-            console.log('一键申请===================>', item)
-            localStorage.setItem(
-              'applyList',
-              JSON.stringify([
-                {
-                  arr: [
-                    {
-                      delFlag: item.delFlag,
-                      description: item.description,
-                      resourceId: item.id,
-                      resourceName: item.name,
-                      time: item.createDate,
-                      type: item.type,
-                    },
-                  ],
-                  deptId: item.deptId,
-                  deptName: item.deptName,
-                },
-              ])
-            )
-            router.push({
-              path: '/apply',
-            })
-          } else {
-            console.log(
-              '111111111111111111===========>',
-              router,
-              props.selectCardsname
-            )
-            router.push({
-              path: '/details',
-              query: {
-                id: item.id,
-              },
+          if (item.name === '应用ID') {
+            item.value = this.resourceList.data[i].id
+            item.dataResourceId =
+              this.resourceList.data[i].infoList[0].dataResourceId
+          }
+          if (item.name === '应用领域') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '应用领域' ? (item.value = aa.attrValue) : ''
             })
           }
-        }
-      }
-      // 加入申购车
-      const addShoppingCart = (item, index) => {
-        console.log('item===============>', item)
-        mybus.emit('changeSelcted', index)
-        if (flag.value && item.id) {
-          flag.value = false
-          sgcInsert({
-            delFlag: '0',
-            resourceId: item.id,
-            // userId: userId.value,
-          }).then((res) => {
-            console.log(res)
-            message.success('添加申购车成功！')
-            mybus.emit('getSgcNum')
-            flag.value = true
-          })
-        }
-        shoppingKey.value++
-        // 查询申购车中已有id,用于过滤图标
-      }
-      // 添加收藏
-      const addCollect = (item) => {
-        console.log('收藏===============>', item, flag.value)
-        if (flag.value && item.id) {
-          flag.value = false
-          if (item.isCollect == 'true') {
-            scDel([item.id]).then((res) => {
-              if (res.data.msg === 'success') {
-                message.success('取消成功')
-                item.isCollect = 'false'
-                item.collectCount--
-                flag.value = true
-                console.log('收藏2===============>', res.data, flag.value)
-              }
-            })
-          } else {
-            scInsert([
-              {
-                resourceId: item.id,
-              },
-            ]).then((res) => {
-              if (res.data.msg === 'success') {
-                message.success('添加收藏成功！')
-                item.isCollect = 'true'
-                item.collectCount++
-                flag.value = true
-                console.log('收藏2===============>', res.data, flag.value)
-              }
+          if (item.name === '组件类型') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '组件类型' ? (item.value = aa.attrValue) : ''
+            })
+          }
+          if (item.name === '技术领域') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '技术领域' ? (item.value = aa.attrValue) : ''
+            })
+          }
+          if (item.name === '共享类型') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '共享类型' ? (item.value = aa.attrValue) : ''
+            })
+          }
+          if (item.name === '共享条件') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '共享条件' ? (item.value = aa.attrValue) : ''
             })
           }
-        }
-      }
-      // 更换查询条件
-      const changeCondition = (val) => {
-        selData.value = selData.value == val ? 'total' : val
-        const orderType = selData.value == val ? 'ASC' : 'DESC'
-        mybus.emit('changeCondition', {
-          orderField: val,
-          orderType: orderType,
         })
-        console.log('选择===========》', val, selData.value)
+        newArr.push(arr)
       }
-      mybus.on('chongzhi', () => {
-        selData.value = 'total'
-      })
-      let videoUrl = ref('')
-      const options = reactive({
-        width: '700px', //播放器宽度
-        height: '400px', //播放器高度
-        color: '#409eff', //主题色
-        title: '', //视频名称
-        src: '', //视频源
-        type: 'm3u8', // 视频源类型
-        muted: false, //静音
-        webFullScreen: false,
-        speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-        autoPlay: true, //自动播放
-        loop: false, //循环播放
-        mirror: false, //镜像画面
-        ligthOff: false, //关灯模式
-        volume: 0.3, //默认音量大小
-        control: true, //是否显示控制
-        controlBtns: [
-          'audioTrack',
-          'quality',
-          'speedRate',
-          'volume',
-          'setting',
-          'pip',
-          'pageFullScreen',
-          'fullScreen',
-        ], //显示所有按钮,
-      })
-      let visible = ref(false)
-      // 打开视频预览
-      const openVideo = (item) => {
-        videoUrl.value = ''
-        const param = {
-          key: item.link,
-        }
-        getHls(param).then((res) => {
-          console.log('获取视频地址===============>', res)
-          // videoUrl.value = res.data.data
-          options.src = res.data.data
-          visible.value = true
+      console.log(
+        'dataList======================>',
+        newArr,
+        this.resourceList
+      )
+      return newArr
+    },
+    isShoppingCartOrNot() {
+      return ''
+    },
+  },
+  components: {},
+  setup(props) {
+    const whoShow1 = whoShow
+    const showKey = ref(0)
+    let shoppingKey = ref(1)
+    // 融合服务排序
+    const orderList = ref([
+      {
+        value: 'create_date',
+        name: '发布时间',
+        orderType: 'DESC'
+      },
+      {
+        value: 'update_date',
+        name: '更新时间',
+        orderType: 'DESC'
+      },
+    ])
+    // 购物车id列表
+    const selList = ref([
+      { name: '发布时间', value: 'tdr.create_date', show: true },
+      { name: '浏览量', value: 'visits', show: true },
+      { name: '申请量', value: 'applyCount', show: true },
+      { name: '收藏量', value: 'collectCount', show: true },
+      { name: '评分', value: 'score', show: true },
+    ])
+    if (props.selectCardsname === '基础设施') {
+      selList.value.map((val) => (val.show = false))
+    } else if (props.selectCardsname === '数据资源') {
+      selList.value.map(
+        (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
+      )
+    }
+    const findComponentName = (list, name) => {
+      if (list.infoList) {
+        return list.infoList.find((item) => {
+          if (item.attrType === '组件类型') {
+            return item.attrValue === name
+          }
         })
       }
-      // 算法对比跳转
-      const goComparePk = (item) => {
+    }
+    console.log('this.resourceList', props.resourceList.data)
+    props.resourceList.data.map((val) => {
+      if (val.infoList) {
+        let obj = val.infoList.filter(
+          (item) => item.attrType == '组件类型'
+        )[0]
+        if (obj) {
+          switch (obj.attrValue) {
+            case '智能算法':
+              val.applicationType = 'znsf'
+              break
+            case '图层服务':
+              val.applicationType = 'tcfw'
+              break
+            case '开发组件':
+              val.applicationType = 'kfzj'
+              break
+            case '业务组件':
+              val.applicationType = 'ywzj'
+              break
+          }
+          console.log('obj', val.applicationType)
+        }
+      }
+    })
+    showKey.value++
+    const selData = ref('total')
+    const flag = ref(true)
+    // userId
+    const userId = ref('')
+    getUser().then((res) => {
+      console.log('getUser============>', res)
+      userId.value = res.data.data.id
+    })
+    const resultList = [1, 2, 3, 4]
+    const router = useRouter()
+    const cardType = router.currentRoute.value.query.select
+    const onSearch = (searchValue) => {
+      console.log('use value', searchValue)
+      console.log('or use this.value', searchValue.value)
+    }
+
+    function toView(type, item) {
+      if (props.selectCardsname == '数据资源') {
+        window.open(
+          'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
+          item.guid
+        )
+      }
+      else if (props.selectCardsname == '融合服务') {
         router.push({
-          path: '/algorithmCompare',
+          path: '/integrationServicesDetails',
           query: {
             id: item.id,
           },
         })
       }
-      return {
-        onSearch,
-        resultList,
-        toView,
-        addShoppingCart,
-        changeCondition,
-        selData,
-        selList,
-        addCollect,
-        cardType,
-        findComponentName,
-        shoppingKey,
-        openVideo,
-        videoUrl,
-        options,
-        visible,
-        goComparePk,
-        whoShow1,
-        showKey,
+      else {
+        if (type === 'apply') {
+          localStorage.setItem(
+            'applyList',
+            JSON.stringify([
+              {
+                arr: [
+                  {
+                    delFlag: item.delFlag,
+                    description: item.description,
+                    resourceId: item.id,
+                    resourceName: item.name,
+                    time: item.createDate,
+                    type: item.type,
+                  },
+                ],
+                deptId: item.deptId,
+                deptName: item.deptName,
+              },
+            ])
+          )
+          router.push({
+            path: '/apply',
+          })
+        } else {
+          router.push({
+            path: '/details',
+            query: {
+              id: item.id,
+            },
+          })
+        }
       }
-    },
-    beforeUnmount() {
-      mybus.off('chongzhi')
-      mybus.emit('changeSelcted')
-    },
-  }
+    }
+    // 加入申购车
+    const addShoppingCart = (item, index) => {
+      console.log('item===============>', item)
+      mybus.emit('changeSelcted', index)
+      if (flag.value && item.id) {
+        flag.value = false
+        sgcInsert({
+          delFlag: '0',
+          resourceId: item.id,
+          // userId: userId.value,
+        }).then((res) => {
+          console.log(res)
+          message.success('添加申购车成功！')
+          mybus.emit('getSgcNum')
+          flag.value = true
+        })
+      }
+      shoppingKey.value++
+      // 查询申购车中已有id,用于过滤图标
+    }
+    // 添加收藏
+    const addCollect = (item) => {
+      console.log('收藏===============>', item, flag.value)
+      if (flag.value && item.id) {
+        flag.value = false
+        if (item.isCollect == 'true') {
+          scDel([item.id]).then((res) => {
+            if (res.data.msg === 'success') {
+              message.success('取消成功')
+              item.isCollect = 'false'
+              item.collectCount--
+              flag.value = true
+              console.log('收藏2===============>', res.data, flag.value)
+            }
+          })
+        } else {
+          scInsert([
+            {
+              resourceId: item.id,
+            },
+          ]).then((res) => {
+            if (res.data.msg === 'success') {
+              message.success('添加收藏成功！')
+              item.isCollect = 'true'
+              item.collectCount++
+              flag.value = true
+              console.log('收藏2===============>', res.data, flag.value)
+            }
+          })
+        }
+      }
+    }
+
+    // 更换查询条件
+    const changeCondition = (val) => {
+      selData.value = selData.value == val ? 'total' : val
+      let orderType = selData.value == val ? 'ASC' : 'DESC'
+      mybus.emit('changeCondition', {
+        orderField: val,
+        orderType: orderType,
+      })
+    }
+
+    // 融合服务--排序
+    const changeOrder = (i, val, type) => {
+      let newType = type === 'DESC' ? 'ASC' : 'DESC'
+      orderList.value[i].orderType = newType
+      mybus.emit('changeCondition', {
+        orderField: val,
+        orderType: newType,
+      })
+    }
+
+    // 融合服务--一键申请
+    const handleAKeyApplication = (item) => {
+      localStorage.setItem(
+        'applyList',
+        JSON.stringify([
+          {
+            arr: [
+              {
+                delFlag: item.delFlag,
+                description: item.description,
+                resourceId: item.id,
+                resourceName: item.name,
+                time: item.createDate,
+                type: item.type,
+              },
+            ],
+            deptId: item.deptId,
+            deptName: item.deptName,
+          },
+        ])
+      )
+      router.push({
+        path: '/apply',
+      })
+    }
+
+    mybus.on('chongzhi', () => {
+      selData.value = 'total'
+    })
+    let videoUrl = ref('')
+    const options = reactive({
+      width: '700px', //播放器宽度
+      height: '400px', //播放器高度
+      color: '#409eff', //主题色
+      title: '', //视频名称
+      src: '', //视频源
+      type: 'm3u8', // 视频源类型
+      muted: false, //静音
+      webFullScreen: false,
+      speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
+      autoPlay: true, //自动播放
+      loop: false, //循环播放
+      mirror: false, //镜像画面
+      ligthOff: false, //关灯模式
+      volume: 0.3, //默认音量大小
+      control: true, //是否显示控制
+      controlBtns: [
+        'audioTrack',
+        'quality',
+        'speedRate',
+        'volume',
+        'setting',
+        'pip',
+        'pageFullScreen',
+        'fullScreen',
+      ], //显示所有按钮,
+    })
+    let visible = ref(false)
+    // 打开视频预览
+    const openVideo = (item) => {
+      videoUrl.value = ''
+      const param = {
+        key: item.link,
+      }
+      getHls(param).then((res) => {
+        console.log('获取视频地址===============>', res)
+        // videoUrl.value = res.data.data
+        options.src = res.data.data
+        visible.value = true
+      })
+    }
+    // 算法对比跳转
+    const goComparePk = (item) => {
+      router.push({
+        path: '/algorithmCompare',
+        query: {
+          id: item.id,
+        },
+      })
+    }
+    return {
+      onSearch,
+      resultList,
+      toView,
+      addShoppingCart,
+      changeCondition,
+      selData,
+      selList,
+      addCollect,
+      cardType,
+      findComponentName,
+      shoppingKey,
+      openVideo,
+      videoUrl,
+      options,
+      visible,
+      goComparePk,
+      whoShow1,
+      showKey,
+      orderList,
+      changeOrder,
+      handleAKeyApplication,
+    }
+  },
+  beforeUnmount() {
+    mybus.off('chongzhi')
+    mybus.emit('changeSelcted')
+  },
+}
 </script>
 <style scoped lang="less">
-  #search-result-list-container {
-    width: 1088px;
-    padding: 0 20px;
-    background: #f3f5f9;
+#search-result-list-container {
+  width: 100%;
+  padding: 0 20px;
+  background: #f3f5f9;
 
-    .detail-content {
-      // 超出
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      width: 130px;
-      display: inline-block;
+  .detail-content {
+    // 超出
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 130px;
+    display: inline-block;
+  }
+
+  .shai-xuan {
+    height: 36px;
+    display: flex;
+    align-items: center;
+    position: relative;
+
+    .circle {
+      width: 16px;
+      height: 16px;
+      border-radius: 50%;
+      background-color: #0087ff;
+      text-align: center;
+      color: #fff;
+      line-height: 16px;
+      margin-right: 21px;
     }
 
-    .shai-xuan {
-      width: 1047px;
-      height: 36px;
-      // margin: 11px 0 20px;
-      // background: #e5f2ff;
-      // padding-left: 20px;
+    .result {
+      font-size: 14px;
+      font-weight: 500;
+      color: #212121;
+
+      span {
+        font-size: 18px;
+        color: #0087ff;
+      }
+    }
+
+    .condition {
+      position: absolute;
+      right: 20px;
+      top: 10px;
+
+      ul li {
+        list-style-type: none;
+      }
+
+      ul {
+        display: flex;
+
+        li {
+          width: 90px;
+          height: 12px;
+          text-align: center;
+          cursor: pointer;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+
+          .arrow {
+            display: inline-block;
+            width: 12px;
+            height: 12px;
+            background: url('~@/assets/newHome/arrow.png');
+            margin-left: 10px;
+          }
+
+          .down {
+            background: url('~@/assets/newHome/down.png');
+            margin-top: 6px;
+          }
+        }
+      }
+    }
+  }
+
+  .result-list {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
+    border-top: 1px rgba(150, 144, 144, 0.3) solid;
+    padding: 10px 20px;
+    box-sizing: border-box;
+
+    .item {
+      width: 100%;
+      margin-top: 10px;
       display: flex;
       align-items: center;
-      position: relative;
 
-      .circle {
-        width: 16px;
-        height: 16px;
-        border-radius: 50%;
-        background-color: #0087ff;
-        text-align: center;
-        color: #fff;
-        line-height: 16px;
-        margin-right: 21px;
+      .left {
+        display: inline-block;
+        width: 120px;
+        height: 110px;
+        margin-right: 16px;
       }
 
-      .result {
-        font-size: 14px;
-        font-weight: 500;
-        color: #212121;
-
-        span {
-          font-size: 18px;
-          color: #0087ff;
-        }
-      }
-
-      .condition {
-        position: absolute;
-        right: 20px;
-        top: 10px;
-
-        ul li {
-          list-style-type: none;
-        }
-
-        ul {
-          display: flex;
-
-          li {
-            width: 90px;
-            height: 12px;
-            text-align: center;
-            cursor: pointer;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-
-            .arrow {
-              display: inline-block;
-              width: 12px;
-              height: 12px;
-              background: url('~@/assets/newHome/arrow.png');
-              margin-left: 10px;
-            }
-
-            .down {
-              background: url('~@/assets/newHome/down.png');
-              margin-top: 6px;
-            }
-          }
-        }
-      }
-    }
-
-    .result-list {
-      width: 1048px;
-      display: flex;
-      flex-direction: column;
-      flex-wrap: wrap;
-      border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
-      border-top: 1px rgba(150, 144, 144, 0.3) solid;
-      padding: 10px 0;
-
-      .item {
+      .right {
         width: 100%;
-        margin-top: 10px;
+      }
+
+      .yyzy {
+        background: url('~@/assets/home/yyzy_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .sjzy {
+        background: url('~@/assets/home/sjzy_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .znsf {
+        background: url('~@/assets/home/znsf_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .tcfw {
+        background: url('~@/assets/home/tcfw_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .kfzj {
+        background: url('~@/assets/home/kfzj_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .ywzj {
+        background: url('~@/assets/home/ywzj_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .rhfw {
+        background: url('~@/assets/home/rhfw_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+
+      .header {
         display: flex;
+        justify-content: space-between;
         align-items: center;
+        margin: 0 10px 0 0;
 
-        .left {
-          display: inline-block;
-          width: 120px;
-          height: 110px;
-          margin-right: 16px;
-        }
-
-        .right {
-          width: 100%;
-        }
-
-        .yyzy {
-          background: url('~@/assets/home/yyzy_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .sjzy {
-          background: url('~@/assets/home/sjzy_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .znsf {
-          background: url('~@/assets/home/znsf_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .tcfw {
-          background: url('~@/assets/home/tcfw_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .kfzj {
-          background: url('~@/assets/home/kfzj_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .ywzj {
-          background: url('~@/assets/home/ywzj_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .header {
+        .header-right {
           display: flex;
-          justify-content: space-between;
-          align-items: center;
-          margin: 0 10px 0 0;
-
-          .header-right {
-            display: flex;
-            font-size: 14px;
-            color: #212121;
-
-            span {
-              font-size: 14px;
-              color: #212121;
-            }
-
-            div {
-              margin-right: 24px;
-            }
-          }
-
-          .header-right:last-child {
-            div {
-              margin-right: 16px;
-            }
-          }
+          font-size: 14px;
+          color: #212121;
 
           span {
-            font-size: 20px;
-            font-weight: 600;
-            // color: #0087ff;
+            font-size: 14px;
+            color: #212121;
           }
-        }
-
-        .dec {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          // white-space: nowrap;
-          color: #0058e1;
-          display: flex;
-          margin-top: 10px;
 
           div {
-            margin-right: 10px;
-            background: rgba(0, 88, 225, 0.1);
-            padding-left: 10px;
-            padding-right: 10px;
-          }
-
-          div:nth-child(3) {
-            max-width: 200px;
-            display: -webkit-box;
-            /*设置为弹性盒子*/
-            -webkit-line-clamp: 1;
-            /*最多显示3行*/
-            overflow: hidden;
-            /*超出隐藏*/
-            text-overflow: ellipsis;
-            /*超出显示为省略号*/
-            -webkit-box-orient: vertical;
+            margin-right: 24px;
           }
         }
 
-        .btn {
+        .header-right:last-child {
+          div {
+            margin-right: 16px;
+          }
+        }
+
+        span {
+          font-size: 20px;
+          font-weight: 600;
+          // color: #0087ff;
+        }
+      }
+
+      .dec {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        color: #0058e1;
+        display: flex;
+        margin-top: 10px;
+
+        div {
+          margin-right: 10px;
+          background: rgba(0, 88, 225, 0.1);
+          padding-left: 10px;
+          padding-right: 10px;
+        }
+
+        div:nth-child(3) {
+          max-width: 200px;
+          display: -webkit-box;
+          /*设置为弹性盒子*/
+          -webkit-line-clamp: 1;
+          /*最多显示3行*/
+          overflow: hidden;
+          /*超出隐藏*/
+          text-overflow: ellipsis;
+          /*超出显示为省略号*/
+          -webkit-box-orient: vertical;
+        }
+      }
+
+      .btn {
+        display: flex;
+        justify-content: space-between;
+        font-size: 14px;
+        margin: 5px 0;
+
+        .right {
+          flex: 1;
           display: flex;
-          justify-content: space-between;
-          font-size: 14px;
-          margin: 5px 0;
+          justify-content: flex-end;
+          margin: 0 10px;
+          align-items: center;
 
-          // .left {
-          //   width: 600px;
-          //   display: flex;
-          //   justify-content: space-between;
-          //   flex-wrap: wrap;
-          //   & > div {
-          //     width: 300px;
-          //     & > span {
-          //       color: #0087ff;
-          //       font-weight: 600;
-          //     }
-          //   }
-          // }
-          .right {
-            flex: 1;
-            display: flex;
-            justify-content: flex-end;
-            margin: 0 10px;
-            align-items: center;
-
-            .shopping {
-              span {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                margin-right: 10px;
-                margin-top: 5px;
-              }
-
-              .shopping-on {
-                background: url('~@/assets/newHome/shopping-on.png');
-                cursor: pointer;
-              }
-
-              .shopping-down {
-                background: url('~@/assets/newHome/shopping-down.png');
-              }
-            }
-
-            .pk-on {
+          .shopping {
+            span {
               display: inline-block;
               height: 32px;
               width: 32px;
-              margin-left: 10px;
               margin-right: 10px;
               margin-top: 5px;
-              background: url('~@/assets/newHome/pk-on.png');
+            }
+
+            .shopping-on {
+              background: url('~@/assets/newHome/shopping-on.png');
               cursor: pointer;
             }
 
-            .sc {
-              // margin-top: 4px;
-              cursor: pointer;
-              display: flex;
-              align-items: center;
-
-              .sc-down {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                background: url('~@/assets/newHome/sc-down.png');
-              }
-
-              .sc-on {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                background: url('~@/assets/newHome/sc-on.png');
-              }
-            }
-
-            .ant-btn {
-              background: transparent;
-              background: #0058e1;
-              color: white;
-              width: 80px;
-              height: 32px;
-              font-weight: 600;
-              border-radius: 2px;
-              text-align: center;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              margin-left: 10px;
-            }
-
-            .ant-btn:last-child {
-              background: #0058e1;
-              color: white;
+            .shopping-down {
+              background: url('~@/assets/newHome/shopping-down.png');
             }
           }
-        }
 
-        .bottom {
-          display: flex;
-          justify-content: space-between;
-          margin-top: 10px;
-          align-items: center;
+          .pk-on {
+            display: inline-block;
+            height: 32px;
+            width: 32px;
+            margin-left: 10px;
+            margin-right: 10px;
+            margin-top: 5px;
+            background: url('~@/assets/newHome/pk-on.png');
+            cursor: pointer;
+          }
 
-          & > div {
+          .sc {
+            cursor: pointer;
             display: flex;
             align-items: center;
 
-            & > div {
-              margin: 0 10px;
+            .sc-down {
+              display: inline-block;
+              height: 32px;
+              width: 32px;
+              background: url('~@/assets/newHome/sc-down.png');
+            }
+
+            .sc-on {
+              display: inline-block;
+              height: 32px;
+              width: 32px;
+              background: url('~@/assets/newHome/sc-on.png');
             }
           }
 
-          .pingfen {
-            :deep(span) {
+          .ant-btn {
+            background: transparent;
+            background: #0058e1;
+            color: white;
+            width: 80px;
+            height: 32px;
+            font-weight: 600;
+            border-radius: 2px;
+            text-align: center;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-left: 10px;
+          }
+
+          .ant-btn:last-child {
+            background: #0058e1;
+            color: white;
+          }
+        }
+      }
+
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 10px;
+        align-items: center;
+
+        &>div {
+          display: flex;
+          align-items: center;
+
+          &>div {
+            margin: 0 10px;
+          }
+        }
+
+        .pingfen {
+          :deep(span) {
+            display: flex;
+            align-items: center;
+
+            :deep(ul) {
               display: flex;
               align-items: center;
 
-              :deep(ul) {
-                display: flex;
-                align-items: center;
-
-                :deep(.ant-rate-star:not(:last-child)) {
-                  margin-right: 4px;
-                }
+              :deep(.ant-rate-star:not(:last-child)) {
+                margin-right: 4px;
               }
             }
           }
         }
       }
+    }
 
-      .item:nth-of-type(1) {
-        margin-top: 0;
-      }
+    .item:nth-of-type(1) {
+      margin-top: 0;
     }
   }
+}
 </style>
diff --git a/front/src/views/home/constantData/showData.js b/front/src/views/home/constantData/showData.js
new file mode 100644
index 00000000..69218b34
--- /dev/null
+++ b/front/src/views/home/constantData/showData.js
@@ -0,0 +1,68 @@
+export const titleNameArray = [
+    {
+        photo: require('@/assets/newHome/banner-zj.png'),
+        name: '组件服务',
+    },
+    {
+        photo: require('@/assets/newHome/banner-yy.png'),
+        name: '应用资源',
+    },
+    {
+        photo: require('@/assets/newHome/banner-jc.png'),
+        name: '基础设施',
+    },
+    {
+        photo: require('@/assets/newHome/banner-sj.png'),
+        name: '数据资源',
+    },
+    {
+        photo: require('@/assets/newHome/banner-zs.png'),
+        name: '知识库',
+    },
+]
+
+// 模糊查询
+export const keyongziyuanqingkaungArray = [
+    {
+        name: 'CPU/核：',
+        value: 2102,
+    },
+    {
+        name: '内存/T：',
+        value: 6.68,
+    },
+    {
+        name: '存储/T：',
+        value: 2102,
+    },
+    {
+        name: 'RDS for Mysql/G：',
+        value: 982.82,
+    },
+    {
+        name: 'RDS for SqlServer/G：',
+        value: 997.17,
+    },
+]
+
+export const shujuziyuanqingkuangArray = [
+    {
+        name: '已上线目录：',
+        value: 10372,
+        danwei: '条',
+    },
+    {
+        name: '已发布服务：',
+        value: 1080,
+        danwei: '条',
+    },
+    {
+        name: '已发布接口：',
+        value: 976,
+        danwei: '条',
+    },
+    {
+        name: '更新时间：',
+        value: '2022-05-06',
+    },
+]
\ No newline at end of file
diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue
new file mode 100644
index 00000000..88db0c2b
--- /dev/null
+++ b/front/src/views/home/integrationServices.vue
@@ -0,0 +1,317 @@
+<template>
+    <!-- 青岛 -->
+    <div class="details-pageconetent">
+        <home-header></home-header>
+        <div class="top">
+            <div class="resultListSearchInput-father">
+                <div class="resultListSearchInput-son">
+                    模糊搜索
+                    <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+                        @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
+                    <button class="button-reset" @click="chongzhi()">重置</button>
+                    <div class="hengxian"></div>
+                </div>
+            </div>
+            <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :key="listKey2"
+                :resourceList="resourceList" :resourceTotal="resourceTotal" selectCardsname="融合服务" />
+            <div class="pagination">
+                <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
+                    v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper
+                    :total="resourceTotal" :page-size-options="pageSizeOptions" @change="pageChange"
+                    @showSizeChange="onShowSizeChange" />
+            </div>
+            <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
+                <a-empty />
+            </div>
+        </div>
+    </div>
+    <home-footer></home-footer>
+</template>
+<script>
+import HomeFooter from '@/views/newHome/components/Footer'
+import mybus from '@/myplugins/mybus'
+import {
+    defineComponent,
+    reactive,
+    ref,
+    toRefs,
+    onMounted,
+    watch,
+} from 'vue'
+
+import {
+    getIntegrationServicesList,
+} from '@/api/home.js'
+import { useRouter } from 'vue-router'
+import HomeHeader from '@/views/home/components/header'
+import searchResultList from '@/views/home/components/searchResultList.vue'
+import { message } from 'ant-design-vue'
+
+export default defineComponent({
+    setup() {
+        // 分页
+        const loading = ref(true)
+        const currentPage = ref(1)
+        const currentPageSize = ref(5)
+        const pageSizeOptions = ref(['5', '10', '20', '50'])
+        const router = useRouter()
+        const select = router.currentRoute.value.query.select
+        const searchValue = ref('')
+        const Cardsname = ref(select)
+        const resourceList = reactive({ data: [] })
+        const resourceTotal  = ref(0)
+        const current = ref(1)
+        // 刷新筛选条件组件
+        let listKey = ref(0)
+        // 刷新筛选列表信息组件
+        const listKey2 = ref(0)
+        
+        // 查询参数
+        const paramsGetResources = {
+            pageNum: 1,
+            pageSize: currentPageSize.value,
+            type: Cardsname.value,
+            name: '',
+            orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+            orderType: 'DESC', // ASC 升序  DESC 降序
+        }
+      
+        // 查询
+        const onSearch = () => {
+            loading.value = true
+            currentPage.value = 1
+        }
+        // 重置数据
+        const chongzhi = () => {
+            loading.value = true
+            // 重置模糊查字段
+            searchValue.value = ''
+            // 分页
+            currentPage.value = 1
+            currentPageSize.value = 5
+            // 重置查询条件
+            paramsGetResources.pageNum = 1
+            paramsGetResources.pageSize = 5
+            paramsGetResources.orderField = 'create_date'
+            paramsGetResources.orderType = 'DESC'
+            mybus.emit('chongzhi')
+            getAppResources()
+        }
+
+
+        const getAppResources = () => {
+            getIntegrationList()
+        }
+
+        // 获取融合服务列表
+        const getIntegrationList = () => {
+            let postData = {
+                limit: currentPageSize.value,
+                page: currentPage.value,
+                orderField: paramsGetResources.orderField,
+                orderType: paramsGetResources.orderType,
+                name: searchValue.value
+            }
+            getIntegrationServicesList(postData).then(res => {
+                if (res.data.code !== 0) {
+                    return message.error(res.data.msg)
+                }
+                resourceList.data = res.data.data.list || []
+                resourceTotal.value = res.data.data.total || 0
+            }, err => {
+                message.error(err)
+            })
+        }
+
+        mybus.on('paramsGetResources', (ids) => {
+            if (ids && ids.length > 0) {
+                paramsGetResources.deptIds = ids
+            } else {
+                delete paramsGetResources.deptIds
+            }
+            getAppResources()
+            console.log('paramsGetResources', paramsGetResources)
+        })
+        mybus.on('changePage', (page) => {
+            paramsGetResources.pageNum = page
+            getAppResources('分页查询')
+        })
+        mybus.on('changeSelcted', () => {
+            getAppResources()
+        })
+
+        mybus.on('refresh', () => {
+            paramsGetResources.pageNum = 1
+            currentPage.value = 1
+            getAppResources()
+        })
+        mybus.on('changeCondition', (condition) => {
+            paramsGetResources.orderField = condition.orderField
+            paramsGetResources.orderType = condition.orderType
+            getAppResources()
+        })
+
+        const pageChange = (val) => {
+            console.log(val)
+            loading.value = true
+            currentPage.value = val
+            paramsGetResources.pageNum = val
+            let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+            getAppResources(params)
+        }
+
+        onMounted(() => {
+            listKey2.value++;
+            getAppResources()
+        })
+
+        // 分页
+        const onShowSizeChange = (current, pageSize) => {
+            currentPage.value = current
+            currentPageSize.value = pageSize
+            paramsGetResources.pageNum = current
+            paramsGetResources.pageSize = pageSize
+            getAppResources()
+        }
+        watch(currentPageSize, () => {
+            console.log('pageSize', currentPageSize.value)
+        })
+      
+        return {
+            listKey,
+            searchValue,
+            currentPage,
+            resourceList,
+            resourceTotal,
+            pageChange,
+            listKey2,
+            Cardsname,
+            getAppResources,
+            chongzhi,
+            onSearch,
+            currentPageSize,
+            pageSizeOptions,
+            current,
+            loading,
+        }
+    },
+    components: {
+        HomeHeader,
+        HomeFooter,
+        searchResultList,
+    },
+    beforeUnmount() {
+        mybus.off('paramsGetResources')
+        mybus.off('changeCondition')
+        mybus.off('refresh')
+        mybus.off('changePage')
+    },
+})
+</script>
+<style lang="less" scoped>
+.resultListSearchInput-father {
+    background: #f3f5f9;
+    padding: 0.2rem;
+
+    // padding-left: 0.2rem;
+    // padding-top: 0.2rem;
+    .resultListSearchInput-son {
+        background: #fff;
+        padding: 0.2rem 0.2rem 0rem 0.3rem;
+
+        .hengxian {
+            width: 100%;
+            height: 0.01rem;
+            background: rgba(150, 144, 144, 0.3);
+            margin-top: 0.2rem;
+        }
+    }
+}
+
+.resultListSearchInput {
+    margin-left: 0.1rem;
+
+    :deep(.ant-input) {
+        width: 4rem;
+        height: 0.36rem;
+        background: #fff;
+        border-radius: 0.04rem;
+    }
+
+    :deep(.ant-input-search-button) {
+        width: 0.8rem;
+        height: 0.36rem;
+        background: #0087ff;
+        border-radius: 0.04rem !important;
+        font-size: 0.14rem;
+        font-weight: 400;
+        color: #fff;
+        line-height: 0.34rem;
+        margin-left: 0.1rem;
+    }
+
+    :deep(.ant-input-group-addon) {
+        left: 0 !important;
+    }
+}
+
+.button-reset {
+    border: 0;
+    outline: none;
+    width: 0.8rem;
+    height: 0.36rem;
+    background: #e1edfa;
+    border-radius: 0.04rem;
+    font-size: 0.14rem;
+    font-weight: 400;
+    color: #0087ff;
+    line-height: 0.34rem;
+    margin-left: 2.5rem;
+    cursor: pointer;
+}
+
+.details-pageconetent {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 0.67rem;
+    position: relative;
+    background: rgba(245, 243, 243, 0.3);
+
+    .details-pageconetent-left {
+        max-height: 6.9rem;
+        position: absolute;
+        width: 2.5rem;
+        top: 0.17rem;
+        left: 2.5rem;
+        margin-right: 0.17rem;
+        overflow: auto;
+    }
+
+    .top {
+        min-height: 7.2rem;
+        position: relative;
+        width: 11.5rem;
+        display: flex;
+        padding-top: 0.2rem;
+        flex-direction: column;
+        font-size: 0.16rem;
+        justify-content: left;
+        background: #f3f5f9;
+
+        .pagination {
+            background: #f3f5f9;
+            padding-bottom: 0.6rem;
+        }
+    }
+}
+
+:deep(.ant-card-grid) {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 1;
+}
+</style>
diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
new file mode 100644
index 00000000..e4faf4a4
--- /dev/null
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -0,0 +1,452 @@
+<!-- 融合服务详情 -->
+<template>
+  <div class="IntegrationServicesDetails" :class="{ fixed2: scrollTop >= 600 }">
+    <!-- 头部基本信息 -->
+    <application-top-details :dataList="detailInfoObj" :navList="navList"></application-top-details>
+
+    <!-- 导航 -->
+    <div :class="{ fixed: scrollTop >= 600 }">
+      <div class="application-navigation">
+        <template v-for="nav in navList" :key="nav.key">
+          <div class="nav" :class="{ selectNow: nav.key == selectNow }" @click="selectNav(nav.key)">
+            {{ nav.name }}
+            <span class="line"></span>
+          </div>
+        </template>
+      </div>
+    </div>
+
+    <!-- 组合能力 -->
+    <div id="integration-combination-ability" class="combination-ability scrollBox">
+      <div class="title-1">
+        <DetalsTitle title="组合能力" type="COMBINATION ABILITY"></DetalsTitle>
+      </div>
+      <div class="flex-row-center combine-content">
+        <div class="combine-item" v-for="(item, i) in combineList" :key="i">
+          <div class="title">{{ item.title }}</div>
+          <div class="name-box">
+            <div class="name-text" v-for="(name, j) in item.list" :key="j">
+              {{ name }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 使用方式 -->
+    <div id="integration-use-way" class="use-way scrollBox">
+      <div class="title-1">
+        <DetalsTitle title="使用方式" type="USE WAY"></DetalsTitle>
+      </div>
+      <div class="content">
+        <div class="content-card flex-row-between left word-bg">
+          <div class="content-card-item left-item">
+            <div class="card-title">文档</div>
+            <!-- <div class="card-text">文档描述文档描述文档描述文档描述</div> -->
+          </div>
+          <div class="content-card-item btn-box">
+            <div class="btn" @click="handleOpenUrl('技术文档')">技术文档</div>
+            <div class="btn" @click="handleOpenUrl('使用手册')">使用手册</div>
+          </div>
+        </div>
+        <div class="content-card flex-row-start">
+          <div class="right-item content-card-item" v-for="(use, i) in useWayShowList" :key="i">
+            <div class="card-title title">{{ use.title }}</div>
+            <div class="card-text" v-for="(d, k) in Object.keys(use.info)" :key="k">
+              {{ use.info[d] }}:{{ detailInfoObj[d] || '--' }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 常见问题-->
+    <application-common-problem :dataList="detailInfoObj" id="common-problem" class="scrollBox">
+    </application-common-problem>
+
+    <home-footer></home-footer>
+  </div>
+</template>
+
+<script setup>
+import ApplicationTopDetails from '@/views/detailsAll/components/Application/ApplicationTopDetails.vue'
+import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
+import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
+import HomeFooter from '@/views/newHome/components/Footer'
+import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
+import { useRouter } from 'vue-router'
+import { getIntegrationDetail } from '@/api/home'
+import mybus from '@/myplugins/mybus'
+
+const router = useRouter()
+const scrollTop = ref(0)
+const domArr = ref([])
+const id = router.currentRoute.value.query.id
+document.documentElement.style.transition = 'all 0.3s ease'
+document.documentElement.scrollTop = 0
+document.body.style.transition = 'all 0.3s ease'
+document.body.scrollTop = 0
+mybus.on('flyToView', (id) => {
+  let top = document.querySelector('#' + id) && document.querySelector('#' + id).offsetTop - 50;
+  document.documentElement.scrollTop = top
+  document.body.scrollTop = top
+})
+
+const navList = ref([
+  {
+    name: '组合能力',
+    key: 'integration-combination-ability',
+  },
+  {
+    name: '使用方式',
+    key: 'integration-use-way',
+  },
+  {
+    name: '常见问题',
+    key: 'common-problem',
+  },
+])
+
+const selectNow = ref('integration-combination-ability')
+
+const useWayShowList = ref([
+  {
+    title: '归属部门',
+    info: {
+      deptUser: '部门联系人',
+      mobile: '联系人电话',
+    },
+  },
+  {
+    title: '服务商',
+    info: {
+      providerUser: '服务商联系人',
+      providerMobile: '联系人电话',
+    },
+  },
+])
+
+const combineList = ref([
+  {
+    title: '基础设施',
+    list: []
+  },
+  {
+    title: '组件服务',
+    list: []
+  },
+  {
+    title: '数据资源',
+    list: []
+  },
+])
+const detailInfoObj = ref({})
+
+onMounted(() => {
+  window.addEventListener('scroll', () => {
+    domArr.value = document.querySelectorAll('.scrollBox')
+    scrollTop.value =
+      document.documentElement.scrollTop || document.body.scrollTop
+    for (let i = 0; i < domArr.value.length; i++) {
+      if (i === 0) {
+        if (scrollTop.value <= domArr.value[i + 1].offsetTop - 50) {
+          selectNow.value = domArr.value[i].id
+        }
+      } else if (i == domArr.value.length - 1) {
+        if (scrollTop.value >= domArr.value[i].offsetTop - 50) {
+          selectNow.value = domArr.value[i].id
+        }
+      } else {
+        if (
+          scrollTop.value >= domArr.value[i].offsetTop - 50 &&
+          scrollTop.value <= domArr.value[i + 1].offsetTop - 50
+        ) {
+          selectNow.value = domArr.value[i].id
+        }
+      }
+    }
+  })
+})
+
+const selectNav = (key) => {
+  selectNow.value = key
+  mybus.emit('flyToView', selectNow.value)
+}
+
+// 融合服务--详情
+const getIntegrationServicesDeatil = (id) => {
+  getIntegrationDetail(id).then(res => {
+    if (res.data.code !== 0) {
+      return message.error(res.data.msg)
+    }
+    detailInfoObj.value = res.data.data || {}
+    // 资源属性
+    let fuseAttrList = res.data.data.fuseAttrList || []
+    // 融合关系
+    let fuseResourceList = res.data.data.fuseResourceList || []
+    let questionValue = fuseAttrList.find(v => v.attrType === '常见问题') || {}
+    let questionObj = {
+      attrType: '常见问题',
+      attrValue: JSON.stringify(questionValue.attrValue || [])
+    }
+    let areaObj = {
+      attrType: '应用领域',
+      attrValue: detailInfoObj.value.applicationArea
+    }
+    console.log('areaObj------------>', areaObj);
+    
+    combineList.value.map(item => {
+      let arr = (fuseResourceList.filter(v => v.resource && v.resource.type == item.title) || []).map(d => d.resource.name)
+      item.list = arr;
+      return item
+    })
+    detailInfoObj.value.infoList = []
+    detailInfoObj.value.infoList.push(questionObj)
+    detailInfoObj.value.infoList.push(areaObj)
+  }, err => {
+    message.error(err)
+  })
+}
+getIntegrationServicesDeatil(id)
+
+function handleOpenUrl(type) {
+  let obj = (detailInfoObj.value.fuseAttrList || []).find(v => v.attrType == type) || {};
+  let url = obj.attrValue || '';
+  if (!obj.attrValue) {
+    return message.error('错误的文档链接地址！')
+  }
+  window.open(
+    window.SITE_CONFIG.previewUrl +
+    'hisense_office/onlinePreview?url=' +
+    btoa(encodeURI(url))
+  )
+}
+
+onBeforeUnmount(() => {
+  mybus.off('flyToView')
+})
+</script>
+
+<style lang="less" scoped>
+.flex-row-between {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.flex-row-start {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+}
+
+.flex-row-center {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+
+
+.IntegrationServicesDetails {
+  .fixed {
+    position: fixed !important;
+    z-index: 2000;
+    top: 0;
+    left: 0;
+  }
+
+  .fixed2>div:nth-of-type(3) {
+    margin-top: 0.84rem;
+  }
+
+  .application-navigation {
+    width: 19.12rem;
+    height: 0.84rem;
+    line-height: 0.8rem;
+    display: flex;
+    justify-content: space-around;
+    font-size: 0.24rem;
+    color: #666;
+    background: #fff;
+    padding: 0 3rem;
+    box-shadow: 0rem 0.05rem 0.1rem #f2f3fb;
+    position: relative;
+
+    .nav {
+      cursor: pointer;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      align-items: center;
+
+      .line {
+        width: 0.4rem;
+        height: 0.04rem;
+      }
+    }
+
+    .selectNow {
+      color: #526aff;
+
+      .line {
+        background: #526aff;
+      }
+    }
+  }
+}
+
+.use-way {
+  padding: 0.8rem 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  .title-1 {
+    margin-bottom: 0.3rem;
+  }
+
+
+
+  .left {
+    .btn {
+      padding: 10px 20px;
+      color: #526aff;
+      background: #fff;
+      border-radius: 50px;
+      margin: 10px;
+      font-size: 0.2rem;
+      width: 150px;
+      text-align: center;
+      cursor: pointer;
+    }
+
+    .btn-box {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-end;
+    }
+  }
+
+  .content {
+    display: flex;
+    width: 13rem;
+    justify-content: space-between;
+
+    .word-bg {
+      background: linear-gradient(90deg, #7184fc, #94a3fc) !important;
+    }
+
+    .content-card {
+      height: 1.5rem;
+      width: 6.2rem;
+      border-radius: 0.2rem;
+      background: linear-gradient(to right,
+          rgba(113, 132, 252, 0.4),
+          rgba(148, 163, 252, 0.4));
+      padding: 0 0.3rem;
+      display: flex;
+      justify-content: center;
+
+      .card-title {
+        font-size: 0.26rem;
+        color: #212956;
+        margin-bottom: 0.2rem;
+        line-height: 0.26rem;
+      }
+
+      .content-card-item {
+        width: 50%;
+
+        .card-text {
+          margin-right: 0.2rem;
+          color: rgba(33, 41, 86, 0.8);
+          font-size: 0.2rem;
+          max-width: 2.8rem;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+        }
+
+        div:first-child {
+          display: block;
+        }
+      }
+    }
+  }
+}
+
+.combination-ability {
+  padding: 0.8rem 0;
+  background: rgb(247, 248, 250);
+
+  .title-1 {
+    margin-bottom: 0.3rem;
+  }
+
+  .combine-content {
+    width: 13rem;
+    margin: 0 auto;
+  }
+
+  .combine-item {
+    margin: 0 0.1rem;
+    width: 4.28rem;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    border: 1px solid #e4e6f5;
+    border-radius: 0.1rem;
+    padding: 0.1rem 0;
+    cursor: pointer;
+    height: 2.5rem;
+
+    &:hover {
+      border-radius: 0.02rem;
+      border: 0.01rem solid #0058e1;
+      box-shadow: 0rem 0.08rem 0.2rem rgb(0 88 225 / 30%);
+    }
+
+    .title {
+      color: #212121;
+      text-align: center;
+      padding: 0.2rem 0;
+      font-size: .22rem;
+      text-align: center;
+    }
+
+  }
+
+  .name-box {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    width: 100%;
+  }
+
+  .no-data {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: center;
+    font-size: 0.16rem;
+    color: #666;
+    text-align: center;
+  }
+
+  .name-text {
+    font-size: 0.16rem;
+    color: #212121;
+    line-height: 0.3rem;
+    height: 0.3rem;
+    text-align: center;
+    width: 50%;
+    box-sizing: border-box;
+  }
+
+}
+</style>
diff --git a/front/src/views/personalCenter/components/Collection.vue b/front/src/views/personalCenter/components/Collection.vue
index e7041a24..90310b3a 100644
--- a/front/src/views/personalCenter/components/Collection.vue
+++ b/front/src/views/personalCenter/components/Collection.vue
@@ -1,117 +1,58 @@
 <template>
   <div class="title">我的收藏</div>
   <div class="sousuokuang">
-    <a-input-search
-      v-model:value="name"
-      placeholder="请输入关键词"
-      enter-button="搜索"
-      size="large"
-      @change="onSearch"
-      @search="getList"
-    />
-    <a-button
-      type="primary"
-      style="width: 80px; height: 36px; margin-left: 10px"
-      @click="clean"
-    >
+    <a-input-search v-model:value="name" placeholder="请输入关键词" enter-button="搜索" size="large" @change="onSearch"
+      @search="getList" />
+    <a-button type="primary" style="width: 80px; height: 36px; margin-left: 10px" @click="clean">
       重置
     </a-button>
   </div>
   <div class="tab">
     <span>筛选</span>
-    <div
-      :class="tabIndex == index ? 'tabclass' : ' '"
-      @click="changeTab(index)"
-      v-for="(item, index) in tabList"
-      :key="index"
-    >
+    <div :class="tabIndex == index ? 'tabclass' : ' '" @click="changeTab(index)" v-for="(item, index) in tabList"
+      :key="index">
       {{ item }}
     </div>
   </div>
-  <a-list
-    class="demo-loadmore-list"
-    :loading="initLoading"
-    item-layout="horizontal"
-    :data-source="list"
-    :key="showKey"
-  >
+  <a-list class="demo-loadmore-list" :loading="initLoading" item-layout="horizontal" :data-source="list" :key="showKey">
     <template #renderItem="{ item }">
       <a-list-item>
         <a-skeleton avatar :title="false" :loading="!!item.loading" active>
-          <a-list-item-meta
-            :description="item.description || '--'"
-            style="position: relative"
-          >
+          <a-list-item-meta :description="item.description || '--'" style="position: relative">
             <template #title>
-              <span
-                @click="showItem(item.resourceId, item.type, item.delFlag)"
-                style="cursor: pointer"
-                class="name"
-              >
+              <span @click="showItem(item, item.type, item.delFlag)" style="cursor: pointer" class="name">
                 {{ item.name }}
               </span>
               <span class="time">收藏时间：{{ item.createDate }}</span>
-              <svg
-                t="1652233950228"
-                class="icon"
-                viewBox="0 0 1024 1024"
-                version="1.1"
-                xmlns="http://www.w3.org/2000/svg"
-                p-id="5970"
-                data-spm-anchor-id="a313x.7781069.0.i8"
-                width="50"
-                height="50"
-                v-if="item.delFlag == 4 || item.delFlag == 5"
-                style="position: absolute; top: 0; left: 100px"
-              >
+              <svg t="1652233950228" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                xmlns="http://www.w3.org/2000/svg" p-id="5970" data-spm-anchor-id="a313x.7781069.0.i8" width="50"
+                height="50" v-if="item.delFlag == 4 || item.delFlag == 5"
+                style="position: absolute; top: 0; left: 100px">
                 <path
                   d="M955.22053 256C813.82053 11.2 500.72053-72.6 255.92053 68.8S-72.67947 523.2 68.72053 768 523.22053 1096.6 768.02053 955.2c244.7-141.2 328.6-454.1 187.4-698.8 0-0.1-0.1-0.3-0.2-0.4zM762.02053 944.7c-239 138.1-544.8 56.2-682.9-182.8S22.92053 217.1 261.92053 79.1s544.8-56.2 682.9 182.8c137.9 239 56.1 544.6-182.8 682.8z"
-                  fill="#515151"
-                  opacity=".5"
-                  p-id="5971"
-                ></path>
+                  fill="#515151" opacity=".5" p-id="5971"></path>
                 <path
                   d="M898.12053 289.2C775.02053 76 502.42053 2.9 289.22053 126 76.02053 249.1 3.02053 521.6 126.02053 734.8 249.12053 948 521.62053 1021.1 734.82053 898 947.92053 774.9 1021.02053 502.4 898.12053 289.2zM731.62053 892.8C521.32053 1014.3 252.42053 942.2 131.02053 731.9 9.52053 521.6 81.62053 252.7 291.92053 131.3 502.12053 9.9 771.02053 81.8 892.42053 292c121.5 210.3 49.5 479.3-160.8 600.8z"
-                  fill="#515151"
-                  opacity=".5"
-                  p-id="5972"
-                ></path>
+                  fill="#515151" opacity=".5" p-id="5972"></path>
                 <path
                   d="M323.62053 176.8c3.6-2 6 0.8 8.8 2.8 6 4.4 12.4 8.8 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.4 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.6 0.6-2zM200.72053 289.2c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 14.8 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.4-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.4-1.2 0-1.6 0.8-2.4l0.2 0.4z m276.6-159.6c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.8-1.2-0.4-1.6 0.4-2.4l0.2 0.4z m141.9 29.6c3.6-2 6 0.8 8.8 2.8l18.8 12.8c7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4-7.7 0.4-15.2 0.8-22.4 0.8-4.4 6.8-8.4 13.2-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.5-1.2 0.2-1.6 0.6-2zM150.02053 430c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-4 14-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.5 0.6-2z m558.9 414.4c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.1 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-1.1 0.8-1.1 1.6-1.1h0.1z m-158.8 50c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.1-3.7-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2-1 4.2-1.7 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.4-0.8 0.8-0.8 1.7-0.7z m276.5-159.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8s-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.2 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0-0.8 0.8-1.2 1.6-1.2l0.1 0.1z m45.6-137.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.2-0.7 0.6-0.7 1.4-0.7h0.3zM402.72053 868c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-0.8 1-1.1 1.7-1.1z"
-                  fill="#515151"
-                  opacity=".5"
-                  p-id="5973"
-                ></path>
+                  fill="#515151" opacity=".5" p-id="5973"></path>
                 <path
                   d="M386.42053 590.4l-43.8-75.9L207.02053 592.7l10.2 17.7L334.02053 543l23.4 40.4-90.5 52.2-13.5-23.4-18.7 10.8 53.1 92c9.1 15.8 21.2 19.5 36.4 10.7l98.8-57c6.2-3.6 11-9.3 13.4-16.1-1.4-15.9-6.2-31.2-14.2-45l-21.4 4.8c6.7 10.3 11 21.9 12.8 34-1 3.3-3.2 6-6.1 7.8l-88.3 51c-6.2 3.6-11.1 2.1-14.8-4.3l-27.3-47.4 109.3-63.1z m2.9-103.2l10.4 18.1 65.6-37.9 79.9 138.4 18.6-10.8-55.9-96.9c18.8-0.9 43.2-0.6 73 0.7l1.5-23.1c-29.8-0.3-58.4 0.4-86 2.6l-12.5-21.6 74.9-43.2-10.4-18.1-159.1 91.8zM669.52053 329l38.2 66.2 61.4-35.4-38.1-66.1-61.5 35.3z m72.4 24.2l-26.3 15.2-19-33 26.3-15.2 19 33zM599.02053 356.7l7.9 13.7-23.3 13.5 9.8 17 21.8-12.6c7.5 18.7 6.6 39.6-2.5 57.6l20.7 4.4c10.3-23.1 10.3-49.4 0-72.5l18.8-10.9c6 9.2 10.7 19.2 14.2 29.7 0.3 5-2.6 9.7-7.2 11.7-2.9 1.2-6.4 2.8-10.9 4.9l14.1 14.1c3.7-1.3 7.3-2.9 10.7-4.8 8.6-3.9 14.4-12.2 15.2-21.6-5.4-22.1-14.6-43-27.4-61.8l-36.1 20.8-7.9-13.7-17.9 10.5z m29.9 108.1l10 17.4 53.2-30.7c-7.8 23.7-20.6 45.4-37.5 63.6l20.6 11.1c18.6-24.2 30-53.1 33-83.4l29.8 51.5 18.4-10.7-29.8-51.5c27.4 11.5 57.2 16.3 86.9 14.1l3.5-23.5c-24.7 5.1-50.1 5-74.8-0.1l53.5-30.9-10-17.3-69.3 40-7.3-12.6-18.4 10.7L698.02053 425l-69.1 39.8z"
-                  fill="#515151"
-                  opacity=".5"
-                  p-id="5974"
-                ></path>
+                  fill="#515151" opacity=".5" p-id="5974"></path>
               </svg>
             </template>
             <template #avatar>
-              <a-checkbox
-                :checked="item.checked"
-                @click.stop="checkedItem(item)"
-                @change="checkedItem(item)"
-              ></a-checkbox>
+              <a-checkbox :checked="item.checked" @click.stop="checkedItem(item)" @change="checkedItem(item)">
+              </a-checkbox>
             </template>
           </a-list-item-meta>
         </a-skeleton>
       </a-list-item>
     </template>
   </a-list>
-  <a-pagination
-    v-model:current="pageNum"
-    v-model:page-size="pageSize"
-    :page-size-options="pageSizeOptions"
-    :total="total"
-    show-size-changer
-    @showSizeChange="onShowSizeChange"
-    @change="pageChange"
-    :key="showKey"
-  >
+  <a-pagination v-model:current="pageNum" v-model:page-size="pageSize" :page-size-options="pageSizeOptions"
+    :total="total" show-size-changer @showSizeChange="onShowSizeChange" @change="pageChange" :key="showKey">
     <template #buildOptionText="props">
       <span>{{ props.value }}条/页</span>
     </template>
@@ -121,17 +62,9 @@
       <a-checkbox v-model:checked="checkAll" @change="onCheckAllChange">
         全选
       </a-checkbox>
-      <a-popconfirm
-        :title="'是否批量删除已选中的' + checkedList.length + '条数据?'"
-        ok-text="是"
-        cancel-text="否"
-        @confirm="delList"
-        @cancel="cancel"
-      >
-        <a-button
-          type="primary"
-          style="width: 70px; height: 32px; margin-left: 10px"
-        >
+      <a-popconfirm :title="'是否批量删除已选中的' + checkedList.length + '条数据?'" ok-text="是" cancel-text="否" @confirm="delList"
+        @cancel="cancel">
+        <a-button type="primary" style="width: 70px; height: 32px; margin-left: 10px">
           删除
         </a-button>
       </a-popconfirm>
@@ -139,312 +72,355 @@
   </div>
 </template>
 <script setup>
-  import { onMounted, ref } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { message } from 'ant-design-vue'
-  import mybus from '@/myplugins/mybus'
-  import { getScList, scDel, getTopCategory } from '@/api/personalCenter'
-  const router = useRouter()
-  // 分页
-  const pageNum = ref('1')
-  const pageSize = ref('5')
-  const pageSizeOptions = ref(['5', '10', '20'])
-  const total = ref(0)
-  // 多选框
-  const checkedList = ref([])
-  const checkAll = ref(false)
-  const initLoading = ref(true)
-  const showKey = ref(0)
-  // 筛选条件
-  const name = ref('')
-  const type = ref('')
-  const list = ref([])
-  const tabList = ref([])
-  // 初始化
-  onMounted(() => {
-    getList()
-    getCategory()
-  })
-  // 获取一级编目
-  const getCategory = () => {
-    getTopCategory().then((res) => {
-      console.log('编目一级=============>', res.data)
-      res.data.data.forEach((val) => {
-        // tabList.value.push(val.name)
-        if (val.name == '应用资源' || val.name == '组件服务') {
-          tabList.value.push(val.name)
-        }
-      })
+import { onMounted, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { message } from 'ant-design-vue'
+import mybus from '@/myplugins/mybus'
+import { getScList, scDel, getTopCategory } from '@/api/personalCenter'
+import { getType } from '@turf/invariant'
+const router = useRouter()
+// 分页
+const pageNum = ref('1')
+const pageSize = ref('5')
+const pageSizeOptions = ref(['5', '10', '20'])
+const total = ref(0)
+// 多选框
+const checkedList = ref([])
+const checkAll = ref(false)
+const initLoading = ref(true)
+const showKey = ref(0)
+// 筛选条件
+const name = ref('')
+const type = ref('')
+const list = ref([])
+const tabList = ref([])
+// 初始化
+onMounted(() => {
+  getList()
+  getCategory()
+})
+// 获取一级编目
+const getCategory = () => {
+  getTopCategory().then((res) => {
+    console.log('编目一级=============>', res.data)
+    res.data.data.forEach((val) => {
+      // tabList.value.push(val.name)
+      if (val.name == '应用资源' || val.name == '组件服务') {
+        tabList.value.push(val.name)
+      }
     })
+  })
+}
+// 全选按钮
+const onCheckAllChange = () => {
+  console.log(checkedList)
+  if (checkAll.value) {
+    // checkedList.value = []
+    list.value.forEach((val) => {
+      if (checkedList.value.indexOf(val.resourceId) != -1) {
+        checkedList.value.splice(checkedList.value.indexOf(val.resourceId), 1)
+      }
+      val.checked = true
+      checkedList.value.push(val.resourceId)
+      dataResourceId.value.push(val.resourceId)
+      arr.value.push(val.name)
+    })
+    console.log(checkAll.value)
+  } else {
+    list.value.forEach((val) => {
+      val.checked = false
+      if (checkedList.value.indexOf(val.resourceId) != -1) {
+        checkedList.value.splice(checkedList.value.indexOf(val.resourceId), 1)
+      }
+    })
+    // checkedList.value = []
+    dataResourceId.value = []
+    arr.value = []
+    console.log(checkAll.value)
   }
-  // 全选按钮
-  const onCheckAllChange = () => {
-    console.log(checkedList)
-    if (checkAll.value) {
-      // checkedList.value = []
-      list.value.forEach((val) => {
-        if (checkedList.value.indexOf(val.resourceId) != -1) {
-          checkedList.value.splice(checkedList.value.indexOf(val.resourceId), 1)
-        }
-        val.checked = true
+}
+// 重置
+const clean = () => {
+  name.value = ''
+  type.value = ''
+  pageNum.value = '1'
+  pageSize.value = '5'
+  showKey.value++
+  checkAll.value = false
+  getList()
+}
+// 获取信息
+const getList = () => {
+  console.log(name.value)
+  getScList({
+    pageNum: pageNum.value,
+    pageSize: pageSize.value,
+    name: name.value,
+    type: type.value,
+  }).then((res) => {
+    if (res.data.code !== 0) {
+      return message.error(res.data.msg)
+    }
+    initLoading.value = false
+    checkAll.value = true
+    console.log('申购车列表================>', res.data.data.records)
+    list.value = []
+    total.value = res.data.data.total
+    res.data.data.records.forEach((val) => {
+      const obj = {
+        loading: false,
+        id: val.id,
+        checked: false,
+        resourceId: val.resourceId,
+        createDate: val.createDate,
+        ...getObj(val, val.resourceDTO ? 'resourceDTO' : 'fuseDTO')
+      }
+      if (checkedList.value.indexOf(val.resourceId) == -1) {
+        checkAll.value = false
+      } else {
+        obj.checked = true
+      }
+      list.value.push(obj)
+    })
+  }).catch(err => {
+    message.error(err)
+  })
+}
+
+function getObj(val, typeStr) {
+  let typeObj = val[typeStr] || {};
+  console.log('typeObj------------>', typeObj);
+  return {
+    name: typeObj.name,
+    type: typeObj.type,
+    description: typeObj.description,
+    delFlag: typeObj.delFlag,
+  }
+}
+
+const onShowSizeChange = (current, pageSize) => {
+  console.log(current, pageSize)
+  // pageNum.value = current
+  // pageSize.value = pageSize
+  // getList()
+}
+// 切换页数
+const pageChange = (val) => {
+  pageNum.value = val
+  pageNum.value = val
+  // checkedList.value = []
+  getList()
+}
+// 搜索框
+const onSearch = () => {
+  console.log('search======================>', name.value)
+}
+
+//申请id
+const dataResourceId = ref([])
+
+const arr = ref([])
+// 点击多选框
+const checkedItem = (item) => {
+  checkAll.value = true
+  list.value.forEach((val) => {
+    if (val.id === item.id) {
+      console.log(val)
+      val.checked = !val.checked
+      if (val.checked) {
         checkedList.value.push(val.resourceId)
         dataResourceId.value.push(val.resourceId)
         arr.value.push(val.name)
-      })
-      console.log(checkAll.value)
-    } else {
-      list.value.forEach((val) => {
-        val.checked = false
-        if (checkedList.value.indexOf(val.resourceId) != -1) {
-          checkedList.value.splice(checkedList.value.indexOf(val.resourceId), 1)
-        }
-      })
-      // checkedList.value = []
-      dataResourceId.value = []
-      arr.value = []
-      console.log(checkAll.value)
+      } else {
+        checkedList.value.splice(checkedList.value.indexOf(val.resourceId), 1)
+        dataResourceId.value.splice(
+          checkedList.value.indexOf(val.resourceId),
+          1
+        )
+        arr.value.splice(arr.value.indexOf(val.name), 1)
+      }
     }
-  }
-  // 重置
-  const clean = () => {
-    name.value = ''
+    console.log(checkedList.value, val.resourceId)
+    if (checkedList.value.indexOf(val.resourceId) == -1) {
+      checkAll.value = false
+      console.log('不存在', checkAll.value)
+    }
+  })
+  showKey.value++
+}
+// 切换筛选条件
+const tabIndex = ref(-1)
+const changeTab = (index) => {
+  console.log('tabIndex', tabIndex.value, index, tabList)
+  if (tabIndex.value == index) {
+    tabIndex.value = -1
     type.value = ''
-    pageNum.value = '1'
-    pageSize.value = '5'
-    showKey.value++
-    checkAll.value = false
-    getList()
+  } else {
+    tabIndex.value = index
+    type.value = tabList.value[index]
   }
-  // 获取信息
-  const getList = () => {
-    console.log(name.value)
-    getScList({
-      pageNum: pageNum.value,
-      pageSize: pageSize.value,
-      name: name.value,
-      type: type.value,
-    }).then((res) => {
-      checkAll.value = true
-      console.log('申购车列表================>', res.data.data.records)
-      initLoading.value = false
-      list.value = []
-      total.value = res.data.data.total
-      res.data.data.records.forEach((val) => {
-        const obj = {
-          loading: false,
-          name: val.resourceDTO.name,
-          id: val.id,
-          checked: false,
-          type: val.resourceDTO.type,
-          resourceId: val.resourceId,
-          createDate: val.createDate,
-          description: val.resourceDTO.description,
-          delFlag: val.resourceDTO.delFlag,
-        }
-        if (checkedList.value.indexOf(val.resourceId) == -1) {
-          checkAll.value = false
-        } else {
-          obj.checked = true
-        }
-        list.value.push(obj)
-      })
-    })
-  }
-  const onShowSizeChange = (current, pageSize) => {
-    console.log(current, pageSize)
-    // pageNum.value = current
-    // pageSize.value = pageSize
-    // getList()
-  }
-  // 切换页数
-  const pageChange = (val) => {
-    pageNum.value = val
-    pageNum.value = val
-    // checkedList.value = []
-    getList()
-  }
-  // 搜索框
-  const onSearch = () => {
-    console.log('search======================>', name.value)
-  }
-
-  //申请id
-  const dataResourceId = ref([])
-
-  const arr = ref([])
-  // 点击多选框
-  const checkedItem = (item) => {
-    checkAll.value = true
-    list.value.forEach((val) => {
-      if (val.id === item.id) {
-        console.log(val)
-        val.checked = !val.checked
-        if (val.checked) {
-          checkedList.value.push(val.resourceId)
-          dataResourceId.value.push(val.resourceId)
-          arr.value.push(val.name)
-        } else {
-          checkedList.value.splice(checkedList.value.indexOf(val.resourceId), 1)
-          dataResourceId.value.splice(
-            checkedList.value.indexOf(val.resourceId),
-            1
-          )
-          arr.value.splice(arr.value.indexOf(val.name), 1)
-        }
-      }
-      console.log(checkedList.value, val.resourceId)
-      if (checkedList.value.indexOf(val.resourceId) == -1) {
+  getList()
+}
+// 删除按钮
+const delList = () => {
+  if (checkedList.value.length == 0) {
+    message.error('请先选择需要操作的数据！')
+  } else {
+    scDel(checkedList.value).then((res) => {
+      if (res.data.msg === 'success') {
+        message.success('删除成功')
+        console.log('删除申购车列表================>', res)
         checkAll.value = false
-        console.log('不存在', checkAll.value)
+        checkedList.value = []
+        dataResourceId.value = []
+        pageNum.value = '1'
+        showKey.value++
+        mybus.emit('getSgcNum')
+        getList()
       }
     })
-    showKey.value++
   }
-  // 切换筛选条件
-  const tabIndex = ref(-1)
-  const changeTab = (index) => {
-    console.log('tabIndex', tabIndex.value, index, tabList)
-    if (tabIndex.value == index) {
-      tabIndex.value = -1
-      type.value = ''
-    } else {
-      tabIndex.value = index
-      type.value = tabList.value[index]
-    }
-    getList()
-  }
-  // 删除按钮
-  const delList = () => {
-    if (checkedList.value.length == 0) {
-      message.error('请先选择需要操作的数据！')
-    } else {
-      scDel(checkedList.value).then((res) => {
-        if (res.data.msg === 'success') {
-          message.success('删除成功')
-          console.log('删除申购车列表================>', res)
-          checkAll.value = false
-          checkedList.value = []
-          dataResourceId.value = []
-          pageNum.value = '1'
-          showKey.value++
-          mybus.emit('getSgcNum')
-          getList()
-        }
-      })
-    }
-  }
-  const cancel = (e) => {
-    console.log(e)
-  }
-  // 详情
-  const showItem = (id, type, delFlag) => {
-    if (delFlag == 0) {
-      console.log('进入详情')
-      mybus.emit('tabsChange', { flag: id })
-      router.push({
-        path: '/details',
-        query: {
-          id: id,
-        },
-      })
-    }
+}
+const cancel = (e) => {
+  console.log(e)
+}
+// 详情
+const showItem = (item, type, delFlag) => {
+  if (delFlag == 0) {
+    console.log('进入详情')
+    mybus.emit('tabsChange', { flag: item.resourceId })
+    router.push({
+      path: `/details`,
+      query: {
+        id: item.resourceId,
+      },
+    })
+  } else if (delFlag === undefined) {
+    // 融合服务
+    mybus.emit('tabsChange', { flag: item.resourceId })
+    router.push({
+      path: `/integrationServicesDetails`,
+      query: {
+        id: item.resourceId,
+      },
+    })
   }
+}
 </script>
 <style lang="less" scoped>
-  .ant-list {
-    height: 540px;
-    overflow-y: scroll;
-    .ant-list-item-meta {
-      align-items: center;
-      :deep(.ant-list-item-meta-avatar) {
-        padding-left: 20px;
-        margin-right: 30px;
-      }
-      .time {
-        margin-left: 30px;
-        font-size: 12px;
-        color: #ccc;
-      }
-      :deep(.ant-list-item-meta-description) {
-        max-height: 44px;
-        overflow: hidden;
-        margin-right: 10px;
-      }
-    }
-  }
-  :deep(.ant-list-item-meta-title) {
-    display: flex;
-    justify-content: space-between;
-    span {
-      margin-right: 0.3rem;
-    }
-  }
-  .ant-list::-webkit-scrollbar {
-    width: 0 !important;
-  }
-  .bottom {
-    margin: 10px;
-    display: flex;
-    justify-content: space-between;
+.ant-list {
+  height: 540px;
+  overflow-y: scroll;
+
+  .ant-list-item-meta {
     align-items: center;
-    .left span {
-      margin-left: 10px;
+
+    :deep(.ant-list-item-meta-avatar) {
+      padding-left: 20px;
+      margin-right: 30px;
+    }
+
+    .time {
+      margin-left: 30px;
+      font-size: 12px;
+      color: #ccc;
+    }
+
+    :deep(.ant-list-item-meta-description) {
+      max-height: 44px;
+      overflow: hidden;
+      margin-right: 10px;
     }
   }
-  .title {
-    font-size: 20px;
-    color: #000000;
-    font-family: 'Alibaba PuHuiTi';
-    font-weight: 500;
-    margin-top: 20px;
-    margin-left: 20px;
+}
+
+:deep(.ant-list-item-meta-title) {
+  display: flex;
+  justify-content: space-between;
+
+  span {
+    margin-right: 0.3rem;
   }
-  .sousuokuang {
-    margin: 10px 0px 21px 20px;
-    .ant-input-search {
-      max-width: 490px;
-    }
-    :deep(.ant-input) {
-      width: 400px;
-      height: 36px;
-      font-size: 14px;
-      color: #b2b2b2;
-      background: #f5f5f5;
-    }
-    :deep(.ant-input-group-addon) {
-      display: inline-block;
-      margin-left: 10px;
-      .ant-input-search-button {
-        width: 80px;
-        height: 36px;
-        border-radius: 4px;
-        font-size: 14px;
-      }
-    }
+}
+
+.ant-list::-webkit-scrollbar {
+  width: 0 !important;
+}
+
+.bottom {
+  margin: 10px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .left span {
+    margin-left: 10px;
   }
-  .tab {
-    margin-top: 10px;
-    margin-left: 20px;
-    margin-bottom: 10px;
-    display: flex;
+}
+
+.title {
+  font-size: 20px;
+  color: #000000;
+  font-family: 'Alibaba PuHuiTi';
+  font-weight: 500;
+  margin-top: 20px;
+  margin-left: 20px;
+}
+
+.sousuokuang {
+  margin: 10px 0px 21px 20px;
+
+  .ant-input-search {
+    max-width: 490px;
+  }
+
+  :deep(.ant-input) {
+    width: 400px;
+    height: 36px;
     font-size: 14px;
-    color: #999999;
-    div {
-      width: 70px;
-      height: 24px;
-      border: 1px solid #cccccc;
-      border-radius: 12px;
-      margin-left: 10px;
-      text-align: center;
-      color: #666666;
-      cursor: pointer;
-    }
-    .tabclass {
-      border: 1px solid #0087ff;
-      color: #0087ff;
+    color: #b2b2b2;
+    background: #f5f5f5;
+  }
+
+  :deep(.ant-input-group-addon) {
+    display: inline-block;
+    margin-left: 10px;
+
+    .ant-input-search-button {
+      width: 80px;
+      height: 36px;
+      border-radius: 4px;
+      font-size: 14px;
     }
   }
-  .name:hover {
+}
+
+.tab {
+  margin-top: 10px;
+  margin-left: 20px;
+  margin-bottom: 10px;
+  display: flex;
+  font-size: 14px;
+  color: #999999;
+
+  div {
+    width: 70px;
+    height: 24px;
+    border: 1px solid #cccccc;
+    border-radius: 12px;
+    margin-left: 10px;
+    text-align: center;
+    color: #666666;
+    cursor: pointer;
+  }
+
+  .tabclass {
+    border: 1px solid #0087ff;
     color: #0087ff;
   }
+}
+
+.name:hover {
+  color: #0087ff;
+}
 </style>

From 5d2c39fb446b384dcfe3035c5755a31d5e55286d Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Thu, 7 Jul 2022 14:31:52 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=9A=E4=B8=80=E9=94=AE=E7=94=B3=E8=AF=B7=E7=9A=84=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E6=95=B0=E7=BB=84=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/components/searchResultList.vue      | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 5b8574a2..8b3090d9 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -277,6 +277,11 @@ export default {
     let shoppingKey = ref(1)
     // 融合服务排序
     const orderList = ref([
+      {
+        value: 'collectCount',
+        name: '收藏量',
+        orderType: 'DESC'
+      },
       {
         value: 'create_date',
         name: '发布时间',
@@ -478,24 +483,29 @@ export default {
 
     // 融合服务--一键申请
     const handleAKeyApplication = (item) => {
+      let _applyList = [];
+      (item.fuseResourceList || []).map(v => {
+        let resource = v.resource || {}
+        let obj = {
+          arr: [
+            {
+              delFlag: resource.delFlag,
+              description: resource.description,
+              resourceId: resource.id,
+              resourceName: resource.name,
+              time: resource.createDate,
+              type: resource.type,
+            },
+          ],
+          deptId: resource.deptId,
+          deptName: resource.deptName,
+        }
+        _applyList.push(obj)
+      })
+
       localStorage.setItem(
         'applyList',
-        JSON.stringify([
-          {
-            arr: [
-              {
-                delFlag: item.delFlag,
-                description: item.description,
-                resourceId: item.id,
-                resourceName: item.name,
-                time: item.createDate,
-                type: item.type,
-              },
-            ],
-            deptId: item.deptId,
-            deptName: item.deptName,
-          },
-        ])
+        JSON.stringify(_applyList)
       )
       router.push({
         path: '/apply',

From d7778972f58b79d1ff04ff70ed7b6a0b298448dd Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 8 Jul 2022 16:10:08 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ability/IntegratedServices-add.vue        | 499 ++++++++++++++++++
 .../modules/ability/IntegratedServices.vue    | 449 +++++-----------
 .../views/modules/ability/bsabilityvideo.vue  |   1 -
 .../ability/components/common-question.vue    | 107 ++++
 .../components/integrated-combine-ability.vue | 157 ++++++
 back/src/views/modules/ability/showChild.vue  | 154 ++++++
 6 files changed, 1035 insertions(+), 332 deletions(-)
 create mode 100644 back/src/views/modules/ability/IntegratedServices-add.vue
 create mode 100644 back/src/views/modules/ability/components/common-question.vue
 create mode 100644 back/src/views/modules/ability/components/integrated-combine-ability.vue
 create mode 100644 back/src/views/modules/ability/showChild.vue

diff --git a/back/src/views/modules/ability/IntegratedServices-add.vue b/back/src/views/modules/ability/IntegratedServices-add.vue
new file mode 100644
index 00000000..fc960d21
--- /dev/null
+++ b/back/src/views/modules/ability/IntegratedServices-add.vue
@@ -0,0 +1,499 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="addOrUpdateVisibleCopy" :title="modalType === 'display' ? '能力展示' : '挂接'"
+      @close="closeModal" :close-on-click-modal="false" :close-on-press-escape="false">
+      <div v-if="modalType !== 'display'" style="
+            text-align: center;
+            font-weight: 600;
+            font-size: 18px;
+            margin-bottom: 10px;
+          ">
+        填写字段
+      </div>
+      <el-checkbox-group v-if="modalType !== 'display'" v-model="checkList" @change="changeBtn"
+        style="margin-bottom: 20px">
+        <el-checkbox-button v-for="(item, i) in btnList" :label="item.name" :key="i">{{ item.name }}
+        </el-checkbox-button>
+      </el-checkbox-group>
+
+      <!-- 挂载和修改-->
+      <div key="1" v-if="modalType !== 'display'">
+        <el-form :model="dataForm" :rules="rules" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+          :label-width="$i18n.locale === 'en-US' ? '120px' : 'auto'">
+          <!-- 基本信息 -->
+          <div style="margin-bottom:20px" v-if="checkList.includes('基本信息')">
+            <div style="
+                text-align: center;
+                font-weight: 600;
+                font-size: 18px;
+                margin-bottom: 10px;
+              ">
+              基本信息
+            </div>
+            <el-form-item label="融合服务名称" prop="name">
+              <el-input v-model="dataForm.name" placeholder="请输入融合服务名称"></el-input>
+            </el-form-item>
+            <el-form-item label="融合服务描述" prop="description">
+              <el-input v-model="dataForm.description" placeholder="请输入融合服务描述"></el-input>
+            </el-form-item>
+            <el-form-item label="应用领域" prop="applicationArea">
+              <el-select v-model="dataForm.applicationArea" placeholder="请选择应用领域" filterable>
+                <el-option v-for="item in areaList" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="部门联系人" prop="deptUser">
+              <el-input v-model="dataForm.deptUser" placeholder="请输入部门联系人"></el-input>
+            </el-form-item>
+            <el-form-item label="部门联系人电话" prop="mobile">
+              <el-input v-model="dataForm.mobile" placeholder="请输入部门联系人电话"></el-input>
+            </el-form-item>
+            <el-form-item label="服务商" prop="provider">
+              <el-input v-model="dataForm.provider" placeholder="请输入服务商"></el-input>
+            </el-form-item>
+            <el-form-item label="服务商联系人" prop="providerUser">
+              <el-input v-model="dataForm.providerUser" placeholder="请输入服务商联系人"></el-input>
+            </el-form-item>
+            <el-form-item label="服务商联系人电话" prop="providerMobile">
+              <el-input v-model="dataForm.providerMobile" placeholder="请输入服务商联系人电话"></el-input>
+            </el-form-item>
+          </div>
+
+          <!-- 组合能力 -->
+          <div class="" v-if="checkList.includes('组合能力')">
+            <integrated-combine-ability v-model="dataForm" :dataForm="dataForm" @update="updateDataForm">
+            </integrated-combine-ability>
+          </div>
+
+          <!-- 技术文档 -->
+          <div style="margin-bottom:20px" v-if="checkList.includes('技术文档')">
+            <div style="
+                          text-align: center;
+                          font-weight: 600;
+                          font-size: 18px;
+                          margin-bottom: 10px;
+                        ">
+              技术文档
+            </div>
+            <div v-for="(item, index) in dataForm.fuseAttrList" :key="index">
+              <div v-if="item.attrType === '技术文档'">
+                <el-form-item label="技术文档" prop="attrValue">
+                  <el-upload ref="addUpload" class="upload-demo" :action="fileUploadUrl"
+                    :before-upload="beforeAvatarUpload" :on-success="handleAvatarSuccess" :file-list="fileList"
+                    :show-file-list="false">
+                    <el-button size="small" type="primary">上传</el-button>
+                  </el-upload>
+                  <el-button v-if="item.attrValue" @click="item.attrValue = ''" type="danger">删除</el-button>
+                </el-form-item>
+                <div>
+                  <div v-for="(name, i) in fileNameList" :key="i">{{ name }}</div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <!-- 常见问题 -->
+          <div v-if="checkList.includes('常见问题')">
+            <common-question :dataForm="dataForm" @update="updateDataForm"></common-question>
+          </div>
+        </el-form>
+      </div>
+
+      <!-- 展示 -->
+      <el-form key="2" class="detial-form" v-else :label-width="$i18n.locale === 'en-US' ? '120px' : 'auto'">
+        <el-form-item :label="displayInfo[data]" v-for="(data, i) in Object.keys(displayInfo)" :key="i" :prop="data">
+          {{ dataForm[data] || "--" }}
+        </el-form-item>
+        <div v-for="(data, i) in displayListInfo['常见问题']" :key="`${i}${JSON.stringify(data)}`">
+          <el-form-item :label="`常见问题${i + 1}`">
+            {{ `${data['question']}` }}
+          </el-form-item>
+          <el-form-item :label="`问题描述${i + 1}`">
+            {{ `${data['answer']} ` }}
+          </el-form-item>
+        </div>
+        <div v-for="(data, i) in displayListInfo['组合能力']" :key="`${i}${JSON.stringify(data)}`">
+          <el-form-item :label="`能力类别${i + 1}`">
+            {{ `${data['type']}` }}
+          </el-form-item>
+          <el-form-item :label="`能力名称${i + 1}`">
+            {{ `${data['name']} ` }}
+          </el-form-item>
+        </div>
+      </el-form>
+
+      <template slot="footer">
+        <el-button @click="closeModal">{{ $t("cancel") }}</el-button>
+        <el-button v-if="modalType !== 'display'" type="primary" @click="dataFormSubmitHandle()">{{
+            $t("confirm")
+        }}</el-button>
+      </template>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import qs from "qs";
+import CommonQuestion from './components/common-question.vue';
+import IntegratedCombineAbility from './components/integrated-combine-ability.vue';
+import Cookies from 'js-cookie'
+
+export default {
+  components: {
+    CommonQuestion,
+    IntegratedCombineAbility,
+  },
+  data() {
+    return {
+      fileList: [],
+      fileUploadUrl: `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('ucsToken')}`,
+      dataForm: {
+        "applicationArea": "",
+        "description": "",
+        "fuseAttrList": [
+          {
+            "attrType": "技术文档",
+            "attrValue": "",
+          },
+          {
+            "attrType": "常见问题",
+            "attrValue": [{ question: "", answer: "" }],
+          }
+        ],
+        "fuseResourceList": [
+          {
+            "resourceId": 0,
+            "sequence": ""
+          }
+        ],
+        "mobile": "",
+        "name": "",
+        "provider": "",
+        "providerMobile": "",
+        "providerUser": "",
+        // "updateDate": "",
+        // "updater": 0,
+        // "createDate": "",
+        // "creator": 0,
+        "deptUser": "",
+      },
+      rules: {
+        name: [
+          {
+            required: true,
+            message: "请输入融合服务名称",
+            trigger: "change",
+          },
+        ],
+        description: [
+          {
+            required: true,
+            message: "请输入融合服务描述",
+            trigger: "change",
+          },
+        ],
+      },
+      btnList: [
+        {
+          name: '基本信息',
+          key: 'basic',
+          show: true,
+        },
+        {
+          name: '组合能力',
+          key: 'combine',
+          show: true,
+        },
+        {
+          name: '技术文档',
+          key: 'basic',
+          show: true,
+        },
+        {
+          name: '常见问题',
+          key: 'basic',
+          show: true,
+        },
+      ],
+      checkList: ['基本信息', '组合能力', '技术文档', '常见问题'],
+      areaList: [],
+      fileNameList: [],
+      addOrUpdateVisibleCopy: this.addOrUpdateVisible,
+      displayInfo: {
+        'name': '融合服务名称',
+        'description': '融合服务描述',
+        'applicationArea': '应用领域',
+        'deptUser': '部门联系人',
+        'mobile': '部门联系人电话',
+        'provider': '服务商',
+        'providerMobile': '服务商联系人',
+        'providerMobile': '服务商联系人电话',
+      },
+      displayListInfo: {
+        '常见问题': [],
+        '组合能力': []
+      },
+    };
+  },
+  props: {
+    modalType: {
+      type: String,
+      default: 'add'
+    },
+    addOrUpdateVisible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  watch: {
+    dataForm: {
+      handler(newVal) {
+        this.dataForm = newVal
+      },
+      deep: true,
+      immediate: true,
+    },
+    addOrUpdateVisible: {
+      handler(newVal) {
+        this.addOrUpdateVisibleCopy = newVal;
+      },
+      immediate: true,
+    }
+  },
+  mounted() {
+    // 获取应用领域
+    this.getAreaInfo()
+  },
+  methods: {
+    clearForm() {
+      this.$refs.dataForm && this.$refs.dataForm.resetFields();
+    },
+    closeModal() {
+      this.$emit('closeModal')
+    },
+    // 获取应用领域
+    getAreaInfo() {
+      const params = {
+        page: 1,
+        limit: 99,
+        dictTypeId: "1513712507692818433",
+      };
+      this.$http
+        .get("/sys/dict/data/page" + "?" + qs.stringify(params))
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          res.data.list.map((item) => {
+            this.areaList.push({
+              label: item.dictLabel,
+              value: item.dictLabel
+            });
+          });
+        }).catch(err => {
+          this.$message.error(err);
+        })
+    },
+    // 更新表单
+    updateDataForm(data) {
+      if (data.title == '常见问题') {
+        this.dataForm.fuseAttrList.map(v => {
+          if (v.attrType === '常见问题') {
+            v.attrValue = JSON.stringify(data.list)
+          }
+        })
+      }
+      if (data.title == '组合能力') {
+        this.dataForm.fuseResourceList = data.list
+      }
+    },
+    // 改变按钮状态
+    changeBtn(data) {
+      this.checkList = data;
+    },
+    beforeAvatarUpload() { },
+    handleAvatarSuccess(res, file) {
+      console.log(file)
+      if (res.code !== 0) {
+        return this.$message.error("上传文件失败");
+      }
+      this.fileNameList.push(file.name)
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs.dataForm.validate((valid) => {
+          if (!valid) {
+            this.$message.error("请检查表单是否填写完整");
+            return false;
+          }
+          let methodsObj = {
+            'add': 'post',
+            'update': 'put'
+          }
+          let arr = this.dataForm.fuseResourceList.filter(v => v.resourceId !== '') || []
+          if (arr.length == 0) {
+            this.dataForm.fuseResourceList = []
+          }
+          this.$http
+          [methodsObj[this.modalType]]("/fuse", this.dataForm)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              }
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  this.$refs.dataForm && this.$refs.dataForm.resetFields();
+                  this.$emit("refreshDataList");
+                  this.$emit("closeModal");
+                },
+              });
+            })
+            .catch((err) => {
+              this.$message.error(err)
+            });
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    // 详情
+    getDetail(data) {
+      this.dataForm = data;
+      this.$nextTick(() => {
+        console.log('this.dataForm----详情-------->', this.dataForm);
+      })
+    },
+    // 重组数据
+    getDisPlayData() {
+      this.$nextTick(() => {
+        console.log('this.dataForm----重组数据-------->', this.dataForm);
+        const questionObj = this.dataForm.fuseAttrList.find(v => v.attrType == '常见问题') || {};
+        let fuseResourceList = this.dataForm.fuseResourceList || [];
+        let arr = []
+        fuseResourceList.map(v => {
+          arr.push({
+            name: v.resource.name,
+            type: v.resource.type,
+          })
+        })
+        this.displayListInfo['常见问题'] = JSON.parse(questionObj.attrValue || '[]')
+        this.displayListInfo['组合能力'] = arr
+      })
+
+    },
+  },
+  beforeDestroy() {
+    this.clearForm()
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-dialog__body {
+  height: 580px;
+  overflow: auto;
+}
+
+.icon-input ::v-deep .el-input__inner {
+  cursor: pointer;
+}
+
+.detial-form ::v-deep {
+  .el-form-item {
+    margin-bottom: 0px;
+    line-height: 32px;
+  }
+
+  .el-form-item__label {
+    line-height: 32px;
+  }
+
+  .el-form-item__content {
+    line-height: 32px;
+  }
+}
+
+::v-deep .el-checkbox-button__inner {
+  width: 130px;
+  margin: 0 10px 5px;
+  border-left: unset !important;
+  border-radius: unset !important;
+  border: 1px solid #dcdfe6 !important;
+}
+</style>
+
+<style lang="scss">
+.mod-sys__menu {
+
+  .menu-list,
+  .icon-list {
+
+    .el-input__inner,
+    .el-input__suffix {
+      cursor: pointer;
+    }
+  }
+
+  &-icon-popover {
+    width: 458px;
+    overflow: hidden;
+  }
+
+  &-icon-inner {
+    width: 478px;
+    max-height: 258px;
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+
+  &-icon-list {
+    width: 458px;
+    padding: 0;
+    margin: -8px 0 0 -8px;
+
+    >.el-button {
+      padding: 8px;
+      margin: 8px 0 0 8px;
+
+      >span {
+        display: inline-block;
+        vertical-align: middle;
+        width: 18px;
+        height: 18px;
+        font-size: 18px;
+      }
+    }
+  }
+}
+
+.previewImg {
+  position: fixed;
+  z-index: 9999;
+}
+
+.name {
+  text-align: right;
+  vertical-align: middle;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px;
+  padding: 0 12px 0 0;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  line-height: 32px;
+  background: pink;
+  width: 120px;
+}
+
+.text {
+  margin-left: 132px;
+  font-size: 14px;
+  color: #606266;
+  line-height: 32px;
+}
+</style>
diff --git a/back/src/views/modules/ability/IntegratedServices.vue b/back/src/views/modules/ability/IntegratedServices.vue
index dcff9365..1639a50c 100644
--- a/back/src/views/modules/ability/IntegratedServices.vue
+++ b/back/src/views/modules/ability/IntegratedServices.vue
@@ -3,176 +3,94 @@
     <div class="mod-ability__bsabilityai">
       <el-form :inline="true" :model="dataForm">
         <el-form-item>
-          <el-input
-            v-model="dataForm.name"
-            placeholder="名称"
-            clearable
-          ></el-input>
+          <el-input v-model="dataForm.name" placeholder="名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList2(dataForm.name)">{{
-            $t("query")
+          <el-button @click="searchData">{{
+              $t("query")
           }}</el-button>
         </el-form-item>
+
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{
-            $t("export")
-          }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            v-if="$hasPermission('ability:bsabilityai:save')"
-            type="primary"
-            @click="addOrUpdateHandleServe()"
-            >挂接</el-button
-          >
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            v-if="$hasPermission('ability:bsabilityai:delete')"
-            type="danger"
-            @click="deleteHandle2()"
-            >{{ $t("deleteBatch") }}</el-button
-          >
+          <el-button v-if="$hasPermission('ability:bsabilityai:save')" type="primary" @click="addServe()">挂接</el-button>
         </el-form-item>
+
         <el-form-item>
           <el-button @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        style="width: 100%"
-        :height="qp ? '810px' : '650px'"
-      >
-        <el-table-column
-          type="selection"
-          header-align="center"
-          align="center"
-          width="50"
-        ></el-table-column>
-        <el-table-column
-          prop="name"
-          label="应用名称"
-          header-align="center"
-          align="center"
-        ></el-table-column>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%" :height="qp ? '810px' : '650px'">
 
-        <el-table-column
-          v-for="(item, index) in dataList[0].infoList"
-          :key="index"
-          :label="item.attrType"
-          header-align="center"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="name" label="融合服务名称" header-align="center" align="center"></el-table-column>
+
+        <el-table-column prop="description" label="融合服务描述" header-align="center" align="center"></el-table-column>
+
+        <el-table-column prop="provider" label="服务商" header-align="center" align="center"></el-table-column>
+
+        <el-table-column prop="providerUser" label="服务商联系人" header-align="center" align="center"></el-table-column>
+
+        <el-table-column prop="providerMobile" label="服务商联系人电话" header-align="center" align="center"></el-table-column>
+
+        <el-table-column prop="applicationArea" label="应用领域" header-align="center" align="center"></el-table-column>
+
+        <el-table-column prop="deptId" label="所属部门" header-align="center" align="center"></el-table-column>
+
+        <el-table-column prop="deptUser" label="部门联系人" header-align="center" align="center"></el-table-column>
+
+        <el-table-column prop="mobile" label="部门联系人电话" header-align="center" align="center"></el-table-column>
+
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="94" right="0">
           <template slot-scope="scope">
-            {{ findValue(scope.row.infoList, item.attrType) }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          :label="$t('handle')"
-          fixed="right"
-          header-align="center"
-          align="center"
-          width="94"
-          right="0"
-        >
-          <template slot-scope="scope">
-            <el-button
-              v-if="$hasPermission('ability:bsabilityai:update')"
-              type="text"
-              size="small"
-              @click="UpdateHandle(scope.row)"
-              >{{ $t("update") }}</el-button
-            >
-            <el-button
-              v-if="$hasPermission('ability:bsabilityai:delete')"
-              type="text"
-              size="small"
-              @click="deleteHandle2(scope.row.id)"
-              >{{ $t("delete") }}</el-button
-            >
-            <el-button type="text" size="small" @click="showDetail(scope.row)"
-              >展示</el-button
-            >
-            <el-button type="text" size="small" @click="showDocument(scope.row)"
-              >开发文档</el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              @click="applyAndAssembly(scope.row)"
-              >应用与组件</el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              @click="applyAndDataResource(scope.row)"
-              >应用与数据资源</el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              @click="applyAndProject(scope.row)"
-              >应用与项目</el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              @click="applyAndInfrastructure(scope.row)"
-              >应用与基础设施</el-button
-            >
+            <el-button v-if="$hasPermission('ability:bsabilityai:update')" type="text" size="small"
+              @click="handleUpdate(scope.row)">{{ $t("update") }}</el-button>
+            <el-button v-if="$hasPermission('ability:bsabilityai:delete')" type="text" size="small"
+              @click="deleteRow(scope.row.id)">{{ $t("delete") }}</el-button>
+            <el-button type="text" size="small" @click="showDetail(scope.row)">能力展示</el-button>
+            <el-button type="text" size="small" @click="showDocument(scope.row)">技术文档</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="Number(total)"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle"
-      >
+
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="Number(total)"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
       </el-pagination>
+
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update
-        :disabled="disabled"
-        v-if="addOrUpdateVisible"
-        ref="addOrUpdate"
-        @refreshDataList="getDataList"
-      ></add-or-update>
-      <relate-application
-        v-if="relateApplicationResourceVisible"
-        ref="relateApplication"
-        :relateInfo="relationData"
-        :nameArray="topNameArray"
-        @isShowRelatePopup="handleIsShowRelatePopupApply"
-      ></relate-application>
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="query" @closeModal="closeModal"
+        :addOrUpdateVisible="addOrUpdateVisible" :modalType="modalType">
+      </add-or-update>
+      <relate-application v-if="relateApplicationResourceVisible" ref="relateApplication" :relateInfo="relationData"
+        :nameArray="topNameArray" @isShowRelatePopup="handleIsShowRelatePopupApply"></relate-application>
+      <show-child v-if="showData" :tableData="tableData" :childName="childName" :isShow="showData"></show-child>
     </div>
   </el-card>
 </template>
 
 <script>
 import mixinViewModule from "@/mixins/view-module";
-import AddOrUpdate from "./bsabilityservice-add-or-update";
+import AddOrUpdate from "./IntegratedServices-add";
 import dictionaries from "@/utils/dictionaries";
 import RelateApplication from "./bsabilityai-relate-application.vue";
+import showChild from './showChild.vue'
 import qs from "qs";
 import { type } from "os";
+
+
 export default {
   mixins: [mixinViewModule],
   data() {
     return {
+      tableData: [],
+      showData: false,
+      childName: '',
       mixinViewModuleOptions: {
-        getDataListURL: "/resource/page",
-        getDataListIsPage: true,
+        getDataListURL: "/fuse/page",
         exportURL: "/ability/bsabilityai/export",
-        deleteURL: "/resource/delete",
-        deleteIsBatch: true,
+        deleteURL: "/fuse",
+        getDataListIsPage: true,
+        deleteIsBatch: false,
       },
       disabled: false,
       sceneArr: dictionaries.sceneArr,
@@ -180,80 +98,83 @@ export default {
       shareFormArr: dictionaries.shareFormArr,
       dataForm: {
         name: "",
-        creator: "",
-        selectType: 0,
-        delFlag: 0,
-        type: "应用资源",
+        order: 'desc',
+        orderField: 'create_date',
       },
       qp: false,
       relateApplicationResourceVisible: false,
       relationData: {}, //打开穿梭框时传递的参数
       topNameArray: [], //
+      modalType: 'add',
     };
   },
   watch: {},
   components: {
     AddOrUpdate,
     RelateApplication,
-  },
-  created() {
-    this.dataForm.name = "";
-    this.dataForm.type = "应用资源";
+    showChild,
   },
   mounted() {
     window.addEventListener("resize", this.a);
     this.fullScreen();
   },
   methods: {
-    reset() {
-      this.$http
-        .get(
-          this.mixinViewModuleOptions.getDataListURL +
-            "?" +
-            qs.stringify({
-              // order: this.order,
-              // orderField: this.orderField,
-              // type: '组件服务',
-              page: 1,
-              selectType: 0,
-              limit: 10,
-              delFlag: 0,
-              creator: "",
-              type: "应用资源",
-              name: "",
-            })
-        )
-        .then(({ data: res }) => {
-          this.dataForm.name = "";
-          if (res.code !== 0) {
-            this.dataList = [];
-            this.total = 0;
-            return this.$message.error(res.msg);
-          }
-          this.dataList = this.mixinViewModuleOptions.getDataListIsPage
-            ? res.data.list
-            : res.data;
-          this.total = this.mixinViewModuleOptions.getDataListIsPage
-            ? res.data.total
-            : 0;
-          if (this.mixinViewModuleOptions.requestCallback) {
-            this.mixinViewModuleOptions.requestCallback(res.data);
-          }
-          this.dataListLoading = false;
-        })
-        .catch(() => {
-          this.dataListLoading = false;
+    deleteRow(id) {
+      this.$http.delete('/fuse/delete', {
+         data: [id]
+      }).then(res => {
+        console.log('删除成功', res)
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        }
+        this.$message({
+          message: '删除成功',
+          type: "success",
+          duration: 500,
+          onClose: () => {
+            this.query()
+          },
         });
+      }).catch(err => {
+        this.$message.error(err);
+      })
     },
+    // 查询
+    searchData() {
+      this.query()
+    },
+    // 重置
+    reset() {
+      this.dataForm.name = "";
+      this.query()
+    },
+    // 修改
+    handleUpdate(val) {
+      this.addOrUpdateVisible = true;
+      this.modalType = 'update';
+      const cloneVal = JSON.parse(JSON.stringify(val))
+      this.$nextTick(() => {
+        // this.$refs.addOrUpdate.dataForm = cloneVal;
+        this.$refs.addOrUpdate.getDetail(cloneVal)
+      })
+    },
+    // 挂接
+    addServe() {
+      this.addOrUpdateVisible = true
+      this.modalType = 'add';
+    },
+    closeModal() {
+      this.addOrUpdateVisible = false;
+    },
+    // 展示
     showDetail(val) {
       this.addOrUpdateVisible = true;
-      this.disabled = false;
+      this.modalType = 'display';
+      const cloneVal = JSON.parse(JSON.stringify(val))
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.UpdateState = false;
-        this.$refs.addOrUpdate.dataFormShowDetails = val;
-        this.$refs.addOrUpdate.init();
-      });
-      this.disabled = true;
+        this.$refs.addOrUpdate.dataForm = cloneVal;
+        this.$refs.addOrUpdate.getDisPlayData()
+      })
     },
     showDocument(val) {
       console.log(val);
@@ -262,60 +183,14 @@ export default {
         "_blank"
       );
     },
-    findValue(list, type) {
-      const found = list.find((item) => item.attrType === type);
-      if (found) {
-        return found.attrValue;
-      } else {
-        return "暂无数据";
-      }
-    },
-    getDataList2(names) {
-      if (names != null) {
-        this.$http
-          .get(
-            this.mixinViewModuleOptions.getDataListURL +
-              "?" +
-              qs.stringify({
-                // order: this.order,
-                // orderField: this.orderField,
-                // type: '组件服务',
-                pageNum: 1,
-                pageSize: this.limit,
-                type: "应用资源",
-                creator: "",
-                selectType: 0,
-                delFlag: 0,
-                name: names,
-              })
-          )
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              this.dataList = [];
-              this.total = 0;
-              return this.$message.error(res.msg);
-            }
-            if (res.data.list.length !== 0) {
-              this.dataList = res.data.list;
-              this.total = this.mixinViewModuleOptions.getDataListIsPage
-                ? res.data.total
-                : 0;
-              if (this.mixinViewModuleOptions.requestCallback) {
-                this.mixinViewModuleOptions.requestCallback(res.data);
-              }
-              this.dataListLoading = false;
-            } else {
-              this.$message.error("未查询到相关信息");
-              this.reset();
-            }
-          })
-          .catch(() => {
-            this.dataListLoading = false;
-          });
-      } else {
-        this.$message.error("查询不能输入为空");
-      }
-    },
+    // findValue(list, type) {
+    //   const found = list.find((item) => item.attrType === type);
+    //   if (found) {
+    //     return found.attrValue;
+    //   } else {
+    //     return "暂无数据";
+    //   }
+    // },
     fullScreen() {
       if (window.outerHeight === screen.availHeight) {
         if (window.outerWidth === screen.availWidth) {
@@ -348,94 +223,6 @@ export default {
         this.qp = true;
       }
     },
-    //应用与组件
-    applyAndAssembly(val) {
-      console.log("vvvv", val);
-      //根据id和类型查询已关联的组件，将id,type和查出来的数据传递给组件
-      let type = "组件服务";
-      let id = val.id;
-      this.$http
-        .get(`/dataResourceRel/queryResourceRelByKeyId`, {
-          params: {
-            keyId: id,
-            type: type,
-            referenceName: "",
-          },
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          }
-          console.log("rrrrressssz", res.data);
-          this.relateApplicationResourceVisible = true;
-          this.relationData = {
-            id: id,
-            linkType: "1",
-            responseData: res.data,
-          };
-          this.topNameArray = ["未关联组件名称", "已关联组件名称"];
-          console.log(" this.relationData", this.relationData);
-          //将数据传递给引入的组件
-        });
-    },
-    //应用与数据资源
-    applyAndDataResource(val) {
-      console.log("数据资源");
-    },
-    //应用与项目
-    applyAndProject(val) {
-      let type = "项目";
-      let id = val.id;
-      this.$http
-        .get(`/dataResourceRel/queryResourceRelByKeyId`, {
-          params: {
-            keyId: id,
-            type: type,
-            referenceName: "",
-          },
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          }
-          console.log("rrrrressssx", res.data);
-          this.relateApplicationResourceVisible = true;
-          this.relationData = {
-            id: id,
-            linkType: "1",
-            responseData: res.data,
-          };
-          this.topNameArray = ["未关联项目名称", "已关联项目名称"];
-          //将数据传递给引入的组件
-        });
-    },
-    //应用与基础设施
-    applyAndInfrastructure(val) {
-      let type = "基础设施";
-      let id = val.id;
-      this.$http
-        .get(`/dataResourceRel/queryResourceRelByKeyId`, {
-          params: {
-            keyId: id,
-            type: type,
-            referenceName: "",
-          },
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          }
-          console.log("rrrrressssj", res.data);
-          this.relateApplicationResourceVisible = true;
-          this.relationData = {
-            id: id,
-            linkType: "1",
-            responseData: res.data,
-          };
-          this.topNameArray = ["未关联基础设施名称", "已关联基础设施名称"];
-          //将数据传递给引入的组件
-        });
-    },
     // 是否展示关联应用弹窗
     handleIsShowRelatePopupApply(type) {
       this.relateApplicationResourceVisible = type;
diff --git a/back/src/views/modules/ability/bsabilityvideo.vue b/back/src/views/modules/ability/bsabilityvideo.vue
index 90419584..83d7d2ce 100644
--- a/back/src/views/modules/ability/bsabilityvideo.vue
+++ b/back/src/views/modules/ability/bsabilityvideo.vue
@@ -1,6 +1,5 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    {{ this.$route.meta.type }}
     <div class="mod-ability__bsabilityvideo">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
diff --git a/back/src/views/modules/ability/components/common-question.vue b/back/src/views/modules/ability/components/common-question.vue
new file mode 100644
index 00000000..ba4437e0
--- /dev/null
+++ b/back/src/views/modules/ability/components/common-question.vue
@@ -0,0 +1,107 @@
+<template>
+    <div class="question-box">
+        <div class="title">
+            常见问题
+        </div>
+        <div v-for="(item, index) in dataInfo" :key="item.answer">
+            <el-form-item label="问题名称" prop="question">
+                <el-input v-model="item.question" placeholder="请输入问题名称" style="width:90%"></el-input>
+            </el-form-item>
+            <el-form-item label="问题描述" prop="answer">
+                <el-input v-model="item.answer" placeholder="请输入问题描述" style="width:90%"></el-input>
+                <el-button style="margin-left:10px" @click="deleteItem(index)" type="danger" size="small">删除
+                </el-button>
+            </el-form-item>
+            <el-button style="margin-left:120px" size="small" v-if="index == dataInfo.length - 1" @click="addItem"
+                type="primary">添加
+            </el-button>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    props: {
+        dataForm: {
+            type: Object,
+            default: () => { }
+        }
+    },
+    data() {
+        return {
+            dataInfo: []
+        }
+    },
+    watch: {
+        dataInfo: {
+            handler(newVal) {
+                this.dataInfo = newVal;
+                this.$emit('update', {
+                    title: '常见问题',
+                    list: newVal
+                })
+            },
+            deep: true,
+            immediate: true,
+        },
+        dataForm: {
+            handler(newVal, oldVal) {
+                // 防止无限循环，简单比较一下
+                if (JSON.stringify(newVal) != JSON.stringify(oldVal)) {
+                    this.dataForm = newVal;
+                    this.getDataInfo();
+                }
+            },
+            deep: true,
+            immediate: true,
+        }
+    },
+    methods: {
+        getDataInfo() {
+            let arr = []
+            let fuseAttrList = this.dataForm.fuseAttrList || [];
+            let obj = fuseAttrList.find(v => v.attrType === '常见问题') || {}
+            console.log('obj-------常见问题----->', obj);
+            let attrValue = JSON.parse(obj.attrValue)
+
+            if (attrValue.length > 0) {
+                attrValue.map(v => {
+                    arr.push({
+                        question: v.question,
+                        answer: v.answer,
+                    })
+                })
+            } else {
+                arr = []
+                arr.push({
+                    question: "",
+                    answer: "",
+                })
+            }
+            this.dataInfo = arr;
+        },
+        // 新增
+        addItem() {
+            this.dataInfo.push({
+                question: "",
+                answer: "",
+            })
+        },
+        // 删除
+        deleteItem(list, index) {
+            this.dataInfo.splice(index, 1)
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.question-box {
+    margin-bottom: 20px;
+
+    .title {
+        text-align: center;
+        font-weight: 600;
+        font-size: 18px;
+        margin-bottom: 10px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/back/src/views/modules/ability/components/integrated-combine-ability.vue b/back/src/views/modules/ability/components/integrated-combine-ability.vue
new file mode 100644
index 00000000..fd82c47c
--- /dev/null
+++ b/back/src/views/modules/ability/components/integrated-combine-ability.vue
@@ -0,0 +1,157 @@
+<!-- 融合服务--组合能力 -->
+<template>
+    <div class="content-box">
+        <div class="title">
+            组合能力
+        </div>
+        <div v-for="(item, index) in dataInfo" :key="index">
+            <el-form-item label="能力类别" prop="">
+                <el-select v-model="item.type" placeholder="请选择能力类别" @change="(data) => changeType(data, item, index)">
+                    <el-option v-for="val in typeOptions" :key="val.value" :label="val.value" :value="val.value">
+                    </el-option>
+                </el-select>
+                <el-select style="margin-left: 20px" v-model="item.name" placeholder="请选择能力" filterable>
+                    <el-option v-for="val in item.abilityOptions" :key="val.id" :label="val.name" :value="val.id">
+                    </el-option>
+                </el-select>
+                <el-button style="margin-left:10px" @click="deleteItem(dataInfo, index)" type="danger" size="small">删除
+                </el-button>
+                <el-button style="margin-left:10px" size="small" v-if="index == dataInfo.length - 1"
+                    @click="addItem(dataInfo, 0)" type="primary">添加
+                </el-button>
+            </el-form-item>
+
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    props: {
+        dataForm: {
+            type: Object,
+            default: () => { }
+        },
+    },
+    data() {
+        return {
+            typeOptions: [
+                {
+                    value: '数据资源',
+                },
+                {
+                    value: '组件服务',
+                },
+                {
+                    value: '应用资源',
+                },
+                {
+                    value: '基础设施',
+                },
+                {
+                    value: '知识库',
+                },
+            ],
+            dataInfo: []
+        }
+    },
+    watch: {
+        dataInfo: {
+            handler(newVal) {
+                this.dataInfo = newVal;
+                let arr = newVal.map((v, index) => {
+                    return {
+                        sequence: index,
+                        resourceId: v.name
+                    }
+                })
+                this.$emit('update', {
+                    title: '组合能力',
+                    list: arr
+                })
+            },
+            deep: true,
+            immediate: true,
+        },
+        dataForm: {
+            handler(newVal, oldVal) {
+                // 防止无限循环，简单比较一下
+                if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
+                    this.dataForm = newVal;
+                    this.getDataInfo();
+                }
+            },
+            deep: true,
+            immediate: true,
+        }
+    },
+    methods: {
+        getDataInfo() {
+            let arr = []
+            let attrValue = this.dataForm.fuseResourceList || []
+            if (attrValue.length > 0) {
+                attrValue.map(v => {
+                    arr.push({
+                        type: v.resource && v.resource.type,
+                        name: v.resourceId,
+                        abilityOptions: []
+                    })
+                })
+            } else {
+                arr = []
+                arr.push({
+                    type: "",
+                    name: "",
+                    abilityOptions: []
+                })
+            }
+            this.dataInfo = arr;
+        },
+        // 新增
+        addItem(list) {
+            list.push({
+                type: "",
+                name: "",
+                abilityOptions: []
+            })
+        },
+        // 删除
+        deleteItem(list, index) {
+            list.splice(index, 1)
+        },
+        // 获取能力
+        getAbility(type = '', item) {
+            this.$http.get(`/resource/list`, {
+                params: {
+                    type: type
+                }
+            }).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                }
+                let arr = res.data || []
+                let selectArray = this.dataInfo.map(v => v.name) || [];
+                // 过滤掉已选的
+                item.abilityOptions = arr.filter(v => !selectArray.includes(v.id))
+            }).catch((err) => {
+                this.$message.error(err)
+            })
+        },
+        changeType(data, item) {
+            this.getAbility(data, item)
+        },
+
+    }
+}
+</script>
+<style lang="scss" scoped>
+.content-box {
+    margin-bottom: 20px;
+
+    .title {
+        text-align: center;
+        font-weight: 600;
+        font-size: 18px;
+        margin-bottom: 10px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/back/src/views/modules/ability/showChild.vue b/back/src/views/modules/ability/showChild.vue
new file mode 100644
index 00000000..92159262
--- /dev/null
+++ b/back/src/views/modules/ability/showChild.vue
@@ -0,0 +1,154 @@
+<template>
+  <el-dialog :visible.sync="isShow" :title="childName" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-table
+      border
+      :data="tableData"
+    >
+
+        <el-table-column
+            prop="id"
+            label="主键id"
+            header-align="center"
+            align="center"
+        ></el-table-column>
+
+        <el-table-column
+            prop="fuseId"
+            label="融合服务id"
+            header-align="center"
+            align="center"
+        ></el-table-column>
+
+        <el-table-column
+            v-if="childName==='融合资源属性'"
+            prop="attrType"
+            label="属性类型"
+            header-align="center"
+            align="center"
+        ></el-table-column>
+
+        <el-table-column
+            v-if="childName==='融合资源属性'"
+            prop="attrValue"
+            label="属性值"
+            header-align="center"
+            align="center"
+        ></el-table-column>
+
+        <el-table-column
+            v-if="childName==='资源融合关系'"
+            prop="resourceId"
+            label="资源id"
+            header-align="center"
+            align="center"
+        ></el-table-column>
+
+        <el-table-column
+            v-if="childName==='资源融合关系'"
+            prop="sequence"
+            label="资源挂载顺序"
+            header-align="center"
+            align="center"
+        ></el-table-column>
+
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+import 'quill/dist/quill.snow.css'
+
+export default {
+  props: {
+    childName: {
+      type: String,
+      default: ''
+    },
+    // columns: {
+    //   type: Array,
+    //   default: function () {
+    //     return []
+    //   }
+    // },
+    tableData: {
+      type: Array,
+      default: function () {
+        return []
+      }
+    },
+    isShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      visible: false,
+    }
+  },
+  computed: {
+  },
+  methods: {
+    show () {
+      this.visible = true
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.icon-input ::v-deep .el-input__inner {
+  cursor: pointer;
+}
+.detial-form ::v-deep {
+  .el-form-item {
+    margin-bottom: 0px;
+    line-height: 32px;
+  }
+  .el-form-item__label {
+    line-height: 32px;
+  }
+  .el-form-item__content {
+    line-height: 32px;
+  }
+}
+</style>
+
+<style lang="scss">
+.mod-sys__menu {
+  .menu-list,
+  .icon-list {
+    .el-input__inner,
+    .el-input__suffix {
+      cursor: pointer;
+    }
+  }
+  &-icon-popover {
+    width: 458px;
+    overflow: hidden;
+  }
+  &-icon-inner {
+    width: 478px;
+    max-height: 258px;
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+  &-icon-list {
+    width: 458px;
+    padding: 0;
+    margin: -8px 0 0 -8px;
+    > .el-button {
+      padding: 8px;
+      margin: 8px 0 0 8px;
+      > span {
+        display: inline-block;
+        vertical-align: middle;
+        width: 18px;
+        height: 18px;
+        font-size: 18px;
+      }
+    }
+  }
+}
+
+</style>

From 2540d303fc42cf8e4fc2931182bb1b0a7bd9a2be Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 8 Jul 2022 16:16:23 +0800
Subject: [PATCH 04/17] =?UTF-8?q?fix:=20=E8=9E=8D=E5=90=88=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/ability/IntegratedServices.vue         | 2 +-
 back/src/views/modules/ability/components/common-question.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/back/src/views/modules/ability/IntegratedServices.vue b/back/src/views/modules/ability/IntegratedServices.vue
index 1639a50c..16972066 100644
--- a/back/src/views/modules/ability/IntegratedServices.vue
+++ b/back/src/views/modules/ability/IntegratedServices.vue
@@ -124,7 +124,7 @@ export default {
          data: [id]
       }).then(res => {
         console.log('删除成功', res)
-        if (res.code !== 0) {
+        if (res.data.code !== 0) {
           return this.$message.error(res.msg);
         }
         this.$message({
diff --git a/back/src/views/modules/ability/components/common-question.vue b/back/src/views/modules/ability/components/common-question.vue
index ba4437e0..5af00854 100644
--- a/back/src/views/modules/ability/components/common-question.vue
+++ b/back/src/views/modules/ability/components/common-question.vue
@@ -3,11 +3,11 @@
         <div class="title">
             常见问题
         </div>
-        <div v-for="(item, index) in dataInfo" :key="item.answer">
+        <div v-for="(item, index) in dataInfo" :key="index">
             <el-form-item label="问题名称" prop="question">
                 <el-input v-model="item.question" placeholder="请输入问题名称" style="width:90%"></el-input>
             </el-form-item>
-            <el-form-item label="问题描述" prop="answer">
+            <el-form-item label="问题描述" prop="question">
                 <el-input v-model="item.answer" placeholder="请输入问题描述" style="width:90%"></el-input>
                 <el-button style="margin-left:10px" @click="deleteItem(index)" type="danger" size="small">删除
                 </el-button>

From 324aa70b519ce7860c10596686cc60e681454669 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 8 Jul 2022 16:58:46 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=94=B6=E8=97=8F=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/components/searchResultList.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 8b3090d9..4bc22e59 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -95,13 +95,13 @@
               {{ item.description || '--' }}
             </div>
           </div>
-          <div class="bottom" v-if="selectCardsname !== '基础设施' && selectCardsname !== '融合服务'">
+          <div class="bottom" v-if="selectCardsname !== '基础设施'">
             <div>
-              <div v-if="selectCardsname !== '数据资源'">
+              <div v-if="selectCardsname !== '数据资源'&& selectCardsname !== '融合服务'">
                 浏览量：{{ item.visits || 0 }}次
               </div>
-              <div>申请量：{{ item.applyCount || 0 }}次</div>
-              <div v-if="selectCardsname === '数据资源'">
+              <div v-if="selectCardsname !== '融合服务'">申请量：{{ item.applyCount || 0 }}次</div>
+              <div v-if="selectCardsname === '数据资源' && selectCardsname !== '融合服务'">
                 数据量：{{ item.sjlCount || 0 }}
               </div>
               <div v-if="selectCardsname !== '数据资源'">

From 23324f50adaa4172be34b3e56250e8bf77835a1e Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Sat, 9 Jul 2022 15:22:20 +0800
Subject: [PATCH 06/17] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9=20=20=20=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E4=B8=8A=E6=9E=B6=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/ability/bsabilityai.vue | 74 +++++++++++++++++--
 .../components/inputSelectCheckbox.vue        | 52 ++++++-------
 .../putOnTheShelf/components/special.vue      | 12 +--
 .../src/views/modules/putOnTheShelf/index.vue | 15 ++--
 front/public/index.html                       | 22 +++---
 .../components/ComponentServices.vue          |  2 +-
 .../home/components/searchResultList.vue      | 11 ++-
 .../views/home/detailsPageconetentTree.vue    |  1 +
 front/src/views/home/infrastructurePage.vue   | 28 ++++---
 .../components/CapabilityConvergence.vue      | 14 +++-
 .../views/newHome/components/Navigation.vue   |  4 +-
 11 files changed, 158 insertions(+), 77 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 661f116b..a0bb804e 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -154,9 +154,10 @@
       :visible.sync="showPutOnTheShelfFlag2"
       :close-on-click-modal='false'
       :close-on-press-escape='false'
+      :destroy-on-close='true'
       :before-close='clear'
       width="50%">
-      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList'></putOnTheShelf>
+      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio'></putOnTheShelf>
       <span slot="footer" class="dialog-footer">
         <el-button @click="clear">取 消</el-button>
         <el-button type="primary" @click="submitData">确 定</el-button>
@@ -236,10 +237,6 @@ export default {
     this.fullScreen()
   },
   methods: {
-    changeInfoList (obj) {
-      this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== obj.attrType)
-      this.submitFrom.infoList.push(obj)
-    },
     reset () {
       this.$http
         .get(
@@ -434,8 +431,73 @@ export default {
       this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children
       console.log('radio', this.radio)
     },
+    changeInfoList (obj) {
+      this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== obj.attrType)
+      this.submitFrom.infoList.push(obj)
+    },
     submitData () {
-      console.log('表单数据=================>', this.submitFrom, this.putOnTheShelfList)
+      const arr = []
+      this.putOnTheShelfList.map(item => {
+        item.children.map(child => {
+          if (child.children) {
+            if (child.name === '算法优势' || child.name === '应用场景' || child.name === '功能介绍') {
+              arr.push(child.name)
+            }
+            child.children.map(val => {
+              arr.push(val.name)
+              if (val.type === 'input' || val.type === 'textArea' || val.type === 'select' || val.type === 'checkBox' || val.type === 'radio') {
+                this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== val.name)
+              }
+              if (val.note1) {
+                switch (val.name) {
+                  case '算法名称':
+                  case '应用名称':
+                  case '组件名称':
+                  case '图层名称':
+                    this.submitFrom.name = val.note1
+                    break
+                  case '算法描述':
+                  case '应用描述':
+                  case '组件描述':
+                  case '图层描述':
+                    this.submitFrom.description = val.note1
+                    break
+                  case '共享条件':
+                    this.submitFrom.shareCondition = val.note1
+                    break
+                  case '共享类型':
+                    this.submitFrom.shareType = val.note1
+                    break
+                  case '服务接口':
+                    this.submitFrom.apiUrl = val.note1
+                    break
+                  case '接口请求方式':
+                    this.submitFrom.apiMethodType = val.note1
+                    break
+                  case '访问地址':
+                    this.submitFrom.link = val.note1
+                    break
+                  case '部门联系人':
+                    this.submitFrom.deptContacts = val.note1
+                    break
+                  case '部门联系人电话':
+                    this.submitFrom.deptPhone = val.note1
+                    break
+                  default:
+                    this.submitFrom.infoList.push({
+                      attrType: val.name,
+                      attrValue: val.note1,
+                      delFlag: 0
+                    })
+                    break
+                }
+              }
+            })
+          }
+        })
+      })
+      this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType))
+      console.log('表单数据=================>', this.submitFrom, this.putOnTheShelfList, arr)
     }
   }
 }
diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
index 1c72aebe..9c8395e7 100644
--- a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
+++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
@@ -16,12 +16,12 @@ js:
 <template>
     <div id="inputSelectCheckbox">
       <!-- input框 -->
-      <a-input v-if="type == 'input'" v-model:value="value" :placeholder="'请输入' + name" />
+      <a-input v-if="type == 'input'" v-model:value="data.note1" :placeholder="'请输入' + name" />
       <!-- 下拉框 -->
        <el-select
-        v-else-if="type === 'select'"
+        v-else-if="type === 'select' || type == 'radio'"
         style="width: 240px"
-        v-model="value"
+         v-model:value="data.note1"
         :placeholder="'请选择' + name">
         <el-option
           :value="itemSelect.dictLabel"
@@ -34,7 +34,7 @@ js:
       <div
         v-else-if="type === 'checkBox'"
       >
-        <el-checkbox-group v-model="valueCheckBox">
+        <el-checkbox-group  v-model="valueCheckBox" @change='chekBoxChange'>
         <el-checkbox-button v-for="val in options" :label="val.dictLabel" :key="val.dictLabel">{{val.dictLabel}}</el-checkbox-button>
       </el-checkbox-group>
       </div>
@@ -46,20 +46,10 @@ js:
         :disabled="true"
       />
       <!-- 单选 -->
-       <el-radio-group v-model="value" v-else-if="type == 'radio'">
+       <!-- <el-radio-group v-model:value="data.note1" v-else-if="type == 'radio'">
         <el-radio v-for="item in options" :label="item.dictLabel" :key="item.dictLabel">{{item.dictLabel}}</el-radio>
-      </el-radio-group>
-      <!-- <a-radio-group
-
-          v-model:value="value"
-          :options="item.options.dictLabel"
-        /> -->
-      <!-- 描述框 -->
-      <!-- <a-textarea  v-model:value="value" :showCount="true"
-               /> -->
-    <a-textarea v-else-if="type == 'textArea'" v-model:value="value" :showCount="true" :maxlength="200" :placeholder="'请填写' + name"
-            />
-      <!-- <el-input  type="textarea" :maxlength="200" v-model="value" :placeholder="'请输入' + item.name" ></el-input> -->
+      </el-radio-group> -->
+    <a-textarea v-else-if="type == 'textArea'"  v-model:value="data.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + name" />
     </div>
 </template>
 <script>
@@ -103,6 +93,17 @@ export default {
           })
           .catch(() => {})
       }
+    },
+    chekBoxChange (list) {
+      let str = ''
+      list.map((val, index) => {
+        str += val
+        if (index < list.length - 1) {
+          str += ';'
+        }
+      })
+      // console.log(str)
+      this.data.note1 = str
     }
   },
   mounted () {
@@ -112,7 +113,8 @@ export default {
 </script>
 <style lang='scss' scoped>
 #inputSelectCheckbox {
-  margin-top: 20px;
+  // margin-top: 20px;
+  width: 100%;
   display: flex;
   justify-content: flex-start;
   align-items: center;
@@ -128,17 +130,17 @@ export default {
     }
   }
   ::v-deep .ant-input {
-    // width: 570px;
+    width: 100%;
   }
   ::v-deep .el-input__inner {
     resize: none;
-    // width: 570px;
+    width: 100%;
   }
   ::v-deep .el-textarea {
-    width: 570px;
+    width: 100%;
   }
   ::v-deep .el-textarea__inner {
-    width: 570px;
+    width: 100%;
     height: 76px;
     min-height: 32px;
     resize: none;
@@ -148,10 +150,10 @@ export default {
     right: 5px;
   }
   ::v-deep .el-checkbox-group {
-    width: 570px;
+    width: 100%;
     display: grid;
     margin-top: -5px;
-    grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+    grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
   }
   ::v-deep .el-checkbox-button__inner {
     cursor: pointer;
@@ -165,7 +167,7 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
-    margin-top: 10px;
+    margin: 10px 5px 0;
     font-weight: 500;
   }
   ::v-deep .el-checkbox-button.is-checked .el-checkbox-button__inner {
diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue
index 35c138ab..77fa3e34 100644
--- a/back/src/views/modules/putOnTheShelf/components/special.vue
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:54:50
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 17:26:24
+ * @LastEditTime: 2022-07-09 10:54:48
  * @Description: 多条数据特殊处理
 -->
 <template>
@@ -43,9 +43,9 @@
             <a-input-number v-model:value="val.note1" :min="0" :max="9999" :step="0.01" string-mode
               :placeholder="'请填写' + val.name" v-else-if="val.type == 'number'" />
             <a-radio-group v-model:value="val.note1" :options="val.options" v-else-if="val.type == 'radio'" />
-            <upload :key="showKey" type="图片" btnName="上传图片" :maxCount="1" :data="val" :list="[]" tip="支持图片类型，大小不超过100M"
-              v-else-if="val.type == 'image'"></upload>
-              <!-- <upload :key="showKey" :child='val' limit='1' accept='.jpg,.png' v-else-if="val.type == 'image'"></upload> -->
+            <!-- <upload :key="showKey" type="图片" btnName="上传图片" :maxCount="1" :data="val" :list="[]" tip="支持图片类型，大小不超过100M"
+              v-else-if="val.type == 'image'"></upload> -->
+              <upload :key="showKey" :child='val' limit='1' accept='.jpg,.png' v-else-if="val.type == 'image'"></upload>
           </div>
           <div class="submit">
             <a-button type="primary" @click="add(configure.name)">提交</a-button>
@@ -54,8 +54,8 @@
     </div>
 </template>
 <script>
-// import upload from '@/views/modules/ability/upload.vue'
-import upload from '@/views/modules/components/upload'
+import upload from '@/views/modules/ability/upload.vue'
+// import upload from '@/views/modules/components/upload'
 export default {
   name: '',
   components: {
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index 12f9d511..5a0e8322 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:48:52
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 17:48:27
+ * @LastEditTime: 2022-07-09 10:57:07
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -21,13 +21,13 @@
                 tip="支持文件类型，大小不超过100M"></upload>
               <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.mp4' :list="[]" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :dataList="item"
                 tip="支持视频类型，大小不超过100M"></upload>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'text'" type="disabled" :data="item" :name="item.name"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'text2'" type="disabled" :data="item" :name="item.name"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'text'" type="disabled" :data="item" :name="item.name" value="组件服务"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'text2'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :value="item.note1" :options="item.options"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :value="item.note1" :options="item.options"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :value="item.note1" :options="item.options"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'textArea'" type="textArea" :data="item" :name="item.name" :value="item.note1"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'textArea'" type="textArea" :data="item" :name="item.name"></input-select-checkbox>
             </div>
           </template>
           <template v-else>
@@ -49,6 +49,7 @@ export default {
     inputSelectCheckbox
   },
   props: {
+    type: String,
     putOnTheShelfList: Array
   },
   data () {
diff --git a/front/public/index.html b/front/public/index.html
index fc53acb7..62072fb3 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-07 20:21:07
+ * @LastEditTime: 2022-07-09 15:05:57
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -28,11 +28,11 @@
      <!-- 站点配置 -->
   <script>
     window.SITE_CONFIG = {};
-    window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
-    window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
+    // window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
+    // window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 包头
     // window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
     // window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/';
@@ -45,11 +45,11 @@
     // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
     // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
-    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
-    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
-    // window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
+    window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
+    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 穿透版本
     // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
     // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
diff --git a/front/src/views/capabilityCloud/components/ComponentServices.vue b/front/src/views/capabilityCloud/components/ComponentServices.vue
index 97986fe1..4e0f6215 100644
--- a/front/src/views/capabilityCloud/components/ComponentServices.vue
+++ b/front/src/views/capabilityCloud/components/ComponentServices.vue
@@ -174,7 +174,7 @@
     } else {
       for (let i = 0; i < 31; i++) {
         let time = moment()
-          .subtract('days', 29 - i)
+          .subtract('days', 30 - i)
           .format('MM-DD')
         callTheTrendData.value.time.push(time)
         console.log('time', callTheTrendData.value, name)
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 56b63cf7..8bca6686 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -137,7 +137,9 @@
               <div v-if="selectCardsname !== '数据资源'">
                 浏览量：{{ item.visits || 0 }}次
               </div>
-              <div>申请量：{{ item.applyCount || 0 }}次</div>
+              <div v-if="selectCardsname !== '应用资源'">
+                申请量：{{ item.applyCount || 0 }}次
+              </div>
               <div v-if="selectCardsname === '数据资源'">
                 数据量：{{ item.sjlCount || 0 }}
               </div>
@@ -145,18 +147,15 @@
                 收藏量：{{ item.collectCount || 0 }}次
               </div>
             </div>
-            <div class="pingfen">
+            <!-- <div class="pingfen">
               <a-tooltip placement="top" mouseEnterDelay="1">
-                <!-- <template #title>
-                <span>{{ item.score || 0 }}分</span>
-              </template> -->
                 <a-rate
                   :value="item.score || 0"
                   disabled
                   v-if="item.score != 0"
                 />
               </a-tooltip>
-            </div>
+            </div> -->
           </div>
           <div class="btn">
             <div class="right" v-if="selectCardsname !== '基础设施'">
diff --git a/front/src/views/home/detailsPageconetentTree.vue b/front/src/views/home/detailsPageconetentTree.vue
index a192a4af..08e8c04d 100644
--- a/front/src/views/home/detailsPageconetentTree.vue
+++ b/front/src/views/home/detailsPageconetentTree.vue
@@ -152,6 +152,7 @@
                 }
                 switch (val.type) {
                   case '市级':
+                  case '企业':
                   case '其他':
                     generateChildren(val, obj)
                     break
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index e860c9c8..f58fb5c9 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -253,6 +253,12 @@
   let tableHeight = ref('600')
   //tab切换点击事件
   const tabClick = (indexFather, name) => {
+    console.log(
+      '点击tab================>',
+      indexFather,
+      name,
+      clickList.value[indexFather]
+    )
     selectedRowKeys.value = []
     selectedList.value = []
     if (clickList.value[indexFather].content.indexOf(name) != -1) {
@@ -338,22 +344,22 @@
     })
     console.log('选中的标签code', mapSearchParam.value)
     mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
-    let fatherName = ref('视频资源')
-    if (name == '视频资源' || name == '云资源' || name == '感知资源') {
-      fatherName.value == name
-    }
-    if (fatherName.value == '视频资源') {
-      getCamera()
-    } else {
-      dataSource.value = []
-      pagination.value.total = 0
-    }
-    // if (name == '视频资源') {
+    // let fatherName = ref('视频资源')
+    // if (name == '视频资源' || name == '云资源' || name == '感知资源') {
+    //   fatherName.value == name
+    // }
+    // if (fatherName.value == '视频资源') {
     //   getCamera()
     // } else {
     //   dataSource.value = []
     //   pagination.value.total = 0
     // }
+    if (name == '云资源' || name == '感知资源') {
+      dataSource.value = []
+      pagination.value.total = 0
+    } else {
+      getCamera()
+    }
   }
   // 清空
   const nullClick = () => {
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 0a49b255..9e520325 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -52,7 +52,7 @@
             v-for="(item, index) in sjList"
             :key="item.id"
             :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne(item.id)"
+            @click="selectOne3(item.name)"
           >
             {{ index + 1 }}-{{ item.name }}
           </div>
@@ -162,7 +162,7 @@
     } else {
       let type = paramsGetResources.type
       if (type == '基础设施') {
-          selectInfrastructureList().then((res) => {
+        selectInfrastructureList().then((res) => {
           console.log('基础设施==========>', res.data.data)
           for (const key in res.data.data) {
             jcList.value.push({
@@ -243,6 +243,16 @@
       },
     })
   }
+  const selectOne3 = (name) => {
+    console.log('点击===============》', name)
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        str: name,
+        select: '数据资源',
+      },
+    })
+  }
 </script>
 <style lang="less" scoped>
   .capability-convergence {
diff --git a/front/src/views/newHome/components/Navigation.vue b/front/src/views/newHome/components/Navigation.vue
index 71f12971..ec86a101 100644
--- a/front/src/views/newHome/components/Navigation.vue
+++ b/front/src/views/newHome/components/Navigation.vue
@@ -75,7 +75,7 @@
         </a-form-item>
       </div>
       <div class="qushi-class-father">
-        <div class="qushi-class">
+        <!-- <div class="qushi-class">
           <a-form-item label="发布部门" class="gaojisousuo">
             <a-select
               ref="select"
@@ -139,7 +139,7 @@
               </a-select-option>
             </a-select>
           </a-form-item>
-        </div>
+        </div> -->
         <div class="sousuo" @click="onSearch(mohuchaxun)">搜索</div>
         <div @click="gaojisousuo" class="mohusousuo">
           <div class="mohusousuo-tupian"></div>

From 2eca6ab7583b1246bdf88dea98da7305ffeb67ae Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 11 Jul 2022 15:41:18 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E5=90=8E=E5=8F=B0=20=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/public/index.html                        |   7 +-
 .../src/views/modules/ability/bsabilityai.vue | 181 ++++++++++++++----
 back/src/views/modules/ability/upload.vue     |   4 -
 .../views/modules/components/upload/index.vue |  31 ++-
 .../components/inputSelectCheckbox.vue        |  41 +++-
 .../putOnTheShelf/components/special.vue      |  18 +-
 .../src/views/modules/putOnTheShelf/index.vue |  16 +-
 7 files changed, 232 insertions(+), 66 deletions(-)

diff --git a/back/public/index.html b/back/public/index.html
index 4869501d..465e77bf 100644
--- a/back/public/index.html
+++ b/back/public/index.html
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-11 10:11:40
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 14:13:20
+ * @LastEditTime: 2022-07-11 12:09:13
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -43,8 +43,9 @@
     <script>
       // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin';
     // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
-    window.SITE_CONFIG['apiURL'] = 'http://10.16.5.35:8888/renren-admin';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    // window.SITE_CONFIG['apiURL'] = 'http://10.16.5.35:8888/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
     // window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin';
     // WebSocket地址
     window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket';
diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index a0bb804e..402b9646 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -19,14 +19,14 @@
             $t("export")
           }}</el-button>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-button
             v-if="$hasPermission('ability:bsabilityai:save')"
             type="primary"
             @click="addOrUpdateHandleAI()"
             >挂接</el-button
           >
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-button
             type="primary"
@@ -90,12 +90,19 @@
           width="150"
         >
           <template slot-scope="scope">
-            <el-button
+            <!-- <el-button
               v-if="$hasPermission('ability:bsabilityai:update')"
               type="text"
               size="small"
               @click="UpdateHandle(scope.row)"
               >{{ $t("update") }}</el-button
+            > -->
+            <el-button
+              v-if="$hasPermission('ability:bsabilityai:update')"
+              type="text"
+              size="small"
+              @click="UpdateData(scope.row)"
+              >{{ $t("update") }}</el-button
             >
             <el-button
               v-if="$hasPermission('ability:bsabilityai:delete')"
@@ -150,7 +157,7 @@
       </span>
     </el-dialog>
     <el-dialog
-      :title="'上架'+radio"
+      :title="submitFrom.id?'修改'+radio:'上架'+radio"
       :visible.sync="showPutOnTheShelfFlag2"
       :close-on-click-modal='false'
       :close-on-press-escape='false'
@@ -289,7 +296,6 @@ export default {
       // this.addOrUpdateHandle(id)
       this.addOrUpdateVisible = true
       this.disabled = false
-      console.log('显示数据=============》', val)
       this.$nextTick(() => {
         this.$refs.addOrUpdate.UpdateState = false
         this.$refs.addOrUpdate.dataFormShowDetails = val
@@ -298,7 +304,6 @@ export default {
       this.disabled = true
     },
     showDocument (val) {
-      console.log(val)
       window.open(
         window.SITE_CONFIG.frontUrl + '?id=' + val.id + '&&type=' + val.type,
         '_blank'
@@ -324,7 +329,6 @@ export default {
               })
           )
           .then(({ data: res }) => {
-            console.log('res', res)
             if (res.code !== 0) {
               this.dataList = []
               this.total = 0
@@ -354,32 +358,11 @@ export default {
     fullScreen () {
       if (window.outerHeight === screen.availHeight) {
         if (window.outerWidth === screen.availWidth) {
-          console.log(
-            '全屏1',
-            window.outerHeight,
-            screen.availHeight,
-            window.outerWidth,
-            screen.availWidth
-          )
           this.qp = false
         } else {
-          console.log(
-            '不是全屏2',
-            window.outerHeight,
-            screen.availHeight,
-            window.outerWidth,
-            screen.availWidth
-          )
           this.qp = true
         }
       } else {
-        console.log(
-          '不是全屏3',
-          window.outerHeight,
-          screen.availHeight,
-          window.outerWidth,
-          screen.availWidth
-        )
         this.qp = true
       }
     },
@@ -400,7 +383,7 @@ export default {
     handleIsShowRelatePopup (type) {
       this.relateApplicationVisible = type
     },
-    // 新挂载
+    // 新上架
     clear () {
       this.showPutOnTheShelfFlag = false
       this.showPutOnTheShelfFlag2 = false
@@ -417,6 +400,7 @@ export default {
           }
         ]
       }
+      this.reset()
     },
     showPutOnTheShelf () {
       this.showPutOnTheShelfFlag = true
@@ -429,9 +413,9 @@ export default {
       this.showPutOnTheShelfFlag2 = true
       this.submitFrom.infoList[0].attrValue = this.radio
       this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children
-      console.log('radio', this.radio)
     },
     changeInfoList (obj) {
+      console.log(obj, this.submitFrom)
       this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== obj.attrType)
       this.submitFrom.infoList.push(obj)
     },
@@ -483,12 +467,20 @@ export default {
                   case '部门联系人电话':
                     this.submitFrom.deptPhone = val.note1
                     break
+                  case '归属部门':
+                    this.submitFrom.deptId = val.note1
+                    break
+                  case '能力类型':
+                    this.submitFrom.type = val.note1
+                    break
                   default:
-                    this.submitFrom.infoList.push({
-                      attrType: val.name,
-                      attrValue: val.note1,
-                      delFlag: 0
-                    })
+                    if (val.type !== 'image' && val.type !== 'file' && val.type !== 'video') {
+                      this.submitFrom.infoList.push({
+                        attrType: val.name,
+                        attrValue: val.note1,
+                        delFlag: 0
+                      })
+                    }
                     break
                 }
               }
@@ -497,7 +489,124 @@ export default {
         })
       })
       this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType))
-      console.log('表单数据=================>', this.submitFrom, this.putOnTheShelfList, arr)
+      if (this.submitFrom.id) {
+        // 解决编辑无组件类型
+        this.submitFrom.infoList.map(val => {
+          if (val.attrType === '组件类型') {
+            val.attrValue = this.radio
+          }
+        })
+        console.log('编辑===============>', this.submitFrom)
+        this.$http
+          .put('/resource/update', this.submitFrom)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              this.$message.error('修改失败!')
+            } else {
+              this.$message.success('修改成功！')
+              this.clear()
+            }
+          })
+          .catch(() => {})
+      } else {
+        this.$http
+          .post('/resource/insert?source= b', this.submitFrom)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              this.$message.error('上架失败!')
+            } else {
+              this.$message.success('上架成功！')
+              this.clear()
+            }
+          })
+          .catch(() => {})
+      }
+    },
+    // 新修改
+    UpdateData (item) {
+      this.$http.get('/category/getCategoryTree').then(res => {
+        this.insertList = res.data.data.filter(item => item.name === '组件服务一')[0]
+        this.radio = item.infoList.filter(val => val.attrType === '组件类型')[0].attrValue
+        this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children
+        this.putOnTheShelfList.map(parent => {
+          parent.children.map(child => {
+            if (child.name === '算法优势' || child.name === '应用场景' || child.name === '功能介绍') {
+              const obj = item.infoList.filter(val => val.attrType === child.name)[0]
+              if (obj) {
+                child.note1 = obj.attrValue
+              }
+            } else {
+              if (child.children) {
+                child.children.map(data => {
+                  if (data.name === '计费标准信息' || data.name === '常见问题') {
+                    const obj = item.infoList.filter(val => val.attrType === child.name)[0]
+                    if (obj) {
+                      data.note1 = obj.attrValue
+                    }
+                  } else {
+                    switch (data.name) {
+                      case '算法名称':
+                      case '应用名称':
+                      case '组件名称':
+                      case '图层名称':
+                        data.note1 = item.name
+                        break
+                      case '算法描述':
+                      case '应用描述':
+                      case '组件描述':
+                      case '图层描述':
+                        data.note1 = item.description
+                        break
+                      case '共享条件':
+                        data.note1 = item.shareCondition
+                        break
+                      case '共享类型':
+                        data.note1 = item.shareType
+                        break
+                      case '服务接口':
+                        data.note1 = item.apiUrl
+                        break
+                      case '接口请求方式':
+                        data.note1 = item.apiMethodType
+                        break
+                      case '访问地址':
+                        data.note1 = item.link
+                        break
+                      case '部门联系人':
+                        data.note1 = item.deptContacts
+                        break
+                      case '部门联系人电话':
+                        data.note1 = item.deptPhone
+                        break
+                      case '归属部门':
+                        data.note1 = item.deptId
+                        break
+                      case '能力类型':
+                        data.note1 = item.type
+                        break
+                      default:
+                        // eslint-disable-next-line no-case-declarations
+                        const obj1 = item.infoList.filter(val => val.attrType === data.name)[0]
+                        if (obj1) {
+                          data.note1 = obj1.attrValue
+                        }
+                        break
+                    }
+                    if (data.type === 'image' || data.type === 'file' || data.type === 'video') {
+                      const obj1 = item.infoList.filter(val => val.attrType === data.name)[0]
+                      if (obj1) {
+                        data.note2 = obj1.note2
+                      }
+                    }
+                  }
+                })
+              }
+            }
+          })
+        })
+        this.submitFrom.id = item.id
+        this.showPutOnTheShelfFlag2 = true
+      })
     }
   }
 }
diff --git a/back/src/views/modules/ability/upload.vue b/back/src/views/modules/ability/upload.vue
index 432f08cb..3a85d179 100644
--- a/back/src/views/modules/ability/upload.vue
+++ b/back/src/views/modules/ability/upload.vue
@@ -48,8 +48,6 @@ export default {
   },
   methods: {
     onSuccess (res, file) {
-      console.log('limit', this.limit)
-      console.log(res, file, this.child)
       if (res.code !== 0) {
         return this.$message.error('上传图片失败')
       }
@@ -88,10 +86,8 @@ export default {
       } else {
         this.child.note1 = arr.join(';')
       }
-      console.log(this.child.note1)
     },
     onPreview (file) {
-      console.log('点击预览===============>', file)
       window.open(file.response.data)
     },
     onExceed (files, fileList) {
diff --git a/back/src/views/modules/components/upload/index.vue b/back/src/views/modules/components/upload/index.vue
index 22561ec1..64ed8258 100644
--- a/back/src/views/modules/components/upload/index.vue
+++ b/back/src/views/modules/components/upload/index.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 14:55:19
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 17:23:58
+ * @LastEditTime: 2022-07-11 15:39:31
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -41,7 +41,7 @@ export default {
   data () {
     return {
       apiURL: window.SITE_CONFIG.apiURL + '/upload?token=' + Cookies.get('ucsToken'),
-      fileList: JSON.parse(JSON.stringify(this.list))
+      fileList: []
     }
   },
   methods: {
@@ -53,11 +53,19 @@ export default {
     },
     handlePreview (file) {
       console.log(file)
-      window.open(
-        window.SITE_CONFIG.previewUrl +
+      if (file.response) {
+        window.open(
+          window.SITE_CONFIG.previewUrl +
         'hisense_office/onlinePreview?url=' +
         btoa(encodeURI(file.response.data))
-      )
+        )
+      } else {
+        window.open(
+          window.SITE_CONFIG.previewUrl +
+        'hisense_office/onlinePreview?url=' +
+        btoa(encodeURI(file.url))
+        )
+      }
     },
     handleChange (file, fileList) {
       console.log(file, fileList)
@@ -71,7 +79,8 @@ export default {
           this.$emit('changeInfoList', {
             attrType: this.title,
             attrValue: file.response.data,
-            delFlag: 0
+            delFlag: 0,
+            note2: file.name
           })
         } else {
           this.$message.error(file.name + '上传失败')
@@ -83,12 +92,20 @@ export default {
       }
     },
     handleRemove (file) {
+      console.log(file, '删除', this.title)
       this.$emit('changeInfoList', {
         attrType: this.title,
         attrValue: '',
-        delFlag: 0
+        delFlag: 0,
+        note2: null
       })
     }
+  },
+  created () {
+    if (this.list.note1) {
+      this.fileList.push({ name: this.list.note2 || '--', url: this.list.note1 })
+    }
+    console.log('上传组件===================>', this.list, this.fileList)
   }
 }
 </script>
diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
index 9c8395e7..784284be 100644
--- a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
+++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
@@ -19,7 +19,7 @@ js:
       <a-input v-if="type == 'input'" v-model:value="data.note1" :placeholder="'请输入' + name" />
       <!-- 下拉框 -->
        <el-select
-        v-else-if="type === 'select' || type == 'radio'"
+        v-else-if="(type === 'select' && name !== '归属部门') || type == 'radio'"
         style="width: 240px"
          v-model:value="data.note1"
         :placeholder="'请选择' + name">
@@ -30,6 +30,21 @@ js:
         {{ itemSelect.dictLabel }}
         </el-option>
       </el-select>
+      <el-select
+        v-else-if="(type === 'select' && name === '归属部门')"
+        style="width: 240px"
+         v-model:value="data.note1"
+        filterable
+        placeholder="请输入关键词"
+        :loading="loading">
+        <el-option
+          v-for="(itemSelect) in options"
+          :key="itemSelect.id"
+          :label="itemSelect.name"
+          :value="itemSelect.id">
+        {{ itemSelect.name }}
+        </el-option>
+      </el-select>
       <!-- 多选 -->
       <div
         v-else-if="type === 'checkBox'"
@@ -82,16 +97,26 @@ export default {
       if (this.data.isLinkToDic === 'true' && this.data.linkValue) {
         this.$http
           .get(`/sys/dict/data/page?page=1&limit=20&dictTypeId=${this.data.linkValue}&deFlage=0`).then(({ data: res }) => {
-            console.log(res, 'res')
             const dataList = []
             res.data.list.forEach((element) => {
               dataList.push(element)
-              console.log(dataList, 'this.options')
             })
             this.options = dataList
-            console.log(this.options)
           })
           .catch(() => {})
+      } else if (this.data.name === '归属部门') {
+        this.$http.get('/sys/dept/all').then(res => {
+          const dataList = []
+          res.data.data.forEach((element) => {
+            dataList.push(element)
+          })
+          this.options = dataList
+          if (!this.data.note1) {
+            this.$http.get('/sys/user/info').then(({ data: res }) => {
+              this.data.note1 = res.data.deptId
+            })
+          }
+        })
       }
     },
     chekBoxChange (list) {
@@ -102,10 +127,16 @@ export default {
           str += ';'
         }
       })
-      // console.log(str)
       this.data.note1 = str
     }
   },
+  created () {
+    if (this.data.name === '应用领域') {
+      if (this.data.note1) {
+        this.valueCheckBox = this.data.note1.split(';')
+      }
+    }
+  },
   mounted () {
     this.selectOptions()
   }
diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue
index 77fa3e34..ee40bfcc 100644
--- a/back/src/views/modules/putOnTheShelf/components/special.vue
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:54:50
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-09 10:54:48
+ * @LastEditTime: 2022-07-11 15:00:24
  * @Description: 多条数据特殊处理
 -->
 <template>
@@ -62,7 +62,8 @@ export default {
     upload
   },
   props: {
-    configure: Object
+    configure: Object,
+    showData: Object
   },
   data () {
     return {
@@ -75,7 +76,6 @@ export default {
       const list = this.configure.list
       let flag = true
       list.forEach((item) => {
-        console.log(item)
         if (item.type !== 'number' && !item.note1.length > 0) {
           flag = false
         } else if (item.type === 'number' && !item.note1 > 0) {
@@ -88,7 +88,6 @@ export default {
           obj[item.field] = item.note1
         })
         this.data.push(obj)
-        // console.log(data.value[title])
         this.$emit('changeInfoList', {
           attrType: title,
           attrValue: JSON.stringify(this.data),
@@ -110,6 +109,17 @@ export default {
         delFlag: 0
       })
     }
+  },
+  created () {
+    if (this.configure.name === '计费标准信息' || this.configure.name === '常见问题') {
+      if (this.showData.children[0].note1) {
+        this.data = JSON.parse(this.showData.children[0].note1)
+      }
+    } else {
+      if (this.showData.note1) {
+        this.data = JSON.parse(this.showData.note1)
+      }
+    }
   }
 }
 </script>
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index 5a0e8322..a257dfb0 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:48:52
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-09 10:57:07
+ * @LastEditTime: 2022-07-11 15:11:10
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -13,13 +13,15 @@
             <div class="top">{{child.name}}</div>
             <div v-for="item in child.children" :key="item.id" class='item'>
               <span v-if="item.name != '来源应用'">{{ item.name }}</span>
-              <upload :list="[]" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" :data="item"
-                tip="支持图片类型，大小不超过100M"></upload>
-              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx' :list="[]" v-else-if="item.type == 'file' && item.name !== '使用手册'" type="文件" btnName="上传附件" :maxCount="1"
+              <!-- <upload :list="[]" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" :data="item"
+                tip="支持图片类型，大小不超过100M"></upload> -->
+              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.jpg,.jpeg,.png' :list="item" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1"
                 :dataList="item" tip="支持文件类型，大小不超过100M"></upload>
-              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx' :list="[]" v-else-if="item.name == '使用手册'" type="文件" btnName="上传附件" :maxCount="1" :dataList="item" :busType="2"
+              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx' :list="item" v-else-if="item.type == 'file' && item.name !== '使用手册'" type="文件" btnName="上传附件" :maxCount="1"
+                :dataList="item" tip="支持文件类型，大小不超过100M"></upload>
+              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx' :list="item" v-else-if="item.name == '使用手册'" type="文件" btnName="上传附件" :maxCount="1" :dataList="item" :busType="2"
                 tip="支持文件类型，大小不超过100M"></upload>
-              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.mp4' :list="[]" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :dataList="item"
+              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.mp4' :list="item" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :dataList="item"
                 tip="支持视频类型，大小不超过100M"></upload>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'text'" type="disabled" :data="item" :name="item.name" value="组件服务"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'text2'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
@@ -31,7 +33,7 @@
             </div>
           </template>
           <template v-else>
-            <special :configure='judgmentType.filter(item => item.name==child.name)[0]' @changeInfoList='changeInfoList'></special>
+            <special :configure='judgmentType.filter(item => item.name==child.name)[0]' :showData='child' @changeInfoList='changeInfoList'></special>
           </template>
         </div>
       </div>

From b37b3cafb91f54bac29ec2222f7437b055359045 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 11 Jul 2022 16:10:59 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E6=B8=85=E7=A9=BABUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/ability/bsabilityai.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 402b9646..5146961d 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -385,8 +385,11 @@ export default {
     },
     // 新上架
     clear () {
+      console.log('清空----------------------------------------')
       this.showPutOnTheShelfFlag = false
       this.showPutOnTheShelfFlag2 = false
+      this.insertList = []
+      this.putOnTheShelfList = []
       this.radio = ''
       this.submitFrom = {
         type: '组件服务',

From a6c9ca295ad2327ecc809764a4fc4d8e829c2319 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Mon, 11 Jul 2022 16:12:59 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/ability/bsabilityai.vue |   5 +-
 .../modules/ability/bsabilityservice.vue      | 544 +++++++++++++-----
 .../src/views/modules/putOnTheShelf/index.vue |   5 +-
 3 files changed, 410 insertions(+), 144 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 402b9646..94705db7 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -164,7 +164,7 @@
       :destroy-on-close='true'
       :before-close='clear'
       width="50%">
-      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio'></putOnTheShelf>
+      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio' :typeInput='typeInput'></putOnTheShelf>
       <span slot="footer" class="dialog-footer">
         <el-button @click="clear">取 消</el-button>
         <el-button type="primary" @click="submitData">确 定</el-button>
@@ -226,7 +226,8 @@ export default {
         id: '',
         responseData: {},
         linkType: ''
-      }
+      },
+      typeInput: '组件服务'
     }
   },
   watch: {},
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index dcff9365..d4fd055d 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -27,6 +27,13 @@
             >挂接</el-button
           >
         </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            @click="showPutOnTheShelf()"
+            >上架</el-button
+          >
+        </el-form-item>
         <el-form-item>
           <el-button
             v-if="$hasPermission('ability:bsabilityai:delete')"
@@ -85,7 +92,7 @@
               v-if="$hasPermission('ability:bsabilityai:update')"
               type="text"
               size="small"
-              @click="UpdateHandle(scope.row)"
+              @click="UpdateData(scope.row)"
               >{{ $t("update") }}</el-button
             >
             <el-button
@@ -153,63 +160,97 @@
         @isShowRelatePopup="handleIsShowRelatePopupApply"
       ></relate-application>
     </div>
+     <el-dialog
+      :title="submitFrom.id?'修改'+radio:'上架'+radio"
+      :visible.sync="showPutOnTheShelfFlag2"
+      :close-on-click-modal='false'
+      :close-on-press-escape='false'
+      :destroy-on-close='true'
+      :before-close='clear'
+      width="50%">
+      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio' :typeInput='typeInput'></putOnTheShelf>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="clear">取 消</el-button>
+        <el-button type="primary" @click="submitData">确 定</el-button>
+      </span>
+    </el-dialog>
   </el-card>
 </template>
 
 <script>
-import mixinViewModule from "@/mixins/view-module";
-import AddOrUpdate from "./bsabilityservice-add-or-update";
-import dictionaries from "@/utils/dictionaries";
-import RelateApplication from "./bsabilityai-relate-application.vue";
-import qs from "qs";
-import { type } from "os";
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './bsabilityservice-add-or-update'
+import dictionaries from '@/utils/dictionaries'
+import RelateApplication from './bsabilityai-relate-application.vue'
+import qs from 'qs'
+import { type } from 'os'
+import putOnTheShelf from '@/views/modules/putOnTheShelf'
+
 export default {
   mixins: [mixinViewModule],
-  data() {
+  data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: "/resource/page",
+        getDataListURL: '/resource/page',
         getDataListIsPage: true,
-        exportURL: "/ability/bsabilityai/export",
-        deleteURL: "/resource/delete",
-        deleteIsBatch: true,
+        exportURL: '/ability/bsabilityai/export',
+        deleteURL: '/resource/delete',
+        deleteIsBatch: true
       },
       disabled: false,
       sceneArr: dictionaries.sceneArr,
       fieldArr: dictionaries.fieldArr,
       shareFormArr: dictionaries.shareFormArr,
       dataForm: {
-        name: "",
-        creator: "",
+        name: '',
+        creator: '',
         selectType: 0,
         delFlag: 0,
-        type: "应用资源",
+        type: '应用资源'
       },
       qp: false,
       relateApplicationResourceVisible: false,
-      relationData: {}, //打开穿梭框时传递的参数
+      relationData: {}, // 打开穿梭框时传递的参数
       topNameArray: [], //
-    };
+      radio: '应用资源',
+      insertList: [],
+      putOnTheShelfList: [],
+      showPutOnTheShelfFlag2: false,
+      submitFrom: {
+        type: '应用资源',
+        deptId: '',
+        delFlag: 0,
+        infoList: [
+          // {
+          //   attrType: '组件类型',
+          //   attrValue: '',
+          //   delFlag: 0
+          // }
+        ]
+      },
+      typeInput: '应用资源'
+    }
   },
   watch: {},
   components: {
     AddOrUpdate,
     RelateApplication,
+    putOnTheShelf
   },
-  created() {
-    this.dataForm.name = "";
-    this.dataForm.type = "应用资源";
+  created () {
+    this.dataForm.name = ''
+    this.dataForm.type = '应用资源'
   },
-  mounted() {
-    window.addEventListener("resize", this.a);
-    this.fullScreen();
+  mounted () {
+    window.addEventListener('resize', this.a)
+    this.fullScreen()
   },
   methods: {
-    reset() {
+    reset () {
       this.$http
         .get(
           this.mixinViewModuleOptions.getDataListURL +
-            "?" +
+            '?' +
             qs.stringify({
               // order: this.order,
               // orderField: this.orderField,
@@ -218,230 +259,453 @@ export default {
               selectType: 0,
               limit: 10,
               delFlag: 0,
-              creator: "",
-              type: "应用资源",
-              name: "",
+              creator: '',
+              type: '应用资源',
+              name: ''
             })
         )
         .then(({ data: res }) => {
-          this.dataForm.name = "";
+          this.dataForm.name = ''
           if (res.code !== 0) {
-            this.dataList = [];
-            this.total = 0;
-            return this.$message.error(res.msg);
+            this.dataList = []
+            this.total = 0
+            return this.$message.error(res.msg)
           }
           this.dataList = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.list
-            : res.data;
+            : res.data
           this.total = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.total
-            : 0;
+            : 0
           if (this.mixinViewModuleOptions.requestCallback) {
-            this.mixinViewModuleOptions.requestCallback(res.data);
+            this.mixinViewModuleOptions.requestCallback(res.data)
           }
-          this.dataListLoading = false;
+          this.dataListLoading = false
         })
         .catch(() => {
-          this.dataListLoading = false;
-        });
+          this.dataListLoading = false
+        })
     },
-    showDetail(val) {
-      this.addOrUpdateVisible = true;
-      this.disabled = false;
+    showDetail (val) {
+      this.addOrUpdateVisible = true
+      this.disabled = false
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.UpdateState = false;
-        this.$refs.addOrUpdate.dataFormShowDetails = val;
-        this.$refs.addOrUpdate.init();
-      });
-      this.disabled = true;
+        this.$refs.addOrUpdate.UpdateState = false
+        this.$refs.addOrUpdate.dataFormShowDetails = val
+        this.$refs.addOrUpdate.init()
+      })
+      this.disabled = true
     },
-    showDocument(val) {
-      console.log(val);
+    showDocument (val) {
+      console.log(val)
       window.open(
-        window.SITE_CONFIG.frontUrl + "?id=" + val.id + "&&type=" + val.type,
-        "_blank"
-      );
+        window.SITE_CONFIG.frontUrl + '?id=' + val.id + '&&type=' + val.type,
+        '_blank'
+      )
     },
-    findValue(list, type) {
-      const found = list.find((item) => item.attrType === type);
+    findValue (list, type) {
+      const found = list.find((item) => item.attrType === type)
       if (found) {
-        return found.attrValue;
+        return found.attrValue
       } else {
-        return "暂无数据";
+        return '暂无数据'
       }
     },
-    getDataList2(names) {
+    getDataList2 (names) {
       if (names != null) {
         this.$http
           .get(
             this.mixinViewModuleOptions.getDataListURL +
-              "?" +
+              '?' +
               qs.stringify({
                 // order: this.order,
                 // orderField: this.orderField,
                 // type: '组件服务',
                 pageNum: 1,
                 pageSize: this.limit,
-                type: "应用资源",
-                creator: "",
+                type: '应用资源',
+                creator: '',
                 selectType: 0,
                 delFlag: 0,
-                name: names,
+                name: names
               })
           )
           .then(({ data: res }) => {
             if (res.code !== 0) {
-              this.dataList = [];
-              this.total = 0;
-              return this.$message.error(res.msg);
+              this.dataList = []
+              this.total = 0
+              return this.$message.error(res.msg)
             }
             if (res.data.list.length !== 0) {
-              this.dataList = res.data.list;
+              this.dataList = res.data.list
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total
-                : 0;
+                : 0
               if (this.mixinViewModuleOptions.requestCallback) {
-                this.mixinViewModuleOptions.requestCallback(res.data);
+                this.mixinViewModuleOptions.requestCallback(res.data)
               }
-              this.dataListLoading = false;
+              this.dataListLoading = false
             } else {
-              this.$message.error("未查询到相关信息");
-              this.reset();
+              this.$message.error('未查询到相关信息')
+              this.reset()
             }
           })
           .catch(() => {
-            this.dataListLoading = false;
-          });
+            this.dataListLoading = false
+          })
       } else {
-        this.$message.error("查询不能输入为空");
+        this.$message.error('查询不能输入为空')
       }
     },
-    fullScreen() {
+    fullScreen () {
       if (window.outerHeight === screen.availHeight) {
         if (window.outerWidth === screen.availWidth) {
           console.log(
-            "全屏1",
+            '全屏1',
             window.outerHeight,
             screen.availHeight,
             window.outerWidth,
             screen.availWidth
-          );
-          this.qp = false;
+          )
+          this.qp = false
         } else {
           console.log(
-            "不是全屏2",
+            '不是全屏2',
             window.outerHeight,
             screen.availHeight,
             window.outerWidth,
             screen.availWidth
-          );
-          this.qp = true;
+          )
+          this.qp = true
         }
       } else {
         console.log(
-          "不是全屏3",
+          '不是全屏3',
           window.outerHeight,
           screen.availHeight,
           window.outerWidth,
           screen.availWidth
-        );
-        this.qp = true;
+        )
+        this.qp = true
       }
     },
-    //应用与组件
-    applyAndAssembly(val) {
-      console.log("vvvv", val);
-      //根据id和类型查询已关联的组件，将id,type和查出来的数据传递给组件
-      let type = "组件服务";
-      let id = val.id;
+    // 应用与组件
+    applyAndAssembly (val) {
+      console.log('vvvv', val)
+      // 根据id和类型查询已关联的组件，将id,type和查出来的数据传递给组件
+      const type = '组件服务'
+      const id = val.id
       this.$http
-        .get(`/dataResourceRel/queryResourceRelByKeyId`, {
+        .get('/dataResourceRel/queryResourceRelByKeyId', {
           params: {
             keyId: id,
             type: type,
-            referenceName: "",
-          },
+            referenceName: ''
+          }
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          console.log("rrrrressssz", res.data);
-          this.relateApplicationResourceVisible = true;
+          console.log('rrrrressssz', res.data)
+          this.relateApplicationResourceVisible = true
           this.relationData = {
             id: id,
-            linkType: "1",
-            responseData: res.data,
-          };
-          this.topNameArray = ["未关联组件名称", "已关联组件名称"];
-          console.log(" this.relationData", this.relationData);
-          //将数据传递给引入的组件
-        });
+            linkType: '1',
+            responseData: res.data
+          }
+          this.topNameArray = ['未关联组件名称', '已关联组件名称']
+          console.log(' this.relationData', this.relationData)
+          // 将数据传递给引入的组件
+        })
     },
-    //应用与数据资源
-    applyAndDataResource(val) {
-      console.log("数据资源");
+    // 应用与数据资源
+    applyAndDataResource (val) {
+      console.log('数据资源')
     },
-    //应用与项目
-    applyAndProject(val) {
-      let type = "项目";
-      let id = val.id;
+    // 应用与项目
+    applyAndProject (val) {
+      const type = '项目'
+      const id = val.id
       this.$http
-        .get(`/dataResourceRel/queryResourceRelByKeyId`, {
+        .get('/dataResourceRel/queryResourceRelByKeyId', {
           params: {
             keyId: id,
             type: type,
-            referenceName: "",
-          },
+            referenceName: ''
+          }
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          console.log("rrrrressssx", res.data);
-          this.relateApplicationResourceVisible = true;
+          console.log('rrrrressssx', res.data)
+          this.relateApplicationResourceVisible = true
           this.relationData = {
             id: id,
-            linkType: "1",
-            responseData: res.data,
-          };
-          this.topNameArray = ["未关联项目名称", "已关联项目名称"];
-          //将数据传递给引入的组件
-        });
+            linkType: '1',
+            responseData: res.data
+          }
+          this.topNameArray = ['未关联项目名称', '已关联项目名称']
+          // 将数据传递给引入的组件
+        })
     },
-    //应用与基础设施
-    applyAndInfrastructure(val) {
-      let type = "基础设施";
-      let id = val.id;
+    // 应用与基础设施
+    applyAndInfrastructure (val) {
+      const type = '基础设施'
+      const id = val.id
       this.$http
-        .get(`/dataResourceRel/queryResourceRelByKeyId`, {
+        .get('/dataResourceRel/queryResourceRelByKeyId', {
           params: {
             keyId: id,
             type: type,
-            referenceName: "",
-          },
+            referenceName: ''
+          }
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          console.log("rrrrressssj", res.data);
-          this.relateApplicationResourceVisible = true;
+          console.log('rrrrressssj', res.data)
+          this.relateApplicationResourceVisible = true
           this.relationData = {
             id: id,
-            linkType: "1",
-            responseData: res.data,
-          };
-          this.topNameArray = ["未关联基础设施名称", "已关联基础设施名称"];
-          //将数据传递给引入的组件
-        });
+            linkType: '1',
+            responseData: res.data
+          }
+          this.topNameArray = ['未关联基础设施名称', '已关联基础设施名称']
+          // 将数据传递给引入的组件
+        })
     },
     // 是否展示关联应用弹窗
-    handleIsShowRelatePopupApply(type) {
-      this.relateApplicationResourceVisible = type;
+    handleIsShowRelatePopupApply (type) {
+      this.relateApplicationResourceVisible = type
     },
-  },
-};
+    // 新上架
+    clear () {
+      this.showPutOnTheShelfFlag2 = false
+      this.radio = '应用资源'
+      this.submitFrom = {
+        type: '应用资源',
+        deptId: '',
+        delFlag: 0,
+        infoList: [
+          // {
+          //   attrType: '组件类型',
+          //   attrValue: '',
+          //   delFlag: 0
+          // }
+        ]
+      }
+      this.reset()
+    },
+    // 上架
+    showPutOnTheShelf () {
+      this.showPutOnTheShelfFlag2 = true
+      this.$http.get('/category/getCategoryTree').then(res => {
+        this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]
+        console.log(this.insertList, this, this.radio, 'hhhhhhhhhhh')
+        this.putOnTheShelfList = this.insertList.children
+      })
+    },
+    changeInfoList (obj) {
+      this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== obj.attrType)
+      this.submitFrom.infoList.push(obj)
+    },
+    submitData () {
+      this.showPutOnTheShelfFlag2 = false
+      const arr = []
+      this.putOnTheShelfList.map(item => {
+        item.children.map(child => {
+          if (child.children) {
+            if (child.name === '算法优势' || child.name === '应用场景' || child.name === '功能介绍') {
+              arr.push(child.name)
+            }
+            child.children.map(val => {
+              arr.push(val.name)
+              if (val.type === 'input' || val.type === 'textArea' || val.type === 'select' || val.type === 'checkBox' || val.type === 'radio') {
+                this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== val.name)
+              }
+              if (val.note1) {
+                switch (val.name) {
+                  case '算法名称':
+                  case '应用名称':
+                  case '组件名称':
+                  case '图层名称':
+                    this.submitFrom.name = val.note1
+                    break
+                  case '算法描述':
+                  case '应用描述':
+                  case '组件描述':
+                  case '图层描述':
+                    this.submitFrom.description = val.note1
+                    break
+                  case '共享条件':
+                    this.submitFrom.shareCondition = val.note1
+                    break
+                  case '共享类型':
+                    this.submitFrom.shareType = val.note1
+                    break
+                  case '服务接口':
+                    this.submitFrom.apiUrl = val.note1
+                    break
+                  case '接口请求方式':
+                    this.submitFrom.apiMethodType = val.note1
+                    break
+                  case '访问地址':
+                    this.submitFrom.link = val.note1
+                    break
+                  case '部门联系人':
+                    this.submitFrom.deptContacts = val.note1
+                    break
+                  case '部门联系人电话':
+                    this.submitFrom.deptPhone = val.note1
+                    break
+                  case '归属部门':
+                    this.submitFrom.deptId = val.note1
+                    break
+                  case '能力类型':
+                    this.submitFrom.type = val.note1
+                    break
+                  default:
+                    if (val.type !== 'image' && val.type !== 'file' && val.type !== 'video') {
+                      this.submitFrom.infoList.push({
+                        attrType: val.name,
+                        attrValue: val.note1,
+                        delFlag: 0
+                      })
+                    }
+                    break
+                }
+              }
+            })
+          }
+        })
+      })
+      this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType))
+      if (this.submitFrom.id) {
+        // 解决编辑无组件类型
+        this.submitFrom.infoList.map(val => {
+          if (val.attrType === '组件类型') {
+            val.attrValue = this.radio
+          }
+        })
+        console.log('编辑===============>', this.submitFrom)
+        this.$http
+          .put('/resource/update', this.submitFrom)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              this.$message.error('修改失败!')
+            } else {
+              this.$message.success('修改成功！')
+              this.clear()
+            }
+          })
+          .catch(() => {})
+      } else {
+        this.$http
+          .post('/resource/insert?source= b', this.submitFrom)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              this.$message.error('上架失败!')
+            } else {
+              this.$message.success('上架成功！')
+              this.clear()
+            }
+          })
+          .catch(() => {})
+      }
+    },
+    // 新修改
+    UpdateData (item) {
+      this.$http.get('/category/getCategoryTree').then(res => {
+        this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]
+        this.radio = '应用资源'
+        // this.radio = item.infoList.filter(val => val.attrType === '应用资源')[0].attrValue
+        this.putOnTheShelfList = this.insertList.children
+        // this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children
+        this.putOnTheShelfList.map(parent => {
+          parent.children.map(child => {
+            if (child.name === '算法优势' || child.name === '应用场景' || child.name === '功能介绍') {
+              const obj = item.infoList.filter(val => val.attrType === child.name)[0]
+              if (obj) {
+                child.note1 = obj.attrValue
+              }
+            } else {
+              if (child.children) {
+                child.children.map(data => {
+                  if (data.name === '计费标准信息' || data.name === '常见问题') {
+                    const obj = item.infoList.filter(val => val.attrType === child.name)[0]
+                    if (obj) {
+                      data.note1 = obj.attrValue
+                    }
+                  } else {
+                    switch (data.name) {
+                      case '算法名称':
+                      case '应用名称':
+                      case '组件名称':
+                      case '图层名称':
+                        data.note1 = item.name
+                        break
+                      case '算法描述':
+                      case '应用描述':
+                      case '组件描述':
+                      case '图层描述':
+                        data.note1 = item.description
+                        break
+                      case '共享条件':
+                        data.note1 = item.shareCondition
+                        break
+                      case '共享类型':
+                        data.note1 = item.shareType
+                        break
+                      case '服务接口':
+                        data.note1 = item.apiUrl
+                        break
+                      case '接口请求方式':
+                        data.note1 = item.apiMethodType
+                        break
+                      case '访问地址':
+                        data.note1 = item.link
+                        break
+                      case '部门联系人':
+                        data.note1 = item.deptContacts
+                        break
+                      case '部门联系人电话':
+                        data.note1 = item.deptPhone
+                        break
+                      case '归属部门':
+                        data.note1 = item.deptId
+                        break
+                      case '能力类型':
+                        data.note1 = item.type
+                        break
+                      default:
+                        // eslint-disable-next-line no-case-declarations
+                        const obj1 = item.infoList.filter(val => val.attrType === data.name)[0]
+                        if (obj1) {
+                          data.note1 = obj1.attrValue
+                        }
+                        break
+                    }
+                    if (data.type === 'image' || data.type === 'file' || data.type === 'video') {
+                      const obj1 = item.infoList.filter(val => val.attrType === data.name)[0]
+                      if (obj1) {
+                        data.note2 = obj1.note2
+                      }
+                    }
+                  }
+                })
+              }
+            }
+          })
+        })
+        this.submitFrom.id = item.id
+        this.showPutOnTheShelfFlag2 = true
+      })
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 .el-tooltip__popper {
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index a257dfb0..a2c1b116 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -23,7 +23,7 @@
                 tip="支持文件类型，大小不超过100M"></upload>
               <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.mp4' :list="item" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :dataList="item"
                 tip="支持视频类型，大小不超过100M"></upload>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'text'" type="disabled" :data="item" :name="item.name" value="组件服务"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'text'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'text2'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
@@ -52,7 +52,8 @@ export default {
   },
   props: {
     type: String,
-    putOnTheShelfList: Array
+    putOnTheShelfList: Array,
+    typeInput: String
   },
   data () {
     return {

From 29087301b47386bcc74fc2b0232230226d1be4e4 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 11 Jul 2022 16:43:23 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=9B=9E=E5=A1=AB=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/ability/bsabilityai.vue  | 17 +++++++++++++++++
 .../views/modules/components/upload/index.vue   |  5 ++---
 .../putOnTheShelf/components/special.vue        |  3 ++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 5146961d..c77970cd 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -423,12 +423,20 @@ export default {
       this.submitFrom.infoList.push(obj)
     },
     submitData () {
+      console.log('编辑11111111111===============>', this.putOnTheShelfList)
       const arr = []
       this.putOnTheShelfList.map(item => {
         item.children.map(child => {
           if (child.children) {
             if (child.name === '算法优势' || child.name === '应用场景' || child.name === '功能介绍') {
               arr.push(child.name)
+              if (this.submitFrom.infoList.filter(value => value.attrType === child.name).length === 0) {
+                this.submitFrom.infoList.push({
+                  attrType: child.name,
+                  attrValue: child.note1,
+                  delFlag: 0
+                })
+              }
             }
             child.children.map(val => {
               arr.push(val.name)
@@ -483,6 +491,15 @@ export default {
                         attrValue: val.note1,
                         delFlag: 0
                       })
+                    } else {
+                      if (this.submitFrom.infoList.filter(value => value.attrType === val.name).length === 0) {
+                        this.submitFrom.infoList.push({
+                          attrType: val.name,
+                          attrValue: val.note1,
+                          delFlag: 0,
+                          note2: val.note2 || null
+                        })
+                      }
                     }
                     break
                 }
diff --git a/back/src/views/modules/components/upload/index.vue b/back/src/views/modules/components/upload/index.vue
index 64ed8258..aaed392d 100644
--- a/back/src/views/modules/components/upload/index.vue
+++ b/back/src/views/modules/components/upload/index.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 14:55:19
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-11 15:39:31
+ * @LastEditTime: 2022-07-11 16:34:10
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -68,14 +68,13 @@ export default {
       }
     },
     handleChange (file, fileList) {
-      console.log(file, fileList)
       if (file.status === 'success') {
         if (file.response.msg === 'success') {
           this.$message({
             message: file.name + '上传成功',
             type: 'success'
           })
-          // this.data.note1 = file.response.data
+          console.log(file, fileList)
           this.$emit('changeInfoList', {
             attrType: this.title,
             attrValue: file.response.data,
diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue
index ee40bfcc..54e3a782 100644
--- a/back/src/views/modules/putOnTheShelf/components/special.vue
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:54:50
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-11 15:00:24
+ * @LastEditTime: 2022-07-11 16:18:00
  * @Description: 多条数据特殊处理
 -->
 <template>
@@ -111,6 +111,7 @@ export default {
     }
   },
   created () {
+    console.log('特殊处理=============>', this.showData)
     if (this.configure.name === '计费标准信息' || this.configure.name === '常见问题') {
       if (this.showData.children[0].note1) {
         this.data = JSON.parse(this.showData.children[0].note1)

From d44af11e8a3fdba35bbc8740e6dbb566c43862ca Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Mon, 11 Jul 2022 16:52:42 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8A=E6=9E=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ability/bsabilityservice.vue      | 22 +++++++++++++++++--
 .../components/inputSelectCheckbox.vue        |  4 ++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index d4fd055d..29cf2c4e 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -19,14 +19,14 @@
             $t("export")
           }}</el-button>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-button
             v-if="$hasPermission('ability:bsabilityai:save')"
             type="primary"
             @click="addOrUpdateHandleServe()"
             >挂接</el-button
           >
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-button
             type="primary"
@@ -484,6 +484,8 @@ export default {
     // 新上架
     clear () {
       this.showPutOnTheShelfFlag2 = false
+      this.insertList = []
+      this.putOnTheShelfList = []
       this.radio = '应用资源'
       this.submitFrom = {
         type: '应用资源',
@@ -520,6 +522,13 @@ export default {
           if (child.children) {
             if (child.name === '算法优势' || child.name === '应用场景' || child.name === '功能介绍') {
               arr.push(child.name)
+              if (this.submitFrom.infoList.filter(value => value.attrType === child.name).length === 0) {
+                this.submitFrom.infoList.push({
+                  attrType: child.name,
+                  attrValue: child.note1,
+                  delFlag: 0
+                })
+              }
             }
             child.children.map(val => {
               arr.push(val.name)
@@ -574,6 +583,15 @@ export default {
                         attrValue: val.note1,
                         delFlag: 0
                       })
+                    } else {
+                      if (this.submitFrom.infoList.filter(value => value.attrType === val.name).length === 0) {
+                        this.submitFrom.infoList.push({
+                          attrType: val.name,
+                          attrValue: val.note1,
+                          delFlag: 0,
+                          note2: val.note2 || null
+                        })
+                      }
                     }
                     break
                 }
diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
index 784284be..e87ccf59 100644
--- a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
+++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
@@ -135,6 +135,10 @@ export default {
       if (this.data.note1) {
         this.valueCheckBox = this.data.note1.split(';')
       }
+    } else if (this.data.name === '发布端') {
+      if (this.data.note1) {
+        this.valueCheckBox = this.data.note1.split(';')
+      }
     }
   },
   mounted () {

From b8ddfe5938d35ae8a1219db4a5b1d03933647d56 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Mon, 11 Jul 2022 17:12:12 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E5=90=8E=E5=A4=A9-=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=BB=84=E4=BB=B6=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/putOnTheShelf/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index a2c1b116..d063a3dc 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -12,7 +12,7 @@
           <template v-if='judgmentType.filter(item => item.name==child.name).length === 0'>
             <div class="top">{{child.name}}</div>
             <div v-for="item in child.children" :key="item.id" class='item'>
-              <span v-if="item.name != '来源应用'">{{ item.name }}</span>
+              <span v-if="item.name != '来源应用' && item.name != '关联组件信息'">{{ item.name }}</span>
               <!-- <upload :list="[]" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" :data="item"
                 tip="支持图片类型，大小不超过100M"></upload> -->
               <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.jpg,.jpeg,.png' :list="item" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1"

From dcf90b081e25ab017a660728bf804fedd448f0ff Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Mon, 11 Jul 2022 17:50:01 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5bug=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=90=8E=E5=8F=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/log-data-modification-log.vue | 301 +++++++++++++++
 back/src/views/modules/sys/log-operation.vue  | 233 +++++++++++-
 .../ApplicationDeploymentAndSecurity.vue      |  10 +-
 .../Application/ApplicationNavigation.vue     | 337 +++++++++--------
 ...tionOwningDepartmentAndServiceProvider.vue | 355 +++++++++---------
 5 files changed, 872 insertions(+), 364 deletions(-)
 create mode 100644 back/src/views/modules/sys/log-data-modification-log.vue

diff --git a/back/src/views/modules/sys/log-data-modification-log.vue b/back/src/views/modules/sys/log-data-modification-log.vue
new file mode 100644
index 00000000..c76cc6ea
--- /dev/null
+++ b/back/src/views/modules/sys/log-data-modification-log.vue
@@ -0,0 +1,301 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__log-operation">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-select
+            v-model="dataForm.status"
+            :placeholder="$t('logOperation.status')"
+            clearable
+          >
+            <el-option
+              :label="$t('logOperation.status0')"
+              :value="0"
+            ></el-option>
+            <el-option
+              :label="$t('logOperation.status1')"
+              :value="1"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            v-model="dataForm.creatorName"
+            placeholder="请输入操作人"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-date-picker
+            v-model="value1"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            v-model="dataForm.operation"
+            placeholder="请输入操作名称"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model="operationType"
+            placeholder="请选择操作类型"
+            clearable
+          >
+            <el-option
+              label="增加"
+              value="/renren-admin/resource%/insert"
+            ></el-option>
+            <el-option
+              label="更新"
+              value="/renren-admin/resource%/update"
+            ></el-option>
+            <el-option
+              label="删除"
+              value="/renren-admin/resource%/delete"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="resetFunction()"> 重置 </el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="info" @click="exportHandle()">{{
+            $t('export')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+        :row-class-name="rowClassName"
+      >
+        <el-table-column
+          label="序号"
+          align="center"
+          prop="xh"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          prop="operation"
+          label="操作名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="creatorName"
+          label="操作人"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="requestUriCharacters"
+          label="操作类型"
+          header-align="center"
+          width="100"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="operationTable"
+          label="操作数据表"
+          header-align="center"
+          align="center"
+          width="120"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="status"
+          label="操作结果"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{
+              $t('logOperation.status0')
+            }}</el-tag>
+            <el-tag v-else size="small" type="success">{{
+              $t('logOperation.status1')
+            }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="createDate"
+          label="操作时间"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="requestMethod"
+          label="操作方法"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="requestParams"
+          label="传递参数"
+          header-align="center"
+          align="center"
+          width="120"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="resultData"
+          label="返回结果"
+          header-align="center"
+          width="150"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/sys/log/operation/page',
+        getDataListIsPage: true,
+        exportURL: '/sys/log/operation/export'
+      },
+      dataForm: {
+        status: '',
+        creatorName: '',
+        startDate: '',
+        endDate: '',
+        operation: '',
+        operationType: 'all'
+      },
+      operationType: '',
+      value1: ''
+    }
+  },
+  watch: {
+    value1 (val) {
+      val[0] = this.handleTime(val[0], 'yyyy-MM-dd HH:mm:ss')
+      this.dataForm.startDate = val[0]
+      val[1] = this.handleTime(val[1], 'yyyy-MM-dd HH:mm:ss')
+      this.dataForm.endDate = val[1]
+    },
+    dataList (val) {
+      if (val[0].requestUri) {
+        this.requestUriFunction()
+      }
+    },
+    operationType (val) {
+      if (val !== 'all') {
+        this.dataForm.operationType = val
+      }
+    }
+  },
+  methods: {
+    // 重置按钮
+    resetFunction () {
+      const params = {
+        status: '',
+        creatorName: '',
+        startDate: '',
+        endDate: '',
+        operation: '',
+        operationType: 'all'
+      }
+      this.value1 = '' // 格式化日期
+      this.operationType = '' // 操作类型转化
+      this.page = 1
+      this.limit = 10
+      this.dataForm = params
+      this.getDataList() // 重置完调用查询方法
+    },
+    // 序号
+    rowClassName ({ row, rowIndex }) {
+      row.xh = rowIndex + 1 + (this.page - 1) * this.limit
+    },
+    // 操作类型字段
+    requestUriFunction () {
+      this.dataList.map((item, index) => {
+        const name = item.requestUri.substring(
+          item.requestUri.lastIndexOf('/') + 1
+        )
+        switch (name) {
+          case 'delete':
+            this.dataList[index].requestUriCharacters = '删除'
+            break
+          case 'update':
+            this.dataList[index].requestUriCharacters = '更新'
+            break
+          case 'insert':
+            this.dataList[index].requestUriCharacters = '增加'
+            break
+        }
+      })
+    },
+    // 定义格式化函数：
+    handleTime (time, format) {
+      if (time == null || time == undefined || time == '') {
+        return ''
+      }
+      var t = new Date(time)
+      var tf = function (i) {
+        return (i < 10 ? '0' : '') + i
+      }
+      return format.replace(/yyyy|MM|dd|HH|mm|ss/g, function (a) {
+        switch (a) {
+          case 'yyyy':
+            return tf(t.getFullYear())
+            break
+          case 'MM':
+            return tf(t.getMonth() + 1)
+            break
+          case 'mm':
+            return tf(t.getMinutes())
+            break
+          case 'dd':
+            return tf(t.getDate())
+            break
+          case 'HH':
+            return tf(t.getHours())
+            break
+          case 'ss':
+            return tf(t.getSeconds())
+            break
+        }
+      })
+    }
+  },
+  mounted () {
+    this.$nextTick(() => {})
+  }
+}
+</script>
diff --git a/back/src/views/modules/sys/log-operation.vue b/back/src/views/modules/sys/log-operation.vue
index c4bd61be..10f57da0 100644
--- a/back/src/views/modules/sys/log-operation.vue
+++ b/back/src/views/modules/sys/log-operation.vue
@@ -1,40 +1,164 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__log-operation">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
         <el-form-item>
-          <el-select v-model="dataForm.status" :placeholder="$t('logOperation.status')" clearable>
-            <el-option :label="$t('logOperation.status0')" :value="0"></el-option>
-            <el-option :label="$t('logOperation.status1')" :value="1"></el-option>
+          <el-select
+            v-model="dataForm.status"
+            :placeholder="$t('logOperation.status')"
+            clearable
+          >
+            <el-option
+              :label="$t('logOperation.status0')"
+              :value="0"
+            ></el-option>
+            <el-option
+              :label="$t('logOperation.status1')"
+              :value="1"
+            ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item>
+          <el-input
+            v-model="dataForm.creatorName"
+            placeholder="请输入操作人"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-date-picker
+            v-model="value1"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            v-model="dataForm.operation"
+            placeholder="请输入操作名称"
+          ></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button @click="resetFunction()"> 重置 </el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="info" @click="exportHandle()">{{
+            $t('export')
+          }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
-        <el-table-column prop="creatorName" :label="$t('logOperation.creatorName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="operation" :label="$t('logOperation.operation')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="requestUri" :label="$t('logOperation.requestUri')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="requestMethod" :label="$t('logOperation.requestMethod')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="requestParams" :label="$t('logOperation.requestParams')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="requestTime" :label="$t('logOperation.requestTime')" sortable="custom" header-align="center" align="center">
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+        :row-class-name="rowClassName"
+      >
+        <el-table-column
+          label="序号"
+          align="center"
+          prop="xh"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          prop="operation"
+          label="操作名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="creatorName"
+          label="操作人"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="createDate"
+          label="操作时间"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="ip"
+          label="客户端IP"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="requestUri"
+          label="请求地址"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="requestMethod"
+          :label="$t('logOperation.requestMethod')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="requestParams"
+          :label="$t('logOperation.requestParams')"
+          header-align="center"
+          align="center"
+          width="150"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="resultData"
+          label="返回结果"
+          header-align="center"
+          width="150"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="requestTime"
+          :label="$t('logOperation.requestTime')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        >
           <template slot-scope="scope">
             {{ `${scope.row.requestTime}ms` }}
           </template>
         </el-table-column>
-        <el-table-column prop="status" :label="$t('logOperation.status')" sortable="custom" header-align="center" align="center">
+        <el-table-column
+          prop="status"
+          :label="$t('logOperation.status')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('logOperation.status0') }}</el-tag>
-            <el-tag v-else size="small" type="success">{{ $t('logOperation.status1') }}</el-tag>
+            <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{
+              $t('logOperation.status0')
+            }}</el-tag>
+            <el-tag v-else size="small" type="success">{{
+              $t('logOperation.status1')
+            }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="ip" :label="$t('logOperation.ip')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userAgent" :label="$t('logOperation.userAgent')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('logOperation.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
+        <!-- <el-table-column
+          prop="userAgent"
+          :label="$t('logOperation.userAgent')"
+          header-align="center"
+          align="center"
+          width="150"
+          :show-overflow-tooltip="true"
+        ></el-table-column> -->
       </el-table>
       <el-pagination
         :current-page="page"
@@ -43,7 +167,8 @@
         :total="total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+        @current-change="pageCurrentChangeHandle"
+      >
       </el-pagination>
     </div>
   </el-card>
@@ -61,8 +186,76 @@ export default {
         exportURL: '/sys/log/operation/export'
       },
       dataForm: {
-        status: ''
+        status: '',
+        creatorName: '',
+        startDate: '',
+        endDate: '',
+        operation: ''
+      },
+      value1: ''
+    }
+  },
+  watch: {
+    value1 (val) {
+      val[0] = this.handleTime(val[0], 'yyyy-MM-dd HH:mm:ss')
+      this.dataForm.startDate = val[0]
+      val[1] = this.handleTime(val[1], 'yyyy-MM-dd HH:mm:ss')
+      this.dataForm.endDate = val[1]
+    }
+  },
+  methods: {
+    // 重置按钮
+    resetFunction () {
+      const params = {
+        status: '',
+        creatorName: '',
+        startDate: '',
+        endDate: '',
+        operation: '',
+        operationType: 'all'
       }
+      this.value1 = '' // 格式化日期
+      this.operationType = '' // 操作类型转化
+      this.page = 1
+      this.limit = 10
+      this.dataForm = params
+      this.getDataList() // 重置完调用查询方法
+    },
+    // 序号
+    rowClassName ({ row, rowIndex }) {
+      row.xh = rowIndex + 1 + (this.page - 1) * this.limit
+    },
+    // 定义格式化函数：
+    handleTime (time, format) {
+      if (time == null || time == undefined || time == '') {
+        return ''
+      }
+      var t = new Date(time)
+      var tf = function (i) {
+        return (i < 10 ? '0' : '') + i
+      }
+      return format.replace(/yyyy|MM|dd|HH|mm|ss/g, function (a) {
+        switch (a) {
+          case 'yyyy':
+            return tf(t.getFullYear())
+            break
+          case 'MM':
+            return tf(t.getMonth() + 1)
+            break
+          case 'mm':
+            return tf(t.getMinutes())
+            break
+          case 'dd':
+            return tf(t.getDate())
+            break
+          case 'HH':
+            return tf(t.getHours())
+            break
+          case 'ss':
+            return tf(t.getSeconds())
+            break
+        }
+      })
     }
   }
 }
diff --git a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
index 81ad5792..3fbc894b 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
@@ -144,11 +144,11 @@
             dataFrom.value.content[1].childrenContent.push(itemContent)
           })
         }
-        // let obj = {
-        //   attrType: '访问地址',
-        //   attrValue: props.dataList.link || '------',
-        // }
-        // dataFrom.value.content[0].childrenContent.push(obj)
+        let obj = {
+          attrType: '访问地址',
+          attrValue: props.dataList.link || '------',
+        }
+        dataFrom.value.content[0].childrenContent.push(obj)
       }
     }
   )
diff --git a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
index 4ddf5f70..feff2a35 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
@@ -8,7 +8,12 @@
 <template>
   <div class="application-navigation" v-if="navList.length > 0">
     <template v-for="nav in navList" :key="nav.key">
-      <div class="nav" :class="{ select: nav.key == select }" v-if="nav.show" @click="selectNav(nav.key)">
+      <div
+        class="nav"
+        :class="{ select: nav.key == select }"
+        v-if="nav.show"
+        @click="selectNav(nav.key)"
+      >
         {{ nav.name }}
         <span class="line"></span>
       </div>
@@ -16,179 +21,179 @@
   </div>
 </template>
 <script setup>
-import { ref, defineProps, watch } from 'vue'
-import mybus from '@/myplugins/mybus'
-import { useRouter } from 'vue-router'
-import { queryPartAppByKeyId } from '@/api/home'
-// 获取当前路由地址
-const router = useRouter()
-const keyId = router.currentRoute.value.query.id
-const navList = ref([
-  {
-    name: '应用展示',
-    key: 'application-presentation',
-  },
-  {
-    name: '功能介绍',
-    key: 'function-introduction',
-  },
-  {
-    name: '使用能力',
-    key: 'ability-to-use',
-  },
-  {
-    name: '部署与安全',
-    key: 'deployment-and-security',
-  },
-  {
-    name: '归属部门与服务商',
-    key: 'department-and-service-provider',
-  },
-  {
-    name: '常见问题',
-    key: 'common-problem',
-  },
-])
-const props = defineProps({
-  selectNow: { type: String, default: '' },
-  dataList: { type: Object, default: null },
-  associatedComponents: { type: Array, default: null },
-})
-const select = ref('application-associated-ability')
-const list = ref([])
-// 根据能力id查询是否存在关联应用
-if (keyId) {
-  let params = {
-    keyId: keyId,
-    type: '组件服务',
-  }
-  queryPartAppByKeyId(params).then((res) => {
-    console.log('ressssssss', res)
-    if (res.data.data.length != 0) {
-      // 存在关联应用时在导航栏加入关联应用
-      navList.value.unshift({
-        name: '关联组件',
-        key: 'application-associated-ability',
-        show: true,
-      })
-      list.value.unshift('关联组件')
-    }
+  import { ref, defineProps, watch } from 'vue'
+  import mybus from '@/myplugins/mybus'
+  import { useRouter } from 'vue-router'
+  import { queryPartAppByKeyId } from '@/api/home'
+  // 获取当前路由地址
+  const router = useRouter()
+  const keyId = router.currentRoute.value.query.id
+  const navList = ref([
+    {
+      name: '应用展示',
+      key: 'application-presentation',
+    },
+    {
+      name: '功能介绍',
+      key: 'function-introduction',
+    },
+    {
+      name: '使用能力',
+      key: 'ability-to-use',
+    },
+    {
+      name: '部署与安全',
+      key: 'deployment-and-security',
+    },
+    {
+      name: '归属部门与服务商',
+      key: 'department-and-service-provider',
+    },
+    {
+      name: '常见问题',
+      key: 'common-problem',
+    },
+  ])
+  const props = defineProps({
+    selectNow: { type: String, default: '' },
+    dataList: { type: Object, default: null },
+    associatedComponents: { type: Array, default: null },
   })
-}
-const selectNav = (key) => {
-  select.value = key
-  mybus.emit('flyToView', select.value)
-}
-if (props.dataList.infoList) {
-  list.value = []
-  props.dataList.infoList.map((item) => {
-    if (
-      item.attrType === '功能介绍' ||
-      item.attrType === '常见问题' ||
-      item.attrType === '使用能力' ||
-      item.attrType === '关联组件'
-    ) {
-      list.value.push(item.attrType)
-    } else if (item.attrType === '应用展示视频') {
-      list.value.push('应用展示')
+  const select = ref('application-associated-ability')
+  const list = ref([])
+  // 根据能力id查询是否存在关联应用
+  if (keyId) {
+    let params = {
+      keyId: keyId,
+      type: '组件服务',
     }
-  })
-  list.value.unshift('关联组件')
-  list.value.push('部署与安全')
-  list.value.push('归属部门与服务商')
-  navList.value.forEach((item) => {
-    console.log(item)
-    if (list.value.indexOf(item.name) > -1) {
-      item.show = true
-    }
-  })
-  if (list.value.length > 0) {
-    if (navList.value.filter((item) => item.name === list.value[0])[0]) {
-      select.value = navList.value.filter(
-        (item) => (item.name === '关联组件') | (item.name === list.value[0])
-      )[0].key
-    }
-  }
-  console.log('11111111111111111111111111', list.value, navList.value)
-}
-watch(
-  () => props.selectNow,
-  (newValue) => {
-    select.value = newValue
-  }
-)
-watch(
-  () => props.dataList,
-  (val) => {
-    if (val) {
-      list.value = []
-      val.infoList.map((item) => {
-        if (
-          item.attrType === '功能介绍' ||
-          item.attrType === '常见问题' ||
-          item.attrType === '使用能力' ||
-          item.attrType === '关联组件'
-        ) {
-          list.value.push(item.attrType)
-        } else if (item.attrType === '应用展示视频') {
-          list.value.push('应用展示')
-        }
-      })
-      list.value.unshift('关联组件')
-      list.value.push('部署与安全')
-      list.value.push('归属部门与服务商')
-      navList.value.forEach((item) => {
-        console.log(item)
-        if (list.value.indexOf(item.name) > -1) {
-          item.show = true
-        }
-      })
-      if (list.value.length > 0) {
-        if (navList.value.filter((item) => item.name === list.value[0])[0]) {
-          select.value = navList.value.filter(
-            (item) =>
-              (item.name === '关联组件') | (item.name === list.value[0])
-          )[0].key
-        }
+    queryPartAppByKeyId(params).then((res) => {
+      console.log('ressssssss', res)
+      if (res.data.data.length != 0) {
+        // 存在关联应用时在导航栏加入关联应用
+        navList.value.unshift({
+          name: '关联组件',
+          key: 'application-associated-ability',
+          show: true,
+        })
+        list.value.unshift('关联组件')
       }
-      console.log('11111111111111111111111111', list.value, navList.value)
-    }
+    })
   }
-)
+  const selectNav = (key) => {
+    select.value = key
+    mybus.emit('flyToView', select.value)
+  }
+  if (props.dataList.infoList) {
+    list.value = []
+    props.dataList.infoList.map((item) => {
+      if (
+        item.attrType === '功能介绍' ||
+        item.attrType === '常见问题' ||
+        item.attrType === '使用能力' ||
+        item.attrType === '关联组件'
+      ) {
+        list.value.push(item.attrType)
+      } else if (item.attrType === '应用展示视频') {
+        list.value.push('应用展示')
+      }
+    })
+    list.value.unshift('关联组件')
+    list.value.push('部署与安全')
+    list.value.push('归属部门与服务商')
+    navList.value.forEach((item) => {
+      console.log(item)
+      if (list.value.indexOf(item.name) > -1) {
+        item.show = true
+      }
+    })
+    if (list.value.length > 0) {
+      if (navList.value.filter((item) => item.name === list.value[0])[0]) {
+        select.value = navList.value.filter(
+          (item) => (item.name === '关联组件') | (item.name === list.value[0])
+        )[0].key
+      }
+    }
+    console.log('11111111111111111111111111', list.value, navList.value)
+  }
+  watch(
+    () => props.selectNow,
+    (newValue) => {
+      select.value = newValue
+    }
+  )
+  watch(
+    () => props.dataList,
+    (val) => {
+      if (val) {
+        list.value = []
+        val.infoList.map((item) => {
+          if (
+            item.attrType === '功能介绍' ||
+            item.attrType === '常见问题' ||
+            item.attrType === '使用能力' ||
+            item.attrType === '关联组件'
+          ) {
+            list.value.push(item.attrType)
+          } else if (item.attrType === '应用展示视频') {
+            list.value.push('应用展示')
+          }
+        })
+        list.value.unshift('关联组件')
+        list.value.push('部署与安全')
+        list.value.push('归属部门与服务商')
+        navList.value.forEach((item) => {
+          console.log(item)
+          if (list.value.indexOf(item.name) > -1) {
+            item.show = true
+          }
+        })
+        if (list.value.length > 0) {
+          if (navList.value.filter((item) => item.name === list.value[0])[0]) {
+            select.value = navList.value.filter(
+              (item) =>
+                (item.name === '关联组件') | (item.name === list.value[0])
+            )[0].key
+          }
+        }
+        console.log('11111111111111111111111111', list.value, navList.value)
+      }
+    }
+  )
 </script>
 <style lang="less" scoped>
-.application-navigation {
-  width: 19.12rem;
-  height: 0.84rem;
-  line-height: 0.8rem;
-  display: flex;
-  justify-content: space-around;
-  font-size: 0.24rem;
-  color: #666;
-  background: #fff;
-  padding: 0 3rem;
-  box-shadow: 0rem 0.05rem 0.1rem #f2f3fb;
-  position: relative;
-
-  .nav {
-    cursor: pointer;
+  .application-navigation {
+    width: 19.12rem;
+    height: 0.84rem;
+    line-height: 0.8rem;
     display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    align-items: center;
+    justify-content: space-around;
+    font-size: 0.24rem;
+    color: #666;
+    background: #fff;
+    padding: 0 3rem;
+    box-shadow: 0rem 0.05rem 0.1rem #f2f3fb;
+    position: relative;
 
-    .line {
-      width: 0.4rem;
-      height: 0.04rem;
+    .nav {
+      cursor: pointer;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      align-items: center;
+
+      .line {
+        width: 0.4rem;
+        height: 0.04rem;
+      }
+    }
+
+    .select {
+      color: #526aff;
+
+      .line {
+        background: #526aff;
+      }
     }
   }
-
-  .select {
-    color: #526aff;
-
-    .line {
-      background: #526aff;
-    }
-  }
-}
 </style>
diff --git a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
index c878f35e..85ab0b3d 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
@@ -2,10 +2,17 @@
 <template>
   <div class="application-deployment-and-security">
     <div class="title">
-      <DetalsTitle :title="dataFrom.title" :type="dataFrom.englishTitle"></DetalsTitle>
+      <DetalsTitle
+        :title="dataFrom.title"
+        :type="dataFrom.englishTitle"
+      ></DetalsTitle>
     </div>
     <div class="content">
-      <div v-for="(item, index) in dataFrom.content" :key="index" class="content-card">
+      <div
+        v-for="(item, index) in dataFrom.content"
+        :key="index"
+        class="content-card"
+      >
         <div class="card-title">{{ item.childrenTitle }}</div>
         <div class="card-content">
           <div v-for="carditem in item.childrenContent" :key="carditem">
@@ -24,206 +31,208 @@
 </template>
 
 <script setup>
-import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
-import { ref, defineProps, watch } from 'vue'
-let dataFrom = ref({
-  title: '归属部门与服务商',
-  englishTitle: 'DEPARTMENT&ERVICE',
-  content: [
-    {
-      childrenTitle: '归属部门信息',
-      childrenContent: [],
-    },
-    {
-      childrenTitle: '服务商信息',
-      childrenContent: [],
-    },
-  ],
-})
-console.log(dataFrom.value)
-//数据初始化
-const props = defineProps({
-  dataList: { type: Object, default: null },
-})
-if (props.dataList.infoList) {
-  let obj = {
-    attrType: '部门名称',
-    attrValue: props.dataList.deptName || '------',
-  }
-  dataFrom.value.content[0].childrenContent[0] = obj
-  let deptContacts = {
-    attrType: '部门联系人',
-    attrValue: '',
-  }
-  dataFrom.value.content[0].childrenContent[1] = deptContacts
-  let deptPhone = {
-    attrType: '部门联系电话',
-    attrValue: '',
-  }
-  dataFrom.value.content[0].childrenContent[2] = deptPhone
-  props.dataList.infoList.map((item) => {
-    if (
-      item.attrType === '服务商' ||
-      item.attrType === '服务商联系人' ||
-      item.attrType === '服务商联系电话' ||
-      item.attrType.indexOf('服务商名') != -1
-    ) {
+  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
+  import { ref, defineProps, watch } from 'vue'
+  let dataFrom = ref({
+    title: '归属部门与服务商',
+    englishTitle: 'DEPARTMENT&ERVICE',
+    content: [
+      {
+        childrenTitle: '归属部门信息',
+        childrenContent: [],
+      },
+      {
+        childrenTitle: '服务商信息',
+        childrenContent: [],
+      },
+    ],
+  })
+  console.log(dataFrom.value)
+  //数据初始化
+  const props = defineProps({
+    dataList: { type: Object, default: null },
+  })
+  if (props.dataList.infoList) {
+    let obj = {
+      attrType: '部门名称',
+      attrValue: props.dataList.deptName || '------',
+    }
+    dataFrom.value.content[0].childrenContent[0] = obj
+    let deptContacts = {
+      attrType: '部门联系人',
+      attrValue: '',
+    }
+    dataFrom.value.content[0].childrenContent[1] = deptContacts
+    let deptPhone = {
+      attrType: '部门联系电话',
+      attrValue: '',
+    }
+    dataFrom.value.content[0].childrenContent[2] = deptPhone
+    props.dataList.infoList.map((item) => {
       if (
         item.attrType === '服务商' ||
+        item.attrType === '服务商联系人' ||
+        item.attrType === '服务商联系电话' ||
         item.attrType.indexOf('服务商名') != -1
       ) {
-        dataFrom.value.content[1].childrenContent[0] = item
-        if (dataFrom.value.content[1].childrenContent[0].attrValue == '') {
-          dataFrom.value.content[1].childrenContent[0].attrValue = '------'
-        }
-      } else if (item.attrType === '服务商联系人') {
-        dataFrom.value.content[1].childrenContent[1] = item
-        if (dataFrom.value.content[1].childrenContent[1].attrValue == '') {
-          dataFrom.value.content[1].childrenContent[1].attrValue = '------'
-        }
-      } else if (item.attrType === '服务商联系电话') {
-        dataFrom.value.content[1].childrenContent[2] = item
-        if (dataFrom.value.content[1].childrenContent[2].attrValue == '') {
-          dataFrom.value.content[1].childrenContent[2].attrValue = '------'
-        }
-      }
-    } else if (item.attrType === '部门联系人') {
-      deptContacts.attrValue = item.attrValue || '------'
-    } else if (item.attrType === '部门联系人电话') {
-      deptPhone.attrValue = item.attrValue || '------'
-    }
-  })
-
-  console.log('obj', dataFrom.value)
-}
-watch(
-  () => props.dataList,
-  (val) => {
-    if (val) {
-      // dataFrom.value.content[0].childrenContent = []
-      // dataFrom.value.content[1].childrenContent = []
-      let obj = {
-        attrType: '部门名称',
-        attrValue: props.dataList.deptName || '------',
-      }
-      dataFrom.value.content[0].childrenContent[0] = obj
-      let deptContacts = {
-        attrType: '部门联系人',
-        attrValue: props.dataList.deptContacts || '------',
-      }
-      dataFrom.value.content[0].childrenContent[1] = deptContacts
-      let deptPhone = {
-        attrType: '部门联系电话',
-        attrValue: props.dataList.deptPhone || '------',
-      }
-      dataFrom.value.content[0].childrenContent[2] = deptPhone
-      props.dataList.infoList.map((item) => {
         if (
           item.attrType === '服务商' ||
-          item.attrType === '服务商联系人' ||
-          item.attrType === '服务商联系电话' ||
           item.attrType.indexOf('服务商名') != -1
         ) {
+          dataFrom.value.content[1].childrenContent[0] = item
+          if (dataFrom.value.content[1].childrenContent[0].attrValue == '') {
+            dataFrom.value.content[1].childrenContent[0].attrValue = '------'
+          }
+        } else if (item.attrType === '服务商联系人') {
+          dataFrom.value.content[1].childrenContent[1] = item
+          if (dataFrom.value.content[1].childrenContent[1].attrValue == '') {
+            dataFrom.value.content[1].childrenContent[1].attrValue = '------'
+          }
+        } else if (item.attrType === '服务商联系电话') {
+          dataFrom.value.content[1].childrenContent[2] = item
+          if (dataFrom.value.content[1].childrenContent[2].attrValue == '') {
+            dataFrom.value.content[1].childrenContent[2].attrValue = '------'
+          }
+        }
+      } else if (item.attrType === '部门联系人') {
+        deptContacts.attrValue = item.attrValue || '------'
+      } else if (item.attrType === '部门联系人电话') {
+        deptPhone.attrValue = item.attrValue || '------'
+      }
+    })
+
+    console.log('obj', dataFrom.value)
+  }
+  watch(
+    () => props.dataList,
+    (val) => {
+      if (val) {
+        // dataFrom.value.content[0].childrenContent = []
+        // dataFrom.value.content[1].childrenContent = []
+        let obj = {
+          attrType: '部门名称',
+          attrValue: props.dataList.deptName || '------',
+        }
+        dataFrom.value.content[0].childrenContent[0] = obj
+        let deptContacts = {
+          attrType: '部门联系人',
+          attrValue: props.dataList.deptContacts || '------',
+        }
+        dataFrom.value.content[0].childrenContent[1] = deptContacts
+        let deptPhone = {
+          attrType: '部门联系电话',
+          attrValue: props.dataList.deptPhone || '------',
+        }
+        dataFrom.value.content[0].childrenContent[2] = deptPhone
+        props.dataList.infoList.map((item) => {
           if (
             item.attrType === '服务商' ||
+            item.attrType === '服务商联系人' ||
+            item.attrType === '服务商联系电话' ||
             item.attrType.indexOf('服务商名') != -1
           ) {
-            dataFrom.value.content[1].childrenContent.push(item)
             if (
-              dataFrom.value.content[1].childrenContent[0].attrValue == ''
+              item.attrType === '服务商' ||
+              item.attrType.indexOf('服务商名') != -1
             ) {
-              dataFrom.value.content[1].childrenContent[0].attrValue =
-                '------'
-            }
-          } else if (item.attrType === '服务商联系人') {
-            dataFrom.value.content[1].childrenContent[1] = item
-            if (
-              dataFrom.value.content[1].childrenContent[1].attrValue == ''
-            ) {
-              dataFrom.value.content[1].childrenContent[1].attrValue =
-                '------'
-            }
-          } else if (item.attrType === '服务商联系电话') {
-            dataFrom.value.content[1].childrenContent[2] = item
-            if (
-              dataFrom.value.content[1].childrenContent[2].attrValue == ''
-            ) {
-              dataFrom.value.content[1].childrenContent[2].attrValue =
-                '------'
+              dataFrom.value.content[1].childrenContent.push(item)
+              if (
+                dataFrom.value.content[1].childrenContent[0].attrValue == ''
+              ) {
+                dataFrom.value.content[1].childrenContent[0].attrValue =
+                  '------'
+              }
+            } else if (item.attrType === '服务商联系人') {
+              dataFrom.value.content[1].childrenContent[1] = item
+              if (
+                dataFrom.value.content[1].childrenContent[1].attrValue == ''
+              ) {
+                dataFrom.value.content[1].childrenContent[1].attrValue =
+                  '------'
+              }
+            } else if (item.attrType === '服务商联系电话') {
+              dataFrom.value.content[1].childrenContent[2] = item
+              if (
+                dataFrom.value.content[1].childrenContent[2].attrValue == ''
+              ) {
+                dataFrom.value.content[1].childrenContent[2].attrValue =
+                  '------'
+              }
             }
+          } else if (item.attrType === '部门联系人') {
+            deptContacts.attrValue = item.attrValue || '------'
+          } else if (item.attrType === '部门联系人电话') {
+            deptPhone.attrValue = item.attrValue || '------'
           }
-        } else if (item.attrType === '部门联系人') {
-          deptContacts.attrValue = item.attrValue || '------'
-        } else if (item.attrType === '部门联系人电话') {
-          deptPhone.attrValue = item.attrValue || '------'
-        }
-      })
-      console.log('obj', dataFrom.value)
+        })
+        console.log('obj', dataFrom.value)
+      }
     }
-  }
-)
+  )
 </script>
 
 <style lang="less" scoped>
-.application-deployment-and-security {
-  padding: 0.8rem 0;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  .title {
-    margin-bottom: 0.3rem;
-  }
-
-  .content {
+  .application-deployment-and-security {
+    padding: 0.8rem 0;
     display: flex;
-    width: 13rem;
-    justify-content: space-between;
+    flex-direction: column;
+    align-items: center;
 
-    .content-card {
-      height: 1.5rem;
-      width: 6.2rem;
-      border-radius: 0.2rem;
-      background: linear-gradient(to right,
-          rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4));
-      padding: 0 0.3rem;
+    .title {
+      margin-bottom: 0.3rem;
+    }
+
+    .content {
       display: flex;
-      flex-direction: column;
-      justify-content: center;
+      width: 13rem;
+      justify-content: space-between;
 
-      .card-title {
-        font-size: 0.26rem;
-        color: #212956;
-        margin-bottom: 0.2rem;
-        line-height: 0.26rem;
-      }
+      .content-card {
+        height: 1.5rem;
+        width: 6.2rem;
+        border-radius: 0.2rem;
+        background: linear-gradient(
+          to right,
+          rgba(113, 132, 252, 0.4),
+          rgba(148, 163, 252, 0.4)
+        );
+        padding: 0 0.3rem;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
 
-      .card-content {
-        white-space: nowrap;
-
-        div {
-          display: inline-block;
-          margin-right: 0.2rem;
-          color: rgba(33, 41, 86, 0.8);
-          font-size: 0.2rem;
-          max-width: 2.8rem;
-
-          div {
-            max-width: 2.8rem;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            display: -webkit-box;
-            -webkit-box-orient: vertical;
-            -webkit-line-clamp: 1;
-          }
+        .card-title {
+          font-size: 0.26rem;
+          color: #212956;
+          margin-bottom: 0.2rem;
+          line-height: 0.26rem;
         }
 
-        div:first-child {
-          display: block;
+        .card-content {
+          white-space: nowrap;
+
+          div {
+            display: inline-block;
+            margin-right: 0.2rem;
+            color: rgba(33, 41, 86, 0.8);
+            font-size: 0.2rem;
+            max-width: 2.8rem;
+
+            div {
+              max-width: 2.8rem;
+              // overflow: hidden;
+              // text-overflow: ellipsis;
+              // display: -webkit-box;
+              // -webkit-box-orient: vertical;
+              // -webkit-line-clamp: 1;
+            }
+          }
+
+          div:first-child {
+            display: block;
+          }
         }
       }
     }
   }
-}
 </style>

From a44cce5492845826ced6822401bbf505e4719b77 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Mon, 11 Jul 2022 18:33:58 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E6=97=A5=E5=BF=97bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/sys/log-data-modification-log.vue | 2 +-
 back/src/views/modules/sys/log-operation.vue             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/sys/log-data-modification-log.vue b/back/src/views/modules/sys/log-data-modification-log.vue
index c76cc6ea..c28d66c5 100644
--- a/back/src/views/modules/sys/log-data-modification-log.vue
+++ b/back/src/views/modules/sys/log-data-modification-log.vue
@@ -31,7 +31,7 @@
         <el-form-item>
           <el-date-picker
             v-model="value1"
-            type="daterange"
+            type="datetimerange"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
diff --git a/back/src/views/modules/sys/log-operation.vue b/back/src/views/modules/sys/log-operation.vue
index 10f57da0..3b70341b 100644
--- a/back/src/views/modules/sys/log-operation.vue
+++ b/back/src/views/modules/sys/log-operation.vue
@@ -31,7 +31,7 @@
         <el-form-item>
           <el-date-picker
             v-model="value1"
-            type="daterange"
+            type="datetimerange"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"

From 71b6b2edd77e728728fe4b99a34debc2fc7ef071 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Mon, 11 Jul 2022 18:53:42 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E6=97=A5=E5=BF=97bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/log-data-modification-log.vue | 29 +++++++++++++++++-
 back/src/views/modules/sys/log-operation.vue  | 30 +++++++++++++++++--
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/back/src/views/modules/sys/log-data-modification-log.vue b/back/src/views/modules/sys/log-data-modification-log.vue
index c28d66c5..d65b42f9 100644
--- a/back/src/views/modules/sys/log-data-modification-log.vue
+++ b/back/src/views/modules/sys/log-data-modification-log.vue
@@ -163,7 +163,13 @@
           width="150"
           align="center"
           :show-overflow-tooltip="true"
-        ></el-table-column>
+        >
+          <template slot-scope="scope">
+            <div class="blue-font-color" @click="copyFunction(scope.row)">
+              复制
+            </div>
+          </template>
+        </el-table-column>
       </el-table>
       <el-pagination
         :current-page="page"
@@ -221,6 +227,21 @@ export default {
     }
   },
   methods: {
+    copyFunction (row) {
+      var data = row.resultData
+      var oInput = document.createElement('input')
+      oInput.value = data
+      document.body.appendChild(oInput)
+      oInput.select()
+      document.execCommand('Copy')
+      oInput.className = 'oInput'
+      oInput.style.display = 'none'
+      this.$message({
+        type: 'success',
+        message: this.$t('复制成功')
+      })
+    },
+
     // 重置按钮
     resetFunction () {
       const params = {
@@ -299,3 +320,9 @@ export default {
   }
 }
 </script>
+<style scoped lang="scss">
+.blue-font-color:hover {
+  color: #0058e1;
+  cursor: pointer;
+}
+</style>
diff --git a/back/src/views/modules/sys/log-operation.vue b/back/src/views/modules/sys/log-operation.vue
index 3b70341b..c0b085ed 100644
--- a/back/src/views/modules/sys/log-operation.vue
+++ b/back/src/views/modules/sys/log-operation.vue
@@ -117,13 +117,18 @@
           :show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          prop="resultData"
           label="返回结果"
           header-align="center"
           width="150"
           align="center"
           :show-overflow-tooltip="true"
-        ></el-table-column>
+        >
+          <template slot-scope="scope">
+            <div class="blue-font-color" @click="copyFunction(scope.row)">
+              复制
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="requestTime"
           :label="$t('logOperation.requestTime')"
@@ -204,6 +209,21 @@ export default {
     }
   },
   methods: {
+    // 复制方法
+    copyFunction (row) {
+      var data = row.resultData
+      var oInput = document.createElement('input')
+      oInput.value = data
+      document.body.appendChild(oInput)
+      oInput.select()
+      document.execCommand('Copy')
+      oInput.className = 'oInput'
+      oInput.style.display = 'none'
+      this.$message({
+        type: 'success',
+        message: this.$t('复制成功')
+      })
+    },
     // 重置按钮
     resetFunction () {
       const params = {
@@ -260,3 +280,9 @@ export default {
   }
 }
 </script>
+<style scoped lang="scss">
+.blue-font-color:hover {
+  color: #0058e1;
+  cursor: pointer;
+}
+</style>

From ae22bbd063fea0628bc66b40f64ac1ad64e29848 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Mon, 11 Jul 2022 18:59:21 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E9=9A=90=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/sys/log-data-modification-log.vue | 5 +++--
 back/src/views/modules/sys/log-operation.vue             | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/back/src/views/modules/sys/log-data-modification-log.vue b/back/src/views/modules/sys/log-data-modification-log.vue
index d65b42f9..8f5f7c0c 100644
--- a/back/src/views/modules/sys/log-data-modification-log.vue
+++ b/back/src/views/modules/sys/log-data-modification-log.vue
@@ -70,11 +70,11 @@
         <el-form-item>
           <el-button @click="resetFunction()"> 重置 </el-button>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-button type="info" @click="exportHandle()">{{
             $t('export')
           }}</el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <el-table
         v-loading="dataListLoading"
@@ -227,6 +227,7 @@ export default {
     }
   },
   methods: {
+    // 复制方法
     copyFunction (row) {
       var data = row.resultData
       var oInput = document.createElement('input')
diff --git a/back/src/views/modules/sys/log-operation.vue b/back/src/views/modules/sys/log-operation.vue
index c0b085ed..3a6cafa8 100644
--- a/back/src/views/modules/sys/log-operation.vue
+++ b/back/src/views/modules/sys/log-operation.vue
@@ -50,11 +50,11 @@
         <el-form-item>
           <el-button @click="resetFunction()"> 重置 </el-button>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-button type="info" @click="exportHandle()">{{
             $t('export')
           }}</el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <el-table
         v-loading="dataListLoading"

From b7b0a14b8683d6b2c40a98d59bc339f1fda42024 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Mon, 11 Jul 2022 19:12:53 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=B1=BB=E7=AE=97?=
 =?UTF-8?q?=E6=B3=95=E8=AF=95=E7=94=A8+=E5=8D=95=E7=82=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/public/index.html                        |  6 +--
 front/public/index.html                       |  8 ++--
 front/src/api/file.js                         |  8 +++-
 front/src/utils/request.js                    | 34 +++++++++-----
 front/src/vab/plugins/permissions.js          |  6 ++-
 .../components/Algorithm/TestOfWords.vue      | 47 ++++++++++++-------
 front/src/views/home/infrastructurePage.vue   |  2 +-
 7 files changed, 69 insertions(+), 42 deletions(-)

diff --git a/back/public/index.html b/back/public/index.html
index 465e77bf..1d32cc9d 100644
--- a/back/public/index.html
+++ b/back/public/index.html
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-11 10:11:40
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-11 12:09:13
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-11 18:56:36
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -44,7 +44,7 @@
       // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin';
     // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
     // window.SITE_CONFIG['apiURL'] = 'http://10.16.5.35:8888/renren-admin';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';
     window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
     // window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin';
     // WebSocket地址
diff --git a/front/public/index.html b/front/public/index.html
index cacc03dd..e408d9d5 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-09 15:05:57
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-11 18:10:24
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -49,7 +49,7 @@
     window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
     window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
     window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 穿透版本
     // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
@@ -126,4 +126,4 @@
   <!-- built files will be auto injected -->
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/front/src/api/file.js b/front/src/api/file.js
index 96f3d1ea..5848b83a 100644
--- a/front/src/api/file.js
+++ b/front/src/api/file.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-20 17:16:35
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-22 14:57:16
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-11 19:02:33
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -46,6 +46,10 @@ export function correct(params) {
 export function paddleocr(params) {
   return axios.post('http://15.72.183.90:7008/paddleocr', params, config2)
 }
+// 算法总接口
+export function algo(params) {
+  return axios.post('http://15.72.184.10:8888/api/algo', params, config2)
+}
 
 // 能力云图-数据资源
 export function count() {
diff --git a/front/src/utils/request.js b/front/src/utils/request.js
index f4fe2a90..0f02346e 100644
--- a/front/src/utils/request.js
+++ b/front/src/utils/request.js
@@ -29,12 +29,13 @@ const handleCode = (code, msg, res) => {
       // message.error(msg || '登录失效')
 
       store.dispatch('user/resetAll').catch(() => {})
-      if (res.token) {
-        console.log('存在token信息', res.token)
-      setAccessToken(res.token)
-      const token = getAccessToken()
-      console.log('验证token信息', token)
-      }
+      debugger
+      // if (res.token) {
+      //   console.log('存在token信息', res.token)
+      // setAccessToken(res.token)
+      // const token = getAccessToken()
+      // console.log('验证token信息', token)
+      // }
 
       // // location.reload()
       // if (redirect) {
@@ -71,8 +72,10 @@ const instance = axios.create({
  */
 instance.interceptors.request.use(
   (config) => {
-    if (store.getters['user/accessToken'])
-      config.headers[tokenName] = store.getters['user/accessToken']
+    debugger
+    const token = getAccessToken()
+    if (token)
+      config.headers[tokenName] = token
     if (
       config.data &&
       config.headers['Content-Type'] ===
@@ -101,10 +104,12 @@ instance.interceptors.response.use(
     console.log('接口返回REDIRECT', response.headers.redirect)
     response['Access-Control-Expose-Headers'] = 'redirect'
     const { code, message } = response.data
-    if (response.headers.token) {
+    debugger
+    if (code=='0' && response.headers.token) {
       setAccessToken(response.headers.token)
     } else {
-      if (response.headers.redirect) {
+      const token = getAccessToken()
+      if (response.headers.redirect && !token) {
         // window.location.href = response.headers.redirect
         window.location.replace(response.headers.redirect)
         return
@@ -154,16 +159,21 @@ instance.interceptors.response.use(
     // }
   },
   (error) => {
+    debugger
     console.log('接口error', error)
     if (loadingInstance) loadingInstance.close()
+
     const { response, message } = error
-    if (error.response && error.response.data) {
+    if (error.response) {
       console.log('接口返回', response)
       console.log('接口返回headers', response.headers)
       console.log('接口返回REDIRECT', response.headers.redirect)
+      // if (response.headers.token) {
+      //   setAccessToken(response.headers.token)
+      // }
       if (response.headers.redirect) {
         window.location.replace(response.headers.redirect)
-        return Promise.reject(error)
+        // return Promise.resolve()
       }
       const { status, data } = response
 
diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js
index 8e495192..6139bd4b 100644
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 17:23:11
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-08 18:55:28
+ * @LastEditTime: 2022-07-11 16:39:36
  * @Description: 告诉大家这是什么
  */
 /**
@@ -33,8 +33,9 @@
    if (!loginInterception) hasToken = true
    console.log('hasToken存在巨大问题', hasToken)
    if (hasToken) {
-     setAccessToken(hasToken)
+    //  setAccessToken(hasToken)
      await store.dispatch('user/getUserInfo')
+     debugger
      next()
    } else {
      let accessRoutes = []
@@ -45,6 +46,7 @@
      if (routesWhiteList.indexOf(to.path) !== -1) {
        next()
      } else {
+      // 这里是一个单点登录的入口
       getUserInfo().then(res=>{
         console.log(res)
         router.replace('/home')
diff --git a/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue b/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue
index 6cee07eb..4541c9a5 100644
--- a/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue
+++ b/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue
@@ -26,9 +26,9 @@
             <div class="bg bg4"></div>
             <div class="top-left">
               <div class="text">
-                <p>错误内容： {{ errorWord }}</p>
-                <p>错误位置： {{ errorWordIndex }}</p>
-                <p>识别内容： {{ errorWordContent }}</p>
+                <p>返回结果： {{ errorWord }}</p>
+                <!-- <p>错误位置： {{ errorWordIndex }}</p>
+                <p>识别内容： {{ errorWordContent }}</p> -->
                 <span></span>
               </div>
             </div>
@@ -43,26 +43,37 @@
 </template>
 <script setup>
   import { ref } from 'vue'
-  import { correct } from '@/api/file'
+  import { correct,algo } from '@/api/file'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  // const keyId = router.currentRoute.value.query.id
   const wordValue = ref('')
+  wordValue.value = router.currentRoute.value.query.data
   const errorWord = ref('')
-  const errorWordIndex = ref('')
-  const errorWordContent = ref('')
+  // const errorWordIndex = ref('')
+  // const errorWordContent = ref('')
   const correctWord = () => {
     const param = {
-      sentence: wordValue.value,
+      // sentence: wordValue.value,
+      company: router.currentRoute.value.query.company,
+      algorithmName: router.currentRoute.value.query.algorithmName,
+      data: wordValue.value,
+      type: router.currentRoute.value.query.type
     }
-    correct(param).then((res) => {
-      // wordContent.value = res.data.data
-      Object.keys(res.data.data).forEach((key) => {
-        console.log(key)
-        errorWord.value = key
-      })
-      Object.values(res.data.data).forEach((val) => {
-        console.log(val)
-        errorWordIndex.value = val.ix
-        errorWordContent.value = val.value
-      })
+    // correct(param).then((res) => {
+    //   // wordContent.value = res.data.data
+    //   Object.keys(res.data.data).forEach((key) => {
+    //     console.log(key)
+    //     errorWord.value = key
+    //   })
+    //   Object.values(res.data.data).forEach((val) => {
+    //     console.log(val)
+    //     errorWordIndex.value = val.ix
+    //     errorWordContent.value = val.value
+    //   })
+    // })
+    algo(param).then(res=>{
+      errorWord.value = res.data.text_data
     })
   }
 </script>
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index f58fb5c9..a7de5707 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -138,7 +138,7 @@
     muted: false, //静音
     webFullScreen: false,
     speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-    autoPlay: true, //自动播放
+    autoPlay: false, //自动播放
     loop: false, //循环播放
     mirror: false, //镜像画面
     ligthOff: false, //关灯模式