Merge branch 'config_href_url' into dev

# Conflicts:
#	src/views/screen/index.vue

src/out/config.js

@@ -1,6 +1,8 @@
 window.cusConfig = {
   version: 'zwww',  // zwww-政务外网，gaw-公安网
   zwww: {
+    zhName: '海南社会管理信息化平台',
+    enName: 'HAINAN Social management information platform',
     screenHref: [
       {
         label: '分平台&子系统',
@@ -80,6 +82,8 @@ window.cusConfig = {
     ],
   },
   gaw: {
+    zhName: '海南社会管理信息化平台-公安分平台',
+    enName: 'HAINAN Social management information platform',
     screenHref: [
       {
         label: '反走私',

src/views/common/static.ts

@@ -17,6 +17,8 @@ import LogoIconZwww from './img/logo-icon_zwww.png'
 import store from '@/store/index'
 
 export const logoIcon = window?.cusConfig?.version === 'zwww' ? LogoIconZwww : LogoIcon
+export const zhName = window?.cusConfig?.[window?.cusConfig?.version].zhName
+export const enName = window?.cusConfig?.[window?.cusConfig?.version].enName
 
 export const bgImgMapper = [BgImg1, BgImg2, BgImg3]
 

src/views/pc/index.vue

@@ -9,10 +9,10 @@
       <img :src="LogoIcon"/>
       <div class="pc-logo-title">
         <div class="pc-logo-title-cn">
-          海南社会管理信息化平台
+          {{ zhName }}
         </div>
         <div class="pc-logo-title-en">
-          HAINAN Social management information platform
+          {{ enName }}
         </div>
       </div>
     </div>
@@ -67,7 +67,7 @@ import {
   toRefs,
   getCurrentInstance
 } from 'vue'
-import {bgImgMapper, infoMapper, logoIcon} from '../common/static'
+import {bgImgMapper, infoMapper, logoIcon, zhName, enName} from '../common/static'
 
 export default defineComponent({
   name: 'App',
@@ -84,7 +84,9 @@ export default defineComponent({
       infoCurrent: '',
       InfoMapper: infoMapper,
       infoInput: '',
-      LogoIcon: logoIcon
+      LogoIcon: logoIcon,
+      zhName: zhName,
+      enName: enName,
     });
 
     const toHref = (val: { href: string | URL | undefined }) => {

src/views/screen/index.vue

@@ -9,10 +9,10 @@
       <img :src="LogoIcon"/>
       <div class="screen-logo-title">
         <div class="screen-logo-title-cn">
-          海南社会管理信息化平台
+          {{ zhName }}
         </div>
         <div class="screen-logo-title-en">
-          HAINAN Social management information platform
+          {{ enName }}
         </div>
       </div>
     </div>
@@ -348,11 +348,11 @@ import {
   getCurrentInstance
 } from 'vue'
 import {useStore} from 'vuex'
-import {bgImgMapper, infoMapper, logoIcon} from '../common/static'
 import MessageCom from './message/index.vue'
 import CountTo from '@/components/vue-count-to/vue-countTo.vue';
 import KedaCom from '@/components/keda/keda-com.vue';
 import axios from "axios";
+import {bgImgMapper, infoMapper, logoIcon, zhName, enName} from '../common/static'
 
 export default defineComponent({
   name: 'App',
@@ -412,7 +412,9 @@ export default defineComponent({
         cqzl: '0(0%)',
         bbbzs: '0(0%)',
         qt: '0(0%)',
-      }
+      },
+      zhName: zhName,
+      enName: enName,
     });
     const switchInfo = (ind) => {
       if (ind === state.infoIndex) {