西海岸bug修复

front/public/index.html

@@ -28,10 +28,10 @@
      <!-- 站点配置 -->
   <script>
     window.SITE_CONFIG = {};
-    window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
+    // window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 包头
     // window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
@@ -40,10 +40,10 @@
     // window.SITE_CONFIG['apiURL'] = 'http://10.110.205.1:8000/renren-admin';
 
     // 西海岸版本
-    // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
+    window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
-    // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
+    window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
+    window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
     // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
     // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';

front/public/static/config/location.js

@@ -2,12 +2,12 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-09 10:36:12
+ * @LastEditTime: 2022-07-09 17:09:05
  * @Description: 数据资源参数配置
  */
-const newLocation = 'qingdao'
+// const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-//  const newLocation = 'xihaian'
+  const newLocation = 'xihaian'
 
 // 数据资源数据
 const whoShow = {}
@@ -162,7 +162,7 @@ else if (newLocation === 'xihaian') {
   footerDataList.footerList = {
     company: {
       left: '青岛西海岸新区大数据发展促进局建设',
-      right: 'v0.8.1.5',
+      right: 'v0.8.1.6',
     },
     address: [
       {

front/src/utils/accessToken.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:48:03
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-04-25 17:47:09
+ * @LastEditTime: 2022-07-09 16:47:54
  * @Description: 告诉大家这是什么
  */
 import { storage, tokenTableName } from '@/config'
@@ -33,7 +33,7 @@ export function getAccessToken() {
  * @author chuzhixin 1204505056@qq.com
  * @description 存储accessToken
  * @param accessToken
- * @returns {void|*}
+ * @returns {void|*}cs
  */
 export function setAccessToken(accessToken) {
   if (storage) {
@@ -64,7 +64,7 @@ export function removeAccessToken() {
     } else if ('sessionStorage' === storage) {
       return sessionStorage.clear()
     } else if ('cookie' === storage) {
-      // return cookie.remove(tokenTableName)
+      return cookie.remove(tokenTableName)
     } else {
       return localStorage.removeItem(tokenTableName)
     }

front/src/views/capabilityCloud/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:11:03
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-05 19:47:07
+ * @LastEditTime: 2022-07-09 17:05:49
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -32,7 +32,8 @@
   import { useRouter } from 'vue-router'
   const router = useRouter()
   const goHome = () => {
-    router.push('/home')
+    // router.push('/home')
+    window.location.replace('/#/home')
   }
 </script>
 <style lang="less">

front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue

@@ -41,7 +41,6 @@
 <script setup>
   import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
   import { ref, defineProps, watch } from 'vue'
-
   let dataFrom = ref({
     title: '部署与安全',
     englishTitle: 'DEPLOY&SAFE',
@@ -61,7 +60,15 @@
     dataList: { type: Object, default: null },
   })
   if (props.dataList.infoList) {
+    if(props.dataList.link) {
+       let obj = {
+          attrType: '访问地址',
+          attrValue: props.dataList.link
+        }
+        props.dataList.infoList.push(obj)
+    }
     props.dataList.infoList.map((item) => {
+      debugger
       if (
         item.attrType === '部署区域' ||
         item.attrType === '是否统一登录' ||
@@ -107,6 +114,13 @@
     () => props.dataList,
     (val) => {
       if (val) {
+        if(props.dataList.link) {
+       let obj = {
+          attrType: '访问地址',
+          attrValue: props.dataList.link
+        }
+        props.dataList.infoList.push(obj)
+    }
         dataFrom.value.content[0].childrenContent = []
         dataFrom.value.content[1].childrenContent = []
         props.dataList.infoList.map((item) => {

front/src/views/home/Navigation.vue

@@ -70,7 +70,7 @@
           {
             componentCapability: '组件服务0',
             applicationResources: '应用资源0',
-            infrastructure: '基础设施23万',
+            infrastructure: '基础设施0',
             dataResources: '数据资源10387',
             knowledgeBase: '知识库12',
           },

front/src/views/newHome/components/Navigation2.vue

@@ -52,7 +52,7 @@
   // import mybus from '@/myplugins/mybus'
   const yyNum = ref('')
   const zjNum = ref('')
-  const jcNum = ref('23万')
+  const jcNum = ref('')
   const sjNum = ref('')
   const zsNum = ref('')
   // mybus.on('chagneNum', (obj) => {
@@ -74,7 +74,7 @@
           yyNum.value = val.count
           break
         case '基础设施':
-          // jcNum.value = val.count
+          jcNum.value = val.count
           break
         case '数据资源':
           sjNum.value = val.count