From 43db0d138fe0c7f3192211f6509bf7861da388e8 Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 24 May 2023 11:04:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E5=85=A8=E9=83=A8=E8=BF=81=E7=A7=BB=E4=B8=BA=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 3 +- .../foshan_01/menus/menuDialog/helpAbout.vue | 11 +- .../fuzhou_01/menus/menuDialog/helpAbout.vue | 11 +- src/layout/components/Entry.vue | 365 ++- src/layout/components/Navbar.vue | 3 +- src/layout/index.vue | 26 +- src/router/index.js | 288 +-- src/scripts/ProjectConfig.js | 2062 ++++++++--------- src/store/modules/projectConfig.js | 12 + src/store/modules/user.js | 5 + src/utils/mapList.js | 18 +- src/views/designPlatform/bigScreen.vue | 448 ++-- src/views/designPlatform/bigSplitScreen.vue | 438 ++-- src/views/designPlatform/demonList.vue | 602 ++--- src/views/designPlatform/home.vue | 154 +- src/views/designPlatform/index.vue | 156 +- src/views/designPlatform/mapPreviewNew.vue | 350 +-- .../jlmap3d/lesson3dplayer/lesson3dselect.vue | 1 - .../jlmap3d/maintainer/jl3dmaintainer.vue | 1 - .../maintainer/jl3dmaintainerselect.vue | 1 - .../jlmap3d/otherproject/xzexam/xzexam.vue | 3 - src/views/jlmap3d/passflow/jl3dpassflow.vue | 7 +- .../jlmap3d/simulation/jl3dsimulation.vue | 5 +- .../jlmap3d/trafficplan/jl3dtrafficplan.vue | 5 +- src/views/messageBoard/index.vue | 888 +++---- src/views/messageBoard/manage.vue | 236 +- src/views/newMap/display/messageBoard.vue | 896 +++---- .../display/simulationMenu/contectUs.vue | 11 +- .../orderauthor/permission/projectPackage.vue | 16 +- src/views/permissionManage/index.vue | 21 +- src/views/planSchedule/titleBar.vue | 11 +- src/views/publish/publishMap/index.vue | 14 +- src/views/publish/publishMap/project.vue | 23 +- .../frontProjectConfigManage/frontConfig.vue | 24 + src/views/system/serverManage/add.vue | 234 +- src/views/system/serverManage/index.vue | 328 +-- src/views/system/systemGenerate/create.vue | 400 ++-- src/views/system/systemGenerate/index.vue | 344 +-- src/views/thirdLogin/index.vue | 1 - 39 files changed, 4234 insertions(+), 4188 deletions(-) diff --git a/src/App.vue b/src/App.vue index 82e28f4bf..7fac3f21c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -23,7 +23,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index b44134285..67b70a0d3 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -111,7 +111,6 @@ import { mapGetters } from 'vuex'; import SystemTitle from './Title'; import {getSessionStorage } from '@/utils/auth'; -import { ThirdLoginList } from '@/scripts/ProjectConfig'; export default { components: { @@ -131,7 +130,7 @@ export default { 'routers' ]), thirdLogin() { - return ThirdLoginList.includes(getSessionStorage('project')); + return this.$store.state.user.thirdLogin; }, username() { return this.$store.state.user.nickname; diff --git a/src/layout/index.vue b/src/layout/index.vue index 13e84969c..94de39444 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -8,9 +8,9 @@ -
{{ $t('global.companyInfo') }}  {{ $t('global.companyTel') }}
-
{{ bottomColumnOnlyConInfo.includes(project)? companyInfo : $t('global.companyICP') }}
- +
{{ bottomCompanyInfo }}
+
{{ bottomRecordNumber }}
+
@@ -33,7 +33,8 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/designPlatform/bigSplitScreen.vue b/src/views/designPlatform/bigSplitScreen.vue index 8d8e1f29c..a4d753200 100644 --- a/src/views/designPlatform/bigSplitScreen.vue +++ b/src/views/designPlatform/bigSplitScreen.vue @@ -1,221 +1,221 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue index b25a48574..cd7b36d91 100644 --- a/src/views/designPlatform/demonList.vue +++ b/src/views/designPlatform/demonList.vue @@ -1,304 +1,304 @@ - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/views/designPlatform/home.vue b/src/views/designPlatform/home.vue index cc849145d..7496e8e4c 100644 --- a/src/views/designPlatform/home.vue +++ b/src/views/designPlatform/home.vue @@ -1,83 +1,83 @@ - + + + + + + + + + + + + + + + + + - - + + + + + + + + + diff --git a/src/views/designPlatform/index.vue b/src/views/designPlatform/index.vue index b0c6ff1fb..154af9971 100644 --- a/src/views/designPlatform/index.vue +++ b/src/views/designPlatform/index.vue @@ -1,82 +1,82 @@ - + + + + + + + + + + + - - + + + + + + + diff --git a/src/views/designPlatform/mapPreviewNew.vue b/src/views/designPlatform/mapPreviewNew.vue index a565cf9df..308a85559 100644 --- a/src/views/designPlatform/mapPreviewNew.vue +++ b/src/views/designPlatform/mapPreviewNew.vue @@ -1,177 +1,177 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/jlmap3d/lesson3dplayer/lesson3dselect.vue b/src/views/jlmap3d/lesson3dplayer/lesson3dselect.vue index c6b396424..3fec13003 100644 --- a/src/views/jlmap3d/lesson3dplayer/lesson3dselect.vue +++ b/src/views/jlmap3d/lesson3dplayer/lesson3dselect.vue @@ -37,7 +37,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/messageBoard/manage.vue b/src/views/messageBoard/manage.vue index f61b39b65..d3547ed59 100644 --- a/src/views/messageBoard/manage.vue +++ b/src/views/messageBoard/manage.vue @@ -1,121 +1,121 @@ - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/views/newMap/display/messageBoard.vue b/src/views/newMap/display/messageBoard.vue index 27978cbca..3dee44fa3 100644 --- a/src/views/newMap/display/messageBoard.vue +++ b/src/views/newMap/display/messageBoard.vue @@ -1,451 +1,451 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/newMap/display/simulationMenu/contectUs.vue b/src/views/newMap/display/simulationMenu/contectUs.vue index d24838220..4ff8cfed7 100644 --- a/src/views/newMap/display/simulationMenu/contectUs.vue +++ b/src/views/newMap/display/simulationMenu/contectUs.vue @@ -5,7 +5,7 @@ width="400px" :before-close="handleClose" > -
+
联系人：欧阳炜椿
电    话：4000500081
邮    箱：zhrc@richortech.com
@@ -29,8 +29,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/system/serverManage/index.vue b/src/views/system/serverManage/index.vue index 6c55534d9..8d1267f31 100644 --- a/src/views/system/serverManage/index.vue +++ b/src/views/system/serverManage/index.vue @@ -1,166 +1,166 @@ - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/system/systemGenerate/create.vue b/src/views/system/systemGenerate/create.vue index 5ba8ddf7d..68aa5b88f 100644 --- a/src/views/system/systemGenerate/create.vue +++ b/src/views/system/systemGenerate/create.vue @@ -1,201 +1,201 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/system/systemGenerate/index.vue b/src/views/system/systemGenerate/index.vue index be0cc8e9a..58dfa3a9d 100644 --- a/src/views/system/systemGenerate/index.vue +++ b/src/views/system/systemGenerate/index.vue @@ -1,176 +1,176 @@ - + + + + + + - + + + + + + + + + + + + + diff --git a/src/views/thirdLogin/index.vue b/src/views/thirdLogin/index.vue index e6343cea4..517323995 100644 --- a/src/views/thirdLogin/index.vue +++ b/src/views/thirdLogin/index.vue @@ -14,7 +14,6 @@ import md5 from 'js-md5'; import { setToken, getToken } from '@/utils/auth'; import OrgSelect from '../login/orgSelect'; // , ProjectLoginStyleList, VersionBaseNoShow, MainBodyNoShow, NoQrcodeList, localPackageProject, RegisterCodeList -// import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig'; export default { name:'ThirdLogin',