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

2022-10-13 18:02:02 +08:00 · 2022-10-13 18:02:02 +08:00 · a900c4c332
parent a6ab3b9194 2a05650b26
commit a900c4c332
10 changed files with 704 additions and 465 deletions
--- a/back/public/config/basicConfig.js
+++ b/back/public/config/basicConfig.js
@ -2,16 +2,16 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-08-25 14:37:49
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-12 15:25:01
+ * @LastEditTime: 2022-10-13 14:49:32
 * @Description: 告诉大家这是什么
 */
 var _global = {}
 var CONFIGITEM = {
  // version: 'qingdao', // 青岛
  // version: 'xihaian', // 西海岸
-  // version: 'test', // 测试
+  version: 'test', // 测试
  // version: 'frp', // 内网穿透
-  version: 'xihaian', // 开发
+  // version: 'xihaian', // 开发
  vNum: 'v0.8.7.2',
  configData: {
    // 青岛市大数据局
--- a/back/src/views/modules/ability/assignedScene/add-update-scene.vue
+++ b/back/src/views/modules/ability/assignedScene/add-update-scene.vue
@ -27,7 +27,7 @@
            <el-form-item label="名称" prop="name">
              <el-input v-model="dataForm.name" placeholder="请输入名称" style="width:90%"></el-input>
            </el-form-item>
-           
+
            <el-form-item label="描述" prop="description">
              <el-input type="textarea" :rows="3" v-model="dataForm.description" placeholder="请输入描述" style="width:90%">
              </el-input>
@ -210,7 +210,7 @@ export default {
        name: '',
        applicationArea: '',
        description: '',
-        sceneUrl:'',
+        sceneUrl: '',
        fuseAttrList: [
          {
            attrType: '使用步骤',
@ -357,10 +357,10 @@ export default {
            update: 'put'
          }
          this.dataForm.fuseResourceList = this.getFuseResourceList()
-          if (this.imageUrl == '') {
-            this.$message.error('请上传图片！')
-            return
-          }
+          // if (this.imageUrl == '') {
+          //   this.$message.error('请上传图片！')
+          //   return
+          // }
          this.dataForm.fuseAttrList.find(v => v.attrType == '服务图片').attrValue = this.imageUrl || ''
          const _obj = Object.assign({}, this.dataForm, {
            type: '赋能场景'
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2020-07-07 16:03:23
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-29 09:55:56
+ * @LastEditTime: 2022-10-13 15:29:31
 * @Description: 数据资源参数配置
 */
 // eslint-disable-next-line no-undef
@ -51,10 +51,10 @@ if (newLocation !== 'baotou' && newLocation !== 'xihaian') {
      right: '海信网络科技股份有限公司',
    },
    address: [
-      {
-        name: '鲁IC备00000000号',
-        value: '政府标识码3702000106',
-      },
+      // {
+      //   name: '鲁IC备00000000号',
+      //   value: '政府标识码3702000106',
+      // },
      {
        name: '版权所有：青岛市大数据发展管理局',
        value: '地址：山东省青岛市香港中路17号市级机关办公楼',
@ -523,6 +523,11 @@ else if (newLocation === 'xihaian') {
      },
    ],
  }
-  xhaHasPermissionUser.list = ['xihaian01', 'xihaian02', 'xihaian03', 'xihaian04', 'admin']
-  
+  xhaHasPermissionUser.list = [
+    'xihaian01',
+    'xihaian02',
+    'xihaian03',
+    'xihaian04',
+    'admin',
+  ]
 }
--- a/front/src/views/abilityStatistics/components/Footer.vue
+++ b/front/src/views/abilityStatistics/components/Footer.vue
@ -1,3 +1,10 @@
+<!--
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-07-05 12:53:04
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-13 15:29:14
+ * @Description: 告诉大家这是什么
+-->
 <template>
  <div class="footer">
    <div class="fotter-son">
@ -18,10 +25,10 @@
 <script setup>
  import { reactive } from 'vue'
  let dataList = reactive([
-    {
-      name: '鲁IC备00000000号',
-      value: '政府标识码3702000106',
-    },
+    // {
+    //   name: '鲁IC备00000000号',
+    //   value: '政府标识码3702000106',
+    // },
    {
      name: '版权所有：青岛市大数据发展管理局',
      value: '地址：山东省青岛市香港中路17号市级机关办公楼',
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@ -342,93 +342,217 @@
      }
    })
    console.log('============》', dataList)
+    dataList = dataList.reverse()
    echarts.init(document.getElementById('right')).dispose()
    let chartDom = document.getElementById('right')
    let myChart = echarts.init(chartDom)
+    // let option = {
+    //   tooltip: {
+    //     trigger: 'item',
+    //     formatter: function (info) {
+    //       let _obj = dataList.find((v) => v.fanwei == info.data.name) || {}
+    //       let dom = ref()
+    //       dom.value =
+    //         '部门数<br/>' +
+    //         (_obj.fanwei || '--') +
+    //         ' : ' +
+    //         (_obj.value || _obj.value === 0 ? _obj.value : '--') +
+    //         '项'
+    //       console.log('name', info.data)
+    //       return dom.value
+    //     },
+    //   },
+    //   grid: {
+    //     height: '65%',
+    //     width: '45%',
+    //     left: '20%',
+    //     bottom: 30,
+    //   },
+    //   xAxis: {
+    //     show: false,
+    //     type: 'category',
+    //     data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+    //   },
+    //   yAxis: {
+    //     show: false,
+    //     type: 'value',
+    //     min: 0,
+    //     max: 20,
+    //   },
+    //   series: [
+    //     {
+    //       name: '部门数',
+    //       type: 'funnel',
+    //       left: '28%',
+    //       right: '35%',
+    //       top: '15%',
+    //       bottom: '10%',
+    //       minSize: '0%',
+    //       maxSize: '100%',
+    //       sort: 'ascending',
+    //       label: {
+    //         show: true,
+    //         formatter: function (info) {
+    //           let _obj = dataList.find((v) => v.fanwei == info.data.name) || {}
+    //           let dom = ref()
+    //           dom.value =
+    //             (_obj.fanwei || '--') +
+    //             ' : ' +
+    //             (_obj.value || _obj.value === 0 ? _obj.value : '--') +
+    //             '项'
+    //           console.log('name', info.data)
+    //           return dom.value
+    //         },
+    //         rich: {
+    //           b: {
+    //             fontSize: 14,
+    //           },
+    //         },
+    //       },
+    //       labelLine: {
+    //         length: 40,
+    //         lineStyle: {
+    //           width: 1,
+    //           type: 'solid',
+    //         },
+    //       },
+    //       itemStyle: {
+    //         borderColor: '#fff',
+    //         borderWidth: 1,
+    //       },
+    //       emphasis: {
+    //         label: {
+    //           fontSize: 20,
+    //         },
+    //       },
+    //       data: chartData,
+    //     },
+    //   ],
+    // }
+
    let option = {
+      //          title: {
+      //              text: 'ECharts 入门示例'
+      //          },
      tooltip: {
        trigger: 'item',
        formatter: function (info) {
-          let _obj = dataList.find((v) => v.fanwei == info.data.name) || {}
+          let _obj = dataList.find((v) => v.fanwei == info.name) || {}
          let dom = ref()
          dom.value =
            '部门数<br/>' +
            (_obj.fanwei || '--') +
            ' : ' +
            (_obj.value || _obj.value === 0 ? _obj.value : '--') +
-            '项'
-          console.log('name', info.data)
+            '个'
+          console.log('name', info)
          return dom.value
        },
      },
-      grid: {
-        height: '65%',
-        width: '45%',
-        left: '20%',
-        bottom: 30,
+      legend: {
+        data: [],
      },
      xAxis: {
-        show: false,
-        type: 'category',
-        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-      },
-      yAxis: {
-        show: false,
-        type: 'value',
-        min: 0,
-        max: 20,
+        data: [],
      },
+      yAxis: {},
      series: [
        {
-          name: '部门数',
-          type: 'funnel',
-          left: '28%',
-          right: '35%',
-          top: '15%',
-          bottom: '10%',
-          minSize: '0%',
-          maxSize: '100%',
-          sort: 'ascending',
-          label: {
-            show: true,
-            formatter: function (info) {
-              let _obj = dataList.find((v) => v.fanwei == info.data.name) || {}
-              let dom = ref()
-              dom.value =
-                (_obj.fanwei || '--') +
-                ' : ' +
-                (_obj.value || _obj.value === 0 ? _obj.value : '--') +
-                '项'
-              console.log('name', info.data)
-              return dom.value
-            },
-            rich: {
-              b: {
-                fontSize: 14,
-              },
-            },
-          },
-          labelLine: {
-            length: 40,
-            lineStyle: {
-              width: 1,
-              type: 'solid',
-            },
-          },
+          name: '',
+          type: 'bar',
+          barWidth: 35,
+          barGap: '-100%',
          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 1,
-          },
-          emphasis: {
-            label: {
-              fontSize: 20,
+            normal: {
+              color: '#C1232B',
            },
          },
-          data: chartData,
+          //              data: [5, 20, 36, 10, 10, 20]
+          data: [],
+        },
+        {
+          name: '',
+          type: 'bar',
+          barWidth: 35,
+          barGap: '-100%',
+          itemStyle: {
+            normal: {
+              color: '#B5C334',
+            },
+          },
+          //              data: [5, 20, 36, 10, 10, 20]
+          data: [],
+        },
+        {
+          name: '',
+          type: 'bar',
+          barWidth: 35,
+          barGap: '-100%',
+          itemStyle: {
+            normal: {
+              color: '#FCCE10',
+            },
+          },
+          //              data: [5, 20, 36, 10, 10, 20]
+          data: [],
+        },
+        {
+          name: '',
+          type: 'bar',
+          barWidth: 35,
+          barGap: '-100%',
+          itemStyle: {
+            normal: {
+              color: '#E87C25',
+            },
+          },
+          //              data: [5, 20, 36, 10, 10, 20]
+          data: [],
+        },
+        {
+          name: '',
+          type: 'bar',
+          barWidth: 35,
+          barGap: '-100%',
+          itemStyle: {
+            normal: {
+              color: '#27727B',
+            },
+          },
+          //              data: [5, 20, 36, 10, 10, 20]
+          data: [],
+        },
+        {
+          name: '',
+          type: 'bar',
+          barWidth: 35,
+          barGap: '-100%',
+          itemStyle: {
+            normal: {
+              color: '#FE8463',
+            },
+          },
+          //              data: [5, 20, 36, 10, 10, 20]
+          data: [],
        },
      ],
    }
-
+    option.legend.data = []
+    option.xAxis.data = []
+    dataList.map((val, index) => {
+      // option.legend.data.push(val.fanwei)
+      option.xAxis.data.push(val.fanwei)
+      option.series[index].name = val.fanwei
+      let arr = []
+      for (let i = 0; i < 5; i++) {
+        if (i == index) {
+          arr.push(val.value)
+        } else {
+          arr.push(0)
+        }
+      }
+      option.series[index].data = arr
+    })
    option && myChart.setOption(option)
  }
  onMounted(() => {
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@ -105,7 +105,7 @@
              }}
            </div>
          </div>
-          <div class="remove" @click="removeFunction(val)"></div>
+          <div class="remove" v-if="item.arr.length>1" @click="removeFunction(val)"></div>
        </div>
      </template>
    </div>
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@ -331,10 +331,7 @@
              </a-form-item>
            </a-col>
            <a-col :span="8">
-              <a-form-item
-                name="phone"
-                label="联系电话"
-              >
+              <a-form-item name="phone" label="联系电话">
                <a-input v-model:value="formState.phone" style="width: 72%" />
              </a-form-item>
            </a-col>
@ -389,7 +386,9 @@
            :wrapper-col="{ span: 14, offset: 4 }"
            style="text-align: center; margin-top: 0.4rem"
          >
-            <a-button @click="resetFields" type="primary" danger>取消</a-button>
+            <a-button @click="appointmentRoom = false" type="primary" danger>
+              取消
+            </a-button>
            <a-button
              style="margin-left: 10px"
              type="primary"
@ -551,7 +550,10 @@
      >
        <template #footer></template>
        <div style="width: 100%; display: flex; justify-content: center">
-          <div style="width: 100%; height: 100%; position: relative" v-show="isXiHaiAn">
+          <div
+            style="width: 100%; height: 100%; position: relative"
+            v-show="isXiHaiAn"
+          >
            <!-- 西海岸--预览视频--遮罩 todo-->
            <div class="video-cover" @click="videoShowMsg"></div>
            <div class="waterMark waterMark-left-top">
@ -635,17 +637,33 @@
            style="width: 100%; height: 100%; position: relative"
          >
            <!-- 批量预览视频--遮罩 -->
-            <div class="batch-video-cover" @click="videoShowMsg(index)" v-show="isXiHaiAn"></div>
-            <div class="batch-waterMark batch-waterMark-left-top" v-show="isXiHaiAn">
+            <div
+              class="batch-video-cover"
+              @click="videoShowMsg(index)"
+              v-show="isXiHaiAn"
+            ></div>
+            <div
+              class="batch-waterMark batch-waterMark-left-top"
+              v-show="isXiHaiAn"
+            >
              {{ userInfo.usernameShow }}
            </div>
-            <div class="batch-waterMark batch-waterMark-right-top" v-show="isXiHaiAn">
+            <div
+              class="batch-waterMark batch-waterMark-right-top"
+              v-show="isXiHaiAn"
+            >
              {{ userInfo.realNameShow }}
            </div>
-            <div class="batch-waterMark batch-waterMark-left-bottom" v-show="isXiHaiAn">
+            <div
+              class="batch-waterMark batch-waterMark-left-bottom"
+              v-show="isXiHaiAn"
+            >
              {{ userInfo.usernameShow }}
            </div>
-            <div class="batch-waterMark batch-waterMark-right-bottom" v-show="isXiHaiAn">
+            <div
+              class="batch-waterMark batch-waterMark-right-bottom"
+              v-show="isXiHaiAn"
+            >
              {{ userInfo.realNameShow }}
            </div>
            <p></p>
@ -899,12 +917,12 @@
        tabClick(0, '视频资源')
      } else {
        // 默认选中
-        if(formPage && formPage == 'noticePage') {
+        if (formPage && formPage == 'noticePage') {
          tabClick(0, '城市云脑会客厅')
          roomYuyue.value = false
          roomResult.value = true
          onSearch()
-        }else {
+        } else {
          tabClick(0, '政务云资源')
        }
      }
@ -958,7 +976,7 @@
  let clickList = ref([]) //存储点击的tab
  if (!isXiHaiAn) {
    tabList.value.push({
-      title: '视频标签',
+      title: '政务云资源',
      content: [],
    })
  }
@ -1383,6 +1401,7 @@
      '点击tab================>',
      indexFather,
      name,
+      clickList.value,
      clickList.value[indexFather]
    )

@ -1397,7 +1416,7 @@
          tabList.value[1].title = '视频标签'
        }
        selectType.value = '视频资源'
-        console.log('444------------>', 444);
+        console.log('444------------>', 444)
      } else if (name == '政务云资源') {
        room.value = true
        tableHeight.value = 600
@ -1579,8 +1598,11 @@
      clickList.value[1].content = []
    }
    clickList.value[indexFather].content[0] = name
-    console.log('clickList.value[indexFather].content[0]------------>', clickList.value[indexFather].content[0]);
-    
+    console.log(
+      'clickList.value[indexFather].content[0]------------>',
+      clickList.value[indexFather].content[0]
+    )
+
    if (tabList.value[1]) {
      tabList.value[1].title = ''
      tabList.value[1].content = []
@ -1814,22 +1836,32 @@
  // 西海岸-视频资源loading
  const loadingCamera = ref(false)
  const getCamera = (flag, str) => {
-    loadingCamera.value = true;
+    loadingCamera.value = true
    if (flag) {
      mapSearchParam.value.cameraName = str
    }
    console.log('初始化调用')
-    console.log('不选左侧树的时候不调用接口', mapSearchParam.value)
+    console.log(
+      '不选左侧树的时候不调用接口',
+      mapSearchParam.value,
+      selectType.value
+    )
    if (!whoShow1.value.itShowXiHaiAn) {
-      getCameraByParentId(mapSearchParam.value).then((res) => {
-        console.log('res--查询摄像头---------->', res);
-        loadingCamera.value = false;
-        dataSource.value = res.data.data
-        pagination.value.total = res.data.count
-      }).catch(err => {
-        loadingCamera.value = false;
-        message.error(err)
-      })
+      if (selectType.value == '视频资源') {
+        getCameraByParentId(mapSearchParam.value)
+          .then((res) => {
+            console.log('res--查询摄像头---------->', res)
+            loadingCamera.value = false
+            dataSource.value = res.data.data
+            pagination.value.total = res.data.count
+          })
+          .catch((err) => {
+            loadingCamera.value = false
+            message.error(err)
+          })
+      } else {
+        loadingCamera.value = false
+      }
    } else {
      let params = {
        regionId:
@ -1866,15 +1898,17 @@
          }
        }
      }
-      getCameraByCondition(params).then((res) => {
-        console.log('res--查询摄像头---------->', res);
-        loadingCamera.value = false;
-        dataSource.value = res.data.data
-        pagination.value.total = res.data.count
-      }).catch(err => {
-        loadingCamera.value = false;
-        message.error(err)
-      })
+      getCameraByCondition(params)
+        .then((res) => {
+          console.log('res--查询摄像头---------->', res)
+          loadingCamera.value = false
+          dataSource.value = res.data.data
+          pagination.value.total = res.data.count
+        })
+        .catch((err) => {
+          loadingCamera.value = false
+          message.error(err)
+        })
    }
  }
  defineExpose({
@ -1884,7 +1918,7 @@
  const addShoppingCart = () => {
    if (selectedList.value.length > 0) {
      let _arr = []
-      selectedList.value.map(v => {
+      selectedList.value.map((v) => {
        _arr.push({
          delFlag: '0',
          resourceId: v.idtCameraChannel,
@ -1892,7 +1926,7 @@
        })
      })
      xhaAddCart(_arr).then((res) => {
-        if(res.data.code !== 0) {
+        if (res.data.code !== 0) {
          return message.error(res.data.msg)
        }
        message.success('添加申购车成功！')
@ -1929,7 +1963,7 @@
    },
  ])
  // 西海岸--状态展示
-  if(isXiHaiAn) {
+  if (isXiHaiAn) {
    columns.value.splice(2, 0, {
      title: '状态',
      dataIndex: 'status',
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@ -5,8 +5,13 @@
    <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 in titleName"
+          :key="item.index"
+          class="tabAll"
+          @click="changeCards(item.index)"
+          :class="{ sel: item.index === number }"
+        >
          <span>
            {{ item.name === '赋能场景' ? '典型赋能场景' : '打包模式' }}
          </span>
@ -15,26 +20,55 @@
      <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="getIntegrationList" @change="onSearch" class="resultListSearchInput" />
+          <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" @saveSearchCodition="saveSearchCodition"
-          ref="searchResultListDom" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
-        <CanAssignCase v-else v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList"
-          @saveSearchCodition="saveSearchCodition" :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"
+          @saveSearchCodition="saveSearchCodition"
+          :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>
@ -43,357 +77,382 @@
  <home-footer></home-footer>
 </template>
 <script>
-import HomeFooter from '@/views/newHome/components/Footer'
-import mybus from '@/myplugins/mybus'
-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'
-import searchResultList from '@/views/home/components/searchResultList.vue'
-import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
-import { message } from 'ant-design-vue'
+  import HomeFooter from '@/views/newHome/components/Footer'
+  import mybus from '@/myplugins/mybus'
+  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'
+  import searchResultList from '@/views/home/components/searchResultList.vue'
+  import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
+  import { message } from 'ant-design-vue'

-export default defineComponent({
-  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' && to.name !== 'integrationServicesDetails') {
-      localStorage.removeItem('integrationServices')
-    }
-    next()
-  },
-  setup() {
-    // 分页
-    const loading = ref(true)
-    const currentPage = ref(1)
-    const currentPageSize = ref(10)
-    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 loadingData = ref(false)
-    // 选项卡
-    const titleName = ref([
-      {
-        name: '打包模式',
-      },
-      {
-        name: '赋能场景',
-      },
-    ])
-    const number = ref(0)
-    // 查询参数
-    const paramsGetResources = {
-      page: currentPage.value,
-      limit: currentPageSize.value,
-      type: titleName.value[number.value].name,
-      name: searchValue.value,
-      orderField: 'create_date',
-      orderType: 'DESC', // ASC 升序  DESC 降序
-    }
-    const searchResultListDom = ref(null)
-    const storageSearchInfo = JSON.parse(localStorage.getItem('integrationServices'))
-    // 读取本地存储：表单赋值
-    const handleSetSearchData = () => {
-      if (storageSearchInfo) {
-        number.value = storageSearchInfo.type == '打包模式' ? 0 : 1;
-        // 搜索名称 
-        searchValue.value = storageSearchInfo.name;
-        currentPage.value = storageSearchInfo.page;
-        currentPageSize.value = storageSearchInfo.limit;
-        paramsGetResources.limit = storageSearchInfo.limit;
-        paramsGetResources.page = storageSearchInfo.page;
-        paramsGetResources.type = storageSearchInfo.type;
-        // 延迟使用，因为还没有返回跟挂载
-        nextTick(() => {
-          searchResultListDom.value && searchResultListDom.value.changeCondition && searchResultListDom.value.changeCondition({
-            value: storageSearchInfo.orderField,
-            orderType: storageSearchInfo.orderType,
-          }, true)
+  export default defineComponent({
+    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' &&
+        to.name !== 'integrationServicesDetails'
+      ) {
+        localStorage.removeItem('integrationServices')
+      }
+      next()
+    },
+    setup() {
+      // 分页
+      const loading = ref(true)
+      const currentPage = ref(1)
+      const currentPageSize = ref(10)
+      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 loadingData = ref(false)
+      // 选项卡
+      const titleName = ref([
+        {
+          name: '赋能场景',
+          index: 1,
+        },
+        {
+          name: '打包模式',
+          index: 0,
+        },
+      ])
+      let number = ref(1)
+      // 查询参数
+      const paramsGetResources = {
+        page: currentPage.value,
+        limit: currentPageSize.value,
+        type: titleName.value[number.value].name,
+        name: searchValue.value,
+        orderField: 'create_date',
+        orderType: 'DESC', // ASC 升序  DESC 降序
+      }
+      const searchResultListDom = ref(null)
+      const storageSearchInfo = JSON.parse(
+        localStorage.getItem('integrationServices')
+      )
+      // 读取本地存储：表单赋值
+      const handleSetSearchData = () => {
+        if (storageSearchInfo) {
+          number.value = storageSearchInfo.type == '打包模式' ? 1 : 0
+          // 搜索名称
+          searchValue.value = storageSearchInfo.name
+          currentPage.value = storageSearchInfo.page
+          currentPageSize.value = storageSearchInfo.limit
+          paramsGetResources.limit = storageSearchInfo.limit
+          paramsGetResources.page = storageSearchInfo.page
+          paramsGetResources.type = storageSearchInfo.type
+          // 延迟使用，因为还没有返回跟挂载
+          nextTick(() => {
+            searchResultListDom.value &&
+              searchResultListDom.value.changeCondition &&
+              searchResultListDom.value.changeCondition(
+                {
+                  value: storageSearchInfo.orderField,
+                  orderType: storageSearchInfo.orderType,
+                },
+                true
+              )
+          })
+          getIntegrationList()
+        }
+      }
+
+      const changeCards = (val) => {
+        // 打包模式
+        number.value = val
+        paramsGetResources.type = titleName.value[number.value].name
+        resetAction()
+      }
+
+      // 查询
+      const onSearch = () => {
+        currentPage.value = 1
+        getIntegrationList()
+      }
+      // 重置数据
+      const resetAction = () => {
+        // 重置模糊查字段
+        searchValue.value = ''
+        // 分页
+        currentPage.value = 1
+        currentPageSize.value = 10
+        // 重置查询条件
+        paramsGetResources.page = 1
+        paramsGetResources.limit = 10
+        paramsGetResources.orderField = 'create_date'
+        paramsGetResources.orderType = 'DESC'
+
+        mybus.emit('resetAction', {
+          type: titleName.value[number.value].name,
        })
        getIntegrationList()
      }
-    }

-    const changeCards = (val) => {
-      // 打包模式
-      number.value = val;
-      paramsGetResources.type = titleName.value[number.value].name;
-      resetAction()
-    }
-
-    // 查询
-    const onSearch = () => {
-      currentPage.value = 1
-      getIntegrationList()
-    }
-    // 重置数据
-    const resetAction = () => {
-      // 重置模糊查字段
-      searchValue.value = ''
-      // 分页
-      currentPage.value = 1
-      currentPageSize.value = 10
-      // 重置查询条件
-      paramsGetResources.page = 1
-      paramsGetResources.limit = 10
-      paramsGetResources.orderField = 'create_date'
-      paramsGetResources.orderType = 'DESC'
-
-      mybus.emit('resetAction', {
-        type: titleName.value[number.value].name,
-      })
-      getIntegrationList()
-    }
-
-    // 获取融合服务列表
-    const getIntegrationList = () => {
-      loadingData.value = true
-      paramsGetResources.name = searchValue.value;
-      console.log('paramsGetResources------参数下发------>', paramsGetResources);
-      getIntegrationServicesList(paramsGetResources).then(
-        (res) => {
-          loadingData.value = false
-          if (res.data.code !== 0) {
-            return message.error(res.data.msg)
+      // 获取融合服务列表
+      const getIntegrationList = () => {
+        loadingData.value = true
+        paramsGetResources.name = searchValue.value
+        console.log(
+          'paramsGetResources------参数下发------>',
+          paramsGetResources
+        )
+        getIntegrationServicesList(paramsGetResources).then(
+          (res) => {
+            loadingData.value = false
+            if (res.data.code !== 0) {
+              return message.error(res.data.msg)
+            }
+            resourceList.data = res.data.data.list || []
+            resourceTotal.value = res.data.data.total || 0
+          },
+          (err) => {
+            loadingData.value = false
+            message.error(err)
          }
-          resourceList.data = res.data.data.list || []
-          resourceTotal.value = res.data.data.total || 0
-        },
-        (err) => {
-          loadingData.value = false
-          message.error(err)
-        }
-      )
-    }
-
-    mybus.on('paramsGetResources', (ids) => {
-      if (ids && ids.length > 0) {
-        paramsGetResources.deptIds = ids
-      } else {
-        delete paramsGetResources.deptIds
+        )
      }
-      getIntegrationList()
-    })

-    mybus.on('changePage', (page) => {
-      paramsGetResources.page = page
-      getIntegrationList()
-    })
+      mybus.on('paramsGetResources', (ids) => {
+        if (ids && ids.length > 0) {
+          paramsGetResources.deptIds = ids
+        } else {
+          delete paramsGetResources.deptIds
+        }
+        getIntegrationList()
+      })

-    mybus.on('changeSelcted', () => {
-      getIntegrationList()
-    })
+      mybus.on('changePage', (page) => {
+        paramsGetResources.page = page
+        getIntegrationList()
+      })

-    mybus.on('refresh', () => {
-      paramsGetResources.page = 1
-      currentPage.value = 1
-      getIntegrationList()
-    })
-    mybus.on('changeCondition', (condition) => {
-      paramsGetResources.orderField = condition.orderField
-      paramsGetResources.orderType = condition.orderType
-      getIntegrationList()
-    })
+      mybus.on('changeSelcted', () => {
+        getIntegrationList()
+      })

-    const pageChange = (val) => {
-      currentPage.value = val
-      paramsGetResources.page = val
-      getIntegrationList() //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-    }
+      mybus.on('refresh', () => {
+        paramsGetResources.page = 1
+        currentPage.value = 1
+        getIntegrationList()
+      })
+      mybus.on('changeCondition', (condition) => {
+        paramsGetResources.orderField = condition.orderField
+        paramsGetResources.orderType = condition.orderType
+        getIntegrationList()
+      })

-    // 分页
-    const onShowSizeChange = (current, pageSize) => {
-      currentPage.value = current
-      currentPageSize.value = pageSize
-      paramsGetResources.page = current
-      paramsGetResources.limit = pageSize
-      getIntegrationList()
-    }
+      const pageChange = (val) => {
+        currentPage.value = val
+        paramsGetResources.page = val
+        getIntegrationList() //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+      }

-    // 存储查询条件到本地
-    const saveSearchCodition = (n) => {
-      console.log('融合服务-----存储查询条件到本地------->', paramsGetResources);
-      localStorage.setItem(
-        'integrationServices',
-        JSON.stringify(paramsGetResources)
-      )
-    }
-
-    onMounted(() => {
-      if (storageSearchInfo) {
-        handleSetSearchData()
-      } else {
+      // 分页
+      const onShowSizeChange = (current, pageSize) => {
+        currentPage.value = current
+        currentPageSize.value = pageSize
+        paramsGetResources.page = current
+        paramsGetResources.limit = pageSize
        getIntegrationList()
      }
-    })

-    return {
-      searchValue,
-      currentPage,
-      resourceList,
-      resourceTotal,
-      pageChange,
-      Cardsname,
-      getIntegrationList,
-      resetAction,
-      onSearch,
-      currentPageSize,
-      pageSizeOptions,
-      loading,
-      titleName,
-      changeCards,
-      number,
-      loadingData,
-      onShowSizeChange,
-      saveSearchCodition,
-      searchResultListDom,
-    }
-  },
-  components: {
-    HomeHeader,
-    HomeFooter,
-    searchResultList,
-    CanAssignCase,
-  },
-  beforeUnmount() {
-    mybus.off('paramsGetResources')
-    mybus.off('changeCondition')
-    mybus.off('refresh')
-    mybus.off('changePage')
-  },
-})
+      // 存储查询条件到本地
+      const saveSearchCodition = (n) => {
+        console.log(
+          '融合服务-----存储查询条件到本地------->',
+          paramsGetResources
+        )
+        localStorage.setItem(
+          'integrationServices',
+          JSON.stringify(paramsGetResources)
+        )
+      }
+
+      onMounted(() => {
+        if (storageSearchInfo) {
+          handleSetSearchData()
+        } else {
+          getIntegrationList()
+        }
+      })
+
+      return {
+        searchValue,
+        currentPage,
+        resourceList,
+        resourceTotal,
+        pageChange,
+        Cardsname,
+        getIntegrationList,
+        resetAction,
+        onSearch,
+        currentPageSize,
+        pageSizeOptions,
+        loading,
+        titleName,
+        changeCards,
+        number,
+        loadingData,
+        onShowSizeChange,
+        saveSearchCodition,
+        searchResultListDom,
+      }
+    },
+    components: {
+      HomeHeader,
+      HomeFooter,
+      searchResultList,
+      CanAssignCase,
+    },
+    beforeUnmount() {
+      mybus.off('paramsGetResources')
+      mybus.off('changeCondition')
+      mybus.off('refresh')
+      mybus.off('changePage')
+    },
+  })
 </script>
 <style lang="less" scoped>
-.resultListSearchInput-father {
-  background: #f3f5f9;
-  padding: 0.2rem;
+  .resultListSearchInput-father {
+    background: #f3f5f9;
+    padding: 0.2rem;

-  .resultListSearchInput-son {
-    background: #fff;
-    padding: 0.2rem 0.2rem 0rem 0.3rem;
+    .resultListSearchInput-son {
+      background: #fff;
+      padding: 0.2rem 0.2rem 0rem 0.3rem;

-    .hengxian {
-      width: 100%;
-      height: 0.01rem;
-      background: rgba(150, 144, 144, 0.3);
-      margin-top: 0.2rem;
+      .hengxian {
+        width: 100%;
+        height: 0.01rem;
+        background: rgba(150, 144, 144, 0.3);
+        margin-top: 0.2rem;
+      }
    }
  }
-}

-.resultListSearchInput {
-  margin-left: 0.1rem;
+  .resultListSearchInput {
+    margin-left: 0.1rem;

-  :deep(.ant-input) {
-    width: 4rem;
-    height: 0.36rem;
-    background: #fff;
-    border-radius: 0.04rem;
+    :deep(.ant-input) {
+      width: 4rem;
+      height: 0.36rem;
+      background: #fff;
+      border-radius: 0.04rem;
+    }
+
+    :deep(.ant-input-search-button) {
+      width: 0.8rem;
+      height: 0.36rem;
+      background: #0087ff;
+      border-radius: 0.04rem !important;
+      font-size: 0.14rem;
+      font-weight: 400;
+      color: #fff;
+      line-height: 0.34rem;
+      margin-left: 0.1rem;
+    }
+
+    :deep(.ant-input-group-addon) {
+      left: 0 !important;
+    }
  }

-  :deep(.ant-input-search-button) {
+  .button-reset {
+    border: 0;
+    outline: none;
    width: 0.8rem;
    height: 0.36rem;
-    background: #0087ff;
-    border-radius: 0.04rem !important;
+    background: #e1edfa;
+    border-radius: 0.04rem;
    font-size: 0.14rem;
    font-weight: 400;
-    color: #fff;
+    color: #0087ff;
    line-height: 0.34rem;
-    margin-left: 0.1rem;
+    margin-left: 2.5rem;
+    cursor: pointer;
  }

-  :deep(.ant-input-group-addon) {
-    left: 0 !important;
-  }
-}
-
-.button-reset {
-  border: 0;
-  outline: none;
-  width: 0.8rem;
-  height: 0.36rem;
-  background: #e1edfa;
-  border-radius: 0.04rem;
-  font-size: 0.14rem;
-  font-weight: 400;
-  color: #0087ff;
-  line-height: 0.34rem;
-  margin-left: 2.5rem;
-  cursor: pointer;
-}
-
-.details-pageconetent {
-  height: 100%;
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin-top: 0.67rem;
-  position: relative;
-  background: rgba(245, 243, 243, 0.3);
-
-  .details-pageconetent-left {
-    max-height: 6.9rem;
-    position: absolute;
-    width: 2.5rem;
-    top: 0.17rem;
-    left: 2.5rem;
-    margin-right: 0.17rem;
-    overflow: auto;
-  }
-
-  .top {
-    min-height: 7.2rem;
-    position: relative;
-    width: 11.5rem;
+  .details-pageconetent {
+    height: 100%;
+    width: 100%;
    display: flex;
-    padding-top: 0.2rem;
-    flex-direction: column;
-    font-size: 0.16rem;
-    justify-content: left;
-    background: #f3f5f9;
+    justify-content: center;
+    align-items: center;
+    margin-top: 0.67rem;
+    position: relative;
+    background: rgba(245, 243, 243, 0.3);

-    .pagination {
-      background: #f3f5f9;
-      padding-bottom: 0.6rem;
+    .details-pageconetent-left {
+      max-height: 6.9rem;
+      position: absolute;
+      width: 2.5rem;
+      top: 0.17rem;
+      left: 2.5rem;
+      margin-right: 0.17rem;
+      overflow: auto;
    }

-    .top-title {
-      padding: 0.2rem;
+    .top {
+      min-height: 7.2rem;
+      position: relative;
+      width: 11.5rem;
      display: flex;
-      font-size: 18px;
+      padding-top: 0.2rem;
+      flex-direction: column;
+      font-size: 0.16rem;
+      justify-content: left;
+      background: #f3f5f9;

-      .tabAll {
+      .pagination {
+        background: #f3f5f9;
+        padding-bottom: 0.6rem;
+      }
+
+      .top-title {
+        padding: 0.2rem;
+        display: flex;
        font-size: 18px;
-        color: #000000;
-        margin-right: 35px;
-        cursor: pointer;
-      }

-      .tabAll:nth-child(1) {
-        margin-left: 20px;
-      }
+        .tabAll {
+          font-size: 18px;
+          color: #000000;
+          margin-right: 35px;
+          cursor: pointer;
+        }

-      .sel {
-        font-weight: 600;
-        color: #0087ff;
-        border-bottom: 0.02rem solid #0087ff;
+        .tabAll:nth-child(1) {
+          margin-left: 20px;
+        }
+
+        .sel {
+          font-weight: 600;
+          color: #0087ff;
+          border-bottom: 0.02rem solid #0087ff;
+        }
      }
    }
  }
-}

-:deep(.ant-card-grid) {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 1;
-  word-break: break-all;
-}
+  :deep(.ant-card-grid) {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 1;
+    word-break: break-all;
+  }
 </style>
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@ -92,15 +92,24 @@
      >
        <div
          class="top"
-          style="font-size: 0.24rem;text-align: center; margin-bottom: 0.3rem"
+          style="font-size: 0.24rem; text-align: center; margin-bottom: 0.3rem"
        >
          {{ i == 0 ? '基础设施' : i == 1 ? '组件服务' : '数据资源' }}
        </div>
-         <div
+        <div
          class="data-count"
          style="font-size: 0.14rem; text-align: right; margin-bottom: 0.2rem"
        >
-         <span style="color:#909399;">共 {{ i == 0 ? infrastructureCount : i == 1 ? componentCount : dataSourceCount }}条数据，示例数据如下：</span>
+          <span style="color: #909399">
+            共
+            {{
+              i == 0
+                ? infrastructureCount
+                : i == 1
+                ? componentCount
+                : dataSourceCount
+            }}条数据，示例数据如下：
+          </span>
        </div>
        <div class="bottom" style="display: flex; align-items: flex-start">
          <div class="title" :class="'title' + i"></div>
@ -679,7 +688,8 @@
        // width: 100%;
        font-size: 16px;
      }
-      .data-count{}
+      .data-count {
+      }
    }

    .name-box {
--- a/front/src/views/newHome/index.vue
+++ b/front/src/views/newHome/index.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-23 16:41:49
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-04 17:53:27
+ * @LastEditors: Light
+ * @LastEditTime: 2022-10-13 16:40:15
 * @Description: 告诉大家这是什么
 -->
 <template>
@ -32,21 +32,21 @@
  import HomeFooter from '@/views/newHome/components/Footer'
 </script>
 <style lang="less" scoped>
-  @font-face {
-    font-family: 'text-typeface';
-    src: url('~@/assets/newHome/font/text-typeface.otf');
-  }
-  @font-face {
-    font-family: 'num-typeface';
-    src: url('~@/assets/newHome/font/num-typeface.otf');
-  }
-  .newHome {
-    font-family: text-typeface;
-    .num {
-      font-family: num-typeface;
-    }
-  }
-  .resource-aggregation {
-    background: #fff;
+@font-face {
+  font-family: 'text-typeface';
+  src: url('~@/assets/newHome/font/text-typeface.otf');
+}
+@font-face {
+  font-family: 'num-typeface';
+  src: url('~@/assets/newHome/font/num-typeface.otf');
+}
+.newHome {
+  font-family: text-typeface;
+  .num {
+    font-family: num-typeface;
  }
+}
+.resource-aggregation {
+  background: #fff;
+}
 </style>