From dfa6c6a67bf82630d0d80cb3ee946ec6b80ae31a Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Thu, 7 Jul 2022 18:22:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/index.html                       | 16 ++++----
 front/public/static/config/location.js        |  6 +--
 front/src/store/modules/user.js               | 40 +++++++------------
 front/src/utils/request.js                    |  4 ++
 front/src/vab/plugins/permissions.js          | 20 +++++++---
 front/src/views/home/infrastructurePage.vue   |  2 +-
 .../components/CapabilityConvergence.vue      |  2 +-
 7 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/front/public/index.html b/front/public/index.html
index 897e6d73..7530e93e 100644
--- a/front/public/index.html
+++ b/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['previewUrl'] = 'http://15.72.183.90:7008/';
-    // 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['backUrl'] = 'http://15.72.183.90:8001';
+    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['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';
@@ -45,10 +45,10 @@
     // 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['backUrl'] = 'http://15.2.21.238:9797';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/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://124.222.94.39:9797';
diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 19e1dbdb..7a90265f 100644
--- a/front/public/static/config/location.js
+++ b/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-05 20:08:53
+ * @LastEditTime: 2022-07-07 17:30:10
  * @Description: 数据资源参数配置
  */
-//const newLocation = 'qingdao'
+const newLocation = 'qingdao'
 // const newLocation = 'baotou'
- const newLocation = 'xihaian'
+// const newLocation = 'xihaian'
 
 // 数据资源数据
 const whoShow = {}
diff --git a/front/src/store/modules/user.js b/front/src/store/modules/user.js
index f8dc9bb2..9679476e 100644
--- a/front/src/store/modules/user.js
+++ b/front/src/store/modules/user.js
@@ -113,31 +113,21 @@ const actions = {
    * @param {*} { commit, dispatch, state }
    * @returns
    */
-  async getUserInfo({ commit }) {
-    const { data } = await getUserInfo()
-    if (!data) {
-      message.error(`验证失败，请重新登录...`)
-      return false
-    }
-    // debugger
-    commit('setUsername', data.data.username)
-    commit('setRole', data.data.roleIdList.length)
-    commit('setUserId', data.data.id)
-    // TODO 获取用户信息，后续执行部分操作
-    // let { username, avatar, roles, ability } = data
-    // if (username && roles && Array.isArray(roles)) {
-    //   dispatch('acl/setRole', roles, {
-    //     root: true,
-    //   })
-    //   if (ability && ability.length > 0)
-    //     dispatch('acl/setAbility', ability, {
-    //       root: true,
-    //     })
-    //   commit('setUsername', username)
-    //   commit('setAvatar', avatar)
-    // } else {
-    //   message.error('用户信息接口异常')
-    // }
+  getUserInfo({ commit }) {
+    return new Promise((resolve, reject)=>{
+      getUserInfo().then( (res) =>{
+        console.log('res', res)
+        const data = res.data
+        if (!data) {
+          message.error(`验证失败，请重新登录...`)
+          reject()
+        }
+        commit('setUsername', data.data.username)
+        commit('setRole', data.data.roleIdList.length)
+        commit('setUserId', data.data.id)
+        resolve()
+      })
+    })
   },
 
   /**
diff --git a/front/src/utils/request.js b/front/src/utils/request.js
index 021c203b..581dbef8 100644
--- a/front/src/utils/request.js
+++ b/front/src/utils/request.js
@@ -114,10 +114,14 @@ instance.interceptors.response.use(
         location.reload()
       }, 1000)
     }
+    debugger;
     response['Access-Control-Expose-Headers'] = 'redirect'
     const { code, message } = response.data
     if (response.headers.token) {
       setAccessToken(response.headers.token)
+      debugger
+      // setAccessToken(response.headers.token)
+      //  store.dispatch('user/getUserInfo')
     } else {
       if (response.headers.redirect) {
         // window.location.href = response.headers.redirect
diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js
index f417ba89..ac6117bc 100644
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 17:23:11
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 09:54:19
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-07 18:15:38
  * @Description: 告诉大家这是什么
  */
 /**
@@ -20,6 +20,7 @@ import {
 } from '@/config'
 import { setAccessToken, getAccessToken } from '@/utils/accessToken'
 router.beforeEach(async (to, from, next) => {
+  // 初始化拦截
   // debugger
   // const SSOTOKEN = to.query.SSOToken
   // if (SSOTOKEN) {
@@ -29,11 +30,14 @@ router.beforeEach(async (to, from, next) => {
   // console.log('token', token)
   let hasToken = token || store.getters['user/accessToken']
   // debugger
+  // 未开启登录拦截状态
   if (!loginInterception) hasToken = true
   // console.log('hasToken存在巨大问题', hasToken)
+  debugger
   if (hasToken) {
-    setAccessToken(hasToken)
+    setAccessToken(token)
     await store.dispatch('user/getUserInfo')
+    debugger
     next()
   } else {
     let accessRoutes = []
@@ -44,11 +48,17 @@ router.beforeEach(async (to, from, next) => {
     if (routesWhiteList.indexOf(to.path) !== -1) {
       next()
     } else {
-      await store.dispatch('user/getUserInfo')
+      store.dispatch('user/getUserInfo').then((res)=>{
+        debugger
+        next()
+      })
       // if (recordRoute)
       //   next({ path: '/login', query: { redirect: to.path }, replace: true })
       // else next({ path: '/login', replace: true })
-      next()
+      // debugger
+      // setTimeout(()=>{
+      //   next()
+      // }, 500)
       // window.open('http://www.baidu.com', '_self')
     }
   }
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 7060d2e3..626f905e 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -9,7 +9,7 @@
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
-          @click="tabClick(index, itemContent, itemContent)"
+          @click="tabClick(index, item.title)"
           :class="
             clickList[index].content.indexOf(itemContent.labelName) != -1 ||
             clickList[index].content.indexOf(itemContent) != -1
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 9b195a16..0a49b255 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -162,7 +162,7 @@
     } else {
       let type = paramsGetResources.type
       if (type == '基础设施') {
-        selectInfrastructureList().then((res) => {
+          selectInfrastructureList().then((res) => {
           console.log('基础设施==========>', res.data.data)
           for (const key in res.data.data) {
             jcList.value.push({

From 74187e4623dc9486908c1b1f8f9be3e8326ad025 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Thu, 7 Jul 2022 19:07:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePage.vue | 24 ++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 7060d2e3..60c76190 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -9,7 +9,7 @@
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
-          @click="tabClick(index, itemContent, itemContent)"
+          @click="tabClick(index, itemContent)"
           :class="
             clickList[index].content.indexOf(itemContent.labelName) != -1 ||
             clickList[index].content.indexOf(itemContent) != -1
@@ -115,8 +115,8 @@
 </template>
 <script setup>
   import VideoSurveillance from '@/views/home/videoSurveillance'
-  import { getCategoryTreePage } from '@/api/personalCenter'
-  import { dataType } from 'element-plus/es/components/table-v2/src/common'
+  // import { getCategoryTreePage } from '@/api/personalCenter'
+  // import { dataType } from 'element-plus/es/components/table-v2/src/common'
   import { useRouter } from 'vue-router'
   import { message } from 'ant-design-vue'
   import { ref, reactive, onMounted } from 'vue'
@@ -243,7 +243,7 @@
       clickList.value.push(params)
     })
     mybus.off('tranferToList')
-    mybus.on('tranferToList', (data) => {
+    mybus.on('tranferToList', () => {
       console.log('获取到的列表数据')
     })
   }
@@ -338,7 +338,11 @@
     })
     console.log('选中的标签code', mapSearchParam.value)
     mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
-    if (name == '视频资源') {
+    let fatherName = ref('视频资源')
+    if (name == '视频资源' || name == '云资源' || name == '感知资源') {
+      fatherName.value == name
+    }
+    if (fatherName.value == '视频资源') {
       getCamera()
     } else {
       dataSource.value = []
@@ -392,10 +396,10 @@
       message.error('请选择需要申请的数据')
     }
   }
-  // 添加至购物车
-  const addShopCar = () => {
-    console.log('添加至购物车')
-  }
+  // // 添加至购物车
+  // const addShopCar = () => {
+  //   console.log('添加至购物车')
+  // }
   const getCamera = () => {
     console.log('初始化调用')
     getCameraByParentId(mapSearchParam.value).then((res) => {
@@ -442,7 +446,7 @@
       key: 'channelId',
     },
   ])
-  const allClick = ref([])
+  // const allClick = ref([])
   const onSelectChange = (record, selected, selectedRows, nativeEvent) => {
     console.log('hahhahah', record, selected, selectedRows, nativeEvent)
     if (selected) {

From 2ffb67b235889a91523eef93cf281c110b698cd3 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 7 Jul 2022 19:15:27 +0800
Subject: [PATCH 3/3] no message

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

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 2d3ef2e8..b88cabc5 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -11,11 +11,7 @@
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
-<<<<<<< HEAD
-          @click="tabClick(index, item.title)"
-=======
           @click="tabClick(index, itemContent, item)"
->>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
           :class="
             clickList[index].content.indexOf(itemContent.labelName) != -1 ||
             clickList[index].content.indexOf(itemContent) != -1