添加西海岸图标切图

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-14 10:01:08
+ * @LastEditTime: 2022-07-18 11:34:38
  * @Description: 数据资源参数配置
  */
-const newLocation = 'qingdao'
+//const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-//  const newLocation = 'xihaian'
+const newLocation = 'xihaian'
 
 // 数据资源数据
 const whoShow = {}

front/src/vab/plugins/permissions.js

@@ -2,60 +2,59 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 17:23:11
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-16 10:57:59
+ * @LastEditTime: 2022-07-18 11:25:28
  * @Description: 告诉大家这是什么
  */
 /**
  * @author chuzhixin 1204505056@qq.com
  * @description 路由守卫，目前两种模式：all模式与intelligence模式
  */
- import router from '@/router'
- import store from '@/store'
- import getPageTitle from '@/utils/pageTitle'
- import { getUserInfo } from '@/api/user'
- import {
-   // authentication,
-   loginInterception,
-   // recordRoute,
-   routesWhiteList,
- } from '@/config'
- import { setAccessToken, getAccessToken } from '@/utils/accessToken'
- router.beforeEach(async (to, from, next) => {
-   // debugger
-   // const SSOTOKEN = to.query.SSOToken
-   // if (SSOTOKEN) {
-   //   setAccessToken(SSOTOKEN)
-   // }
+import router from '@/router'
+import store from '@/store'
+import getPageTitle from '@/utils/pageTitle'
+import { getUserInfo } from '@/api/user'
+import {
+  // authentication,
+  loginInterception,
+  // recordRoute,
+  routesWhiteList,
+} from '@/config'
+import { setAccessToken, getAccessToken } from '@/utils/accessToken'
+router.beforeEach(async (to, from, next) => {
+  // debugger
+  // const SSOTOKEN = to.query.SSOToken
+  // if (SSOTOKEN) {
+  //   setAccessToken(SSOTOKEN)
+  // }
 
-   const token = getAccessToken()
-   console.log('token', token)
-   let hasToken = token
-   // debugger
-   if (!loginInterception) hasToken = true
-   console.log('hasToken存在巨大问题', hasToken)
-   if (hasToken) {
+  const token = getAccessToken()
+  console.log('token', token)
+  let hasToken = token
+  // debugger
+  if (!loginInterception) hasToken = true
+  console.log('hasToken存在巨大问题', hasToken)
+  if (hasToken) {
     //  setAccessToken(hasToken)
-     await store.dispatch('user/getUserInfo')
-     // debugger
-     next()
-   } else {
-     let accessRoutes = []
-     accessRoutes = await store.dispatch('routes/setRoutes')
-     accessRoutes.forEach((item) => {
-       router.addRoute(item)
-     })
-     if (routesWhiteList.indexOf(to.path) !== -1) {
-       next()
-     } else {
+    await store.dispatch('user/getUserInfo')
+    // debugger
+    next()
+  } else {
+    let accessRoutes = []
+    accessRoutes = await store.dispatch('routes/setRoutes')
+    accessRoutes.forEach((item) => {
+      router.addRoute(item)
+    })
+    if (routesWhiteList.indexOf(to.path) !== -1) {
+      next()
+    } else {
       // 这里是一个单点登录的入口
-       if (to.query.redict)
-         getUserInfo(to.query.redict)
-       else {
-         getUserInfo()
-       }
-     }
-   }
- })
- router.afterEach((to) => {
-   document.title = getPageTitle(to.meta.title)
- })
+      if (to.query.redict) getUserInfo(to.query.redict)
+      else {
+        getUserInfo()
+      }
+    }
+  }
+})
+router.afterEach((to) => {
+  document.title = getPageTitle(to.meta.title)
+})

front/src/views/demandCenter/index.vue

@@ -17,7 +17,7 @@
         </a-layout-sider>
       </div>
       <div class="right">
-        <div class="title">数据需求</div>
+        <!-- <div class="title">数据需求</div> -->
         <a-list
           class="demo-loadmore-list"
           :loading="initLoading"

front/src/views/home/components/header.vue

@@ -7,7 +7,8 @@
     ]"
   >
     <div class="name">
-      <div class="name-bg"></div>
+      <div class="name-bg" v-if="!whoShow1.itShowXiHaiAn"></div>
+      <div class="name-bg-xihaian" v-else></div>
       城市云脑通用能力服务平台
     </div>
     <div
@@ -137,6 +138,7 @@
   //   // { name: '后台管理', key: 'houtaiguanli' },
   //   { name: '赋能案例', key: 'assignCase' },
   // ])
+  const whoShow1 = whoShow
   const user = ref({
     username: store.getters['user/username'],
   })
@@ -353,6 +355,14 @@
         background-size: 100%;
         margin-right: 0.15rem;
       }
+      .name-bg-xihaian {
+        height: 0.6rem;
+        width: 0.6rem;
+        background: url('~@/assets/newHome/newHome-title-bg-xihaian.png')
+          no-repeat;
+        background-size: 100%;
+        margin-right: 0.15rem;
+      }
     }
     .nav {
       width: 1.2rem;