Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/App.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-05-06 11:12:00
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-12-14 14:27:01
+ * @LastEditTime: 2022-12-29 17:12:43
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -22,8 +22,9 @@
   import { onBeforeUnmount, onMounted, watch, ref } from 'vue'
   import { useRouter } from 'vue-router'
   import mybus from '@/myplugins/mybus'
+  import { useStore } from 'vuex'
   const router = useRouter()
-
+  const store = useStore()
   const locale = zhCN
   const token = Cookies.get('ucsToken')
   const whoShow1 = ref(whoShow)
@@ -88,10 +89,11 @@
     }
   }
   const waterMarkInit = (newValue) => {
-    getUser().then((res) => {
-      if (res.data.code == 0) {
-        realName = res.data.data.realName
-      }
+    // getUser().then((res) => {
+    //   if (res.data.code == 0) {
+    //     realName = res.data.data.realName
+    //   }
+    realName = store.getters['user/realName']
     if (realName.length > 13) {
       onWholeWaterMark(
         [realName, moment().format('YYYY-MM-DD')],
@@ -130,7 +132,7 @@
         changeWaterMark(newValue)
       }
     })
-    })
+    // })
   }
   watch(
     () => router.currentRoute.value.path,
@@ -142,16 +144,16 @@
         realName,
         realName.charCodeAt()
       )
-      // 如果刚登陆  初始化水印
-      if (newValue == '/home') {
-        waterMarkInit(newValue)
-      }
+      // // 如果刚登陆  初始化水印
+      // if (newValue == '/home') {
+      //   waterMarkInit(newValue)
+      // }
       changeWaterMark(newValue)
     },
     { immediate: true }
   )
   onMounted(() => {
-    // waterMarkInit()
+    waterMarkInit()
   })
   onBeforeUnmount(() => {
     // 4.卸载前, 关闭链接

front/src/api/user.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:48:03
- * @LastEditors: Light
- * @LastEditTime: 2022-10-25 09:37:05
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-12-29 14:50:51
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -62,3 +62,11 @@ export function register() {
     method: 'post',
   })
 }
+// 获取菜单
+export function getNavList(params) {
+  return request({
+    url: '/sys/menu/nav',
+    method: 'get',
+    params,
+  })
+}

front/src/main.js

@@ -2,12 +2,10 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:48:03
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-06 15:00:49
+ * @LastEditTime: 2022-12-29 10:30:38
  * @Description: 告诉大家这是什么
  */
-import {
-    createApp
-} from 'vue'
+import { createApp } from 'vue'
 import Antd from 'ant-design-vue'
 import mitt from 'mitt'
 import App from './App'
@@ -17,8 +15,8 @@ import store from './store'
 import 'ant-design-vue/dist/antd.css'
 import '@/vab'
 import * as echarts from 'echarts'
-import * as moment from "moment"
-import "dayjs/locale/zh-cn";
+import * as moment from 'moment'
+import 'dayjs/locale/zh-cn'
 import vue3videoPlay from 'vue3-video-play-emiyagm' // 引入组件
 import 'vue3-video-play-emiyagm/dist/style.css' // 引入css
 import ElementPlus from 'element-plus'
@@ -58,7 +56,6 @@ router.beforeEach((to, from, next) => {
   next()
 })
 
-
 // 判断浏览器
 // function judgeAgent() {
 //     let userAgent = navigator.userAgent // 取得浏览器的userAgent字符串

front/src/store/modules/user.js

@@ -21,6 +21,7 @@ const state = () => ({
   avatar: '',
   role: 0, // 用户管理员权限
   roleList: [], // 用户管理员权限
+  navList: [],
 })
 const getters = {
   accessToken: (state) => state.accessToken,
@@ -32,6 +33,7 @@ const getters = {
   userId: (state) => state.userId,
   deptName: (state) => state.deptName,
   deptId: (state) => state.deptId,
+  navList: (state) => state.navList,
 }
 const mutations = {
   /**
@@ -77,6 +79,11 @@ const mutations = {
   setDeptName(state, name) {
     state.deptName = name
   },
+  // 设置门户导航
+  setNavList(state, nav) {
+    debugger
+    state.navList = nav
+  },
   setDeptId(state, name) {
     state.deptId = name
   },

front/src/utils/request.js

@@ -61,6 +61,7 @@ const instance = axios.create({
   timeout: requestTimeout,
   headers: {
     'Content-Type': contentType,
+    'Accept-Language': 'zh-CN',
   },
 })
 

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

@@ -92,9 +92,12 @@
       <div class="bottom" @click="goToView()">查看更多</div>
     </div>
     <div class="info">
-      <i class="img"  @click="
+      <i
+        class="img"
+        @click="
           jumpPage({ name: '个人中心', key: 'personalCenter' }, 'headerClick')
-          "></i>
+        "
+      ></i>
       <a-tooltip placement="bottom">
         <template #title>
           <span>{{ user.realName }}</span>
@@ -131,6 +134,7 @@
   import { mynotice } from '@/api/home'
   import { useStore } from 'vuex'
   import { getSgcTotal } from '@/api/home'
+
   import Cookies from 'js-cookie'
   import mybus from '@/myplugins/mybus'
   import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
@@ -149,7 +153,13 @@
   const select = ref(router.currentRoute.value.name)
   const mynoticeFlag = ref(false)
   const mynoticeData = ref([])
-  const navList = ref(navListManagement.navList)
+  const navList = ref([])
+  const asyncNav = store.getters['user/navList']
+  if (asyncNav.length > 0) {
+    navList.value = asyncNav
+  } else {
+    navList.value = navListManagement.navList
+  }
   const targetRouter = ref('')
   const backFlag = ref(false)
   getUserInfo().then((res) => {
@@ -165,6 +175,7 @@
       })
     }
   })
+
   console.log('navList------------>', navList)
 
   const props = defineProps({
@@ -422,7 +433,6 @@
     })
 
     mybus.on('changeMenuStyle', (data) => {
-
       targetRouter.value = data
       if (data.path == '/algorithmCompare') {
         jumpPage(

front/src/views/home/index.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:53:28
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-03-30 16:35:27
+ * @LastEditTime: 2022-12-29 15:12:28
  * @Description: 告诉大家这是什么
 -->
 <template>

front/src/views/login/index.vue

@@ -53,7 +53,9 @@
   import { Encrypt } from '@/utils/crypto'
   import { UserOutlined, LockOutlined } from '@ant-design/icons-vue'
   import { message, Modal } from 'ant-design-vue'
-
+  import { getNavList } from '@/api/user'
+  import { useStore } from 'vuex'
+  // const store = useStore()
   // 是否是西海岸
   const isXiHaiAn = whoShow.itShowXiHaiAn
 
@@ -74,6 +76,7 @@
         devDependencies: devDependencies,
         is360: false,
         isIE: false,
+        store: useStore(),
         canOpen: ['FF', 'Chrome'],
       }
     },
@@ -94,7 +97,6 @@
     mounted() {
       this.form.username = ''
       this.form.password = ''
-
       if (!this.canOpen.includes(this.judgeAgent())) {
         Modal.warning({
           title: '提示',
@@ -106,6 +108,24 @@
       ...mapActions({
         login: 'user/login',
       }),
+      getNavList() {
+        let navList = []
+        getNavList({
+          _t: new Date().getTime(),
+        }).then((res) => {
+          const nav = res.data.data.filter((item) => item.site === 1)
+          if (nav.length > 0) {
+            navList = nav.map((item) => {
+              item.key = item.url
+              item.innerKey = item.permissions
+              return item
+            })
+          }
+          console.log('后台获取到的站点', navList)
+          debugger
+          this.store.commit('user/setNavList', navList)
+        })
+      },
       // 判断浏览器
       judgeAgent() {
         let userAgent = navigator.userAgent // 取得浏览器的userAgent字符串
@@ -159,6 +179,7 @@
           })
           // window.localStorage.setItem('tokenStartTime', new Date().getTime())
           window.sessionStorage.setItem('visits', JSON.stringify([]))
+          this.getNavList()
           // console.log(this.handleRoute())
           // 西海岸特殊处理
           if (isXiHaiAn) {