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

front/public/static/config/basicConfig.js

@@ -2,14 +2,14 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-13 19:03:07
+ * @LastEditTime: 2022-10-13 21:31:09
  * @Description: 系统静态参数配置
  */
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
   // version: 'xihaian', // 西海岸
-  version: 'dev', // 开发
+  version: 'qingdao', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试
   //version: 'frp', // 内网穿透

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-10-13 15:29:31
+ * @LastEditTime: 2022-10-13 20:53:24
  * @Description: 数据资源参数配置
  */
 // eslint-disable-next-line no-undef
@@ -33,7 +33,7 @@ if (newLocation !== 'baotou' && newLocation !== 'xihaian') {
   navListManagement.navList = [
     { name: '共享门户', key: 'home' },
     { name: '能力集市', key: 'DetailsPageconetent' },
-    { name: '能力云图', key: 'capabilityCloud' },
+    // { name: '能力云图', key: 'capabilityCloud' },
     { name: '能力统计', key: 'abilityStatistics' },
     // { name: '开发指南', key: 'developmentGuide' },
     { name: '新手指南', key: 'instructionManual' },
@@ -47,21 +47,21 @@ if (newLocation !== 'baotou' && newLocation !== 'xihaian') {
   ]
   footerDataList.footerList = {
     company: {
-      left: '青岛市大数据发展管理局建设',
+      left: '青岛市大数据发展管理局',
-      right: '海信网络科技股份有限公司',
+      right: '政府标识码3702000106',
     },
     address: [
-      // {
-      //   name: '鲁IC备00000000号',
-      //   value: '政府标识码3702000106',
-      // },
       {
-        name: '版权所有：青岛市大数据发展管理局',
+        name: '邮编: 266071',
-        value: '地址：山东省青岛市香港中路17号市级机关办公楼',
+        value: 'Email: QDDSJJ@qingdao.shandong.cn',
       },
       {
-        name: '电话：0532-8561234',
+        name: '版权所有：青岛市大数据发展管理局',
-        value: '传真：0532-2145122',
+        value: '地址：山东省青岛市香港中路17号市级机关三号办公楼',
+      },
+      {
+        name: '电话：0532-85912587',
+        value: '传真：0532-85912181',
       },
     ],
   }

front/src/views/abilityStatistics/components/ResourceAggregation.vue

@@ -463,7 +463,7 @@
       grid: {
         height: '65%',
         width: '63%',
-        left: '10%',
+        left: '12%',
         bottom: 30,
       },
       series: [

front/src/views/home/integrationServicesDetails.vue

@@ -108,7 +108,7 @@
                 : i == 1
                 ? componentCount
                 : dataSourceCount
-            }}条数据，示例数据如下：
+            }}项，示例如下：
           </span>
         </div>
         <div class="bottom" style="display: flex; align-items: flex-start">
@@ -302,7 +302,7 @@
         }
         detailInfoObj.value = res.data.data || {}
         dataSourceCount.value = res.data.data.dataSourceCount || 0
-        infrastructureCount.value = res.data.data.infrastructureCount|| 0
+        infrastructureCount.value = res.data.data.infrastructureCount || 0
         componentCount.value = res.data.data.componentCount || 0
         // 资源属性
         let fuseAttrList = res.data.data.fuseAttrList || []
@@ -351,7 +351,6 @@
                   )?.attrValue || '组件服务',
               }))
             } else if (item.title === '数据资源') {
-
               arr = resource.map((res) => ({
                 id: res.resource.resourceId,
                 name: res.resource.resourceName,