From 1cba78f8e1b2d0512120fc316628883b24c0db04 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Tue, 13 Sep 2022 09:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E8=83=BD=E5=8A=9B=E9=9B=86=E5=B8=82=E8=AF=A6=E6=83=85=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/App.vue                             |  100 +-
 front/src/assets/detailsAll/back.png          |  Bin 0 -> 3298 bytes
 .../LayerService/LayerServiceInformation.vue  |  405 +++----
 front/src/views/home/DetailsPageconetent.vue  | 1012 ++++++-----------
 .../components/integrationServiceOrder.vue    |   37 +-
 .../home/components/searchResultList.vue      |  447 +++-----
 front/src/views/home/detailBack.vue           |   34 +
 front/src/views/home/details.vue              |    4 +
 front/src/views/home/infrastructurePage.vue   |    6 +-
 front/src/views/home/integrationServices.vue  |  228 ++--
 front/src/views/home/packagingDetails.vue     |    7 +-
 11 files changed, 945 insertions(+), 1335 deletions(-)
 create mode 100644 front/src/assets/detailsAll/back.png
 create mode 100644 front/src/views/home/detailBack.vue

diff --git a/front/src/App.vue b/front/src/App.vue
index ce2073f2..82c2265f 100644
--- a/front/src/App.vue
+++ b/front/src/App.vue
@@ -13,62 +13,56 @@
   </div>
 </template>
 <script setup>
-  import zhCN from 'ant-design-vue/es/locale/zh_CN'
-  import Cookies from 'js-cookie'
-  import { onBeforeUnmount } from 'vue'
-  import { useRouter } from 'vue-router'
-  import mybus from '@/myplugins/mybus'
-  const router = useRouter()
+import zhCN from 'ant-design-vue/es/locale/zh_CN'
+import Cookies from 'js-cookie'
+import { onBeforeUnmount } from 'vue'
+import { useRouter } from 'vue-router'
+import mybus from '@/myplugins/mybus'
+const router = useRouter()
 
-  // export default {
-  //   name: 'App',
-  //   data() {
-  //     return {
-  //       ,
-  //     }
-  //   },
-  // }
-  const locale = zhCN
-  const token = Cookies.get('ucsToken')
-  console.log('token=================>', token)
-  let ws = new WebSocket(
+const locale = zhCN
+const token = Cookies.get('ucsToken')
+console.log('token=================>', token)
+let ws = new WebSocket(
+  `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
+)
+// ws.send()给服务器发送信息
+// 服务器每次返回信息都会执行一次onmessage方法
+ws.onmessage = function (e) {
+  console.log('WebSocket服务器返回的信息: ' + e.data)
+  mybus.emit('getMynotice')
+  // 判断当前路由是否是消息中心
+  if (router.currentRoute.value.name === 'mynoticeView') {
+    mybus.emit('noticeListInit')
+  }
+}
+ws.onerror = function (e) {
+  console.log('WebSocket连接异常============================>', e)
+  ws = new WebSocket(
     `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
   )
-  // ws.send()给服务器发送信息
-  // 服务器每次返回信息都会执行一次onmessage方法
-  ws.onmessage = function (e) {
-    console.log('WebSocket服务器返回的信息: ' + e.data)
-    mybus.emit('getMynotice')
-    // 判断当前路由是否是消息中心
-    if (router.currentRoute.value.name === 'mynoticeView') {
-      mybus.emit('noticeListInit')
-    }
-  }
-  ws.onerror = function (e) {
-    console.log('WebSocket连接异常============================>', e)
-    ws = new WebSocket(
-      `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
-    )
-  }
-  ws.onclose = function (e) {
-    console.log('WebSocket连接断开============================>', e)
-  }
-  onBeforeUnmount(() => {
-    // 4.卸载前, 关闭链接
-    ws.close()
-  })
+}
+ws.onclose = function (e) {
+  console.log('WebSocket连接断开============================>', e)
+}
+onBeforeUnmount(() => {
+  // 4.卸载前, 关闭链接
+  ws.close()
+})
 </script>
 <style lang="less">
-  @import '~@/vab/styles/vab.less';
-  #vue-admin-beautiful {
-    max-width: 1920px;
-    // max-height: 1080px;
-    margin: auto;
-    height: 100%;
-    position: relative;
-    background-color: #fff;
-  }
-  body {
-    font-size: 0.14rem;
-  }
+@import '~@/vab/styles/vab.less';
+
+#vue-admin-beautiful {
+  max-width: 1920px;
+  // max-height: 1080px;
+  margin: auto;
+  height: 100%;
+  position: relative;
+  background-color: #fff;
+}
+
+body {
+  font-size: 0.14rem;
+}
 </style>
diff --git a/front/src/assets/detailsAll/back.png b/front/src/assets/detailsAll/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ba8051119f121e5171a7608f551d51a5b7694e3
GIT binary patch
literal 3298
zcmV<83?1`{P)<h;3K|Lk000e1NJLTq002Y)002Y?1^@s6I1`hy00004b3#c}2nYxW
zd<bNS000b`Nkl<ZcwX(B2~ZSQ8h{@&3^0J)D4q~S;~I^(@xplDM9Qmj7)i43dL$7y
zao389#3LGajd2r?HM+PSQL}N42cE$*Qsb_!h^1>vjdw&40YMn<+4oQ8pZe#~Gt=GE
z=x&v-s;j4ax?jKd^?$wpz4l_yiUR?!XFMDUJZT_mpJ#beFHUU(<+e|(pB}q=HiaMp
zsWU+C8YQ>m;&oWB)ZW>DSO<2N?xoJb^_qjx5{UTr;TX^9Y`^gw{ZDLz2m+3AtFcj|
z=R}ZdU!wIst$@(CPCJbtU{8O;HF!+hL194W;h65lb0QdzCB{=Au0TMC^|p?SzbPOo
z2|*A50Jmx<zbO<^wG>N>CqP6P*h%a>z<|x$wznReruQGzG}zeH&)d79pTVoXw@%l<
zpwrcdmRHu)<W|+x<djufa?7f!vTx>>oaw#l`1kxTfPq_;a7>{g9M$$k4G<}*kb(dp
zyhpTc7?d)g&7j!uz#+kYhQ2zTm%ozNR#RgsDJ-izaV@X-;DV!<)AwD>F5>qC6x=8*
zR4FMNBkQqBfjE;2lmsgTz8QwS5EZ;8q4QKO4euz0;H>2U=T2cs>ifGg*Y5q#{X!5b
z2{<S*s-#5;5DJ5;2STudcp)+<;2&@Icq=xd-c-HLD@@jFQFu{xjU}H;%&IXPOq(t}
zC@PTvBdU>X6_N`?3I>%51An5=+OeJ6BzB2j>Fcd;sj!c#E-$OBzOvf%)07YQWL@PI
zR0v?G5teOi<p6O7!wLenvoi*a?bJAQv6q*Zud3duyb09k{Jnw&omU*$Zi7O>D25^z
z2*wuZIRJze#=w^0A=}>Q^=U+)?<*?%q{(d$9+&SN{?)PBXYUn*(FG{5QI90c(7FR6
z23cq?tWvRVT$i>JJ4dhg@zyodq*oqR0xGmE^XBw-{(kNPuc};7A<+X#KFt*n8g`>w
z1t0*!*Uyjn=FCml9OP%{?O{JOz5P*H#mT5eyA#XGSeb;Rps{soWZeP55E~6Bs0r8z
zzgu%g%xM<t{~JwvqfuqI3rg2Tf3oirUL8Q8l7cpcx@3o^Is+m~ht;JbjEwjCC-jU7
z|3aho*GV;|n-6C6TzPz_1QeH2;tB|r4us)5t!MMbUnX=q!h@}Pb<z`!D&^j%c+|#|
zacP%wAK0V>CB>zbxB^nkZt#kYcjk^<&?Ln8rbg|q(`s(zm#mLjydPA@Y=c5Q4;opw
zDubQ{fH<hiq?clvd^NVqam`|lph)f*c^gX~)d?7j#Zvz6uCsmDWZb-KgF<5z>UHeT
zmy!_CkXpS8-~4}09`R|TVE^%&v_7;EV~NWcE6ir>Zy#z>rBo$%3(cFGE=o(`|CQS8
z366iL>No{Lr2{+*+79E#LtDqD3~ZOq&%t@miZO_>R~IlA#-S8&AgM{7)#u`FkdlSz
zmxrYsx^zV_u#&b!ln@$`qPqBjbYy-o@U0GwLV>hrC6JHzCM;nrAoQ1d>KF(-f`|6=
zJ1$S(U{f1##Z*chT(A@nYD}#$2LLHpIBH{v(WjS3G`x7#6aUCq1PN@P0FXj+MMh}y
z?nI(C;BhdlcQCHbfKX#<>>nFZKYen)(_UUy6;fYD&15XLo8$dY0EorHDr1)H?sz-D
z0<1TB9F!85Krqi?579w7ewfyGZ13ig+ybgB-rOz^oyOSnJ!@A`&eIuLJWE)Z!?*jt
zsL<nll@D@$+rCTLlSghib;u?qAR*|2X`tqibr<aico!o8xiV|W%$AWsQ&qPz?sdkx
zCCI=1MkZr>mUE$oc573vJ}6q#YU!ar5w)Q)iQSG+l|gq4QeqF&`R{=2l#!oB)ibIa
z-UEo<ukr~Gs8&I#;F5jr0Ar?adEOlyf@kG^v3XC!`Dq{6fPmUyOhQwRwIl=$s@>fJ
zkivxtTZ4^;&WfAVrVnF-r*KCN8mO||JkMC#3O+=GFhYHKWUl;oNb;`N2oR}I-X#$5
zE}$|2<|U&K`Wf^wikjoi9aPe0MYlM;xQGu&QfKgq2(W|d3eT0?G=8*mD8CzWuplAm
zejNfdDV3of2Br)Gs+NvDqt|-{DsD>S){Kq%J;$oSIPjm}F?MR3;wIn?)zy~A-m`Xe
zwE+QfqiF%Vr*Q?uE+MLcKx@FW4B={Hfa*LbU`MvjVJzpms!B8kQo4BbL8Fg8T2)Kn
zrdB-|i~pVK+wC{r;+er6FnCoyg=?;;zU4n#Qe_}OlO-Y60UfAJ!NP>ELyU$_s(S<;
zrprj~ZMaR-2}2<>&k1LI!&oq%&1}$uu|}=<7#lpkL@^gLw(eaXc!T;YD~0CDbD_z*
z-cX}5IH<F$%>9)3FB;VI8?3Ae5?A+`z*yIK{s+-iFqqIuECC^mbsElCYo4kNil|-5
zZXO?A`<LRT<P?`3j+(!Bx($dTqv|lq1qrz^dw5DrSOAZ%G$;cmG1h^w6@k!4B>aJ~
z7F`@4difM%`;})e`Na9w=N9juPk_jFyEHJfMyf}ryga&JZ2hGg;NUrXUL}lanzj3-
zI#)n++~IZO@nBD$g2BM<!7au%anGf&9J`h~tN&k4K#mnW3?0va+jSbLf-GZ(-5$F4
zjSZ`Rbn<|c9uMwlC&ta=P};f%V!fU>sSj6uut5L?Y|d&fWeN%m?s~00+S_#FVIBeE
zHgtzah=V)39eKE5)cP=gAMP$RDiFOUe#XNiZYa0Tbzdn0gaP1R!4$|Z`K1-6@Ois|
zA`Qyi4(@EP!wSV=_|K06Oz-!b*gZO8w)|$uxDvdHg?qee@O*9xc%Ro6GWKHzWBZiZ
zkkhyF7Weq_*d_u*GAKg;v?XFb)t(@FyIXX0>iDiag~%1>X_YZNFv~j3z04T}EwEVL
z+<v<Mma}*7*wh6luVg2Ps2zbpo?UIOeKah&MR*_|x;~`>hWH*&jVeeB{Pghg_Shu{
zxM<ZH!ypj1DMYCWDr*{XeEY^tw!YqDkE(Hv77QV%Q;-Va3u{Woe{G82ne{VFLtxh3
z<%E^1X$W+`_Gt)!a&hM1B)(eee{xP&WPbi$;i`_yzh7g6fde|pJP6+F3<ydI8dr3|
z#y%~=BGZ4{Z?8eGtCQtYS_l%<QCU?}(0bW{!PoPwvtST+U{VNxIGxT^JeA2SGww+2
zK4?tarl0c=L17w9tM0m~$HHp9&AOX3ev9ddpem}SGST~pwgjXE4J@Ch88o>=qYyF(
zc|x6)@fe$`thK?waSN)7>d9_+G!4{fo)toRWA4YVtcncu^=z(2MhBH#a_^Bjz45{{
zJ~ptciMU2Y)p7_aDRG$i1|YqfhejNp)OU-&kGJ|<iIU#Bxwg2x@=E9BhbCTqXofYc
z0D{7R{G-$wR)<<$1zGqX#wB!&V^^Q<%|gS{ejWFDcz`dY=bl>0eO#6?D)rQ?)3*yA
zO2EKX&va5sGRx#H>cs!4>fj_6Lh%dsH~5>T^-ua$RM1mdH}Ydn(bgAN99mXcX_pGR
zz6>OTF3*IQ<}~Hz4hU5pXOe>9z2Ct}aq)wnk4n~bRO~|LYWU3lfy>zoMy6)$<Cj6e
zg(^~K%QCS!beV*>vdFqblWzdV_q|@R&n3mRoY*`pAf7L~a*_-5OtbiMsfz3QC42w;
z!_`eIGp^mR!NBQB5r$j4L0cn7LQqO@kLp8LCfZjt+rapYY2UEHq9HFPwu-2iz`=l5
z^0;si<|}!{yJjD}u<5%C**p(moqeMqKt03-F_J5VoHa%+5LZwr7?22rV_ogsv1v%q
z{DE!aIyDLF7ZvE+L$B8<`aFb>N6hz&%1oKrg~#R{zIZb8P9dyRhE8K#fqM!<@se(;
z3QFD_^*l6itMz$^4Gg+!Tmh~BX2MG^w`&;OKG4U|z~5INVf5BV@Q($o+2r!7>O3>w
zO3SPB9#>T6T*@uZ8n@AOg8u~_L{EVor_vyPJ0nVk?0E|%5+Xtr?FzLmA|U*#3ikAK
zGpqyKA%1X(ZyJZ{^ur-~j!J}T7*q|ENC^c)JLK#WGyGrx_w+jWExr_I-`mkIr^Mg%
zV?|ku{I#$lQgw(bglZ&qntqH(|3jd(ZtM{K2uSKfM5%A>WPcY^S3pE5qY{H~C?xS5
z1qyZ14x#ANy?9Pa8f4oGS8rI2%82(+(HFruJC;&g3Wavq*>7xzM<CRC89CrYFrv#A
zr9#Svh|(ge0`0seAnFnbg(h}Z3YIg-t~#wL1Xm4~BLSXVqsGlsY4POQvhG#eKv|Xl
gKVI|<i160_3wu=Sfy$$F`v3p{07*qoM6N<$f>(D%!2kdN

literal 0
HcmV?d00001

diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue
index a0686593..e119baca 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue
@@ -44,214 +44,227 @@
 </template>
 
 <script setup>
-  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
-  import { ref, defineProps, watch } from 'vue'
-  const iconImg = require('@/assets/detailsAll/layer-service/layer-icon.png')
-  const dataFromLeft = ref({
-    content: [
-      {
-        type: '服务类型',
-        values: '',
-      },
-      {
-        type: '覆盖区域',
-        values: '',
-      },
-      {
-        type: '切片策略',
-        values: '',
-      },
-    ],
-  })
-  const dataFromCenter = ref({
-    content: [
-      {
-        type: '坐标系',
-        values: '',
-      },
-      {
-        type: '切片尺寸',
-        values: '',
-      },
-      {
-        type: '最小级别',
-        values: '',
-      },
-    ],
-  })
-  const dataFromRight = ref({
-    content: [
-      {
-        type: '图层名称',
-        values: '',
-      },
-      {
-        type: '最大级别',
-        values: '',
-      },
-    ],
-  })
-  //数据初始化
-  const props = defineProps({
-    dataList: { type: Object, default: null },
-  })
-  const flag = ref(true)
-  if (props.dataList.infoList) {
-    let obj = props.dataList.infoList.filter(
-      (item) =>
-        item.attrType === '服务类型' ||
-        item.attrType === '覆盖区域' ||
-        item.attrType === '切片策略' ||
-        item.attrType === '坐标系' ||
-        item.attrType === '切片尺寸' ||
-        item.attrType === '最小级别' ||
-        item.attrType === '数据范围' ||
-        item.attrType === '图层类型' ||
-        item.attrType === '最大级别'
-    )[0]
-    if (!obj) {
-      flag.value = false
-    } else {
-      // dataFrom.value.content[0].link.value = props.dataList.apiUrl
-      // dataFrom.value.content[0].facilitator.value = props.dataList.deptContacts
-      console.log('dataList', props.dataList)
-      props.dataList.infoList.map((item) => {
-        if (item.attrType === '服务类型') {
-          dataFromLeft.value.content[0].values = item.attrValue || '123'
-        } else if (item.attrType === '覆盖区域') {
-          dataFromLeft.value.content[1].values = item.attrValue || '--'
-        } else if (item.attrType === '切片策略') {
-          dataFromLeft.value.content[2].values = item.attrValue || '--'
-        } else if (item.attrType === '坐标系') {
-          dataFromCenter.value.content[0].values = item.attrValue || '--'
-        } else if (item.attrType === '切片尺寸') {
-          dataFromCenter.value.content[1].values = item.attrValue || '--'
-        } else if (item.attrType === '最小级别') {
-          dataFromCenter.value.content[2].values = item.attrValue || '--'
-        } else if (item.attrType === '数据范围') {
-          dataFromRight.value.content[0].values = item.attrValue || '--'
-        } else if (item.attrType === '图层类型') {
-          dataFromRight.value.content[1].values = item.attrValue || '--'
-        } else if (item.attrType === '最大级别') {
-          dataFromRight.value.content[2].values = item.attrValue || '--'
-        }
-      })
+import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
+import { ref, defineProps, watch } from 'vue'
+const iconImg = require('@/assets/detailsAll/layer-service/layer-icon.png')
+const dataFromLeft = ref({
+  content: [
+    {
+      type: '服务类型',
+      values: '',
+    },
+    {
+      type: '覆盖区域',
+      values: '',
+    },
+    {
+      type: '切片策略',
+      values: '',
+    },
+  ],
+})
+const dataFromCenter = ref({
+  content: [
+    {
+      type: '坐标系',
+      values: '',
+    },
+    {
+      type: '切片尺寸',
+      values: '',
+    },
+    {
+      type: '最小级别',
+      values: '',
+    },
+  ],
+})
+const dataFromRight = ref({
+  content: [
+    {
+      type: '图层名称',
+      values: '',
+    },
+    {
+      type: '最大级别',
+      values: '',
+    },
+  ],
+})
+//数据初始化
+const props = defineProps({
+  dataList: { type: Object, default: null },
+})
+const flag = ref(true)
+if (props.dataList.infoList) {
+  let obj = props.dataList.infoList.filter(
+    (item) =>
+      item.attrType === '服务类型' ||
+      item.attrType === '覆盖区域' ||
+      item.attrType === '切片策略' ||
+      item.attrType === '坐标系' ||
+      item.attrType === '切片尺寸' ||
+      item.attrType === '最小级别' ||
+      item.attrType === '数据范围' ||
+      item.attrType === '图层类型' ||
+      item.attrType === '最大级别'
+  )[0]
+  if (!obj) {
+    flag.value = false
+  } else {
+    // dataFrom.value.content[0].link.value = props.dataList.apiUrl
+    // dataFrom.value.content[0].facilitator.value = props.dataList.deptContacts
+    console.log('dataList', props.dataList)
+    props.dataList.infoList.map((item) => {
+      handleInfoList(item)
+    })
+  }
+}
+const handleInfoList = (item) => {
+  if (item.attrType === '服务类型') {
+    dataFromLeft.value.content[0].values = item.attrValue || '123'
+  } else if (item.attrType === '覆盖区域') {
+    dataFromLeft.value.content[1].values = item.attrValue || '--'
+  } else if (item.attrType === '切片策略') {
+    dataFromLeft.value.content[2].values = item.attrValue || '--'
+  } else if (item.attrType === '坐标系') {
+    dataFromCenter.value.content[0].values = item.attrValue || '--'
+  } else if (item.attrType === '切片尺寸') {
+    dataFromCenter.value.content[1].values = item.attrValue || '--'
+  } else if (item.attrType === '最小级别') {
+    dataFromCenter.value.content[2].values = item.attrValue || '--'
+  } else if (item.attrType === '数据范围') {
+    dataFromRight.value.content[0].values = item.attrValue || '--'
+  } else if (item.attrType === '图层类型') {
+    dataFromRight.value.content[1].values = item.attrValue || '--'
+  } else if (item.attrType === '最大级别') {
+    if (dataFromRight.value.content && dataFromRight.value.content[2]) {
+      dataFromRight.value.content[2].values = item.attrValue || '--'
     }
   }
-  watch(
-    () => props.dataList,
-    (val) => {
-      if (val) {
-        let obj = val.infoList.filter(
-          (item) =>
-            item.attrType === '服务类型' ||
-            item.attrType === '覆盖区域' ||
-            item.attrType === '切片策略' ||
-            item.attrType === '坐标系' ||
-            item.attrType === '切片尺寸' ||
-            item.attrType === '最小级别' ||
-            item.attrType === '数据范围' ||
-            item.attrType === '图层类型' ||
-            item.attrType === '最大级别'
-        )[0]
-        if (!obj) {
-          flag.value = false
-        } else {
-          // dataFrom.value.content[0].link.value = val.apiUrl
-          // dataFrom.value.content[0].facilitator.value = val.deptContacts
-          console.log('dataList', val)
-          val.infoList.map((item) => {
-            if (item.attrType === '服务类型') {
-              dataFromLeft.value.content[0].values = item.attrValue || '123'
-            } else if (item.attrType === '覆盖区域') {
-              dataFromLeft.value.content[1].values = item.attrValue || '--'
-            } else if (item.attrType === '切片策略') {
-              dataFromLeft.value.content[2].values = item.attrValue || '--'
-            } else if (item.attrType === '坐标系') {
-              dataFromCenter.value.content[0].values = item.attrValue || '--'
-            } else if (item.attrType === '切片尺寸') {
-              dataFromCenter.value.content[1].values = item.attrValue || '--'
-            } else if (item.attrType === '最小级别') {
-              dataFromCenter.value.content[2].values = item.attrValue || '--'
-            } else if (item.attrType === '数据范围') {
-              dataFromRight.value.content[0].values = item.attrValue || '--'
-            } else if (item.attrType === '图层类型') {
-              dataFromRight.value.content[1].values = item.attrValue || '--'
-            } else if (item.attrType === '最大级别') {
-              dataFromRight.value.content[2].values = item.attrValue || '--'
-            }
-          })
-        }
+}
+watch(
+  () => props.dataList,
+  (val) => {
+    if (val) {
+      let obj = val.infoList.filter(
+        (item) =>
+          item.attrType === '服务类型' ||
+          item.attrType === '覆盖区域' ||
+          item.attrType === '切片策略' ||
+          item.attrType === '坐标系' ||
+          item.attrType === '切片尺寸' ||
+          item.attrType === '最小级别' ||
+          item.attrType === '数据范围' ||
+          item.attrType === '图层类型' ||
+          item.attrType === '最大级别'
+      )[0]
+      if (!obj) {
+        flag.value = false
+      } else {
+        console.log('dataList', val)
+        val.infoList.map((item) => {
+          handleInfoList(item)
+          // if (item.attrType === '服务类型') {
+          //   dataFromLeft.value.content[0].values = item.attrValue || '123'
+          // } else if (item.attrType === '覆盖区域') {
+          //   dataFromLeft.value.content[1].values = item.attrValue || '--'
+          // } else if (item.attrType === '切片策略') {
+          //   dataFromLeft.value.content[2].values = item.attrValue || '--'
+          // } else if (item.attrType === '坐标系') {
+          //   dataFromCenter.value.content[0].values = item.attrValue || '--'
+          // } else if (item.attrType === '切片尺寸') {
+          //   dataFromCenter.value.content[1].values = item.attrValue || '--'
+          // } else if (item.attrType === '最小级别') {
+          //   dataFromCenter.value.content[2].values = item.attrValue || '--'
+          // } else if (item.attrType === '数据范围') {
+          //   dataFromRight.value.content[0].values = item.attrValue || '--'
+          // } else if (item.attrType === '图层类型') {
+          //   dataFromRight.value.content[1].values = item.attrValue || '--'
+          // } else if (item.attrType === '最大级别') {
+          //   if (dataFromRight.value.content && dataFromRight.value.content[2]) {
+          //     dataFromRight.value.content[2].values = item.attrValue || '--'
+          //   }
+          // }
+        })
       }
     }
-  )
+  }
+)
 </script>
 
 <style lang="less" scoped>
-  .usage-mode {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 0.8rem 0;
-    .content {
-      margin-top: 0.3rem;
-      display: flex;
-      .content-left {
-        height: 2.8rem;
-        width: 13rem;
-        background: url('~@/assets/detailsAll/layer-service/layer-bg.png');
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-        border-radius: 0.1rem;
-        box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
-        display: flex;
-        align-items: center;
-        padding: 0 0.35rem;
+.usage-mode {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 0.8rem 0;
 
-        .content-left-content {
-          width: 100%;
-          font-size: 0.2rem;
-          color: rgba(33, 41, 86, 0.8);
-          line-height: 0.2rem;
+  .content {
+    margin-top: 0.3rem;
+    display: flex;
+
+    .content-left {
+      height: 2.8rem;
+      width: 13rem;
+      background: url('~@/assets/detailsAll/layer-service/layer-bg.png');
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
+      border-radius: 0.1rem;
+      box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
+      display: flex;
+      align-items: center;
+      padding: 0 0.35rem;
+
+      .content-left-content {
+        width: 100%;
+        font-size: 0.2rem;
+        color: rgba(33, 41, 86, 0.8);
+        line-height: 0.2rem;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        ul {
+          padding: 0;
+          margin: 0;
+        }
+
+        ul li {
+          list-style: none;
           display: flex;
-          justify-content: space-between;
           align-items: center;
-          ul {
-            padding: 0;
-            margin: 0;
-          }
-          ul li {
-            list-style: none;
-            display: flex;
-            align-items: center;
-            margin-bottom: 0.3rem;
-            line-height: 0.25rem;
-          }
-          img {
-            margin: 0 0.2rem 0 0;
-            width: 0.15rem;
-            height: 0.15rem;
-          }
-          span {
-            font-size: 0.2rem;
-            color: #666666;
-            display: block;
-            margin-right: 0.5rem;
-            width: 120px;
-          }
-          p {
-            width: 2rem;
-            margin-bottom: 0;
-            font-size: 0.2rem;
-            color: #333333;
-            display: -webkit-box;
-            overflow: hidden;
-            -webkit-line-clamp: 1;
-            -webkit-box-orient: vertical;
-            word-break: break-all;
-          }
+          margin-bottom: 0.3rem;
+          line-height: 0.25rem;
+        }
+
+        img {
+          margin: 0 0.2rem 0 0;
+          width: 0.15rem;
+          height: 0.15rem;
+        }
+
+        span {
+          font-size: 0.2rem;
+          color: #666666;
+          display: block;
+          margin-right: 0.5rem;
+          width: 120px;
+        }
+
+        p {
+          width: 2rem;
+          margin-bottom: 0;
+          font-size: 0.2rem;
+          color: #333333;
+          display: -webkit-box;
+          overflow: hidden;
+          -webkit-line-clamp: 1;
+          -webkit-box-orient: vertical;
+          word-break: break-all;
         }
       }
     }
   }
+}
 </style>
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index f7cc45a0..f1d89e99 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -12,55 +12,32 @@
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
-            v-model:value="searchValue"
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources2"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button
-            class="button-reset"
-            style="margin-left: 0.1rem"
-            @click="globalSearch()"
-          >
+          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
             全局搜索
           </button>
-          <button
-            v-if="Cardsname == '应用资源'"
-            class="button-reset"
-            @click="applyAll()"
-            style="margin-left: 0.1rem"
-          >
+          <button v-if="Cardsname == '应用资源'" class="button-reset" @click="applyAll()" style="margin-left: 0.1rem">
             全部申请
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
       <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 v-if="globalData.data.length > 0">
             {{
-              item.name +
-              '(' +
-              (globalData.data.filter((val) => val.type === item.name)[0]
-                .count || '0') +
-              ')'
+            item.name +
+            '(' +
+            (globalData.data.filter((val) => val.type === item.name)[0]
+            .count || '0') +
+            ')'
             }}
           </span>
           <span v-else>
@@ -69,111 +46,45 @@
         </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"
-              v-if="Cardsname == '组件服务' || Cardsname == '应用资源'"
-            >
-              <span class="top-content-title">共享条件</span>
-              <div class="leixingsumfather">
-                <div class="leixingsum">
-                  <a-checkable-tag
-                    :checked="tagFlag == '申请'"
-                    @change="() => chagneTag('申请')"
-                  >
-                    申请
-                  </a-checkable-tag>
-                </div>
-                <div class="leixingsum">
-                  <a-checkable-tag
-                    :checked="tagFlag == '免批申请'"
-                    @change="() => chagneTag('免批申请')"
-                  >
-                    免批
-                  </a-checkable-tag>
-                </div>
-              </div>
-            </div> -->
           </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" :resourceList="resourceList"
+        :key="listKey2" :resourceTotal="resourceTotal" :select-cardsname="Cardsname"
+        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
       <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>
@@ -181,47 +92,29 @@
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
-            v-model:value="searchValue"
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources2"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button
-            class="button-reset"
-            style="margin-left: 0.1rem"
-            @click="globalSearch()"
-          >
+          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
             全局搜索
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
       <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 v-if="globalData.data.length > 0">
             {{
-              item.name +
-              '(' +
-              (globalData.data.filter((val) => val.type === item.name)[0]
-                .count || '0') +
-              ')'
+            item.name +
+            '(' +
+            (globalData.data.filter((val) => val.type === item.name)[0]
+            .count || '0') +
+            ')'
             }}
           </span>
           <span v-else>
@@ -230,58 +123,36 @@
         </div>
       </div>
       <div class="top-content-father">
-        <infrastructurePage
-          ref="camera"
-          @add="handleAdd"
-          :searchValue="searchValue"
-        />
+        <infrastructurePage ref="camera" @add="handleAdd" :searchValue="searchValue" />
       </div>
     </div>
     <div class="top" v-else>
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
-            v-model:value="searchValue"
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources2"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button
-            class="button-reset"
-            style="margin-left: 0.1rem"
-            @click="globalSearch()"
-          >
+          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
             全局搜索
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
       <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 v-if="globalData.data.length > 0">
             {{
-              item.name +
-              '(' +
-              (globalData.data.filter((val) => val.type === item.name)[0]
-                .count || '0') +
-              ')'
+            item.name +
+            '(' +
+            (globalData.data.filter((val) => val.type === item.name)[0]
+            .count || '0') +
+            ')'
             }}
           </span>
           <span v-else>
@@ -289,10 +160,7 @@
           </span>
         </div>
       </div>
-      <KnowledgeBase
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-      ></KnowledgeBase>
+      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
     </div>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
@@ -304,21 +172,14 @@
       <p></p>
       <p>能力广场</p>
       <ul v-show="visibleAbilitySquare">
-        <li
-          v-for="item in abilitySquare"
-          :key="item"
-          @click="abilitySquareFunction(item)"
-        >
+        <li v-for="item in abilitySquare" :key="item" @click="abilitySquareFunction(item)">
           {{ item }}
         </li>
       </ul>
     </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" v-if="Cardsname != '基础设施'">
       <detailsPageconetentTree />
@@ -328,170 +189,75 @@
     </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>
-          <!-- <button
-            v-if="Cardsname == '应用资源'"
-            class="button-reset"
-            @click="applyAll()"
-            style="margin-left: 0.1rem"
-          >
-            全部申请
-          </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"
-              v-if="Cardsname == '组件服务' || Cardsname == '应用资源'"
-            >
-              <span class="top-content-title">共享条件</span>
-              <div class="leixingsumfather">
-                <div class="leixingsum">
-                  <a-checkable-tag
-                    :checked="tagFlag == '申请'"
-                    @change="() => chagneTag('申请')"
-                  >
-                    申请
-                  </a-checkable-tag>
-                </div>
-                <div class="leixingsum">
-                  <a-checkable-tag
-                    :checked="tagFlag == '免批申请'"
-                    @change="() => chagneTag('免批申请')"
-                  >
-                    免批
-                  </a-checkable-tag>
-                </div>
-              </div>
-            </div> -->
           </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"
+        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
       <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>
@@ -501,41 +267,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>
@@ -545,158 +294,75 @@
     </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" v-if="Cardsname == '组件服务'">
-              <span class="top-content-title">共享条件</span>
-              <div class="leixingsumfather">
-                <div class="leixingsum">
-                  <a-checkable-tag
-                    :checked="tagFlag == '申请'"
-                    @change="() => chagneTag('申请')"
-                  >
-                    申请
-                  </a-checkable-tag>
-                </div>
-                <div class="leixingsum">
-                  <a-checkable-tag
-                    :checked="tagFlag == '免批申请'"
-                    @change="() => chagneTag('免批申请')"
-                  >
-                    免批申请
-                  </a-checkable-tag>
-                </div>
-              </div>
-            </div> -->
           </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"
+        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
       <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>
@@ -712,28 +378,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>
@@ -741,61 +397,37 @@
     </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>
-        <template #title>问答机器人</template>
-        <i></i>
-      </a-tooltip>
-    </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 { defineComponent, reactive, ref, toRefs, onMounted, watch, nextTick } from 'vue'
 import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
 import {
   selectDicStoreAll,
   pageWithAttrs,
   getDataResource,
-  getIntegrationServicesList,
   getCountByFuzzyQuery,
 } from '@/api/home.js'
 import { getSgcList } from '@/api/personalCenter'
@@ -809,6 +441,7 @@ 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,
@@ -817,6 +450,26 @@ import {
 } from './constantData/showData.js'
 
 export default defineComponent({
+  beforeRouteEnter(to, from, next) {
+    console.log('to---DetailsPageconetent--beforeRouteEnter------->', to)
+    console.log('from---DetailsPageconetent--beforeRouteEnter------->', from)
+    console.log('next---DetailsPageconetent--beforeRouteEnter------->', next)
+    // 返回按钮，刷新页面，所以from.name为undefined
+    // if (from.name || from.name !== 'details') {
+    //   console.log('清空------------>')
+    //   localStorage.removeItem('DetailsPageconetent')
+    // }
+    next()
+  },
+  beforeRouteLeave(to, from, next) {
+    console.log('to---DetailsPageconetent--beforeRouteLeave------->', to)
+    console.log('from---DetailsPageconetent--beforeRouteLeave------->', from)
+    console.log('next---DetailsPageconetent--beforeRouteLeave------->', next)
+    if (to.name !== 'details') {
+      localStorage.removeItem('DetailsPageconetent')
+    }
+    next()
+  },
   setup() {
     //会议室传的标识6
     const flag = ref('')
@@ -833,17 +486,15 @@ export default defineComponent({
     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)
+    let currentPage = ref(1)
+    let currentPageSize = ref(5)
     const pageSizeOptions = ref(['5', '10', '20', '50'])
     const router = useRouter()
-    let select = router.currentRoute.value.query.select || '组件服务'
+    let select = router.currentRoute.value.query.select || '应用资源'
     const select2 = router.currentRoute.value.query.select
     const str = router.currentRoute.value.query.str
     const searchValue = ref(str)
@@ -860,7 +511,7 @@ export default defineComponent({
       diyici: [],
     })
     // 查询参数
-    const paramsGetResources = {
+    let paramsGetResources = {
       districtId: '',
       deptIds: [],
       pageNum: 1,
@@ -871,6 +522,36 @@ export default defineComponent({
       orderField: '', // 传空为默认排序 total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
       orderType: 'DESC', // ASC 升序  DESC 降序
     }
+
+    const searchResultListDom = ref(null)
+    // 读取本地存储查询条件
+    const storageSearchInfo = localStorage.getItem('DetailsPageconetent') && JSON.parse(
+      localStorage.getItem('DetailsPageconetent')
+    )
+    const handleSetSearchData = () => {
+      console.log('storageSearchInfo------------>', storageSearchInfo)
+      // 读取本地存储：表单赋值
+      if (storageSearchInfo) {
+        paramsGetResources = Object.assign({}, paramsGetResources, storageSearchInfo)
+        // 搜索名称
+        searchValue.value = storageSearchInfo.name;
+        currentPage.value = storageSearchInfo.pageNum;
+        currentPageSize.value = storageSearchInfo.pageSize;
+        paramsGetResources.pageNum = storageSearchInfo.pageNum;
+        paramsGetResources.pageSize = storageSearchInfo.pageSize;
+        paramsGetResources.deptIds = storageSearchInfo.deptIds;
+        paramsGetResources.districtId = storageSearchInfo.districtId;
+
+        // 延迟使用，因为还没有返回跟挂载
+        nextTick(() => {
+          searchResultListDom.value.changeCondition({
+            value: storageSearchInfo.orderField,
+            orderType: storageSearchInfo.orderType,
+          }, true)
+        })
+      }
+    }
+
     //西海岸查询参数
     let paramsGetResources2 = ref({
       regionId: '70be8c5b664f4bcf869d82f2e8335051',
@@ -886,49 +567,9 @@ export default defineComponent({
     }
     // 免批
     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)
-      }
-      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) => {
+      console.log('name------------>', name)
       paramsGetResources.pageNum = 1
       currentPage.value = 1
       if (tagFlag.value == name) {
@@ -940,6 +581,7 @@ export default defineComponent({
       }
       listKey.value++
       getAppResources()
+      console.log('paramsGetResources-----chagneTag------->', paramsGetResources);
     }
 
     // 重置数据
@@ -976,6 +618,7 @@ export default defineComponent({
       paramsGetResources.orderField = ''
       paramsGetResources.orderType = 'DESC'
       mybus.emit('chongzhi')
+      console.log('paramsGetResources---chongzhi-重置-------->', paramsGetResources);
       getAppResources()
     }
 
@@ -1016,6 +659,7 @@ export default defineComponent({
         }
       })
       listKey.value++
+      console.log('paramsGetResources---handleChange--------->', paramsGetResources);
       getAppResources()
     }
     const getNewList = () => {
@@ -1044,6 +688,7 @@ export default defineComponent({
             if (searchValue.value) {
               paramsGetResources.name = searchValue.value
             }
+
             pageWithAttrs(paramsGetResources).then((res) => {
               resourceList.data = []
               resourceList.data = res.data.data.records || []
@@ -1074,6 +719,16 @@ export default defineComponent({
             val.showShrink = true
             val.shrinkFlag = true
           }
+
+          // todo--赋值
+          if (storageSearchInfo) {
+            // name
+            let obj =
+              (storageSearchInfo.infoList || []).find(
+                (x) => x.attrType === val.name
+              ) || {}
+            val.selectedTags = obj.attrValue || []
+          }
         })
         listKey.value++
         listKey2.value++
@@ -1113,6 +768,8 @@ export default defineComponent({
           } else {
             getAppResources()
           }
+          console.log('paramsGetResources--globalSearch---------->', paramsGetResources);
+
         })
       } else {
         message.warning('全局搜索必须输入关键词！')
@@ -1129,7 +786,11 @@ export default defineComponent({
         console.log('camera2', camera)
         camera.value.getCamera(true, searchValue.value)
       } else {
-        getAppResources()
+        if (storageSearchInfo) {
+          getAppResources('分页查询')
+        } else {
+          getAppResources()
+        }
       }
     }
     const getAppResources = (switchIndex) => {
@@ -1137,23 +798,6 @@ export default defineComponent({
         globalData.data = []
       }
       select = router.currentRoute.value.query.select
-      console.log(
-        'url中的select',
-        router.currentRoute.value.query.select,
-        select == '应用资源' &&
-          (paramsGetResources.orderField == '' ||
-            paramsGetResources.orderField == 'deptSort' ||
-            paramsGetResources.orderField == 'pin_top'),
-        paramsGetResources.infoList.filter(
-          (val) => val.attrType == '组件类型'
-        )[0] &&
-          paramsGetResources.infoList.filter(
-            (val) => val.attrType == '组件类型'
-          )[0].attrValue == '图层服务' &&
-          (paramsGetResources.orderField == '' ||
-            paramsGetResources.orderField == 'deptSort' ||
-            paramsGetResources.orderField == 'pin_top')
-      )
       if (
         (select == '应用资源' &&
           (paramsGetResources.orderField == '' ||
@@ -1192,30 +836,19 @@ export default defineComponent({
       if (searchValue.value) {
         let str = ''
         let r = null
-        console.log(
-          '2222222222222222222222222222',
-          searchValue.value,
-          searchValue.value.length
-        )
         if (
           searchValue.value.length >= 2 &&
           paramsGetResources.type !== '基础设施'
         ) {
           str = searchValue.value.substring(0, 2)
-          console.log('str================>', str)
           r = re.test(str)
         }
         if (
           (searchValue.value.length > 1 && r) ||
           paramsGetResources.type === '基础设施'
         ) {
-          //switchIndex这个参数是下面的分页传过来的参数
           paramsGetResources.name = searchValue.value
           paramsGetResources.type = Cardsname.value
-          console.log(
-            '执行getAppResources====================》',
-            paramsGetResources
-          )
           if (
             !whoShow1.value.itShowBaoTou &&
             paramsGetResources.type === '数据资源'
@@ -1230,8 +863,8 @@ export default defineComponent({
                   ? 'syqk'
                   : 'fbrq'
                 : paramsGetResources.orderField == 'applyCount'
-                ? 'requestCount'
-                : 'createTime', //排序字段
+                  ? 'requestCount'
+                  : 'createTime', //排序字段
               orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
               pageNum: paramsGetResources.pageNum, //页码
               pageSize: paramsGetResources.pageSize, //分页大小
@@ -1274,7 +907,7 @@ export default defineComponent({
               paramsGetResources.pageNum = 1
             }
             pageWithAttrs(paramsGetResources).then((res) => {
-              console.log('查询列表============>', resourceList, res.data.data)
+              console.log('查询列表====22========>', resourceList, res.data.data)
               resourceList.data = []
               videoList.data = []
               if (Cardsname.value === '基础设施') {
@@ -1284,7 +917,6 @@ export default defineComponent({
               } else {
                 resourceTotal.value = res.data.data.total || ''
                 resourceList.data = res.data.data.records || []
-                // getShoppingCartList(res.data.data.records)
               }
             })
           } else if (
@@ -1305,10 +937,6 @@ export default defineComponent({
         //switchIndex这个参数是下面的分页传过来的参数
         paramsGetResources.name = searchValue.value
         paramsGetResources.type = Cardsname.value
-        console.log(
-          '执行getAppResources====================》',
-          paramsGetResources
-        )
         if (
           !whoShow1.value.itShowBaoTou &&
           paramsGetResources.type === '数据资源'
@@ -1323,15 +951,15 @@ export default defineComponent({
                 ? 'syqk'
                 : 'fbrq'
               : paramsGetResources.orderField == 'applyCount'
-              ? 'requestCount'
-              : 'createTime', //排序字段
+                ? 'requestCount'
+                : 'createTime', //排序字段
             orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
             pageNum: paramsGetResources.pageNum, //页码
             pageSize: paramsGetResources.pageSize, //分页大小
           }
           getDataResource(dataResourceParams).then((res) => {
             if (whoShow1.value.itShowQingDao) {
-              res.data.data.data.forEach((val) => {
+              (res.data && res.data.data && res.data.data.data || []).forEach((val) => {
                 val.id = val.guid // id
                 val.name = val.zyname // 名字
                 val.sjlCount = val.sjcczl // 数据量
@@ -1344,7 +972,7 @@ export default defineComponent({
               resourceTotal.value = res.data.data.rows || ''
               loading.value = false
             } else if (whoShow1.value.itShowXiHaiAn) {
-              res.data.data.list.forEach((val) => {
+              (res.data && res.data.data && res.data.data.list || []).forEach((val) => {
                 val.id = val.serviceId // id
                 val.name = val.serviceName // 名字
                 val.sjlCount = val.requestQuantity // 数据量
@@ -1367,7 +995,7 @@ export default defineComponent({
             paramsGetResources.pageNum = 1
           }
           pageWithAttrs(paramsGetResources).then((res) => {
-            console.log('查询列表============>', resourceList, res.data.data)
+            console.log('查询列表===11=========>', resourceList, res.data.data)
             resourceList.data = []
             videoList.data = []
             if (Cardsname.value === '基础设施') {
@@ -1377,7 +1005,6 @@ export default defineComponent({
             } else {
               resourceTotal.value = res.data.data.total || ''
               resourceList.data = res.data.data.records || []
-              // getShoppingCartList(res.data.data.records)
             }
           })
         } else if (
@@ -1403,14 +1030,10 @@ export default defineComponent({
         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)
+        shoppingCartList.value = res.data.data.records = console.log(
+          '经过过滤后的列表信息',
+          list
+        )
         resourceList.data = list
       })
     }
@@ -1425,19 +1048,19 @@ export default defineComponent({
         delete paramsGetResources.deptIds
       }
       getAppResources()
-      console.log('paramsGetResources', paramsGetResources)
+      console.log('paramsGetResources-----paramsGetResources------->', paramsGetResources);
     })
     mybus.on('changePage', (page) => {
       paramsGetResources.pageNum = page
-      console.log('changePage', paramsGetResources.pageNum)
       getAppResources('分页查询')
-      console.log('paramsGetResources', paramsGetResources)
+      console.log('paramsGetResources----changePage-------->', paramsGetResources);
     })
     mybus.on('changeSelcted', () => {
       // 添加申购车后，返回第一页
       paramsGetResources.pageNum = 1
       currentPage.value = 1
       getAppResources()
+      console.log('paramsGetResources----changeSelcted-------->', paramsGetResources);
     })
     mybus.on('changeInfo', (info) => {
       paramsGetResources.pageNum = 1
@@ -1449,39 +1072,50 @@ export default defineComponent({
         paramsGetResources.infoList.push(info)
       }
       getAppResources()
-      console.log('paramsGetResources', paramsGetResources)
+      console.log('paramsGetResources-----changeInfo------->', paramsGetResources);
+
     })
     mybus.on('refresh', () => {
       paramsGetResources.pageNum = 1
       currentPage.value = 1
       getAppResources()
+      console.log('paramsGetResources-----refresh------->', paramsGetResources);
     })
+
     mybus.on('changeCondition', (condition) => {
-      // 回到第一页，分页页码为1
-      paramsGetResources.pageNum = 1
-      currentPage.value = 1
-      //  orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+      if (!storageSearchInfo) {
+        // 回到第一页，分页页码为1
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
+      }
+      // orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
       // orderType: 'ASC'  ASC 升序  DESC 降序
       paramsGetResources.orderField = condition.orderField
       paramsGetResources.orderType = condition.orderType
-      getAppResources()
-      console.log('paramsGetResources', paramsGetResources)
+      if (storageSearchInfo) {
+        getAppResources('分页查询')
+      } else {
+        getAppResources()
+      }
+      console.log('paramsGetResources---changeCondition--------->', paramsGetResources);
     })
+
     const pageChange = (val) => {
-      console.log(val)
+      console.log('pageChange------------>', val);
       loading.value = true
       currentPage.value = val
       paramsGetResources.pageNum = val
-      let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-      getAppResources(params)
+      getAppResources('分页查询') //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+      console.log('paramsGetResources-----pageChange------->', paramsGetResources);
     }
 
     onMounted(() => {
-      listKey2.value++
+      // 从本地读取查询条件，赋值
+      handleSetSearchData()
 
+      listKey2.value++
       // 获取筛选条件
       getNewList()
-
       if (!tecHnosphere && !appLiCation) {
         if (searchValue.value && !select2) {
           globalSearch()
@@ -1505,8 +1139,9 @@ export default defineComponent({
       currentPageSize.value = pageSize
       paramsGetResources.pageNum = current
       paramsGetResources.pageSize = pageSize
-      console.log('执行onShowSizeChange', paramsGetResources)
       getAppResources()
+      console.log('paramsGetResources----onShowSizeChange-------->', paramsGetResources);
+
     }
     watch(currentPageSize, () => {
       console.log('pageSize', currentPageSize.value)
@@ -1530,21 +1165,12 @@ export default defineComponent({
       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(true)
           getNewList()
@@ -1589,6 +1215,16 @@ export default defineComponent({
       visibleAbilitySquare.value = false
       abilitySquareFunctionData.value = '智能算法'
     }
+
+    // 存储查询条件到本地 todo
+    const saveSearchCodition = () => {
+      console.log('存储查询条件到本地---DetailsPageconetent----->', 1111)
+      localStorage.setItem(
+        'DetailsPageconetent',
+        JSON.stringify(paramsGetResources)
+      )
+    }
+
     return {
       listKey,
       ListContent,
@@ -1620,12 +1256,6 @@ export default defineComponent({
       tagFlag,
       current,
       openMonitor,
-      stateTags,
-      selStateTags,
-      handleChangeStateTag,
-      // bqTags,
-      selBqTags,
-      handleChangeBqTags,
       loading,
       getShoppingCartList,
       whoShow1,
@@ -1641,6 +1271,10 @@ export default defineComponent({
       globalData,
       globalSearch,
       camera,
+      saveSearchCodition,
+      searchResultListDom,
+      handleSetSearchData, // todo
+      // refreshList,
     }
   },
   components: {
@@ -1651,8 +1285,6 @@ export default defineComponent({
     UpOutlined,
     DownOutlined,
     KnowledgeBase,
-    // VideoCameraOutlined,
-    // VideoSurveillance,
     DetailsPageResource,
     infrastructurePage,
     detailsPageInfrastructureTree,
@@ -1673,12 +1305,11 @@ export default defineComponent({
   font-family: 'webfont';
   src: url('~@/assets/capacitySquare/webfont.ttf');
 }
+
 .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;
@@ -1789,8 +1420,7 @@ export default defineComponent({
           display: flex;
           align-items: center;
 
-          .tupian {
-          }
+          .tupian {}
 
           .title {
             margin-left: 0.1rem;
@@ -1823,7 +1453,7 @@ export default defineComponent({
         }
       }
 
-      .yunziyuan > div {
+      .yunziyuan>div {
         margin-bottom: 0.1rem;
       }
 
@@ -1834,8 +1464,7 @@ export default defineComponent({
           display: flex;
           align-items: center;
 
-          .tupian {
-          }
+          .tupian {}
 
           .title {
             margin-left: 0.1rem;
@@ -1859,12 +1488,12 @@ export default defineComponent({
         }
       }
 
-      .shipin > div {
+      .shipin>div {
         margin-bottom: 0.1rem;
       }
     }
 
-    .jichusheshi > div {
+    .jichusheshi>div {
       padding-top: 0.1rem;
       border-radius: 0.04rem;
       margin-bottom: 0.2rem;
@@ -1893,8 +1522,7 @@ export default defineComponent({
           align-items: center;
           margin-left: 0.2rem;
 
-          .tupian {
-          }
+          .tupian {}
 
           .title {
             margin-left: 0.1rem;
@@ -1927,12 +1555,12 @@ export default defineComponent({
         }
       }
 
-      .yunziyuan > div {
+      .yunziyuan>div {
         margin-bottom: 0.1rem;
       }
     }
 
-    .shujuziyuan > div {
+    .shujuziyuan>div {
       background: #eaf4ff;
       padding-top: 0.1rem;
       border-radius: 0.04rem;
@@ -1949,6 +1577,7 @@ export default defineComponent({
       color: #000000;
       line-height: 0.34rem;
       margin-bottom: 0.2rem;
+
       .photo {
         display: inline-block;
         height: 0.44rem;
@@ -1957,7 +1586,6 @@ export default defineComponent({
       }
 
       div {
-        // margin: 0 0.2rem;
         padding: 0 0.1rem;
         cursor: pointer;
         display: flex;
@@ -2098,6 +1726,7 @@ export default defineComponent({
     background-size: cover;
   }
 }
+
 .abilitySquare {
   width: 0.7rem;
   height: 0.7rem;
@@ -2105,7 +1734,6 @@ export default defineComponent({
   border: 0.01rem #94aac9 solid;
   display: flex;
   flex-direction: column;
-  // justify-content: center;
   align-items: center;
   padding-top: 0.05rem;
   position: fixed;
@@ -2114,9 +1742,11 @@ export default defineComponent({
   right: 0.1rem;
   cursor: pointer;
   background: #e3edfc;
+
   p {
     margin: 0;
   }
+
   p:nth-child(1) {
     height: 0.35rem;
     width: 0.36rem;
@@ -2124,6 +1754,7 @@ export default defineComponent({
     background-size: 100% 100%;
     background-position: center;
   }
+
   ul {
     background: #ffffff;
     font-family: webfont;
@@ -2136,6 +1767,7 @@ export default defineComponent({
     left: -0.62rem;
     padding: 0;
     margin: 0;
+
     li {
       list-style: none;
       color: #0061ec;
@@ -2144,20 +1776,24 @@ export default defineComponent({
       padding-left: 0.4rem;
       border-bottom: 0.01rem solid #dfd9d9;
     }
+
     li:nth-of-type(1) {
       background: url('~@/assets/home/appIcon.png') no-repeat;
       background-position: 0.18rem center;
     }
+
     li:nth-of-type(2) {
       background: url('~@/assets/home/AiIcon.png') no-repeat;
       background-position: 0.18rem center;
     }
+
     li:nth-of-type(3) {
       border-bottom: none;
       background: url('~@/assets/home/GisIcon.png') no-repeat;
       background-position: 0.18rem center;
     }
   }
+
   ul::after {
     content: '';
     position: absolute;
@@ -2168,6 +1804,7 @@ export default defineComponent({
     border: 0.13rem solid;
     border-color: #fff transparent transparent transparent;
   }
+
   ul::before {
     content: '';
     position: absolute;
@@ -2178,10 +1815,12 @@ export default defineComponent({
     border: 0.13rem solid;
     border-color: #dfd9d9 transparent transparent transparent;
   }
+
   @keyframes ulShowTime {
     0% {
       transform: scale(0);
     }
+
     100% {
       transform: scale(0);
     }
@@ -2192,7 +1831,6 @@ export default defineComponent({
   width: 10.87rem;
   padding-left: 0.2rem;
 
-  // margin-bottom: .2rem;
   .top-content {
     display: flex;
     margin-top: 0.23rem;
@@ -2209,15 +1847,11 @@ export default defineComponent({
       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 {
@@ -2227,7 +1861,6 @@ export default defineComponent({
       text-align: center;
       margin-top: 0.05rem;
 
-      // margin-bottom: .1rem;
       .ant-tag-checkable {
         width: 0.85rem;
         height: 0.25rem;
@@ -2247,7 +1880,6 @@ export default defineComponent({
       }
 
       :deep(.ant-tag-checkable-checked) {
-        // width: .67rem;
         margin-left: 0.15rem;
         margin-right: 0.15rem;
         text-align: center;
diff --git a/front/src/views/home/components/integrationServiceOrder.vue b/front/src/views/home/components/integrationServiceOrder.vue
index 224874c8..3869d370 100644
--- a/front/src/views/home/components/integrationServiceOrder.vue
+++ b/front/src/views/home/components/integrationServiceOrder.vue
@@ -1,22 +1,15 @@
 <template>
   <ul class="integrationServiceOrder">
-    <li
-      v-for="(item, i) in integrationOrderList"
-      :key="i"
-      @click="
-        changeOrder(i, item.value, item.orderType == 'DESC' ? 'ASC' : 'DESC')
-      "
-    >
+    <li v-for="(item, i) in integrationOrderList" :key="i" @click="
+      changeOrder(i, item.value, item.orderType == 'DESC' ? 'ASC' : 'DESC')
+    ">
       {{ item.name }}
-      <span
-        class="arrow"
-        :class="
-          integrationOrder.orderType == 'ASC' &&
-          integrationOrder.orderField == item.value
-            ? 'down'
-            : ''
-        "
-      ></span>
+      <span class="arrow" :class="
+        integrationOrder.orderType == 'ASC' &&
+        integrationOrder.orderField == item.value
+          ? 'down'
+          : ''
+      "></span>
     </li>
   </ul>
 </template>
@@ -54,13 +47,17 @@ const integrationOrder = reactive({
 
 // 融合服务--排序
 const changeOrder = (i, val, type) => {
-  let newType = type
+  console.log('i, val, type------------>', i, val, type);
   integrationOrder.orderField = val
-  integrationOrder.orderType = newType
-  integrationOrderList.value[i].orderType = newType
+  integrationOrder.orderType = type;
+  // 0 apply_count ASC
+  let _index = integrationOrderList.value.findIndex(x => x.value = val)
+  if (_index > -1) {
+    integrationOrderList.value[_index].orderType = type
+  }
   mybus.emit('changeCondition', {
     orderField: val,
-    orderType: newType,
+    orderType: type,
   })
 }
 
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 41837fd5..f99c692e 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -5,180 +5,126 @@
         检测结果:
         <span>{{ resourceTotal || '' }}</span>
         个{{
-          cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
+        cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
         }}
       </div>
       <div class="condition" :key="showKey">
-        <IntegrationServiceOrder
-          ref="integrationServiceOrderDom"
-          v-if="
-            selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-          "
-        ></IntegrationServiceOrder>
+        <IntegrationServiceOrder ref="integrationServiceOrderDom" v-if="
+          selectCardsname === '融合服务' || selectCardsname === '赋能场景'
+        "></IntegrationServiceOrder>
         <ul v-else>
-          <li
-            v-for="item in selList"
-            :key="item.value"
-            @click="changeCondition(item.value)"
-            v-show="
-              item.show &&
-              item.name !== '评分' &&
-              selectCardsname !== '数据资源'
-            "
-          >
+          <li v-for="(item, i) in selList" :key="i" @click="changeCondition(item)" v-show="
+            item.show &&
+            item.name !== '评分' &&
+            selectCardsname !== '数据资源'
+          ">
             {{ item.name }}
-            <span
-              class="arrow"
-              :class="item.value == selData ? 'down' : ''"
-            ></span>
+            <!-- {{orderObj.orderType}}{{orderObj.orderField}} -->
+            <!-- <span class="arrow" :class="item.value == selData ? 'down' : ''"></span> -->
+            <!-- {{orderObj.orderType == 'ASC' ? '11' : '22'}} -->
+            <!-- {{orderObj.orderField == item.value ? '11' : '22'}} -->
+            <span class="arrow" :class="
+              orderObj.orderType == 'ASC' &&
+              orderObj.orderField == item.value
+                ? 'down'
+                : ''
+            "></span>
           </li>
         </ul>
+        <!-- {{JSON.stringify(orderObj)}} -->
       </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"
-          style="display: flex; align-items: center"
-          v-if="
-            item.type === '应用资源' &&
-            item.infoList &&
+        <div class="left" style="display: flex; align-items: center" v-if="
+          item.type === '应用资源' &&
+          item.infoList &&
+          item.infoList.filter((val) => val.attrType == '应用图片')[0]
+        ">
+          <a-image :width="106" :preview="false" :src="
             item.infoList.filter((val) => val.attrType == '应用图片')[0]
-          "
-        >
-          <a-image
-            :width="106"
-            :preview="false"
-            :src="
-              item.infoList.filter((val) => val.attrType == '应用图片')[0]
-                .attrValue
-            "
-          />
+              .attrValue
+          " />
         </div>
-        <div
-          class="left"
-          style="display: flex; align-items: center"
-          v-else-if="
-            (selectCardsname === '融合服务' ||
-              selectCardsname === '赋能场景') &&
-            item.fuseAttrList &&
+        <div class="left" style="display: flex; align-items: center" v-else-if="
+          (selectCardsname === '融合服务' ||
+            selectCardsname === '赋能场景') &&
+          item.fuseAttrList &&
+          item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
+        ">
+          <a-image :width="106" :preview="false" :src="
             item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
-          "
-        >
-          <a-image
-            :width="106"
-            :preview="false"
-            :src="
-              item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
-                .attrValue
-            "
-          />
+              .attrValue
+          " />
         </div>
-        <div
-          class="left"
-          :class="
-            item.type == '应用资源'
-              ? 'yyzy'
-              : !item.type
-              ? 'sjzy'
-              : !item.infoList ||
-                !item.infoList.filter((val) => val.attrType == '组件类型')[0]
-              ? 'znsf'
-              : 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'
-              : ''
-          "
-          @click="toView('details', item)"
-          v-else-if="
-            selectCardsname !== '基础设施' &&
-            selectCardsname !== '融合服务' &&
-            selectCardsname !== '赋能场景'
-          "
-        ></div>
+        <div class="left" :class="
+          item.type == '应用资源'
+            ? 'yyzy'
+            : !item.type
+            ? 'sjzy'
+            : !item.infoList ||
+              !item.infoList.filter((val) => val.attrType == '组件类型')[0]
+            ? 'znsf'
+            : 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'
+            : ''
+        " @click="toView('details', item)" v-else-if="
+          selectCardsname !== '基础设施' &&
+          selectCardsname !== '融合服务' &&
+          selectCardsname !== '赋能场景'
+        "></div>
         <div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
-        <div
-          class="left rhfw"
-          v-else-if="
-            selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-          "
-        ></div>
+        <div class="left rhfw" v-else-if="
+          selectCardsname === '融合服务' || selectCardsname === '赋能场景'
+        "></div>
         <div class="right" @click="toView('details', item)">
           <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="
+              <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 == '已申请' && item.approveStatus == '通过'
-                "
-                style="margin-left: 10px; min-width: 40px"
-              >
+                " style="margin-left: 10px; min-width: 40px">
                 <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">
-              <div
-                v-if="
-                  selectCardsname === '融合服务' ||
-                  selectCardsname === '赋能场景'
-                "
-                class="label-content"
-              >
-                <template
-                  v-if="
-                    item.fuseAttrList &&
-                    item.fuseAttrList.filter(
-                      (val) => val.attrType == '应用领域'
-                    )[0]
-                  "
-                >
-                  <span
-                    class="label"
-                    v-for="(data, index) in item.fuseAttrList
-                      .filter((val) => val.attrType == '应用领域')[0]
-                      .attrValue.split(';')"
-                    :key="index"
-                  >
+              <div v-if="
+                selectCardsname === '融合服务' ||
+                selectCardsname === '赋能场景'
+              " class="label-content">
+                <template v-if="
+                  item.fuseAttrList &&
+                  item.fuseAttrList.filter(
+                    (val) => val.attrType == '应用领域'
+                  )[0]
+                ">
+                  <span class="label" v-for="(data, index) in item.fuseAttrList
+                  .filter((val) => val.attrType == '应用领域')[0]
+                  .attrValue.split(';')" :key="index">
                     {{ data }}
                   </span>
                 </template>
@@ -196,21 +142,15 @@
             </div>
           </div>
           <div class="dec">
-            <div
-              v-if="
-                selectCardsname !== '融合服务' &&
-                selectCardsname !== '赋能场景' &&
-                selectCardsname !== '基础设施'
-              "
-            >
+            <div v-if="
+              selectCardsname !== '融合服务' &&
+              selectCardsname !== '赋能场景' &&
+              selectCardsname !== '基础设施'
+            ">
               <span>{{ item.deptName || '--' }}</span>
             </div>
           </div>
-          <div
-            v-if="selectCardsname !== '基础设施'"
-            style="margin-top: 0.1rem"
-            class="description"
-          >
+          <div v-if="selectCardsname !== '基础设施'" style="margin-top: 0.1rem" class="description">
             <a-tooltip>
               <template #title>{{ item.description }}</template>
               {{ item.description || '--' }}
@@ -228,22 +168,18 @@
                 >
                   浏览量：{{ item.visits || 0 }}次
                 </div> -->
-                <div
-                  v-if="
-                    selectCardsname !== '数据资源' &&
-                    selectCardsname !== '赋能场景' &&
-                    (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
-                  "
-                >
+                <div v-if="
+                  selectCardsname !== '数据资源' &&
+                  selectCardsname !== '赋能场景' &&
+                  (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
+                ">
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
-                <div
-                  v-if="
-                    selectCardsname === '数据资源' &&
-                    selectCardsname !== '融合服务' &&
-                    selectCardsname !== '赋能场景'
-                  "
-                >
+                <div v-if="
+                  selectCardsname === '数据资源' &&
+                  selectCardsname !== '融合服务' &&
+                  selectCardsname !== '赋能场景'
+                ">
                   数据量：{{ item.sjlCount || 0 }}
                 </div>
                 <div v-if="selectCardsname !== '数据资源'">
@@ -253,77 +189,41 @@
             </div>
             <div class="right" v-if="selectCardsname !== '基础设施'">
               <div class="shopping" :key="shoppingKey">
-                <template
-                  v-if="
-                    (selectCardsname == '组件服务' &&
-                      item.infoList.filter(
-                        (val) => val.attrType == '外部服务地址'
-                      ).length === 0) ||
-                    (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
-                  "
-                >
-                  <span
-                    class="shopping-down"
-                    v-if="item.isInShoppingCart"
-                  ></span>
-                  <span
-                    class="shopping-on"
-                    v-else
-                    @click.stop="addShoppingCart(item, index)"
-                  ></span>
+                <template v-if="
+                  (selectCardsname == '组件服务' &&
+                    item.infoList.filter(
+                      (val) => val.attrType == '外部服务地址'
+                    ).length === 0) ||
+                  (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
+                ">
+                  <span class="shopping-down" v-if="item.isInShoppingCart"></span>
+                  <span class="shopping-on" v-else @click.stop="addShoppingCart(item, index)"></span>
                 </template>
               </div>
               <div class="sc">
-                <span
-                  class="sc-down"
-                  v-if="item.isCollect == 'false'"
-                  @click.stop="addCollect(item)"
-                ></span>
-                <span
-                  class="sc-on"
-                  v-if="item.isCollect == 'true'"
-                  @click.stop="addCollect(item)"
-                ></span>
+                <span class="sc-down" v-if="item.isCollect == 'false'" @click.stop="addCollect(item)"></span>
+                <span class="sc-on" v-if="item.isCollect == 'true'" @click.stop="addCollect(item)"></span>
               </div>
-              <div
-                class="shopping pk"
-                :key="pk"
-                v-show="
-                  cardType == '组件服务' && findComponentName(item, '智能算法')
-                "
-              >
-                <span
-                  class="pk-on"
-                  @click.stop="goComparePk(item, index)"
-                ></span>
+              <div class="shopping pk" :key="pk" v-show="
+                cardType == '组件服务' && findComponentName(item, '智能算法')
+              ">
+                <span class="pk-on" @click.stop="goComparePk(item, index)"></span>
               </div>
-              <a-button
-                type="primary"
-                @click.stop="toView('details', item)"
-                v-if="!whoShow1.itShowBaoTou"
-              >
+              <a-button type="primary" @click.stop="toView('details', item)" v-if="!whoShow1.itShowBaoTou">
                 查看详情
               </a-button>
-              <a-button
-                style="margin-left: 10px"
-                v-show="
-                  selectCardsname === '融合服务' ||
-                  selectCardsname === '赋能场景'
-                "
-                @click.stop="handleAKeyApplication(item)"
-              >
+              <a-button style="margin-left: 10px" v-show="
+                selectCardsname === '融合服务' ||
+                selectCardsname === '赋能场景'
+              " @click.stop="handleAKeyApplication(item)">
                 一键申请
               </a-button>
-              <a-button
-                type="primary"
-                @click.stop="toView('apply', item)"
-                v-show="
-                  cardType == '组件服务' ||
-                  (cardType == '应用资源' && whoShow1.itShowQingDao)
-                "
-              >
+              <a-button type="primary" @click.stop="toView('apply', item)" v-show="
+                cardType == '组件服务' ||
+                (cardType == '应用资源' && whoShow1.itShowQingDao)
+              ">
                 {{
-                  item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
+                item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
               </a-button>
             </div>
@@ -336,12 +236,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%">
@@ -352,7 +247,7 @@
   </div>
 </template>
 <script>
-import { ref, reactive, nextTick } from 'vue'
+import { ref, reactive, nextTick, defineEmits, defineExpose, getCurrentInstance } from 'vue'
 import { message } from 'ant-design-vue'
 import { useRouter } from 'vue-router'
 import { getUser, sgcInsert } from '@/api/home'
@@ -365,7 +260,7 @@ export default {
   props: {
     resourceList: {
       type: Object,
-      default: () => {},
+      default: () => { },
     },
     resourceTotal: {
       type: String,
@@ -458,18 +353,24 @@ export default {
   components: {
     IntegrationServiceOrder,
   },
-  setup(props) {
+  setup(props, context) {
     const whoShow1 = whoShow
     const showKey = ref(0)
     let shoppingKey = ref(1)
-    const integrationServiceOrderDom = ref(null);
+    let orderObj = reactive({
+      // orderField: 'tdr.create_date',
+      // orderType: 'ASC',
+      orderField: '',
+      orderType: '',
+    })
+    const integrationServiceOrderDom = ref(null)
     // 购物车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 },
+      { name: '发布时间', value: 'tdr.create_date', show: true, orderType: 'DESC' },
+      { name: '浏览量', value: 'visits', show: true, orderType: 'DESC' },
+      { name: '申请量', value: 'applyCount', show: true, orderType: 'DESC' },
+      { name: '收藏量', value: 'collectCount', show: true, orderType: 'DESC' },
+      { name: '评分', value: 'score', show: true, orderType: 'DESC' },
     ])
     if (props.selectCardsname === '基础设施') {
       selList.value.map((val) => (val.show = false))
@@ -478,7 +379,7 @@ export default {
         (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
       )
     }
-    
+
     const findComponentName = (list, name) => {
       if (list.infoList) {
         return list.infoList.find((item) => {
@@ -513,6 +414,7 @@ export default {
     })
     showKey.value++
     const selData = ref('total')
+
     const flag = ref(true)
     // userId
     const userId = ref('')
@@ -527,18 +429,20 @@ export default {
       console.log('use value', searchValue)
       console.log('or use this.value', searchValue.value)
     }
+
     function toView(type, item) {
-      debugger
+      // debugger
       if (props.selectCardsname == '数据资源') {
         if (whoShow1.itShowQingDao) {
           window.open(
             'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
-              item.guid
+            item.guid
           )
         } else {
           window.open('http://10.134.135.24:30090/#/home?id=' + item.serviceId)
         }
       } else if (props.selectCardsname === '融合服务') {
+        context.emit('saveSearchCodition')
         // 打包模式
         router.push({
           path: '/packagingDetails',
@@ -605,6 +509,7 @@ export default {
             })
           }
         } else {
+          context.emit('saveSearchCodition')
           router.push({
             path: '/details',
             query: {
@@ -665,15 +570,29 @@ export default {
         }
       }
     }
-    // 更换查询条件
-    const changeCondition = (val) => {
-      selData.value = selData.value == val ? 'total' : val
-      const orderType = selData.value == val ? 'ASC' : 'DESC'
-      mybus.emit('changeCondition', {
-        orderField: val,
-        orderType: orderType,
+
+    /**更换查询条件
+     * val: 排序字段值
+     * isFromFather: 是否来自父组件传值
+     */
+    const changeCondition = (item, isFromFather = false) => {
+      console.log('item, isFromFather------------>', item, isFromFather);
+      let newType = item.orderType == 'DESC' ? 'ASC' : 'DESC';
+      if (isFromFather) {
+        newType = item.orderType;
+      }
+      orderObj.orderField = item.value;
+      orderObj.orderType = newType;
+      let _index = selList.value.findIndex(x => x.value == item.value)
+      if (_index > -1) {
+        selList.value[_index].orderType = newType
+      }
+      selList.value = selList.value.splice(0);
+      nextTick(() => {
+        console.log('orderObj------------>', orderObj);
+        console.log('selList------------>', selList.value);
       })
-      console.log('选择===========》', val, selData.value)
+      mybus.emit('changeCondition', orderObj)
     }
 
     // 融合服务--一键申请
@@ -724,10 +643,8 @@ export default {
         _applyList.push(obj)
       })
       _applyList = jcss.concat(_applyList)
-      console.log('_applyList------------>', _applyList)
-
       localStorage.setItem('applyList', JSON.stringify(_applyList))
-      // 融合服务 item
+      // 融合服务
       localStorage.setItem('integrationServicesItemInfo', JSON.stringify(item))
       router.push({
         path: '/apply',
@@ -735,7 +652,6 @@ export default {
     }
 
     mybus.on('chongzhi', (typeObj) => {
-      console.log('typeObj------------>', typeObj)
       if (!typeObj) {
         selData.value = 'total'
       }
@@ -743,7 +659,8 @@ export default {
         typeObj &&
         (typeObj.type === '融合服务' || typeObj.type === '打包模式')
       ) {
-        integrationServiceOrderDom.value.reset && integrationServiceOrderDom.value.reset()
+        integrationServiceOrderDom.value.reset &&
+          integrationServiceOrderDom.value.reset()
       }
     })
     let videoUrl = ref('')
@@ -819,6 +736,7 @@ export default {
       showKey,
       handleAKeyApplication,
       integrationServiceOrderDom,
+      orderObj,
     }
   },
   beforeUnmount() {
@@ -1062,7 +980,6 @@ export default {
         font-size: 14px;
         margin: 5px 0;
 
-       
         .right {
           flex: 1;
           display: flex;
@@ -1149,11 +1066,11 @@ export default {
         margin-top: 10px;
         align-items: center;
 
-        & > div {
+        &>div {
           display: flex;
           align-items: center;
 
-          & > div {
+          &>div {
             margin: 0 10px;
           }
         }
diff --git a/front/src/views/home/detailBack.vue b/front/src/views/home/detailBack.vue
new file mode 100644
index 00000000..39c0b629
--- /dev/null
+++ b/front/src/views/home/detailBack.vue
@@ -0,0 +1,34 @@
+<template>
+  <div class="detail-back" @click="previousPage" :style="{ color: textColor }">
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, watch, defineProps } from 'vue'
+import { useRouter } from 'vue-router'
+const router = useRouter()
+console.log('router------------>', router)
+
+const props = defineProps({
+  textColor: { type: String, default: '' },
+})
+
+const previousPage = () => {
+  window.history.go(-1)
+}
+</script>
+
+<style scoped lang="less">
+.detail-back {
+  position: absolute;
+  top: 0.85rem;
+  left: 100px;
+  font-size:  0.18rem;
+  color: #fff;
+  cursor: pointer;
+  width: 50px;
+  height: 50px;
+  background-image: url('~@/assets/detailsAll/back.png');
+  background-size: 100% 100%;
+}
+</style>
\ No newline at end of file
diff --git a/front/src/views/home/details.vue b/front/src/views/home/details.vue
index 0b4a51e6..9374ebaa 100644
--- a/front/src/views/home/details.vue
+++ b/front/src/views/home/details.vue
@@ -9,6 +9,7 @@
   <div>
     <div id="apply-container">
       <home-header :showView="showView"></home-header>
+      <detail-back></detail-back>
       <details-view v-if="showView === 'details-view'"></details-view>
       <algorithm-details
         v-else-if="showView === 'algorithm-details'"
@@ -38,6 +39,7 @@
   import DeveloperComponents from '@/views/detailsAll/DeveloperComponents'
   import BusinessDetails from '@/views/detailsAll/BusinessDetails'
   import LayerService from '@/views/detailsAll/LayerService'
+  import detailBack from '@/views/home/detailBack.vue'
   import { selectOne } from '@/api/home'
   import { useRouter } from 'vue-router'
   export default defineComponent({
@@ -52,6 +54,7 @@
       DeveloperComponents,
       BusinessDetails,
       LayerService,
+      detailBack
     },
     setup() {
       const formState = reactive({
@@ -163,6 +166,7 @@
         }
       }
       init()
+      
       return {
         formState,
         options,
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 27cd733b..bdf86c83 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -432,7 +432,7 @@
               placeholder="请输入关键词"
               enter-button="搜索"
               size="large"
-              @change="getCamera"
+              @change="(e) => getCamera(true, e.target.value)"
             />
             <a-button
               type="primary"
@@ -1697,6 +1697,7 @@
   // }
   const wrjFlag = ref(false)
   const getCamera = (flag, str) => {
+    console.log('mapSearchParam.value.cameraName------------>', mapSearchParam.value.cameraName);
     if (flag) {
       mapSearchParam.value.cameraName = str
       console.log('赋值===============》', str, mapSearchParam.value)
@@ -1710,6 +1711,8 @@
         pagination.value.total = res.data.count
       })
     } else {
+      console.log('mapSearchParam------------>', mapSearchParam);
+      
       let params = {
         regionId:
           mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
@@ -1720,6 +1723,7 @@
         latitude: mapSearchParam.value.gpsY || '',
         radius: mapSearchParam.value.radius || '',
         status: 1,
+        name: mapSearchParam.value.cameraName
       }
       if (
         params.regionId === '70be8c5b664f4bcf869d82f2e8335051' &&
diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue
index fa9dffc0..089e3a69 100644
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@@ -5,13 +5,8 @@
     <div class="top">
       <div class="top-title">
         全部：
-        <div
-          v-for="(item, index) in titleName"
-          :key="index"
-          class="tabAll"
-          @click="changeCards(index)"
-          :class="{ sel: index == number }"
-        >
+        <div v-for="(item, index) in titleName" :key="index" class="tabAll" @click="changeCards(index)"
+          :class="{ sel: index == number }">
           <span>
             {{ item.name === '赋能场景' ? '典型赋能场景' : '打包模式' }}
           </span>
@@ -20,52 +15,25 @@
       <div class="resultListSearchInput-father" v-if="number === 0">
         <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>
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+            @search="getIntegrationList" @change="onSearch" class="resultListSearchInput" />
+          <button class="button-reset" @click="resetAction()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <div v-loading="loadingData">
-        <searchResultList
-          v-if="number === 0"
-          v-show="resourceList.data && resourceList.data.length > 0"
-          :resourceList="resourceList"
-          :resourceTotal="resourceTotal"
-          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
-        />
-        <CanAssignCase
-          v-else
-          v-show="resourceList.data && resourceList.data.length > 0"
-          :resourceList="resourceList"
-          :resourceTotal="resourceTotal"
-          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
-        />
+        <searchResultList v-if="number === 0" v-show="resourceList.data && resourceList.data.length > 0"
+          :resourceList="resourceList" :resourceTotal="resourceTotal" @saveSearchCodition="saveSearchCodition"
+          ref="searchResultListDom" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
+        <CanAssignCase v-else v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList"
+          :resourceTotal="resourceTotal" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
         <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>
@@ -76,8 +44,7 @@
 <script>
 import HomeFooter from '@/views/newHome/components/Footer'
 import mybus from '@/myplugins/mybus'
-import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
-
+import { defineComponent, reactive, ref, toRefs, onMounted, nextTick } from 'vue'
 import { getIntegrationServicesList } from '@/api/home.js'
 import { useRouter } from 'vue-router'
 import HomeHeader from '@/views/home/components/header'
@@ -86,19 +53,38 @@ import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
 import { message } from 'ant-design-vue'
 
 export default defineComponent({
+  beforeRouteEnter(to, from, next) {
+    console.log('to---integrationServices--beforeRouteEnter------->', to)
+    console.log('from---integrationServices--beforeRouteEnter------->', from)
+    console.log('next---integrationServices--beforeRouteEnter------->', next)
+    // 返回按钮，刷新页面，所以from.name为undefined
+    // if (from.name || from.name !== 'details') {
+    //   console.log('清空------------>')
+    //   localStorage.removeItem('DetailsPageconetent')
+    // }
+    next()
+  },
+  beforeRouteLeave(to, from, next) {
+    console.log('to---integrationServices--beforeRouteLeave------->', to)
+    console.log('from---integrationServices--beforeRouteLeave------->', from)
+    console.log('next---integrationServices--beforeRouteLeave------->', next)
+    if (to.name !== 'packagingDetails') {
+      localStorage.removeItem('integrationServices')
+    }
+    next()
+  },
   setup() {
     // 分页
     const loading = ref(true)
     const currentPage = ref(1)
     const currentPageSize = ref(5)
-    const pageSizeOptions = ref(['5', '10', '20', '50'])
+    const pageSizeOptions = ref(['2','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)
     const loadingData = ref(false)
     // 选项卡
     const titleName = ref([
@@ -109,49 +95,73 @@ export default defineComponent({
         name: '赋能场景',
       },
     ])
-
+    const searchData = null;
     const number = ref(0)
     // 查询参数
     const paramsGetResources = {
-      pageNum: 1,
-      pageSize: currentPageSize.value,
+      page: currentPage.value,
+      limit: currentPageSize.value,
       type: titleName.value[number.value].name,
-      name: '',
-      orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+      name: searchValue.value,
+      orderField: 'create_date',
       orderType: 'DESC', // ASC 升序  DESC 降序
     }
+    const searchResultListDom = ref(null)
+    const storageSearchInfo = JSON.parse(localStorage.getItem('integrationServices'))
+    // 读取本地存储：表单赋值
+    const handleSetSearchData = () => {
+      console.log('storageSearchInfo------------>', storageSearchInfo)
+      if (storageSearchInfo) {
+        // 搜索名称 
+        searchValue.value = storageSearchInfo.name;
+        currentPage.value = storageSearchInfo.page;
+        currentPageSize.value = storageSearchInfo.limit;
+        titleName.value[number.value].name = storageSearchInfo.type;;
+        paramsGetResources.limit = storageSearchInfo.limit;
+        paramsGetResources.page = storageSearchInfo.page;
+        paramsGetResources.type = storageSearchInfo.type;
+
+        // 延迟使用，因为还没有返回跟挂载
+        nextTick(() => {
+          searchResultListDom.value.changeCondition({
+            value: storageSearchInfo.orderField,
+            orderType: storageSearchInfo.orderType,
+          }, true)
+        })
+        console.log('paramsGetResources------------>', paramsGetResources);
+        return;
+        getIntegrationList()
+      }
+    }
 
     const changeCards = (val) => {
       console.log(val)
       number.value = val
-      chongzhi()
+      resetAction()
     }
 
     // 查询
     const onSearch = () => {
-      loading.value = true
+      
       currentPage.value = 1
+      getIntegrationList()
     }
     // 重置数据
-    const chongzhi = () => {
-      loading.value = true
+    const resetAction = () => {
       // 重置模糊查字段
       searchValue.value = ''
       // 分页
       currentPage.value = 1
       currentPageSize.value = 5
       // 重置查询条件
-      paramsGetResources.pageNum = 1
-      paramsGetResources.pageSize = 5
+      paramsGetResources.page = 1
+      paramsGetResources.limit = 5
       paramsGetResources.orderField = 'create_date'
       paramsGetResources.orderType = 'DESC'
-      mybus.emit('chongzhi', {
+
+      mybus.emit('resetAction', {
         type: titleName.value[number.value].name,
       })
-      getAppResources()
-    }
-
-    const getAppResources = () => {
       getIntegrationList()
     }
 
@@ -159,16 +169,9 @@ export default defineComponent({
     const getIntegrationList = () => {
       loadingData.value = true
       console.log('获取融合服务列表------------>')
-      let postData = {
-        limit: currentPageSize.value,
-        page: currentPage.value,
-        orderField: paramsGetResources.orderField,
-        orderType: paramsGetResources.orderType,
-        name: searchValue.value,
-        type: titleName.value[number.value].name,
-      }
-
-      getIntegrationServicesList(postData).then(
+      paramsGetResources.name = searchValue.value;
+      console.log('paramsGetResources------------>', paramsGetResources);
+      getIntegrationServicesList(paramsGetResources).then(
         (res) => {
           loadingData.value = false
           if (res.data.code !== 0) {
@@ -190,52 +193,66 @@ export default defineComponent({
       } else {
         delete paramsGetResources.deptIds
       }
-      getAppResources()
-      console.log('paramsGetResources', paramsGetResources)
+      getIntegrationList()
+      console.log('paramsGetResources-----paramsGetResources------->', paramsGetResources);
     })
+
     mybus.on('changePage', (page) => {
-      paramsGetResources.pageNum = page
-      getAppResources('分页查询')
+      paramsGetResources.page = page
+      console.log('paramsGetResources----changePage-------->', paramsGetResources);
+      getIntegrationList('分页查询')
     })
+
     mybus.on('changeSelcted', () => {
-      getAppResources()
+      getIntegrationList()
     })
 
     mybus.on('refresh', () => {
-      paramsGetResources.pageNum = 1
+      paramsGetResources.page = 1
       currentPage.value = 1
-      getAppResources()
+      getIntegrationList()
     })
     mybus.on('changeCondition', (condition) => {
-      console.log('------>', condition)
+      console.log('changeCondition------>', condition)
       paramsGetResources.orderField = condition.orderField
       paramsGetResources.orderType = condition.orderType
-      getAppResources()
+      getIntegrationList()
     })
 
     const pageChange = (val) => {
-      console.log(val)
-      loading.value = true
+      console.log('val-----pageChange------->', val);
       currentPage.value = val
-      paramsGetResources.pageNum = val
-      let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-      getAppResources(params)
-    }
+      paramsGetResources.page = val
+      getIntegrationList() //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+      console.log('paramsGetResources----pageChange-------->', paramsGetResources);
 
-    onMounted(() => {
-      getAppResources()
-    })
+    }
 
     // 分页
     const onShowSizeChange = (current, pageSize) => {
       currentPage.value = current
       currentPageSize.value = pageSize
-      paramsGetResources.pageNum = current
-      paramsGetResources.pageSize = pageSize
-      getAppResources()
+      paramsGetResources.page = current
+      paramsGetResources.limit = pageSize
+      getIntegrationList()
     }
-    watch(currentPageSize, () => {
-      console.log('pageSize', currentPageSize.value)
+
+    // 存储查询条件到本地
+    const saveSearchCodition = () => {
+      console.log('融合服务------------>', searchData);
+      localStorage.setItem(
+        'integrationServices',
+        JSON.stringify(paramsGetResources)
+      )
+    }
+
+    onMounted(() => {
+      if (storageSearchInfo) {
+        handleSetSearchData()
+      } else {
+        getIntegrationList()
+      }
+
     })
 
     return {
@@ -245,17 +262,20 @@ export default defineComponent({
       resourceTotal,
       pageChange,
       Cardsname,
-      getAppResources,
-      chongzhi,
+      getIntegrationList,
+      resetAction,
       onSearch,
       currentPageSize,
       pageSizeOptions,
-      current,
       loading,
       titleName,
       changeCards,
       number,
       loadingData,
+      onShowSizeChange,
+      saveSearchCodition,
+      searchResultListDom,
+
     }
   },
   components: {
@@ -277,8 +297,6 @@ export default defineComponent({
   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;
diff --git a/front/src/views/home/packagingDetails.vue b/front/src/views/home/packagingDetails.vue
index c8043426..cec7beee 100644
--- a/front/src/views/home/packagingDetails.vue
+++ b/front/src/views/home/packagingDetails.vue
@@ -2,6 +2,7 @@
   <!-- 青岛 -->
   <div class="details-pageconetent">
     <home-header></home-header>
+    <detail-back></detail-back>
     <div class="content-box" v-loading="loadingPage">
       <div class="package-title">打包模式</div>
       <div class="basic-info">
@@ -70,6 +71,7 @@ import { message } from 'ant-design-vue'
 import { getIntegrationDetail } from '@/api/home'
 import HomeHeader from '@/views/home/components/header'
 import { scInsert, scDel } from '@/api/personalCenter'
+import detailBack from '@/views/home/detailBack.vue'
 
 const router = useRouter()
 const id = router.currentRoute.value.query.id
@@ -110,7 +112,6 @@ const getIntegrationServicesDeatil = (id) => {
       }
       detailInfoObj.value = res.data.data || {}
       console.log('detailInfoObj------------>', detailInfoObj);
-
       let fuseResourceList = detailInfoObj.value.fuseResourceList || []
       abilityList.value.map(v => {
         let list = fuseResourceList.filter(x => x.type == v.name) || [];
@@ -197,7 +198,6 @@ const addCollect = () => {
         }
       })
         .catch(err => {
-          console.log('err------------>', err);
           message.success(err)
         })
     } else {
@@ -216,16 +216,13 @@ const addCollect = () => {
         }
       })
         .catch(err => {
-          console.log('err------------>', err);
           message.success(err)
         })
     }
   }
 }
-
 getIntegrationServicesDeatil(id)
 
-
 </script>
 <style lang="less" scoped>
 .flex-row-start {