Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

2022-11-18 16:38:51 +08:00 · 2022-11-18 16:38:51 +08:00 · 1ae34481d7
parent e48f8cc6ce bc73b269a6
commit 1ae34481d7
5 changed files with 89 additions and 32 deletions
--- 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,
  })
 }
--- 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>
@ -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++
        // 获取筛选条件
--- 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;
--- a/front/src/views/home/infrastructureApplication.vue
+++ 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>
--- 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切换点击事件
@ -1667,6 +1672,7 @@
              'PaaS服务',
              '安全服务',
              '大数据服务',
+              '运营服务',
              '附加增值服务',
            ]
          } else {
@ -1783,7 +1789,9 @@
        clickList.value[indexFather].content = [name]
      }
      if (!isXiHaiAn) {
-        getGovernmentCloud()
+        getGovernmentCloud(1)
+        governmentCloud.current = 1
+        showKey.value++
      }
    }
    // 改变查询摄像头接口的labelCode数组
@ -2313,9 +2321,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