From 8a02cc43b4b1405d6df1f356c7805bdb22db15ef Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 18 Nov 2022 15:37:00 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=94=BF=E5=8A=A1=E4=BA=91=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/home.js                         |  8 ++--
 .../components/GovernmentCloudResources.vue   | 43 ++++++++++++++-----
 front/src/views/home/infrastructurePage.vue   | 23 ++++++++--
 3 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/front/src/api/home.js b/front/src/api/home.js
index fb90e0d0..4851a2f0 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
  * @LastEditors: Light
- * @LastEditTime: 2022-11-18 09:16:13
+ * @LastEditTime: 2022-11-18 14:09:20
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -526,10 +526,10 @@ export function getGisByArea(data) {
     data,
   })
 }
-export function getPolicyCloudService(params) {
+export function getPolicyCloudService(data) {
   return request({
     url: '/resource/getPolicyCloudService',
-    method: 'get',
-    params,
+    method: 'post',
+    data,
   })
 }
diff --git a/front/src/views/home/components/GovernmentCloudResources.vue b/front/src/views/home/components/GovernmentCloudResources.vue
index 2752e22b..4861b8fb 100644
--- a/front/src/views/home/components/GovernmentCloudResources.vue
+++ b/front/src/views/home/components/GovernmentCloudResources.vue
@@ -2,36 +2,59 @@
  * @Author: Light
  * @Date: 2022-11-16 16:46:16
  * @LastEditors: Light
- * @LastEditTime: 2022-11-17 09:46:45
+ * @LastEditTime: 2022-11-18 15:35:25
  * @Description: 政务云资源列表
 -->
 <template>
   <div class="top">
-    <div>检索结果：60项</div>
+    <div>检索结果：{{ props.governmentCloud.total }}项</div>
     <div>
       使用声明:
       附加增值服务，委办局单位可以根据自身需求，按需采购，由采购单位付费。
     </div>
   </div>
-  <div class="bottom">
+  <div
+    class="bottom"
+    v-for="(item, index) in props.governmentCloud.data"
+    :key="item.service_item_tier1 + index"
+  >
     <div class="left"></div>
     <div class="right">
       <div class="title">
         <div>
-          <div class="name">云主机</div>
-          <div class="type">基础服务</div>
+          <div class="name">{{ item.service_item_tier1 }}</div>
+          <div class="type">{{ item.service_type }}</div>
         </div>
-        <div>年份：2022</div>
+        <div>年份：{{ item.year }}</div>
       </div>
-      <div class="text">云主机配置</div>
+      <div class="text">{{ item.service_description }}</div>
       <div class="info">
-        <div>一级条目：主机服务</div>
-        <div>规格：1H2G</div>
+        <div>一级条目：{{ item.service_item_tier2 }}</div>
+        <div>规格：{{ item.specification }}</div>
       </div>
     </div>
   </div>
+  <a-pagination
+    v-model:current="current"
+    :pageSize="5"
+    :total="props.governmentCloud.total"
+    :showSizeChanger="false"
+    @change="changeCurrent"
+    show-less-items
+  />
 </template>
-<script setup></script>
+<script setup>
+  import { ref, defineProps, defineEmits } from 'vue'
+  const props = defineProps({
+    governmentCloud: { type: Object, default: null },
+  })
+  const emit = defineEmits(['getGovernmentCloud'])
+  const current = ref(props.governmentCloud.current)
+  const changeCurrent = (current) => {
+    console.log(current)
+    emit('getGovernmentCloud', current)
+  }
+</script>
 <style lang="less" scoped>
   .top {
     display: flex;
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 316597ea..99fb0dbe 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -562,9 +562,13 @@
       </div>
       <div
         class="infrastructrue-table"
+        :key="showKey"
         v-if="!wrjFlag && selectType == '政务云资源'"
       >
-        <GovernmentCloudResources></GovernmentCloudResources>
+        <GovernmentCloudResources
+          :governmentCloud="governmentCloud"
+          @getGovernmentCloud="getGovernmentCloud"
+        ></GovernmentCloudResources>
       </div>
       <!-- 西海岸-无人机、单兵设备 -->
       <div class="infrastructrue-table" v-else-if="isXiHaiAn && wrjFlag">
@@ -1553,6 +1557,7 @@
   }
   const emits = defineEmits(['add'])
   const selectType = ref('政务云资源')
+  const showKey = ref(0)
   //表格的高度
   let tableHeight = ref('600')
   //tab切换点击事件
@@ -1783,7 +1788,9 @@
         clickList.value[indexFather].content = [name]
       }
       if (!isXiHaiAn) {
-        getGovernmentCloud()
+        getGovernmentCloud(1)
+        governmentCloud.current = 1
+        showKey.value++
       }
     }
     // 改变查询摄像头接口的labelCode数组
@@ -2313,9 +2320,17 @@
     } else {
     }
   }
-  const getGovernmentCloud = () => {
-    getPolicyCloudService().then((res) => {
+  const governmentCloud = reactive({ data: [], total: 0, current: 1 })
+  const getGovernmentCloud = (page) => {
+    getPolicyCloudService({
+      limit: 5,
+      page: page || 1,
+      name: '',
+      type: clickList.value[1].content[0],
+    }).then((res) => {
       console.log('获取政务云资源======》', res.data.data)
+      governmentCloud.data = res.data.data.list
+      governmentCloud.total = res.data.data.total
     })
   }
   // 切换tab

From 84ea475d6472e2462005790a034fb7e0828c1ec5 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 18 Nov 2022 15:38:56 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=20=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue  | 34 +++++++++++--------
 .../views/home/infrastructureApplication.vue  | 12 +++++++
 2 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 front/src/views/home/infrastructureApplication.vue

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 4a804b38..7bd057a7 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1,5 +1,4 @@
 <template>
-  itShowQingDao
   <!-- 青岛 -->
   <div class="details-pageconetent" v-if="whoShow1 && whoShow1.itShowQingDao">
     <home-header></home-header>
@@ -305,7 +304,7 @@
     <div class="details-pageconetent-left" v-if="Cardsname != '基础设施'">
       <detailsPageconetentTree />
     </div>
-    <div class="details-pageconetent-left" style="left:0.16rem" v-else>
+    <div class="details-pageconetent-left" style="left: 0.16rem" v-else>
       <detailsPageInfrastructureTreeXha />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
@@ -436,7 +435,11 @@
         <a-empty />
       </div>
     </div>
-    <div class="top" style="width: 13.5rem;margin-left:0" v-else-if="Cardsname === '基础设施'">
+    <div
+      class="top"
+      style="width: 13.5rem; margin-left: 0"
+      v-else-if="Cardsname === '基础设施'"
+    >
       <div class="top-title">
         <div
           v-for="item in titleName"
@@ -507,6 +510,9 @@
         :resourceTotal="resourceTotal"
       ></KnowledgeBase>
     </div>
+    <div v-if="Cardsname == '基础设施'">
+      <infrastructureApplication></infrastructureApplication>
+    </div>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
         <template #title>问答机器人</template>
@@ -778,6 +784,7 @@
   import infrastructurePageXha from '@/views/home/infrastructurePageXha.vue'
   import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
   import detailsPageInfrastructureTreeXha from '@/views/home/detailsPageInfrastructureTreeXha.vue'
+  import infrastructureApplication from '@/views/home/infrastructureApplication.vue'
   import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   import { useStore } from 'vuex'
   import { message } from 'ant-design-vue'
@@ -803,7 +810,7 @@
       const handleAdd = (value) => {
         flag.value = value
       }
-          const titleName=ref([])
+      const titleName = ref([])
       const openMonitor = () => {
         window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
       }
@@ -904,15 +911,14 @@
         name: '',
       })
       //调整标题顺序  西海岸基础设施放在最前面
-       const setTitle = () => {
-        let  title = titleNameArray
-        let whoShow1 = ref(whoShow)
-      if( whoShow1 && whoShow1.value.itShowXiHaiAn){
-        title[0] = title.splice(2, 1, title[0])[0];
-      
-      }
-      titleName.value=title
-      }
+      const setTitle = () => {
+        let title = titleNameArray
+        let whoShow1 = ref(whoShow)
+        if (whoShow1 && whoShow1.value.itShowXiHaiAn) {
+          title[0] = title.splice(2, 1, title[0])[0]
+        }
+        titleName.value = title
+      }
       // 查询
       const onSearch = () => {
         loading.value = true
@@ -1751,7 +1757,7 @@
       onMounted(() => {
         // 从本地读取查询条件，赋值
         //西海岸基础设施放在最前面
-        setTitle();
+        setTitle()
         handleSetSearchData()
         listKey2.value++
         // 获取筛选条件
diff --git a/front/src/views/home/infrastructureApplication.vue b/front/src/views/home/infrastructureApplication.vue
new file mode 100644
index 00000000..d8688692
--- /dev/null
+++ b/front/src/views/home/infrastructureApplication.vue
@@ -0,0 +1,12 @@
+<!--
+ * @Author: Light
+ * @Date: 2022-11-18 11:53:43
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-18 11:54:11
+ * @Description: 告诉大家这是什么
+-->
+<template>
+  <div>基础设施申请</div>
+</template>
+<script setup></script>
+<style lang="less" scoped></style>

From bc73b269a6e6befaeaf6777e0ef26a7a2f120a96 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 18 Nov 2022 15:54:43 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E6=94=BF=E5=8A=A1=E4=BA=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePage.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 99fb0dbe..103196b1 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -1672,6 +1672,7 @@
               'PaaS服务',
               '安全服务',
               '大数据服务',
+              '运营服务',
               '附加增值服务',
             ]
           } else {

From e48f8cc6cea78347922b06037f8f9dfcc0b16053 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Fri, 18 Nov 2022 16:38:42 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/capacityOnTheShelf/Algorithm.vue    |   2 +-
 .../home/detailsPageInfrastructureTreeXha.vue | 239 +++++++++++++++---
 2 files changed, 200 insertions(+), 41 deletions(-)

diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index 128e67b0..18fc2c41 100644
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/front/src/views/capacityOnTheShelf/Algorithm.vue
@@ -230,7 +230,7 @@
       >
         <button class="buzhou">提交</button>
       </a-popconfirm>
-      <button class="buzhou" v-else-if="服务商联系电话 === '部署与使用'" @click="submit()">
+      <button class="buzhou" v-else-if="showView === '部署与使用'" @click="submit()">
         提交
       </button>
        <button class="quxiao" @click="close()">取消</button>
diff --git a/front/src/views/home/detailsPageInfrastructureTreeXha.vue b/front/src/views/home/detailsPageInfrastructureTreeXha.vue
index b30661cb..b9f1e455 100644
--- a/front/src/views/home/detailsPageInfrastructureTreeXha.vue
+++ b/front/src/views/home/detailsPageInfrastructureTreeXha.vue
@@ -1,8 +1,34 @@
 <template>
   <div class="wrapper">
-    <div class="wrapper-title-left-tree" :key="showKey">
+    <div class="nav">
+      <div :class="{ active: itemIndex == 1 }" @click="btnClick(1)">
+        <span
+          class="photo"
+          :style="{
+            backgroundImage: `url(${bumenImg}) `,
+            backgroundSize: 'cover',
+          }"
+        ></span>
+        <span>部门</span>
+      </div>
+      <div :class="{ active: itemIndex == 2 }" @click="btnClick(2)">
+        <span
+          class="photo"
+          :style="{
+            backgroundImage: `url(${biaoqianImg}) `,
+            backgroundSize: 'cover',
+          }"
+        ></span>
+        <span>标签</span>
+      </div>
+    </div>
+    <div v-if="itemIndex == 1" class="wrapper-title-left-tree" :key="showKey">
       <div v-for="item in treeData" :key="item.id" class="primaryNode">
-        <div class="top" @click="showBottom(item)" :class="item.show ? 'topSelect' : ''">
+        <div
+          class="top"
+          @click="showBottom(item)"
+          :class="item.show ? 'topSelect' : ''"
+        >
           {{ item.name }}
           ({{ item.channelCount }})
           <DownOutlined v-show="!item.show" />
@@ -10,13 +36,28 @@
         </div>
         <div class="bottom" v-show="item.show">
           <div v-for="val in item.children" :key="val.id" class="item">
-            <div class="up" :class="selectId == val.id ? 'select' : ''"
-              @click="showDown(item, val), onSelect(item, val)">
+            <div
+              class="up"
+              :class="selectId == val.id ? 'select' : ''"
+              @click="showDown(item, val), onSelect(item, val)"
+            >
               <div>
-                <svg t="1654068878091" class="icon" viewBox="0 0 1024 1024" version="1.1"
-                  xmlns="http://www.w3.org/2000/svg" p-id="2156" width="0.25rem" height="0.25rem"
-                  v-show="selectId == val.id">
-                  <path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z" p-id="2157" fill="#0058e1"></path>
+                <svg
+                  t="1654068878091"
+                  class="icon"
+                  viewBox="0 0 1024 1024"
+                  version="1.1"
+                  xmlns="http://www.w3.org/2000/svg"
+                  p-id="2156"
+                  width="0.25rem"
+                  height="0.25rem"
+                  v-show="selectId == val.id"
+                >
+                  <path
+                    d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z"
+                    p-id="2157"
+                    fill="#0058e1"
+                  ></path>
                 </svg>
                 <span class="name">{{ val.name }}({{ val.channelCount }})</span>
               </div>
@@ -27,13 +68,30 @@
               </span>
             </div>
             <div class="down" v-show="val.show">
-              <div v-for="child in val.children" :key="child.id" class="child"
-                :class="selectId == child.id ? 'select2' : ''" @click="onSelect(item, child, child)">
+              <div
+                v-for="child in val.children"
+                :key="child.id"
+                class="child"
+                :class="selectId == child.id ? 'select2' : ''"
+                @click="onSelect(item, child, child)"
+              >
                 <div>
-                  <svg t="1654068878091" class="icon" viewBox="0 0 1024 1024" version="1.1"
-                    xmlns="http://www.w3.org/2000/svg" p-id="2156" width="0.25rem" height="0.25rem"
-                    v-show="selectId == child.id">
-                    <path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z" p-id="2157" fill="#0058e1"></path>
+                  <svg
+                    t="1654068878091"
+                    class="icon"
+                    viewBox="0 0 1024 1024"
+                    version="1.1"
+                    xmlns="http://www.w3.org/2000/svg"
+                    p-id="2156"
+                    width="0.25rem"
+                    height="0.25rem"
+                    v-show="selectId == child.id"
+                  >
+                    <path
+                      d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z"
+                      p-id="2157"
+                      fill="#0058e1"
+                    ></path>
                   </svg>
                   <span class="name">
                     {{ child.name }}
@@ -46,6 +104,20 @@
         </div>
       </div>
     </div>
+    <div v-if="itemIndex == 2" class="wrapper-title-left-tree">
+      <div v-for="(item, index) in biaoqianList">
+        <div class="titleName">{{ item.placeTypeName }}</div>
+        <div class="glgkmk" v-for="(child, index) in item.children">
+          <div
+            class="glgknum"
+            :class="{ active: child.placeTypeCode == chooseId }"
+            @click="tabClick(child.placeTypeCode)"
+          >
+            {{ child.placeTypeName }}
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -59,29 +131,35 @@ import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
 
 export default defineComponent({
   setup() {
+    const biaoqianList = ref([])
+    const bumenImg = require('@/assets/newHome/bumen.png')
+    const biaoqianImg = require('@/assets/newHome/biaoqian.png')
     const router = useRouter()
     const whoShow1 = ref(whoShow)
     const showKey = ref(0)
     const treeData = ref([])
     const selectId = ref('')
-
+    let itemIndex = ref(1)
+    let chooseId = ref('')
+    //切换tab
+    const btnClick = (index) => {
+      itemIndex.value = index
+    }
+    //选择标签内容
+    const tabClick = (id) => {
+      chooseId.value = id
+    }
     // 初始化
     const init = async () => {
       treeData.value = []
-      console.log(
-        'router.currentRoute.value.query.select',
-        router.currentRoute.value.query.select
-      )
-      let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB
+      let select =
+        router.currentRoute.value.query.select ||
+        DETAIL_PAGE_CONTENT_DEFAULT_TAB
       if (select === '123') {
         select = ''
       }
-      console.log(
-        '获取url中的select=====================>',
-        router.currentRoute.value.query.select
-      )
       if (select == '基础设施') {
-        let res = {};
+        let res = {}
         if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
           res = await getCameraAllOrgan({ parentId: 'S4NbecfYB1DBH8HNULGS34' })
         } else {
@@ -90,9 +168,27 @@ export default defineComponent({
             areaId: '70be8c5b664f4bcf869d82f2e8335051',
           })
         }
-        treeData.value = res.data && res.data.data || []
+        treeData.value = (res.data && res.data.data) || []
+        //获取标签列表=========
+        biaoqianList.value = [
+          {
+            placeTypeName: '政府机构',
+            children: [
+              { placeTypeName: '行政中心', placeTypeCode: '1' },
+              { placeTypeName: '行政中心', placeTypeCode: '12' },
+              { placeTypeName: '行政中心', placeTypeCode: '14' },
+            ],
+          },
+          {
+            placeTypeName: '政府机构1',
+            children: [
+              { placeTypeName: '行政中心', placeTypeCode: '2' },
+              { placeTypeName: '行政中心', placeTypeCode: '3' },
+            ],
+          },
+        ]
         // 只有一个，默认展开到二级菜单
-        if(res.data && res.data.data.length == 1) {
+        if (res.data && res.data.data.length == 1) {
           showBottom(treeData.value[0])
         }
       }
@@ -102,11 +198,6 @@ export default defineComponent({
     })
 
     const onSelect = async (item, val, child) => {
-      console.log('item--------onSelect---->', item);
-      console.log('val------onSelect------>', val);
-      console.log('child-----onSelect------->', child);
-      mybus.emit('getCameraByParentId', val.id)
-      mybus.emit('getListByParentId', val.id)
       let res = {}
       if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
         res = await getCameraAllOrgan({ parentId: val.id })
@@ -137,8 +228,8 @@ export default defineComponent({
     })
 
     const showBottom = async (item) => {
-      item.show = !item.show;
-      let res = {};
+      item.show = !item.show
+      let res = {}
       if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
         res = await getCameraAllOrgan({ parentId: item.id })
       } else {
@@ -148,17 +239,17 @@ export default defineComponent({
 
       treeData.value.map((treeDataItem, index) => {
         if (item.id == treeDataItem.id) {
-          treeData.value[index].children = res.data && res.data.data || []
+          treeData.value[index].children = (res.data && res.data.data) || []
           console.log('treeData.value.[index]', treeData.value[index])
         }
       })
     }
     const showDown = (item, val) => {
       selectId.value = val.id
-      console.log('item---showDown--------->', item);
-      console.log('val----showDown-------->', val);
+      console.log('item---showDown--------->', item)
+      console.log('val----showDown-------->', val)
       if (item.children) {
-        val.show = !val.show;
+        val.show = !val.show
         // 取消选中
         if (!val.show) {
           selectId.value = ''
@@ -166,12 +257,19 @@ export default defineComponent({
       }
     }
     return {
+      btnClick,
+      tabClick,
       treeData,
       showKey,
       onSelect,
       showBottom,
       showDown,
       selectId,
+      itemIndex,
+      bumenImg,
+      biaoqianImg,
+      biaoqianList,
+      chooseId,
     }
   },
   beforeUnmount() {
@@ -185,6 +283,67 @@ export default defineComponent({
 })
 </script>
 <style lang="less" scoped>
+.titleName {
+  font-size: 18px;
+  color: #1e1a1a;
+  margin-bottom: 10px;
+  padding-left: 10px;
+  border-left: 6px solid #1296db;
+}
+.glgkmk {
+  cursor: pointer;
+  text-align: center;
+  position: relative;
+  display: inline-block;
+  width: 30%;
+  margin-bottom: 10px;
+  .active {
+    color: #0058e1;
+  }
+  .glgknum {
+    // color: #000000;
+  }
+}
+
+.glgkmk :hover {
+  color: #0058e1;
+}
+.nav {
+  margin-bottom: 13px;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  font-size: 18px;
+  font-family: 'Alibaba PuHuiTi';
+  color: #000000;
+  line-height: 0.32rem;
+  margin-bottom: 0.1rem;
+
+  .photo {
+    display: inline-block;
+    height: 0.3rem;
+    width: 0.3rem;
+    margin-right: 0.1rem;
+  }
+
+  div {
+    padding: 0 0.1rem;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+  }
+
+  div:hover {
+    color: #1296db;
+  }
+
+  .active {
+    font-weight: 600;
+    color: #1296db;
+    border-bottom: 0.02rem solid #1296db;
+  }
+}
+
 .primaryNode {
   .top {
     width: 100%;
@@ -232,7 +391,7 @@ export default defineComponent({
       border-top: 0.01rem solid #ccc;
       padding: 0 0.1rem;
 
-      &>div {
+      & > div {
         display: flex;
         justify-content: flex-start;
       }
@@ -289,7 +448,7 @@ export default defineComponent({
         align-items: center;
         padding: 0 0.1rem;
 
-        &>div {
+        & > div {
           display: flex;
           justify-content: flex-start;
         }

From 281143503ae5f04d0d4cd5af200c7efe63f6dd3a Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Fri, 18 Nov 2022 16:40:34 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/assets/newHome/biaoqian.png | Bin 0 -> 1040 bytes
 front/src/assets/newHome/bumen.png    | Bin 0 -> 718 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 front/src/assets/newHome/biaoqian.png
 create mode 100644 front/src/assets/newHome/bumen.png

diff --git a/front/src/assets/newHome/biaoqian.png b/front/src/assets/newHome/biaoqian.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b190f68ecbf78ae983178c2c3f7b6525d5ea1dc
GIT binary patch
literal 1040
zcmV+r1n>KaP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&%1J~)RA@u()=i5XMHmP0|I=A7f>YypCql0J1!NDBYebwLldQ)0ibm9s-I}OG
zG~$XHVqWZ;6<^Ruq6TAjB~yc-NA)1_3mEXS7zku<nHmX!fc=D-NpE_GshR4xm4%t(
zbXE8NS5MW`P1xi=+T{5$0sP+;oK#>^fs89K*+Ll?F!S`x71+MOQ)SVv5OF1hH%;&=
z09OE-25=qBOS&$8$(+=3gG7L8qccO`od~(YMAHOxLskGxjS5KM*`_Qn7lCjF)B>}Y
z31`!WC<@^W@B?!ago9}T-FZbIoB>s3&JplL1Yls52v@;aW$>y8?<!MxnM15>0ah;5
z%PYPzKLB_<j?Nq545+Ej?+kvZABL}JS>EbW4PTk>0qiLX;SBIqdj+6vw}V{NQp~sj
zx?_B0z60=75eO$hzg2c_fTC_g%UYIZd*Om>3q)IXF>r|xF59|IO_^^PcqVUz6W|eb
z<Gv}}yd2yAK}(9>f%aABSAe(ouhAJTOV8UX<12F-z;k&boB)q4ng_!W7o!IgaIh&w
za2v1$@a|rG=2OjjdEcn5<*UvqfM3W9;RNtidnZ6Y-T~ZsG1XLiH^Y0FfWMjl`%~BN
z{cYUYsH*mt1X>48+nwA1!8Hl;dMn;vX_{%)OKTMw7kJq9sxqGw@N(8lxB*n>1i-IF
z5A(dcwqBUK`%0SN@j1RSp8|L_3&IW1Fz3POb)D`{OW`!n1?V@-A{YnKBAkNws&g9P
zc=tH3rC56_y96D1umht&m`{Un0|aIV2tN;mIH#p}GHdu~zTYq>!Rx=ZTn@Gqp!<-1
zx1pthz-P4-Pv?cG2JPcS^m>v?I0I}50={iZ@oZj*nra_q&>>euBEX1BoY7KP-@r+6
zHP!i$!Ed=B5(DfA`dZ7<i%G-U#{0^=58&`PL@Iy{!Qii2viwqRh`=m>@NVpW|7a<q
zFXG<csR4EbzGzADN>)U5@!$Kske3+zz}mfte$w-$N7q*+<C84i=`$_G{<OCq7M?(V
zg&xhe=I*(aE5Ldt2%qSAF_#pPBz)#A6c0DF5{!nf3+akT8a`LRh)R5{=f&EGpbe8I
zeC`12!Dc?us+Zr$JA5Gk8-l<eHD&qDK}6b>kM5JHjgH#e!_EYOjx=TI?Py-s@P$<%
z3TSDuA80Aw$s>H>0PDeKyhlX4;x8#%pC8x33fn?sTWoAV+VC4vfic?&S;B89VAyub
z8h*n8F~l(@`~mWg41U{;+w+6hH{=W?4V7g41dwF4iWs};D{u?gXYW9R&5YUr0000<
KMNUMnLSTZxd+DeE

literal 0
HcmV?d00001

diff --git a/front/src/assets/newHome/bumen.png b/front/src/assets/newHome/bumen.png
new file mode 100644
index 0000000000000000000000000000000000000000..019e4f41e03a682e81420ae5037338eca2e8f814
GIT binary patch
literal 718
zcmV;<0x|uGP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%h)G02RA@u(SwBn@VHE$pqa-9^Vv7uH3?wG%z-Dm5NloaX7+7^;axok;ICG7O
zo13l>R9YOI&_yQ$B<QM6#y>42)tIz!&wRB<uD$knch>@!e7E+!_j|whe&4<KT?q+)
zDB<}-6FBJ(cBBK@Txo)U>&&<;Aw+~723{BDGV2oiAe-0(vi7fA1mi`NL>SKPf_467
z6kpdTHi1dI^p1fs0AE1#)R&Co_%Vp?0vIOX{hF1zdZGkOyTr8wm>=fn2NosCm`lY)
z5G^R%yp@Sn#8}QM0Zl-6KqA@z8!aI%AuXYV&w++X%>2yPP{a5?=)4c}y;C!ZC++e@
zM)hM9B@%istyyP3Me*&}E~ElYEd3lejGjBq+b99&Tp$Ma4nYY!j&rcOK0o*-PV&k(
z_9_vSK$IB~mXIc(I}lbgP4;35nYrBsW*!fNM?lS<fzXGwU}dgJutE_4v*^Mi0S>ZJ
zgu6yS1t;dW;v`!QvNq1D!>VgtCm^kkm}K2BYnL{<N1%R>4O1OWKv02}hd65&XAKx*
z4tUtJbF^Fw4A364vz<!yJ$e4%%r^lhrXKwn+IK3mV7|b>P#g>&0q-XdNiv>YNBrh+
zwH_wE`#Nque+>j~J}wXTR;oXg@s*Lj59$6?`6!TL`5?9Z_3vn9AN?Sn$<Ga}1WxB%
zaT-j^ox*4!P}?f0XF~<Qe<OWV?uWm>+Wfus`FnL#@^Q=C;Z9&^0;&zV0|K$OE0UIw
zmXJU`K}FIMI#m)%{3KS@G(DqUD9^eXt>mrrjKs&Zcb5U4me@Ah_%X!WXge@>8<qY)
z=EhNX?B;DW3WoSj9KKq|<Dm&0Po3MNB)$Xx01uLrPb@x3cmMzZ07*qoM6N<$g5JqK
Ap#T5?

literal 0
HcmV?d00001


From a5f3b4b023fadec4ceae6310e444af5cdef94cfb Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 18 Nov 2022 16:55:55 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9C=8D=E5=8A=A1=20?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=B5=84=E6=BA=90=E6=B7=BB=E5=8A=A0=E5=AE=8C?=
 =?UTF-8?q?=E5=85=A8=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/ability/bsabilityai.vue | 37 +++++++++++++++++++
 .../modules/ability/bsabilityservice.vue      | 37 +++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 09636f2a..53dd6b22 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -157,6 +157,13 @@
               @click="deleteHandle2(scope.row.id)"
               >{{ $t('delete') }}</el-button
             >
+            <el-button
+              v-if="superAdmin == 1"
+              type="text"
+              size="small"
+              @click="deleteCompletely(scope.row)"
+              >完全删除</el-button
+            >
             <el-button type="text" size="small" @click="showDetail(scope.row)"
               >详情</el-button
             >
@@ -256,6 +263,7 @@ export default {
   mixins: [mixinViewModule],
   data () {
     return {
+      superAdmin: '',
       required: ['归属部门', '部门联系人', '部门联系人电话', '应用领域', '共享条件', '算法名称', '算法描述', '图层名称', '图层描述', '组件名称', '组件描述', '组件地址', '服务地址', '服务接口', '接口请求方式', '算法类别'],
       notFilled: [],
       insertList: [],
@@ -317,6 +325,10 @@ export default {
   created () {
     this.dataForm.name = ''
     this.dataForm.type = '组件服务'
+    this.$http.get('/sys/user/info').then(res => {
+      console.log('res', res.data.data)
+      this.superAdmin = res.data.data.superAdmin
+    })
   },
   mounted () {
     // window.addEventListener('resize', this.a)
@@ -671,6 +683,31 @@ export default {
       arr.push('常见问题')
       this.$refs.putOnTheShelf.submit(arr)
     },
+    // 完全删除
+    deleteCompletely (row) {
+      console.log('完全删除===', row)
+      this.$confirm('确认是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$http.post('/resource/delResBySuAd?id=' + row.id).then(res => {
+          console.log('删除结果', res.data)
+          if (res.data.code == 0) {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            })
+          }
+          this.getDataList()
+        })
+      }).catch(() => {
+        // this.$message({
+        //   type: 'info',
+        //   message: '已取消删除'
+        // });
+      })
+    },
     submitData () {
       console.log('提交11111111111===============>', this.putOnTheShelfList, this.submitFrom)
       const arr = []
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index f3f404db..a9886b3c 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -145,6 +145,13 @@
               @click="deleteHandle2(scope.row.id)"
               >{{ $t("delete") }}</el-button
             >
+            <el-button
+              v-if="superAdmin == 1"
+              type="text"
+              size="small"
+              @click="deleteCompletely(scope.row)"
+              >完全删除</el-button
+            >
             <el-button type="text" size="small" @click="showDetail(scope.row)"
               >详情</el-button
             >
@@ -234,6 +241,7 @@ export default {
   mixins: [mixinViewModule],
   data () {
     return {
+      superAdmin: '',
       required: ['归属部门', '部门联系人', '部门联系人电话', '应用领域', '共享条件', '应用名称', '应用描述', '应用类型'],
       notFilled: [],
       mixinViewModuleOptions: {
@@ -286,6 +294,10 @@ export default {
   created () {
     this.dataForm.name = ''
     this.dataForm.type = '应用资源'
+    this.$http.get('/sys/user/info').then(res => {
+      console.log('res', res.data.data)
+      this.superAdmin = res.data.data.superAdmin
+    })
   },
   mounted () {
     // window.addEventListener('resize', this.a)
@@ -522,6 +534,31 @@ export default {
           // 将数据传递给引入的组件
         })
     },
+    // 完全删除
+    deleteCompletely (row) {
+      console.log('完全删除===', row)
+      this.$confirm('确认是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$http.post('/resource/delResBySuAd?id=' + row.id).then(res => {
+          console.log('删除结果', res.data)
+          if (res.data.code == 0) {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            })
+          }
+          this.getDataList()
+        })
+      }).catch(() => {
+        // this.$message({
+        //   type: 'info',
+        //   message: '已取消删除'
+        // });
+      })
+    },
     // 应用与基础设施
     applyAndInfrastructure (val) {
       const type = '基础设施'

From 97ddab81b820398a42b825d794226bf19975ebd3 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 18 Nov 2022 17:05:26 +0800
Subject: [PATCH 07/10] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePageXha.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/front/src/views/home/infrastructurePageXha.vue b/front/src/views/home/infrastructurePageXha.vue
index 316597ea..ff4d6d64 100644
--- a/front/src/views/home/infrastructurePageXha.vue
+++ b/front/src/views/home/infrastructurePageXha.vue
@@ -560,12 +560,6 @@
           @change="handleMeeting"
         ></a-table>
       </div>
-      <div
-        class="infrastructrue-table"
-        v-if="!wrjFlag && selectType == '政务云资源'"
-      >
-        <GovernmentCloudResources></GovernmentCloudResources>
-      </div>
       <!-- 西海岸-无人机、单兵设备 -->
       <div class="infrastructrue-table" v-else-if="isXiHaiAn && wrjFlag">
         <a-table

From 778122d24969b6130a46ba6a728a7e93f7c046a9 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 18 Nov 2022 18:33:04 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=20=20?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/file.js                         | 12 ++-
 front/src/views/home/DetailsPageconetent.vue  |  1 +
 .../views/home/videoSurveillance/index.vue    | 86 +++++++++++++++----
 3 files changed, 79 insertions(+), 20 deletions(-)

diff --git a/front/src/api/file.js b/front/src/api/file.js
index b4f0d1ce..7abf3ed9 100644
--- a/front/src/api/file.js
+++ b/front/src/api/file.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-20 17:16:35
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-26 17:57:52
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-18 17:52:05
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -97,6 +97,14 @@ export function getHls(params) {
     config2
   )
 }
+// 西海岸 POI搜索
+export function getListForPOI(params) {
+  return axios.get(
+    'http://10.134.135.3:21009/service/lbs/coder/geocoding2?appKey=675d95594136456bb7b1434dda31953f&city=青岛&keywords=' +
+      params.keywords,
+    config2
+  )
+}
 
 // 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537)
 let _cameraUrl =
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 7bd057a7..3b14242c 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1959,6 +1959,7 @@
       infrastructurePageXha,
       detailsPageInfrastructureTree,
       detailsPageInfrastructureTreeXha,
+      infrastructureApplication,
     },
     beforeUnmount() {
       mybus.off('getCameraByParentId')
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 7f7c128a..e2f08e96 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -8,23 +8,7 @@
       </div>
 
       <div class="searchPoint">
-        <el-autocomplete
-          v-model="address"
-          placeholder="请输入地址"
-          :fetch-suggestions="
-            (queryString, cb) => {
-              searchAddressByKeyWord(queryString, cb, i)
-            }
-          "
-          :trigger-on-focus="false"
-          :popper-append-to-body="false"
-          class="address-auto-complete-input"
-          @select="
-            (addressItem) => {
-              selectedAddress(addressItem, i)
-            }
-          "
-        />
+        <!-- 第一版 -->
         <!-- <el-autocomplete
           class="inline-input"
           prefix-icon="Search"
@@ -46,6 +30,37 @@
           </template>
           <template v-slot:append>搜索</template>
         </el-autocomplete> -->
+        <!-- 第二版 -->
+        <el-select class="input-with-select" v-model="addressType" style="width: 115px" @change="address=''">
+          <el-option label="兴趣点" value="1" />
+          <el-option label="点位" value="2" />
+        </el-select>
+        <el-input
+          v-if="addressType==1"
+          v-model="address"
+          placeholder="请输入关键词"
+          class="input-with-select"
+          @keyup.enter="handleEnter"
+        >
+        </el-input>
+        <el-autocomplete
+          v-else-if="addressType==2"
+          v-model="address"
+          placeholder="请输入地址"
+          :fetch-suggestions="
+            (queryString, cb) => {
+              searchAddressByKeyWord(queryString, cb, i)
+            }
+          "
+          :trigger-on-focus="false"
+          :popper-append-to-body="false"
+          class="address-auto-complete-input"
+          @select="
+            (addressItem) => {
+              selectedAddress(addressItem, i)
+            }
+          "
+        />
       </div>
       <svg
         t="1656319660834"
@@ -77,6 +92,7 @@
 </template>
 
 <script>
+import { ElMessage } from 'element-plus'
   import { message } from 'ant-design-vue'
   import { HieimpMap } from '@/supermap/map-init'
   import TiledMap from './components/tiledMap'
@@ -92,7 +108,7 @@
     selectByLabelName,
     selectByChannelName,
   } from '@/api/videoSurveillance'
-  import { getCameraByCondition } from '@/api/file'
+  import { getCameraByCondition,getListForPOI } from '@/api/file'
   import mybus from '@/myplugins/mybus'
   import * as turf from '@turf/turf';
 
@@ -118,6 +134,7 @@
         areaModeFlag: false,
         addressMatchUrl: '',
         address: '',
+        addressType:'1',
         whoShow1: whoShow,
         mapSearchParam: {
           // 地图搜索初始化数据
@@ -181,6 +198,31 @@
       })
     },
     methods: {
+      // 查询
+      handleEnter(){
+        console.log('查询',this.address,this.addressType)
+        if(this.address){
+          getListForPOI({keywords:this.address}).then(res => {
+            console.log('POI=========>',res.data.data)
+            if(res.data.data.rows[0]){
+              let arr = res.data.data.rows[0].location.split(',')
+              this.selectedAddress({location:{y:arr[1],x:arr[0]}})
+            }else{
+              ElMessage({
+                showClose: true,
+                message: '未查询到兴趣点！',
+                type: 'warning',
+              })
+            }
+          })
+        }else{
+          ElMessage({
+            showClose: true,
+            message: '请输入兴趣点！',
+            type: 'warning',
+          })
+        }
+      },
       selectedAddress(item, index) {
         // 跳转到相应经纬度
         console.log('跳转', item)
@@ -666,6 +708,14 @@
       z-index: 988;
       cursor: pointer;
     }
+    .input-with-select{
+      width: 2.4rem;
+      svg{
+        position: relative;
+        bottom: 0;
+        right: 0;
+      }
+    }
     .icon-poylon {
       width: 0.46rem;
       bottom: 0.6rem;

From 9fe01b9d1004d69b5ba8a3ecf5657d65b818ede4 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Sat, 19 Nov 2022 16:05:31 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E6=94=BF=E5=8A=A1=E4=BA=91=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue | 40 +++++----
 front/src/views/home/infrastructurePage.vue  | 85 ++++++++++++++++++--
 2 files changed, 103 insertions(+), 22 deletions(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 3b14242c..f1a19858 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -510,9 +510,9 @@
         :resourceTotal="resourceTotal"
       ></KnowledgeBase>
     </div>
-    <div v-if="Cardsname == '基础设施'">
+    <template v-if="Cardsname == '基础设施'">
       <infrastructureApplication></infrastructureApplication>
-    </div>
+    </template>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
         <template #title>问答机器人</template>
@@ -1286,21 +1286,27 @@
           .replace({
             query: newQuery,
           })
-          .then(() => {})
-        mybus.emit('changeRoomInput', searchValue.value)
-        if (
-          whoShow1.value.itShowQingDao &&
-          paramsGetResources.type == '基础设施'
-        ) {
-          console.log('camera2', camera)
-          camera.value.getCamera(true, searchValue.value)
-        } else {
-          if (storageSearchInfo) {
-            getAppResources('分页查询')
-          } else {
-            getAppResources()
-          }
-        }
+          .then(() => {
+            mybus.emit('changeRoomInput', searchValue.value)
+            if (
+              whoShow1.value.itShowQingDao &&
+              paramsGetResources.type == '基础设施'
+            ) {
+              console.log('camera2', camera)
+              let selectType = router.currentRoute.value.query.selectType
+              if (selectType == '政务云资源') {
+                camera.value.getGovernmentCloud()
+              } else {
+                camera.value.getCamera(true, searchValue.value)
+              }
+            } else {
+              if (storageSearchInfo) {
+                getAppResources('分页查询')
+              } else {
+                getAppResources()
+              }
+            }
+          })
       }
       const getAppResources = (switchIndex) => {
         if (!globalFlag.value) {
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 103196b1..ea531868 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -1566,6 +1566,15 @@
     selectedList.value = []
     if (clickList.value[indexFather].content.indexOf(name) != -1) {
       if (name == '视频资源') {
+        let newQuery = JSON.parse(
+          JSON.stringify(router.currentRoute.value.query)
+        )
+        newQuery.selectType = name
+        router
+          .replace({
+            query: newQuery,
+          })
+          .then(() => {})
         room.value = true
         tableHeight.value = 330
         showMap.value = true
@@ -1575,6 +1584,15 @@
         selectType.value = '视频资源'
         console.log('444------------>', 444)
       } else if (name == '政务云资源') {
+        let newQuery = JSON.parse(
+          JSON.stringify(router.currentRoute.value.query)
+        )
+        newQuery.selectType = name
+        router
+          .replace({
+            query: newQuery,
+          })
+          .then(() => {})
         room.value = true
         tableHeight.value = 600
         showMap.value = false
@@ -1594,7 +1612,25 @@
         pagination.value.total = 0
         selectType.value = '感知资源'
       } else if (name == '城市云脑会客厅') {
+        let newQuery = JSON.parse(
+          JSON.stringify(router.currentRoute.value.query)
+        )
+        newQuery.selectType = name
+        router
+          .replace({
+            query: newQuery,
+          })
+          .then(() => {})
       } else if (name == '视频会议') {
+        let newQuery = JSON.parse(
+          JSON.stringify(router.currentRoute.value.query)
+        )
+        newQuery.selectType = name
+        router
+          .replace({
+            query: newQuery,
+          })
+          .then(() => {})
         room.value = true
         tableHeight.value = 600
         showMap.value = false
@@ -1614,6 +1650,15 @@
       }
     } else {
       if (name == '视频资源') {
+        let newQuery = JSON.parse(
+          JSON.stringify(router.currentRoute.value.query)
+        )
+        newQuery.selectType = name
+        router
+          .replace({
+            query: newQuery,
+          })
+          .then(() => {})
         selectType.value = '视频资源'
         wrjFlag.value = false
         tableHeight.value = 330
@@ -1654,6 +1699,15 @@
         emits('add', 1)
         getCamera()
       } else if (name == '政务云资源') {
+        let newQuery = JSON.parse(
+          JSON.stringify(router.currentRoute.value.query)
+        )
+        newQuery.selectType = name
+        router
+          .replace({
+            query: newQuery,
+          })
+          .then(() => {})
         selectType.value = '政务云资源'
         tableHeight.value = 600
         showMap.value = false
@@ -1686,6 +1740,15 @@
         wrjFlag.value = false
         emits('add', 2)
       } else if (name == '视频会议') {
+        let newQuery = JSON.parse(
+          JSON.stringify(router.currentRoute.value.query)
+        )
+        newQuery.selectType = name
+        router
+          .replace({
+            query: newQuery,
+          })
+          .then(() => {})
         selectType.value = '视频会议'
         tableHeight.value = 600
         showMap.value = false
@@ -1728,6 +1791,15 @@
         pagination.value.current = 1
         getSoldierData(indexFather, name)
       } else if (name == '城市云脑会客厅') {
+        let newQuery = JSON.parse(
+          JSON.stringify(router.currentRoute.value.query)
+        )
+        newQuery.selectType = name
+        router
+          .replace({
+            query: newQuery,
+          })
+          .then(() => {})
         showMap.value = false
         dataSource.value = []
         dataSource2.value = []
@@ -2150,10 +2222,6 @@
         })
     }
   }
-  defineExpose({
-    getCamera,
-    reSetSearch,
-  })
   //加入申购车
   const addShoppingCart = () => {
     if (selectedList.value.length > 0) {
@@ -2323,10 +2391,11 @@
   }
   const governmentCloud = reactive({ data: [], total: 0, current: 1 })
   const getGovernmentCloud = (page) => {
+    let roomStr = router.currentRoute.value.query.str
     getPolicyCloudService({
       limit: 5,
       page: page || 1,
-      name: '',
+      name: roomStr || '',
       type: clickList.value[1].content[0],
     }).then((res) => {
       console.log('获取政务云资源======》', res.data.data)
@@ -2394,6 +2463,12 @@
         message.warning(err)
       })
   }
+
+  defineExpose({
+    getCamera,
+    reSetSearch,
+    getGovernmentCloud,
+  })
 </script>
 <style lang="less" scoped>
   .infrastructrueBox {

From 5767fa4c4942e44d5d2fdc816007b7d50eb45f3b Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Sat, 19 Nov 2022 17:16:19 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=20=E5=BE=85?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=E7=9B=B8=E5=85=B3=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/home.js                         |  25 ++-
 .../views/home/infrastructureApplication.vue  | 174 +++++++++++++++++-
 2 files changed, 194 insertions(+), 5 deletions(-)

diff --git a/front/src/api/home.js b/front/src/api/home.js
index 4851a2f0..cb9cbb7d 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
  * @LastEditors: Light
- * @LastEditTime: 2022-11-18 14:09:20
+ * @LastEditTime: 2022-11-19 14:53:29
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -533,3 +533,26 @@ export function getPolicyCloudService(data) {
     data,
   })
 }
+// 西海岸基础设施待申请列表
+export function willApplyCameraSelect() {
+  return request({
+    url: '/willApplyCamera/select',
+    method: 'get',
+  })
+}
+// 西海岸基础设施待申请列表新增
+export function willApplyCameraBatchInsert(data) {
+  return request({
+    url: '/willApplyCamera/batchInsert',
+    method: 'post',
+    data,
+  })
+}
+// 西海岸基础设施待申请列表删除
+export function willApplyCameraBatchDelete(data) {
+  return request({
+    url: '/willApplyCamera/batchDelete',
+    method: 'post',
+    data,
+  })
+}
diff --git a/front/src/views/home/infrastructureApplication.vue b/front/src/views/home/infrastructureApplication.vue
index d8688692..ddb63315 100644
--- a/front/src/views/home/infrastructureApplication.vue
+++ b/front/src/views/home/infrastructureApplication.vue
@@ -2,11 +2,177 @@
  * @Author: Light
  * @Date: 2022-11-18 11:53:43
  * @LastEditors: Light
- * @LastEditTime: 2022-11-18 11:54:11
+ * @LastEditTime: 2022-11-19 17:15:15
  * @Description: 告诉大家这是什么
 -->
 <template>
-  <div>基础设施申请</div>
+  <div class="infrastructureApplication">
+    <div class="top">
+      <a-list size="small" bordered :data-source="dataList.toBeApplied">
+        <template #renderItem="{ item }">
+          <a-list-item>
+            <div class="name">
+              <a-tooltip>
+                <template #title>{{ item.channelName }}</template>
+                {{ item.channelName }}
+              </a-tooltip>
+            </div>
+            <a-button type="link" danger @click="delWillApplyCamera(item.id)">
+              移出
+            </a-button>
+          </a-list-item>
+        </template>
+        <template #header>
+          <div class="title">待申请列表</div>
+        </template>
+        <template #footer>
+          <a-button type="primary">一键申请</a-button>
+        </template>
+      </a-list>
+    </div>
+    <div class="bottom">
+      <a-list size="small" bordered :data-source="data">
+        <template #renderItem="{ item }">
+          <a-list-item>
+            <div class="name">
+              <a-tooltip>
+                <template #title>{{ item }}</template>
+                {{ item }}
+              </a-tooltip>
+            </div>
+            <a-button type="link" danger>删除</a-button>
+          </a-list-item>
+        </template>
+        <template #header>
+          <div class="title">已申请列表</div>
+        </template>
+      </a-list>
+    </div>
+  </div>
 </template>
-<script setup></script>
-<style lang="less" scoped></style>
+<script setup>
+  import {
+    willApplyCameraSelect,
+    willApplyCameraBatchInsert,
+    willApplyCameraBatchDelete,
+  } from '@/api/home'
+  import { onBeforeUnmount, reactive, ref } from 'vue'
+  import { message } from 'ant-design-vue'
+  import mybus from '@/myplugins/mybus'
+  const dataList = reactive({ toBeApplied: [], requested: [] })
+  // 待办
+  const addWacFlag = ref(true)
+  const delWacFlag = ref(true)
+  const delWillApplyCamera = (id) => {
+    console.log('删除===>', id)
+    if (delWacFlag.value) {
+      delWacFlag.value = false
+      willApplyCameraBatchDelete([id]).then((res) => {
+        if (res.data.code == 0) {
+          message.success('移出成功')
+        } else {
+          message.warning('移出失败')
+        }
+        init()
+      })
+    }
+  }
+  const init = () => {
+    willApplyCameraSelect().then((res) => {
+      if (res.data.code == 0) {
+        dataList.toBeApplied = res.data.data
+        delWacFlag.value = true
+        addWacFlag.value = true
+      } else {
+        message.warning('查询失败')
+        dataList.toBeApplied = []
+      }
+    })
+  }
+  init()
+  mybus.on('selectCamera', (obj) => {
+    // 判断最多10条
+    if (dataList.toBeApplied.length + dataList.requested.length > 10) {
+      message.warning('最多只能申请10个摄像头！')
+      return
+    }
+    // 判断是否已操作
+    let addFlag = true
+    dataList.toBeApplied.map((val) => {
+      if (addFlag && val.channelId == obj.channelId) {
+        addFlag = false
+      }
+    })
+    dataList.requested.map((val) => {
+      if (addFlag && val.channelId == obj.channelId) {
+        addFlag = false
+      }
+    })
+    if (addWacFlag.value) {
+      if (addFlag) {
+        addWacFlag.value = false
+        willApplyCameraBatchInsert([obj]).then((res) => {
+          if (res.data.code == 0) {
+            message.success('移入成功')
+          } else {
+            message.warning('移入失败')
+          }
+          init()
+        })
+      } else {
+        message.warning('已申请该摄像头！')
+      }
+    }
+  })
+  onBeforeUnmount(() => {
+    mybus.off('selectCamera')
+  })
+
+  const data = [
+    'Racing car sprays burning fuel into crowd.',
+    'Japanese princess to wed commoner.',
+    'Australian walks 100km after outback crash.',
+    'Man charged over missing wedding girl.',
+    'Los Angeles battles huge wildfires.',
+    'Racing car sprays burning fuel into crowd.',
+    'Japanese princess to wed commoner.',
+    'Australian walks 100km after outback crash.',
+    'Man charged over missing wedding girl.',
+    'Los Angeles battles huge wildfires.',
+  ]
+</script>
+<style lang="less" scoped>
+  .infrastructureApplication {
+    background: #fff;
+    position: fixed;
+    top: 50%;
+    right: 0.16rem;
+    margin-top: -3.5rem;
+    .bottom {
+      margin-top: 32px;
+    }
+    .title {
+      font-size: 16px;
+      font-weight: 600;
+    }
+    .name {
+      width: 150px;
+      overflow: hidden;
+      display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
+      word-break: break-all;
+    }
+    :deep(.ant-list-footer) {
+      display: flex;
+      justify-content: flex-end;
+    }
+    :deep(.ant-list-items) {
+      height: 2.45rem;
+      overflow-y: scroll;
+    }
+    :deep(.ant-spin-nested-loading) {
+      height: 2.45rem;
+    }
+  }
+</style>