From 7952d486d3f18e992bbc606a5a089710342f24c4 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 21 Apr 2020 15:47:25 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A5=BF=E5=AE=89?=
 =?UTF-8?q?=E5=9C=B0=E9=93=81=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit d44faf5)
---
 src/layout/components/Title.vue |  2 +-
 src/router/index_Common.js      |  2 +-
 src/scripts/ProjectConfig.js    | 10 ++++++++--
 src/views/login/index.vue       | 19 ++++++++++++++++---
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/layout/components/Title.vue b/src/layout/components/Title.vue
index 2cf1085d4..96a65c072 100644
--- a/src/layout/components/Title.vue
+++ b/src/layout/components/Title.vue
@@ -21,7 +21,7 @@ export default {
     },
     mounted() {
         const project = getSessionStorage('project');
-        this.systemTitle = loginInfo[project].title;
+        this.systemTitle = loginInfo[project].homeTitle || loginInfo[project].title;
         this.logoImg = ProjectIcon[project];
         if (project.endsWith('hyd')) {
             this.isHyd = true;
diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index 4b5946bb9..ae4706abc 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -901,7 +901,7 @@ const router = createRouter();
 
 router.beforeEach((to, from, next) => {
     const project = getSessionStorage('project');
-    document.title = loginInfo[project || 'login'].title;
+    document.title = loginInfo[project || 'login'].browserTitle || loginInfo[project || 'login'].title;
     next();
 });
 
diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index 43ad16fd3..088420a02 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -40,11 +40,17 @@ export const loginInfo = { // 页面title & 退出登录跳转路径
         loginPath: '/design/login'
     },
     xadt: {
-        title: '西安地铁城市轨道交通实训平台',
+        title: '城市轨道交通实训平台',
+        loginTitle: '调度一部',
+        homeTitle: '调度一部',
+        browserTitle: '西安地铁调度一部城市轨道交通实训平台',
         loginPath: '/xadt/login'
     },
     designxadt: {
-        title: '西安地铁城市轨道交通设计平台',
+        title: '城市轨道交通设计平台',
+        loginTitle: '调度一部',
+        homeTitle: '调度一部',
+        browserTitle: '西安地铁调度一部城市轨道交通设计平台',
         loginPath: '/designxadt/login'
     }
 };
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 9b16d630d..d1adb78e4 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,11 @@
 <template>
   <div class="login-container" :style="{'background-image': 'url('+bgImg+')'}">
+    <div v-if="loginTitle" class="left-logo-box">
+      <img class="logo" :src="logoImg" style="width: 60px">
+      <span>{{ loginTitle }}</span>
+    </div>
     <div v-if="isProject" class="text-box">
-      <img v-if="project.endsWith('hyd')" class="logo" :src="logoImg" style="width: 140px">
-      <img v-else class="logo" :src="logoImg" style="width: 80px">
+      <img v-if="!loginTitle" class="logo" :src="logoImg" style="width: 80px">
       <span>{{ title }}</span>
     </div>
     <div class="language_box">
@@ -162,6 +165,9 @@ export default {
         project() {
             return this.$route.path.split('/')[1];
         },
+        loginTitle () {
+            return loginInfo[this.$route.path.split('/')[1]].loginTitle;
+        },
         title() {
             return loginInfo[this.$route.path.split('/')[1]].title;
         },
@@ -198,7 +204,7 @@ export default {
         }
     },
     mounted() {
-        document.title = loginInfo[this.project].title;
+        document.title = loginInfo[this.project].browserTitle || loginInfo[this.project].title;
         this.loginRefresh();
     },
     methods: {
@@ -421,6 +427,13 @@ export default {
         font-size: 40px;
         font-weight: bold;
     }
+	.left-logo-box{
+		position: absolute;
+		top: 2%;
+		font-size: 28px;
+		font-weight: bold;
+		left: 2%;
+	}
     .logo{
         vertical-align: middle;
     }

From df034795dec46b90ba6ea3725e416bf1755659ee Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 21 Apr 2020 16:00:10 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=97=E8=BD=A6?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit d60c288)
---
 src/jmapNew/config/skinCode/bejing_01.js  | 2 ++
 src/jmapNew/config/skinCode/chengdu_01.js | 2 ++
 src/jmapNew/config/skinCode/chengdu_03.js | 2 ++
 src/jmapNew/config/skinCode/ningbo_01.js  | 2 ++
 src/jmapNew/config/skinCode/xian_02.js    | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js
index b983ade6a..4e06547e8 100644
--- a/src/jmapNew/config/skinCode/bejing_01.js
+++ b/src/jmapNew/config/skinCode/bejing_01.js
@@ -582,6 +582,8 @@ class SkinCode extends defaultStyle {
                 trainTargetTextAlign: 'left'// 车次号文字显示位置
             },
             trainTargetNumber: {
+                groupNumberPrefix: '000', // 车组号前缀
+                defaultGroupNumber: 'EEE', // 默认车组号
                 trainTargetNumberOffset: { x: -4, y: 4 }// 车组号偏移量
             },
             trainHead: {
diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js
index 25e99ed94..1cf3c7a85 100644
--- a/src/jmapNew/config/skinCode/chengdu_01.js
+++ b/src/jmapNew/config/skinCode/chengdu_01.js
@@ -528,6 +528,8 @@ class SkinCode extends defaultStyle {
                 trainTargetTextAlign: 'right' // 车次号文字显示位置
             },
             trainTargetNumber: {
+                groupNumberPrefix: '000', // 车组号前缀
+                defaultGroupNumber: 'EEE', // 默认车组号
                 trainTargetNumberOffset: {x: -4, y: 4}// 车组号偏移量
             },
             trainHead: {
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index a7a186103..777f059a0 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -705,6 +705,8 @@ class SkinCode extends defaultStyle {
                 trainTargetTextAlign: 'right' // 车次号文字显示位置
             },
             trainTargetNumber: {
+                groupNumberPrefix: '000', // 车组号前缀
+                defaultGroupNumber: 'EEE', // 默认车组号
                 trainTargetNumberOffset: {x: -4, y: 4}// 车组号偏移量
             },
             trainHead: {
diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 166e3849d..0cc29e9cd 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -565,6 +565,8 @@ class SkinCode extends defaultStyle {
                 trainTargetTextAlign: 'right' // 车次号文字显示位置
             },
             trainTargetNumber: {
+                groupNumberPrefix: '000', // 车组号前缀
+                defaultGroupNumber: 'EEE', // 默认车组号
                 trainTargetNumberOffset: {x: -4, y: 4}// 车组号偏移量
             },
             trainHead: {
diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js
index c11663983..77dcc1384 100644
--- a/src/jmapNew/config/skinCode/xian_02.js
+++ b/src/jmapNew/config/skinCode/xian_02.js
@@ -675,6 +675,8 @@ class SkinCode extends defaultStyle {
                 trainTargetTextAlign: 'right' // 车次号文字显示位置
             },
             trainTargetNumber: {
+                groupNumberPrefix: '000', // 车组号前缀
+                defaultGroupNumber: 'EEE', // 默认车组号
                 trainTargetNumberOffset: {x: -4, y: 4}// 车组号偏移量
             },
             trainHead: {

From 461c08f5f3d4f8f56d166b416864446bb2380e84 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 22 Jun 2020 10:11:12 +0800
Subject: [PATCH 3/6] =?UTF-8?q?sockjs=E9=99=8D=E7=BA=A7=E8=87=B31.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b7dc55048..b9406c84a 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
 		"recordrtc": "^5.5.9",
 		"script-loader": "^0.7.2",
 		"sessionstorage": "^0.1.0",
-		"sockjs-client": "^1.4.0",
+		"sockjs-client": "^1.0.0",
 		"stompjs": "^2.3.3",
 		"storejs": "^1.0.25",
 		"three": "^0.107.0",

From 630440a6e94f150eecc09f05b9db2477e0fcd3ef Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 22 Jun 2020 10:38:59 +0800
Subject: [PATCH 4/6] =?UTF-8?q?sockjs=E6=81=A2=E5=A4=8D=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b9406c84a..b7dc55048 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
 		"recordrtc": "^5.5.9",
 		"script-loader": "^0.7.2",
 		"sessionstorage": "^0.1.0",
-		"sockjs-client": "^1.0.0",
+		"sockjs-client": "^1.4.0",
 		"stompjs": "^2.3.3",
 		"storejs": "^1.0.25",
 		"three": "^0.107.0",

From 47a9ee6e1f80dcb6ec408d066facc83285f5ad50 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 23 Jun 2020 17:01:10 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/userInfo.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/layout/components/userInfo.vue b/src/layout/components/userInfo.vue
index 379d82b0a..5ebb6e769 100644
--- a/src/layout/components/userInfo.vue
+++ b/src/layout/components/userInfo.vue
@@ -11,7 +11,7 @@
     <div>
       <div class="form_box">
         <div class="title">{{ $t('global.compellation') }}:</div>
-        <div class="content">
+        <div class="content_box_info">
           <div v-show="nameShow" class="show_box">
             <span>{{ userInfo.name }}</span>
             <i class="el-icon-edit" @click="switcherName" />
@@ -43,7 +43,7 @@
       </div>
       <div class="form_box">
         <div class="title">{{ $t('global.nickName') }}:</div>
-        <div class="content">
+        <div class="content_box_info">
           <div v-show="nickNameShow" class="show_box">
             <span>{{ userInfo.nickname }}</span>
             <i class="el-icon-edit" @click="switcherNickname" />
@@ -75,7 +75,7 @@
       </div>
       <div class="form_box">
         <div class="title">{{ $t('global.mobile') }}:</div>
-        <div class="content">
+        <div class="content_box_info">
           <div v-show="mobileShow" class="show_box">
             <span>{{ geTel(userInfo.mobile) }}</span>
             <i class="el-icon-edit" @click="switcherMobile" />
@@ -133,7 +133,7 @@
       </div>
       <div class="form_box">
         <div class="title">{{ $t('global.email') }}:</div>
-        <div class="content">
+        <div class="content_box_info">
           <div v-show="emailShow" class="show_box">
             <span>{{ userInfo.email }}</span>
             <i class="el-icon-edit" @click="switcherEmail" />
@@ -182,7 +182,7 @@
       </div>
       <div class="form_box">
         <div class="title">{{ $t('global.passWord') }}:</div>
-        <div class="content">
+        <div class="content_box_info">
           <div v-show="passwordShow" class="show_box">
             <span>******</span>
             <i class="el-icon-edit" @click="switcherPassWord" />
@@ -238,7 +238,7 @@
     </div>
     <div v-if="project.endsWith('gzb')" class="form_box">
       <div class="title">{{ wxUnionId||wxOpenId? '更改绑定微信:': '绑定微信:' }}</div>
-      <div class="content">
+      <div class="content_box_info">
         <el-button v-if="!binding&&!bindSuccess" type="primary" size="small" style="position: absolute;" @click="generateQrCode">生成微信二维码</el-button>
         <div v-if="binding && !bindSuccess" class="login-code-box" @click="generateQrCode">
           <qrcode-vue
@@ -256,7 +256,7 @@
     </div>
     <div v-if="project.endsWith('design') && !wmOpenId " class="form_box">
       <div class="title">绑定微信:</div>
-      <div class="content">
+      <div class="content_box_info">
         <el-button v-if="!binding&&!bindSuccess" type="primary" size="small" style="position: absolute;" @click="generateBindQrCode">生成微信二维码</el-button>
         <div v-if="binding && !bindSuccess" class="login-code-box" @click="generateBindQrCode">
           <qrcode-vue
@@ -682,7 +682,7 @@ export default {
         line-height: 28px;
         float: left;
     }
-    .content {
+    .content_box_info {
         width: calc(100% - 80px);
         float: left;
         margin: 0;

From 81ecb046ba308363e000b5970e005618ba3ab9e7 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 24 Jun 2020 15:45:46 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E9=81=93=E5=B2=94=E5=8C=BA=E6=AE=B5=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/newMapdraft/mapoperate/switch/create.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/switch/create.vue b/src/views/newMap/newMapdraft/mapoperate/switch/create.vue
index 238a6185e..7a05c4b02 100644
--- a/src/views/newMap/newMapdraft/mapoperate/switch/create.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/switch/create.vue
@@ -351,7 +351,6 @@ export default {
                             relSwitchCode: '',
                             relevanceSectionList: elem.relevanceSectionList,
                             points: [{ x: 0, y: 0 }, { x: 0, y: 0 }],
-                            logicSectionNum: 0,
                             logicSectionShow: false,
                             sepTypeLeft: '00',
                             offsetLeft: 0,