From b74b070367732e573001c48f64f54ab74a93352f Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 09:29:34 +0800
Subject: [PATCH 01/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/competition/examDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 58bd26796..e47c98d32 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -157,7 +157,7 @@ export default {
             } else {
                 // this.disabled = true;
                 getCompetitionPractical(this.$route.query.raceId).then(()=>{
-                    participantCreatTrainingRoom(1, {mapId: 41, prdType: '02'}).then(resp => {
+                    participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
                         const query = { lineCode: '11', mapId: '41', group: resp.data, roomId: '385' };
                         this.$router.replace({ path: `/jointTrainingNew`, query: query});
                     });

From aa6d821fedc27c262df2d3a76cc0697f067bfd03 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 25 May 2020 09:40:14 +0800
Subject: [PATCH 02/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A3=81=E5=88=A4?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competition.js               |  7 ++---
 src/views/jsxt/refereeList/index.vue | 41 ++++++----------------------
 2 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/src/api/competition.js b/src/api/competition.js
index 1e81796d6..3e1b0bec3 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -72,11 +72,10 @@ export function getIsSignUp(raceId) {
 }
 
 /** 分页查询竞赛报名人员 */
-export function getRaceUserList(params) {
+export function getRaceUserList(raceId) {
     return request({
-        url: `/api/race/${params.raceId}/raceUser`,
-        method: 'get',
-        params
+        url: `/api/race/${raceId}/raceUser`,
+        method: 'get'
     });
 }
 
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 909e7f369..1a1abbc6e 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -8,6 +8,7 @@
 <script>
 import {refereeGetCompetitionList, refereeEnterSimulation} from '@/api/competition';
 import {getPermissionJointNew} from '@/api/jointTraining';
+import { getRaceUserList } from '@/api/competition';
 // import QuestionList from './questionList';
 
 export default {
@@ -36,38 +37,8 @@ export default {
                 }
             },
             queryList: {
-                data:[
-                    {
-                        name:'xxx',
-                        mobile:'189xxxx0023',
-                        organization:'xx企业',
-                        department:'xx部门',
-                        status:'01'
-                    },
-                    {
-                        name:'xxx',
-                        mobile:'189xxxx0023',
-                        organization:'xx企业',
-                        department:'xx部门',
-                        status:'02'
-                    },
-                    {
-                        name:'xxx',
-                        mobile:'189xxxx0023',
-                        organization:'xx企业',
-                        department:'xx部门',
-                        status:'03'
-                    },
-                    {
-                        name:'xxx',
-                        mobile:'189xxxx0023',
-                        organization:'xx企业',
-                        department:'xx部门',
-                        status:'04',
-                        score:80
-                    }
-                ],
-                // query: this.queryFunction,
+                data:[],
+                query: this.queryFunction,
                 selectCheckShow: false,
                 indexShow: true,
                 columns: [
@@ -87,6 +58,10 @@ export default {
                         title: '部门',
                         prop: 'department'
                     },
+                    {
+                        title: '报名时间',
+                        prop: 'time'
+                    },
                     {
                         title: '状态',
                         prop: 'status',
@@ -171,7 +146,7 @@ export default {
             if (this.$route.query.raceId) {
                 params['id'] = this.$route.query.raceId;
             }
-            return refereeGetCompetitionList(this.$route.query.raceId);
+            return getRaceUserList(this.$route.query.raceId);
         },
         handleClick(row) {
             const group = row.room.group;

From 46e6dec30e1709bfe25695d0df95db76d8982e76 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 09:52:23 +0800
Subject: [PATCH 03/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/competition/examDetail.vue        | 4 ++--
 src/views/jsxt/competition/result.vue            | 4 ++--
 src/views/jsxt/competition/theory/quiz/index.vue | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index e47c98d32..83b7a0fa6 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -151,14 +151,14 @@ export default {
         async exmaStart() {
             if (this.$route.query.type == 'theory') {
                 getCompetitionTheory({competitionId:this.$route.query.raceId}).then(()=>{
-                    this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}`);
+                    this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}?raceId=${this.$route.query.raceId}`);
                 }).catch(()=>{
                 });
             } else {
                 // this.disabled = true;
                 getCompetitionPractical(this.$route.query.raceId).then(()=>{
                     participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
-                        const query = { lineCode: '11', mapId: '41', group: resp.data, roomId: '385' };
+                        const query = { lineCode: '11', mapId: '41', group: resp.data, roomId: '385', raceId: this.$route.query.raceId};
                         this.$router.replace({ path: `/jointTrainingNew`, query: query});
                     });
                 });
diff --git a/src/views/jsxt/competition/result.vue b/src/views/jsxt/competition/result.vue
index c44427194..0f9034df6 100644
--- a/src/views/jsxt/competition/result.vue
+++ b/src/views/jsxt/competition/result.vue
@@ -125,8 +125,8 @@ export default {
             }
         },
         back() {
-            const query = {type: 'operation', mapId: this.$route.query.mapId};
-            this.$router.push({path: `/jsxt/home`, query: query});
+            const query = {type: 'operation', mapId: this.$route.query.mapId, raceId:this.$route.query.raceId};
+            this.$router.push({path: `/jsxt/home`, query: query });
         },
         objectSpanMethod({ row, column, rowIndex, columnIndex }) {
             if ((columnIndex === 0 || columnIndex === 1 || columnIndex === 2) && row.scoringPointLength) {
diff --git a/src/views/jsxt/competition/theory/quiz/index.vue b/src/views/jsxt/competition/theory/quiz/index.vue
index 647ec6b6e..724158926 100644
--- a/src/views/jsxt/competition/theory/quiz/index.vue
+++ b/src/views/jsxt/competition/theory/quiz/index.vue
@@ -156,7 +156,8 @@ export default {
         doEnd() {
             // console.log('考试成绩');
             // this.$router.push({ path: `/jsxt/home`});
-            postCompetitionTheory(1, {competitionId:this.$route.query.raceId}).then(()=>{
+            const params = {competitionId:this.$route.query.raceId};
+            postCompetitionTheory(1, params).then(()=>{
                 this.$router.push({ path: `/jsxt/result`, query: { type: 'theory', raceId:this.$route.query.raceId } });
             });
         },

From f90514777a67cbcdbf54c39823f19dd22fb605a1 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 25 May 2020 10:29:03 +0800
Subject: [PATCH 04/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=99=BB=E5=BD=95=E6=B5=81=E7=A8=8B=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competition.js               | 7 ++++---
 src/permission.js                    | 4 ++++
 src/utils/baseUrl.js                 | 5 ++---
 src/views/jsxt/refereeList/index.vue | 6 +++---
 src/views/login/index.vue            | 6 ++++--
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/api/competition.js b/src/api/competition.js
index 3e1b0bec3..1e81796d6 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -72,10 +72,11 @@ export function getIsSignUp(raceId) {
 }
 
 /** 分页查询竞赛报名人员 */
-export function getRaceUserList(raceId) {
+export function getRaceUserList(params) {
     return request({
-        url: `/api/race/${raceId}/raceUser`,
-        method: 'get'
+        url: `/api/race/${params.raceId}/raceUser`,
+        method: 'get',
+        params
     });
 }
 
diff --git a/src/permission.js b/src/permission.js
index 3f32cd3f1..53dc0d483 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -47,6 +47,10 @@ function getRouteInfo(to) {
     } else {
         const whitePage = PermissionParam[current_session] ? PermissionParam[current_session].whitePage : '';
         loginPath = whitePage || loginPage;
+        if (current_session && current_session.startsWith('jsxt') || current_session && current_session.startsWith('refereeJsxt')) {
+            const raceId = getSessionStorage('raceId'); // 登陆时候保存 竞赛id
+            loginPath = `${loginPath}?raceId=${raceId}`;
+        }
         if (current_session && current_session.startsWith('design')) {
             removeToken();
         }
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index e9046878d..e49695b4d 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,12 +2,11 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
-        // BASE_API = 'http://192.168.3.41:9000'; // 张赛
+        BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
-        // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip';    // 张赛
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 1a1abbc6e..04dce0c15 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import {refereeGetCompetitionList, refereeEnterSimulation} from '@/api/competition';
+import { refereeEnterSimulation } from '@/api/competition';
 import {getPermissionJointNew} from '@/api/jointTraining';
 import { getRaceUserList } from '@/api/competition';
 // import QuestionList from './questionList';
@@ -144,9 +144,9 @@ export default {
         // 查询函数
         queryFunction(params) {
             if (this.$route.query.raceId) {
-                params['id'] = this.$route.query.raceId;
+                params['raceId'] = this.$route.query.raceId;
             }
-            return getRaceUserList(this.$route.query.raceId);
+            return getRaceUserList(params);
         },
         handleClick(row) {
             const group = row.room.group;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 47582d8b1..acb2701b6 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -339,7 +339,8 @@ export default {
                 if (this.$route.path.includes('jsxt/login')) {
                     getIsSignUp(this.$route.query.raceId).then(res => {
                         if (res.data) {
-                            this.$router.push({ path: this.path, query:{raceId:this.$route.query.raceId} });
+                            setSessionStorage('raceId', this.$route.query.raceId);
+                            this.$router.push({ path: this.path, query:{ raceId:this.$route.query.raceId } });
                         } else {
                             this.$messageBox('您未报名该竞赛，所以无法进入竞赛系统');
                         }
@@ -347,7 +348,8 @@ export default {
                         this.$messageBox('您未报名该竞赛，所以无法进入竞赛系统');
                     });
                 } else {
-                    this.$router.push({ path: this.path, query:{raceId:this.$route.query.raceId} });
+                    setSessionStorage('raceId', this.$route.query.raceId);
+                    this.$router.push({ path: this.path, query:{ raceId:this.$route.query.raceId } });
                 }
             } else if (!this.$route.path.includes('jsxt/login') && !this.$route.path.includes('refereeJsxt/login')) {
                 this.$router.push({ path: this.path });

From 24ed5f502d28c18d3c997af3708a6834c0f55e21 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 10:31:32 +0800
Subject: [PATCH 05/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competition.js                    |  5 +++--
 src/views/jsxt/competition/examDetail.vue |  3 ++-
 src/views/jsxt/refereeList/index.vue      | 17 +++++++----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/api/competition.js b/src/api/competition.js
index 3e1b0bec3..2174c13da 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -72,10 +72,11 @@ export function getIsSignUp(raceId) {
 }
 
 /** 分页查询竞赛报名人员 */
-export function getRaceUserList(raceId) {
+export function getRaceUserList(raceId, params) {
     return request({
         url: `/api/race/${raceId}/raceUser`,
-        method: 'get'
+        method: 'get',
+        params
     });
 }
 
diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 83b7a0fa6..4e5c1a749 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -159,7 +159,8 @@ export default {
                 getCompetitionPractical(this.$route.query.raceId).then(()=>{
                     participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
                         const query = { lineCode: '11', mapId: '41', group: resp.data, roomId: '385', raceId: this.$route.query.raceId};
-                        this.$router.replace({ path: `/jointTrainingNew`, query: query});
+                        // this.$router.replace({ path: `/jointTrainingNew`, query: query});
+                        
                     });
                 });
             }
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 1a1abbc6e..e4e4e7087 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -125,7 +125,7 @@ export default {
             // this.getData();
         },
         covertStatus(status) {
-            const statusDict = {'01':'未考试', '02':'准备中', '03':'考试中', '04':'考试结束'};
+            const statusDict = {'0':'尚未参赛', '1':'进入赛场', '2':'理论赛场', '3':'实操赛场', '4':'完成比赛'};
             return statusDict[status];
         },
         // getData() {
@@ -143,19 +143,16 @@ export default {
         },
         // 查询函数
         queryFunction(params) {
-            if (this.$route.query.raceId) {
-                params['id'] = this.$route.query.raceId;
-            }
-            return getRaceUserList(this.$route.query.raceId);
+            return getRaceUserList(this.$route.query.raceId, params);
         },
         handleClick(row) {
             const group = row.room.group;
-            getPermissionJointNew(group).then(resp=>{
-                refereeEnterSimulation(group).then(response=>{
-                    const query = { lineCode: '11', mapId: '41', group: row.room.group, roomId: row.room.id };
-                    this.$router.push({ path: `/jointTrainingNew`, query: query});
-                });
+            // getPermissionJointNew(group).then(resp=>{
+            refereeEnterSimulation(group).then(response=>{
+                const query = { lineCode: '11', mapId: '41', group: row.room.group, roomId: row.room.id };
+                this.$router.push({ path: `/jointTrainingNew`, query: query});
             });
+            // });
         },
         playBack() {
 

From 58118ba06aa6448bdbf6013c739c2b9fa4c96c90 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 25 May 2020 10:32:14 +0800
Subject: [PATCH 06/85] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=B8=80=E4=B8=89?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/StatusIcon/statusIcon.vue      |  1 +
 src/views/newMap/displayNew/designIndex.vue   |  2 +-
 src/views/newMap/displayNew/index.vue         |  2 +-
 src/views/newMap/displayNew/menuDemon.vue     |  2 +-
 src/views/newMap/displayNew/menuScript.vue    |  2 +-
 .../newMap/displayNew/menuSystemTime.vue      | 69 ++++++++++++++++---
 src/views/newMap/jointTrainingNew/index.vue   |  3 +-
 .../newMap/jointTrainingNew/menuDemon.vue     |  2 +-
 8 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/src/views/components/StatusIcon/statusIcon.vue b/src/views/components/StatusIcon/statusIcon.vue
index a61e2e20b..4a0573216 100644
--- a/src/views/components/StatusIcon/statusIcon.vue
+++ b/src/views/components/StatusIcon/statusIcon.vue
@@ -113,6 +113,7 @@ export default {
 		/*border-radius: 4px;*/
 		overflow: hidden;
 		display: flex;
+		box-shadow: 0 0 5px #eee;
 	}
 	.textStatus {
 		width: 50px;
diff --git a/src/views/newMap/displayNew/designIndex.vue b/src/views/newMap/displayNew/designIndex.vue
index 2af6e52c5..0d4132c3c 100644
--- a/src/views/newMap/displayNew/designIndex.vue
+++ b/src/views/newMap/displayNew/designIndex.vue
@@ -303,7 +303,7 @@ export default {
             if (resp && resp.code == 200) {
                 this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
                 this.questId = Number(resp.data.questId) || 0;
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(resp.data.systemTime)}`));
+                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
             }
         },
         // 加载地图数据
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index b29ea5d89..af089a31a 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -401,7 +401,7 @@ export default {
             if (resp && resp.code == 200 && resp.data && !resp.data.dataError) {
                 this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
                 this.questId = Number(resp.data.questId) || 0;
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(resp.data.systemTime)}`));
+                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
                 if (resp.data.planRunning) {
                     this.$store.dispatch('training/simulationStart');
                 } else {
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 8c877c830..cba5b9e87 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -183,7 +183,7 @@ export default {
             ranAsPlan(data, this.group).then(res => {
                 this.$store.dispatch('training/simulationStart').then(() => {
                     this.$store.dispatch('map/setRunPlanStatus', true);
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${model.initTime}`));
+                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
                     this.$store.dispatch('map/setShowCentralizedStationNum');
                 });
             }).catch(error => {
diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue
index 0fd47a4f0..2a98e9db5 100644
--- a/src/views/newMap/displayNew/menuScript.vue
+++ b/src/views/newMap/displayNew/menuScript.vue
@@ -121,7 +121,7 @@ export default {
             ranAsPlan(data, this.group).then(res => {
                 this.$store.dispatch('training/simulationStart').then(() => {
                     this.$store.dispatch('map/setRunPlanStatus', true);
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${model.initTime}`));
+                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
                     this.$store.dispatch('map/setShowCentralizedStationNum');
                 });
             }).catch((error) => {
diff --git a/src/views/newMap/displayNew/menuSystemTime.vue b/src/views/newMap/displayNew/menuSystemTime.vue
index de31f59f7..154c0fb62 100644
--- a/src/views/newMap/displayNew/menuSystemTime.vue
+++ b/src/views/newMap/displayNew/menuSystemTime.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isShowSystemTime" class="display-card" :style="{top: top+'px', right: xianRight+'px'}">
+  <div v-if="isShowSystemTime" class="display-card" :style="{top: top+'px', right: newRight+'px'}">
     <template v-if="pause">
       <span class="display-pause">{{ $t('display.systemTime.timePause') }}</span>
     </template>
@@ -8,7 +8,10 @@
         class="display-time"
         :time="time"
       />
-
+      <div v-if="isShowDate" style="width: 80px;height: 58px;float: right;box-shadow: 0 0 5px #eee;">
+        <div class="display-date-box">{{ dateString }}</div>
+        <div class="display-date-box">{{ dayString }}</div>
+      </div>
     </template>
   </div>
 </template>
@@ -35,8 +38,8 @@ export default {
     data() {
         return {
             time: '00:0000',
-            top: 0,
-            xianRight: 0
+            dateString: '00/00/00',
+            dayString: ''
         };
     },
     computed: {
@@ -49,25 +52,62 @@ export default {
         },
         pause() {
             return this.$store.state.scriptRecord.simulationPause;
+        },
+        isShowDate() {
+            return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.$route.path.includes('displayNew');
+        },
+        top() {
+            return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.$route.path.includes('displayNew') ? 35 : this.offset;
+        },
+        newRight() {
+            return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.$route.path.includes('displayNew') ? this.$store.state.config.width - 340 - 80 : this.right;
         }
     },
     watch: {
         '$store.state.training.initTime': function (initTime) {
             const date = new Date(initTime);
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
+            this.initDate(date);
         }
     },
     mounted() {
         const initTime = this.$store.state.training.initTime;
-        this.top = this.offset;
-        this.xianRight = this.right;
-        if (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) {
-            this.top = 35;
-            this.xianRight = this.$store.state.config.width - 340;
-        }
         if (initTime > 0) {
             const date = new Date(initTime);
+            this.initDate(date);
+        }
+    },
+    methods: {
+        initDate(date) {
             this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
+            const years = date.getFullYear() + '';
+            let months = date.getMonth() + 1 + '';
+            let dates = date.getDate() + '';
+            if (months.length < 2) { months = '0' + months; }
+            if (dates.length < 2) { dates = '0' + dates; }
+            this.dateString = dates + '/' + months + '/' + years.slice(2);
+            const day = date.getDay();
+            switch (day) {
+            case 0:
+                this.dayString = '星 期 一';
+                break;
+            case 1:
+                this.dayString = '星 期 二';
+                break;
+            case 2:
+                this.dayString = '星 期 三';
+                break;
+            case 3:
+                this.dayString = '星 期 四';
+                break;
+            case 4:
+                this.dayString = '星 期 五';
+                break;
+            case 5:
+                this.dayString = '星 期 六';
+                break;
+            case 6:
+                this.dayString = '星 期 日';
+            }
         }
     }
 };
@@ -96,5 +136,12 @@ export default {
     .display-card .el-row {
         line-height: 32px !important;
     }
+	.display-date-box{
+		height: 29px;
+		line-height: 29px;
+		background: #404040;
+		color: #1DEA1E;
+		text-align: center;
+	}
 
 </style>
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 93a9a8e19..f0d3674c4 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -278,7 +278,6 @@ export default {
                 if (menuBar) {
                     offset += (menuBar.offsetHeight || 0);
                 }
-
                 if (menuTool) {
                     offset += (menuTool.offsetHeight || 0);
                 }
@@ -322,7 +321,7 @@ export default {
             if (resp && resp.code == 200 && resp.data && !resp.data.dataError) {
                 this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
                 this.questId = Number(resp.data.questId) || 0;
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(resp.data.systemTime)}`));
+                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
                 this.$store.dispatch('map/setRunPlanStatus', resp.data.planRunning);
                 if (resp.data.planRunning) {
                     this.$store.dispatch('training/simulationStart');
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 8264fcc29..ac5a1de9a 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -244,7 +244,7 @@ export default {
             ranAsPlan(data, this.group).then(res => {
                 this.$store.dispatch('training/simulationStart').then(() => {
                     this.$store.dispatch('map/setRunPlanStatus', true);
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${model.initTime}`));
+                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
                 });
             }).catch((error) => {
                 this.isDisable = false;

From cf8e39f765dfacd91a179639fd5f259615b70ad2 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 25 May 2020 10:45:56 +0800
Subject: [PATCH 07/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/competition/examDetail.vue     |  4 +-
 src/views/jsxt/refereeList/index.vue          |  4 +-
 src/views/newMap/displayNew/menuDemon.vue     | 68 ++++++++++++++++---
 .../newMap/jointTrainingNew/menuDemon.vue     | 53 +--------------
 4 files changed, 63 insertions(+), 66 deletions(-)

diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 83b7a0fa6..defe56288 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -158,8 +158,8 @@ export default {
                 // this.disabled = true;
                 getCompetitionPractical(this.$route.query.raceId).then(()=>{
                     participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
-                        const query = { lineCode: '11', mapId: '41', group: resp.data, roomId: '385', raceId: this.$route.query.raceId};
-                        this.$router.replace({ path: `/jointTrainingNew`, query: query});
+                        const query = { lineCode: '11', mapId: '41', group: resp.data, prdType: '03', raceId: this.$route.query.raceId};
+                        this.$router.replace({ path: `/displayNew/demon`, query: query});
                     });
                 });
             }
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 04dce0c15..477fd04a6 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -152,8 +152,8 @@ export default {
             const group = row.room.group;
             getPermissionJointNew(group).then(resp=>{
                 refereeEnterSimulation(group).then(response=>{
-                    const query = { lineCode: '11', mapId: '41', group: row.room.group, roomId: row.room.id };
-                    this.$router.push({ path: `/jointTrainingNew`, query: query});
+                    const query = { lineCode: '11', mapId: '41', group: row.room.group, prdType: '03' };
+                    this.$router.push({ path: `/displayNew/demon`, query: query});
                 });
             });
         },
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index cba5b9e87..f3cf4e931 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -8,18 +8,25 @@
     </div>
     <div class="display-draft" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group>
-        <el-button v-if="isShowScheduling && !dataError" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
-        <el-button v-if="!isShowScheduling && !dataError" type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
-        <!-- <el-button v-if="!isShowScheduling && !dataError" type="jl3dstation" @click="jumpjl3dstation">{{ jl3dstation }}</el-button> -->
-        <el-button v-if="!isShowScheduling && !dataError" type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
-        <el-button v-if="isShow3dmodel && !isShowScheduling && !dataError" type="jumpjlmap3dmodel" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
-        <template v-if="isShowQuest">
-          <!-- && !isDesignPlatform  -->
-          <el-button v-if="!isDesignPlatform && !dataError" type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
+        <template v-if="project==='jsxt'">
+          <el-button :disabled="!jsStart" type="success" @click="startCompetition">开始考试</el-button>
+          <el-button type="danger" @click="endCompetition">提交</el-button>
         </template>
+        <el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition">返回</el-button>
         <template v-else>
-          <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
-          <el-button type="danger" :disabled="!isDisable || dataError" @click="end">{{ $t('display.demon.exitPlan') }}</el-button>
+          <el-button v-if="isShowScheduling && !dataError" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
+          <el-button v-if="!isShowScheduling && !dataError" type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
+          <!-- <el-button v-if="!isShowScheduling && !dataError" type="jl3dstation" @click="jumpjl3dstation">{{ jl3dstation }}</el-button> -->
+          <el-button v-if="!isShowScheduling && !dataError" type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
+          <el-button v-if="isShow3dmodel && !isShowScheduling && !dataError" type="jumpjlmap3dmodel" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
+          <template v-if="isShowQuest">
+            <!-- && !isDesignPlatform  -->
+            <el-button v-if="!isDesignPlatform && !dataError" type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
+          </template>
+          <template v-else>
+            <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
+            <el-button type="danger" :disabled="!isDisable || dataError" @click="end">{{ $t('display.demon.exitPlan') }}</el-button>
+          </template>
         </template>
         <el-button type="primary" @click="back">{{ $t('display.demon.back') }}</el-button>
       </el-button-group>
@@ -40,6 +47,8 @@ import { ranAsPlan, exitRunPlan, clearSimulation, getSimulationInfoNew } from '@
 import { PermissionType } from '@/scripts/ConstDic';
 import { getCountTime } from '@/utils/index';
 import { quitScriptNew, scriptRePreview } from '@/api/simulation';
+import { getSessionStorage } from '@/utils/auth';
+import { participantCompleteCompetition, refereeExitSimulation } from '@/api/competition';
 
 export default {
     name: 'MenuDemon',
@@ -98,7 +107,8 @@ export default {
             jl3dname: this.$t('display.demon.threeDimensionalView'),
             jl3dstation: this.$t('display.demon.threeDimensionalStation'),
             jl3dmodel: this.$t('display.demon.deviceView'),
-            isShow3dmodel :false
+            isShow3dmodel :false,
+            jsStart: true
         };
     },
     computed: {
@@ -113,6 +123,9 @@ export default {
         },
         isHebLine() {
             return this.$route.query.lineCode === '07';
+        },
+        project() {
+            return getSessionStorage('project');
         }
     },
     watch: {
@@ -295,6 +308,39 @@ export default {
                 this.jl3dname = this.$t('display.demon.threeDimensionalView');
                 this.isShow3dmodel = true;
             }
+        },
+        startCompetition() {
+            const date = new Date(this.$store.state.training.initTime || null);
+            const model = {
+                initTime: this.formatTime(date)
+            };
+            this.start(model);
+        },
+        refeeEndCompetition() { // 裁判返回
+            refereeExitSimulation(this.group).then(resp => {
+                this.$router.go(-1);
+            }).catch(()=> {
+                this.$message.success('退出系统失败');
+            });
+        },
+        endCompetition() { // 参赛人员提交实操
+            this.$confirm('此操作将结束并提交本次竞赛，是否继续', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                participantCompleteCompetition(1, this.group).then(resp => {
+                    this.submit();
+                }).catch(()=> {
+                    this.$message.success('提交试卷失败！');
+                });
+            });
+        },
+        submit() {
+            // this.$store.dispatch('exam/over').then(() => {
+            //     this.$store.dispatch('trainingList/clearTrainingList');
+            this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate' } });
+            // });
         }
     }
 };
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index ac5a1de9a..1c2dab58e 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -9,12 +9,7 @@
           <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
           <el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('joinTraining.exitPlan') }}</el-button>
         </template>
-        <template v-if="project==='jsxt'">
-          <!-- <el-button :disabled="!jsStart" type="success" @click="startCompetition">开始</el-button> -->
-          <el-button type="danger" @click="endCompetition">提交</el-button>
-        </template>
-        <el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition">返回</el-button>
-        <el-button v-if="project!=='jsxt'&&project!=='refereeJsxt'" type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button>
+        <el-button type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button>
       </el-button-group>
     </div>
     <qr-code ref="qrCode" />
@@ -33,7 +28,6 @@ import { putJointTrainingSimulationUserNew} from '@/api/jointTraining';
 import { EventBus } from '@/scripts/event-bus';
 import { getSessionStorage } from '@/utils/auth';
 import RealDevice from './menuDraft/realDevice';
-import { participantCompleteCompetition, refereeExitSimulation } from '@/api/competition';
 import { prefixIntrger } from '@/utils/date';
 
 export default {
@@ -76,8 +70,7 @@ export default {
             offset: 10,
             userId: '',
             stationList: [],
-            stationLists: [],
-            jsStart: true
+            stationLists: []
         };
     },
     computed: {
@@ -95,9 +88,6 @@ export default {
         },
         isProject() {
             return getSessionStorage('project').endsWith('gzb') && this.userRole === 'CI';
-        },
-        project() {
-            return getSessionStorage('project');
         }
     },
     watch: {
@@ -126,11 +116,6 @@ export default {
         '$store.state.map.runPlanStatus': function (val) {
             this.isDisable = val;
         },
-        '$store.state.socket.competitionStart':function(val) {
-            if (val) {
-                this.startCompetition();
-            }
-        },
         '$store.state.socket.simulationOver':function(val) {
             if (val && this.project === 'refereeJsxt') {
                 this.$router.go(-1);
@@ -304,40 +289,6 @@ export default {
             const mm = prefixIntrger(initTime.getMinutes(), 2);
             const ss = prefixIntrger(initTime.getSeconds(), 2);
             return `${hh}:${mm}:${ss}`;
-        },
-        startCompetition() {
-            const date = new Date(this.$store.state.training.initTime || null);
-            const model = {
-                initTime: this.formatTime(date)
-            };
-            this.start(model);
-        },
-        endCompetition() {
-            this.$confirm('此操作将结束并提交本次竞赛，是否继续', this.$t('global.tips'), {
-                confirmButtonText: this.$t('global.confirm'),
-                cancelButtonText: this.$t('global.cancel'),
-                type: 'warning'
-            }).then(() => {
-                participantCompleteCompetition(1, this.group).then(resp => {
-                    // this.$router.go(-1);
-                    this.submit();
-                }).catch(()=> {
-                    this.$message.success('提交试卷失败！');
-                });
-            });
-        },
-        refeeEndCompetition() {
-            refereeExitSimulation(this.group).then(resp => {
-                this.$router.go(-1);
-            }).catch(()=> {
-                this.$message.success('退出系统失败');
-            });
-        },
-        submit() {
-            // this.$store.dispatch('exam/over').then(() => {
-            //     this.$store.dispatch('trainingList/clearTrainingList');
-            this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate' } });
-            // });
         }
     }
 };

From a2e0522a3077e217f2c8d9cd9e041d6f2b75b40a Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 25 May 2020 10:53:01 +0800
Subject: [PATCH 08/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/menuDemon.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index f3cf4e931..efea09794 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -8,11 +8,11 @@
     </div>
     <div class="display-draft" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group>
-        <template v-if="project==='jsxt'">
-          <el-button :disabled="!jsStart" type="success" @click="startCompetition">开始考试</el-button>
-          <el-button type="danger" @click="endCompetition">提交</el-button>
+        <template v-if="project =='jsxt' || project =='refereeJsxt'">
+          <el-button v-if="project =='jsxt'" :disabled="!jsStart" type="success" @click="startCompetition">开始考试</el-button>
+          <el-button v-if="project =='jsxt'" type="danger" @click="endCompetition">提交</el-button>
+          <el-button v-if="project =='refereeJsxt'" type="success" @click="refeeEndCompetition">返回</el-button>
         </template>
-        <el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition">返回</el-button>
         <template v-else>
           <el-button v-if="isShowScheduling && !dataError" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
           <el-button v-if="!isShowScheduling && !dataError" type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
@@ -28,7 +28,7 @@
             <el-button type="danger" :disabled="!isDisable || dataError" @click="end">{{ $t('display.demon.exitPlan') }}</el-button>
           </template>
         </template>
-        <el-button type="primary" @click="back">{{ $t('display.demon.back') }}</el-button>
+        <el-button v-if="project !='jsxt' && project !='refereeJsxt'" type="primary" @click="back">{{ $t('display.demon.back') }}</el-button>
       </el-button-group>
     </div>
 

From c74eaaaab68126eb1b6cac7a7050d6a750e14d1f Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 25 May 2020 11:00:10 +0800
Subject: [PATCH 09/85] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E8=BD=A6=E5=A4=B4?=
 =?UTF-8?q?=E7=A0=81=E8=BD=A6=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/xian_01.js            | 15 ++++++++-------
 src/jmapNew/shape/Train/TrainBody.js              |  4 ++--
 .../theme/xian_01/menus/dialog/trainControl.vue   |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js
index 54f73378c..1847b0aad 100644
--- a/src/jmapNew/config/skinCode/xian_01.js
+++ b/src/jmapNew/config/skinCode/xian_01.js
@@ -549,12 +549,12 @@ class SkinCode extends defaultStyle {
                 changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [
                     {
-                        type: '03',
+                        type: 'MANUAL',
                         serviceNumber: 'MM',
                         nameFormat: 'serviceNumber:groupNumber'
                     },
                     {
-                        type: '02',
+                        type: 'HEAD',
                         nameFormat: 'targetCode:groupNumber'
                     }
                 ], // 特殊列车类型需设置显示格式
@@ -585,7 +585,8 @@ class SkinCode extends defaultStyle {
             trainServer: {
                 serviceNumberPrefix: '00', // 服务号(表号)前缀
                 defaultServiceNumber: 'BB', // 默认服务号（表号）
-                trainServerOffset: { x: 26, y: 1}// 列车服务号偏移
+                trainServerOffset: { x: 26, y: 1}, // 列车服务号偏移
+                manualTypeText: 'MM' // 人工车填充
             },
             trainTarget: {
                 tripNumberPrefix: '0000', // 车次号前缀
@@ -595,14 +596,14 @@ class SkinCode extends defaultStyle {
                 smallColor: '#70ECEE', // 小交路颜色
                 bigColor: '#FFFFFF', // 大交路颜色
                 inboundColor: '#00FF00', // 回库颜色
-                planTypeColor: '#FFFFFF', // 计划车颜色
-                manualTypeColor: '#FF0', // 人工车
-                headTypeColor: '#FF0' // 头码车
+                planTypeColor: '#FFFFFF' // 计划车颜色
             },
             trainTargetNumber: {
                 groupNumberPrefix: '000', // 车组号前缀
                 defaultGroupNumber: 'EEE', // 默认车组号
-                trainTargetNumberOffset: {x: -1, y: 1}// 车组号偏移量
+                trainTargetNumberOffset: {x: -1, y: 1}, // 车组号偏移量
+                manualTypeColor: '#FF0', // 人工车
+                headTypeColor: '#FF0' // 头码车
             },
             trainHead: {
                 trainMoreLength: 1, // 列车车头比车身高出的长度,上下相比车体伸出去的边框
diff --git a/src/jmapNew/shape/Train/TrainBody.js b/src/jmapNew/shape/Train/TrainBody.js
index 4eb4519a4..be043e588 100644
--- a/src/jmapNew/shape/Train/TrainBody.js
+++ b/src/jmapNew/shape/Train/TrainBody.js
@@ -320,9 +320,9 @@ export default class TrainBody extends Group {
         if (type === 'PLAN') {
             this.style.Train.trainTarget.planTypeColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.planTypeColor});
         } else if (type === 'MANUAL') {
-            this.style.Train.trainTarget.manualTypeColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.manualTypeColor});
+            this.style.Train.trainTargetNumber.manualTypeColor && this.textTrainTargetNumber && this.textTrainTargetNumber.setStyle({textFill: this.style.Train.trainTargetNumber.manualTypeColor});
         } else if (type === 'HEAD') {
-            this.style.Train.trainTarget.headTypeColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.headTypeColor});
+            this.style.Train.trainTargetNumber.headTypeColor && this.textTrainTargetNumber && this.textTrainTargetNumber.setStyle({textFill: this.style.Train.trainTargetNumber.headTypeColor});
         }
     }
     setSoonerOrLater(dt) {
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
index 87cd70709..b164ca440 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
@@ -453,11 +453,11 @@ export default {
                         tripNumber: '',
                         destinationCode: ''
                     };
-                    if (this.formModel.type === '01') {
+                    if (this.formModel.type === 'PLAN') {
                         params.serviceNumber = this.formModel.serviceNumber;
                         params.tripNumber = this.formModel.tripNumber;
                         params.destinationCode = this.formModel.destinationCode;
-                    } else if (this.formModel.type === '02') {
+                    } else if (this.formModel.type === 'HEAD') {
                         params.tripNumber = this.formModel.tripNumber;
                         params.destinationCode = this.formModel.destinationCode;
                     }

From 30e92a0f355a0042b9170158cc2ed399996b5c6e Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 25 May 2020 11:26:42 +0800
Subject: [PATCH 10/85] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=B8=80=E4=B8=89?=
 =?UTF-8?q?=E5=8F=B7=E7=BA=BF=E6=9B=B4=E6=96=B0=E8=BF=90=E8=A1=8C=E5=9B=BE?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=96=B9=E5=90=91?=
 =?UTF-8?q?code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/xian_01/planConvert.js | 2 +-
 src/utils/baseUrl.js                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/jmapNew/theme/xian_01/planConvert.js b/src/jmapNew/theme/xian_01/planConvert.js
index fdbf73e59..5fde9cd64 100644
--- a/src/jmapNew/theme/xian_01/planConvert.js
+++ b/src/jmapNew/theme/xian_01/planConvert.js
@@ -220,7 +220,7 @@ export default {
                             serie.markPoint.data.push(createMartPoint({
                                 directionCode: elem.directionCode,
                                 coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
-                                name: `(${elem.groupNumber})${elem.serviceNumber}${elem.directionCode}${elem.tripNumber}`,
+                                name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`,
                                 color: lineStyle.color || '#000'
                             }));
                         }
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index e49695b4d..818fe4147 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,10 +2,10 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
-        BASE_API = 'http://192.168.3.41:9000'; // 张赛
+        // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康

From 3b0d842b97877d79495fec864d5d295a9f34f80c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 13:40:25 +0800
Subject: [PATCH 11/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competition.js                      |  8 ++++++++
 src/views/jsxt/competition/examDetail.vue   |  6 ++++--
 src/views/newMap/jointTrainingNew/index.vue | 15 ++++++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/api/competition.js b/src/api/competition.js
index 1e81796d6..2fc9d0a6c 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -106,3 +106,11 @@ export function getCompetitionPractical(competitionId) {
     });
 }
 
+/** 查询竞赛报名人员详情 */
+export function getRaceUserById(raceId, userId) {
+    return request({
+        url: `/api/race/${raceId}/raceUser/${userId}`,
+        method: 'get'
+    });
+}
+
diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index defe56288..2891470a6 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -158,8 +158,10 @@ export default {
                 // this.disabled = true;
                 getCompetitionPractical(this.$route.query.raceId).then(()=>{
                     participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
-                        const query = { lineCode: '11', mapId: '41', group: resp.data, prdType: '03', raceId: this.$route.query.raceId};
-                        this.$router.replace({ path: `/displayNew/demon`, query: query});
+                        // const query = { lineCode: '11', mapId: '41', group: resp.data, prdType: '03', raceId: this.$route.query.raceId};
+                        // this.$router.replace({ path: `/displayNew/demon`, query: query});
+                        const query = { lineCode: '11', mapId: '41', group: resp.data, raceId: this.$route.query.raceId};
+                        this.$router.replace({ path: `/jointTrainingNew`, query: query});
                     });
                 });
             }
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index f0d3674c4..074f7db00 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -48,6 +48,8 @@ import { checkLoginLine } from '@/api/login';
 import { loadNewMapDataByGroup } from '@/utils/loaddata';
 import { getUserRolesNew, deljointTrainRoomNew} from '@/api/jointTraining';
 import { clearSimulation, getSimulationInfoNew } from '@/api/simulation';
+import {getRaceUserById} from '@/api/competition';
+import { getSessionStorage } from '@/utils/auth';
 import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
 import Jl3dMaintainer from '@/views/jlmap3d/maintainer/jl3dmaintainer';
 import { EventBus } from '@/scripts/event-bus';
@@ -127,6 +129,9 @@ export default {
         },
         prdType() {
             return this.$store.state.training.prdType;
+        },
+        project() {
+            return getSessionStorage('project');
         }
     },
     watch: {
@@ -358,7 +363,15 @@ export default {
 
             if (this.lineCode) {
                 // 01 现地 02 行调 '' 观众
-                const resp = await this.getUserRole();
+                let resp;
+                if (this.project == 'jsxt' ) {
+                    resp = await getRaceUserById(this.$route.query.raceId, this.userId);
+                    resp.data.userRole = resp.data.role;
+                } else if (this.project == 'refereeJsxt') {
+                    resp.data.userRole = 'ADMIN';
+                } else {
+                    resp = await this.getUserRole();
+                }
                 console.log('/////////////' + resp.data.userRole);
                 if (resp && resp.code == 200) {
                     // Admin 管理员 Instructor 教员 Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号 IBP:IBP盘

From 9d7e4f928f5858a3bfcefe3bf6ec10a85ee58094 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 25 May 2020 13:48:43 +0800
Subject: [PATCH 12/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=BF=9B=E5=85=A5=E4=BB=BF=E7=9C=9F=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/menuDemon.vue     | 70 ++++---------------
 .../newMap/jointTrainingNew/menuDemon.vue     | 52 +++++++++++++-
 2 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index efea09794..cba5b9e87 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -8,27 +8,20 @@
     </div>
     <div class="display-draft" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group>
-        <template v-if="project =='jsxt' || project =='refereeJsxt'">
-          <el-button v-if="project =='jsxt'" :disabled="!jsStart" type="success" @click="startCompetition">开始考试</el-button>
-          <el-button v-if="project =='jsxt'" type="danger" @click="endCompetition">提交</el-button>
-          <el-button v-if="project =='refereeJsxt'" type="success" @click="refeeEndCompetition">返回</el-button>
+        <el-button v-if="isShowScheduling && !dataError" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
+        <el-button v-if="!isShowScheduling && !dataError" type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
+        <!-- <el-button v-if="!isShowScheduling && !dataError" type="jl3dstation" @click="jumpjl3dstation">{{ jl3dstation }}</el-button> -->
+        <el-button v-if="!isShowScheduling && !dataError" type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
+        <el-button v-if="isShow3dmodel && !isShowScheduling && !dataError" type="jumpjlmap3dmodel" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
+        <template v-if="isShowQuest">
+          <!-- && !isDesignPlatform  -->
+          <el-button v-if="!isDesignPlatform && !dataError" type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
         </template>
         <template v-else>
-          <el-button v-if="isShowScheduling && !dataError" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
-          <el-button v-if="!isShowScheduling && !dataError" type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
-          <!-- <el-button v-if="!isShowScheduling && !dataError" type="jl3dstation" @click="jumpjl3dstation">{{ jl3dstation }}</el-button> -->
-          <el-button v-if="!isShowScheduling && !dataError" type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
-          <el-button v-if="isShow3dmodel && !isShowScheduling && !dataError" type="jumpjlmap3dmodel" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
-          <template v-if="isShowQuest">
-            <!-- && !isDesignPlatform  -->
-            <el-button v-if="!isDesignPlatform && !dataError" type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
-          </template>
-          <template v-else>
-            <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
-            <el-button type="danger" :disabled="!isDisable || dataError" @click="end">{{ $t('display.demon.exitPlan') }}</el-button>
-          </template>
+          <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
+          <el-button type="danger" :disabled="!isDisable || dataError" @click="end">{{ $t('display.demon.exitPlan') }}</el-button>
         </template>
-        <el-button v-if="project !='jsxt' && project !='refereeJsxt'" type="primary" @click="back">{{ $t('display.demon.back') }}</el-button>
+        <el-button type="primary" @click="back">{{ $t('display.demon.back') }}</el-button>
       </el-button-group>
     </div>
 
@@ -47,8 +40,6 @@ import { ranAsPlan, exitRunPlan, clearSimulation, getSimulationInfoNew } from '@
 import { PermissionType } from '@/scripts/ConstDic';
 import { getCountTime } from '@/utils/index';
 import { quitScriptNew, scriptRePreview } from '@/api/simulation';
-import { getSessionStorage } from '@/utils/auth';
-import { participantCompleteCompetition, refereeExitSimulation } from '@/api/competition';
 
 export default {
     name: 'MenuDemon',
@@ -107,8 +98,7 @@ export default {
             jl3dname: this.$t('display.demon.threeDimensionalView'),
             jl3dstation: this.$t('display.demon.threeDimensionalStation'),
             jl3dmodel: this.$t('display.demon.deviceView'),
-            isShow3dmodel :false,
-            jsStart: true
+            isShow3dmodel :false
         };
     },
     computed: {
@@ -123,9 +113,6 @@ export default {
         },
         isHebLine() {
             return this.$route.query.lineCode === '07';
-        },
-        project() {
-            return getSessionStorage('project');
         }
     },
     watch: {
@@ -308,39 +295,6 @@ export default {
                 this.jl3dname = this.$t('display.demon.threeDimensionalView');
                 this.isShow3dmodel = true;
             }
-        },
-        startCompetition() {
-            const date = new Date(this.$store.state.training.initTime || null);
-            const model = {
-                initTime: this.formatTime(date)
-            };
-            this.start(model);
-        },
-        refeeEndCompetition() { // 裁判返回
-            refereeExitSimulation(this.group).then(resp => {
-                this.$router.go(-1);
-            }).catch(()=> {
-                this.$message.success('退出系统失败');
-            });
-        },
-        endCompetition() { // 参赛人员提交实操
-            this.$confirm('此操作将结束并提交本次竞赛，是否继续', this.$t('global.tips'), {
-                confirmButtonText: this.$t('global.confirm'),
-                cancelButtonText: this.$t('global.cancel'),
-                type: 'warning'
-            }).then(() => {
-                participantCompleteCompetition(1, this.group).then(resp => {
-                    this.submit();
-                }).catch(()=> {
-                    this.$message.success('提交试卷失败！');
-                });
-            });
-        },
-        submit() {
-            // this.$store.dispatch('exam/over').then(() => {
-            //     this.$store.dispatch('trainingList/clearTrainingList');
-            this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate' } });
-            // });
         }
     }
 };
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 1c2dab58e..fd078936f 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -11,6 +11,12 @@
         </template>
         <el-button type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button>
       </el-button-group>
+      <template v-if="project==='jsxt'">
+        <el-button :disabled="!jsStart" type="success" @click="startCompetition">开始</el-button>
+        <el-button type="danger" @click="endCompetition">提交</el-button>
+      </template>
+      <el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition">返回</el-button>
+      <el-button v-if="project!=='jsxt'&&project!=='refereeJsxt'" type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button>
     </div>
     <qr-code ref="qrCode" />
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
@@ -28,6 +34,7 @@ import { putJointTrainingSimulationUserNew} from '@/api/jointTraining';
 import { EventBus } from '@/scripts/event-bus';
 import { getSessionStorage } from '@/utils/auth';
 import RealDevice from './menuDraft/realDevice';
+import { participantCompleteCompetition, refereeExitSimulation } from '@/api/competition';
 import { prefixIntrger } from '@/utils/date';
 
 export default {
@@ -70,7 +77,8 @@ export default {
             offset: 10,
             userId: '',
             stationList: [],
-            stationLists: []
+            stationLists: [],
+            jsStart: true
         };
     },
     computed: {
@@ -88,6 +96,9 @@ export default {
         },
         isProject() {
             return getSessionStorage('project').endsWith('gzb') && this.userRole === 'CI';
+        },
+        project() {
+            return getSessionStorage('project');
         }
     },
     watch: {
@@ -116,6 +127,11 @@ export default {
         '$store.state.map.runPlanStatus': function (val) {
             this.isDisable = val;
         },
+        '$store.state.socket.competitionStart':function(val) {
+            if (val) {
+                this.startCompetition();
+            }
+        },
         '$store.state.socket.simulationOver':function(val) {
             if (val && this.project === 'refereeJsxt') {
                 this.$router.go(-1);
@@ -289,6 +305,40 @@ export default {
             const mm = prefixIntrger(initTime.getMinutes(), 2);
             const ss = prefixIntrger(initTime.getSeconds(), 2);
             return `${hh}:${mm}:${ss}`;
+        },
+        startCompetition() {
+            const date = new Date(this.$store.state.training.initTime || null);
+            const model = {
+                initTime: this.formatTime(date)
+            };
+            this.start(model);
+        },
+        endCompetition() {
+            this.$confirm('此操作将结束并提交本次竞赛，是否继续', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                participantCompleteCompetition(1, this.group).then(resp => {
+                    // this.$router.go(-1);
+                    this.submit();
+                }).catch(()=> {
+                    this.$message.success('提交试卷失败！');
+                });
+            });
+        },
+        refeeEndCompetition() {
+            refereeExitSimulation(this.group).then(resp => {
+                this.$router.go(-1);
+            }).catch(()=> {
+                this.$message.success('退出系统失败');
+            });
+        },
+        submit() {
+            // this.$store.dispatch('exam/over').then(() => {
+            //     this.$store.dispatch('trainingList/clearTrainingList');
+            this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate' } });
+            // });
         }
     }
 };

From 0f863cffe153e4ec81004aae5da9304b69e7ae57 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 13:49:44 +0800
Subject: [PATCH 13/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/refereeList/index.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 2c84b0559..b64700a4b 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -7,7 +7,6 @@
 
 <script>
 import { refereeEnterSimulation } from '@/api/competition';
-import {getPermissionJointNew} from '@/api/jointTraining';
 import { getRaceUserList } from '@/api/competition';
 // import QuestionList from './questionList';
 
@@ -150,13 +149,12 @@ export default {
         },
         handleClick(row) {
             const group = row.room.group;
-            getPermissionJointNew(group).then(resp=>{
-                refereeEnterSimulation(group).then(response=>{
-                    const query = { lineCode: '11', mapId: '41', group: row.room.group, prdType: '03' };
-                    this.$router.push({ path: `/displayNew/demon`, query: query});
-                });
+            refereeEnterSimulation(group).then(response=>{
+                // const query = { lineCode: '11', mapId: '41', group: row.room.group, prdType: '03' };
+                // this.$router.push({ path: `/displayNew/demon`, query: query});
+                const query = { lineCode: '11', mapId: '41', group: group, raceId: this.$route.query.raceId};
+                this.$router.replace({ path: `/jointTrainingNew`, query: query});
             });
-            // });
         },
         playBack() {
 

From 8621198acf364844a4fc53c4b74c46e698696ac9 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 25 May 2020 14:06:16 +0800
Subject: [PATCH 14/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E6=9C=BA=E8=8F=9C=E5=8D=95=E6=98=BE=E7=A4=BA&=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=88=97=E8=BD=A6=E8=AF=86=E5=88=AB=E5=8F=B7=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Signal/ESigPost.js          |  1 +
 src/jmapNew/shape/Signal/index.js             |  2 +
 .../xian_01/menus/dialog/trainControl.vue     | 37 -------------------
 .../components/StatusIcon/statusIcon.vue      |  1 -
 4 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/src/jmapNew/shape/Signal/ESigPost.js b/src/jmapNew/shape/Signal/ESigPost.js
index 45322b62e..5f23398c5 100644
--- a/src/jmapNew/shape/Signal/ESigPost.js
+++ b/src/jmapNew/shape/Signal/ESigPost.js
@@ -33,6 +33,7 @@ class ESigPost extends Group {
         this.hor = new Polyline({
             zlevel: model.zlevel,
             z: model.z,
+            _val: '3',
             shape: {
                 points: [
                     [model.x, model.y],
diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js
index 9fc0c362f..132a59302 100644
--- a/src/jmapNew/shape/Signal/index.js
+++ b/src/jmapNew/shape/Signal/index.js
@@ -67,6 +67,7 @@ class Signal extends Group {
             this.ciConfirm = new Text({
                 zlevel: this.zlevel,
                 z: this.z,
+                _val: '3',
                 silent: false,
                 _subType: 'enabled',
                 style: {
@@ -110,6 +111,7 @@ class Signal extends Group {
             this.tText = new Text({
                 zlevel: this.zlevel,
                 z: this.z,
+                _val: '3',
                 style: {
                     x: endPoint.x,
                     y: endPoint.y,
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
index b164ca440..6dfc6c38b 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
@@ -50,21 +50,6 @@
           v-model="formModel.destinationCode"
         />
       </el-form-item>
-      <!--<el-form-item v-if="formModel.type == '03'" :label="this.$t('menu.category')+this.$t('global.colon')" prop="category">-->
-      <!--<el-select-->
-      <!--:id="domIdTrainNumber"-->
-      <!--v-model="formModel.category"-->
-      <!--filterable-->
-      <!--:disabled="true"-->
-      <!--&gt;-->
-      <!--<el-option-->
-      <!--v-for="item in categoryList"-->
-      <!--:key="item.value"-->
-      <!--:label="item.name"-->
-      <!--:value="item.value"-->
-      <!--/>-->
-      <!--</el-select>-->
-      <!--</el-form-item>-->
     </el-form>
     <el-row justify="center" class="button-group">
       <el-col :span="10" :offset="2">
@@ -424,28 +409,6 @@ export default {
         editTrainId() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
-                    // const operate = {
-                    //     send: true,
-                    //
-                    //     operation: OperationEvent.Train.editTrainId.menu.operation,
-                    //     cmdType: CMD.Train.CMD_EDIT_TRAIN_ID,
-                    //     messages: [this.$t('tip.editTrainIdTip')],
-                    //     val: `${this.formModel.trainType}::${this.formModel.tripNumber}`
-                    // };
-                    //
-                    // this.loading = true;
-                    // this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    //     this.loading = false;
-                    //     if (valid) {
-                    //         this.doClose();
-                    //         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    //         this.$refs.confirmTrain.doShow(operate);
-                    //     }
-                    // }).catch(() => {
-                    //     this.loading = false;
-                    //     this.doClose();
-                    //     this.$refs.noticeInfo.doShow();
-                    // });
                     const params = {
                         groupNumber: this.formModel.groupNumber,
                         type: this.formModel.type,
diff --git a/src/views/components/StatusIcon/statusIcon.vue b/src/views/components/StatusIcon/statusIcon.vue
index 4a0573216..87ce1efed 100644
--- a/src/views/components/StatusIcon/statusIcon.vue
+++ b/src/views/components/StatusIcon/statusIcon.vue
@@ -68,7 +68,6 @@ export default {
                 this.$store.state.map.holdStandList.forEach(item => {
                     const stand = this.$store.getters['map/getDeviceByCode'](item);
                     const station = this.$store.getters['map/getDeviceByCode'](stand.stationCode);
-                    console.log(station);
                     const dir = stand.right ? '上行站台' : '下行站台';
                     if (stand) {
                         this.tip = this.tip + station.name + ':<br>' + dir + '站台存在扣车命令';

From 992892ee6b27d2a36b03539ee094b1c0cab8274a Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 14:55:42 +0800
Subject: [PATCH 15/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/refereeList/index.vue             | 12 ++++++++----
 src/views/login/index.vue                        |  2 +-
 src/views/newMap/displayNew/chatView/chatBox.vue |  6 +++---
 src/views/newMap/jointTrainingNew/menuDemon.vue  | 12 ++++++------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index b64700a4b..54048e0e3 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -6,8 +6,7 @@
 </template>
 
 <script>
-import { refereeEnterSimulation } from '@/api/competition';
-import { getRaceUserList } from '@/api/competition';
+import { refereeEnterSimulation, loadQuestionList, getRaceUserList } from '@/api/competition';
 // import QuestionList from './questionList';
 
 export default {
@@ -124,7 +123,7 @@ export default {
             // this.getData();
         },
         covertStatus(status) {
-            const statusDict = {'0':'尚未参赛', '1':'进入赛场', '2':'理论赛场', '3':'实操赛场', '4':'完成比赛'};
+            const statusDict = {'0':'尚未参赛', '1':'进入赛场', '2':'理论赛场', '3':'实操赛场', '4':'完成比赛', '5':'完成理论', '6':'完成实操'};
             return statusDict[status];
         },
         // getData() {
@@ -138,7 +137,12 @@ export default {
         //     });
         // },
         handleAdd() {
-
+            loadQuestionList(this.$route.query.raceId, []).then((response)=>{
+                this.$message('开始考试成功！');
+                this.doClose();
+            }).catch(()=>{
+                this.$message('开始考试失败');
+            });
         },
         // 查询函数
         queryFunction(params) {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index acb2701b6..d3027d9b6 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -345,7 +345,7 @@ export default {
                             this.$messageBox('您未报名该竞赛，所以无法进入竞赛系统');
                         }
                     }).catch(() => {
-                        this.$messageBox('您未报名该竞赛，所以无法进入竞赛系统');
+                        this.$messageBox('登陆竞赛系统失败，请稍后重试');
                     });
                 } else {
                     setSessionStorage('raceId', this.$route.query.raceId);
diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue
index 6ea2f84da..88584b408 100644
--- a/src/views/newMap/displayNew/chatView/chatBox.vue
+++ b/src/views/newMap/displayNew/chatView/chatBox.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- v-quickMenuDrag  -->
   <div class="chatBox">
-    <div v-show="!minimize" class="chat-box">
+    <div v-if="!minimize" class="chat-box">
       <chat-member-list ref="chatMemberList" :group="group" @addCoversition="addCoversition" />
       <div class="chat-box-main">
         <chat-coversition-list ref="chatCoversitionList" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
@@ -272,7 +272,7 @@ export default {
 <style lang="scss" scoped>
 .chatBox{
   width: 503px;
-  height: 400px;
+//   height: 400px;
   position: absolute;
   padding-left:5px;
   left: 0;
@@ -281,7 +281,7 @@ export default {
 }
 .chat-box{
   width: 100%;
-  height: 100%;
+  height: 400px;
 }
 .chat-box-header{
     width: 100%;
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index fd078936f..1ab518b41 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -9,10 +9,10 @@
           <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
           <el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('joinTraining.exitPlan') }}</el-button>
         </template>
-        <el-button type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button>
+        <!-- <el-button type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button> -->
       </el-button-group>
       <template v-if="project==='jsxt'">
-        <el-button :disabled="!jsStart" type="success" @click="startCompetition">开始</el-button>
+        <!-- <el-button :disabled="!jsStart" type="success" @click="startCompetition">开始</el-button> -->
         <el-button type="danger" @click="endCompetition">提交</el-button>
       </template>
       <el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition">返回</el-button>
@@ -77,8 +77,8 @@ export default {
             offset: 10,
             userId: '',
             stationList: [],
-            stationLists: [],
-            jsStart: true
+            stationLists: []
+            // jsStart: true
         };
     },
     computed: {
@@ -319,7 +319,7 @@ export default {
                 cancelButtonText: this.$t('global.cancel'),
                 type: 'warning'
             }).then(() => {
-                participantCompleteCompetition(1, this.group).then(resp => {
+                participantCompleteCompetition(this.$route.query.raceId, this.group).then(resp => {
                     // this.$router.go(-1);
                     this.submit();
                 }).catch(()=> {
@@ -337,7 +337,7 @@ export default {
         submit() {
             // this.$store.dispatch('exam/over').then(() => {
             //     this.$store.dispatch('trainingList/clearTrainingList');
-            this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate' } });
+            this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate', raceId:this.$route.query.raceId } });
             // });
         }
     }

From 1ae2793221f9d72b98b7f9e825c7e1f894c02fe9 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 25 May 2020 15:06:34 +0800
Subject: [PATCH 16/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=98=E5=9B=BE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=AD=97=E4=BD=93=E7=9A=AE=E8=82=A4=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/SAFS.png                           | Bin 0 -> 44751 bytes
 src/i18n/langs/zh/map.js                      |   8 +-
 src/jmapNew/config/skinCode/bejing_01.js      |   1 +
 src/jmapNew/config/skinCode/chengdu_01.js     |   1 +
 src/jmapNew/config/skinCode/chengdu_03.js     |   1 +
 src/jmapNew/config/skinCode/foshan_01.js      |   1 +
 src/jmapNew/config/skinCode/fuzhou_01.js      |   1 +
 src/jmapNew/config/skinCode/haerbin_01.js     |   1 +
 src/jmapNew/config/skinCode/ningbo_01.js      |   1 +
 src/jmapNew/config/skinCode/xian_01.js        |   1 +
 src/jmapNew/config/skinCode/xian_02.js        |   1 +
 src/jmapNew/shape/Automactic/EMouse.js        |   2 +-
 src/jmapNew/shape/AutomacticRoute/EMouse.js   |   2 +-
 src/jmapNew/shape/AxleReset/EMouse.js         |   2 +-
 src/jmapNew/shape/GuideLock/EMouse.js         |   2 +-
 src/jmapNew/shape/LcControl/EMouse.js         |  94 ++++++++---------
 src/jmapNew/shape/LimitControl/EMouse.js      |  96 +++++++++---------
 src/jmapNew/shape/SaidLamp/EMouse.js          |   2 +-
 src/jmapNew/shape/Section/EMouse.js           |   1 +
 src/jmapNew/shape/Station/ESingleControl.js   |   2 +-
 src/jmapNew/shape/Station/index.js            |   1 +
 src/jmapNew/shape/StationStand/EDetain.js     |   3 +-
 src/jmapNew/shape/Train/TrainBody.js          |  24 ++---
 src/jmapNew/shape/ZcControl/EMouse.js         |  96 +++++++++---------
 src/views/components/font/index.vue           |  81 ++++++++-------
 src/views/jsxt/apply/index.vue                |  21 +++-
 .../newMap/newMapdraft/mapoperate/station.vue |   8 +-
 .../newMap/newMapdraft/mapoperate/text.vue    |   2 +-
 28 files changed, 242 insertions(+), 214 deletions(-)
 create mode 100644 src/assets/SAFS.png

diff --git a/src/assets/SAFS.png b/src/assets/SAFS.png
new file mode 100644
index 0000000000000000000000000000000000000000..2807e5991edcfb4f33ebc76a2de0c2127ebe7149
GIT binary patch
literal 44751
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

literal 0
HcmV?d00001

diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js
index b95471af5..6e4a9e741 100644
--- a/src/i18n/langs/zh/map.js
+++ b/src/i18n/langs/zh/map.js
@@ -315,12 +315,12 @@ export default {
     centralized: '是否集中站:',
     stationRunPlanName: '真实名称:',
     stationVisible: '是否显示:',
-    stationNameFont: '车站字体:',
+    stationNameFont: '车站字体大小:',
     stationNameFontColor: '车站字体颜色:',
     stationKmPostShow: '是否显示公里标名称:',
     stationKmRange: '公里标距离:',
     stationKmPost: '公里标名称:',
-    stationKmPostFont: '公里标字体:',
+    stationKmPostFont: '公里标字体大小:',
     stationKmPostFontColor: '公里标字体颜色:',
     stationPositionX: 'x坐标:',
     stationPositionY: 'y坐标:',
@@ -350,7 +350,7 @@ export default {
     stationstandPosition: '车站坐标:',
     subhead:'副标题:',
     subheadDisplay:'是否显示副标题:',
-    subheadFont:'副标题字体:',
+    subheadFont:'副标题字体大小:',
     subheadFontColor:'副标题字体颜色:',
     subheadPosition:'副标题坐标:',
 
@@ -377,7 +377,7 @@ export default {
 
     textCode: '文字编码:',
     textContent: '文本内容:',
-    textFont: '字体格式:',
+    textFont: '字体大小:',
     textFontColor: '字体颜色:',
 
     trainCode: '列车编号:',
diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js
index f46b8c9b2..8f04180af 100644
--- a/src/jmapNew/config/skinCode/bejing_01.js
+++ b/src/jmapNew/config/skinCode/bejing_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js
index 105148ae5..c0b5f44c5 100644
--- a/src/jmapNew/config/skinCode/chengdu_01.js
+++ b/src/jmapNew/config/skinCode/chengdu_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index 05fdc0707..1a5c48806 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: true							// 进路触发颜色
diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js
index cf87fc295..721c8d51f 100644
--- a/src/jmapNew/config/skinCode/foshan_01.js
+++ b/src/jmapNew/config/skinCode/foshan_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index f1b957b48..effcfd54a 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js
index 7075919f8..ece44059c 100644
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 940c09892..74722abc0 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js
index 1847b0aad..5df4e33b7 100644
--- a/src/jmapNew/config/skinCode/xian_01.js
+++ b/src/jmapNew/config/skinCode/xian_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js
index 8d9a50e62..bdb8c587f 100644
--- a/src/jmapNew/config/skinCode/xian_02.js
+++ b/src/jmapNew/config/skinCode/xian_02.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
diff --git a/src/jmapNew/shape/Automactic/EMouse.js b/src/jmapNew/shape/Automactic/EMouse.js
index 967f6094e..8eb02756e 100644
--- a/src/jmapNew/shape/Automactic/EMouse.js
+++ b/src/jmapNew/shape/Automactic/EMouse.js
@@ -17,7 +17,7 @@ export default class EMouse extends Group {
                 y: this.device.model.position.y + this.device.style.LcControl.lamp.radiusR + this.device.style.LcControl.text.distance - 30,
                 fontWeight: 'normal',
                 fontSize: this.device.style.LcControl.mouseOverStyle.fontSize,
-                fontFamily: this.device.style.LcControl.mouseOverStyle.fontFamily,
+                fontFamily: this.device.style.fontFamily,
                 text: this.device.model.name,
                 textFill: this.device.style.LcControl.mouseOverStyle.fontColor,
                 textAlign: this.device.style.LcControl.mouseOverStyle.textAlign,
diff --git a/src/jmapNew/shape/AutomacticRoute/EMouse.js b/src/jmapNew/shape/AutomacticRoute/EMouse.js
index 96e179317..f2547d8c6 100644
--- a/src/jmapNew/shape/AutomacticRoute/EMouse.js
+++ b/src/jmapNew/shape/AutomacticRoute/EMouse.js
@@ -17,7 +17,7 @@ export default class EMouse extends Group {
                 y: this.device.model.position.y + this.device.style.LcControl.lamp.radiusR + this.device.style.LcControl.text.distance - 30,
                 fontWeight: 'normal',
                 fontSize: this.device.style.LcControl.mouseOverStyle.fontSize,
-                fontFamily: this.device.style.LcControl.mouseOverStyle.fontFamily,
+                fontFamily: this.device.style.fontFamily,
                 text: this.device.model.name,
                 textFill: this.device.style.LcControl.mouseOverStyle.fontColor,
                 textAlign: this.device.style.LcControl.mouseOverStyle.textAlign,
diff --git a/src/jmapNew/shape/AxleReset/EMouse.js b/src/jmapNew/shape/AxleReset/EMouse.js
index 96e179317..f2547d8c6 100644
--- a/src/jmapNew/shape/AxleReset/EMouse.js
+++ b/src/jmapNew/shape/AxleReset/EMouse.js
@@ -17,7 +17,7 @@ export default class EMouse extends Group {
                 y: this.device.model.position.y + this.device.style.LcControl.lamp.radiusR + this.device.style.LcControl.text.distance - 30,
                 fontWeight: 'normal',
                 fontSize: this.device.style.LcControl.mouseOverStyle.fontSize,
-                fontFamily: this.device.style.LcControl.mouseOverStyle.fontFamily,
+                fontFamily: this.device.style.fontFamily,
                 text: this.device.model.name,
                 textFill: this.device.style.LcControl.mouseOverStyle.fontColor,
                 textAlign: this.device.style.LcControl.mouseOverStyle.textAlign,
diff --git a/src/jmapNew/shape/GuideLock/EMouse.js b/src/jmapNew/shape/GuideLock/EMouse.js
index 2241f7e1c..1589c764a 100644
--- a/src/jmapNew/shape/GuideLock/EMouse.js
+++ b/src/jmapNew/shape/GuideLock/EMouse.js
@@ -17,7 +17,7 @@ export default class EMouse extends Group {
                 y: this.device.model.position.y + this.device.style.LcControl.lamp.radiusR + this.device.style.LcControl.text.distance - 30,
                 fontWeight: 'normal',
                 fontSize: this.device.style.LcControl.mouseOverStyle.fontSize,
-                fontFamily: this.device.style.LcControl.mouseOverStyle.fontFamily,
+                fontFamily: this.device.style.fontFamily,
                 text: this.device.model.name,
                 textFill: this.device.style.LcControl.mouseOverStyle.fontColor,
                 textAlign: this.device.style.LcControl.mouseOverStyle.textAlign,
diff --git a/src/jmapNew/shape/LcControl/EMouse.js b/src/jmapNew/shape/LcControl/EMouse.js
index fdb639e95..f2547d8c6 100644
--- a/src/jmapNew/shape/LcControl/EMouse.js
+++ b/src/jmapNew/shape/LcControl/EMouse.js
@@ -2,52 +2,52 @@ import Group from 'zrender/src/container/Group';
 import Text from 'zrender/src/graphic/Text';
 
 export default class EMouse extends Group {
-	constructor(device) {
-		super();
-		this.device = device;
-		this.create();
-	}
-	create() {
-		this.text = new Text({
-			zlevel: this.device.zlevel,
-			z: this.device.z+1,
-			position: [0, 0],
-			style: {
-				x: this.device.model.position.x,
-				y: this.device.model.position.y + this.device.style.LcControl.lamp.radiusR + this.device.style.LcControl.text.distance-30,
-				fontWeight: 'normal',
-				fontSize: this.device.style.LcControl.mouseOverStyle.fontSize,
-				fontFamily: this.device.style.LcControl.mouseOverStyle.fontFamily,
-				text: this.device.model.name,
-				textFill: this.device.style.LcControl.mouseOverStyle.fontColor,
-				textAlign: this.device.style.LcControl.mouseOverStyle.textAlign,
-				textVerticalAlign: this.device.style.LcControl.mouseOverStyle.textVerticalAlign
-			}
-		});
-		this.add(this.text);
-		this.text.hide();
-	}
-	mouseover(e) {
-		if (e.target && e.target._subType == 'Text') {
-			this.text.show();
-		} else {
-			this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor);
-			this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor);
-			this.device.control.setTextBorder(true);
-			this.device.control.setArcBorder(true);
-		}
-	}
+    constructor(device) {
+        super();
+        this.device = device;
+        this.create();
+    }
+    create() {
+        this.text = new Text({
+            zlevel: this.device.zlevel,
+            z: this.device.z + 1,
+            position: [0, 0],
+            style: {
+                x: this.device.model.position.x,
+                y: this.device.model.position.y + this.device.style.LcControl.lamp.radiusR + this.device.style.LcControl.text.distance - 30,
+                fontWeight: 'normal',
+                fontSize: this.device.style.LcControl.mouseOverStyle.fontSize,
+                fontFamily: this.device.style.fontFamily,
+                text: this.device.model.name,
+                textFill: this.device.style.LcControl.mouseOverStyle.fontColor,
+                textAlign: this.device.style.LcControl.mouseOverStyle.textAlign,
+                textVerticalAlign: this.device.style.LcControl.mouseOverStyle.textVerticalAlign
+            }
+        });
+        this.add(this.text);
+        this.text.hide();
+    }
+    mouseover(e) {
+        if (e.target && e.target._subType == 'Text') {
+            this.text.show();
+        } else {
+            this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor);
+            this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor);
+            this.device.control.setTextBorder(true);
+            this.device.control.setArcBorder(true);
+        }
+    }
 
-	mouseout(e) {
-		if (!this.device.model.down) {
-			if (e.target && e.target._subType == 'Text') {
-				this.text.hide();
-			} else {
-				this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor);
-				this.device.control.setTextColor('#FFFFFF');
-				this.device.control.setTextBorder(false);
-				this.device.control.setArcBorder(false);
-			}
-		}
-	}
+    mouseout(e) {
+        if (!this.device.model.down) {
+            if (e.target && e.target._subType == 'Text') {
+                this.text.hide();
+            } else {
+                this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor);
+                this.device.control.setTextColor('#FFFFFF');
+                this.device.control.setTextBorder(false);
+                this.device.control.setArcBorder(false);
+            }
+        }
+    }
 }
diff --git a/src/jmapNew/shape/LimitControl/EMouse.js b/src/jmapNew/shape/LimitControl/EMouse.js
index 4abd12d5d..c650da217 100644
--- a/src/jmapNew/shape/LimitControl/EMouse.js
+++ b/src/jmapNew/shape/LimitControl/EMouse.js
@@ -2,53 +2,53 @@ import Group from 'zrender/src/container/Group';
 import Text from 'zrender/src/graphic/Text';
 
 export default class EMouse extends Group {
-	constructor(device) {
-		super();
-		this.device = device;
-		this.create();
-	}
-	create() {
-		this.text = new Text({
-			_subType: 'Text',
-			zlevel: this.device.zlevel,
-			z: this.device.z+1,
-			position: [0, 0],
-			style: {
-				x: this.device.model.position.x,
-				y: this.device.model.position.y + this.device.style.LimitControl.lamp.radiusR + this.device.style.LimitControl.text.distance-30,
-				fontWeight: this.device.style.LimitControl.mouseOverStyle.fontWeight,
-				fontSize: this.device.style.LimitControl.mouseOverStyle.fontSize,
-				fontFamily: this.device.style.LimitControl.mouseOverStyle.fontFormat,
-				text: this.device.model.name,
-				textFill: this.device.style.LimitControl.mouseOverStyle.fontColor,
-				textAlign: this.device.style.LimitControl.mouseOverStyle.textAlign,
-				textVerticalAlign: this.device.style.LimitControl.mouseOverStyle.textVerticalAlign
-			}
-		});
-		this.add(this.text);
-		this.text.hide();
-	}
-	mouseover(e) {
-		if (e.target && e.target._subType == 'Text') {
-			this.text.show();
-		} else {
-			this.device.control.setControlColor(this.device.style.LimitControl.mouseOverStyle.arcColor);
-			this.device.control.setTextColor(this.device.style.LimitControl.mouseOverStyle.textColor);
-			this.device.control.setTextBorder(true);
-			this.device.control.setArcBorder(true);
-		}
-	}
+    constructor(device) {
+        super();
+        this.device = device;
+        this.create();
+    }
+    create() {
+        this.text = new Text({
+            _subType: 'Text',
+            zlevel: this.device.zlevel,
+            z: this.device.z + 1,
+            position: [0, 0],
+            style: {
+                x: this.device.model.position.x,
+                y: this.device.model.position.y + this.device.style.LimitControl.lamp.radiusR + this.device.style.LimitControl.text.distance - 30,
+                fontWeight: this.device.style.LimitControl.mouseOverStyle.fontWeight,
+                fontSize: this.device.style.LimitControl.mouseOverStyle.fontSize,
+                fontFamily: this.device.style.fontFormat,
+                text: this.device.model.name,
+                textFill: this.device.style.LimitControl.mouseOverStyle.fontColor,
+                textAlign: this.device.style.LimitControl.mouseOverStyle.textAlign,
+                textVerticalAlign: this.device.style.LimitControl.mouseOverStyle.textVerticalAlign
+            }
+        });
+        this.add(this.text);
+        this.text.hide();
+    }
+    mouseover(e) {
+        if (e.target && e.target._subType == 'Text') {
+            this.text.show();
+        } else {
+            this.device.control.setControlColor(this.device.style.LimitControl.mouseOverStyle.arcColor);
+            this.device.control.setTextColor(this.device.style.LimitControl.mouseOverStyle.textColor);
+            this.device.control.setTextBorder(true);
+            this.device.control.setArcBorder(true);
+        }
+    }
 
-	mouseout(e) {
-		if (!this.device.model.down) {
-			if (e.target && e.target._subType == 'Text') {
-				this.text.hide();
-			} else {
-				this.device.control.setControlColor(this.device.style.LimitControl.lamp.controlColor);
-				this.device.control.setTextColor('#FFFFFF');
-				this.device.control.setTextBorder(false);
-				this.device.control.setArcBorder(false);
-			}
-		}
-	}
+    mouseout(e) {
+        if (!this.device.model.down) {
+            if (e.target && e.target._subType == 'Text') {
+                this.text.hide();
+            } else {
+                this.device.control.setControlColor(this.device.style.LimitControl.lamp.controlColor);
+                this.device.control.setTextColor('#FFFFFF');
+                this.device.control.setTextBorder(false);
+                this.device.control.setArcBorder(false);
+            }
+        }
+    }
 }
diff --git a/src/jmapNew/shape/SaidLamp/EMouse.js b/src/jmapNew/shape/SaidLamp/EMouse.js
index 92865a4eb..156f18853 100644
--- a/src/jmapNew/shape/SaidLamp/EMouse.js
+++ b/src/jmapNew/shape/SaidLamp/EMouse.js
@@ -17,7 +17,7 @@ export default class EMouse extends Group {
                 y: this.device.model.position.y + this.device.deviceStyle.lamp.radiusR + this.device.deviceStyle.text.distance - 30,
                 fontWeight: 'normal',
                 fontSize: this.device.deviceStyle.mouseOverStyle.fontSize,
-                fontFamily: this.device.deviceStyle.mouseOverStyle.fontFamily,
+                fontFamily: this.device.style.fontFamily,
                 text: this.device.model.name,
                 textFill: this.device.deviceStyle.mouseOverStyle.fontColor,
                 textAlign: this.device.deviceStyle.mouseOverStyle.textAlign,
diff --git a/src/jmapNew/shape/Section/EMouse.js b/src/jmapNew/shape/Section/EMouse.js
index 03316ae93..978e9e36a 100644
--- a/src/jmapNew/shape/Section/EMouse.js
+++ b/src/jmapNew/shape/Section/EMouse.js
@@ -59,6 +59,7 @@ class EMouse extends Group {
                     x: rect.x + (rect.width / 2),
                     y: rect.y + (rect.height / 2),
                     text: this.device.model.name,
+                    fontFamily: this.device.style.fontFamily,
                     textFill: this.device.style.Section.mouseOverStyle.textShadowColor, // 黄色
                     textAlign: 'middle',
                     textVerticalAlign: 'top',
diff --git a/src/jmapNew/shape/Station/ESingleControl.js b/src/jmapNew/shape/Station/ESingleControl.js
index f1e0607e3..ad2956851 100644
--- a/src/jmapNew/shape/Station/ESingleControl.js
+++ b/src/jmapNew/shape/Station/ESingleControl.js
@@ -53,7 +53,7 @@ export default class ESingleControl extends Group {
                 y: model.point.y + model.style.Station.StationControl.lamp.radiusR + model.style.Station.StationControl.text.distance,
                 fontWeight: model.style.Station.StationControl.text.fontWeight,
                 fontSize: model.style.Station.StationControl.text.fontSize,
-                fontFamily: model.style.Station.StationControl.text.fontFormat,
+                fontFamily: model.style.fontFamily,
                 text: model.context,
                 textFill: model.style.Station.StationControl.text.fontColor,
                 textAlign: model.style.Station.StationControl.text.textAlign,
diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js
index ca5433e33..77880b13b 100644
--- a/src/jmapNew/shape/Station/index.js
+++ b/src/jmapNew/shape/Station/index.js
@@ -36,6 +36,7 @@ export default class Station extends Group {
 
         if (model.visible) {
             // 公里标名称是否显示
+            console.log(model.nameFont);
             this.stationText = new ETextName({
                 zlevel: this.zlevel,
                 z: this.z,
diff --git a/src/jmapNew/shape/StationStand/EDetain.js b/src/jmapNew/shape/StationStand/EDetain.js
index 727941e07..a70e31784 100644
--- a/src/jmapNew/shape/StationStand/EDetain.js
+++ b/src/jmapNew/shape/StationStand/EDetain.js
@@ -23,7 +23,8 @@ class EDetain extends Group {
                     x: model.x,
                     y: model.y,
                     text: style.StationStand.detainCar.text,
-                    fontSize: `${style.StationStand.detainCar.fontSize} px  ${style.fontFamily}`,
+                    fontSize: `${style.StationStand.detainCar.fontSize}px`,
+                    fontFamily: style.fontFamily,
                     textFill: style.StationStand.detainCar.centerTrainColor,
                     textStroke: style.backgroundColor,
                     textAlign: style.textStyle.textAlign,
diff --git a/src/jmapNew/shape/Train/TrainBody.js b/src/jmapNew/shape/Train/TrainBody.js
index be043e588..4ab351b62 100644
--- a/src/jmapNew/shape/Train/TrainBody.js
+++ b/src/jmapNew/shape/Train/TrainBody.js
@@ -59,7 +59,7 @@ export default class TrainBody extends Group {
             text: style.Train.hsda.textHContent,
             textFill: style.trainYellowColor,
             fontSize: style.Train.hsda.trainHSDATextFontSize,
-            fontFamily: style.Train.common.fontFamily,
+            fontFamily: style.fontFamily,
             textAlign: 'middle',
             textVerticalAlign: 'top'
         }) : '';
@@ -71,7 +71,7 @@ export default class TrainBody extends Group {
             text: style.Train.hsda.textSContent,
             textFill: style.trainBlueColor,
             fontSize: style.Train.hsda.trainHSDATextFontSize,
-            fontFamily: style.Train.common.fontFamily,
+            fontFamily: style.fontFamily,
             textAlign: 'middle',
             textVerticalAlign: 'top'
         }) : '';
@@ -83,7 +83,7 @@ export default class TrainBody extends Group {
             text: style.Train.hsda.textDContent,
             textFill: style.trainGreenColor,
             fontSize: style.Train.hsda.trainHSDATextFontSize,
-            fontFamily: style.Train.common.fontFamily,
+            fontFamily: style.fontFamily,
             textAlign: 'middle',
             textVerticalAlign: 'top'
         }) : '';
@@ -95,7 +95,7 @@ export default class TrainBody extends Group {
             text: style.Train.hsda.textAContent,
             textFill: style.trainRedColor,
             fontSize: style.Train.hsda.trainHSDATextFontSize,
-            fontFamily: style.Train.common.fontFamily,
+            fontFamily: style.fontFamily,
             textAlign: 'middle',
             textVerticalAlign: 'top'
         }) : '';
@@ -113,7 +113,7 @@ export default class TrainBody extends Group {
             text: serviceNumber.substring(serviceNumber.length - style.Train.trainServer.serviceNumberPrefix.length),
             textFill: model.style.Train.trainServer.fontColor || style.trainTextColor,
             fontSize: model.fontSize,
-            fontFamily: style.Train.common.fontFamily,
+            fontFamily: style.fontFamily,
             textAlign: 'left',
             textVerticalAlign: 'top'
         });
@@ -125,7 +125,7 @@ export default class TrainBody extends Group {
             text: tripNumber.substring(tripNumber.length - style.Train.trainTarget.tripNumberPrefix.length),
             textFill: model.style.Train.trainTarget.fontColor || style.trainTextColor,
             fontSize: model.fontSize,
-            fontFamily: style.Train.common.fontFamily,
+            fontFamily: style.fontFamily,
             textAlign: 'left',
             textVerticalAlign: 'top'
         });
@@ -139,7 +139,7 @@ export default class TrainBody extends Group {
             textStroke: style.trainTextColor,
             textStrokeWidth: 0,
             fontSize: model.fontSize,
-            fontFamily: style.Train.common.fontFamily,
+            fontFamily: style.fontFamily,
             textAlign: 'left',
             textVerticalAlign: 'top'
         });
@@ -153,7 +153,7 @@ export default class TrainBody extends Group {
             textStroke: style.trainTextColor,
             textStrokeWidth: 0,
             fontSize: model.fontSize,
-            fontFamily: style.Train.common.fontFamily,
+            fontFamily: style.fontFamily,
             textAlign: 'left',
             textVerticalAlign: 'top'
         });
@@ -193,7 +193,7 @@ export default class TrainBody extends Group {
                 textStroke: style.trainTextColor,
                 textStrokeWidth: 0,
                 fontSize: model.fontSize,
-                fontFamily: style.Train.common.fontFamily,
+                fontFamily: style.fontFamily,
                 textAlign: 'left',
                 textVerticalAlign: 'top'
             });
@@ -210,7 +210,7 @@ export default class TrainBody extends Group {
                 textStroke: style.trainTextColor,
                 textStrokeWidth: 0,
                 fontSize: model.fontSize,
-                fontFamily: style.Train.common.fontFamily,
+                fontFamily: style.fontFamily,
                 textAlign: 'left',
                 textVerticalAlign: 'top'
             });
@@ -227,7 +227,7 @@ export default class TrainBody extends Group {
                 textStroke: style.trainTextColor,
                 textStrokeWidth: 0,
                 fontSize: model.fontSize,
-                fontFamily: style.Train.common.fontFamily,
+                fontFamily: style.fontFamily,
                 textAlign: 'left',
                 textVerticalAlign: 'top'
             });
@@ -244,7 +244,7 @@ export default class TrainBody extends Group {
                 textStroke: style.trainTextColor,
                 textStrokeWidth: 0,
                 fontSize: model.fontSize,
-                fontFamily: style.Train.common.fontFamily,
+                fontFamily: style.fontFamily,
                 textAlign: 'left',
                 textVerticalAlign: 'top'
             });
diff --git a/src/jmapNew/shape/ZcControl/EMouse.js b/src/jmapNew/shape/ZcControl/EMouse.js
index 0855053f9..fd8eb1fe8 100644
--- a/src/jmapNew/shape/ZcControl/EMouse.js
+++ b/src/jmapNew/shape/ZcControl/EMouse.js
@@ -2,53 +2,53 @@ import Group from 'zrender/src/container/Group';
 import Text from 'zrender/src/graphic/Text';
 
 export default class EMouse extends Group {
-	constructor(device) {
-		super();
-		this.device = device;
-		this.create();
-	}
-	create() {
-		this.text = new Text({
-			_subType: 'Text',
-			zlevel: this.device.zlevel,
-			z: this.device.z+1,
-			position: [0, 0],
-			style: {
-				x: this.device.model.position.x,
-				y: this.device.model.position.y + this.device.style.ZcControl.lamp.radiusR + this.device.style.ZcControl.text.distance-30,
-				fontWeight: this.device.style.ZcControl.mouseOverStyle.fontWeight,
-				fontSize: this.device.style.ZcControl.mouseOverStyle.fontSize,
-				fontFamily: this.device.style.ZcControl.mouseOverStyle.fontFormat,
-				text: this.device.model.name,
-				textFill: this.device.style.ZcControl.mouseOverStyle.fontColor,
-				textAlign: this.device.style.ZcControl.mouseOverStyle.textAlign,
-				textVerticalAlign: this.device.style.ZcControl.mouseOverStyle.textVerticalAlign
-			}
-		});
-		this.add(this.text);
-		this.text.hide();
-	}
-	mouseover(e) {
-		if (e.target && e.target._subType == 'Text') {
-			this.text.show();
-		} else {
-			this.device.control.setControlColor(this.device.style.ZcControl.mouseOverStyle.arcColor);
-			this.device.control.setTextColor(this.device.style.ZcControl.mouseOverStyle.textColor);
-			this.device.control.setTextBorder(true);
-			this.device.control.setArcBorder(true);
-		}
-	}
+    constructor(device) {
+        super();
+        this.device = device;
+        this.create();
+    }
+    create() {
+        this.text = new Text({
+            _subType: 'Text',
+            zlevel: this.device.zlevel,
+            z: this.device.z + 1,
+            position: [0, 0],
+            style: {
+                x: this.device.model.position.x,
+                y: this.device.model.position.y + this.device.style.ZcControl.lamp.radiusR + this.device.style.ZcControl.text.distance - 30,
+                fontWeight: this.device.style.ZcControl.mouseOverStyle.fontWeight,
+                fontSize: this.device.style.ZcControl.mouseOverStyle.fontSize,
+                fontFamily: this.device.style.fontFamily,
+                text: this.device.model.name,
+                textFill: this.device.style.ZcControl.mouseOverStyle.fontColor,
+                textAlign: this.device.style.ZcControl.mouseOverStyle.textAlign,
+                textVerticalAlign: this.device.style.ZcControl.mouseOverStyle.textVerticalAlign
+            }
+        });
+        this.add(this.text);
+        this.text.hide();
+    }
+    mouseover(e) {
+        if (e.target && e.target._subType == 'Text') {
+            this.text.show();
+        } else {
+            this.device.control.setControlColor(this.device.style.ZcControl.mouseOverStyle.arcColor);
+            this.device.control.setTextColor(this.device.style.ZcControl.mouseOverStyle.textColor);
+            this.device.control.setTextBorder(true);
+            this.device.control.setArcBorder(true);
+        }
+    }
 
-	mouseout(e) {
-		if (!this.device.model.down) {
-			if (e.target && e.target._subType == 'Text') {
-				this.text.hide();
-			} else {
-				this.device.control.setControlColor(this.device.style.ZcControl.lamp.controlColor);
-				this.device.control.setTextColor('#FFFFFF');
-				this.device.control.setTextBorder(false);
-				this.device.control.setArcBorder(false);
-			}
-		}
-	}
+    mouseout(e) {
+        if (!this.device.model.down) {
+            if (e.target && e.target._subType == 'Text') {
+                this.text.hide();
+            } else {
+                this.device.control.setControlColor(this.device.style.ZcControl.lamp.controlColor);
+                this.device.control.setTextColor('#FFFFFF');
+                this.device.control.setTextBorder(false);
+                this.device.control.setArcBorder(false);
+            }
+        }
+    }
 }
diff --git a/src/views/components/font/index.vue b/src/views/components/font/index.vue
index 6f8ea0a1e..011f83c6d 100644
--- a/src/views/components/font/index.vue
+++ b/src/views/components/font/index.vue
@@ -1,71 +1,70 @@
 <template>
   <div class="font_box">
-    <el-select v-model="font" :placeholder="$t('global.font')" @input="$emit('input', inputValue)">
+    <!-- <el-select v-model="font" :placeholder="$t('global.font')" @input="$emit('input', inputValue)">
       <el-option v-for="option in fontList" :key="option.code" :label="option.name" :value="option.code" />
-    </el-select>
+    </el-select> -->
     <el-select v-model="size" :placeholder="$t('global.size')" @input="$emit('input', inputValue)">
       <el-option v-for="option in sizeList" :key="option.code" :label="option.name" :value="option.code" />
     </el-select><br>
-    <div class="format">
+    <!-- <div class="format">
       <span :style="{'font-family': font, 'font-size': size}">{{ text }}</span>
-    </div>
+    </div> -->
   </div>
 </template>
 
 <script>
 export default {
     name: 'ElFont',
-    props: [
-        'value'
-    ],
+    props: ['value'],
     data() {
         return {
-            fontList: [
-                { code: 'consolas', name: 'consolas' },
-                { code: 'sans-serif', name: 'sans-serif' },
-                { code: 'STHeiti', name: '华文黑体' },
-                { code: 'FangSong', name: '仿宋' }
-            ],
+            // fontList: [
+            //     { code: 'consolas', name: 'consolas' },
+            //     { code: 'sans-serif', name: 'sans-serif' },
+            //     { code: 'STHeiti', name: '华文黑体' },
+            //     { code: 'FangSong', name: '仿宋' }
+            // ],
             sizeList: [
-                { code: '0px', name: '0px' },
-                { code: '4px', name: '4px' },
-                { code: '6px', name: '6px' },
-                { code: '8px', name: '8px' },
-                { code: '10px', name: '10px' },
-                { code: '12px', name: '12px' },
-                { code: '14px', name: '14px' },
-                { code: '16px', name: '16px' },
-                { code: '18px', name: '18px' },
-                { code: '20px', name: '20px' },
-                { code: '22px', name: '22px' },
-                { code: '24px', name: '24px' },
-                { code: '26px', name: '26px' },
-                { code: '28px', name: '28px' },
-                { code: '30px', name: '30px' },
-                { code: '32px', name: '32px' },
-                { code: '34px', name: '34px' },
-                { code: '36px', name: '36px' },
-                { code: '38px', name: '38px' },
-                { code: '40px', name: '40px' }
+                { code: '0', name: '0px' },
+                { code: '4', name: '4px' },
+                { code: '6', name: '6px' },
+                { code: '8', name: '8px' },
+                { code: '10', name: '10px' },
+                { code: '12', name: '12px' },
+                { code: '14', name: '14px' },
+                { code: '16', name: '16px' },
+                { code: '18', name: '18px' },
+                { code: '20', name: '20px' },
+                { code: '22', name: '22px' },
+                { code: '24', name: '24px' },
+                { code: '26', name: '26px' },
+                { code: '28', name: '28px' },
+                { code: '30', name: '30px' },
+                { code: '32', name: '32px' },
+                { code: '34', name: '34px' },
+                { code: '36', name: '36px' },
+                { code: '38', name: '38px' },
+                { code: '40', name: '40px' }
             ],
             size: '10px',
-            font: 'consolas',
+            // font: 'consolas',
             text: 'hello world'
         };
     },
     computed: {
         inputValue: function () {
-            return this.size + ' ' + this.font;
+            return this.size;
         }
     },
     watch: {
         value(val) {
             if (val !== this.inputValue && val) {
-                const arr = val.split(' ');
-                if (arr && arr.length >= 2) {
-                    this.size = arr[0];
-                    this.font = arr[1];
-                }
+                this.size = val;
+                // const arr = val.split(' ');
+                // if (arr && arr.length >= 2) {
+                //     this.size = arr[0];
+                //     this.font = arr[1];
+                // }
             }
         }
     },
@@ -79,7 +78,7 @@ export default {
         background-color: #C0C4CC;
         width: 100%;
 		display: flex;
-    	padding-left: 15px;
+		padding-left: 15px;
     }
 	.font_box{
 		/deep/ {
diff --git a/src/views/jsxt/apply/index.vue b/src/views/jsxt/apply/index.vue
index 0b96cf7a4..99693b5f2 100644
--- a/src/views/jsxt/apply/index.vue
+++ b/src/views/jsxt/apply/index.vue
@@ -55,10 +55,12 @@
     </template>
     <template v-else>
       <div v-if="flag" class="apply_box">
+        <div class="img_box"><img :src="SAFS" alt=""></div>
         <i class="el-icon-success" style="color: green; font-size: 40px;" />
         <span class="title">报名成功!</span>
       </div>
       <div v-if="!flag" class="applyAready_box">
+        <div class="img_box"><img :src="SAFS" alt=""></div>
         <div><img :src="applyAlready" class="applyAlready"></div>
         <div><span style="margin-left:10px;">请按时参加竞赛！</span></div>
       </div>
@@ -77,6 +79,7 @@ import { getUserinfoMobileCode } from '@/api/management/user';
 import { postSignUp } from '@/api/competition';
 import { getIsSignUp } from '@/api/competition';
 import applyAlready from '@/assets/applyAlready.png';
+import SAFS from '@/assets/SAFS.png';
 
 export default {
     name: '',
@@ -97,6 +100,7 @@ export default {
             }
         };
         return {
+            SAFS: SAFS,
             dialogVisible: false,
             applyAlready:applyAlready,
             applyFlag: true,
@@ -384,10 +388,12 @@ export default {
     .applyAlready{
         width:150px;
     }
+	.applyAready_box{
+		padding-top: 95px;
+	}
     .applyAready_box div{
         width:100%;
         text-align:center;
-        margin-top: 150px;
         font-size: 25px;
     }
 	.dictionary_box{
@@ -403,11 +409,22 @@ export default {
 			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 		}
 	}
+	.img_box{
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 80px;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+	}
 	.apply_box{
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		margin-top: 50px;
+		margin-top: 95px;
 		font-size: 25px;
 		.title{
 			margin-left: 7px;
diff --git a/src/views/newMap/newMapdraft/mapoperate/station.vue b/src/views/newMap/newMapdraft/mapoperate/station.vue
index 083cf1816..2fd54b5a2 100644
--- a/src/views/newMap/newMapdraft/mapoperate/station.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/station.vue
@@ -70,10 +70,10 @@
       <div style="height: 100%;">
         <el-scrollbar wrap-class="scrollbar-wrapper">
           <el-form ref="oprt" :model="allModel" label-width="130px" size="mini">
-            <el-form-item label="车站字体:" prop="nameFont">
+            <el-form-item label="车站字体大小:" prop="nameFont">
               <el-font v-model="allModel.nameFont" :placeholder="this.$t('tip.stationFont')" />
             </el-form-item>
-            <el-form-item label="公里标字体:" prop="kmPostFont">
+            <el-form-item label="公里标字体大小:" prop="kmPostFont">
               <el-font v-model="allModel.kmPostFont" :placeholder="this.$t('tip.stationFont')" />
             </el-form-item>
             <el-form-item label="车站Y坐标:" prop="positionY">
@@ -421,11 +421,11 @@ export default {
                                 zcCode: '',
                                 runPlanName: '',
                                 visible: true,
-                                nameFont: '22px consolas',
+                                nameFont: '22',
                                 nameFontColor: '#FFFFFF',
                                 kmPost: '1000km~2000km',
                                 kmPostShow: true,
-                                kmPostFont: '8px consolas',
+                                kmPostFont: '8',
                                 kmPostFontColor: '#FFFFFF',
                                 kilometerPosition: { x: 0, y: 0 },
                                 centralized: false,
diff --git a/src/views/newMap/newMapdraft/mapoperate/text.vue b/src/views/newMap/newMapdraft/mapoperate/text.vue
index 9add562bf..8195ecbf0 100644
--- a/src/views/newMap/newMapdraft/mapoperate/text.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/text.vue
@@ -206,7 +206,7 @@ export default {
                     const model = {
                         _type: 'Text',
                         code: getUID('Text', this.textList),
-                        font: '14px consolas',
+                        font: '14',
                         fontColor: '#FFFFFF',
                         content: `${this.addModel.prepend}::${this.addModel.content}`,
                         position: {

From 3d10668abf0ccf3fe10ac992cb6f3b15283a3174 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 15:43:36 +0800
Subject: [PATCH 17/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competition.js                        | 39 +++++++++++++------
 src/views/jsxt/competition/examDetail.vue     | 27 ++++++++-----
 src/views/jsxt/refereeList/index.vue          |  8 +---
 .../newMap/jointTrainingNew/menuDemon.vue     | 21 +++++-----
 4 files changed, 59 insertions(+), 36 deletions(-)

diff --git a/src/api/competition.js b/src/api/competition.js
index 2fc9d0a6c..eec560f25 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -46,10 +46,10 @@ export function getQuestionListByMapId(params) {
     });
 }
 
-// 加载实操及内容
-export function loadQuestionList(competitionId, data) {
+// 加载试卷
+export function loadingPaper(competitionId, data) {
     return request({
-        url: `api/v1/competitionPractical/competition/${competitionId}/distribute`,
+        url: `api/v1/competition/${competitionId}/testPaper`,
         method: 'post',
         data
     });
@@ -80,14 +80,14 @@ export function getRaceUserList(params) {
     });
 }
 
-/** 分页查询理论题列表 */
-export function getCompetitionTheory(params) {
-    return request({
-        url: `/api/v1/competitionTheory`,
-        method: 'get',
-        params
-    });
-}
+// /** 分页查询理论题列表 */
+// export function getCompetitionTheory(params) {
+//     return request({
+//         url: `/api/v1/competitionTheory`,
+//         method: 'get',
+//         params
+//     });
+// }
 
 /** 提交试卷 */
 export function postCompetitionTheory(theoryId, data) {
@@ -98,7 +98,7 @@ export function postCompetitionTheory(theoryId, data) {
     });
 }
 
-/** 查询用户是否已经报名该竞赛 */
+/** 查询本竞赛用的实操列表 */
 export function getCompetitionPractical(competitionId) {
     return request({
         url: `/api/v1/competitionPractical/competition/${competitionId}`,
@@ -114,3 +114,18 @@ export function getRaceUserById(raceId, userId) {
     });
 }
 
+/** 查询加载的实操题 */
+export function getPracticalQuestion(competitionId) {
+    return request({
+        url: `/api/v1/competitionPractical/competition/${competitionId}`,
+        method: 'get'
+    });
+}
+
+/** 查询加载的理论题 */
+export function getTheoryQuestion(competitionId) {
+    return request({
+        url: `/api/v1/competitionTheory/competition/${competitionId}`,
+        method: 'get'
+    });
+}
diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 2891470a6..5b01cb9d1 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -15,7 +15,7 @@ import LangStorage from '@/utils/lang';
 import { getPublishMapInfo } from '@/api/jmap/map';
 import ConstConfig from '@/scripts/ConstConfig';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import { participantCreatTrainingRoom, getCompetitionTheory, getCompetitionPractical } from '@/api/competition';
+import { participantCreatTrainingRoom, getCompetitionPractical, getPracticalQuestion, getTheoryQuestion } from '@/api/competition';
 import applyImg from '@/assets/apply.png';
 
 export default {
@@ -150,19 +150,28 @@ export default {
         },
         async exmaStart() {
             if (this.$route.query.type == 'theory') {
-                getCompetitionTheory({competitionId:this.$route.query.raceId}).then(()=>{
-                    this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}?raceId=${this.$route.query.raceId}`);
+                getTheoryQuestion(this.$route.query.raceId).then((resp)=>{
+                    if (resp.data) {
+                        this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}?raceId=${this.$route.query.raceId}`);
+                    } else {
+                        this.$messageBox('试卷还没被加载');
+                    }
+
                 }).catch(()=>{
                 });
             } else {
-                // this.disabled = true;
-                getCompetitionPractical(this.$route.query.raceId).then(()=>{
-                    participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
+                getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
+                    if (responese.data) {
+                        participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
                         // const query = { lineCode: '11', mapId: '41', group: resp.data, prdType: '03', raceId: this.$route.query.raceId};
                         // this.$router.replace({ path: `/displayNew/demon`, query: query});
-                        const query = { lineCode: '11', mapId: '41', group: resp.data, raceId: this.$route.query.raceId};
-                        this.$router.replace({ path: `/jointTrainingNew`, query: query});
-                    });
+                            const query = { lineCode: '11', mapId: '41', group: resp.data, raceId: this.$route.query.raceId};
+                            this.$router.replace({ path: `/jointTrainingNew`, query: query});
+                        });
+                    } else {
+                        this.$messageBox('试卷还没被加载');
+                    }
+
                 });
             }
         }
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 54048e0e3..0ed037e6b 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { refereeEnterSimulation, loadQuestionList, getRaceUserList } from '@/api/competition';
+import { refereeEnterSimulation, loadingPaper, getRaceUserList } from '@/api/competition';
 // import QuestionList from './questionList';
 
 export default {
@@ -137,9 +137,8 @@ export default {
         //     });
         // },
         handleAdd() {
-            loadQuestionList(this.$route.query.raceId, []).then((response)=>{
+            loadingPaper(this.$route.query.raceId, {}).then((response)=>{
                 this.$message('开始考试成功！');
-                this.doClose();
             }).catch(()=>{
                 this.$message('开始考试失败');
             });
@@ -154,14 +153,11 @@ export default {
         handleClick(row) {
             const group = row.room.group;
             refereeEnterSimulation(group).then(response=>{
-                // const query = { lineCode: '11', mapId: '41', group: row.room.group, prdType: '03' };
-                // this.$router.push({ path: `/displayNew/demon`, query: query});
                 const query = { lineCode: '11', mapId: '41', group: group, raceId: this.$route.query.raceId};
                 this.$router.replace({ path: `/jointTrainingNew`, query: query});
             });
         },
         playBack() {
-
         },
         gradeScore() {
 
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 1ab518b41..76125f3a1 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -12,8 +12,8 @@
         <!-- <el-button type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button> -->
       </el-button-group>
       <template v-if="project==='jsxt'">
-        <!-- <el-button :disabled="!jsStart" type="success" @click="startCompetition">开始</el-button> -->
-        <el-button type="danger" @click="endCompetition">提交</el-button>
+        <el-button :disabled="!jsStart" type="success" @click="startCompetition">开始</el-button>
+        <el-button :disabled="jsStart" type="danger" @click="endCompetition">提交</el-button>
       </template>
       <el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition">返回</el-button>
       <el-button v-if="project!=='jsxt'&&project!=='refereeJsxt'" type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button>
@@ -77,8 +77,8 @@ export default {
             offset: 10,
             userId: '',
             stationList: [],
-            stationLists: []
-            // jsStart: true
+            stationLists: [],
+            jsStart: true
         };
     },
     computed: {
@@ -127,11 +127,11 @@ export default {
         '$store.state.map.runPlanStatus': function (val) {
             this.isDisable = val;
         },
-        '$store.state.socket.competitionStart':function(val) {
-            if (val) {
-                this.startCompetition();
-            }
-        },
+        // '$store.state.socket.competitionStart':function(val) {
+        //     if (val) {
+        //         this.startCompetition();
+        //     }
+        // },
         '$store.state.socket.simulationOver':function(val) {
             if (val && this.project === 'refereeJsxt') {
                 this.$router.go(-1);
@@ -244,6 +244,9 @@ export default {
             };
             ranAsPlan(data, this.group).then(res => {
                 this.$store.dispatch('training/simulationStart').then(() => {
+                    if (this.project == 'jsxt') {
+                        this.jsStart = false;
+                    }
                     this.$store.dispatch('map/setRunPlanStatus', true);
                     this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
                 });

From 8a104a09f6a450b1768c135b08678a28035871b2 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 15:45:51 +0800
Subject: [PATCH 18/85] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/refereeList/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 0ed037e6b..76722ccd6 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -138,9 +138,9 @@ export default {
         // },
         handleAdd() {
             loadingPaper(this.$route.query.raceId, {}).then((response)=>{
-                this.$message('开始考试成功！');
+                this.$message('试题加载成功');
             }).catch(()=>{
-                this.$message('开始考试失败');
+                this.$message('试题加载失败');
             });
         },
         // 查询函数

From 0f21696e19b4ee3831e70edc41edcc4f86c87921 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 16:15:15 +0800
Subject: [PATCH 19/85] =?UTF-8?q?=E8=A3=81=E5=88=A4=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/refereeList/index.vue | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 76722ccd6..8aadf593c 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -106,22 +106,23 @@ export default {
                 actions: [
                     { text: '导入试题', handler: this.handleAdd }
                 ]
-            }
-            // isLeaving:false
+            },
+            isLeaving:false
         };
     },
     computed: {
     },
     created() {
-        this.loadInitData();
+    },
+    mounted() {
+        this.$nextTick(()=>{
+            this.refresh();
+        });
     },
     beforeDestroy() {
-        // this.isLeaving = true;
+        this.isLeaving = true;
     },
     methods: {
-        loadInitData() {
-            // this.getData();
-        },
         covertStatus(status) {
             const statusDict = {'0':'尚未参赛', '1':'进入赛场', '2':'理论赛场', '3':'实操赛场', '4':'完成比赛', '5':'完成理论', '6':'完成实操'};
             return statusDict[status];
@@ -164,6 +165,11 @@ export default {
         },
         refresh() {
             this.$refs.queryListPage.refresh(true);
+            setTimeout(() => {
+                if (!this.isLeaving) {
+                    this.refresh();
+                }
+            }, 3000);
         }
         // loadQuestions() {
         //     this.$refs.questionList.doShow();

From 3bd5572e58cd756c04ed8996fae8d7bcfd6694fb Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 16:29:13 +0800
Subject: [PATCH 20/85] =?UTF-8?q?=E8=A3=81=E5=88=A4=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/refereeList/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 8aadf593c..c8c578ca8 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -39,6 +39,7 @@ export default {
                 query: this.queryFunction,
                 selectCheckShow: false,
                 indexShow: true,
+                afterQuery:this.afterQuery,
                 columns: [
                     {
                         title: '名字',
@@ -115,9 +116,6 @@ export default {
     created() {
     },
     mounted() {
-        this.$nextTick(()=>{
-            this.refresh();
-        });
     },
     beforeDestroy() {
         this.isLeaving = true;
@@ -163,13 +161,15 @@ export default {
         gradeScore() {
 
         },
-        refresh() {
-            this.$refs.queryListPage.refresh(true);
+        afterQuery(data) {
             setTimeout(() => {
                 if (!this.isLeaving) {
                     this.refresh();
                 }
             }, 3000);
+        },
+        refresh() {
+            this.$refs.queryListPage.refresh(true);
         }
         // loadQuestions() {
         //     this.$refs.questionList.doShow();

From f06419e9630ed4767fc12260ba873191e10b36e7 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 25 May 2020 16:38:03 +0800
Subject: [PATCH 21/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A3=81=E5=88=A4?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=BF=9B=E5=85=A5=E4=BB=BF=E7=9C=9F=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competition.js                          |  5 +++--
 src/jmapNew/shape/Station/index.js              |  1 -
 src/utils/baseUrl.js                            |  4 ++--
 src/views/jsxt/refereeList/index.vue            | 10 +++++-----
 src/views/login/index.vue                       |  2 +-
 src/views/newMap/jointTrainingNew/index.vue     |  7 ++++---
 src/views/newMap/jointTrainingNew/menuDemon.vue |  5 +++--
 7 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/api/competition.js b/src/api/competition.js
index eec560f25..8af0f2102 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -64,10 +64,11 @@ export function postSignUp(id, data) {
 }
 
 /** 查询用户是否已经报名该竞赛 */
-export function getIsSignUp(raceId) {
+export function getIsSignUp(raceId, params = {}) {
     return request({
         url: `/api/race/${raceId}/isSignUp`,
-        method: 'get'
+        method: 'get',
+        params
     });
 }
 
diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js
index 77880b13b..ca5433e33 100644
--- a/src/jmapNew/shape/Station/index.js
+++ b/src/jmapNew/shape/Station/index.js
@@ -36,7 +36,6 @@ export default class Station extends Group {
 
         if (model.visible) {
             // 公里标名称是否显示
-            console.log(model.nameFont);
             this.stationText = new ETextName({
                 zlevel: this.zlevel,
                 z: this.z,
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 818fe4147..b62985baa 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,11 +2,11 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip';    // 张赛
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 76722ccd6..2a96bfc84 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -150,16 +150,16 @@ export default {
             }
             return getRaceUserList(params);
         },
-        handleClick(row) {
-            const group = row.room.group;
+        handleClick(index, row) {
+            const group = row.group;
             refereeEnterSimulation(group).then(response=>{
                 const query = { lineCode: '11', mapId: '41', group: group, raceId: this.$route.query.raceId};
-                this.$router.replace({ path: `/jointTrainingNew`, query: query});
+                this.$router.push({ path: `/jointTrainingNew`, query: query});
             });
         },
-        playBack() {
+        playBack(index, row) {
         },
-        gradeScore() {
+        gradeScore(index, row) {
 
         },
         refresh() {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index d3027d9b6..6078dda2d 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -337,7 +337,7 @@ export default {
             removeSessionStorage('againEnter');
             if (this.$route.query.raceId) {
                 if (this.$route.path.includes('jsxt/login')) {
-                    getIsSignUp(this.$route.query.raceId).then(res => {
+                    getIsSignUp(this.$route.query.raceId, { isLogin: true }).then(res => {
                         if (res.data) {
                             setSessionStorage('raceId', this.$route.query.raceId);
                             this.$router.push({ path: this.path, query:{ raceId:this.$route.query.raceId } });
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 074f7db00..0a1412c22 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -363,16 +363,17 @@ export default {
 
             if (this.lineCode) {
                 // 01 现地 02 行调 '' 观众
-                let resp;
+                let resp = {data: {}};
                 if (this.project == 'jsxt' ) {
                     resp = await getRaceUserById(this.$route.query.raceId, this.userId);
                     resp.data.userRole = resp.data.role;
                 } else if (this.project == 'refereeJsxt') {
-                    resp.data.userRole = 'ADMIN';
+                    resp['code'] = 200;
+                    resp.data['userRole'] = 'ADMIN';
                 } else {
                     resp = await this.getUserRole();
                 }
-                console.log('/////////////' + resp.data.userRole);
+                // console.log('/////////////' + resp.data.userRole);
                 if (resp && resp.code == 200) {
                     // Admin 管理员 Instructor 教员 Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号 IBP:IBP盘
                     this.userRole = resp.data.userRole;
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 76125f3a1..2432a3fb7 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -5,7 +5,7 @@
       <el-button-group>
         <el-button v-if="isProject && !dataError " type="primary" @click="setRelDevice">{{ $t('joinTraining.connectRealDevices') }}</el-button>
         <el-button v-if="isDriver && !dataError" type="jumpjlmap3d" @click="jumpjlmap3d">{{ $t('joinTraining.driverPerspective') }}</el-button>
-        <template v-if="isAdmin">
+        <template v-if="isAdmin && project != 'refereeJsxt'">
           <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
           <el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('joinTraining.exitPlan') }}</el-button>
         </template>
@@ -332,7 +332,8 @@ export default {
         },
         refeeEndCompetition() {
             refereeExitSimulation(this.group).then(resp => {
-                this.$router.go(-1);
+                // this.$router.go(-1);
+                this.$router.replace({ path: `/refereeJsxt/home`, query: { raceId:this.$route.query.raceId } });
             }).catch(()=> {
                 this.$message.success('退出系统失败');
             });

From ab8ea5114073677176fe05ba484153f3779946ae Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 16:44:26 +0800
Subject: [PATCH 22/85] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/refereeList/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index c8c578ca8..9956a71df 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -87,19 +87,19 @@ export default {
                                 name: '进入',
                                 handleClick: this.handleClick,
                                 type: '',
-                                showControl: (row) => { return row.status == '02' || row.status == '03'; }
+                                showControl: (row) => { return row.status == '3'; }
                             },
                             {
                                 name: '回放',
                                 handleClick: this.playBack,
                                 type: '',
-                                showControl: (row) => { return row.status == '04'; }
+                                showControl: (row) => { return row.status == '4'; }
                             },
                             {
                                 name: '打分',
                                 handleClick: this.gradeScore,
                                 type: 'success',
-                                showControl: (row) => { return row.status == '04'; }
+                                showControl: (row) => { return row.status == '4'; }
                             }
                         ]
                     }

From 3ec64f3794c6d863045c3bb88d56e9cfa9c0303a Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 25 May 2020 16:52:54 +0800
Subject: [PATCH 23/85] =?UTF-8?q?=E5=88=97=E8=BD=A6=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xian_01/menus/dialog/trainControl.vue     |   4 +-
 .../xian_01/menus/dialog/trainDetail.vue      | 186 ++++++++++++------
 src/jmapNew/theme/xian_01/menus/menuTrain.vue |  28 ++-
 src/scripts/ConstDic.js                       |   7 +-
 4 files changed, 156 insertions(+), 69 deletions(-)

diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
index 6dfc6c38b..9aba8ad7b 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
@@ -21,7 +21,7 @@
         <el-radio-group
           :id="domIdTrainType"
           v-model="formModel.type"
-          style="margin-left: 15px;"
+          style="margin-left: 45px;"
           @change="trainTypeChange"
         >
           <el-radio :label="'PLAN'">{{ $t('menu.planTrain') }}</el-radio>
@@ -30,7 +30,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item v-if="formModel.type == 'PLAN'" prop="serviceNumber">
-        <span slot="label">{{ $t('menu.serviceNumber') }}</span>
+        <span slot="label">{{ $t('menu.serviceNumber') + '：' }}</span>
         <el-input
           :id="domIdServerNo"
           v-model="formModel.serviceNumber"
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
index 32e9ad06e..8e98c0f6f 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
@@ -3,6 +3,8 @@
     <el-select
       v-model="groupNumber"
       filterable
+      size="small"
+      style="width: 100%;"
       :disabled="true"
     >
       <el-option
@@ -12,7 +14,13 @@
         :value="train.groupNumber"
       />
     </el-select>
-    <el-table :data="tableData" :show-header="false">
+    <div style="margin-top: 5px;">
+      <div :class="[tabType==='baseInfo'?'simulate-tabs-button-active':'simulate-tabs-button']" style="margin-right: 6px" @click="changeTabs('baseInfo')">基本信息</div>
+      <div :class="[tabType==='groupInfo'?'simulate-tabs-button-active':'simulate-tabs-button']" style="margin-right: 6px" @click="changeTabs('groupInfo')">车组信息</div>
+      <div :class="[tabType==='planInfo'?'simulate-tabs-button-active':'simulate-tabs-button']" style="margin-right: 6px" @click="changeTabs('planInfo')">计划信息</div>
+      <div :class="[tabType==='atcInfo'?'simulate-tabs-button-active':'simulate-tabs-button']" @click="changeTabs('atcInfo')">ATC信息</div>
+    </div>
+    <el-table :data="tableData" :show-header="false" border style="margin-top: 5px;height: 360px;">
       <el-table-column prop="key" label="key" />
       <el-table-column prop="value" label="value" />
     </el-table>
@@ -32,6 +40,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import Handler from '@/scripts/cmdPlugin/Handler';
 import { menuOperate, commitOperate } from '../utils/menuOperate';
+import {TrainType} from '@/scripts/ConstDic';
 
 export default {
     name: 'TrainControl',
@@ -42,13 +51,14 @@ export default {
             trainList: [],
             tableData: [],
             baseInfo: [],
-            marshallingInfo: [],
+            groupInfo: [],
             planInfo: [],
             atcInfo: [],
             operation: null,
             dialogShow: false,
             loading: false,
-            groupNumber: ''
+            groupNumber: '',
+            tabType: 'baseInfo'
         };
     },
     computed: {
@@ -80,64 +90,7 @@ export default {
             if (!this.dialogShow) {
                 this.operation = operate.operation;
             }
-            const model = this.$store.getters['map/getDeviceByCode'](selected.code);
-            this.groupNumber = model.groupNumber;
-            this.baseInfo = [
-                {key: '车组号', value: model.groupNumber},
-                {key: '车次号', value: ''},
-                {key: '表号', value: ''},
-                {key: '目的地号', value: ''},
-                {key: '类型', value: ''},
-                {key: '司机号', value: ''},
-                {key: '车站', value: ''},
-                {key: '所处设备', value: ''},
-                {key: '跟踪模式', value: ''},
-                {key: 'ATP切除', value: ''},
-                {key: '停站状态', value: ''}
-            ];
-            this.marshallingInfo = [
-                {key: '车组号', value: ''},
-                {key: '设备ID', value: ''},
-                {key: '车头号1', value: ''},
-                {key: '车头号2', value: ''},
-                {key: '车厢号1', value: ''},
-                {key: '车厢号2', value: ''},
-                {key: '车厢号3', value: ''},
-                {key: '车厢号4', value: ''},
-                {key: '车厢号5', value: ''},
-                {key: '车厢号6', value: ''},
-                {key: '车厢号7', value: ''},
-                {key: '车厢号8', value: ''}
-            ];
-            this.planInfo = [
-                {key: '车组号', value: ''},
-                {key: '车次号', value: ''},
-                {key: '表号', value: ''},
-                {key: '运行等级', value: ''},
-                {key: '状态', value: ''},
-                {key: '计划偏离', value: ''},
-                {key: '停站时间', value: ''},
-                {key: '计划到站', value: ''},
-                {key: '计划到点', value: ''},
-                {key: '计划发点', value: ''},
-                {key: '终端发车站台', value: ''},
-                {key: '终端发车时间', value: ''},
-                {key: '预计离开站台', value: ''},
-                {key: '预计离开时间', value: ''},
-                {key: '预计到达站台', value: ''},
-                {key: '预计到达时间', value: ''},
-                {key: '区间运行时分', value: ''}
-            ];
-            this.atcInfo = [
-                {key: '车组号', value: ''},
-                {key: '车次号', value: ''},
-                {key: '表号', value: ''},
-                {key: '运行方向', value: ''},
-                {key: '扣车状态', value: ''},
-                {key: '车门状态', value: ''},
-                {key: '驾驶模式', value: ''},
-                {key: '目的地号', value: ''}
-            ];
+            this.initData(selected);
             this.tableData = this.baseInfo;
             /** 加载列车数据*/
             this.dialogShow = true;
@@ -174,7 +127,118 @@ export default {
             }).catch(() => {
                 this.doClose();
             });
+        },
+        changeTabs(type) {
+            switch (type) {
+            case 'baseInfo':
+                this.tableData = this.baseInfo;
+                this.tabType = 'baseInfo';
+                break;
+            case 'groupInfo':
+                this.tableData = this.groupInfo;
+                this.tabType = 'groupInfo';
+                break;
+            case 'planInfo':
+                this.tableData = this.planInfo;
+                this.tabType = 'planInfo';
+                break;
+            case 'atcInfo':
+                this.tableData = this.atcInfo;
+                this.tabType = 'atcInfo';
+                break;
+            }
+        },
+        initData(model) {
+            this.groupNumber = model.groupNumber;
+            this.baseInfo = [
+                {key: '车组号', value: model.groupNumber},
+                {key: '车次号', value: model.tripNumber},
+                {key: '表号', value: model.serviceNumber},
+                {key: '目的地号', value: model.destinationCode},
+                {key: '类型', value: TrainType[model.type]},
+                {key: '司机号', value: ''},
+                {key: '车站', value: ''},
+                {key: '所处设备', value: ''},
+                {key: '跟踪模式', value: ''},
+                {key: 'ATP切除', value: ''},
+                {key: '停站状态', value: ''}
+            ];
+            this.groupInfo = [
+                {key: '车组号', value: model.groupNumber},
+                {key: '设备ID', value: ''},
+                {key: '车头号1', value: ''},
+                {key: '车头号2', value: ''},
+                {key: '车厢号1', value: ''},
+                {key: '车厢号2', value: ''},
+                {key: '车厢号3', value: ''},
+                {key: '车厢号4', value: ''},
+                {key: '车厢号5', value: ''},
+                {key: '车厢号6', value: ''},
+                {key: '车厢号7', value: ''},
+                {key: '车厢号8', value: ''}
+            ];
+            this.planInfo = [
+                {key: '车组号', value: model.groupNumber},
+                {key: '车次号', value: model.tripNumber},
+                {key: '表号', value: model.serviceNumber},
+                {key: '运行等级', value: model.runLevel},
+                {key: '状态', value: ''},
+                {key: '计划偏离', value: model.dt},
+                {key: '停站时间', value: ''},
+                {key: '计划到站', value: ''},
+                {key: '计划到点', value: ''},
+                {key: '计划发点', value: ''},
+                {key: '终端发车站台', value: ''},
+                {key: '终端发车时间', value: ''},
+                {key: '预计离开站台', value: ''},
+                {key: '预计离开时间', value: ''},
+                {key: '预计到达站台', value: ''},
+                {key: '预计到达时间', value: ''},
+                {key: '区间运行时分', value: ''}
+            ];
+            this.atcInfo = [
+                {key: '车组号', value: model.groupNumber},
+                {key: '车次号', value: model.tripNumber},
+                {key: '表号', value: model.serviceNumber},
+                {key: '运行方向', value: model.right ? '上行' : '下行'},
+                {key: '扣车状态', value: model.runControlStatus === '01' ? '正常' : model.runControlStatus === '03' ? '跳停' : '扣车'},
+                {key: '车门状态', value: model.speed ? '关闭' : '开启'},
+                {key: '驾驶模式', value: 'SM模式'},
+                {key: '目的地号', value: model.destinationCode}
+            ];
         }
     }
 };
 </script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.simulate-tabs-button {
+		display: inline;
+		border-top: solid 1px #FBFAEF;
+		border-left: solid 1px #FBFAEF;
+		border-bottom: solid 1px #858273;
+		border-right: solid 1px #858273;
+		width: 90px;
+		height: 28px;
+		font-size: 14px;
+		line-height: 28px;
+		padding: 2px 10px;
+	}
+	.simulate-tabs-button:active{
+		border-top: solid 1px #858273;
+		border-left: solid 1px #858273;
+		border-bottom: solid 1px #FBFAEF;
+		border-right: solid 1px #FBFAEF;
+	}
+	.simulate-tabs-button-active{
+		display: inline;
+		border-top: solid 1px #858273;
+		border-left: solid 1px #858273;
+		border-bottom: solid 1px #FBFAEF;
+		border-right: solid 1px #FBFAEF;
+		width: 90px;
+		height: 28px;
+		font-size: 14px;
+		line-height: 28px;
+		padding: 2px 10px;
+	}
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
index a211af021..4f5507dc0 100644
--- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
@@ -7,6 +7,7 @@
     <train-move ref="trainMove" />
     <train-switch ref="trainSwitch" />
     <train-edit-number ref="trainEditNumber" />
+    <train-detail ref="trainDetail" />
   </div>
 </template>
 
@@ -22,6 +23,7 @@ import TrainDelete from './dialog/trainDelete';
 import TrainMove from './dialog/trainMove';
 import TrainSwitch from './dialog/trainSwitch';
 import TrainEditNumber from './dialog/trainEditNumber';
+import TrainDetail from './dialog/trainDetail';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
@@ -33,7 +35,8 @@ export default {
         TrainDelete,
         TrainMove,
         TrainSwitch,
-        TrainEditNumber
+        TrainEditNumber,
+        TrainDetail
     },
     props: {
         selected: {
@@ -81,17 +84,17 @@ export default {
                     },
                     {
                         label: '标记ATP切除',
-                        handler: this.undeveloped(),
+                        handler: this.undeveloped,
                         cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_CUT
                     },
                     {
                         label: '标记ATP激活',
-                        handler: this.undeveloped(),
+                        handler: this.undeveloped,
                         cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_RECOVER
                     },
                     {
                         label: '查看列车详细运行信息',
-                        handler: this.undeveloped(),
+                        handler: this.checkTrainDetails,
                         cmdType: CMD.TrainWindow.CMD_TRAIN_INFO
                     }
                 ]
@@ -322,7 +325,6 @@ export default {
         switchTrainId() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.switchTrainId.menu.operation,
                 param: {
                     code: this.selected.code
@@ -334,6 +336,22 @@ export default {
                     this.$refs.trainSwitch.doShow(step, this.selected);
                 }
             });
+        },
+        checkTrainDetails() {
+            const step = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Train.trainDetailInfo.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDetail.doShow(step, this.selected);
+                }
+            });
         }
     }
 };
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index 4b05c1047..9ebfc5c2b 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -2211,7 +2211,12 @@ export const IbpShowCondition = {
     Show_Open_Screen_Door: {statusKey: 'screenDoorOpenStatus', statusValue:['02'], defaultStatus: 'close'},
     Show_Close_Screen_Door: {statusKey: 'screenDoorOpenStatus', statusValue: ['01'], defaultStatus: 'open'}
 };
-
+/** 列车类型 */
+export const TrainType = {
+    PLAN: '计划车',
+    HEAD: '头码车',
+    MANUAL: '人工车'
+};
 export const UrlConfig = {
     display: '/display',
     displayNew: '/displayNew',

From 663f25cddc1e4ae0829fe0c5d5ef18dc71cfbcf3 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 16:56:00 +0800
Subject: [PATCH 24/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/refereeList/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 6d65a8a2e..48c92a888 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -108,7 +108,8 @@ export default {
                     { text: '导入试题', handler: this.handleAdd }
                 ]
             },
-            isLeaving:false
+            isLeaving:false,
+            inter:null
         };
     },
     computed: {
@@ -162,7 +163,8 @@ export default {
 
         },
         afterQuery(data) {
-            setTimeout(() => {
+            clearTimeout(this.inter);
+            this.inter = setTimeout(() => {
                 if (!this.isLeaving) {
                     this.refresh();
                 }

From fe45d9b1ac7b338f77b88d2078edba973763511b Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 25 May 2020 17:07:58 +0800
Subject: [PATCH 25/85] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=A3=E8=BD=A6?=
 =?UTF-8?q?=E8=B7=B3=E5=81=9C=E5=91=BD=E4=BB=A4=E6=8F=90=E7=A4=BA=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/StatusIcon/statusIcon.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/components/StatusIcon/statusIcon.vue b/src/views/components/StatusIcon/statusIcon.vue
index 87ce1efed..0dd3a0901 100644
--- a/src/views/components/StatusIcon/statusIcon.vue
+++ b/src/views/components/StatusIcon/statusIcon.vue
@@ -70,7 +70,7 @@ export default {
                     const station = this.$store.getters['map/getDeviceByCode'](stand.stationCode);
                     const dir = stand.right ? '上行站台' : '下行站台';
                     if (stand) {
-                        this.tip = this.tip + station.name + ':<br>' + dir + '站台存在扣车命令';
+                        this.tip = this.tip + station.name + ':<br>' + dir + '站台存在扣车命令<br>';
                     }
                 });
             }
@@ -89,7 +89,7 @@ export default {
                     const station = this.$store.getters['map/getDeviceByCode'](stand.stationCode);
                     const dir = stand.right ? '上行站台' : '下行站台';
                     if (stand) {
-                        this.tip = this.tip + station.name + ':<br>' + dir + '站台存在跳停命令';
+                        this.tip = this.tip + station.name + ':<br>' + dir + '站台存在跳停命令<br>';
                     }
                 });
             }

From f329e30049e14562ae074dd2beb8717f12a17dcd Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 25 May 2020 17:57:24 +0800
Subject: [PATCH 26/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A5=BF=E5=AE=89?=
 =?UTF-8?q?=E4=B8=80=E4=B8=89=20=E5=8F=B7=E7=BA=BF=E8=B7=AF=20=E5=8F=B3?=
 =?UTF-8?q?=E9=94=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PopMenu/index.vue              |  8 +-
 src/jmapNew/theme/xian_01/menus/index.vue     | 15 ++++
 .../theme/xian_01/menus/menuSection.vue       |  2 +-
 .../theme/xian_01/menus/menuSignal.vue        |  2 +-
 .../theme/xian_01/menus/menuStation.vue       |  2 +-
 .../theme/xian_01/menus/menuStationStand.vue  |  4 +-
 .../theme/xian_01/menus/menuSwitch.vue        |  2 +-
 src/jmapNew/theme/xian_01/menus/menuTrain.vue | 86 +++++++++----------
 src/utils/baseUrl.js                          |  4 +-
 .../newMap/displayNew/chatView/chatBox.vue    |  4 +-
 10 files changed, 73 insertions(+), 56 deletions(-)

diff --git a/src/components/PopMenu/index.vue b/src/components/PopMenu/index.vue
index f982ae27a..c8d1baaf5 100644
--- a/src/components/PopMenu/index.vue
+++ b/src/components/PopMenu/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-show="show" class="pop-menu" :style="{ height: height, left: tPosition.x+'px', top: tPosition.y+'px' }">
+  <div v-show="show" class="pop-menu" :class="popMenuClass" :style="{ height: height, left: tPosition.x+'px', top: tPosition.y+'px' }">
     <div v-for="(item, index) in menu" :key="index" class="" :style="{ width: width }">
       <div v-if="item.children">
         <el-popover
@@ -99,6 +99,12 @@ export default {
             default() {
                 return '';
             }
+        },
+        popMenuClass: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
diff --git a/src/jmapNew/theme/xian_01/menus/index.vue b/src/jmapNew/theme/xian_01/menus/index.vue
index d92cd369d..80e174563 100644
--- a/src/jmapNew/theme/xian_01/menus/index.vue
+++ b/src/jmapNew/theme/xian_01/menus/index.vue
@@ -96,6 +96,21 @@ export default {
         overflow: hidden !important;
     }
 
+	.xian-01__systerm.pop-menu{
+		padding: 0;
+		padding-left: 20px;
+	}
+	.xian-01__systerm.pop-menu .dsp-block {
+		display: block;
+		text-align: left;
+		width: 100%;
+		border-radius: unset;
+		border: 1px solid transparent;
+		color: #000;
+		padding: 6px 6px;
+		border-left: 1px solid #bdbcbc;
+	}
+
     .xian-01__systerm .el-dialog {
         background: rgba(100, 100, 100, 0.3);
         border: 2px solid rgb(144, 144, 144, 0.8);
diff --git a/src/jmapNew/theme/xian_01/menus/menuSection.vue b/src/jmapNew/theme/xian_01/menus/menuSection.vue
index 1589964cd..778ff14f8 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSection.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
     <section-control ref="sectionControl" />
     <section-cmd-control ref="sectionCmdControl" />
     <speed-cmd-control ref="speedCmdControl" />
diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
index 197a15e81..ed06cac66 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
     <route-selection ref="routeSelection" />
     <route-lock ref="routeLock" />
     <route-control ref="routeControl" />
diff --git a/src/jmapNew/theme/xian_01/menus/menuStation.vue b/src/jmapNew/theme/xian_01/menus/menuStation.vue
index dceee489c..ae11724e8 100644
--- a/src/jmapNew/theme/xian_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuStation.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
     <station-cmd-control ref="stationCmdControl" />
     <station-human-control-all ref="stationHumanControlAll" />
     <station-set-route-control-all ref="stationSetRouteControlAll" />
diff --git a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
index e8de5bd4f..56fc78fef 100644
--- a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
     <stand-control ref="standControl" />
     <stand-detail ref="standDetail" />
     <stand-run-level ref="standRunLevel" />
@@ -22,7 +22,7 @@ import StandStopTime from './dialog/standStopTime';
 import StandDetainTrainAll from './dialog/standDetainTrainAll';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+// import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
diff --git a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
index 17aebdcbe..373759158 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
     <switch-control ref="switchControl" />
     <switch-cmd-control ref="switchCmdControl" />
     <speed-cmd-control ref="speedCmdControl" />
diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
index a211af021..0229c381f 100644
--- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
     <notice-info ref="noticeInfo" />
     <train-control ref="trainControl" />
     <train-delete ref="trainDelete" />
@@ -50,48 +50,48 @@ export default {
                 Local: [],
                 Center: [
                     {
-                        label: this.$t('menu.menuTrain.addTrainId'),
-                        handler: this.addTrainId,
-                        cmdType:''
+                        label: '添加列车识别号',
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
-                        label: this.$t('menu.menuTrain.deleteTrainId'),
-                        handler: this.delTrainId,
-                        cmdType:''
+                        label: '删除列车识别号',
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
-                        label: this.$t('menu.menuTrain.editTrainId'),
+                        label: '修改列车识别号',
                         handler: this.editTrainId,
-                        cmdType:CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
-                        label: this.$t('menu.menuTrain.editTrainNo'),
-                        handler: this.editTrainNo,
-                        cmdType:''
+                        label: '修改车组号',
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
-                        label: this.$t('menu.menuTrain.moveTrainId'),
-                        handler: this.moveTrainId,
-                        cmdType:''
+                        label: '移动列车识别号',
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
-                        label: this.$t('menu.menuTrain.switchTrainId'),
-                        handler: this.switchTrainId,
-                        cmdType:''
+                        label: '交换列车识别号',
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
                         label: '标记ATP切除',
-                        handler: this.undeveloped(),
+                        handler: this.undeveloped,
                         cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_CUT
                     },
                     {
                         label: '标记ATP激活',
-                        handler: this.undeveloped(),
+                        handler: this.undeveloped,
                         cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_RECOVER
                     },
                     {
                         label: '查看列车详细运行信息',
-                        handler: this.undeveloped(),
+                        handler: this.undeveloped,
                         cmdType: CMD.TrainWindow.CMD_TRAIN_INFO
                     }
                 ]
@@ -144,10 +144,9 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.menuFiltration(this.menuNormal);
             this.menu = MenuContextHandler.covert(this.menuNormal);
             if (this.operatemode === OperateMode.ADMIN) {
-                this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
+                this.menu = [...this.menu, ...this.menuForce];
             }
 
             // 故障模式菜单列表
@@ -159,28 +158,26 @@ export default {
             this.clickEvent();
             this.initMenu();
 
-            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+            if (this.$refs.popMenu && this.menu && this.menu.length) {
                 this.$refs.popMenu.resetShowPosition(point);
             }
         },
         doClose() {
-            if (this.$refs && this.$refs.popMenu) {
+            if (this.$refs.popMenu) {
                 this.$refs.popMenu.close();
-                // this.$store.dispatch('map/setTrainWindowShow', false);
             }
         },
         // 设置故障
         setStoppage() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.stoppage.menu.operation,
                 cmdType: CMD.Train.CMD_STOPPAGE,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -194,14 +191,13 @@ export default {
         cancelStoppage() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.cancelStoppage.menu.operation,
                 cmdType: CMD.Train.CMD_CANCEL_STOPPAGE,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -215,14 +211,13 @@ export default {
         limitSpeed() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.limitSpeed.menu.operation,
                 cmdType: CMD.Train.CMD_LIMIT_SPEED,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -236,13 +231,12 @@ export default {
         addTrainId() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.addTrainId.menu.operation,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(step, this.selected);
@@ -253,13 +247,12 @@ export default {
         delTrainId() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.delTrainId.menu.operation,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDelete.doShow(step, this.selected);
@@ -270,13 +263,12 @@ export default {
         editTrainId() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.editTrainId.menu.operation,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(step, this.selected);
@@ -287,13 +279,12 @@ export default {
         editTrainNo() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.editTrainNo.menu.operation,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainEditNumber.doShow(step, this.selected);
@@ -304,31 +295,36 @@ export default {
         moveTrainId() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.moveTrainId.menu.operation,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMove.doShow(step, this.selected);
                 }
             });
         },
-        undeveloped() {},
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
         // 交换列车识别号
         switchTrainId() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.switchTrainId.menu.operation,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSwitch.doShow(step, this.selected);
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index b62985baa..818fe4147 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,11 +2,11 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip';    // 张赛
diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue
index 88584b408..64278f6be 100644
--- a/src/views/newMap/displayNew/chatView/chatBox.vue
+++ b/src/views/newMap/displayNew/chatView/chatBox.vue
@@ -88,8 +88,8 @@ export default {
         '$store.state.socket.simulationRoleList': function (val) {
             if (val && val.length) {
                 this.$nextTick(() => {
-                    this.$refs.chatMemberList.setMemberStatus(val);
-                    this.$refs.chatCoversitionList.setCoversitionStatus(val);
+                    this.$refs.chatMemberList && this.$refs.chatMemberList.setMemberStatus(val);
+                    this.$refs.chatCoversitionList && this.$refs.chatCoversitionList.setCoversitionStatus(val);
                 });
             }
         },

From dc33306c965199ee462c1d6fd3750e13a76a390e Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 25 May 2020 18:26:05 +0800
Subject: [PATCH 27/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=82=E8=B5=9B?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=B7=AF=E7=94=B1=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competition.js                      |  6 +-
 src/views/jsxt/competition/examDetail.vue   | 72 ++++++++++++---------
 src/views/newMap/jointTrainingNew/index.vue |  2 +-
 3 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/src/api/competition.js b/src/api/competition.js
index 8af0f2102..dd286df15 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -75,7 +75,7 @@ export function getIsSignUp(raceId, params = {}) {
 /** 分页查询竞赛报名人员 */
 export function getRaceUserList(params) {
     return request({
-        url: `/api/race/${params.raceId}/raceUser`,
+        url: `/api/race/${params.raceId}/raceUser/page`,
         method: 'get',
         params
     });
@@ -108,9 +108,9 @@ export function getCompetitionPractical(competitionId) {
 }
 
 /** 查询竞赛报名人员详情 */
-export function getRaceUserById(raceId, userId) {
+export function getRaceUserById(raceId) {
     return request({
-        url: `/api/race/${raceId}/raceUser/${userId}`,
+        url: `/api/race/${raceId}/raceUser`,
         method: 'get'
     });
 }
diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 5b01cb9d1..03ca871df 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="joylink-card">
     <b class="title-name">{{ examType }}</b>
-    <img class="img_box" :src="applyImg" alt="">
+    <!-- <img class="img_box" :src="applyImg" alt=""> -->
     <div class="btn-start">
       <el-button :disabled="disabled" type="primary" @click="exmaStart">{{ $t('exam.startTheExam') }}</el-button>
     </div>
@@ -15,15 +15,16 @@ import LangStorage from '@/utils/lang';
 import { getPublishMapInfo } from '@/api/jmap/map';
 import ConstConfig from '@/scripts/ConstConfig';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import { participantCreatTrainingRoom, getCompetitionPractical, getPracticalQuestion, getTheoryQuestion } from '@/api/competition';
-import applyImg from '@/assets/apply.png';
+import {getRaceUserById} from '@/api/competition';
+import { participantCreatTrainingRoom, getPracticalQuestion, getTheoryQuestion } from '@/api/competition';
+// import applyImg from '@/assets/apply.png';
 
 export default {
     name: 'ExamDetailView',
     data() {
         return {
             disabled: false,
-            applyImg: applyImg,
+            // applyImg: applyImg,
             examDetails: {
                 lessonId: '',
                 name: '',
@@ -150,29 +151,38 @@ export default {
         },
         async exmaStart() {
             if (this.$route.query.type == 'theory') {
-                getTheoryQuestion(this.$route.query.raceId).then((resp)=>{
-                    if (resp.data) {
-                        this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}?raceId=${this.$route.query.raceId}`);
-                    } else {
-                        this.$messageBox('试卷还没被加载');
-                    }
+                const res = await getRaceUserById(this.$route.query.raceId);
+                if (res.data.status != 4 || res.data.status != 5) {
+                    getTheoryQuestion(this.$route.query.raceId).then((resp)=>{
+                        if (resp.data) {
+                            this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}?raceId=${this.$route.query.raceId}`);
+                        } else {
+                            this.$messageBox('试卷还没被加载');
+                        }
 
-                }).catch(()=>{
-                });
+                    }).catch(()=>{
+                    });
+                } else {
+                    this.$router.replace({ path: `/jsxt/result`, query: { type: 'theory', raceId:this.$route.query.raceId } });
+                }
             } else {
-                getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
-                    if (responese.data) {
-                        participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
-                        // const query = { lineCode: '11', mapId: '41', group: resp.data, prdType: '03', raceId: this.$route.query.raceId};
-                        // this.$router.replace({ path: `/displayNew/demon`, query: query});
-                            const query = { lineCode: '11', mapId: '41', group: resp.data, raceId: this.$route.query.raceId};
-                            this.$router.replace({ path: `/jointTrainingNew`, query: query});
-                        });
-                    } else {
-                        this.$messageBox('试卷还没被加载');
-                    }
-
-                });
+                const res = await getRaceUserById(this.$route.query.raceId);
+                if (res.data.status != 4 || res.data.status != 6) {
+                    getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
+                        if (responese.data) {
+                            participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
+                                // const query = { lineCode: '11', mapId: '41', group: resp.data, prdType: '03', raceId: this.$route.query.raceId};
+                                // this.$router.replace({ path: `/displayNew/demon`, query: query});
+                                const query = { lineCode: '11', mapId: '41', group: resp.data, raceId: this.$route.query.raceId};
+                                this.$router.replace({ path: `/jointTrainingNew`, query: query});
+                            });
+                        } else {
+                            this.$messageBox('试卷还没被加载');
+                        }
+                    });
+                } else {
+                    this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate', raceId:this.$route.query.raceId } });
+                }
             }
         }
     }
@@ -196,11 +206,15 @@ export default {
 			height: 100%;
 		}
 		.title-name{
-			position: absolute;
-			left: 50%;
-			top: 66px;
-			transform: translateX(-80px);
+			// position: absolute;
+			// left: 50%;
+			// top: 66px;
+			// transform: translateX(-80px);
 			font-size: 30px;
+			text-align: center;
+			width: 100%;
+			margin-top: 50px;
+			display: block;
 		}
 	}
 	.img_box{
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 0a1412c22..e6cd8932b 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -365,7 +365,7 @@ export default {
                 // 01 现地 02 行调 '' 观众
                 let resp = {data: {}};
                 if (this.project == 'jsxt' ) {
-                    resp = await getRaceUserById(this.$route.query.raceId, this.userId);
+                    resp = await getRaceUserById(this.$route.query.raceId);
                     resp.data.userRole = resp.data.role;
                 } else if (this.project == 'refereeJsxt') {
                     resp['code'] = 200;

From 1db4c0e1938b44f5d6c68989a1de4951ce1f3144 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 18:32:59 +0800
Subject: [PATCH 28/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/apply/index.vue       | 55 +++++++++++++++-------------
 src/views/jsxt/refereeList/index.vue | 14 +++++--
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/src/views/jsxt/apply/index.vue b/src/views/jsxt/apply/index.vue
index 99693b5f2..1d9757474 100644
--- a/src/views/jsxt/apply/index.vue
+++ b/src/views/jsxt/apply/index.vue
@@ -56,15 +56,30 @@
     <template v-else>
       <div v-if="flag" class="apply_box">
         <div class="img_box"><img :src="SAFS" alt=""></div>
-        <i class="el-icon-success" style="color: green; font-size: 40px;" />
-        <span class="title">报名成功!</span>
+        <div style="width: 100%;text-align:center;margin-top:120px;"><i class="el-icon-success" style="color: green; font-size: 100px;" /></div>
+        <div style="width: 100%;margin-top: 25px;">
+          <div class="apply_box_title">报名成功! 您的报名信息如下:<br>姓名：{{ formModel.name }}
+            <br>公司：{{ formModel.company }}
+            <br>部门：{{ formModel.department }}
+            <br>职位：{{ formModel.job }}
+            <br>电话：{{ formModel.phone.replace(/^(\d{3})\d{4}(\d+)/,"$1****$2") }}
+          </div>
+        </div>
       </div>
       <div v-if="!flag" class="applyAready_box">
         <div class="img_box"><img :src="SAFS" alt=""></div>
-        <div><img :src="applyAlready" class="applyAlready"></div>
-        <div><span style="margin-left:10px;">请按时参加竞赛！</span></div>
+        <div style="width: 100%;text-align:center;margin-top:120px;"><img :src="applyAlready" class="applyAlready"></div>
+        <div style="width: 100%;margin-top: 25px;">
+          <div class="apply_box_title">
+            您的报名信息如下:<br>姓名：{{ formModel.name }}
+            <br>公司：{{ formModel.company }}
+            <br>部门：{{ formModel.department }}
+            <br>职位：{{ formModel.job }}
+            <br>电话：{{ formModel.phone.replace(/^(\d{3})\d{4}(\d+)/,"$1****$2") }}
+          </div>
+        </div>
       </div>
-    </template>
+    </template></div></template>
   </div>
 </template>
 
@@ -389,15 +404,8 @@ export default {
         width:150px;
     }
 	.applyAready_box{
-		padding-top: 95px;
 	}
-    .applyAready_box div{
-        width:100%;
-        text-align:center;
-        font-size: 25px;
-    }
 	.dictionary_box{
-		padding-top: 10px;
 		.joylink-card{
 			width: 800px;
 			margin: 0 auto 20px;
@@ -410,9 +418,6 @@ export default {
 		}
 	}
 	.img_box{
-		position: absolute;
-		top: 0;
-		left: 0;
 		width: 100%;
 		height: 80px;
 		img{
@@ -421,18 +426,18 @@ export default {
 		}
 	}
 	.apply_box{
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin-top: 95px;
+		// display: flex;
+		// justify-content: center;
+		// align-items: center;
 		font-size: 25px;
-		.title{
-			margin-left: 7px;
-			text-align: left;
-			font-size: 25px;
-			width: auto;
-		}
 	}
+    .apply_box_title{
+			font-size: 22px;
+            line-height: 35px;
+            margin-left: 50%;
+            transform: translateX(-50%);
+            display: inline-block;
+		}
 	/deep/{
 		.dialog-apply{
 			.el-form-item{
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 48c92a888..c147d8212 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -69,8 +69,16 @@ export default {
                         tagType: (row) => { return 'success'; }
                     },
                     {
-                        title: '分数',
-                        prop: 'score'
+                        title: '理论分数',
+                        prop: 'theoryScore'
+                    },
+                    {
+                        title: '实操分数',
+                        prop: 'practiceScore'
+                    },
+                    {
+                        title: '总数',
+                        prop: 'totalScore'
                     },
                     // {
                     //     title: '竞赛名称',
@@ -96,7 +104,7 @@ export default {
                                 showControl: (row) => { return row.status == '4'; }
                             },
                             {
-                                name: '打分',
+                                name: '修改',
                                 handleClick: this.gradeScore,
                                 type: 'success',
                                 showControl: (row) => { return row.status == '4'; }

From 83192e2bd59f2e600fb90fbae34cc06723df2b92 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 18:33:36 +0800
Subject: [PATCH 29/85] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/chatView/chatBox.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue
index 88584b408..f1e4a9172 100644
--- a/src/views/newMap/displayNew/chatView/chatBox.vue
+++ b/src/views/newMap/displayNew/chatView/chatBox.vue
@@ -88,6 +88,7 @@ export default {
         '$store.state.socket.simulationRoleList': function (val) {
             if (val && val.length) {
                 this.$nextTick(() => {
+                    debugger;  
                     this.$refs.chatMemberList.setMemberStatus(val);
                     this.$refs.chatCoversitionList.setCoversitionStatus(val);
                 });

From c667b7f9800e81ecc0d683c869e24ead26e28288 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 May 2020 18:50:38 +0800
Subject: [PATCH 30/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/apply/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/jsxt/apply/index.vue b/src/views/jsxt/apply/index.vue
index 1d9757474..8a4e5db1f 100644
--- a/src/views/jsxt/apply/index.vue
+++ b/src/views/jsxt/apply/index.vue
@@ -72,10 +72,10 @@
         <div style="width: 100%;margin-top: 25px;">
           <div class="apply_box_title">
             您的报名信息如下:<br>姓名：{{ formModel.name }}
-            <br>公司：{{ formModel.company }}
+            <br>公司：{{ formModel.organization }}
             <br>部门：{{ formModel.department }}
-            <br>职位：{{ formModel.job }}
-            <br>电话：{{ formModel.phone.replace(/^(\d{3})\d{4}(\d+)/,"$1****$2") }}
+            <br>职位：{{ formModel.position }}
+            <br>电话：{{ formModel.mobile.replace(/^(\d{3})\d{4}(\d+)/,"$1****$2") }}
           </div>
         </div>
       </div>
@@ -91,8 +91,7 @@ import md5 from 'js-md5';
 import Cookies from 'js-cookie';
 import QrcodeVue from 'qrcode.vue';
 import { getUserinfoMobileCode } from '@/api/management/user';
-import { postSignUp } from '@/api/competition';
-import { getIsSignUp } from '@/api/competition';
+import { postSignUp, getRaceUserById } from '@/api/competition';
 import applyAlready from '@/assets/applyAlready.png';
 import SAFS from '@/assets/SAFS.png';
 
@@ -205,9 +204,10 @@ export default {
                     if (this.checkLogin) {
                         this.clearTimer(this.checkLogin);
                     }
-                    getIsSignUp(this.$route.query.raceId).then(res => {
+                    getRaceUserById(this.$route.query.raceId).then(res => {
                         if (res.data) {
                             // 已经报名过
+                            this.formModel = res.data;
                             this.applyFlag = false;
                             this.flag = false;
                         }

From f27c766b9bd4df89bf6a644dfbd16f23dbc44283 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 26 May 2020 09:21:48 +0800
Subject: [PATCH 31/85] =?UTF-8?q?=E5=88=97=E8=BD=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/bejing_01.js  |  1 +
 src/jmapNew/config/skinCode/chengdu_01.js |  1 +
 src/jmapNew/config/skinCode/chengdu_03.js |  1 +
 src/jmapNew/config/skinCode/foshan_01.js  |  1 +
 src/jmapNew/config/skinCode/fuzhou_01.js  |  1 +
 src/jmapNew/config/skinCode/haerbin_01.js |  1 +
 src/jmapNew/config/skinCode/ningbo_01.js  |  1 +
 src/jmapNew/config/skinCode/xian_01.js    |  4 +++-
 src/jmapNew/config/skinCode/xian_02.js    |  1 +
 src/jmapNew/shape/Train/TrainBody.js      | 24 +++++++++++------------
 src/utils/baseUrl.js                      |  4 ++--
 11 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js
index 8f04180af..7907c9965 100644
--- a/src/jmapNew/config/skinCode/bejing_01.js
+++ b/src/jmapNew/config/skinCode/bejing_01.js
@@ -542,6 +542,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 0.1, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [
diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js
index c0b5f44c5..f95bfdceb 100644
--- a/src/jmapNew/config/skinCode/chengdu_01.js
+++ b/src/jmapNew/config/skinCode/chengdu_01.js
@@ -492,6 +492,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 1, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [], // 特殊列车类型需设置显示格式
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index 1a5c48806..e9c64c29a 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -660,6 +660,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 1, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [
diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js
index 721c8d51f..2c5e629be 100644
--- a/src/jmapNew/config/skinCode/foshan_01.js
+++ b/src/jmapNew/config/skinCode/foshan_01.js
@@ -524,6 +524,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 0, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [
diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index effcfd54a..721c93775 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -516,6 +516,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 0, // 车身line宽
                 changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [
diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js
index ece44059c..4ddba9dab 100644
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@@ -541,6 +541,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 2, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [
diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 74722abc0..521b51b5f 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -522,6 +522,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 1, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [], // 特殊列车类型需设置显示格式
diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js
index 5df4e33b7..8953afb6d 100644
--- a/src/jmapNew/config/skinCode/xian_01.js
+++ b/src/jmapNew/config/skinCode/xian_01.js
@@ -546,6 +546,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 0, // 车身line宽
                 changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [
@@ -575,7 +576,8 @@ class SkinCode extends defaultStyle {
                 normalColor: '#FFF'
             },
             hsda: {
-                trainHSDATextFontSize: 8// 列车HDSA字号
+                trainHSDATextFontSize: 8, // 列车HDSA字号
+                upPaddingHSDA: 0
             },
             trainNumber: {
                 targetCodePrefix: '000', // 目的地码前缀
diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js
index bdb8c587f..504339c51 100644
--- a/src/jmapNew/config/skinCode/xian_02.js
+++ b/src/jmapNew/config/skinCode/xian_02.js
@@ -660,6 +660,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 2, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [], // 特殊列车类型需设置显示格式
diff --git a/src/jmapNew/shape/Train/TrainBody.js b/src/jmapNew/shape/Train/TrainBody.js
index 4ab351b62..be043e588 100644
--- a/src/jmapNew/shape/Train/TrainBody.js
+++ b/src/jmapNew/shape/Train/TrainBody.js
@@ -59,7 +59,7 @@ export default class TrainBody extends Group {
             text: style.Train.hsda.textHContent,
             textFill: style.trainYellowColor,
             fontSize: style.Train.hsda.trainHSDATextFontSize,
-            fontFamily: style.fontFamily,
+            fontFamily: style.Train.common.fontFamily,
             textAlign: 'middle',
             textVerticalAlign: 'top'
         }) : '';
@@ -71,7 +71,7 @@ export default class TrainBody extends Group {
             text: style.Train.hsda.textSContent,
             textFill: style.trainBlueColor,
             fontSize: style.Train.hsda.trainHSDATextFontSize,
-            fontFamily: style.fontFamily,
+            fontFamily: style.Train.common.fontFamily,
             textAlign: 'middle',
             textVerticalAlign: 'top'
         }) : '';
@@ -83,7 +83,7 @@ export default class TrainBody extends Group {
             text: style.Train.hsda.textDContent,
             textFill: style.trainGreenColor,
             fontSize: style.Train.hsda.trainHSDATextFontSize,
-            fontFamily: style.fontFamily,
+            fontFamily: style.Train.common.fontFamily,
             textAlign: 'middle',
             textVerticalAlign: 'top'
         }) : '';
@@ -95,7 +95,7 @@ export default class TrainBody extends Group {
             text: style.Train.hsda.textAContent,
             textFill: style.trainRedColor,
             fontSize: style.Train.hsda.trainHSDATextFontSize,
-            fontFamily: style.fontFamily,
+            fontFamily: style.Train.common.fontFamily,
             textAlign: 'middle',
             textVerticalAlign: 'top'
         }) : '';
@@ -113,7 +113,7 @@ export default class TrainBody extends Group {
             text: serviceNumber.substring(serviceNumber.length - style.Train.trainServer.serviceNumberPrefix.length),
             textFill: model.style.Train.trainServer.fontColor || style.trainTextColor,
             fontSize: model.fontSize,
-            fontFamily: style.fontFamily,
+            fontFamily: style.Train.common.fontFamily,
             textAlign: 'left',
             textVerticalAlign: 'top'
         });
@@ -125,7 +125,7 @@ export default class TrainBody extends Group {
             text: tripNumber.substring(tripNumber.length - style.Train.trainTarget.tripNumberPrefix.length),
             textFill: model.style.Train.trainTarget.fontColor || style.trainTextColor,
             fontSize: model.fontSize,
-            fontFamily: style.fontFamily,
+            fontFamily: style.Train.common.fontFamily,
             textAlign: 'left',
             textVerticalAlign: 'top'
         });
@@ -139,7 +139,7 @@ export default class TrainBody extends Group {
             textStroke: style.trainTextColor,
             textStrokeWidth: 0,
             fontSize: model.fontSize,
-            fontFamily: style.fontFamily,
+            fontFamily: style.Train.common.fontFamily,
             textAlign: 'left',
             textVerticalAlign: 'top'
         });
@@ -153,7 +153,7 @@ export default class TrainBody extends Group {
             textStroke: style.trainTextColor,
             textStrokeWidth: 0,
             fontSize: model.fontSize,
-            fontFamily: style.fontFamily,
+            fontFamily: style.Train.common.fontFamily,
             textAlign: 'left',
             textVerticalAlign: 'top'
         });
@@ -193,7 +193,7 @@ export default class TrainBody extends Group {
                 textStroke: style.trainTextColor,
                 textStrokeWidth: 0,
                 fontSize: model.fontSize,
-                fontFamily: style.fontFamily,
+                fontFamily: style.Train.common.fontFamily,
                 textAlign: 'left',
                 textVerticalAlign: 'top'
             });
@@ -210,7 +210,7 @@ export default class TrainBody extends Group {
                 textStroke: style.trainTextColor,
                 textStrokeWidth: 0,
                 fontSize: model.fontSize,
-                fontFamily: style.fontFamily,
+                fontFamily: style.Train.common.fontFamily,
                 textAlign: 'left',
                 textVerticalAlign: 'top'
             });
@@ -227,7 +227,7 @@ export default class TrainBody extends Group {
                 textStroke: style.trainTextColor,
                 textStrokeWidth: 0,
                 fontSize: model.fontSize,
-                fontFamily: style.fontFamily,
+                fontFamily: style.Train.common.fontFamily,
                 textAlign: 'left',
                 textVerticalAlign: 'top'
             });
@@ -244,7 +244,7 @@ export default class TrainBody extends Group {
                 textStroke: style.trainTextColor,
                 textStrokeWidth: 0,
                 fontSize: model.fontSize,
-                fontFamily: style.fontFamily,
+                fontFamily: style.Train.common.fontFamily,
                 textAlign: 'left',
                 textVerticalAlign: 'top'
             });
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index b62985baa..818fe4147 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,11 +2,11 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip';    // 张赛

From d10fccb624b7f9030f2f7f22db24dcfabbab1b69 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 26 May 2020 09:43:09 +0800
Subject: [PATCH 32/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baseUrl.js                      | 4 ++--
 src/views/jsxt/competition/examDetail.vue | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 818fe4147..b62985baa 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,11 +2,11 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip';    // 张赛
diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 03ca871df..66e7429c9 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -152,7 +152,7 @@ export default {
         async exmaStart() {
             if (this.$route.query.type == 'theory') {
                 const res = await getRaceUserById(this.$route.query.raceId);
-                if (res.data.status != 4 || res.data.status != 5) {
+                if (res.data.status != 4 && res.data.status != 5) {
                     getTheoryQuestion(this.$route.query.raceId).then((resp)=>{
                         if (resp.data) {
                             this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}?raceId=${this.$route.query.raceId}`);
@@ -167,7 +167,8 @@ export default {
                 }
             } else {
                 const res = await getRaceUserById(this.$route.query.raceId);
-                if (res.data.status != 4 || res.data.status != 6) {
+                console.log(res.data);
+                if (res.data.status != 4 && res.data.status != 6) {
                     getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
                         if (responese.data) {
                             participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {

From 66ad2223211fc8da7a5a00002c2b6e4b7fb5c587 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 26 May 2020 09:51:24 +0800
Subject: [PATCH 33/85] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/competition/examDetail.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 66e7429c9..0accd17a7 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -167,7 +167,6 @@ export default {
                 }
             } else {
                 const res = await getRaceUserById(this.$route.query.raceId);
-                console.log(res.data);
                 if (res.data.status != 4 && res.data.status != 6) {
                     getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
                         if (responese.data) {

From 681e67468f40f1c946363af71f19c44a7ab6010f Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 May 2020 10:18:54 +0800
Subject: [PATCH 34/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competition.js                        |  8 +++++++
 src/views/jsxt/apply/index.vue                | 22 ++++++++++++++++---
 src/views/jsxt/refereeList/index.vue          |  2 +-
 .../newMap/jointTrainingNew/chatContent.vue   | 11 +++++-----
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/api/competition.js b/src/api/competition.js
index dd286df15..eff437a1a 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -130,3 +130,11 @@ export function getTheoryQuestion(competitionId) {
         method: 'get'
     });
 }
+
+/** 根据id查询竞赛信息 */
+export function getRaceById(id) {
+    return request({
+        url: `/api/race/${id}`,
+        method: 'get'
+    });
+}
diff --git a/src/views/jsxt/apply/index.vue b/src/views/jsxt/apply/index.vue
index 8a4e5db1f..e4d904b09 100644
--- a/src/views/jsxt/apply/index.vue
+++ b/src/views/jsxt/apply/index.vue
@@ -58,7 +58,10 @@
         <div class="img_box"><img :src="SAFS" alt=""></div>
         <div style="width: 100%;text-align:center;margin-top:120px;"><i class="el-icon-success" style="color: green; font-size: 100px;" /></div>
         <div style="width: 100%;margin-top: 25px;">
-          <div class="apply_box_title">报名成功! 您的报名信息如下:<br>姓名：{{ formModel.name }}
+          <div class="apply_box_title">报名成功!:<br> 您的赛事信息如下:
+            <br>竞赛名称：{{ compition.name }}
+            <br>竞赛时间：{{ compition.startDate }}
+            <br>姓名：{{ formModel.name }}
             <br>公司：{{ formModel.company }}
             <br>部门：{{ formModel.department }}
             <br>职位：{{ formModel.job }}
@@ -71,7 +74,10 @@
         <div style="width: 100%;text-align:center;margin-top:120px;"><img :src="applyAlready" class="applyAlready"></div>
         <div style="width: 100%;margin-top: 25px;">
           <div class="apply_box_title">
-            您的报名信息如下:<br>姓名：{{ formModel.name }}
+            您的赛事信息如下:
+            <br>竞赛名称：{{ compition.name }}
+            <br>竞赛时间：{{ compition.startDate }}
+            <br>姓名：{{ formModel.name }}
             <br>公司：{{ formModel.organization }}
             <br>部门：{{ formModel.department }}
             <br>职位：{{ formModel.position }}
@@ -91,7 +97,7 @@ import md5 from 'js-md5';
 import Cookies from 'js-cookie';
 import QrcodeVue from 'qrcode.vue';
 import { getUserinfoMobileCode } from '@/api/management/user';
-import { postSignUp, getRaceUserById } from '@/api/competition';
+import { postSignUp, getRaceUserById, getRaceById } from '@/api/competition';
 import applyAlready from '@/assets/applyAlready.png';
 import SAFS from '@/assets/SAFS.png';
 
@@ -148,6 +154,10 @@ export default {
                 department: '', // 部门
                 phone: '', // 电话
                 phoneCode: '' // 验证码
+            },
+            compition:{
+                name:'',
+                startDate:''
             }
         };
     },
@@ -207,6 +217,9 @@ export default {
                     getRaceUserById(this.$route.query.raceId).then(res => {
                         if (res.data) {
                             // 已经报名过
+                            getRaceById(this.$route.query.raceId).then(res=>{
+                                this.compition = res.data;
+                            });
                             this.formModel = res.data;
                             this.applyFlag = false;
                             this.flag = false;
@@ -351,6 +364,9 @@ export default {
                 if (this.$route.query.raceId) {
                     postSignUp(this.$route.query.raceId, param).then(res => {
                         // this.$messageBox('报名成功！');
+                        getRaceById(this.$route.query.raceId).then(res=>{
+                            this.compition = res.data;
+                        });
                         this.applyFlag = false;
                         this.flag = true;
                     }).catch(error => {
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index c147d8212..e4f4afd62 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -77,7 +77,7 @@ export default {
                         prop: 'practiceScore'
                     },
                     {
-                        title: '总数',
+                        title: '总分',
                         prop: 'totalScore'
                     },
                     // {
diff --git a/src/views/newMap/jointTrainingNew/chatContent.vue b/src/views/newMap/jointTrainingNew/chatContent.vue
index fcbde11ff..2bca5bdc6 100644
--- a/src/views/newMap/jointTrainingNew/chatContent.vue
+++ b/src/views/newMap/jointTrainingNew/chatContent.vue
@@ -125,13 +125,14 @@ export default {
         playEachAudio(index) {
             this.$nextTick(function() {
                 document.querySelector('#audio' + index).play();
+                const that = this;
                 document.querySelector('#audio' + index).onended = function() {
-                    this.currentAudioList.shift();
-                    if (this.currentAudioList.length > 0) {
-                        this.currentAudioIndex++;
-                        this.playEachAudio(this.currentAudioList[this.currentAudioIndex]);
+                    that.currentAudioList.shift();
+                    if (that.currentAudioList.length > 0) {
+                        that.currentAudioIndex++;
+                        that.playEachAudio(that.currentAudioList[that.currentAudioIndex]);
                     } else {
-                        this.isPlay = false;
+                        that.isPlay = false;
                     }
                 };
             });

From c1cead347574676880d9cd237a064acfd9117f1b Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 26 May 2020 10:30:11 +0800
Subject: [PATCH 35/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=A5=E5=90=8D?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=8A=A5=E5=90=8D=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baseUrl.js           | 4 ++--
 src/views/jsxt/apply/index.vue | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index b62985baa..818fe4147 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,11 +2,11 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip';    // 张赛
diff --git a/src/views/jsxt/apply/index.vue b/src/views/jsxt/apply/index.vue
index 8a4e5db1f..905bef590 100644
--- a/src/views/jsxt/apply/index.vue
+++ b/src/views/jsxt/apply/index.vue
@@ -355,6 +355,7 @@ export default {
                         this.flag = true;
                     }).catch(error => {
                         console.log(error);
+                        this.$messageBox(error.message);
                     });
                 } else {
                     this.$messageBox('报名地址有问题，请检查');

From ae9cce355781e00a88c8a42638210b99bba1ab7b Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 26 May 2020 11:10:37 +0800
Subject: [PATCH 36/85] =?UTF-8?q?LCD=E5=B1=8F=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iscs/iscsSystem/config/pis/lcdControl.vue | 97 +++++++++++++++++--
 1 file changed, 87 insertions(+), 10 deletions(-)

diff --git a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue
index 68b60815b..27af4ddd9 100644
--- a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue
+++ b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue
@@ -1,19 +1,31 @@
 <template>
   <div class="iscs_lcd_box" style="width: 100%;height: 100%; position: relative;">
     <div class="lcdControl_title">LCD控制屏</div>
-    <div class="area_select">
+    <div class="area_select" style="margin-top: 110px;">
       <div class="area_select_title">特定区域</div>
       <div class="area_select_button">全线</div>
     </div>
-    <div class="area_select" style="top: 27%;">
+    <div class="area_select" style="margin-top: 200px;">
       <div>
-        <el-radio v-model="lcdSwitch" :label="true" size="small" border>开启LCD屏</el-radio>
+        <el-radio v-model="lcdSwitch" :label="true" size="small" border style="margin-left: 12px;margin-bottom: 5px;margin-top: 10px;">开启LCD屏</el-radio>
         <br>
         <el-radio v-model="lcdSwitch" :label="false" size="small" border>关闭LCD屏</el-radio>
       </div>
-      <div>确定</div>
+      <div class="area_select_button" style="margin-top: 20px;">确定</div>
+    </div>
+
+    <div class="lcd_content_box">
+      <div style="display: inline-block;">
+        <div class="lcd_content_box_left_title">车站</div>
+        <div class="lcd_content_box_left_title">选择</div>
+      </div>
+      <div v-for="(station, index) in stationList" :key="index" style="display: inline-block;text-align: center;">
+        <div class="each_station_info">{{ station }}</div>
+        <div class="button_default_content">
+          <div class="button_default" :style="{background:selectedAreaList.includes(station.stationName + '-' + index)?'#2EFF74':'#CDCDCD'}" />
+        </div>
+      </div>
     </div>
-    <div />
   </div>
 </template>
 <script>
@@ -22,7 +34,8 @@ export default {
         return {
             columns: ['车站', '选择'],
             stationList: ['会展中心站', '世纪大道站', '交通大学站', '市图书馆站', '中心医院站', '未来路站', '火车站', '人民广场站', '体育中心站'],
-            lcdSwitch: true
+            lcdSwitch: true,
+            selectedAreaList:[]
         };
     }
 };
@@ -41,10 +54,8 @@ export default {
 	}
 	.area_select {
 		position: absolute;
-		top: 15%;
 		left: 25%;
 		width: 120px;
-		/*height: 70px;*/
 		border-top: 3px solid #898888;
 		border-left: 3px solid #898888;
 		border-right: 3px solid #fff;
@@ -58,17 +69,74 @@ export default {
 	}
 	.area_select_button {
 		text-align: center;
-		width: 80px;
+		width: 90px;
 		height: 30px;
 		background: #A9A9A9;
 		border-top: 2px solid #FFF;
 		border-left: 2px solid #FFF;
 		border-right: 2px solid #898888;
 		border-bottom: 2px solid #898888;
-		margin: 5px 18px 10px;
+		margin: 5px 12px 10px;
 		font-size: 14px;
 		line-height: 30px;
 	}
+	.each_station_info{
+		/*display: inline-block;*/
+		vertical-align:top;
+		font-size: 13px;
+		padding: 2px 2px;
+		background: #A9A9A9;
+		border-top: 2px solid #FFF;
+		border-left: 2px solid #FFF;
+		border-right: 2px solid #898888;
+		border-bottom: 2px solid #898888;
+		margin-right: 5px;
+	}
+	.lcd_content_box{
+		margin-top: 110px;
+		width: 700px;
+		height: 330px;
+		position: absolute;
+		left: 35%;
+		border-top: 3px solid #898888;
+		border-left: 3px solid #898888;
+		border-right: 3px solid #fff;
+		border-bottom: 3px solid #fff;
+		padding-top: 10px;
+		padding-left: 10px;
+		overflow-x: auto;
+	}
+	.lcd_content_box_left_title{
+		vertical-align:top;
+		font-size: 13px;
+		color: #CBFFFF;
+		padding: 10px 10px 5px;
+	}
+	.button_default_content{
+		margin-top: 5px;
+		height: 18px;
+		width: 18px;
+		background: #D4D4D4;
+		display: inline-block;
+		border-top: 2px solid #fff;
+		border-left: 2px solid #fff;
+		border-right: 2px solid #898888;
+		border-bottom: 2px solid #898888;
+		text-align: center;
+	}
+	.button_default{
+		height: 10px;
+		width: 10px;
+		margin: auto;
+		background:#CCCCCC;
+		position: relative;
+		top: 50%;
+		transform: translateY(-50%);
+		border-top: 2px solid #fff;
+		border-left: 2px solid #fff;
+		border-right: 2px solid #898888;
+		border-bottom: 2px solid #898888;
+	}
 </style>
 <style lang="scss">
 	.iscs_lcd_box .el-radio.is-bordered.is-checked {
@@ -95,4 +163,13 @@ export default {
 	.iscs_lcd_box .el-radio__input.is-checked+.el-radio__label {
 		color: #FFF;
 	}
+	.iscs_lcd_box .el-radio__input.is-checked .el-radio__inner{
+		background: #FFF;
+	}
+	.iscs_lcd_box .el-radio__input.is-checked .el-radio__inner::after{
+		background: #1E84C7;
+	}
+	.iscs_lcd_box .el-radio--small.is-bordered {
+		padding: 8px 5px 0 0;
+	}
 </style>

From 83343d54b8fd06cc0e957862df5bcf4b2add3ea8 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 26 May 2020 12:11:59 +0800
Subject: [PATCH 37/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/competition/examDetail.vue | 78 +++++++++++++----------
 1 file changed, 43 insertions(+), 35 deletions(-)

diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 0accd17a7..5dd2b83a4 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -1,10 +1,12 @@
 <template>
   <div class="joylink-card">
-    <b class="title-name">{{ examType }}</b>
-    <!-- <img class="img_box" :src="applyImg" alt=""> -->
-    <div class="btn-start">
-      <el-button :disabled="disabled" type="primary" @click="exmaStart">{{ $t('exam.startTheExam') }}</el-button>
-    </div>
+    <template v-if="resultFlag">
+      <b class="title-name">{{ examType }}</b>
+      <!-- <img class="img_box" :src="applyImg" alt=""> -->
+      <div class="btn-start">
+        <el-button :disabled="disabled" type="primary" @click="exmaStart">{{ $t('exam.startTheExam') }}</el-button>
+      </div>
+    </template>
   </div>
 </template>
 <script>
@@ -41,6 +43,7 @@ export default {
             examList: [],
             trainingOperateTypeMap: {},
             drawWay: false,
+            resultFlag: false,
             lineCode: '' // 线路对应的皮肤
         };
     },
@@ -55,10 +58,14 @@ export default {
     watch: {
         '$route.params.examId': function (val) {
             this.loadInitPage(val);
+        },
+        $route() {
+            this.getUserStatus();
         }
     },
     async mounted() {
         // this.loadInitPage(this.$route.params.examId);
+        this.getUserStatus();
     },
     methods: {
         async getList() {
@@ -149,40 +156,41 @@ export default {
                 }
             }
         },
+        async getUserStatus() {
+            this.resultFlag = false;
+            const res = await getRaceUserById(this.$route.query.raceId);
+            // console.log(res.data.status);
+            if (this.$route.query.type == 'theory' && (res.data.status == 4 || res.data.status == 5)) {
+                this.$router.replace({ path: `/jsxt/result`, query: { type: 'theory', raceId:this.$route.query.raceId } });
+            } else if (this.$route.query.type == 'operation' && (res.data.status == 4 || res.data.status == 6)) {
+                this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate', raceId:this.$route.query.raceId } });
+            } else {
+                this.resultFlag = true;
+            }
+        },
         async exmaStart() {
             if (this.$route.query.type == 'theory') {
-                const res = await getRaceUserById(this.$route.query.raceId);
-                if (res.data.status != 4 && res.data.status != 5) {
-                    getTheoryQuestion(this.$route.query.raceId).then((resp)=>{
-                        if (resp.data) {
-                            this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}?raceId=${this.$route.query.raceId}`);
-                        } else {
-                            this.$messageBox('试卷还没被加载');
-                        }
+                getTheoryQuestion(this.$route.query.raceId).then((resp)=>{
+                    if (resp.data) {
+                        this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}?raceId=${this.$route.query.raceId}`);
+                    } else {
+                        this.$messageBox('试卷还没被加载');
+                    }
 
-                    }).catch(()=>{
-                    });
-                } else {
-                    this.$router.replace({ path: `/jsxt/result`, query: { type: 'theory', raceId:this.$route.query.raceId } });
-                }
+                }).catch(()=>{});
             } else {
-                const res = await getRaceUserById(this.$route.query.raceId);
-                if (res.data.status != 4 && res.data.status != 6) {
-                    getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
-                        if (responese.data) {
-                            participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
-                                // const query = { lineCode: '11', mapId: '41', group: resp.data, prdType: '03', raceId: this.$route.query.raceId};
-                                // this.$router.replace({ path: `/displayNew/demon`, query: query});
-                                const query = { lineCode: '11', mapId: '41', group: resp.data, raceId: this.$route.query.raceId};
-                                this.$router.replace({ path: `/jointTrainingNew`, query: query});
-                            });
-                        } else {
-                            this.$messageBox('试卷还没被加载');
-                        }
-                    });
-                } else {
-                    this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate', raceId:this.$route.query.raceId } });
-                }
+                getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
+                    if (responese.data) {
+                        participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
+                            // const query = { lineCode: '11', mapId: '41', group: resp.data, prdType: '03', raceId: this.$route.query.raceId};
+                            // this.$router.replace({ path: `/displayNew/demon`, query: query});
+                            const query = { lineCode: '11', mapId: '41', group: resp.data, raceId: this.$route.query.raceId};
+                            this.$router.replace({ path: `/jointTrainingNew`, query: query});
+                        });
+                    } else {
+                        this.$messageBox('试卷还没被加载');
+                    }
+                });
             }
         }
     }

From a35426409733dc56ae39cf1d5b18318d2d7de2ec Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 May 2020 13:03:37 +0800
Subject: [PATCH 38/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competition.js                                         | 3 +--
 src/components/QueryListPage/QueryListPage.vue                 | 2 +-
 src/iscs/constant/iscsData.js                                  | 2 +-
 src/views/iscs/iscsDraw/iscsBasOperate/volumeControlDamper.vue | 2 +-
 src/views/jsxt/refereeList/index.vue                           | 1 +
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/api/competition.js b/src/api/competition.js
index eff437a1a..b10384334 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -76,8 +76,7 @@ export function getIsSignUp(raceId, params = {}) {
 export function getRaceUserList(params) {
     return request({
         url: `/api/race/${params.raceId}/raceUser/page`,
-        method: 'get',
-        params
+        method: 'get'
     });
 }
 
diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue
index fa0365d2f..132a02c8d 100644
--- a/src/components/QueryListPage/QueryListPage.vue
+++ b/src/components/QueryListPage/QueryListPage.vue
@@ -142,7 +142,7 @@
           @click="queryList.selectAllClick(queryList.selection)"
         >{{ $t('global.selectAdd') }}</el-button>
       </div>
-      <div class="page-container " style="text-align: center; margin: 10px 0; height: 40px;">
+      <div v-if="!queryList.paginationHiden" class="page-container " style="text-align: center; margin: 10px 0; height: 40px;">
         <el-pagination
           :current-page="pageIndex"
           :page-sizes="[10, 20, 50, 100] "
diff --git a/src/iscs/constant/iscsData.js b/src/iscs/constant/iscsData.js
index 1dd16f9e9..ae89ddb24 100644
--- a/src/iscs/constant/iscsData.js
+++ b/src/iscs/constant/iscsData.js
@@ -5,7 +5,7 @@ const iscsData = {
     '21': {
         'iscsLineList':[{'point1':{'x':72, 'y':51}, 'point2':{'x':72, 'y':171}, 'code':'IscsLine_1', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':72, 'y':51}}, {'point1':{'x':72, 'y':286}, 'point2':{'x':72, 'y':381}, 'code':'IscsLine_2', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':72, 'y':286}}, {'point1':{'x':71, 'y':381}, 'point2':{'x':161, 'y':381}, 'code':'IscsLine_3', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':71, 'y':381}}, {'point1':{'x':181, 'y':381}, 'point2':{'x':196, 'y':381}, 'code':'IscsLine_4', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':181, 'y':381}}, {'point1':{'x':51, 'y':471}, 'point2':{'x':1041, 'y':471}, 'code':'IscsLine_5', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':51, 'y':471}}, {'point1':{'x':382, 'y':51}, 'point2':{'x':382, 'y':471}, 'code':'IscsLine_6', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':382, 'y':51}}, {'point1':{'x':442, 'y':41}, 'point2':{'x':442, 'y':186}, 'code':'IscsLine_7', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':442, 'y':41}}, {'point1':{'x':442, 'y':196}, 'point2':{'x':442, 'y':356}, 'code':'IscsLine_8', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':442, 'y':196}}, {'point1':{'x':442, 'y':366}, 'point2':{'x':442, 'y':596}, 'code':'IscsLine_9', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':442, 'y':366}}, {'point1':{'x':652, 'y':41}, 'point2':{'x':652, 'y':186}, 'code':'IscsLine_10', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':652, 'y':41}}, {'point1':{'x':652, 'y':196}, 'point2':{'x':652, 'y':596}, 'code':'IscsLine_11', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':652, 'y':196}}, {'point1':{'x':737, 'y':51}, 'point2':{'x':737, 'y':186}, 'code':'IscsLine_12', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':737, 'y':51}}, {'point1':{'x':737, 'y':196}, 'point2':{'x':737, 'y':470}, 'code':'IscsLine_13', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':737, 'y':196}}, {'point1':{'x':72, 'y':301}, 'point2':{'x':102, 'y':301}, 'code':'IscsLine_14', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':72, 'y':301}}, {'point1':{'x':152, 'y':301}, 'point2':{'x':162, 'y':301}, 'code':'IscsLine_15', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':152, 'y':301}}, {'point1':{'x':181, 'y':301}, 'point2':{'x':196, 'y':301}, 'code':'IscsLine_16', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':181, 'y':301}}, {'point1':{'x':210, 'y':171}, 'point2':{'x':210, 'y':281}, 'code':'IscsLine_22', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':210, 'y':171}}, {'point1':{'x':225, 'y':341}, 'point2':{'x':245, 'y':341}, 'code':'IscsLine_23', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':225, 'y':341}}, {'point1':{'x':315, 'y':341}, 'point2':{'x':390, 'y':341}, 'code':'IscsLine_24', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':315, 'y':341}}, {'point1':{'x':405, 'y':341}, 'point2':{'x':450, 'y':341}, 'code':'IscsLine_25', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':405, 'y':341}}, {'point1':{'x':465, 'y':341}, 'point2':{'x':485, 'y':341}, 'code':'IscsLine_26', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':465, 'y':341}}, {'point1':{'x':610, 'y':341}, 'point2':{'x':630, 'y':341}, 'code':'IscsLine_27', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':610, 'y':341}}, {'point1':{'x':645, 'y':341}, 'point2':{'x':745, 'y':341}, 'code':'IscsLine_28', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':645, 'y':341}}, {'point1':{'x':760, 'y':341}, 'point2':{'x':800, 'y':341}, 'code':'IscsLine_29', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':760, 'y':341}}, {'point1':{'x':365, 'y':171}, 'point2':{'x':365, 'y':511}, 'code':'IscsLine_30', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':365, 'y':171}}, {'point1':{'x':365, 'y':511}, 'point2':{'x':525, 'y':511}, 'code':'IscsLine_31', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':365, 'y':511}}, {'point1':{'x':555, 'y':511}, 'point2':{'x':675, 'y':511}, 'code':'IscsLine_32', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':511}}, {'point1':{'x':675, 'y':170}, 'point2':{'x':675, 'y':510}, 'code':'IscsLine_33', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':675, 'y':170}}, {'point1':{'x':485, 'y':296}, 'point2':{'x':485, 'y':386}, 'code':'IscsLine_34', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':296}}, {'point1':{'x':610, 'y':296}, 'point2':{'x':610, 'y':386}, 'code':'IscsLine_35', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':610, 'y':296}}, {'point1':{'x':485, 'y':296}, 'point2':{'x':545, 'y':296}, 'code':'IscsLine_36', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':296}}, {'point1':{'x':485, 'y':326}, 'point2':{'x':545, 'y':326}, 'code':'IscsLine_37', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':326}}, {'point1':{'x':485, 'y':356}, 'point2':{'x':545, 'y':356}, 'code':'IscsLine_38', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#2AF5E6', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':356}}, {'point1':{'x':485, 'y':386}, 'point2':{'x':545, 'y':386}, 'code':'IscsLine_39', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#2AF5E6', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':386}}, {'point1':{'x':555, 'y':296}, 'point2':{'x':610, 'y':296}, 'code':'IscsLine_40', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':296}}, {'point1':{'x':555, 'y':326}, 'point2':{'x':610, 'y':326}, 'code':'IscsLine_41', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':326}}, {'point1':{'x':555, 'y':356}, 'point2':{'x':610, 'y':356}, 'code':'IscsLine_42', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#2AF5E6', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':356}}, {'point1':{'x':555, 'y':386}, 'point2':{'x':610, 'y':386}, 'code':'IscsLine_43', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#2AF5E6', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':386}}, {'point1':{'x':347, 'y':380}, 'point2':{'x':347, 'y':575}, 'code':'IscsLine_44', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':347, 'y':380}}, {'point1':{'x':346, 'y':575}, 'point2':{'x':357, 'y':575}, 'code':'IscsLine_45', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':346, 'y':575}}, {'point1':{'x':372, 'y':575}, 'point2':{'x':392, 'y':575}, 'code':'IscsLine_46', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':372, 'y':575}}, {'point1':{'x':407, 'y':575}, 'point2':{'x':542, 'y':575}, 'code':'IscsLine_47', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':407, 'y':575}}, {'point1':{'x':567, 'y':575}, 'point2':{'x':727, 'y':575}, 'code':'IscsLine_48', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':567, 'y':575}}, {'point1':{'x':742, 'y':575}, 'point2':{'x':767, 'y':575}, 'code':'IscsLine_49', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':742, 'y':575}}, {'point1':{'x':767, 'y':341}, 'point2':{'x':767, 'y':575}, 'code':'IscsLine_50', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':767, 'y':341}}, {'point1':{'x':867, 'y':341}, 'point2':{'x':890, 'y':341}, 'code':'IscsLine_51', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':867, 'y':341}}, {'point1':{'x':920, 'y':381}, 'point2':{'x':935, 'y':381}, 'code':'IscsLine_52', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':920, 'y':381}}, {'point1':{'x':951, 'y':381}, 'point2':{'x':1045, 'y':381}, 'code':'IscsLine_53', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':951, 'y':381}}, {'point1':{'x':1045, 'y':286}, 'point2':{'x':1045, 'y':381}, 'code':'IscsLine_54', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1045, 'y':286}}, {'point1':{'x':1045, 'y':51}, 'point2':{'x':1045, 'y':171}, 'code':'IscsLine_55', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1045, 'y':51}}, {'point1':{'x':1020, 'y':51}, 'point2':{'x':1020, 'y':171}, 'code':'IscsLine_56', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1020, 'y':51}}, {'point1':{'x':990, 'y':171}, 'point2':{'x':1021, 'y':171}, 'code':'IscsLine_57', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':990, 'y':171}}, {'point1':{'x':941, 'y':171}, 'point2':{'x':973, 'y':171}, 'code':'IscsLine_58', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':941, 'y':171}}, {'point1':{'x':859, 'y':171}, 'point2':{'x':869, 'y':171}, 'code':'IscsLine_59', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':859, 'y':171}}, {'point1':{'x':829, 'y':171}, 'point2':{'x':842, 'y':171}, 'code':'IscsLine_60', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':829, 'y':171}}, {'point1':{'x':731, 'y':171}, 'point2':{'x':772, 'y':171}, 'code':'IscsLine_61', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':731, 'y':171}}, {'point1':{'x':701, 'y':171}, 'point2':{'x':713, 'y':171}, 'code':'IscsLine_62', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':701, 'y':171}}, {'point1':{'x':671, 'y':171}, 'point2':{'x':686, 'y':171}, 'code':'IscsLine_63', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':671, 'y':171}}, {'point1':{'x':636, 'y':171}, 'point2':{'x':651, 'y':171}, 'code':'IscsLine_64', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':636, 'y':171}}, {'point1':{'x':561, 'y':171}, 'point2':{'x':619, 'y':171}, 'code':'IscsLine_65', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':561, 'y':171}}, {'point1':{'x':112, 'y':51}, 'point2':{'x':112, 'y':171}, 'code':'IscsLine_66', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':112, 'y':51}}, {'point1':{'x':112, 'y':171}, 'point2':{'x':122, 'y':171}, 'code':'IscsLine_67', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':112, 'y':171}}, {'point1':{'x':142, 'y':171}, 'point2':{'x':152, 'y':171}, 'code':'IscsLine_68', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':142, 'y':171}}, {'point1':{'x':167, 'y':171}, 'point2':{'x':227, 'y':171}, 'code':'IscsLine_69', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':167, 'y':171}}, {'point1':{'x':284, 'y':171}, 'point2':{'x':294, 'y':171}, 'code':'IscsLine_70', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':284, 'y':171}}, {'point1':{'x':314, 'y':171}, 'point2':{'x':329, 'y':171}, 'code':'IscsLine_71', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':314, 'y':171}}, {'point1':{'x':346, 'y':171}, 'point2':{'x':390, 'y':171}, 'code':'IscsLine_72', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':346, 'y':171}}, {'point1':{'x':407, 'y':171}, 'point2':{'x':415, 'y':171}, 'code':'IscsLine_73', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':407, 'y':171}}, {'point1':{'x':431, 'y':171}, 'point2':{'x':450, 'y':171}, 'code':'IscsLine_74', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':431, 'y':171}}, {'point1':{'x':468, 'y':171}, 'point2':{'x':532, 'y':171}, 'code':'IscsLine_75', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':468, 'y':171}}, {'point1':{'x':1015, 'y':301}, 'point2':{'x':1045, 'y':301}, 'code':'IscsLine_76', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1015, 'y':301}}, {'point1':{'x':950, 'y':301}, 'point2':{'x':960, 'y':301}, 'code':'IscsLine_77', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':950, 'y':301}}, {'point1':{'x':920, 'y':301}, 'point2':{'x':930, 'y':301}, 'code':'IscsLine_78', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':920, 'y':301}}, {'point1':{'x':905, 'y':261}, 'point2':{'x':905, 'y':281}, 'code':'IscsLine_79', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':905, 'y':261}}, {'point1':{'x':905, 'y':225}, 'point2':{'x':905, 'y':245}, 'code':'IscsLine_80', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':905, 'y':225}}, {'point1':{'x':1071, 'y':223}, 'point2':{'x':1071, 'y':241}, 'code':'IscsLine_81', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1071, 'y':223}}], 'iscsRectList':[{'point':{'x':52, 'y':171}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':40, 'height':115, 'zlevel':1, 'z':3}, {'point':{'x':195, 'y':281}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#A39A9A', 'width':30, 'height':111, 'zlevel':1, 'z':3}, {'point':{'x':890, 'y':281}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#A39A9A', 'width':30, 'height':111, 'zlevel':1, 'z':3}, {'point':{'x':1025, 'y':171}, 'code':'IscsRect_4', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':40, 'height':115, 'zlevel':1, 'z':3}, {'point':{'x':870, 'y':146}, 'code':'IscsRect_5', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#A39A9A', 'width':70, 'height':45, 'zlevel':1, 'z':3}], 'iscsTextList':[{'point':{'x':64, 'y':180}, 'code':'IscsText_1', '_type':'IscsText', 'context':'新\n\n\n风\n\n\n道', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':202, 'y':290}, 'code':'IscsText_2', '_type':'IscsText', 'context':'混\n\n\n风\n\n\n室', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':481, 'y':492}, 'code':'IscsText_3', '_type':'IscsText', 'context':'站台回排风/排烟风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':515, 'y':279}, 'code':'IscsText_4', '_type':'IscsText', 'context':'站厅送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':515, 'y':309}, 'code':'IscsText_5', '_type':'IscsText', 'context':'站厅送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':515, 'y':340}, 'code':'IscsText_6', '_type':'IscsText', 'context':'站厅送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':515, 'y':370}, 'code':'IscsText_7', '_type':'IscsText', 'context':'站厅送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':523, 'y':556}, 'code':'IscsText_8', '_type':'IscsText', 'context':'站台送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':53, 'y':451}, 'code':'IscsText_9', '_type':'IscsText', 'context':'站厅层', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':53, 'y':482}, 'code':'IscsText_10', '_type':'IscsText', 'context':'站台层', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':293, 'y':53}, 'code':'IscsText_11', '_type':'IscsText', 'context':'左端环控机房', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':758, 'y':53}, 'code':'IscsText_12', '_type':'IscsText', 'context':'右端环控机房', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':386, 'y':53}, 'code':'IscsText_13', '_type':'IscsText', 'context':'左端管理\n 用房区', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':678, 'y':53}, 'code':'IscsText_14', '_type':'IscsText', 'context':'右端管理\n 用房区', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':456, 'y':55}, 'code':'IscsText_15', '_type':'IscsText', 'context':'公共区', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':598, 'y':54}, 'code':'IscsText_16', '_type':'IscsText', 'context':'公共区', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':897, 'y':290}, 'code':'IscsText_17', '_type':'IscsText', 'context':'混\n\n\n风\n\n\n室', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1039, 'y':180}, 'code':'IscsText_18', '_type':'IscsText', 'context':'新\n\n\n风\n\n\n道', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1036, 'y':37}, 'code':'IscsText_19', '_type':'IscsText', 'context':'新风井', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':993, 'y':37}, 'code':'IscsText_20', '_type':'IscsText', 'context':'排风井', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':877, 'y':164}, 'code':'IscsText_21', '_type':'IscsText', 'context':'回排风室', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':47, 'y':37}, 'code':'IscsText_22', '_type':'IscsText', 'context':'新风井', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':96, 'y':37}, 'code':'IscsText_23', '_type':'IscsText', 'context':'排风井', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':130, 'y':131}, 'code':'IscsText_24', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':123, 'y':119}, 'code':'IscsText_25', '_type':'IscsText', 'context':'MD-4', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':158, 'y':138}, 'code':'IscsText_26', '_type':'IscsText', 'context':'FD2-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':156, 'y':195}, 'code':'IscsText_27', '_type':'IscsText', 'context':'FD1-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':150, 'y':239}, 'code':'IscsText_28', '_type':'IscsText', 'context':'MD-3', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':214, 'y':220}, 'code':'IscsText_29', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':179, 'y':268}, 'code':'IscsText_30', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':145, 'y':262}, 'code':'IscsText_31', '_type':'IscsText', 'context':'MD-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':111, 'y':271}, 'code':'IscsText_32', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':136, 'y':356}, 'code':'IscsText_33', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':259, 'y':135}, 'code':'IscsText_34', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':307, 'y':133}, 'code':'IscsText_35', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':415, 'y':129}, 'code':'IscsText_36', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':653, 'y':131}, 'code':'IscsText_37', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':711, 'y':131}, 'code':'IscsText_38', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':809, 'y':135}, 'code':'IscsText_39', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':984, 'y':133}, 'code':'IscsText_40', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':770, 'y':301}, 'code':'IscsText_41', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':300}, 'code':'IscsText_42', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':682, 'y':401}, 'code':'IscsText_43', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':795, 'y':425}, 'code':'IscsText_44', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':388, 'y':408}, 'code':'IscsText_45', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':368, 'y':384}, 'code':'IscsText_46', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':347, 'y':314}, 'code':'IscsText_47', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':286, 'y':302}, 'code':'IscsText_48', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':425, 'y':302}, 'code':'IscsText_49', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':472, 'y':150}, 'code':'IscsText_50', '_type':'IscsText', 'context':'站厅回风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':550, 'y':150}, 'code':'IscsText_51', '_type':'IscsText', 'context':'站厅回风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':357, 'y':543}, 'code':'IscsText_52', '_type':'IscsText', 'context':'FD1-9', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':396, 'y':543}, 'code':'IscsText_53', '_type':'IscsText', 'context':'FD1-10', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':715, 'y':543}, 'code':'IscsText_54', '_type':'IscsText', 'context':'FD1-11', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':385, 'y':448}, 'code':'IscsText_55', '_type':'IscsText', 'context':'FD2-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':612, 'y':444}, 'code':'IscsText_56', '_type':'IscsText', 'context':'FD2-7', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':612, 'y':415}, 'code':'IscsText_57', '_type':'IscsText', 'context':'MD-14', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':707, 'y':422}, 'code':'IscsText_58', '_type':'IscsText', 'context':'MD-19', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':720, 'y':384}, 'code':'IscsText_59', '_type':'IscsText', 'context':'FD1-7', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':388, 'y':421}, 'code':'IscsText_60', '_type':'IscsText', 'context':'MD-8', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':280, 'y':397}, 'code':'IscsText_61', '_type':'IscsText', 'context':'MD-17', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':291, 'y':367}, 'code':'IscsText_62', '_type':'IscsText', 'context':'FD1-4', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':375, 'y':308}, 'code':'IscsText_63', '_type':'IscsText', 'context':'FD1-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':402, 'y':286}, 'code':'IscsText_64', '_type':'IscsText', 'context':'MD-16', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':317, 'y':302}, 'code':'IscsText_65', '_type':'IscsText', 'context':'MD-5', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':239, 'y':302}, 'code':'IscsText_66', '_type':'IscsText', 'context':'AHU-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':146, 'y':342}, 'code':'IscsText_67', '_type':'IscsText', 'context':'MD-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':98, 'y':257}, 'code':'IscsText_68', '_type':'IscsText', 'context':'FAF-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':446, 'y':361}, 'code':'IscsText_69', '_type':'IscsText', 'context':'FD1-3', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':615, 'y':310}, 'code':'IscsText_70', '_type':'IscsText', 'context':'FD1-6', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':686, 'y':287}, 'code':'IscsText_71', '_type':'IscsText', 'context':'MD-18', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':757, 'y':289}, 'code':'IscsText_72', '_type':'IscsText', 'context':'MD-15', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':726, 'y':312}, 'code':'IscsText_73', '_type':'IscsText', 'context':'FD1-5', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':799, 'y':304}, 'code':'IscsText_74', '_type':'IscsText', 'context':'AHU-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':974, 'y':119}, 'code':'IscsText_75', '_type':'IscsText', 'context':'MD-12', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':837, 'y':135}, 'code':'IscsText_76', '_type':'IscsText', 'context':'FD2-8', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':755, 'y':122}, 'code':'IscsText_77', '_type':'IscsText', 'context':'RAF/SEF-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':711, 'y':119}, 'code':'IscsText_78', '_type':'IscsText', 'context':'MD-13', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':654, 'y':118}, 'code':'IscsText_79', '_type':'IscsText', 'context':'MD-11', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':674, 'y':141}, 'code':'IscsText_80', '_type':'IscsText', 'context':'FD2-6', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':614, 'y':140}, 'code':'IscsText_81', '_type':'IscsText', 'context':'FD2-5', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':470, 'y':177}, 'code':'IscsText_82', '_type':'IscsText', 'context':'FD2-4', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':410, 'y':113}, 'code':'IscsText_83', '_type':'IscsText', 'context':'MD-7', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':374, 'y':141}, 'code':'IscsText_84', '_type':'IscsText', 'context':'FD2-3', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':332, 'y':141}, 'code':'IscsText_85', '_type':'IscsText', 'context':'FD2-9', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':288, 'y':120}, 'code':'IscsText_86', '_type':'IscsText', 'context':'MD-6', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':204, 'y':121}, 'code':'IscsText_87', '_type':'IscsText', 'context':'RAF/SEF-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':952, 'y':347}, 'code':'IscsText_88', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':945, 'y':264}, 'code':'IscsText_89', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':911, 'y':230}, 'code':'IscsText_90', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':998, 'y':264}, 'code':'IscsText_91', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':847, 'y':211}, 'code':'IscsText_92', '_type':'IscsText', 'context':'FD1-8', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':839, 'y':251}, 'code':'IscsText_93', '_type':'IscsText', 'context':'MD-20', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':930, 'y':251}, 'code':'IscsText_94', '_type':'IscsText', 'context':'MD-10', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':976, 'y':250}, 'code':'IscsText_95', '_type':'IscsText', 'context':'FAF-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':947, 'y':333}, 'code':'IscsText_96', '_type':'IscsText', 'context':'MD-9', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':844, 'y':304}, 'code':'IscsText_97', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}], 'volumeControlDamperList':[{'point':{'x':161, 'y':355}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_1', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':161, 'y':278}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_2', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':184, 'y':231}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_3', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':325, 'y':315}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_4', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':412, 'y':314}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_5', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':695, 'y':314}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_6', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':770, 'y':314}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_7', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':320, 'y':385}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_8', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':342, 'y':411}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_9', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':656, 'y':413}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_10', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':748, 'y':419}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_11', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':933, 'y':355}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_12', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':973, 'y':145}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_13', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':712, 'y':145}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_14', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':651, 'y':145}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_15', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':122, 'y':144}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_16', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':294, 'y':144}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_17', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':415, 'y':144}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_18', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':930, 'y':274}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_19', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':880, 'y':241}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_20', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}], 'ventilatorList':[{'point':{'x':103, 'y':282}, '_type':'Ventilator', 'code':'Ventilator_1', 'width':50, 'isRight':true, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':773, 'y':150}, '_type':'Ventilator', 'code':'Ventilator_2', 'width':55, 'isRight':true, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':227, 'y':150}, '_type':'Ventilator', 'code':'Ventilator_3', 'width':55, 'isRight':false, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':959, 'y':280}, '_type':'Ventilator', 'code':'Ventilator_4', 'width':55, 'isRight':false, 'color':'#00ff00', 'zlevel':1, 'z':4}], 'fireDamperList':[{'point':{'x':195, 'y':195}, '_type':'FireDamper', 'code':'FireDamper_1', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':389, 'y':325}, '_type':'FireDamper', 'code':'FireDamper_2', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':449, 'y':326}, '_type':'FireDamper', 'code':'FireDamper_3', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':630, 'y':326}, '_type':'FireDamper', 'code':'FireDamper_4', 'width':15, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':745, 'y':326}, '_type':'FireDamper', 'code':'FireDamper_5', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':332, 'y':365}, '_type':'FireDamper', 'code':'FireDamper_6', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':358, 'y':559}, '_type':'FireDamper', 'code':'FireDamper_7', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':392, 'y':559}, '_type':'FireDamper', 'code':'FireDamper_8', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':727, 'y':560}, '_type':'FireDamper', 'code':'FireDamper_9', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':752, 'y':398}, '_type':'FireDamper', 'code':'FireDamper_10', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':890, 'y':209}, '_type':'FireDamper', 'code':'FireDamper_11', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}], 'airConditionerList':[{'point':{'x':238, 'y':321}, '_type':'AirConditioner', 'code':'AirConditioner_1', 'width':75, 'isRight':true, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':800, 'y':317}, '_type':'AirConditioner', 'code':'AirConditioner_2', 'width':75, 'isRight':false, 'color':'#00ff00', 'zlevel':1, 'z':4}], 'smookExhaustFdList':[{'point':{'x':350, 'y':445}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_1', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':660, 'y':445}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_2', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':843, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_3', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_4', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':620, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_5', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':153, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_6', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':330, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_7', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':391, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_8', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':452, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_9', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}], 'iscsButtonList':[{'point':{'x':1030, 'y':25}, 'code':'IscsButton_1', '_type':'IscsButton', 'levelPadding':30, 'verticalPadding':5, 'context':'图元说明', 'function':'GraphicEle', 'fontSize':14, 'zlevel':1, 'z':4}]
     }, '22':{
-        'iscsRectList':[{'point':{'x':60, 'y':30}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':150, 'y':30}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':240, 'y':30}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':330, 'y':30}, 'code':'IscsRect_4', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':555, 'y':30}, 'code':'IscsRect_5', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':125, 'height':115, 'zlevel':1, 'z':3}, {'point':{'x':680, 'y':30}, 'code':'IscsRect_6', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':355, 'height':135, 'zlevel':1, 'z':3}, {'point':{'x':60, 'y':135}, 'code':'IscsRect_7', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':110, 'height':150, 'zlevel':1, 'z':3}, {'point':{'x':170, 'y':135}, 'code':'IscsRect_8', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':45, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':215, 'y':135}, 'code':'IscsRect_9', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':45, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':170, 'y':205}, 'code':'IscsRect_10', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':80, 'zlevel':1, 'z':3}], 'iscsLineList':[{'point1':{'x':80, 'y':50}, 'point2':{'x':495, 'y':50}, 'code':'IscsLine_1', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':80, 'y':50}}, {'point1':{'x':505, 'y':50}, 'point2':{'x':560, 'y':50}, 'code':'IscsLine_2', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':505, 'y':50}}]
+        'iscsRectList':[{'point':{'x':60, 'y':30}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':150, 'y':30}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':240, 'y':30}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':330, 'y':30}, 'code':'IscsRect_4', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':555, 'y':30}, 'code':'IscsRect_5', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':125, 'height':115, 'zlevel':1, 'z':3}, {'point':{'x':680, 'y':30}, 'code':'IscsRect_6', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':355, 'height':135, 'zlevel':1, 'z':3}, {'point':{'x':60, 'y':135}, 'code':'IscsRect_7', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':110, 'height':150, 'zlevel':1, 'z':3}, {'point':{'x':170, 'y':135}, 'code':'IscsRect_8', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':45, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':215, 'y':135}, 'code':'IscsRect_9', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':45, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':170, 'y':205}, 'code':'IscsRect_10', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':80, 'zlevel':1, 'z':3}, {'point':{'x':770, 'y':35}, 'code':'IscsRect_11', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':40, 'height':30, 'zlevel':1, 'z':3}, {'point':{'x':50, 'y':420}, 'code':'IscsRect_12', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':35, 'height':110, 'zlevel':1, 'z':3}, {'point':{'x':85, 'y':420}, 'code':'IscsRect_13', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':70, 'height':110, 'zlevel':1, 'z':3}], 'iscsLineList':[{'point1':{'x':79, 'y':50}, 'point2':{'x':495, 'y':50}, 'code':'IscsLine_1', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':79, 'y':50}}, {'point1':{'x':505, 'y':50}, 'point2':{'x':560, 'y':50}, 'code':'IscsLine_2', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':505, 'y':50}}, {'point1':{'x':575, 'y':50}, 'point2':{'x':685, 'y':50}, 'code':'IscsLine_3', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':575, 'y':50}}, {'point1':{'x':700, 'y':50}, 'point2':{'x':735, 'y':50}, 'code':'IscsLine_4', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':700, 'y':50}}, {'point1':{'x':750, 'y':50}, 'point2':{'x':770, 'y':50}, 'code':'IscsLine_5', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':750, 'y':50}}, {'point1':{'x':810, 'y':50}, 'point2':{'x':830, 'y':50}, 'code':'IscsLine_6', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':810, 'y':50}}, {'point1':{'x':80, 'y':50}, 'point2':{'x':80, 'y':100}, 'code':'IscsLine_7', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':80, 'y':50}}, {'point1':{'x':80, 'y':114}, 'point2':{'x':80, 'y':155}, 'code':'IscsLine_8', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':80, 'y':114}}, {'point1':{'x':90, 'y':185}, 'point2':{'x':90, 'y':205}, 'code':'IscsLine_9', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':90, 'y':185}}, {'point1':{'x':90, 'y':223}, 'point2':{'x':90, 'y':238}, 'code':'IscsLine_10', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':90, 'y':223}}, {'point1':{'x':90, 'y':255}, 'point2':{'x':90, 'y':310}, 'code':'IscsLine_11', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':90, 'y':255}}, {'point1':{'x':89, 'y':310}, 'point2':{'x':475, 'y':310}, 'code':'IscsLine_12', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':89, 'y':310}}, {'point1':{'x':194, 'y':314}, 'point2':{'x':194, 'y':330}, 'code':'IscsLine_13', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':194, 'y':314}}, {'point1':{'x':195, 'y':330}, 'point2':{'x':94, 'y':330}, 'code':'IscsLine_14', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':195, 'y':330}}, {'point1':{'x':94, 'y':330}, 'point2':{'x':94, 'y':480}, 'code':'IscsLine_15', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':94, 'y':330}}, {'point1':{'x':64, 'y':480}, 'point2':{'x':449, 'y':480}, 'code':'IscsLine_16', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':64, 'y':480}}], 'fireDamperList':[{'point':{'x':560, 'y':36}, '_type':'FireDamper', 'code':'FireDamper_1', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':36}, '_type':'FireDamper', 'code':'FireDamper_2', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':68, 'y':100}, '_type':'FireDamper', 'code':'FireDamper_3', 'width':25, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':75, 'y':239}, '_type':'FireDamper', 'code':'FireDamper_4', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}], 'volumeControlDamperList':[{'point':{'x':735, 'y':34}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_1', 'width':15, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':67, 'y':201}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_2', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}], 'orbitalVentilatorList':[], 'airConditionerList':[{'point':{'x':826, 'y':33}, '_type':'AirConditioner', 'code':'AirConditioner_1', 'width':70, 'isRight':true, 'color':'#00ff00', 'zlevel':1, 'z':4}]
     },
     '31': {'platformScreenDoorList':[{'point':{'x':135, 'y':225}, 'code':'PlatformScreenDoor_1', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':198, 'y':225}, 'code':'PlatformScreenDoor_2', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':324, 'y':225}, 'code':'PlatformScreenDoor_4', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':260, 'y':225}, 'code':'PlatformScreenDoor_5', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':385, 'y':225}, 'code':'PlatformScreenDoor_6', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':448, 'y':225}, 'code':'PlatformScreenDoor_7', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':512, 'y':225}, 'code':'PlatformScreenDoor_8', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':576, 'y':225}, 'code':'PlatformScreenDoor_9', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':830, 'y':225}, 'code':'PlatformScreenDoor_10', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':767, 'y':225}, 'code':'PlatformScreenDoor_11', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':702, 'y':225}, 'code':'PlatformScreenDoor_12', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':639, 'y':225}, 'code':'PlatformScreenDoor_13', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1330, 'y':225}, 'code':'PlatformScreenDoor_14', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1267, 'y':225}, 'code':'PlatformScreenDoor_15', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1205, 'y':225}, 'code':'PlatformScreenDoor_16', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1143, 'y':225}, 'code':'PlatformScreenDoor_17', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1080, 'y':225}, 'code':'PlatformScreenDoor_18', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1017, 'y':225}, 'code':'PlatformScreenDoor_19', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':955, 'y':225}, 'code':'PlatformScreenDoor_20', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':892, 'y':225}, 'code':'PlatformScreenDoor_21', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':143, 'y':638}, 'code':'PlatformScreenDoor_22', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':455, 'y':638}, 'code':'PlatformScreenDoor_23', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':519, 'y':638}, 'code':'PlatformScreenDoor_24', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':582, 'y':638}, 'code':'PlatformScreenDoor_25', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1085, 'y':638}, 'code':'PlatformScreenDoor_26', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1022, 'y':638}, 'code':'PlatformScreenDoor_27', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':958, 'y':638}, 'code':'PlatformScreenDoor_28', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':896, 'y':638}, 'code':'PlatformScreenDoor_29', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':833, 'y':638}, 'code':'PlatformScreenDoor_30', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':770, 'y':638}, 'code':'PlatformScreenDoor_31', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':707, 'y':638}, 'code':'PlatformScreenDoor_32', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':645, 'y':638}, 'code':'PlatformScreenDoor_33', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':331, 'y':638}, 'code':'PlatformScreenDoor_34', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':269, 'y':638}, 'code':'PlatformScreenDoor_35', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':206, 'y':638}, 'code':'PlatformScreenDoor_36', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':394, 'y':638}, 'code':'PlatformScreenDoor_37', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1333, 'y':638}, 'code':'PlatformScreenDoor_38', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1271, 'y':638}, 'code':'PlatformScreenDoor_39', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1209, 'y':638}, 'code':'PlatformScreenDoor_40', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1147, 'y':638}, 'code':'PlatformScreenDoor_41', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}], 'endDoorList':[{'point':{'x':97, 'y':209}, 'code':'EndDoor_1', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}, {'point':{'x':1407, 'y':210}, 'code':'EndDoor_2', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}, {'point':{'x':113, 'y':654}, 'code':'EndDoor_3', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}, {'point':{'x':1405, 'y':659}, 'code':'EndDoor_4', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}], 'borderRadiusList':[{'point':{'x':141, 'y':157}, 'code':'BorderRadius_1', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':391, 'y':158}, 'code':'BorderRadius_2', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':644, 'y':157}, 'code':'BorderRadius_3', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':896, 'y':157}, 'code':'BorderRadius_4', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':1148, 'y':157}, 'code':'BorderRadius_5', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':147, 'y':717}, 'code':'BorderRadius_6', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':1150, 'y':718}, 'code':'BorderRadius_7', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':649, 'y':716}, 'code':'BorderRadius_8', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':900, 'y':717}, 'code':'BorderRadius_9', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':399, 'y':717}, 'code':'BorderRadius_10', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}], 'iscsLineList':[{'point1':{'x':104, 'y':260}, 'point2':{'x':1438, 'y':260}, 'code':'IscsLine_1', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':104, 'y':260}}, {'point1':{'x':134, 'y':220}, 'point2':{'x':1391, 'y':220}, 'code':'IscsLine_2', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':134, 'y':220}}, {'point1':{'x':103, 'y':189}, 'point2':{'x':1436, 'y':189}, 'code':'IscsLine_3', 'classify':'solid', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':103, 'y':189}}, {'point1':{'x':104, 'y':150}, 'point2':{'x':1437, 'y':150}, 'code':'IscsLine_4', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':104, 'y':150}}, {'point1':{'x':133, 'y':190}, 'point2':{'x':133, 'y':261}, 'code':'IscsLine_5', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':133, 'y':190}}, {'point1':{'x':1393, 'y':189}, 'point2':{'x':1393, 'y':260}, 'code':'IscsLine_6', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1393, 'y':189}}, {'point1':{'x':385, 'y':149}, 'point2':{'x':385, 'y':260}, 'code':'IscsLine_7', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':385, 'y':149}}, {'point1':{'x':637, 'y':149}, 'point2':{'x':637, 'y':259}, 'code':'IscsLine_8', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':637, 'y':149}}, {'point1':{'x':1142, 'y':149}, 'point2':{'x':1142, 'y':259}, 'code':'IscsLine_9', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1142, 'y':149}}, {'point1':{'x':892, 'y':149}, 'point2':{'x':892, 'y':259}, 'code':'IscsLine_10', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':892, 'y':149}}, {'point1':{'x':109, 'y':634}, 'point2':{'x':1439, 'y':634}, 'code':'IscsLine_11', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':109, 'y':634}}, {'point1':{'x':108, 'y':749}, 'point2':{'x':1438, 'y':749}, 'code':'IscsLine_12', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':108, 'y':749}}, {'point1':{'x':107, 'y':712}, 'point2':{'x':1437, 'y':712}, 'code':'IscsLine_13', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':107, 'y':712}}, {'point1':{'x':142, 'y':671}, 'point2':{'x':1393, 'y':671}, 'code':'IscsLine_14', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':142, 'y':671}}, {'point1':{'x':141, 'y':633}, 'point2':{'x':141, 'y':713}, 'code':'IscsLine_15', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':141, 'y':633}}, {'point1':{'x':1395, 'y':633}, 'point2':{'x':1395, 'y':713}, 'code':'IscsLine_16', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1395, 'y':633}}, {'point1':{'x':392, 'y':633}, 'point2':{'x':392, 'y':749}, 'code':'IscsLine_17', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':392, 'y':633}}, {'point1':{'x':644, 'y':633}, 'point2':{'x':644, 'y':749}, 'code':'IscsLine_18', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':644, 'y':633}}, {'point1':{'x':894, 'y':634}, 'point2':{'x':894, 'y':749}, 'code':'IscsLine_19', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':894, 'y':634}}, {'point1':{'x':1146, 'y':634}, 'point2':{'x':1146, 'y':749}, 'code':'IscsLine_20', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1146, 'y':634}}, {'point1':{'x':408, 'y':301}, 'point2':{'x':408, 'y':601}, 'code':'IscsLine_21', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':408, 'y':301}}, {'point1':{'x':1140, 'y':299}, 'point2':{'x':1140, 'y':600}, 'code':'IscsLine_22', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1140, 'y':299}}, {'point1':{'x':644, 'y':301}, 'point2':{'x':644, 'y':391}, 'code':'IscsLine_23', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':644, 'y':301}}, {'point1':{'x':221, 'y':328}, 'point2':{'x':481, 'y':328}, 'code':'IscsLine_24', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':328}}, {'point1':{'x':221, 'y':370}, 'point2':{'x':481, 'y':370}, 'code':'IscsLine_25', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':370}}, {'point1':{'x':220, 'y':393}, 'point2':{'x':480, 'y':393}, 'code':'IscsLine_26', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':393}}, {'point1':{'x':221, 'y':415}, 'point2':{'x':481, 'y':415}, 'code':'IscsLine_27', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':415}}, {'point1':{'x':220, 'y':436}, 'point2':{'x':480, 'y':436}, 'code':'IscsLine_28', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':436}}, {'point1':{'x':221, 'y':458}, 'point2':{'x':481, 'y':458}, 'code':'IscsLine_29', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':458}}, {'point1':{'x':222, 'y':479}, 'point2':{'x':482, 'y':479}, 'code':'IscsLine_30', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':222, 'y':479}}, {'point1':{'x':221, 'y':500}, 'point2':{'x':481, 'y':500}, 'code':'IscsLine_31', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':500}}, {'point1':{'x':220, 'y':521}, 'point2':{'x':480, 'y':521}, 'code':'IscsLine_32', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':521}}, {'point1':{'x':220, 'y':539}, 'point2':{'x':480, 'y':539}, 'code':'IscsLine_33', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':539}}, {'point1':{'x':219, 'y':580}, 'point2':{'x':479, 'y':580}, 'code':'IscsLine_34', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':219, 'y':580}}, {'point1':{'x':219, 'y':560}, 'point2':{'x':479, 'y':560}, 'code':'IscsLine_35', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':219, 'y':560}}, {'point1':{'x':220, 'y':349}, 'point2':{'x':480, 'y':349}, 'code':'IscsLine_36', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':349}}, {'point1':{'x':511, 'y':368}, 'point2':{'x':701, 'y':368}, 'code':'IscsLine_37', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':511, 'y':368}}, {'point1':{'x':513, 'y':346}, 'point2':{'x':703, 'y':346}, 'code':'IscsLine_38', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':513, 'y':346}}, {'point1':{'x':512, 'y':323}, 'point2':{'x':702, 'y':323}, 'code':'IscsLine_39', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':512, 'y':323}}, {'point1':{'x':954, 'y':408}, 'point2':{'x':1214, 'y':408}, 'code':'IscsLine_40', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':408}}, {'point1':{'x':952, 'y':450}, 'point2':{'x':1212, 'y':450}, 'code':'IscsLine_41', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':952, 'y':450}}, {'point1':{'x':954, 'y':367}, 'point2':{'x':1214, 'y':367}, 'code':'IscsLine_42', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':367}}, {'point1':{'x':955, 'y':348}, 'point2':{'x':1215, 'y':348}, 'code':'IscsLine_43', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':348}}, {'point1':{'x':955, 'y':326}, 'point2':{'x':1215, 'y':326}, 'code':'IscsLine_44', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':326}}, {'point1':{'x':955, 'y':429}, 'point2':{'x':1215, 'y':429}, 'code':'IscsLine_45', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':429}}, {'point1':{'x':955, 'y':471}, 'point2':{'x':1215, 'y':471}, 'code':'IscsLine_46', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':471}}, {'point1':{'x':954, 'y':388}, 'point2':{'x':1214, 'y':388}, 'code':'IscsLine_47', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':388}}, {'point1':{'x':954, 'y':493}, 'point2':{'x':1214, 'y':493}, 'code':'IscsLine_48', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':493}}, {'point1':{'x':954, 'y':517}, 'point2':{'x':1214, 'y':517}, 'code':'IscsLine_49', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':517}}, {'point1':{'x':954, 'y':539}, 'point2':{'x':1214, 'y':539}, 'code':'IscsLine_50', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':539}}, {'point1':{'x':955, 'y':579}, 'point2':{'x':1214, 'y':579}, 'code':'IscsLine_51', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':579}}, {'point1':{'x':954, 'y':559}, 'point2':{'x':1213, 'y':559}, 'code':'IscsLine_52', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':559}}], 'iscsRectList':[{'point':{'x':220, 'y':300}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(255, 0, 0, 0)', 'borderWidth':2, 'strokeColor':'#FFFFFF', 'width':260, 'height':300, 'zlevel':1, 'z':3}, {'point':{'x':512, 'y':300}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(255, 0, 0, 0)', 'borderWidth':2, 'strokeColor':'#FFFFFF', 'width':190, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':954, 'y':300}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(255, 0, 0, 0)', 'borderWidth':2, 'strokeColor':'#FFFFFF', 'width':260, 'height':300, 'zlevel':1, 'z':3}], 'iscsTextList':[{'point':{'x':229, 'y':163}, 'code':'IscsText_1', '_type':'IscsText', 'context':'车厢1', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':483, 'y':162}, 'code':'IscsText_2', '_type':'IscsText', 'context':'车厢2', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':747, 'y':161}, 'code':'IscsText_3', '_type':'IscsText', 'context':'车厢3', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':991, 'y':161}, 'code':'IscsText_4', '_type':'IscsText', 'context':'车厢4', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1243, 'y':162}, 'code':'IscsText_5', '_type':'IscsText', 'context':'车厢5', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':239, 'y':722}, 'code':'IscsText_6', '_type':'IscsText', 'context':'车厢1', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':491, 'y':722}, 'code':'IscsText_7', '_type':'IscsText', 'context':'车厢2', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':742, 'y':722}, 'code':'IscsText_8', '_type':'IscsText', 'context':'车厢3', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':989, 'y':723}, 'code':'IscsText_9', '_type':'IscsText', 'context':'车厢4', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1242, 'y':722}, 'code':'IscsText_10', '_type':'IscsText', 'context':'车厢5', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':100, 'y':131}, 'code':'IscsText_11', '_type':'IscsText', 'context':'下行', 'textFill':'#20B8C1', 'fontSize':14, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1406, 'y':755}, 'code':'IscsText_12', '_type':'IscsText', 'context':'上行', 'textFill':'#20B8C1', 'fontSize':14, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':280, 'y':308}, 'code':'IscsText_13', '_type':'IscsText', 'context':'下行站台', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':309}, 'code':'IscsText_14', '_type':'IscsText', 'context':'状态', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1011, 'y':306}, 'code':'IscsText_15', '_type':'IscsText', 'context':'上行站台', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1163, 'y':308}, 'code':'IscsText_16', '_type':'IscsText', 'context':'状态', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':334}, 'code':'IscsText_17', '_type':'IscsText', 'context':'滑动门&应急门开门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':354}, 'code':'IscsText_18', '_type':'IscsText', 'context':'滑动门&应急门关门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':376}, 'code':'IscsText_19', '_type':'IscsText', 'context':'滑动门互锁解除报警', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':398}, 'code':'IscsText_20', '_type':'IscsText', 'context':'紧急控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':442}, 'code':'IscsText_22', '_type':'IscsText', 'context':'紧急控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':227, 'y':464}, 'code':'IscsText_23', '_type':'IscsText', 'context':'就地控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':484}, 'code':'IscsText_24', '_type':'IscsText', 'context':'就得控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':506}, 'code':'IscsText_25', '_type':'IscsText', 'context':'就地控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':525}, 'code':'IscsText_26', '_type':'IscsText', 'context':'自动开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':225, 'y':545}, 'code':'IscsText_27', '_type':'IscsText', 'context':'自动关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':565}, 'code':'IscsText_28', '_type':'IscsText', 'context':'所有门开到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':227, 'y':585}, 'code':'IscsText_29', '_type':'IscsText', 'context':'所有门关到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':517, 'y':306}, 'code':'IscsText_30', '_type':'IscsText', 'context':'系统驱动电源故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':518, 'y':329}, 'code':'IscsText_31', '_type':'IscsText', 'context':'系统控制电源故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':519, 'y':352}, 'code':'IscsText_32', '_type':'IscsText', 'context':'监视电源故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':520, 'y':375}, 'code':'IscsText_33', '_type':'IscsText', 'context':'现场总线故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':332}, 'code':'IscsText_34', '_type':'IscsText', 'context':'滑动门&应急门开门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':960, 'y':352}, 'code':'IscsText_35', '_type':'IscsText', 'context':'滑动门&应急门关门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':371}, 'code':'IscsText_36', '_type':'IscsText', 'context':'滑动门互锁解除报警', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':393}, 'code':'IscsText_37', '_type':'IscsText', 'context':'紧急控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':225, 'y':421}, 'code':'IscsText_38', '_type':'IscsText', 'context':'紧急控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':413}, 'code':'IscsText_39', '_type':'IscsText', 'context':'紧急控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':433}, 'code':'IscsText_40', '_type':'IscsText', 'context':'紧急控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':963, 'y':454}, 'code':'IscsText_41', '_type':'IscsText', 'context':'就地控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':477}, 'code':'IscsText_42', '_type':'IscsText', 'context':'就得控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':500}, 'code':'IscsText_43', '_type':'IscsText', 'context':'就地控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':523}, 'code':'IscsText_44', '_type':'IscsText', 'context':'自动开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':545}, 'code':'IscsText_45', '_type':'IscsText', 'context':'自动关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':963, 'y':565}, 'code':'IscsText_46', '_type':'IscsText', 'context':'所有门开到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':963, 'y':583}, 'code':'IscsText_47', '_type':'IscsText', 'context':'所有门关到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':154, 'y':265}, 'code':'IscsText_48', '_type':'IscsText', 'context':'1-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':217, 'y':266}, 'code':'IscsText_49', '_type':'IscsText', 'context':'1-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':280, 'y':266}, 'code':'IscsText_50', '_type':'IscsText', 'context':'1-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':341, 'y':266}, 'code':'IscsText_51', '_type':'IscsText', 'context':'1-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':404, 'y':267}, 'code':'IscsText_52', '_type':'IscsText', 'context':'2-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':467, 'y':267}, 'code':'IscsText_53', '_type':'IscsText', 'context':'2-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':531, 'y':266}, 'code':'IscsText_54', '_type':'IscsText', 'context':'2-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':596, 'y':266}, 'code':'IscsText_55', '_type':'IscsText', 'context':'2-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':659, 'y':266}, 'code':'IscsText_56', '_type':'IscsText', 'context':'3-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':720, 'y':267}, 'code':'IscsText_57', '_type':'IscsText', 'context':'3-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':787, 'y':267}, 'code':'IscsText_58', '_type':'IscsText', 'context':'3-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':847, 'y':267}, 'code':'IscsText_59', '_type':'IscsText', 'context':'3-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':910, 'y':266}, 'code':'IscsText_60', '_type':'IscsText', 'context':'4-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':972, 'y':267}, 'code':'IscsText_61', '_type':'IscsText', 'context':'4-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1035, 'y':266}, 'code':'IscsText_62', '_type':'IscsText', 'context':'4-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1098, 'y':267}, 'code':'IscsText_63', '_type':'IscsText', 'context':'4-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1162, 'y':267}, 'code':'IscsText_64', '_type':'IscsText', 'context':'5-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1225, 'y':267}, 'code':'IscsText_65', '_type':'IscsText', 'context':'5-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1288, 'y':267}, 'code':'IscsText_66', '_type':'IscsText', 'context':'5-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1348, 'y':266}, 'code':'IscsText_67', '_type':'IscsText', 'context':'5-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':164, 'y':619}, 'code':'IscsText_68', '_type':'IscsText', 'context':'1-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':223, 'y':619}, 'code':'IscsText_69', '_type':'IscsText', 'context':'1-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':285, 'y':619}, 'code':'IscsText_70', '_type':'IscsText', 'context':'1-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':348, 'y':619}, 'code':'IscsText_71', '_type':'IscsText', 'context':'1-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':412, 'y':618}, 'code':'IscsText_72', '_type':'IscsText', 'context':'2-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':472, 'y':618}, 'code':'IscsText_73', '_type':'IscsText', 'context':'2-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':535, 'y':619}, 'code':'IscsText_74', '_type':'IscsText', 'context':'2-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':599, 'y':620}, 'code':'IscsText_75', '_type':'IscsText', 'context':'2-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':663, 'y':618}, 'code':'IscsText_76', '_type':'IscsText', 'context':'3-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':724, 'y':618}, 'code':'IscsText_77', '_type':'IscsText', 'context':'3-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':787, 'y':617}, 'code':'IscsText_78', '_type':'IscsText', 'context':'3-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':847, 'y':619}, 'code':'IscsText_79', '_type':'IscsText', 'context':'3-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':912, 'y':619}, 'code':'IscsText_80', '_type':'IscsText', 'context':'4-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':973, 'y':620}, 'code':'IscsText_81', '_type':'IscsText', 'context':'4-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1039, 'y':619}, 'code':'IscsText_82', '_type':'IscsText', 'context':'4-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1101, 'y':619}, 'code':'IscsText_83', '_type':'IscsText', 'context':'4-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1165, 'y':618}, 'code':'IscsText_84', '_type':'IscsText', 'context':'5-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1225, 'y':618}, 'code':'IscsText_85', '_type':'IscsText', 'context':'5-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1290, 'y':620}, 'code':'IscsText_86', '_type':'IscsText', 'context':'5-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1350, 'y':620}, 'code':'IscsText_87', '_type':'IscsText', 'context':'5-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':432, 'y':399}, 'code':'IscsText_88', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':421}, 'code':'IscsText_89', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':443}, 'code':'IscsText_90', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':431, 'y':464}, 'code':'IscsText_91', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':431, 'y':484}, 'code':'IscsText_92', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':506}, 'code':'IscsText_93', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':525}, 'code':'IscsText_94', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':544}, 'code':'IscsText_95', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':427, 'y':586}, 'code':'IscsText_96', '_type':'IscsText', 'context':'关到位', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1161, 'y':585}, 'code':'IscsText_97', '_type':'IscsText', 'context':'关到位', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':524}, 'code':'IscsText_98', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':501}, 'code':'IscsText_99', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1165, 'y':392}, 'code':'IscsText_100', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':455}, 'code':'IscsText_101', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':478}, 'code':'IscsText_102', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':545}, 'code':'IscsText_103', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1160, 'y':415}, 'code':'IscsText_104', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1161, 'y':435}, 'code':'IscsText_105', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}], 'arcStatusList':[{'point':{'x':443, 'y':338}, 'code':'ArcStatus_1', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':443, 'y':359}, 'code':'ArcStatus_2', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':443, 'y':381}, 'code':'ArcStatus_3', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':311}, 'code':'ArcStatus_4', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':335}, 'code':'ArcStatus_5', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':358}, 'code':'ArcStatus_6', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':380}, 'code':'ArcStatus_7', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':337}, 'code':'ArcStatus_8', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':357}, 'code':'ArcStatus_9', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':377}, 'code':'ArcStatus_10', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}]},
     '41': {'iscsRectList':[{'point':{'x':1, 'y':70}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':160, 'height':80, 'zlevel':1, 'z':3}, {'point':{'x':161, 'y':80}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':95, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':1, 'y':205}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F  7F1F1', 'width':135, 'height':100, 'zlevel':1, 'z':3}, {'point':{'x':136, 'y':225}, 'code':'IscsRect_4', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':120, 'height':80, 'zlevel':1, 'z':3}, {'point':{'x':327, 'y':116}, 'code':'IscsRect_5', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':60, 'zlevel':1, 'z':3}, {'point':{'x':936, 'y':26}, 'code':'IscsRect_6', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1006, 'y':26}, 'code':'IscsRect_7', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1076, 'y':26}, 'code':'IscsRect_8', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1146, 'y':26}, 'code':'IscsRect_9', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1305, 'y':40}, 'code':'IscsRect_10', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':145, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1305, 'y':130}, 'code':'IscsRect_11', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':145, 'height':105, 'zlevel':1, 'z':3}, {'point':{'x':1340, 'y':270}, 'code':'IscsRect_12', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':45, 'height':35, 'zlevel':1, 'z':3}, {'point':{'x':1385, 'y':270}, 'code':'IscsRect_13', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':45, 'height':35, 'zlevel':1, 'z':3}, {'point':{'x':930, 'y':160}, 'code':'IscsRect_14', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':90, 'height':95, 'zlevel':1, 'z':3}, {'point':{'x':1020, 'y':160}, 'code':'IscsRect_15', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':50, 'height':95, 'zlevel':1, 'z':3}, {'point':{'x':1070, 'y':160}, 'code':'IscsRect_16', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':85, 'height':95, 'zlevel':1, 'z':3}, {'point':{'x':1155, 'y':160}, 'code':'IscsRect_17', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':90, 'height':95, 'zlevel':1, 'z':3}, {'point':{'x':760, 'y':116}, 'code':'IscsRect_18', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':65, 'height':60, 'zlevel':1, 'z':3}, {'point':{'x':1054, 'y':265}, 'code':'IscsRect_19', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':135, 'height':40, 'zlevel':1, 'z':3}], 'iscsLineList':[{'point1':{'x':0, 'y':15}, 'point2':{'x':260, 'y':15}, 'code':'IscsLine_1', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':0, 'y':15}}, {'point1':{'x':260, 'y':15}, 'point2':{'x':260, 'y':0}, 'code':'IscsLine_2', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':260, 'y':15}}, {'point1':{'x':330, 'y':0}, 'point2':{'x':330, 'y':15}, 'code':'IscsLine_3', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':330, 'y':0}}, {'point1':{'x':330, 'y':15}, 'point2':{'x':810, 'y':15}, 'code':'IscsLine_4', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':330, 'y':15}}, {'point1':{'x':810, 'y':15}, 'point2':{'x':810, 'y':0}, 'code':'IscsLine_5', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':810, 'y':15}}, {'point1':{'x':880, 'y':0}, 'point2':{'x':880, 'y':15}, 'code':'IscsLine_6', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':880, 'y':0}}, {'point1':{'x':880, 'y':15}, 'point2':{'x':1470, 'y':15}, 'code':'IscsLine_7', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':880, 'y':15}}, {'point1':{'x':0, 'y':305}, 'point2':{'x':300, 'y':305}, 'code':'IscsLine_8', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':0, 'y':305}}, {'point1':{'x':300, 'y':305}, 'point2':{'x':300, 'y':320}, 'code':'IscsLine_9', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':300, 'y':305}}, {'point1':{'x':370, 'y':320}, 'point2':{'x':370, 'y':305}, 'code':'IscsLine_10', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':370, 'y':320}}, {'point1':{'x':370, 'y':305}, 'point2':{'x':800, 'y':305}, 'code':'IscsLine_11', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':370, 'y':305}}, {'point1':{'x':800, 'y':305}, 'point2':{'x':800, 'y':320}, 'code':'IscsLine_12', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':800, 'y':305}}, {'point1':{'x':870, 'y':305}, 'point2':{'x':870, 'y':320}, 'code':'IscsLine_13', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':870, 'y':305}}, {'point1':{'x':870, 'y':305}, 'point2':{'x':1470, 'y':305}, 'code':'IscsLine_14', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':870, 'y':305}}, {'point1':{'x':746, 'y':100}, 'point2':{'x':746, 'y':110}, 'code':'IscsLine_15', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':746, 'y':100}}, {'point1':{'x':746, 'y':16}, 'point2':{'x':746, 'y':37}, 'code':'IscsLine_16', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':746, 'y':16}}, {'point1':{'x':729, 'y':190}, 'point2':{'x':729, 'y':212}, 'code':'IscsLine_17', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':729, 'y':190}}, {'point1':{'x':729, 'y':274}, 'point2':{'x':729, 'y':305}, 'code':'IscsLine_18', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':729, 'y':274}}, {'point1':{'x':416, 'y':14}, 'point2':{'x':416, 'y':29}, 'code':'IscsLine_19', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':416, 'y':14}}, {'point1':{'x':416, 'y':92}, 'point2':{'x':416, 'y':110}, 'code':'IscsLine_20', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':416, 'y':92}}, {'point1':{'x':436, 'y':189}, 'point2':{'x':436, 'y':216}, 'code':'IscsLine_21', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':436, 'y':189}}, {'point1':{'x':436, 'y':280}, 'point2':{'x':436, 'y':305}, 'code':'IscsLine_22', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':436, 'y':280}}], 'iscsTextList':[{'point':{'x':262, 'y':9}, 'code':'IscsText_1', '_type':'IscsText', 'context':'2号出入口', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':304, 'y':296}, 'code':'IscsText_2', '_type':'IscsText', 'context':'5号出入口', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':813, 'y':10}, 'code':'IscsText_3', '_type':'IscsText', 'context':'3号出入口', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':804, 'y':297}, 'code':'IscsText_4', '_type':'IscsText', 'context':'4号出入口', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':183, 'y':107}, 'code':'IscsText_5', '_type':'IscsText', 'context':'配电间', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':33, 'y':246}, 'code':'IscsText_6', '_type':'IscsText', 'context':'空调机房', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':170, 'y':248}, 'code':'IscsText_7', '_type':'IscsText', 'context':'环控\n电控室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':333, 'y':160}, 'code':'IscsText_8', '_type':'IscsText', 'context':'客服中心', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':764, 'y':159}, 'code':'IscsText_9', '_type':'IscsText', 'context':'客服中心', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':949, 'y':38}, 'code':'IscsText_10', '_type':'IscsText', 'context':'通信\n设备室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1020, 'y':40}, 'code':'IscsText_11', '_type':'IscsText', 'context':'通信\n电源室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1088, 'y':40}, 'code':'IscsText_12', '_type':'IscsText', 'context':'AFC\n设备室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':41}, 'code':'IscsText_13', '_type':'IscsText', 'context':'交\n接\n班\n室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':950, 'y':171}, 'code':'IscsText_14', '_type':'IscsText', 'context':'车站\n控制室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1026, 'y':175}, 'code':'IscsText_15', '_type':'IscsText', 'context':'站长室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1091, 'y':169}, 'code':'IscsText_16', '_type':'IscsText', 'context':'信号\n设备室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1173, 'y':169}, 'code':'IscsText_17', '_type':'IscsText', 'context':'信号\n电源室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1061, 'y':273}, 'code':'IscsText_18', '_type':'IscsText', 'context':'中和监控\n设备室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1346, 'y':281}, 'code':'IscsText_19', '_type':'IscsText', 'context':'男更', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1393, 'y':280}, 'code':'IscsText_20', '_type':'IscsText', 'context':'女更', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1372, 'y':144}, 'code':'IscsText_21', '_type':'IscsText', 'context':'票务室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1355, 'y':64}, 'code':'IscsText_22', '_type':'IscsText', 'context':'环控\n电控室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':13, 'y':122}, 'code':'IscsText_23', '_type':'IscsText', 'context':'01022#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':59, 'y':183}, 'code':'IscsText_24', '_type':'IscsText', 'context':'01023#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':267, 'y':263}, 'code':'IscsText_25', '_type':'IscsText', 'context':'01024#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':332, 'y':279}, 'code':'IscsText_26', '_type':'IscsText', 'context':'01001#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':333, 'y':145}, 'code':'IscsText_27', '_type':'IscsText', 'context':'01002#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':570, 'y':281}, 'code':'IscsText_28', '_type':'IscsText', 'context':'01004#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':464, 'y':59}, 'code':'IscsText_29', '_type':'IscsText', 'context':'01003#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':568, 'y':110}, 'code':'IscsText_30', '_type':'IscsText', 'context':'01028#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':523, 'y':183}, 'code':'IscsText_31', '_type':'IscsText', 'context':'01027#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':615, 'y':186}, 'code':'IscsText_32', '_type':'IscsText', 'context':'01029#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':469, 'y':238}, 'code':'IscsText_33', '_type':'IscsText', 'context':'01026#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':662, 'y':238}, 'code':'IscsText_34', '_type':'IscsText', 'context':'01030#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':766, 'y':142}, 'code':'IscsText_35', '_type':'IscsText', 'context':'01005#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':774, 'y':80}, 'code':'IscsText_36', '_type':'IscsText', 'context':'01031#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':840, 'y':64}, 'code':'IscsText_37', '_type':'IscsText', 'context':'01033#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':783, 'y':269}, 'code':'IscsText_38', '_type':'IscsText', 'context':'01006#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':849, 'y':249}, 'code':'IscsText_39', '_type':'IscsText', 'context':'01032#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':948, 'y':232}, 'code':'IscsText_40', '_type':'IscsText', 'context':'01008#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':947, 'y':97}, 'code':'IscsText_41', '_type':'IscsText', 'context':'01007#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1017, 'y':97}, 'code':'IscsText_42', '_type':'IscsText', 'context':'01009#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1089, 'y':98}, 'code':'IscsText_43', '_type':'IscsText', 'context':'01010#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':142}, 'code':'IscsText_44', '_type':'IscsText', 'context':'01037#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1114, 'y':142}, 'code':'IscsText_45', '_type':'IscsText', 'context':'01034#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1088, 'y':233}, 'code':'IscsText_46', '_type':'IscsText', 'context':'01011#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1176, 'y':233}, 'code':'IscsText_47', '_type':'IscsText', 'context':'01012#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1127, 'y':290}, 'code':'IscsText_48', '_type':'IscsText', 'context':'01013#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':933, 'y':292}, 'code':'IscsText_49', '_type':'IscsText', 'context':'01035#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':994, 'y':291}, 'code':'IscsText_50', '_type':'IscsText', 'context':'01036#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1317, 'y':169}, 'code':'IscsText_51', '_type':'IscsText', 'context':'01014#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1379, 'y':211}, 'code':'IscsText_52', '_type':'IscsText', 'context':'01038#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':742, 'y':128}, 'code':'IscsText_53', '_type':'IscsText', 'context':'上', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':167}, 'code':'IscsText_54', '_type':'IscsText', 'context':'下', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':284, 'y':94}, 'code':'IscsText_55', '_type':'IscsText', 'context':'01025#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':397, 'y':127}, 'code':'IscsText_56', '_type':'IscsText', 'context':'上', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':456, 'y':169}, 'code':'IscsText_57', '_type':'IscsText', 'context':'下', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}], 'vidiconList':[{'_type':'Vidicon', 'code':'Vidicon_1', 'width':40, 'right':true, 'point':{'x':14, 'y':99}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_2', 'width':40, 'right':true, 'point':{'x':59, 'y':160}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_3', 'width':40, 'right':true, 'point':{'x':299, 'y':86}, 'rotationAngle':90, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_4', 'width':40, 'right':true, 'point':{'x':267, 'y':239}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_5', 'width':40, 'right':true, 'point':{'x':569, 'y':87}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_6', 'width':40, 'right':true, 'point':{'x':614, 'y':160}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_7', 'width':40, 'right':false, 'point':{'x':526, 'y':159}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_8', 'width':40, 'right':false, 'point':{'x':474, 'y':217}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_9', 'width':40, 'right':true, 'point':{'x':660, 'y':217}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_10', 'width':40, 'right':false, 'point':{'x':779, 'y':61}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_11', 'width':40, 'right':true, 'point':{'x':839, 'y':44}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_12', 'width':40, 'right':true, 'point':{'x':850, 'y':227}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_13', 'width':40, 'right':true, 'point':{'x':993, 'y':272}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_14', 'width':40, 'right':false, 'point':{'x':940, 'y':272}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_15', 'width':40, 'right':true, 'point':{'x':1115, 'y':120}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_16', 'width':40, 'right':false, 'point':{'x':965, 'y':120}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_17', 'width':40, 'right':false, 'point':{'x':1387, 'y':190}, 'rotationAngle':0, 'zlevel':1, 'z':4}], 'vidiconCloudList':[{'_type':'VidiconCloud', 'code':'VidiconCloud_1', 'r':18, 'point':{'x':353, 'y':255}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_2', 'r':18, 'point':{'x':349, 'y':122}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_3', 'r':18, 'point':{'x':487, 'y':32}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_4', 'r':18, 'point':{'x':803, 'y':120}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_5', 'r':18, 'point':{'x':592, 'y':252}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_6', 'r':18, 'point':{'x':805, 'y':245}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_7', 'r':18, 'point':{'x':970, 'y':70}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_8', 'r':18, 'point':{'x':1042, 'y':70}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_9', 'r':18, 'point':{'x':1110, 'y':70}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_10', 'r':18, 'point':{'x':1198, 'y':210}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_11', 'r':18, 'point':{'x':970, 'y':210}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_12', 'r':18, 'point':{'x':1110, 'y':210}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_13', 'r':18, 'point':{'x':1149, 'y':272}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_14', 'r':18, 'point':{'x':1340, 'y':145}, 'zlevel':1, 'z':4}], 'brakeMachineList':[{'point':{'x':730, 'y':36}, 'isRight':false, 'code':'BrakeMachine_1', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':730, 'y':48}, 'isRight':false, 'code':'BrakeMachine_2', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':730, 'y':60}, 'isRight':false, 'code':'BrakeMachine_3', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':730, 'y':72}, 'isRight':false, 'code':'BrakeMachine_4', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':730, 'y':84}, 'isRight':false, 'code':'BrakeMachine_5', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':212}, 'isRight':true, 'code':'BrakeMachine_6', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':224}, 'isRight':true, 'code':'BrakeMachine_7', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':236}, 'isRight':true, 'code':'BrakeMachine_8', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':248}, 'isRight':true, 'code':'BrakeMachine_9', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':30}, 'isRight':true, 'code':'BrakeMachine_10', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':42}, 'isRight':true, 'code':'BrakeMachine_11', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':54}, 'isRight':true, 'code':'BrakeMachine_12', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':66}, 'isRight':true, 'code':'BrakeMachine_13', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':217}, 'isRight':true, 'code':'BrakeMachine_14', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':229}, 'isRight':true, 'code':'BrakeMachine_15', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':241}, 'isRight':true, 'code':'BrakeMachine_16', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':253}, 'isRight':true, 'code':'BrakeMachine_17', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':265}, 'isRight':true, 'code':'BrakeMachine_18', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':260}, 'isRight':true, 'code':'BrakeMachine_19', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':78}, 'isRight':true, 'code':'BrakeMachine_20', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}], 'staircaseList':[{'point':{'x':700, 'y':111}, 'fill':'#fff', 'isRight':true, 'rotationAngle':180, 'code':'Staircase_1', '_type':'Staircase', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':457, 'y':192}, 'fill':'#fff', 'isRight':false, 'rotationAngle':180, 'code':'Staircase_2', '_type':'Staircase', 'width':60, 'zlevel':1, 'z':4}]},
diff --git a/src/views/iscs/iscsDraw/iscsBasOperate/volumeControlDamper.vue b/src/views/iscs/iscsDraw/iscsBasOperate/volumeControlDamper.vue
index b1c18cbef..0847b6f85 100644
--- a/src/views/iscs/iscsDraw/iscsBasOperate/volumeControlDamper.vue
+++ b/src/views/iscs/iscsDraw/iscsBasOperate/volumeControlDamper.vue
@@ -5,7 +5,7 @@
         <el-input v-model="form.code" :disabled="true" />
       </el-form-item>
       <el-form-item label="图形宽度" prop="width">
-        <el-input-number v-model="form.width" :min="20" />
+        <el-input-number v-model="form.width" :min="15" />
       </el-form-item>
       <el-form-item label="旋转角度" prop="rotateAngle">
         <el-select v-model="form.rotateAngle" placeholder="请选择类型">
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index e4f4afd62..678db87b1 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -36,6 +36,7 @@ export default {
             },
             queryList: {
                 data:[],
+                paginationHiden:true,
                 query: this.queryFunction,
                 selectCheckShow: false,
                 indexShow: true,

From 187024b5b78f51933adfe229236d562d1c1f7bb8 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 May 2020 13:10:29 +0800
Subject: [PATCH 39/85] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competition.js               | 3 ++-
 src/views/jsxt/refereeList/index.vue | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/api/competition.js b/src/api/competition.js
index b10384334..eff437a1a 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -76,7 +76,8 @@ export function getIsSignUp(raceId, params = {}) {
 export function getRaceUserList(params) {
     return request({
         url: `/api/race/${params.raceId}/raceUser/page`,
-        method: 'get'
+        method: 'get',
+        params
     });
 }
 
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 678db87b1..d7fd57e4a 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -156,6 +156,7 @@ export default {
         queryFunction(params) {
             if (this.$route.query.raceId) {
                 params['raceId'] = this.$route.query.raceId;
+                params['pageSize'] = 999;
             }
             return getRaceUserList(params);
         },

From 2336fe7fbe335d9c6177ee1ad00da6eb80dc53de Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 May 2020 13:33:12 +0800
Subject: [PATCH 40/85] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/refereeList/index.vue | 43 +++++++++++++++-------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index d7fd57e4a..9dc8ef9ef 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -35,7 +35,6 @@ export default {
                 }
             },
             queryList: {
-                data:[],
                 paginationHiden:true,
                 query: this.queryFunction,
                 selectCheckShow: false,
@@ -126,6 +125,7 @@ export default {
     created() {
     },
     mounted() {
+        this.getData();
     },
     beforeDestroy() {
         this.isLeaving = true;
@@ -135,16 +135,19 @@ export default {
             const statusDict = {'0':'尚未参赛', '1':'进入赛场', '2':'理论赛场', '3':'实操赛场', '4':'完成比赛', '5':'完成理论', '6':'完成实操'};
             return statusDict[status];
         },
-        // getData() {
-        //     refereeGetCompetitionList(1).then(response=>{
-        //         this.tableData = response.data;
-        //         setTimeout(() => {
-        //             if (!this.isLeaving) {
-        //                 this.getData();
-        //             }
-        //         }, 2000);
-        //     });
-        // },
+        getData() {
+            const params = {raceId:this.$route.query.raceId, pageSize:999, pageNum:1};
+            getRaceUserList(params).then(response=>{
+                this.queryList.data = response.data.list;
+                this.refresh();
+                clearTimeout(this.inter);
+                this.inter = setTimeout(() => {
+                    if (!this.isLeaving) {
+                        this.getData();
+                    }
+                }, 2000);
+            });
+        },
         handleAdd() {
             loadingPaper(this.$route.query.raceId, {}).then((response)=>{
                 this.$message('试题加载成功');
@@ -172,16 +175,16 @@ export default {
         gradeScore(index, row) {
 
         },
-        afterQuery(data) {
-            clearTimeout(this.inter);
-            this.inter = setTimeout(() => {
-                if (!this.isLeaving) {
-                    this.refresh();
-                }
-            }, 3000);
-        },
+        // afterQuery(data) {
+        //     clearTimeout(this.inter);
+        //     this.inter = setTimeout(() => {
+        //         if (!this.isLeaving) {
+        //             this.refresh();
+        //         }
+        //     }, 3000);
+        // },
         refresh() {
-            this.$refs.queryListPage.refresh(true);
+            this.$refs.queryListPage.refresh(false);
         }
         // loadQuestions() {
         //     this.$refs.questionList.doShow();

From d161492fedfb1dd22dd69ba1b4cbeb037d804ce7 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 26 May 2020 15:59:11 +0800
Subject: [PATCH 41/85] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=98=E5=BA=93?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/api/questionBank.js                       |  10 +
 src/components/QuillEditor/index.vue          | 116 ++++++++++
 src/i18n/langs/zh/router.js                   |   3 +-
 src/main.js                                   |   1 +
 src/router/index_Common.js                    |  26 ++-
 src/scripts/ConstConfig.js                    |   4 +
 src/scripts/ConstDic.js                       |   4 +
 src/scripts/GlobalPlugin.js                   |   4 +-
 .../bankList/dialog-detail.vue                |  77 +++++++
 .../bankList/dialog-modify-rich.vue           |  46 ++++
 .../bankList/dialog-update-answer.vue         |  70 ++++++
 .../bankList/dialog-update-question.vue       |  42 ++++
 .../competitionManage/bankList/index.vue      | 207 ++++++++++++++++++
 .../bankList/item-answer.vue                  |  55 +++++
 .../bankList/item-options.vue                 |  62 ++++++
 .../competitionManage/bankList/item-rich.vue  |  55 +++++
 .../bankList/question-create-page.vue         | 109 +++++++++
 .../bankList/question-form.vue                | 129 +++++++++++
 .../bankList/question-update-page.vue         | 104 +++++++++
 src/views/newMap/displayNew/menuTrainList.vue |  42 +---
 src/views/system/dictionaryDetail/index.vue   |   7 -
 22 files changed, 1130 insertions(+), 44 deletions(-)
 create mode 100644 src/api/questionBank.js
 create mode 100644 src/components/QuillEditor/index.vue
 create mode 100644 src/views/competitionManage/bankList/dialog-detail.vue
 create mode 100644 src/views/competitionManage/bankList/dialog-modify-rich.vue
 create mode 100644 src/views/competitionManage/bankList/dialog-update-answer.vue
 create mode 100644 src/views/competitionManage/bankList/dialog-update-question.vue
 create mode 100644 src/views/competitionManage/bankList/index.vue
 create mode 100644 src/views/competitionManage/bankList/item-answer.vue
 create mode 100644 src/views/competitionManage/bankList/item-options.vue
 create mode 100644 src/views/competitionManage/bankList/item-rich.vue
 create mode 100644 src/views/competitionManage/bankList/question-create-page.vue
 create mode 100644 src/views/competitionManage/bankList/question-form.vue
 create mode 100644 src/views/competitionManage/bankList/question-update-page.vue

diff --git a/package.json b/package.json
index 9a08831b7..b7dc55048 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
 		"three": "^0.107.0",
 		"vue": "^2.6.10",
 		"vue-i18n": "^8.12.0",
+		"vue-quill-editor": "^3.0.6",
 		"vue-router": "^3.1.6",
 		"vuedraggable": "^2.23.2",
 		"vuex": "^3.1.0",
diff --git a/src/api/questionBank.js b/src/api/questionBank.js
new file mode 100644
index 000000000..dd2538322
--- /dev/null
+++ b/src/api/questionBank.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request';
+
+/** 推送通知消息*/
+export function listQuestionPage(data) {
+    return request({
+        // url: `/api/pushMessage`,
+        // method: 'post',
+        // data: data
+    });
+}
diff --git a/src/components/QuillEditor/index.vue b/src/components/QuillEditor/index.vue
new file mode 100644
index 000000000..2e4bf60d7
--- /dev/null
+++ b/src/components/QuillEditor/index.vue
@@ -0,0 +1,116 @@
+<template>
+  <div>
+    <quill-editor
+      ref="editor"
+      v-model="content"
+      :options="options"
+      :style="{height: height+'px', 'margin-bottom': '80px'}"
+      @change="onChange"
+      @blur="onBlur"
+      @focus="onFocus"
+    />
+  </div>
+</template>
+
+<script>
+import { quillEditor } from 'vue-quill-editor';
+import 'quill/dist/quill.snow.css';
+
+export default {
+    components: {
+        quillEditor
+    },
+    props: {
+        value: {
+            type: String,
+            default: ''
+        },
+        height: {
+            type: Number,
+            default: 200
+        },
+        placeholder: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            content: '',
+            options: {
+                modules: {
+                    toolbar: [
+                        ['bold', 'italic', 'underline', 'strike'],
+                        [],
+                        [],
+                        [{'list': 'ordered'}, {'list': 'bullet'}],
+                        [{'script': 'sub'}, {'script': 'super'}],
+                        [{'indent': '-1'}, {'indent': '+1'}],
+                        [{'direction': 'rtl'}],
+                        [{'size': ['small', 'large', 'huge']}],
+                        [{'color': [], 'background': []}],
+                        [{'font': []}],
+                        [{'align': []}],
+                        ['clean']
+                    ]
+                }
+            }
+        };
+    },
+    computed: {
+        editor() {
+            return this.$refs.editor.quill;
+        },
+        titleConfig () {
+            return {
+                'ql-bold': '加粗',
+                'ql-color': '颜色',
+                'ql-font': '字体',
+                'ql-code': '插入代码',
+                'ql-italic': '斜体',
+                'ql-link': '添加链接',
+                'ql-background': '背景颜色',
+                'ql-size': '字体大小',
+                'ql-strike': '删除线',
+                'ql-script': '上标/下标',
+                'ql-underline': '下划线',
+                'ql-blockquote': '引用',
+                'ql-header': '标题',
+                'ql-indent': '缩进',
+                'ql-list': '列表',
+                'ql-align': '文本对齐',
+                'ql-direction': '文本方向',
+                'ql-code-block': '代码块',
+                'ql-formula': '公式',
+                'ql-image': '图片',
+                'ql-video': '视频',
+                'ql-clean': '清除字体样式'
+            };
+        }
+    },
+    watch: {
+        'value': function(val) {
+            this.$nextTick(() => {
+                if (val != this.$escapeHTML(this.content)) {
+                    this.editor.enable(false);
+                    this.content = val;
+                    this.editor.enable(true);
+                    this.editor.blur();
+                }
+            });
+        }
+    },
+    mounted() {
+        this.content = this.value;
+    },
+    methods: {
+        onChange(e) {
+            this.$emit('input', this.$escapeHTML(this.content));
+        },
+        onBlur(e) {
+        },
+        onFocus(e) {
+        }
+    }
+};
+</script>
diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js
index fc651d643..f90f2beb5 100644
--- a/src/i18n/langs/zh/router.js
+++ b/src/i18n/langs/zh/router.js
@@ -82,5 +82,6 @@ export default {
     homeJsxt: '首页',
     examDetail: '考试详情',
     raceManage: '竞赛管理',
-    recaList: '报名列表'
+    recaList: '报名列表',
+    bankManage: '题库列表'
 };
diff --git a/src/main.js b/src/main.js
index bf8f2874f..f5a04a56c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,6 +4,7 @@ import 'normalize.css/normalize.css'; // A modern alternative to CSS resets
 import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
 import '@/styles/index.scss'; // global css
+import 'quill/dist/quill.snow.css';
 
 import LangStorage from '@/utils/lang';
 import App from './App';
diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index 660fa8839..ea4ed5fea 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -123,6 +123,9 @@ const DeviceManage = () => import('@/views/system/deviceManage/index');
 const MapSort = () => import('@/views/publish/publishMap/mapSort');
 const StudentManage = () => import('@/views/studentManage');
 const RaceManage = () => import('@/views/competitionManage/index');
+const BankManage = () => import('@/views/competitionManage/bankList/index');
+const QuestionCreatePage = () => import('@/views/competitionManage/bankList/question-create-page');
+const QuestionUpdatePage = () => import('@/views/competitionManage/bankList/question-update-page');
 
 const CompetitionDetail = () => import('@/views/jsxt/competition/examDetail');
 const CompetitionManage = () => import('@/views/jsxt/competition/index');
@@ -914,11 +917,10 @@ export const asyncRouter = [
         ]
     },
     {
-        path: '/design/race',
-        redirect: '/design/race/manage',
+        path: '/design/race', // 竞赛管理
         component: Layout,
         meta: {
-            i18n: 'route.raceManage',
+            i18n: 'router.raceManage',
             roles: [admin]
         },
         children: [
@@ -929,6 +931,24 @@ export const asyncRouter = [
                     i18n: 'router.raceManage',
                     icon: 'design'
                 }
+            },
+            {
+                path: 'bank',
+                component: BankManage,
+                meta: {
+                    i18n: 'router.bankManage',
+                    icon: 'design'
+                }
+            },
+            {
+                path: 'questionCreate',
+                component: QuestionCreatePage,
+                hidden: true
+            },
+            {
+                path: 'questionUpdate/:questionId',
+                component: QuestionUpdatePage,
+                hidden: true
             }
         ]
     }
diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index 88f8ca94d..a462dc7b9 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -147,6 +147,10 @@ export default {
             { label: '控制模式', value: 'ControlConvertMenu' },
             { label: '车次窗', value: 'TrainWindow' }
         ],
+        QuestionTypeList: [
+            { label: '选择题', value: 'select' },
+            { label: '判断题', value: 'judge' }
+        ],
         // 新版的产品类型枚举
         prdType:[
             { enlabel: 'ATS local workstation', label: 'ATS现地工作站', value: '01'},
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index 9ebfc5c2b..aee02b272 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -2312,5 +2312,9 @@ export const UrlConfig = {
         draft: '/trainingPlatform/draft',
         pay: '/trainingPlatform/pay',
         runPlan: '/trainingPlatform/runPlan/manage'
+    },
+    bank: {
+        questionCreate: '/design/race/questionCreate',
+        questionUpdate: '/design/race/questionUpdate'
     }
 };
diff --git a/src/scripts/GlobalPlugin.js b/src/scripts/GlobalPlugin.js
index 7e0ae1c63..af9b09c5d 100644
--- a/src/scripts/GlobalPlugin.js
+++ b/src/scripts/GlobalPlugin.js
@@ -5,11 +5,13 @@ import TurnbackBar from '@/components/TurnbackBar';
 import ConstConfig from '@/scripts/ConstConfig';
 import Dictionary from '@/scripts/DictionaryData';
 import Theme from '@/jmapNew/theme/factory';
+import QuillEditor from '@/components/QuillEditor/index';
 
 // 全局组件
 Vue.component('DataForm', DataForm);
 Vue.component('QueryListPage', QueryListPage);
 Vue.component('TurnbackBar', TurnbackBar);
+Vue.component('QuillEditor', QuillEditor);
 
 Vue.prototype.$ConstSelect = (function() {
     ConstConfig.ConstSelect.translate = function(value, codeName) {
@@ -116,7 +118,7 @@ Vue.prototype.$copyClone = function(obj1, obj2 = {}) {
 };
 
 Vue.prototype.$escapeHTML = function (context) {
-    const pattern = /<\w*>(.*)<\/\w*>/;
+    const pattern = /<\p>(.*)<\/\p>/;
 
     if (pattern.test(context)) {
         context = pattern.exec(context)[1];
diff --git a/src/views/competitionManage/bankList/dialog-detail.vue b/src/views/competitionManage/bankList/dialog-detail.vue
new file mode 100644
index 000000000..2ce0f390a
--- /dev/null
+++ b/src/views/competitionManage/bankList/dialog-detail.vue
@@ -0,0 +1,77 @@
+<template>
+  <el-dialog v-dialogDrag :close-on-click-moda="false" :title="title" :visible.sync="show" width="860px" :close-on-click-modal="false" :before-close="doClose">
+    <div class="ql-editor" v-html="$escapeHTML(`${form.topic}`)" />
+    <template v-if="checkType(form, 'judge')">
+      <div class="answer">
+        答 案:
+        <template v-for="(el,i) in options">
+          <span v-if="el.correct" :key="i">{{ el.content }} </span>
+        </template>
+      </div>
+
+    </template>
+    <template v-else-if="checkType(form, 'select')">
+      <div v-for="(el,i) in options" :key="i" class="option" :label="$str2number(el.id)">
+        <span>{{ $asc2chart(i+65) }}. </span>
+        <div class="ql-editor" style="display: inline; padding: 0" v-html="$escapeHTML(el.content)" />
+      </div>
+      <div class="answer">
+        答 案:
+        <template v-for="(el,i) in options">
+          <span v-if="el.correct" :key="i">{{ $asc2chart(i+65) }} </span>
+        </template>
+      </div>
+    </template>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="show = false">关闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+	data() {
+		return {
+			show: false,
+			form: {
+				optionList: []
+			}
+		};
+	},
+	computed: {
+		title() {
+			return '详 情';
+		},
+		options() {
+			return this.form.optionList;
+		}
+	},
+	methods: {
+		checkType(option, type) {
+			return option.type == type;
+		},
+		appendIndex(str, index) {
+			return `${index+1}. ${str}`;
+		},
+		doShow(node) {
+			this.form = node.row||{};
+			this.show = true;
+		},
+		doClose(done) {
+			this.show = false;
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+	.option {
+		line-height: 22px;
+	}
+
+	.answer {
+		line-height: 32px;
+		padding-left: 0;
+		color: #000;
+	}
+</style>
diff --git a/src/views/competitionManage/bankList/dialog-modify-rich.vue b/src/views/competitionManage/bankList/dialog-modify-rich.vue
new file mode 100644
index 000000000..e41791c43
--- /dev/null
+++ b/src/views/competitionManage/bankList/dialog-modify-rich.vue
@@ -0,0 +1,46 @@
+<template>
+  <el-dialog v-dialogDrag :close-on-click-moda="false" :title="title" :visible.sync="show" width="40%" :close-on-click-modal="false" :before-close="doClose">
+    <quill-editor v-model="content" placeholder="请输入内容" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doInput">确 定</el-button>
+      <el-button @click="show = false">取 消</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+    data() {
+        return {
+            show: false,
+            content: '',
+            node: {
+                model: {},
+                prop: ''
+            }
+        };
+    },
+    computed: {
+        title() {
+            return '富文本输入';
+        }
+    },
+    methods: {
+        doShow(node) {
+            this.node = node;
+            this.content = (node.model || {})[node.prop] || '';
+            this.show = true;
+        },
+        doClose(done) {
+            this.show = false;
+        },
+        doInput() {
+            const node = this.node;
+            node.model[node.prop] = this.content;
+            this.$emit('update', node.model);
+            this.doClose();
+        }
+    }
+};
+</script>
diff --git a/src/views/competitionManage/bankList/dialog-update-answer.vue b/src/views/competitionManage/bankList/dialog-update-answer.vue
new file mode 100644
index 000000000..0dcc748ce
--- /dev/null
+++ b/src/views/competitionManage/bankList/dialog-update-answer.vue
@@ -0,0 +1,70 @@
+<template>
+  <el-dialog v-dialogDrag :close-on-click-moda="false" :title="title" :visible.sync="show" width="40%" :close-on-click-modal="false" :before-close="doClose">
+    <div class="ql-editor notes" v-html="$escapeHTML(`${formParam.topic}`)" />
+    <item-answer v-model="formParam.answer" :option-list="optionList" :type="formParam.type" @change="onAnswerChnage" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doUpdate">确 定</el-button>
+      <el-button @click="show = false">取 消</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import ItemAnswer from './item-answer';
+import { getOptionsByQuestionId} from '@/api/questionBank.js';
+
+export default {
+	components: {
+		ItemAnswer
+	},
+	data() {
+		return {
+			show: false,
+			content: '',
+			optionList: [],
+			formParam: {}
+		};
+	},
+	computed: {
+		title() {
+			return '更新答案';
+		}
+	},
+	methods: {
+		doShow({index, row}) {
+			this.formParam = row;
+			this.content = row.topic;
+			getOptionsByQuestionId(row.id).then(resp => {
+				this.optionList = resp.data;
+				this.optionList.forEach((el, i) => {
+					if (el.correct) {
+						this.formParam.answer = i;
+					}
+				});
+			});
+			this.show = true;
+		},
+		doClose(done) {
+			this.show = false;
+		},
+		onAnswerChnage(answer) {
+			this.optionList.forEach((el, i) => { el.correct = i == answer; });
+		},
+		doUpdate() {
+			const index = this.optionList.findIndex((el, i) => { return i == this.formParam.answer; });
+			if (index >= 0) {
+				const answer = this.optionList[index];
+				this.$emit('updateAnswer', {questionId: answer.questionId, id: answer.id, correct: answer.correct});
+			}
+			this.doClose();
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	.notes {
+		padding: 0 0 20px 0;
+		color: #6666;
+	}
+</style>
diff --git a/src/views/competitionManage/bankList/dialog-update-question.vue b/src/views/competitionManage/bankList/dialog-update-question.vue
new file mode 100644
index 000000000..3d525d302
--- /dev/null
+++ b/src/views/competitionManage/bankList/dialog-update-question.vue
@@ -0,0 +1,42 @@
+<template>
+  <el-dialog v-dialogDrag :close-on-click-moda="false" :title="title" :visible.sync="show" width="40%" :close-on-click-modal="false" :before-close="doClose">
+    <quill-editor v-model="content" placeholder="请输入内容" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doInput">确 定</el-button>
+      <el-button @click="show = false">取 消</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+	data() {
+		return {
+			show: false,
+			content: '',
+			formParam: null
+		};
+	},
+	computed: {
+		title() {
+			return '更新题目';
+		}
+	},
+	methods: {
+		doShow({index, row}) {
+			this.formParam = row;
+			this.content = row.topic;
+			this.show = true;
+		},
+		doClose(done) {
+			this.show = false;
+		},
+		doInput() {
+			this.formParam.topic = this.content;
+			this.$emit('updateQuestion', this.formParam);
+			this.doClose();
+		}
+	}
+};
+</script>
diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue
new file mode 100644
index 000000000..7ca581c8b
--- /dev/null
+++ b/src/views/competitionManage/bankList/index.vue
@@ -0,0 +1,207 @@
+<template>
+  <div>
+    <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <dialog-update-question ref="question" @updateQuestion="updateQuestion" />
+    <dialog-update-answer ref="answer" @updateAnswer="updateAnswer" />
+    <dialog-detail ref="detail" />
+  </div>
+</template>
+
+<script>
+import { UrlConfig } from '@/scripts/ConstDic';
+import { listQuestionPage } from '@/api/questionBank.js';
+import DialogUpdateQuestion from './dialog-update-question';
+import DialogUpdateAnswer from './dialog-update-answer';
+import DialogDetail from './dialog-detail';
+
+export default {
+    components: {
+        DialogUpdateQuestion,
+        DialogUpdateAnswer,
+        DialogDetail
+    },
+    data() {
+        return {
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '80px',
+                queryObject: {
+                    type: {
+                        type: 'select',
+                        label: '类 型',
+                        config: {
+                            data: this.$ConstSelect.QuestionTypeList
+                        }
+                    },
+                    topic: {
+                        type: 'text',
+                        label: '题 目'
+                    }
+                }
+            },
+            queryList: {
+                query: listQuestionPage,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '类 型',
+                        prop: 'type',
+                        type: 'tag',
+                        width: '120',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.type, 'QuestionTypeList'); },
+                        tagType: (row) => {
+                            return '';
+                        }
+                    },
+                    {
+                        title: '题 目',
+                        prop: 'topic'
+                    },
+                    {
+                        title: '答 案',
+                        prop: 'answer',
+                        type: 'tagMore',
+                        width: '100',
+                        columnValue: (row) => { return this.answerTags(row); },
+                        tagType: (row) => {
+                            return '';
+                        }
+                    },
+                    {
+                        title: '创建人',
+                        prop: 'createUserName',
+                        width: '100'
+                    },
+                    {
+                        type: 'button',
+                        title: '操 作',
+                        width: '420',
+                        buttons: [
+                            {
+                                name: '更新题目',
+                                handleClick: this.doUpdateQuestion,
+                                showControl: (row) => { return row.createUserId == this.userId; },
+                                type: 'success'
+                            },
+                            {
+                                name: '更新选项',
+                                handleClick: this.doupdateAnswers,
+                                showControl: (row) => { return row.createUserId == this.userId && row.type != 'judge'; },
+                                type: 'success'
+                            },
+                            {
+                                name: '更新答案',
+                                handleClick: this.doUpdateAnswer,
+                                showControl: (row) => { return row.createUserId == this.userId; },
+                                type: 'success'
+                            },
+                            {
+                                name: '删 除',
+                                handleClick: this.doDelete,
+                                showControl: (row) => { return row.createUserId == this.userId; },
+                                type: 'danger'
+                            },
+                            {
+                                name: '详 情',
+                                handleClick: this.doDetail,
+                                showControl: (row) => { return row.createUserId != this.userId; }
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: '添 加', handler: this.doCreate }
+                ]
+            }
+        };
+    },
+    computed: {
+        userId() {
+            return this.$store.state.user.id;
+        }
+    },
+    methods: {
+        doCreate() {
+            this.$router.push({path: `${UrlConfig.bank.questionCreate}`});
+        },
+
+        doUpdate(index, row) {
+            this.$router.push({path: `${UrlConfig.bank.questionModify}/${row.id}`});
+        },
+
+        doUpdateQuestion(index, row) {
+            this.$refs.question.doShow({index, row});
+        },
+
+        doupdateAnswers(index, row) {
+            this.$router.push({path: `${UrlConfig.bank.questionUpdate}/${row.id}`});
+        },
+
+        doUpdateAnswer(index, row) {
+            this.$refs.answer.doShow({index, row});
+        },
+
+        doDelete(index, row) {
+            this.$confirm('删除试题，是否继续？', '提 示', {
+                confirmButtonText: '确 定',
+                cancelButtonText: '取 消',
+                type: 'warning'
+            }).then(() => {
+                // deleteQuestion(row.id).then(resp => {
+                //     this.reloadTable();
+                // }).catch(error => {
+                //     this.$message.error(`删除试题失败: ${error.message}`);
+                // });
+            }).catch( () => { });
+        },
+
+        doDetail(index, row) {
+            this.$refs.detail.doShow({index, row});
+        },
+
+        updateQuestion(form) {
+            // updateQuestion(form.id, form).then(resp => {
+            //     this.reloadTable();
+            // }).catch(error => {
+            //     this.$message.error(`修改问题失败: ${error.message}`);
+            // });
+        },
+
+        updateAnswer(form) {
+            // updateAnswer(form.questionId, form).then(resp => {
+            //     this.reloadTable();
+            // }).catch(error => {
+            //     this.$message.error(`修改答案失败: ${error.message}`);
+            // });
+
+        },
+        answerTags(row) {
+            const answer = [];
+            row.optionList.forEach((el, i) => {
+                switch (row.type) {
+                case 'select':
+                    if (el.correct) {
+                        answer.push(this.$asc2chart(i + 65));
+                    }
+                    break;
+                case 'judge':
+                    if (el.correct) {
+                        answer.push(el.content);
+                    }
+                    break;
+                }
+            });
+            return answer;
+        },
+
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
+};
+</script>
diff --git a/src/views/competitionManage/bankList/item-answer.vue b/src/views/competitionManage/bankList/item-answer.vue
new file mode 100644
index 000000000..9f44910e3
--- /dev/null
+++ b/src/views/competitionManage/bankList/item-answer.vue
@@ -0,0 +1,55 @@
+<template>
+  <div>
+    <template v-if="type=='select'">
+      <el-radio-group v-model="active" @change="onChange">
+        <el-radio v-for="(el,i) in optionList" :key="i" :label="i"> 选项-{{ $asc2chart(65+i) }} </el-radio>
+      </el-radio-group>
+    </template>
+    <template v-if="type=='judge'">
+      <el-radio-group v-model="active" @change="onChange">
+        <el-radio :label="0"> √ </el-radio>
+        <el-radio :label="1"> × </el-radio>
+      </el-radio-group>
+    </template>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+    props: {
+        value: {
+            type: Number,
+            default: 0
+        },
+        optionList: {
+            type: Array,
+            required: true
+        },
+        type: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            active: 0
+        };
+    },
+    watch: {
+        value(val) {
+            this.active = val;
+        }
+    },
+    methods: {
+        onChange(e) {
+            this.$emit('input', e);
+            this.$emit('change', e);
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/competitionManage/bankList/item-options.vue b/src/views/competitionManage/bankList/item-options.vue
new file mode 100644
index 000000000..24b4d6117
--- /dev/null
+++ b/src/views/competitionManage/bankList/item-options.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="option">
+    <template v-if="type=='select'">
+      <div v-for="(el,i) in optionList" :key="i" class="option__item">
+        <div> 选项-{{ $asc2chart(65+i) }} </div>
+        <item-rich v-model="el.content" :remove="remove" @modify="doModify(el)" @remove="doRemove(i)" />
+      </div>
+      <el-button v-if="add" class="item__button" type="primary" size="mini" icon="el-icon-plus" @click="doAppend" />
+    </template>
+  </div>
+</template>
+
+<script>
+import ItemRich from './item-rich';
+
+export default {
+    components: {
+        ItemRich
+    },
+    props: {
+        optionList: {
+            type: Array,
+            required: true
+        },
+        type: {
+            type: String,
+            required: true
+        },
+        add: {
+            type: Boolean,
+            default: false
+        },
+        remove: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data() {
+        return {
+        };
+    },
+    methods: {
+        doModify(el) {
+            this.$emit('modify', {model: el, prop: 'content'});
+        },
+        doRemove(index) {
+            this.$emit('remove', index);
+        },
+        doAppend() {
+            this.$emit('append');
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+    .option {
+		&__item {
+			margin-bottom: 10px;
+		}
+    }
+</style>
diff --git a/src/views/competitionManage/bankList/item-rich.vue b/src/views/competitionManage/bankList/item-rich.vue
new file mode 100644
index 000000000..570bc17c0
--- /dev/null
+++ b/src/views/competitionManage/bankList/item-rich.vue
@@ -0,0 +1,55 @@
+<template>
+  <div class="item no-select" :style="{height: height+'px'}">
+    <div class="ql-editor item__text" @click="doModify" v-html="$escapeHTML(`${value}`)" />
+    <el-button class="item__button" type="primary" size="mini" icon="el-icon-edit" circle @click="doModify" />
+    <el-button v-if="remove" class="item__button" type="danger" size="mini" icon="el-icon-delete" circle @click="doRemove" />
+  </div>
+</template>
+
+<script>
+
+export default {
+    props: {
+        value: {
+            type: String,
+            default: ''
+        },
+        height: {
+            type: Number,
+            default: 60
+        },
+        remove: {
+            type: Boolean,
+            default: false
+        }
+    },
+    methods: {
+        doModify() {
+            this.$emit('modify', this.value);
+        },
+        doRemove() {
+            this.$emit('remove', this.value);
+        }
+    }
+};
+
+</script>
+
+<style lang="scss" scoped>
+    .item {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        &__text {
+            flex: 1;
+            background: #f1f1f1;
+        }
+
+        &__button {
+            width: 32px;
+            margin-left: 10px;
+            place-self: flex-end;
+        }
+    }
+</style>
diff --git a/src/views/competitionManage/bankList/question-create-page.vue b/src/views/competitionManage/bankList/question-create-page.vue
new file mode 100644
index 000000000..6108d55bd
--- /dev/null
+++ b/src/views/competitionManage/bankList/question-create-page.vue
@@ -0,0 +1,109 @@
+<template>
+  <div class="page">
+    <div class="page__container">
+      <el-card class="page__container-body">
+        <question-form ref="info" :option="formModel" :remove="true" @modify="doModify" />
+      </el-card>
+      <div class="page__container-footer">
+        <el-button type="primary" :is-create="true" @click="create">提 交</el-button>
+        <el-button @click="back">返 回</el-button>
+      </div>
+    </div>
+    <dialog-modify-rich ref="rich" />
+  </div>
+</template>
+
+<script>
+import QuestionForm from './question-form.vue';
+import DialogModifyRich from './dialog-modify-rich';
+import { createQuestion } from '@/api/questionBank.js';
+import * as authUtils from '@/utils/auth.js';
+
+export default {
+    components: {
+        QuestionForm,
+        DialogModifyRich
+    },
+    data() {
+        return {
+            active: 0,
+            formModel: {
+                id: '',
+                topic: '',
+                type: 'select',
+                answer: 0,
+                optionList: []
+            }
+        };
+    },
+    computed: {
+        deviceId() {
+            return this.$route.params.deviceId;
+        },
+        path() {
+            return this.$route.path;
+        }
+    },
+    created() {
+        const value = authUtils.getSessionStorage(this.path);
+        if (value) {
+            const model = JSON.parse(value);
+            this.formModel.type = model.type;
+        }
+    },
+    methods: {
+        doBack() {
+            this.$router.go(-1);
+        },
+        doModify(node) {
+            this.$refs.rich.doShow(node);
+        },
+        create() {
+            this.$refs.info.validate().then(valid => {
+                if (valid) {
+                    createQuestion(this.formModel).then(resp => {
+                        authUtils.setSessionStorage(this.path, JSON.stringify({
+                            type: this.formModel.type
+                        }));
+                        this.doBack();
+                    }).catch(error => {
+                        this.$message.error(`创建试题失败: ${error.message}`);
+                    });
+                }
+            }).catch(error => { this.$message.warning(error.message); });
+        },
+        back() {
+            this.$router.go(-1);
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+	.page {
+		width: 100%;
+		&__container {
+			width: 55%;
+			margin: auto;
+			&-header {
+				margin-bottom: 10px;
+				.step-group {
+                    margin: 10px 0;
+					.box {
+						display: flex;
+						justify-content: flex-end;
+					}
+                }
+			}
+
+			&-body {
+				padding: 40px;
+			}
+
+			&-footer {
+				margin-top: 20px;
+				display: flex;
+				justify-content: center;
+			}
+		}
+	}
+</style>
diff --git a/src/views/competitionManage/bankList/question-form.vue b/src/views/competitionManage/bankList/question-form.vue
new file mode 100644
index 000000000..bdfb6b208
--- /dev/null
+++ b/src/views/competitionManage/bankList/question-form.vue
@@ -0,0 +1,129 @@
+<template>
+  <div>
+    <el-form ref="form" :model="option" :rules="rules" label-width="80px">
+      <el-form-item label="类 型" prop="type">
+        <el-select v-model="option.type" :disabled="disabled" placeholder="请选择试题类型" @change="onTypeChnage">
+          <el-option v-for="it in QuestionTypeList" :key="it.value" :label="it.label" :value="it.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="问 题" prop="topic">
+        <item-rich v-model="option.topic" @modify="onModify({model: option, prop: 'topic'})" />
+      </el-form-item>
+      <template v-if="isCreate">
+        <el-form-item v-if="option.type != 'judge'" label="选 项" prop="optionList">
+          <item-options :option-list="optionList" :type="option.type" :add="isSelect" :remove="remove" @remove="onRemove" @modify="onModify" @append="onAppend" />
+        </el-form-item>
+        <el-form-item label="答 案" prop="answer">
+          <item-answer v-model="option.answer" :option-list="optionList" :type="option.type" @change="onAnswerChnage" />
+        </el-form-item>
+      </template>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import ItemRich from './item-rich';
+import ItemOptions from './item-options';
+import ItemAnswer from './item-answer';
+
+export default {
+    components: {
+        ItemRich,
+        ItemOptions,
+        ItemAnswer
+    },
+    props: {
+        disabled: {
+            type: Boolean,
+            default: false
+        },
+        option: {
+            type: Object,
+            required: true
+        },
+        isCreate: {
+            type: Boolean,
+            default: true
+        },
+        remove: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data() {
+        return {
+        };
+    },
+    computed: {
+        isSelect() {
+            return this.remove && this.option.type == 'select';
+        },
+        templateMap() {
+            return {
+                select: function() {
+                    return [
+                        { content: '', correct: true },
+                        { content: '', correct: false },
+                        { content: '', correct: false },
+                        { content: '', correct: false }
+                    ];
+                },
+                judge: function() {
+                    return [
+                        { content: '√', correct: true },
+                        { content: '×', correct: false }
+                    ];
+                }
+            };
+        },
+        optionList() {
+            return this.option.optionList;
+        },
+        QuestionTypeList() {
+            return this.$ConstSelect.QuestionTypeList;
+        },
+        rules() {
+            return {
+                topic: [
+                    { required: true, message: '请输入试题内容', trigger: 'blur' }
+                ],
+                type: [
+                    { required: true, message: '请输入试题类型', trigger: 'change' }
+                ],
+                answer: [
+                    { required: true, message: '请选择正确答案', trigger: 'change' }
+                ]
+            };
+        }
+    },
+    mounted() {
+        this.onTypeChnage(this.option.type);
+    },
+    methods: {
+        validate() {
+            return new Promise((resolve, reject) => {
+                this.$refs['form'].validate((valid) => {
+                    resolve(valid);
+                });
+            });
+        },
+        onTypeChnage(type) {
+            if (this.templateMap[type]) {
+                this.option.optionList = this.templateMap[type]();
+            }
+        },
+        onAnswerChnage(answer) {
+            this.option.optionList.forEach((el, i) => { el.correct = i == answer; });
+        },
+        onModify(node) {
+            this.$emit('modify', node);
+        },
+        onAppend() {
+            this.option.optionList.push({content: '', correct: false});
+        },
+        onRemove(index) {
+            this.option.optionList.splice(index, 1);
+        }
+    }
+};
+</script>
diff --git a/src/views/competitionManage/bankList/question-update-page.vue b/src/views/competitionManage/bankList/question-update-page.vue
new file mode 100644
index 000000000..46eb59ee8
--- /dev/null
+++ b/src/views/competitionManage/bankList/question-update-page.vue
@@ -0,0 +1,104 @@
+<template>
+  <div class="page">
+    <div class="page__container">
+      <el-card class="page__container-body">
+        <item-options :option-list="optionList" :type="formModel.type" @modify="doModify" />
+      </el-card>
+    </div>
+    <div class="page__container-footer">
+      <el-button @click="back">返 回</el-button>
+    </div>
+    <dialog-modify-rich ref="rich" @update="update" />
+  </div>
+</template>
+
+<script>
+import ItemOptions from './item-options';
+import DialogModifyRich from './dialog-modify-rich';
+import { getQuestionInfo, getOptionsByQuestionId, updateOption } from '@/api/questionBank.js';
+
+export default {
+    components: {
+        ItemOptions,
+        DialogModifyRich
+    },
+    data() {
+        return {
+            formModel: {
+                id: '',
+                topic: '',
+                type: '',
+                answer: 0
+            },
+            optionList: []
+        };
+    },
+    computed: {
+        questionId() {
+            return this.$route.params.questionId;
+        }
+    },
+    watch: {
+        '$router': function() {
+            this.loadInitData();
+        }
+    },
+    created() {
+        this.loadInitData();
+    },
+    methods: {
+        loadInitData() {
+            getQuestionInfo(this.questionId).then(resp => {
+                this.formModel = resp.data;
+                getOptionsByQuestionId(this.questionId).then(resp => {
+                    this.optionList = resp.data;
+                });
+            });
+        },
+        doBack() {
+            this.$router.go(-1);
+        },
+        doModify(node) {
+            this.$refs.rich.doShow(node);
+        },
+        update(data) {
+            updateOption(data.id, data).then(resp => {
+            }).catch(error => {
+                this.$message.error(`更新选项失败: ${error.message}`);
+            });
+        },
+        back() {
+            this.$router.go(-1);
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+	.page {
+		width: 100%;
+		&__container {
+			width: 55%;
+			margin: auto;
+			&-header {
+				margin-bottom: 10px;
+				.step-group {
+                    margin: 10px 0;
+					.box {
+						display: flex;
+						justify-content: flex-end;
+					}
+                }
+			}
+
+			&-body {
+				padding: 40px;
+			}
+
+			&-footer {
+				margin-top: 20px;
+				display: flex;
+				justify-content: center;
+			}
+		}
+	}
+</style>
diff --git a/src/views/newMap/displayNew/menuTrainList.vue b/src/views/newMap/displayNew/menuTrainList.vue
index 30c5769a9..97557e482 100644
--- a/src/views/newMap/displayNew/menuTrainList.vue
+++ b/src/views/newMap/displayNew/menuTrainList.vue
@@ -1,15 +1,10 @@
 <template>
-  <div class="menuTrainListOut">
-    <div v-if="drawer" class="menuTrainListBtn" @click="clickBtn"><i
-      class="el-icon-more"
-      style="font-size: 20px;margin-top: 9px;transform-origin: 50% 50%;transform: rotate(90deg);margin-left: -10px;"
-    /></div>
+  <div class="menuTrainListOut" :class="{'xian_01' : lineCode == '11'}">
+    <div v-if="drawer" class="menuTrainListBtn" @click="clickBtn">
+      <i class="el-icon-more" style="font-size: 20px;margin-top: 9px;transform-origin: 50% 50%;transform: rotate(90deg);margin-left: -10px;" /></div>
     <div v-else class="menuTrainListBtn1" @click="clickBtn">
       <div class="menuTrainListBtn1In">
-        <i
-          class="el-icon-more"
-          style="font-size: 20px;margin-top: 9px;transform-origin: 50% 50%;transform: rotate(90deg);"
-        />
+        <i class="el-icon-more" style="font-size: 20px;margin-top: 9px;transform-origin: 50% 50%;transform: rotate(90deg);" />
       </div>
     </div>
     <div
@@ -38,18 +33,23 @@ export default {
             oldDevice: null
         };
     },
+    computed: {
+        lineCode() {
+            return this.$route.query.lineCode;
+        }
+    },
     watch:{
         '$store.state.map.trainListUpdate': function (val) {
             this.trainList = this.$store.state.map.map.trainList.filter((train)=>{
                 return train.serviceNumber != '' && train.serviceNumber != undefined;
             });
+            console.log(this.trainList);
         },
         '$store.state.map.runPlanStatus': function (val) {
             if (!val) {
                 this.trainList = [];
             }
         }
-
     },
     mounted() {
     },
@@ -67,29 +67,7 @@ export default {
         // 设置显示中心
         setCenter(code) {
             this.$emit('setCenter', code);
-            // const device = this.$store.getters['map/getDeviceByCode'](code);
-            // this.deviceHighLight(this.oldDevice, false);
-            // this.deviceHighLight(device, true);
-            // this.oldDevice = device;
         }
-        // 高亮设备
-        // deviceHighLight(device, flag) {
-        //     if (device && device.instance && typeof device.instance.drawSelected === 'function' ) {
-        //         if (device._type === 'Section' && device.type === '04') {
-        //             device.relevanceSectionList.forEach(item => {
-        //                 const sectionModel = this.$store.getters['map/getDeviceByCode'](item);
-        //                 sectionModel && sectionModel.instance.drawSelected(flag);
-        //             });
-        //         } else if (device._type === 'Section' && device.type === '01' && device.logicSectionCodeList && device.logicSectionCodeList.length) {
-        //             device.logicSectionCodeList.forEach(item => {
-        //                 const sectionModel = this.$store.getters['map/getDeviceByCode'](item);
-        //                 sectionModel && sectionModel.instance.drawSelected(flag);
-        //             });
-        //         } else {
-        //             device.instance.drawSelected(flag);
-        //         }
-        //     }
-        // }
     }
 };
 </script>
diff --git a/src/views/system/dictionaryDetail/index.vue b/src/views/system/dictionaryDetail/index.vue
index 81c30dbb4..e56b0aeaa 100644
--- a/src/views/system/dictionaryDetail/index.vue
+++ b/src/views/system/dictionaryDetail/index.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-    <!-- <turnback-bar :title="turnbackBarTitle"></turnback-bar> -->
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <div class="draft">
       <el-button-group>
@@ -102,12 +101,6 @@ export default {
         };
     },
 
-    // computed: {
-    //     turnbackBarTitle() {
-    //         return this.dic.name + '(' + this.dic.code + ')'
-    //     }
-    // },
-
     created() {
         this.dicId = this.$route.query.id;
         getData(this.dicId).then(response => {

From 6354b60a5802cbedb5379c3188d4eb08b159b68b Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 26 May 2020 16:01:41 +0800
Subject: [PATCH 42/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/competitionManage/bankList/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue
index 7ca581c8b..ee3566120 100644
--- a/src/views/competitionManage/bankList/index.vue
+++ b/src/views/competitionManage/bankList/index.vue
@@ -107,7 +107,7 @@ export default {
                                 type: 'danger'
                             },
                             {
-                                name: '详 情',
+                                name: '预 览',
                                 handleClick: this.doDetail,
                                 showControl: (row) => { return row.createUserId != this.userId; }
                             }

From 7587475f3821ba5f4dbdee6111470ed824774b1e Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 26 May 2020 16:17:16 +0800
Subject: [PATCH 43/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=BD=A6?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C&=E8=B0=83=E6=95=B4=E5=88=97=E8=BD=A6?=
 =?UTF-8?q?=E5=9C=A8=E4=BA=BA=E5=B7=A5=E8=BD=A6=E5=92=8C=E5=A4=B4=E7=A0=81?=
 =?UTF-8?q?=E8=BD=A6=E4=B8=8B=E7=9A=84=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/map.js                            |   7 +
 src/jmapNew/shape/Train/TrainBody.js          |   2 +-
 src/jmapNew/shape/Train/index.js              |   3 +-
 .../xian_01/menus/dialog/trainControl.vue     | 109 ++------
 .../theme/xian_01/menus/utils/menuOperate.js  |   4 +
 .../xian_02/menus/dialog/trainDestination.vue | 181 +++++++++++++
 src/jmapNew/theme/xian_02/menus/menuTrain.vue | 244 ++++++------------
 src/utils/baseUrl.js                          |   2 +-
 8 files changed, 293 insertions(+), 259 deletions(-)
 create mode 100644 src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue

diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index f45e76172..df076df0e 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -291,6 +291,13 @@ class Jlmap {
         (list || []).forEach(elem => {
             const code = elem.code;
             const type = elem._type;
+            if (elem.deviceType === 'TRAIN' && elem.type === 'HEAD') {
+                elem.serviceNumber = '';
+            } else if (elem.deviceType === 'TRAIN' && elem.type === 'MANUAL') {
+                elem.serviceNumber = '';
+                elem.tripNumber = '';
+                elem.destinationCode = '';
+            }
             const oDevice = this.mapDevice[code] || deviceFactory(type, elem);
             this.hookHandle(oDevice, elem);
         });
diff --git a/src/jmapNew/shape/Train/TrainBody.js b/src/jmapNew/shape/Train/TrainBody.js
index be043e588..665d41f82 100644
--- a/src/jmapNew/shape/Train/TrainBody.js
+++ b/src/jmapNew/shape/Train/TrainBody.js
@@ -99,7 +99,7 @@ export default class TrainBody extends Group {
             textAlign: 'middle',
             textVerticalAlign: 'top'
         }) : '';
-        const serviceNumber = style.Train.trainServer.serviceNumberPrefix + (model.serviceNumber || style.Train.trainServer.defaultServiceNumber) + '';//	服务号(表号)
+        const serviceNumber = style.Train.trainServer.serviceNumberPrefix + (model.serviceNumber || model.model.specialServiceNumber || style.Train.trainServer.defaultServiceNumber) + '';//	服务号(表号)
         const tripNumber = style.Train.trainTarget.tripNumberPrefix + (style.Train.trainTarget.defaultDirectionCode
             ? (model.directionCode || style.Train.trainTarget.defaultDirectionCode) + (model.tripNumber || style.Train.trainTarget.defaultTripNumber)
             : model.tripNumber || style.Train.trainTarget.defaultTripNumber) + ''; //  车次号
diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index 092991e40..a93cd9c21 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -29,12 +29,11 @@ export default class Train extends Group {
             style.Train.trainBody.specialTrainType.some((item) => {
                 if (model.type === item.type) {
                     this.nameFormat = item.nameFormat;
-                    model.serviceNumber = item.serviceNumber ? item.serviceNumber : model.serviceNumber;
+                    model.specialServiceNumber = item.serviceNumber ? item.serviceNumber : model.serviceNumber;
                     return true;
                 }
             });
         }
-
         this.create();
         this.setState(model, this);
         this.initShowStation(model);
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
index 9aba8ad7b..39418e54e 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
@@ -82,9 +82,6 @@ export default {
     data() {
         return {
             trainList: [],
-            categoryList: [
-                { name: 'MM', value: '01' }
-            ],
             formModel: {
                 tripNumber: '',
                 groupNumber: '',
@@ -121,27 +118,15 @@ export default {
         ...mapGetters('map', [
             'map'
         ]),
-        trainNoIsDisabled() {
-            return false;
-        },
         serverNoIsDisabled() {
             return true;
         },
-        targetCodeIsDisabled() {
-            return true;
-        },
         trainNumberIsDisabled() {
             if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
                 return true;
             }
             return '';
         },
-        // trainTypeIsDisabled() {
-        // 	if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
-        // 		return true;
-        // 	}
-        // 	return '';
-        // },
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
@@ -227,30 +212,9 @@ export default {
                 return this.$t('menu.menuTrain.editTrainId');
             }
             return '';
-        },
-        istargetCode() {
-            if (this.formModel.serviceNumber && this.formModel.targetCode) {
-                return false;
-            }
-            return true;
         }
     },
-    watch: {
-        // 'formModel.tripNumber': function(val) {
-        //     if (val.length == 4) {
-        //         // this.trainNoChange(val);
-        //     } else {
-        //         this.formModel = {
-        //             groupNumber: this.formModel.groupNumber,
-        //             tripNumber: val,
-        //             type: this.formModel.type,
-        //             serviceNumber: '',
-        //             destinationCode: '',
-        //             category: 'MM'
-        //         };
-        //     }
-        // }
-    },
+    watch: {},
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');
@@ -287,18 +251,16 @@ export default {
         },
         trainNumberChange(groupNumber) {
             const operate = {
-
-                val: `${groupNumber}`,
+                groupNumber: groupNumber,
                 operation: ''
             };
-
             if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.addTrainId.trainNumberChange.operation;
             } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
             }
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -306,18 +268,15 @@ export default {
         },
         trainTypeChange(trainType) {
             const operate = {
-
-                val: `${trainType}`,
+                type: trainType,
                 operation: ''
             };
-
             if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.addTrainId.trainTypeChange.operation;
             } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
             }
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -325,42 +284,18 @@ export default {
         },
         trainNoChange(tripNumber) {
             const operate = {
-                send: true,
-
-                val: tripNumber,
+                tripNumber: tripNumber,
                 operation: ''
             };
-
             if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.addTrainId.trainNoChange.operation;
-                operate.cmdType = CMD.Train.addTrainId;
             } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
-                operate.cmdType = CMD.Train.editTrainId;
             }
             Handler.undo(1);
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            this.$store.dispatch('training/tripNumber', operate).then(({ valid }) => {
                 if (valid) {
-                    if (response.data) {
-                        this.formModel = {
-                            groupNumber: this.formModel.groupNumber,
-                            tripNumber: tripNumber,
-                            trainType: this.formModel.trainType,
-                            serviceNumber: response.data.serviceNumber,
-                            targetCode: response.data.targetCode,
-                            category: 'MM'
-                        };
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    } else {
-                        this.formModel = {
-                            groupNumber: this.formModel.groupNumber,
-                            tripNumber: tripNumber,
-                            trainType: this.formModel.trainType,
-                            serviceNumber: '',
-                            targetCode: '',
-                            category: 'MM'
-                        };
-                    }
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
             });
         },
@@ -377,23 +312,25 @@ export default {
         addTrainId() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
-                    const model = this.formModel;
-                    const operate = {
-                        send: true,
-
-                        operation: OperationEvent.Train.addTrainId.menu.operation,
-                        cmdType: CMD.Train.CMD_ADD_TRAIN_ID,
-                        messages: [this.$t('tip.addTrainIdTip')],
-                        val: `${model.groupNumber}::${model.trainType}::${model.serviceNumber}::${model.tripNumber}::${model.targetCode}`
+                    const params = {
+                        groupNumber: this.formModel.groupNumber,
+                        type: this.formModel.type,
+                        serviceNumber: '',
+                        tripNumber: '',
+                        destinationCode: ''
                     };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (this.formModel.type === 'PLAN') {
+                        params.serviceNumber = this.formModel.serviceNumber;
+                        params.tripNumber = this.formModel.tripNumber;
+                        params.destinationCode = this.formModel.destinationCode;
+                    } else if (this.formModel.type === 'HEAD') {
+                        params.tripNumber = this.formModel.tripNumber;
+                        params.destinationCode = this.formModel.destinationCode;
+                    }
+                    commitOperate(menuOperate.TrainWindow.addTrainId, params, 2).then(({valid})=>{
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                            this.$refs.confirmTrain.doShow(operate);
                         }
                     }).catch(() => {
                         this.loading = false;
diff --git a/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js b/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js
index 2323957ec..cf5475044 100644
--- a/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js
+++ b/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js
@@ -268,6 +268,10 @@ export const menuOperate = {
         editTrainId: {
             operation: OperationEvent.Train.editTrainId.menu.operation,
             cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+        },
+        addTrainId: {
+            operation: OperationEvent.Train.addTrainId.menu.operation,
+            cmdType: ''
         }
     },
     Common: {
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
new file mode 100644
index 000000000..1d6d0c9ff
--- /dev/null
+++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
@@ -0,0 +1,181 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="xian-02__system train-move"
+    :title="title"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :span="12">车体号:</el-col>
+      <el-col :span="12">追踪号:</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" />
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">车站</el-col>
+      <el-col :span="11" :offset="1">车次窗</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-input v-model="addModel.stationName" :disabled="true" />
+      </el-col>
+      <el-col :span="11" :offset="1">
+        <el-input v-model="addModel.trainWindowCode" :disabled="true" />
+      </el-col>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="5">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+
+export default {
+    name: 'TrainMove',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            trainNoList: [],
+            selected: null,
+            addModel: {
+                stationName: '',
+                trainWindowCode: '',
+                groupNumber: ''
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdInput() {
+            return this.dialogShow ? OperationEvent.Train.addTrainId.input.domId : '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.addTrainId.menu.domId : '';
+        },
+        title() {
+            return '移动车组号';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                const section = this.$store.getters['map/getDeviceByCode'](selected.sectionCode);
+                if (section) {
+                    const station = this.$store.getters['map/getDeviceByCode'](section.stationCode);
+                    if (station) {
+                        this.addModel.stationName = station.name;
+                    }
+                }
+                this.addModel.trainWindowCode = selected.code;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            this.mouseCancelState(this.selected);
+        },
+        inputGroupNumber() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Train.addTrainId.input.operation,
+                val: this.addModel.groupNumber
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Train.addTrainId.menu.operation,
+                val: this.addModel.groupNumber
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    /deep/ .el-row {
+        margin: 10px
+    }
+
+    .xian-02__system .el-dialog .base-label {
+        background: rgba(0, 0, 0, 0.3);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
index e01bbf2ec..761bdd473 100644
--- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
@@ -1,18 +1,16 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" :tip-msg="topTip" :tip-subhead="tipSubhead" />
+    <pop-menu ref="popMenu" :menu="menu" :tip-msg="topTip" :tip-subhead="tipSubhead" pop-class="xian-02__pop_tip_station" />
     <notice-info ref="noticeInfo" />
     <train-delete ref="trainDelete" />
     <train-define ref="trainDefine" />
     <train-move ref="trainMove" />
-    <!-- <train-edit ref="trainEdit" /> -->
     <train-set-plan ref="trainSetPlan" />
     <train-add-plan ref="trainAddPlan" />
-    <!-- <train-move-evently ref="trainMoveEvently" /> -->
-    <!-- <train-delete-plan ref="trainDeletePlan" /> -->
     <train-set-head ref="trainSetHead" />
     <train-set-work ref="trainSetWork" />
     <trainSetWorkATP ref="trainSetWorkATP" />
+    <train-destination ref="trainDestination" />
   </div>
 </template>
 
@@ -28,6 +26,7 @@ import TrainAddPlan from './dialog/trainAddPlan';
 import TrainSetHead from './dialog/trainSetHead';
 import TrainSetWork from './dialog/trainSetWork';
 import trainSetWorkATP from './dialog/trainSetWorkATP';
+import TrainDestination from './dialog/trainDestination';
 
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
@@ -47,7 +46,8 @@ export default {
         TrainAddPlan,
         TrainSetHead,
         TrainSetWork,
-        trainSetWorkATP
+        trainSetWorkATP,
+        TrainDestination
     },
     props: {
         selected: {
@@ -64,75 +64,6 @@ export default {
             menu: [],
             menuNormal: {
                 Local: [
-                    // {
-                    //     label: '设置车组号',
-                    //     handler: this.addTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '删除车组号',
-                    //     handler: this.delTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '移动车组号',
-                    //     handler: this.moveTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '新建计划车',
-                    //     handler: this.addPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '设置计划车',
-                    //     handler: this.setPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置头码车',
-                    //     handler: this.setHeadTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置人工车',
-                    //     handler: this.setWorkTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设乘务组号',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '标记ATP切除',
-                    //     handler: this.setTrainATPdel,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '标记ATP恢复',
-                    //     handler: this.setTrainATPRec,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '旅行冲突列车',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '列车信息',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // }
                 ],
                 Center: [
                     {
@@ -140,41 +71,51 @@ export default {
                         children: [
                             {
                                 label: '目的地ID',
-                                handler: this.atsAutoControlALL
+                                // handler: this.updateDestination,
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '删除ID',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '更改追踪号',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '交换追踪号',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '运行等级',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '列车模式',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '惰性模式',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '旁路模式',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             }
                         ]
                     },
                     {
                         label: '列车明细',
-                        handler: this.atsAutoControlALL
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
                         label: '请求',
@@ -184,37 +125,45 @@ export default {
                                 children:[
                                     {
                                         label: '扣车',
-                                        handler: this.atsAutoControlALL
+                                        handler: this.undeveloped,
+                                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                                     },
                                     {
                                         label: '发车 ',
-                                        handler: this.atsAutoControlALL
+                                        handler: this.undeveloped,
+                                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                                     }
                                 ]
                             },
                             {
                                 label: '停车/放行',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '就绪状态',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '测试',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '救援列车',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '开车门',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '关车门',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             }
                         ]
                     },
@@ -223,19 +172,23 @@ export default {
                         children: [
                             {
                                 label: '创建设备标签',
-                                handler: this.undeveloped
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '查看设备标签',
-                                handler: this.undeveloped
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '更改设备标签',
-                                handler: this.undeveloped
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '删除设备标签',
-                                handler: this.undeveloped
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             }
                         ]
                     },
@@ -244,87 +197,21 @@ export default {
                         children: [
                             {
                                 label: '完整性报警确认',
-                                handler: this.undeveloped
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             }
                         ]
                     },
                     {
                         label: '更新列车计划',
-                        handler: this.undeveloped
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
                         label: '帮助',
-                        handler: this.undeveloped
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     }
-                    // {
-                    //     label: '设置车组号',
-                    //     handler: this.addTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '删除车组号',
-                    //     handler: this.delTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '移动车组号',
-                    //     handler: this.moveTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '新建计划车',
-                    //     handler: this.addPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '设置计划车',
-                    //     handler: this.setPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置头码车',
-                    //     handler: this.setHeadTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置人工车',
-                    //     handler: this.setWorkTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设乘务组号',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '标记ATP切除',
-                    //     handler: this.setTrainATPdel,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '标记ATP恢复',
-                    //     handler: this.setTrainATPRec,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '旅行冲突列车',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '列车信息',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // }
                 ]
             },
             menuForce: [
@@ -375,14 +262,16 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            if (this.$store.state.training.prdType === '02') {
+                this.menu = this.menuNormal.Center;
+            }
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
             }
         },
         doShow(point) {
-            this.topTip = `道岔: ${this.selected.name}`;
+            this.topTip = `车辆: ${this.selected.serviceNumber}`;
             this.clickEvent();
             this.initMenu();
 
@@ -604,6 +493,23 @@ export default {
                     this.$refs.trainSetWorkATP.doShow(operate, this.selected);
                 }
             });
+        },
+        updateDestination() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Train.destinationTrainId.menu.operation,
+                param: {
+                    trainCode: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) =>{
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainDestination.doShow(operate, this.selected);
+                    this.doClose();
+                }
+            });
         }
     }
 };
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 818fe4147..778caeb7b 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -9,7 +9,7 @@ export function getBaseUrl() {
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
-        // BASE_API = 'http://2i38984j47.qicp.vip';    // 张赛
+        // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
     } else {
         BASE_API = process.env.VUE_APP_BASE_API;
     }

From 31a82432d155d26b3f2911e8a3177f89cf9a44af Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 26 May 2020 17:33:19 +0800
Subject: [PATCH 44/85] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AF=95=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index_Common.js                    |   6 +
 src/views/competitionManage/generatePaper.vue | 105 ++++++++++++++++++
 src/views/competitionManage/index.vue         |   7 ++
 3 files changed, 118 insertions(+)
 create mode 100644 src/views/competitionManage/generatePaper.vue

diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index ea4ed5fea..74c3a4d96 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -126,6 +126,7 @@ const RaceManage = () => import('@/views/competitionManage/index');
 const BankManage = () => import('@/views/competitionManage/bankList/index');
 const QuestionCreatePage = () => import('@/views/competitionManage/bankList/question-create-page');
 const QuestionUpdatePage = () => import('@/views/competitionManage/bankList/question-update-page');
+const GeneratePaper = () => import('@/views/competitionManage/generatePaper');
 
 const CompetitionDetail = () => import('@/views/jsxt/competition/examDetail');
 const CompetitionManage = () => import('@/views/jsxt/competition/index');
@@ -949,6 +950,11 @@ export const asyncRouter = [
                 path: 'questionUpdate/:questionId',
                 component: QuestionUpdatePage,
                 hidden: true
+            },
+            {
+                path: 'generate',
+                component: GeneratePaper,
+                hidden: true
             }
         ]
     }
diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
new file mode 100644
index 000000000..f0195407c
--- /dev/null
+++ b/src/views/competitionManage/generatePaper.vue
@@ -0,0 +1,105 @@
+<template>
+  <div style="width: 100%;height: 100%;">
+    <div style="margin-top: 10px;position: absolute; right: 50px;">
+      <el-button size="small" type="primary">导出试题</el-button>
+      <el-button size="small" type="primary" @click="goBack">返回</el-button>
+    </div>
+    <el-card style="width: 45%;margin-left: 50px;margin-top: 60px;display: inline-block;">
+      <div slot="header">
+        <span>理论试题列表</span>
+        <el-button style="float: right; padding: 3px 0" type="text">添加试题</el-button>
+        <el-button style="float: right; padding: 3px 0;margin-right: 5px" type="text">预览</el-button>
+      </div>
+      <el-table
+        :data="tableData"
+        style="width: 100%"
+      >
+        <el-table-column
+          prop="type"
+          label="类型"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              type="primary"
+              disable-transitions
+            >{{ QuestionTypeMap[scope.row.type] }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="topic"
+          label="题目"
+        />
+        <el-table-column
+          prop="score"
+          label="分值"
+        />
+        <el-table-column prop="operate" label="操作">
+          <template slot-scope="scope">
+            <el-button type="warning" size="mini" @click="removeQuestion(index, scope)">移出</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-card style="width: 45%;margin-left: calc(10% - 100px);margin-top: 60px;display: inline-block;">
+      <div slot="header">
+        <span>实操试题列表</span>
+        <el-button style="float: right; padding: 3px 0" type="text">添加试题</el-button>
+        <el-button style="float: right; padding: 3px 0;margin-right: 5px" type="text">预览</el-button>
+      </div>
+      <el-table
+        :data="tableData"
+        style="width: 100%"
+      >
+        <el-table-column
+          prop="type"
+          label="类型"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              type="primary"
+              disable-transitions
+            >{{ QuestionTypeMap[scope.row.type] }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="topic"
+          label="题目"
+        />
+        <el-table-column
+          prop="score"
+          label="分值"
+        />
+        <el-table-column prop="operate" label="操作">
+          <template slot-scope="scope">
+            <el-button type="warning" size="mini" @click="removeQuestion(index, scope)">移出</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'GeneratPaper',
+    data() {
+        return {
+            tableData: [],
+            QuestionTypeMap: {
+                select: '选择题',
+                judge: '判断题'
+            }
+        };
+    },
+    method: {
+        removeQuestion(index, row) {},
+        goBack() {
+            this.$router.go(-1);
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/competitionManage/index.vue b/src/views/competitionManage/index.vue
index 7b013f3eb..90dc0be1b 100644
--- a/src/views/competitionManage/index.vue
+++ b/src/views/competitionManage/index.vue
@@ -84,6 +84,10 @@ export default {
                             {
                                 name: '裁判地址',
                                 handleClick: this.showRefereeUrl
+                            },
+                            {
+                                name: '生成试卷',
+                                handleClick: this.generatePaper
                             }
                         ]
                     }
@@ -167,6 +171,9 @@ export default {
                 document.execCommand('Copy'); // 执行浏览器复制命令
                 this.$message.success('报名路径已经复制到粘贴板');
             });
+        },
+        generatePaper(index, row) {
+            this.$router.push({ path: `/design/race/generate`, query: {raceId:row.id} });
         }
     }
 };

From eea3557635b5c2ca538ff7426b680c19fb8ed32f Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 26 May 2020 17:35:55 +0800
Subject: [PATCH 45/85] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AF=95=E9=A2=98?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/competitionManage/generatePaper.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index f0195407c..2394cf54b 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -91,7 +91,7 @@ export default {
             }
         };
     },
-    method: {
+    methods: {
         removeQuestion(index, row) {},
         goBack() {
             this.$router.go(-1);

From d8cfcbd5955a72a857875db1fa41921e5361b3bd Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 May 2020 17:55:11 +0800
Subject: [PATCH 46/85] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E6=93=8D?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=AE=9E=E6=93=8D?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competitionManage.js                  |   9 ++
 src/i18n/langs/en/router.js                   |   4 +-
 src/i18n/langs/zh/router.js                   |   3 +-
 src/iscs/constant/iscsData.js                 |   2 +-
 src/router/index_Common.js                    |  11 +-
 .../bankList/question-create-page.vue         |   1 +
 .../{ => competition}/create.vue              |   0
 .../{ => competition}/index.vue               |   0
 .../competitionManage/practiceList/create.vue | 110 +++++++++++++++
 .../competitionManage/practiceList/index.vue  | 126 ++++++++++++++++++
 10 files changed, 262 insertions(+), 4 deletions(-)
 create mode 100644 src/api/competitionManage.js
 rename src/views/competitionManage/{ => competition}/create.vue (100%)
 rename src/views/competitionManage/{ => competition}/index.vue (100%)
 create mode 100644 src/views/competitionManage/practiceList/create.vue
 create mode 100644 src/views/competitionManage/practiceList/index.vue

diff --git a/src/api/competitionManage.js b/src/api/competitionManage.js
new file mode 100644
index 000000000..0531336a6
--- /dev/null
+++ b/src/api/competitionManage.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+/** 获取实操列表（题库）*/
+export function getPracticeList() {
+    return request({
+        url: `/api/v1/competitionPractical/competition`,
+        method: 'get'
+    });
+}
diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js
index 3d668d8a4..d9474d1a2 100644
--- a/src/i18n/langs/en/router.js
+++ b/src/i18n/langs/en/router.js
@@ -77,5 +77,7 @@ export default {
     iscsSystem: 'Iscs System',
     studentManage: 'Student manage',
     examDetail: 'Exam detail',
-    raceManage: 'Race manage'
+    raceManage: 'Race manage',
+    practiceManage:'Practice manage',
+    bankManage: 'Bank manage'
 };
diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js
index f90f2beb5..e46828125 100644
--- a/src/i18n/langs/zh/router.js
+++ b/src/i18n/langs/zh/router.js
@@ -83,5 +83,6 @@ export default {
     examDetail: '考试详情',
     raceManage: '竞赛管理',
     recaList: '报名列表',
-    bankManage: '题库列表'
+    bankManage: '题库列表',
+    practiceManage:'实操列表'
 };
diff --git a/src/iscs/constant/iscsData.js b/src/iscs/constant/iscsData.js
index ae89ddb24..f445843bb 100644
--- a/src/iscs/constant/iscsData.js
+++ b/src/iscs/constant/iscsData.js
@@ -5,7 +5,7 @@ const iscsData = {
     '21': {
         'iscsLineList':[{'point1':{'x':72, 'y':51}, 'point2':{'x':72, 'y':171}, 'code':'IscsLine_1', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':72, 'y':51}}, {'point1':{'x':72, 'y':286}, 'point2':{'x':72, 'y':381}, 'code':'IscsLine_2', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':72, 'y':286}}, {'point1':{'x':71, 'y':381}, 'point2':{'x':161, 'y':381}, 'code':'IscsLine_3', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':71, 'y':381}}, {'point1':{'x':181, 'y':381}, 'point2':{'x':196, 'y':381}, 'code':'IscsLine_4', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':181, 'y':381}}, {'point1':{'x':51, 'y':471}, 'point2':{'x':1041, 'y':471}, 'code':'IscsLine_5', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':51, 'y':471}}, {'point1':{'x':382, 'y':51}, 'point2':{'x':382, 'y':471}, 'code':'IscsLine_6', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':382, 'y':51}}, {'point1':{'x':442, 'y':41}, 'point2':{'x':442, 'y':186}, 'code':'IscsLine_7', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':442, 'y':41}}, {'point1':{'x':442, 'y':196}, 'point2':{'x':442, 'y':356}, 'code':'IscsLine_8', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':442, 'y':196}}, {'point1':{'x':442, 'y':366}, 'point2':{'x':442, 'y':596}, 'code':'IscsLine_9', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':442, 'y':366}}, {'point1':{'x':652, 'y':41}, 'point2':{'x':652, 'y':186}, 'code':'IscsLine_10', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':652, 'y':41}}, {'point1':{'x':652, 'y':196}, 'point2':{'x':652, 'y':596}, 'code':'IscsLine_11', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':652, 'y':196}}, {'point1':{'x':737, 'y':51}, 'point2':{'x':737, 'y':186}, 'code':'IscsLine_12', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':737, 'y':51}}, {'point1':{'x':737, 'y':196}, 'point2':{'x':737, 'y':470}, 'code':'IscsLine_13', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':737, 'y':196}}, {'point1':{'x':72, 'y':301}, 'point2':{'x':102, 'y':301}, 'code':'IscsLine_14', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':72, 'y':301}}, {'point1':{'x':152, 'y':301}, 'point2':{'x':162, 'y':301}, 'code':'IscsLine_15', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':152, 'y':301}}, {'point1':{'x':181, 'y':301}, 'point2':{'x':196, 'y':301}, 'code':'IscsLine_16', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':181, 'y':301}}, {'point1':{'x':210, 'y':171}, 'point2':{'x':210, 'y':281}, 'code':'IscsLine_22', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':210, 'y':171}}, {'point1':{'x':225, 'y':341}, 'point2':{'x':245, 'y':341}, 'code':'IscsLine_23', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':225, 'y':341}}, {'point1':{'x':315, 'y':341}, 'point2':{'x':390, 'y':341}, 'code':'IscsLine_24', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':315, 'y':341}}, {'point1':{'x':405, 'y':341}, 'point2':{'x':450, 'y':341}, 'code':'IscsLine_25', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':405, 'y':341}}, {'point1':{'x':465, 'y':341}, 'point2':{'x':485, 'y':341}, 'code':'IscsLine_26', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':465, 'y':341}}, {'point1':{'x':610, 'y':341}, 'point2':{'x':630, 'y':341}, 'code':'IscsLine_27', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':610, 'y':341}}, {'point1':{'x':645, 'y':341}, 'point2':{'x':745, 'y':341}, 'code':'IscsLine_28', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':645, 'y':341}}, {'point1':{'x':760, 'y':341}, 'point2':{'x':800, 'y':341}, 'code':'IscsLine_29', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':760, 'y':341}}, {'point1':{'x':365, 'y':171}, 'point2':{'x':365, 'y':511}, 'code':'IscsLine_30', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':365, 'y':171}}, {'point1':{'x':365, 'y':511}, 'point2':{'x':525, 'y':511}, 'code':'IscsLine_31', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':365, 'y':511}}, {'point1':{'x':555, 'y':511}, 'point2':{'x':675, 'y':511}, 'code':'IscsLine_32', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':511}}, {'point1':{'x':675, 'y':170}, 'point2':{'x':675, 'y':510}, 'code':'IscsLine_33', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':675, 'y':170}}, {'point1':{'x':485, 'y':296}, 'point2':{'x':485, 'y':386}, 'code':'IscsLine_34', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':296}}, {'point1':{'x':610, 'y':296}, 'point2':{'x':610, 'y':386}, 'code':'IscsLine_35', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':610, 'y':296}}, {'point1':{'x':485, 'y':296}, 'point2':{'x':545, 'y':296}, 'code':'IscsLine_36', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':296}}, {'point1':{'x':485, 'y':326}, 'point2':{'x':545, 'y':326}, 'code':'IscsLine_37', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':326}}, {'point1':{'x':485, 'y':356}, 'point2':{'x':545, 'y':356}, 'code':'IscsLine_38', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#2AF5E6', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':356}}, {'point1':{'x':485, 'y':386}, 'point2':{'x':545, 'y':386}, 'code':'IscsLine_39', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#2AF5E6', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':386}}, {'point1':{'x':555, 'y':296}, 'point2':{'x':610, 'y':296}, 'code':'IscsLine_40', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':296}}, {'point1':{'x':555, 'y':326}, 'point2':{'x':610, 'y':326}, 'code':'IscsLine_41', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':326}}, {'point1':{'x':555, 'y':356}, 'point2':{'x':610, 'y':356}, 'code':'IscsLine_42', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#2AF5E6', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':356}}, {'point1':{'x':555, 'y':386}, 'point2':{'x':610, 'y':386}, 'code':'IscsLine_43', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#2AF5E6', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':386}}, {'point1':{'x':347, 'y':380}, 'point2':{'x':347, 'y':575}, 'code':'IscsLine_44', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':347, 'y':380}}, {'point1':{'x':346, 'y':575}, 'point2':{'x':357, 'y':575}, 'code':'IscsLine_45', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':346, 'y':575}}, {'point1':{'x':372, 'y':575}, 'point2':{'x':392, 'y':575}, 'code':'IscsLine_46', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':372, 'y':575}}, {'point1':{'x':407, 'y':575}, 'point2':{'x':542, 'y':575}, 'code':'IscsLine_47', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':407, 'y':575}}, {'point1':{'x':567, 'y':575}, 'point2':{'x':727, 'y':575}, 'code':'IscsLine_48', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':567, 'y':575}}, {'point1':{'x':742, 'y':575}, 'point2':{'x':767, 'y':575}, 'code':'IscsLine_49', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':742, 'y':575}}, {'point1':{'x':767, 'y':341}, 'point2':{'x':767, 'y':575}, 'code':'IscsLine_50', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':767, 'y':341}}, {'point1':{'x':867, 'y':341}, 'point2':{'x':890, 'y':341}, 'code':'IscsLine_51', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':867, 'y':341}}, {'point1':{'x':920, 'y':381}, 'point2':{'x':935, 'y':381}, 'code':'IscsLine_52', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':920, 'y':381}}, {'point1':{'x':951, 'y':381}, 'point2':{'x':1045, 'y':381}, 'code':'IscsLine_53', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':951, 'y':381}}, {'point1':{'x':1045, 'y':286}, 'point2':{'x':1045, 'y':381}, 'code':'IscsLine_54', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1045, 'y':286}}, {'point1':{'x':1045, 'y':51}, 'point2':{'x':1045, 'y':171}, 'code':'IscsLine_55', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1045, 'y':51}}, {'point1':{'x':1020, 'y':51}, 'point2':{'x':1020, 'y':171}, 'code':'IscsLine_56', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1020, 'y':51}}, {'point1':{'x':990, 'y':171}, 'point2':{'x':1021, 'y':171}, 'code':'IscsLine_57', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':990, 'y':171}}, {'point1':{'x':941, 'y':171}, 'point2':{'x':973, 'y':171}, 'code':'IscsLine_58', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':941, 'y':171}}, {'point1':{'x':859, 'y':171}, 'point2':{'x':869, 'y':171}, 'code':'IscsLine_59', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':859, 'y':171}}, {'point1':{'x':829, 'y':171}, 'point2':{'x':842, 'y':171}, 'code':'IscsLine_60', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':829, 'y':171}}, {'point1':{'x':731, 'y':171}, 'point2':{'x':772, 'y':171}, 'code':'IscsLine_61', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':731, 'y':171}}, {'point1':{'x':701, 'y':171}, 'point2':{'x':713, 'y':171}, 'code':'IscsLine_62', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':701, 'y':171}}, {'point1':{'x':671, 'y':171}, 'point2':{'x':686, 'y':171}, 'code':'IscsLine_63', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':671, 'y':171}}, {'point1':{'x':636, 'y':171}, 'point2':{'x':651, 'y':171}, 'code':'IscsLine_64', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':636, 'y':171}}, {'point1':{'x':561, 'y':171}, 'point2':{'x':619, 'y':171}, 'code':'IscsLine_65', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':561, 'y':171}}, {'point1':{'x':112, 'y':51}, 'point2':{'x':112, 'y':171}, 'code':'IscsLine_66', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':112, 'y':51}}, {'point1':{'x':112, 'y':171}, 'point2':{'x':122, 'y':171}, 'code':'IscsLine_67', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':112, 'y':171}}, {'point1':{'x':142, 'y':171}, 'point2':{'x':152, 'y':171}, 'code':'IscsLine_68', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':142, 'y':171}}, {'point1':{'x':167, 'y':171}, 'point2':{'x':227, 'y':171}, 'code':'IscsLine_69', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':167, 'y':171}}, {'point1':{'x':284, 'y':171}, 'point2':{'x':294, 'y':171}, 'code':'IscsLine_70', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':284, 'y':171}}, {'point1':{'x':314, 'y':171}, 'point2':{'x':329, 'y':171}, 'code':'IscsLine_71', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':314, 'y':171}}, {'point1':{'x':346, 'y':171}, 'point2':{'x':390, 'y':171}, 'code':'IscsLine_72', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':346, 'y':171}}, {'point1':{'x':407, 'y':171}, 'point2':{'x':415, 'y':171}, 'code':'IscsLine_73', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':407, 'y':171}}, {'point1':{'x':431, 'y':171}, 'point2':{'x':450, 'y':171}, 'code':'IscsLine_74', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':431, 'y':171}}, {'point1':{'x':468, 'y':171}, 'point2':{'x':532, 'y':171}, 'code':'IscsLine_75', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':468, 'y':171}}, {'point1':{'x':1015, 'y':301}, 'point2':{'x':1045, 'y':301}, 'code':'IscsLine_76', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1015, 'y':301}}, {'point1':{'x':950, 'y':301}, 'point2':{'x':960, 'y':301}, 'code':'IscsLine_77', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':950, 'y':301}}, {'point1':{'x':920, 'y':301}, 'point2':{'x':930, 'y':301}, 'code':'IscsLine_78', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':920, 'y':301}}, {'point1':{'x':905, 'y':261}, 'point2':{'x':905, 'y':281}, 'code':'IscsLine_79', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':905, 'y':261}}, {'point1':{'x':905, 'y':225}, 'point2':{'x':905, 'y':245}, 'code':'IscsLine_80', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':905, 'y':225}}, {'point1':{'x':1071, 'y':223}, 'point2':{'x':1071, 'y':241}, 'code':'IscsLine_81', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1071, 'y':223}}], 'iscsRectList':[{'point':{'x':52, 'y':171}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':40, 'height':115, 'zlevel':1, 'z':3}, {'point':{'x':195, 'y':281}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#A39A9A', 'width':30, 'height':111, 'zlevel':1, 'z':3}, {'point':{'x':890, 'y':281}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#A39A9A', 'width':30, 'height':111, 'zlevel':1, 'z':3}, {'point':{'x':1025, 'y':171}, 'code':'IscsRect_4', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':40, 'height':115, 'zlevel':1, 'z':3}, {'point':{'x':870, 'y':146}, 'code':'IscsRect_5', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#A39A9A', 'width':70, 'height':45, 'zlevel':1, 'z':3}], 'iscsTextList':[{'point':{'x':64, 'y':180}, 'code':'IscsText_1', '_type':'IscsText', 'context':'新\n\n\n风\n\n\n道', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':202, 'y':290}, 'code':'IscsText_2', '_type':'IscsText', 'context':'混\n\n\n风\n\n\n室', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':481, 'y':492}, 'code':'IscsText_3', '_type':'IscsText', 'context':'站台回排风/排烟风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':515, 'y':279}, 'code':'IscsText_4', '_type':'IscsText', 'context':'站厅送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':515, 'y':309}, 'code':'IscsText_5', '_type':'IscsText', 'context':'站厅送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':515, 'y':340}, 'code':'IscsText_6', '_type':'IscsText', 'context':'站厅送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':515, 'y':370}, 'code':'IscsText_7', '_type':'IscsText', 'context':'站厅送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':523, 'y':556}, 'code':'IscsText_8', '_type':'IscsText', 'context':'站台送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':53, 'y':451}, 'code':'IscsText_9', '_type':'IscsText', 'context':'站厅层', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':53, 'y':482}, 'code':'IscsText_10', '_type':'IscsText', 'context':'站台层', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':293, 'y':53}, 'code':'IscsText_11', '_type':'IscsText', 'context':'左端环控机房', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':758, 'y':53}, 'code':'IscsText_12', '_type':'IscsText', 'context':'右端环控机房', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':386, 'y':53}, 'code':'IscsText_13', '_type':'IscsText', 'context':'左端管理\n 用房区', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':678, 'y':53}, 'code':'IscsText_14', '_type':'IscsText', 'context':'右端管理\n 用房区', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':456, 'y':55}, 'code':'IscsText_15', '_type':'IscsText', 'context':'公共区', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':598, 'y':54}, 'code':'IscsText_16', '_type':'IscsText', 'context':'公共区', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':897, 'y':290}, 'code':'IscsText_17', '_type':'IscsText', 'context':'混\n\n\n风\n\n\n室', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1039, 'y':180}, 'code':'IscsText_18', '_type':'IscsText', 'context':'新\n\n\n风\n\n\n道', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1036, 'y':37}, 'code':'IscsText_19', '_type':'IscsText', 'context':'新风井', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':993, 'y':37}, 'code':'IscsText_20', '_type':'IscsText', 'context':'排风井', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':877, 'y':164}, 'code':'IscsText_21', '_type':'IscsText', 'context':'回排风室', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':47, 'y':37}, 'code':'IscsText_22', '_type':'IscsText', 'context':'新风井', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':96, 'y':37}, 'code':'IscsText_23', '_type':'IscsText', 'context':'排风井', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':130, 'y':131}, 'code':'IscsText_24', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':123, 'y':119}, 'code':'IscsText_25', '_type':'IscsText', 'context':'MD-4', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':158, 'y':138}, 'code':'IscsText_26', '_type':'IscsText', 'context':'FD2-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':156, 'y':195}, 'code':'IscsText_27', '_type':'IscsText', 'context':'FD1-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':150, 'y':239}, 'code':'IscsText_28', '_type':'IscsText', 'context':'MD-3', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':214, 'y':220}, 'code':'IscsText_29', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':179, 'y':268}, 'code':'IscsText_30', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':145, 'y':262}, 'code':'IscsText_31', '_type':'IscsText', 'context':'MD-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':111, 'y':271}, 'code':'IscsText_32', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':136, 'y':356}, 'code':'IscsText_33', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':259, 'y':135}, 'code':'IscsText_34', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':307, 'y':133}, 'code':'IscsText_35', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':415, 'y':129}, 'code':'IscsText_36', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':653, 'y':131}, 'code':'IscsText_37', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':711, 'y':131}, 'code':'IscsText_38', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':809, 'y':135}, 'code':'IscsText_39', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':984, 'y':133}, 'code':'IscsText_40', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':770, 'y':301}, 'code':'IscsText_41', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':300}, 'code':'IscsText_42', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':682, 'y':401}, 'code':'IscsText_43', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':795, 'y':425}, 'code':'IscsText_44', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':388, 'y':408}, 'code':'IscsText_45', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':368, 'y':384}, 'code':'IscsText_46', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':347, 'y':314}, 'code':'IscsText_47', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':286, 'y':302}, 'code':'IscsText_48', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':425, 'y':302}, 'code':'IscsText_49', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':472, 'y':150}, 'code':'IscsText_50', '_type':'IscsText', 'context':'站厅回风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':550, 'y':150}, 'code':'IscsText_51', '_type':'IscsText', 'context':'站厅回风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':357, 'y':543}, 'code':'IscsText_52', '_type':'IscsText', 'context':'FD1-9', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':396, 'y':543}, 'code':'IscsText_53', '_type':'IscsText', 'context':'FD1-10', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':715, 'y':543}, 'code':'IscsText_54', '_type':'IscsText', 'context':'FD1-11', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':385, 'y':448}, 'code':'IscsText_55', '_type':'IscsText', 'context':'FD2-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':612, 'y':444}, 'code':'IscsText_56', '_type':'IscsText', 'context':'FD2-7', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':612, 'y':415}, 'code':'IscsText_57', '_type':'IscsText', 'context':'MD-14', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':707, 'y':422}, 'code':'IscsText_58', '_type':'IscsText', 'context':'MD-19', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':720, 'y':384}, 'code':'IscsText_59', '_type':'IscsText', 'context':'FD1-7', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':388, 'y':421}, 'code':'IscsText_60', '_type':'IscsText', 'context':'MD-8', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':280, 'y':397}, 'code':'IscsText_61', '_type':'IscsText', 'context':'MD-17', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':291, 'y':367}, 'code':'IscsText_62', '_type':'IscsText', 'context':'FD1-4', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':375, 'y':308}, 'code':'IscsText_63', '_type':'IscsText', 'context':'FD1-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':402, 'y':286}, 'code':'IscsText_64', '_type':'IscsText', 'context':'MD-16', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':317, 'y':302}, 'code':'IscsText_65', '_type':'IscsText', 'context':'MD-5', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':239, 'y':302}, 'code':'IscsText_66', '_type':'IscsText', 'context':'AHU-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':146, 'y':342}, 'code':'IscsText_67', '_type':'IscsText', 'context':'MD-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':98, 'y':257}, 'code':'IscsText_68', '_type':'IscsText', 'context':'FAF-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':446, 'y':361}, 'code':'IscsText_69', '_type':'IscsText', 'context':'FD1-3', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':615, 'y':310}, 'code':'IscsText_70', '_type':'IscsText', 'context':'FD1-6', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':686, 'y':287}, 'code':'IscsText_71', '_type':'IscsText', 'context':'MD-18', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':757, 'y':289}, 'code':'IscsText_72', '_type':'IscsText', 'context':'MD-15', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':726, 'y':312}, 'code':'IscsText_73', '_type':'IscsText', 'context':'FD1-5', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':799, 'y':304}, 'code':'IscsText_74', '_type':'IscsText', 'context':'AHU-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':974, 'y':119}, 'code':'IscsText_75', '_type':'IscsText', 'context':'MD-12', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':837, 'y':135}, 'code':'IscsText_76', '_type':'IscsText', 'context':'FD2-8', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':755, 'y':122}, 'code':'IscsText_77', '_type':'IscsText', 'context':'RAF/SEF-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':711, 'y':119}, 'code':'IscsText_78', '_type':'IscsText', 'context':'MD-13', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':654, 'y':118}, 'code':'IscsText_79', '_type':'IscsText', 'context':'MD-11', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':674, 'y':141}, 'code':'IscsText_80', '_type':'IscsText', 'context':'FD2-6', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':614, 'y':140}, 'code':'IscsText_81', '_type':'IscsText', 'context':'FD2-5', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':470, 'y':177}, 'code':'IscsText_82', '_type':'IscsText', 'context':'FD2-4', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':410, 'y':113}, 'code':'IscsText_83', '_type':'IscsText', 'context':'MD-7', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':374, 'y':141}, 'code':'IscsText_84', '_type':'IscsText', 'context':'FD2-3', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':332, 'y':141}, 'code':'IscsText_85', '_type':'IscsText', 'context':'FD2-9', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':288, 'y':120}, 'code':'IscsText_86', '_type':'IscsText', 'context':'MD-6', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':204, 'y':121}, 'code':'IscsText_87', '_type':'IscsText', 'context':'RAF/SEF-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':952, 'y':347}, 'code':'IscsText_88', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':945, 'y':264}, 'code':'IscsText_89', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':911, 'y':230}, 'code':'IscsText_90', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':998, 'y':264}, 'code':'IscsText_91', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':847, 'y':211}, 'code':'IscsText_92', '_type':'IscsText', 'context':'FD1-8', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':839, 'y':251}, 'code':'IscsText_93', '_type':'IscsText', 'context':'MD-20', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':930, 'y':251}, 'code':'IscsText_94', '_type':'IscsText', 'context':'MD-10', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':976, 'y':250}, 'code':'IscsText_95', '_type':'IscsText', 'context':'FAF-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':947, 'y':333}, 'code':'IscsText_96', '_type':'IscsText', 'context':'MD-9', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':844, 'y':304}, 'code':'IscsText_97', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}], 'volumeControlDamperList':[{'point':{'x':161, 'y':355}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_1', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':161, 'y':278}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_2', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':184, 'y':231}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_3', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':325, 'y':315}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_4', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':412, 'y':314}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_5', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':695, 'y':314}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_6', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':770, 'y':314}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_7', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':320, 'y':385}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_8', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':342, 'y':411}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_9', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':656, 'y':413}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_10', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':748, 'y':419}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_11', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':933, 'y':355}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_12', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':973, 'y':145}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_13', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':712, 'y':145}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_14', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':651, 'y':145}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_15', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':122, 'y':144}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_16', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':294, 'y':144}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_17', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':415, 'y':144}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_18', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':930, 'y':274}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_19', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':880, 'y':241}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_20', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}], 'ventilatorList':[{'point':{'x':103, 'y':282}, '_type':'Ventilator', 'code':'Ventilator_1', 'width':50, 'isRight':true, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':773, 'y':150}, '_type':'Ventilator', 'code':'Ventilator_2', 'width':55, 'isRight':true, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':227, 'y':150}, '_type':'Ventilator', 'code':'Ventilator_3', 'width':55, 'isRight':false, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':959, 'y':280}, '_type':'Ventilator', 'code':'Ventilator_4', 'width':55, 'isRight':false, 'color':'#00ff00', 'zlevel':1, 'z':4}], 'fireDamperList':[{'point':{'x':195, 'y':195}, '_type':'FireDamper', 'code':'FireDamper_1', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':389, 'y':325}, '_type':'FireDamper', 'code':'FireDamper_2', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':449, 'y':326}, '_type':'FireDamper', 'code':'FireDamper_3', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':630, 'y':326}, '_type':'FireDamper', 'code':'FireDamper_4', 'width':15, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':745, 'y':326}, '_type':'FireDamper', 'code':'FireDamper_5', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':332, 'y':365}, '_type':'FireDamper', 'code':'FireDamper_6', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':358, 'y':559}, '_type':'FireDamper', 'code':'FireDamper_7', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':392, 'y':559}, '_type':'FireDamper', 'code':'FireDamper_8', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':727, 'y':560}, '_type':'FireDamper', 'code':'FireDamper_9', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':752, 'y':398}, '_type':'FireDamper', 'code':'FireDamper_10', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':890, 'y':209}, '_type':'FireDamper', 'code':'FireDamper_11', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}], 'airConditionerList':[{'point':{'x':238, 'y':321}, '_type':'AirConditioner', 'code':'AirConditioner_1', 'width':75, 'isRight':true, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':800, 'y':317}, '_type':'AirConditioner', 'code':'AirConditioner_2', 'width':75, 'isRight':false, 'color':'#00ff00', 'zlevel':1, 'z':4}], 'smookExhaustFdList':[{'point':{'x':350, 'y':445}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_1', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':660, 'y':445}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_2', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':843, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_3', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_4', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':620, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_5', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':153, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_6', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':330, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_7', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':391, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_8', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':452, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_9', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}], 'iscsButtonList':[{'point':{'x':1030, 'y':25}, 'code':'IscsButton_1', '_type':'IscsButton', 'levelPadding':30, 'verticalPadding':5, 'context':'图元说明', 'function':'GraphicEle', 'fontSize':14, 'zlevel':1, 'z':4}]
     }, '22':{
-        'iscsRectList':[{'point':{'x':60, 'y':30}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':150, 'y':30}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':240, 'y':30}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':330, 'y':30}, 'code':'IscsRect_4', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':555, 'y':30}, 'code':'IscsRect_5', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':125, 'height':115, 'zlevel':1, 'z':3}, {'point':{'x':680, 'y':30}, 'code':'IscsRect_6', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':355, 'height':135, 'zlevel':1, 'z':3}, {'point':{'x':60, 'y':135}, 'code':'IscsRect_7', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':110, 'height':150, 'zlevel':1, 'z':3}, {'point':{'x':170, 'y':135}, 'code':'IscsRect_8', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':45, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':215, 'y':135}, 'code':'IscsRect_9', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':45, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':170, 'y':205}, 'code':'IscsRect_10', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':80, 'zlevel':1, 'z':3}, {'point':{'x':770, 'y':35}, 'code':'IscsRect_11', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':40, 'height':30, 'zlevel':1, 'z':3}, {'point':{'x':50, 'y':420}, 'code':'IscsRect_12', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':35, 'height':110, 'zlevel':1, 'z':3}, {'point':{'x':85, 'y':420}, 'code':'IscsRect_13', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':70, 'height':110, 'zlevel':1, 'z':3}], 'iscsLineList':[{'point1':{'x':79, 'y':50}, 'point2':{'x':495, 'y':50}, 'code':'IscsLine_1', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':79, 'y':50}}, {'point1':{'x':505, 'y':50}, 'point2':{'x':560, 'y':50}, 'code':'IscsLine_2', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':505, 'y':50}}, {'point1':{'x':575, 'y':50}, 'point2':{'x':685, 'y':50}, 'code':'IscsLine_3', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':575, 'y':50}}, {'point1':{'x':700, 'y':50}, 'point2':{'x':735, 'y':50}, 'code':'IscsLine_4', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':700, 'y':50}}, {'point1':{'x':750, 'y':50}, 'point2':{'x':770, 'y':50}, 'code':'IscsLine_5', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':750, 'y':50}}, {'point1':{'x':810, 'y':50}, 'point2':{'x':830, 'y':50}, 'code':'IscsLine_6', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':810, 'y':50}}, {'point1':{'x':80, 'y':50}, 'point2':{'x':80, 'y':100}, 'code':'IscsLine_7', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':80, 'y':50}}, {'point1':{'x':80, 'y':114}, 'point2':{'x':80, 'y':155}, 'code':'IscsLine_8', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':80, 'y':114}}, {'point1':{'x':90, 'y':185}, 'point2':{'x':90, 'y':205}, 'code':'IscsLine_9', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':90, 'y':185}}, {'point1':{'x':90, 'y':223}, 'point2':{'x':90, 'y':238}, 'code':'IscsLine_10', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':90, 'y':223}}, {'point1':{'x':90, 'y':255}, 'point2':{'x':90, 'y':310}, 'code':'IscsLine_11', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':90, 'y':255}}, {'point1':{'x':89, 'y':310}, 'point2':{'x':475, 'y':310}, 'code':'IscsLine_12', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':89, 'y':310}}, {'point1':{'x':194, 'y':314}, 'point2':{'x':194, 'y':330}, 'code':'IscsLine_13', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':194, 'y':314}}, {'point1':{'x':195, 'y':330}, 'point2':{'x':94, 'y':330}, 'code':'IscsLine_14', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':195, 'y':330}}, {'point1':{'x':94, 'y':330}, 'point2':{'x':94, 'y':480}, 'code':'IscsLine_15', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':94, 'y':330}}, {'point1':{'x':64, 'y':480}, 'point2':{'x':449, 'y':480}, 'code':'IscsLine_16', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':64, 'y':480}}], 'fireDamperList':[{'point':{'x':560, 'y':36}, '_type':'FireDamper', 'code':'FireDamper_1', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':36}, '_type':'FireDamper', 'code':'FireDamper_2', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':68, 'y':100}, '_type':'FireDamper', 'code':'FireDamper_3', 'width':25, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':75, 'y':239}, '_type':'FireDamper', 'code':'FireDamper_4', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}], 'volumeControlDamperList':[{'point':{'x':735, 'y':34}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_1', 'width':15, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':67, 'y':201}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_2', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}], 'orbitalVentilatorList':[], 'airConditionerList':[{'point':{'x':826, 'y':33}, '_type':'AirConditioner', 'code':'AirConditioner_1', 'width':70, 'isRight':true, 'color':'#00ff00', 'zlevel':1, 'z':4}]
+        'iscsRectList':[{'point':{'x':60, 'y':30}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':150, 'y':30}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':240, 'y':30}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':330, 'y':30}, 'code':'IscsRect_4', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':555, 'y':30}, 'code':'IscsRect_5', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':125, 'height':115, 'zlevel':1, 'z':3}, {'point':{'x':680, 'y':30}, 'code':'IscsRect_6', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':355, 'height':135, 'zlevel':1, 'z':3}, {'point':{'x':60, 'y':135}, 'code':'IscsRect_7', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':110, 'height':150, 'zlevel':1, 'z':3}, {'point':{'x':170, 'y':135}, 'code':'IscsRect_8', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':45, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':215, 'y':135}, 'code':'IscsRect_9', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':45, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':170, 'y':205}, 'code':'IscsRect_10', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':80, 'zlevel':1, 'z':3}, {'point':{'x':770, 'y':35}, 'code':'IscsRect_11', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':40, 'height':30, 'zlevel':1, 'z':3}, {'point':{'x':50, 'y':420}, 'code':'IscsRect_12', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':35, 'height':110, 'zlevel':1, 'z':3}, {'point':{'x':85, 'y':420}, 'code':'IscsRect_13', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':70, 'height':110, 'zlevel':1, 'z':3}], 'iscsLineList':[{'point1':{'x':79, 'y':50}, 'point2':{'x':495, 'y':50}, 'code':'IscsLine_1', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':79, 'y':50}}, {'point1':{'x':505, 'y':50}, 'point2':{'x':560, 'y':50}, 'code':'IscsLine_2', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':505, 'y':50}}, {'point1':{'x':575, 'y':50}, 'point2':{'x':685, 'y':50}, 'code':'IscsLine_3', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':575, 'y':50}}, {'point1':{'x':700, 'y':50}, 'point2':{'x':735, 'y':50}, 'code':'IscsLine_4', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':700, 'y':50}}, {'point1':{'x':750, 'y':50}, 'point2':{'x':770, 'y':50}, 'code':'IscsLine_5', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':750, 'y':50}}, {'point1':{'x':810, 'y':50}, 'point2':{'x':830, 'y':50}, 'code':'IscsLine_6', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':810, 'y':50}}, {'point1':{'x':80, 'y':50}, 'point2':{'x':80, 'y':100}, 'code':'IscsLine_7', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':80, 'y':50}}, {'point1':{'x':80, 'y':114}, 'point2':{'x':80, 'y':155}, 'code':'IscsLine_8', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':80, 'y':114}}, {'point1':{'x':90, 'y':185}, 'point2':{'x':90, 'y':205}, 'code':'IscsLine_9', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':90, 'y':185}}, {'point1':{'x':90, 'y':223}, 'point2':{'x':90, 'y':238}, 'code':'IscsLine_10', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':90, 'y':223}}, {'point1':{'x':90, 'y':255}, 'point2':{'x':90, 'y':310}, 'code':'IscsLine_11', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':90, 'y':255}}, {'point1':{'x':89, 'y':310}, 'point2':{'x':475, 'y':310}, 'code':'IscsLine_12', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':89, 'y':310}}, {'point1':{'x':194, 'y':314}, 'point2':{'x':194, 'y':330}, 'code':'IscsLine_13', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':194, 'y':314}}, {'point1':{'x':195, 'y':330}, 'point2':{'x':94, 'y':330}, 'code':'IscsLine_14', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':195, 'y':330}}, {'point1':{'x':94, 'y':330}, 'point2':{'x':94, 'y':480}, 'code':'IscsLine_15', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':94, 'y':330}}, {'point1':{'x':64, 'y':480}, 'point2':{'x':449, 'y':480}, 'code':'IscsLine_16', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':64, 'y':480}}, {'point1':{'x':120, 'y':114}, 'point2':{'x':120, 'y':155}, 'code':'IscsLine_17', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':120, 'y':114}}, {'point1':{'x':120, 'y':75}, 'point2':{'x':120, 'y':100}, 'code':'IscsLine_18', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':120, 'y':75}}, {'point1':{'x':120, 'y':75}, 'point2':{'x':560, 'y':75}, 'code':'IscsLine_19', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':120, 'y':75}}, {'point1':{'x':575, 'y':75}, 'point2':{'x':685, 'y':75}, 'code':'IscsLine_20', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':575, 'y':75}}, {'point1':{'x':700, 'y':75}, 'point2':{'x':710, 'y':75}, 'code':'IscsLine_21', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':700, 'y':75}}, {'point1':{'x':755, 'y':75}, 'point2':{'x':755, 'y':85}, 'code':'IscsLine_23', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':755, 'y':75}}, {'point1':{'x':725, 'y':75}, 'point2':{'x':755, 'y':75}, 'code':'IscsLine_24', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':725, 'y':75}}], 'fireDamperList':[{'point':{'x':560, 'y':34}, '_type':'FireDamper', 'code':'FireDamper_1', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':36}, '_type':'FireDamper', 'code':'FireDamper_2', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':68, 'y':100}, '_type':'FireDamper', 'code':'FireDamper_3', 'width':25, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':75, 'y':239}, '_type':'FireDamper', 'code':'FireDamper_4', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':108, 'y':100}, '_type':'FireDamper', 'code':'FireDamper_5', 'width':25, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':559, 'y':67}, '_type':'FireDamper', 'code':'FireDamper_6', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':69}, '_type':'FireDamper', 'code':'FireDamper_7', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}], 'volumeControlDamperList':[{'point':{'x':735, 'y':34}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_1', 'width':15, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':67, 'y':201}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_2', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':710, 'y':60}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_3', 'width':15, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}], 'orbitalVentilatorList':[], 'airConditionerList':[{'point':{'x':826, 'y':33}, '_type':'AirConditioner', 'code':'AirConditioner_1', 'width':70, 'isRight':true, 'color':'#00ff00', 'zlevel':1, 'z':4}]
     },
     '31': {'platformScreenDoorList':[{'point':{'x':135, 'y':225}, 'code':'PlatformScreenDoor_1', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':198, 'y':225}, 'code':'PlatformScreenDoor_2', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':324, 'y':225}, 'code':'PlatformScreenDoor_4', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':260, 'y':225}, 'code':'PlatformScreenDoor_5', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':385, 'y':225}, 'code':'PlatformScreenDoor_6', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':448, 'y':225}, 'code':'PlatformScreenDoor_7', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':512, 'y':225}, 'code':'PlatformScreenDoor_8', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':576, 'y':225}, 'code':'PlatformScreenDoor_9', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':830, 'y':225}, 'code':'PlatformScreenDoor_10', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':767, 'y':225}, 'code':'PlatformScreenDoor_11', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':702, 'y':225}, 'code':'PlatformScreenDoor_12', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':639, 'y':225}, 'code':'PlatformScreenDoor_13', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1330, 'y':225}, 'code':'PlatformScreenDoor_14', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1267, 'y':225}, 'code':'PlatformScreenDoor_15', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1205, 'y':225}, 'code':'PlatformScreenDoor_16', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1143, 'y':225}, 'code':'PlatformScreenDoor_17', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1080, 'y':225}, 'code':'PlatformScreenDoor_18', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1017, 'y':225}, 'code':'PlatformScreenDoor_19', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':955, 'y':225}, 'code':'PlatformScreenDoor_20', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':892, 'y':225}, 'code':'PlatformScreenDoor_21', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':143, 'y':638}, 'code':'PlatformScreenDoor_22', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':455, 'y':638}, 'code':'PlatformScreenDoor_23', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':519, 'y':638}, 'code':'PlatformScreenDoor_24', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':582, 'y':638}, 'code':'PlatformScreenDoor_25', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1085, 'y':638}, 'code':'PlatformScreenDoor_26', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1022, 'y':638}, 'code':'PlatformScreenDoor_27', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':958, 'y':638}, 'code':'PlatformScreenDoor_28', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':896, 'y':638}, 'code':'PlatformScreenDoor_29', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':833, 'y':638}, 'code':'PlatformScreenDoor_30', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':770, 'y':638}, 'code':'PlatformScreenDoor_31', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':707, 'y':638}, 'code':'PlatformScreenDoor_32', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':645, 'y':638}, 'code':'PlatformScreenDoor_33', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':331, 'y':638}, 'code':'PlatformScreenDoor_34', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':269, 'y':638}, 'code':'PlatformScreenDoor_35', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':206, 'y':638}, 'code':'PlatformScreenDoor_36', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':394, 'y':638}, 'code':'PlatformScreenDoor_37', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1333, 'y':638}, 'code':'PlatformScreenDoor_38', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1271, 'y':638}, 'code':'PlatformScreenDoor_39', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1209, 'y':638}, 'code':'PlatformScreenDoor_40', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1147, 'y':638}, 'code':'PlatformScreenDoor_41', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}], 'endDoorList':[{'point':{'x':97, 'y':209}, 'code':'EndDoor_1', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}, {'point':{'x':1407, 'y':210}, 'code':'EndDoor_2', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}, {'point':{'x':113, 'y':654}, 'code':'EndDoor_3', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}, {'point':{'x':1405, 'y':659}, 'code':'EndDoor_4', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}], 'borderRadiusList':[{'point':{'x':141, 'y':157}, 'code':'BorderRadius_1', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':391, 'y':158}, 'code':'BorderRadius_2', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':644, 'y':157}, 'code':'BorderRadius_3', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':896, 'y':157}, 'code':'BorderRadius_4', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':1148, 'y':157}, 'code':'BorderRadius_5', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':147, 'y':717}, 'code':'BorderRadius_6', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':1150, 'y':718}, 'code':'BorderRadius_7', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':649, 'y':716}, 'code':'BorderRadius_8', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':900, 'y':717}, 'code':'BorderRadius_9', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':399, 'y':717}, 'code':'BorderRadius_10', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}], 'iscsLineList':[{'point1':{'x':104, 'y':260}, 'point2':{'x':1438, 'y':260}, 'code':'IscsLine_1', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':104, 'y':260}}, {'point1':{'x':134, 'y':220}, 'point2':{'x':1391, 'y':220}, 'code':'IscsLine_2', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':134, 'y':220}}, {'point1':{'x':103, 'y':189}, 'point2':{'x':1436, 'y':189}, 'code':'IscsLine_3', 'classify':'solid', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':103, 'y':189}}, {'point1':{'x':104, 'y':150}, 'point2':{'x':1437, 'y':150}, 'code':'IscsLine_4', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':104, 'y':150}}, {'point1':{'x':133, 'y':190}, 'point2':{'x':133, 'y':261}, 'code':'IscsLine_5', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':133, 'y':190}}, {'point1':{'x':1393, 'y':189}, 'point2':{'x':1393, 'y':260}, 'code':'IscsLine_6', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1393, 'y':189}}, {'point1':{'x':385, 'y':149}, 'point2':{'x':385, 'y':260}, 'code':'IscsLine_7', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':385, 'y':149}}, {'point1':{'x':637, 'y':149}, 'point2':{'x':637, 'y':259}, 'code':'IscsLine_8', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':637, 'y':149}}, {'point1':{'x':1142, 'y':149}, 'point2':{'x':1142, 'y':259}, 'code':'IscsLine_9', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1142, 'y':149}}, {'point1':{'x':892, 'y':149}, 'point2':{'x':892, 'y':259}, 'code':'IscsLine_10', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':892, 'y':149}}, {'point1':{'x':109, 'y':634}, 'point2':{'x':1439, 'y':634}, 'code':'IscsLine_11', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':109, 'y':634}}, {'point1':{'x':108, 'y':749}, 'point2':{'x':1438, 'y':749}, 'code':'IscsLine_12', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':108, 'y':749}}, {'point1':{'x':107, 'y':712}, 'point2':{'x':1437, 'y':712}, 'code':'IscsLine_13', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':107, 'y':712}}, {'point1':{'x':142, 'y':671}, 'point2':{'x':1393, 'y':671}, 'code':'IscsLine_14', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':142, 'y':671}}, {'point1':{'x':141, 'y':633}, 'point2':{'x':141, 'y':713}, 'code':'IscsLine_15', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':141, 'y':633}}, {'point1':{'x':1395, 'y':633}, 'point2':{'x':1395, 'y':713}, 'code':'IscsLine_16', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1395, 'y':633}}, {'point1':{'x':392, 'y':633}, 'point2':{'x':392, 'y':749}, 'code':'IscsLine_17', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':392, 'y':633}}, {'point1':{'x':644, 'y':633}, 'point2':{'x':644, 'y':749}, 'code':'IscsLine_18', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':644, 'y':633}}, {'point1':{'x':894, 'y':634}, 'point2':{'x':894, 'y':749}, 'code':'IscsLine_19', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':894, 'y':634}}, {'point1':{'x':1146, 'y':634}, 'point2':{'x':1146, 'y':749}, 'code':'IscsLine_20', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1146, 'y':634}}, {'point1':{'x':408, 'y':301}, 'point2':{'x':408, 'y':601}, 'code':'IscsLine_21', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':408, 'y':301}}, {'point1':{'x':1140, 'y':299}, 'point2':{'x':1140, 'y':600}, 'code':'IscsLine_22', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1140, 'y':299}}, {'point1':{'x':644, 'y':301}, 'point2':{'x':644, 'y':391}, 'code':'IscsLine_23', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':644, 'y':301}}, {'point1':{'x':221, 'y':328}, 'point2':{'x':481, 'y':328}, 'code':'IscsLine_24', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':328}}, {'point1':{'x':221, 'y':370}, 'point2':{'x':481, 'y':370}, 'code':'IscsLine_25', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':370}}, {'point1':{'x':220, 'y':393}, 'point2':{'x':480, 'y':393}, 'code':'IscsLine_26', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':393}}, {'point1':{'x':221, 'y':415}, 'point2':{'x':481, 'y':415}, 'code':'IscsLine_27', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':415}}, {'point1':{'x':220, 'y':436}, 'point2':{'x':480, 'y':436}, 'code':'IscsLine_28', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':436}}, {'point1':{'x':221, 'y':458}, 'point2':{'x':481, 'y':458}, 'code':'IscsLine_29', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':458}}, {'point1':{'x':222, 'y':479}, 'point2':{'x':482, 'y':479}, 'code':'IscsLine_30', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':222, 'y':479}}, {'point1':{'x':221, 'y':500}, 'point2':{'x':481, 'y':500}, 'code':'IscsLine_31', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':500}}, {'point1':{'x':220, 'y':521}, 'point2':{'x':480, 'y':521}, 'code':'IscsLine_32', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':521}}, {'point1':{'x':220, 'y':539}, 'point2':{'x':480, 'y':539}, 'code':'IscsLine_33', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':539}}, {'point1':{'x':219, 'y':580}, 'point2':{'x':479, 'y':580}, 'code':'IscsLine_34', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':219, 'y':580}}, {'point1':{'x':219, 'y':560}, 'point2':{'x':479, 'y':560}, 'code':'IscsLine_35', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':219, 'y':560}}, {'point1':{'x':220, 'y':349}, 'point2':{'x':480, 'y':349}, 'code':'IscsLine_36', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':349}}, {'point1':{'x':511, 'y':368}, 'point2':{'x':701, 'y':368}, 'code':'IscsLine_37', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':511, 'y':368}}, {'point1':{'x':513, 'y':346}, 'point2':{'x':703, 'y':346}, 'code':'IscsLine_38', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':513, 'y':346}}, {'point1':{'x':512, 'y':323}, 'point2':{'x':702, 'y':323}, 'code':'IscsLine_39', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':512, 'y':323}}, {'point1':{'x':954, 'y':408}, 'point2':{'x':1214, 'y':408}, 'code':'IscsLine_40', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':408}}, {'point1':{'x':952, 'y':450}, 'point2':{'x':1212, 'y':450}, 'code':'IscsLine_41', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':952, 'y':450}}, {'point1':{'x':954, 'y':367}, 'point2':{'x':1214, 'y':367}, 'code':'IscsLine_42', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':367}}, {'point1':{'x':955, 'y':348}, 'point2':{'x':1215, 'y':348}, 'code':'IscsLine_43', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':348}}, {'point1':{'x':955, 'y':326}, 'point2':{'x':1215, 'y':326}, 'code':'IscsLine_44', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':326}}, {'point1':{'x':955, 'y':429}, 'point2':{'x':1215, 'y':429}, 'code':'IscsLine_45', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':429}}, {'point1':{'x':955, 'y':471}, 'point2':{'x':1215, 'y':471}, 'code':'IscsLine_46', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':471}}, {'point1':{'x':954, 'y':388}, 'point2':{'x':1214, 'y':388}, 'code':'IscsLine_47', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':388}}, {'point1':{'x':954, 'y':493}, 'point2':{'x':1214, 'y':493}, 'code':'IscsLine_48', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':493}}, {'point1':{'x':954, 'y':517}, 'point2':{'x':1214, 'y':517}, 'code':'IscsLine_49', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':517}}, {'point1':{'x':954, 'y':539}, 'point2':{'x':1214, 'y':539}, 'code':'IscsLine_50', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':539}}, {'point1':{'x':955, 'y':579}, 'point2':{'x':1214, 'y':579}, 'code':'IscsLine_51', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':579}}, {'point1':{'x':954, 'y':559}, 'point2':{'x':1213, 'y':559}, 'code':'IscsLine_52', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':559}}], 'iscsRectList':[{'point':{'x':220, 'y':300}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(255, 0, 0, 0)', 'borderWidth':2, 'strokeColor':'#FFFFFF', 'width':260, 'height':300, 'zlevel':1, 'z':3}, {'point':{'x':512, 'y':300}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(255, 0, 0, 0)', 'borderWidth':2, 'strokeColor':'#FFFFFF', 'width':190, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':954, 'y':300}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(255, 0, 0, 0)', 'borderWidth':2, 'strokeColor':'#FFFFFF', 'width':260, 'height':300, 'zlevel':1, 'z':3}], 'iscsTextList':[{'point':{'x':229, 'y':163}, 'code':'IscsText_1', '_type':'IscsText', 'context':'车厢1', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':483, 'y':162}, 'code':'IscsText_2', '_type':'IscsText', 'context':'车厢2', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':747, 'y':161}, 'code':'IscsText_3', '_type':'IscsText', 'context':'车厢3', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':991, 'y':161}, 'code':'IscsText_4', '_type':'IscsText', 'context':'车厢4', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1243, 'y':162}, 'code':'IscsText_5', '_type':'IscsText', 'context':'车厢5', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':239, 'y':722}, 'code':'IscsText_6', '_type':'IscsText', 'context':'车厢1', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':491, 'y':722}, 'code':'IscsText_7', '_type':'IscsText', 'context':'车厢2', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':742, 'y':722}, 'code':'IscsText_8', '_type':'IscsText', 'context':'车厢3', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':989, 'y':723}, 'code':'IscsText_9', '_type':'IscsText', 'context':'车厢4', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1242, 'y':722}, 'code':'IscsText_10', '_type':'IscsText', 'context':'车厢5', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':100, 'y':131}, 'code':'IscsText_11', '_type':'IscsText', 'context':'下行', 'textFill':'#20B8C1', 'fontSize':14, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1406, 'y':755}, 'code':'IscsText_12', '_type':'IscsText', 'context':'上行', 'textFill':'#20B8C1', 'fontSize':14, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':280, 'y':308}, 'code':'IscsText_13', '_type':'IscsText', 'context':'下行站台', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':309}, 'code':'IscsText_14', '_type':'IscsText', 'context':'状态', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1011, 'y':306}, 'code':'IscsText_15', '_type':'IscsText', 'context':'上行站台', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1163, 'y':308}, 'code':'IscsText_16', '_type':'IscsText', 'context':'状态', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':334}, 'code':'IscsText_17', '_type':'IscsText', 'context':'滑动门&应急门开门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':354}, 'code':'IscsText_18', '_type':'IscsText', 'context':'滑动门&应急门关门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':376}, 'code':'IscsText_19', '_type':'IscsText', 'context':'滑动门互锁解除报警', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':398}, 'code':'IscsText_20', '_type':'IscsText', 'context':'紧急控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':442}, 'code':'IscsText_22', '_type':'IscsText', 'context':'紧急控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':227, 'y':464}, 'code':'IscsText_23', '_type':'IscsText', 'context':'就地控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':484}, 'code':'IscsText_24', '_type':'IscsText', 'context':'就得控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':506}, 'code':'IscsText_25', '_type':'IscsText', 'context':'就地控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':525}, 'code':'IscsText_26', '_type':'IscsText', 'context':'自动开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':225, 'y':545}, 'code':'IscsText_27', '_type':'IscsText', 'context':'自动关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':565}, 'code':'IscsText_28', '_type':'IscsText', 'context':'所有门开到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':227, 'y':585}, 'code':'IscsText_29', '_type':'IscsText', 'context':'所有门关到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':517, 'y':306}, 'code':'IscsText_30', '_type':'IscsText', 'context':'系统驱动电源故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':518, 'y':329}, 'code':'IscsText_31', '_type':'IscsText', 'context':'系统控制电源故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':519, 'y':352}, 'code':'IscsText_32', '_type':'IscsText', 'context':'监视电源故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':520, 'y':375}, 'code':'IscsText_33', '_type':'IscsText', 'context':'现场总线故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':332}, 'code':'IscsText_34', '_type':'IscsText', 'context':'滑动门&应急门开门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':960, 'y':352}, 'code':'IscsText_35', '_type':'IscsText', 'context':'滑动门&应急门关门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':371}, 'code':'IscsText_36', '_type':'IscsText', 'context':'滑动门互锁解除报警', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':393}, 'code':'IscsText_37', '_type':'IscsText', 'context':'紧急控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':225, 'y':421}, 'code':'IscsText_38', '_type':'IscsText', 'context':'紧急控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':413}, 'code':'IscsText_39', '_type':'IscsText', 'context':'紧急控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':433}, 'code':'IscsText_40', '_type':'IscsText', 'context':'紧急控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':963, 'y':454}, 'code':'IscsText_41', '_type':'IscsText', 'context':'就地控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':477}, 'code':'IscsText_42', '_type':'IscsText', 'context':'就得控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':500}, 'code':'IscsText_43', '_type':'IscsText', 'context':'就地控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':523}, 'code':'IscsText_44', '_type':'IscsText', 'context':'自动开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':545}, 'code':'IscsText_45', '_type':'IscsText', 'context':'自动关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':963, 'y':565}, 'code':'IscsText_46', '_type':'IscsText', 'context':'所有门开到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':963, 'y':583}, 'code':'IscsText_47', '_type':'IscsText', 'context':'所有门关到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':154, 'y':265}, 'code':'IscsText_48', '_type':'IscsText', 'context':'1-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':217, 'y':266}, 'code':'IscsText_49', '_type':'IscsText', 'context':'1-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':280, 'y':266}, 'code':'IscsText_50', '_type':'IscsText', 'context':'1-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':341, 'y':266}, 'code':'IscsText_51', '_type':'IscsText', 'context':'1-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':404, 'y':267}, 'code':'IscsText_52', '_type':'IscsText', 'context':'2-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':467, 'y':267}, 'code':'IscsText_53', '_type':'IscsText', 'context':'2-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':531, 'y':266}, 'code':'IscsText_54', '_type':'IscsText', 'context':'2-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':596, 'y':266}, 'code':'IscsText_55', '_type':'IscsText', 'context':'2-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':659, 'y':266}, 'code':'IscsText_56', '_type':'IscsText', 'context':'3-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':720, 'y':267}, 'code':'IscsText_57', '_type':'IscsText', 'context':'3-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':787, 'y':267}, 'code':'IscsText_58', '_type':'IscsText', 'context':'3-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':847, 'y':267}, 'code':'IscsText_59', '_type':'IscsText', 'context':'3-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':910, 'y':266}, 'code':'IscsText_60', '_type':'IscsText', 'context':'4-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':972, 'y':267}, 'code':'IscsText_61', '_type':'IscsText', 'context':'4-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1035, 'y':266}, 'code':'IscsText_62', '_type':'IscsText', 'context':'4-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1098, 'y':267}, 'code':'IscsText_63', '_type':'IscsText', 'context':'4-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1162, 'y':267}, 'code':'IscsText_64', '_type':'IscsText', 'context':'5-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1225, 'y':267}, 'code':'IscsText_65', '_type':'IscsText', 'context':'5-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1288, 'y':267}, 'code':'IscsText_66', '_type':'IscsText', 'context':'5-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1348, 'y':266}, 'code':'IscsText_67', '_type':'IscsText', 'context':'5-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':164, 'y':619}, 'code':'IscsText_68', '_type':'IscsText', 'context':'1-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':223, 'y':619}, 'code':'IscsText_69', '_type':'IscsText', 'context':'1-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':285, 'y':619}, 'code':'IscsText_70', '_type':'IscsText', 'context':'1-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':348, 'y':619}, 'code':'IscsText_71', '_type':'IscsText', 'context':'1-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':412, 'y':618}, 'code':'IscsText_72', '_type':'IscsText', 'context':'2-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':472, 'y':618}, 'code':'IscsText_73', '_type':'IscsText', 'context':'2-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':535, 'y':619}, 'code':'IscsText_74', '_type':'IscsText', 'context':'2-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':599, 'y':620}, 'code':'IscsText_75', '_type':'IscsText', 'context':'2-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':663, 'y':618}, 'code':'IscsText_76', '_type':'IscsText', 'context':'3-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':724, 'y':618}, 'code':'IscsText_77', '_type':'IscsText', 'context':'3-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':787, 'y':617}, 'code':'IscsText_78', '_type':'IscsText', 'context':'3-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':847, 'y':619}, 'code':'IscsText_79', '_type':'IscsText', 'context':'3-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':912, 'y':619}, 'code':'IscsText_80', '_type':'IscsText', 'context':'4-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':973, 'y':620}, 'code':'IscsText_81', '_type':'IscsText', 'context':'4-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1039, 'y':619}, 'code':'IscsText_82', '_type':'IscsText', 'context':'4-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1101, 'y':619}, 'code':'IscsText_83', '_type':'IscsText', 'context':'4-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1165, 'y':618}, 'code':'IscsText_84', '_type':'IscsText', 'context':'5-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1225, 'y':618}, 'code':'IscsText_85', '_type':'IscsText', 'context':'5-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1290, 'y':620}, 'code':'IscsText_86', '_type':'IscsText', 'context':'5-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1350, 'y':620}, 'code':'IscsText_87', '_type':'IscsText', 'context':'5-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':432, 'y':399}, 'code':'IscsText_88', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':421}, 'code':'IscsText_89', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':443}, 'code':'IscsText_90', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':431, 'y':464}, 'code':'IscsText_91', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':431, 'y':484}, 'code':'IscsText_92', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':506}, 'code':'IscsText_93', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':525}, 'code':'IscsText_94', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':544}, 'code':'IscsText_95', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':427, 'y':586}, 'code':'IscsText_96', '_type':'IscsText', 'context':'关到位', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1161, 'y':585}, 'code':'IscsText_97', '_type':'IscsText', 'context':'关到位', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':524}, 'code':'IscsText_98', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':501}, 'code':'IscsText_99', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1165, 'y':392}, 'code':'IscsText_100', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':455}, 'code':'IscsText_101', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':478}, 'code':'IscsText_102', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':545}, 'code':'IscsText_103', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1160, 'y':415}, 'code':'IscsText_104', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1161, 'y':435}, 'code':'IscsText_105', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}], 'arcStatusList':[{'point':{'x':443, 'y':338}, 'code':'ArcStatus_1', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':443, 'y':359}, 'code':'ArcStatus_2', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':443, 'y':381}, 'code':'ArcStatus_3', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':311}, 'code':'ArcStatus_4', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':335}, 'code':'ArcStatus_5', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':358}, 'code':'ArcStatus_6', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':380}, 'code':'ArcStatus_7', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':337}, 'code':'ArcStatus_8', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':357}, 'code':'ArcStatus_9', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':377}, 'code':'ArcStatus_10', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}]},
     '41': {'iscsRectList':[{'point':{'x':1, 'y':70}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':160, 'height':80, 'zlevel':1, 'z':3}, {'point':{'x':161, 'y':80}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':95, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':1, 'y':205}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F  7F1F1', 'width':135, 'height':100, 'zlevel':1, 'z':3}, {'point':{'x':136, 'y':225}, 'code':'IscsRect_4', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':120, 'height':80, 'zlevel':1, 'z':3}, {'point':{'x':327, 'y':116}, 'code':'IscsRect_5', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':60, 'zlevel':1, 'z':3}, {'point':{'x':936, 'y':26}, 'code':'IscsRect_6', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1006, 'y':26}, 'code':'IscsRect_7', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1076, 'y':26}, 'code':'IscsRect_8', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1146, 'y':26}, 'code':'IscsRect_9', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1305, 'y':40}, 'code':'IscsRect_10', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':145, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1305, 'y':130}, 'code':'IscsRect_11', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':145, 'height':105, 'zlevel':1, 'z':3}, {'point':{'x':1340, 'y':270}, 'code':'IscsRect_12', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':45, 'height':35, 'zlevel':1, 'z':3}, {'point':{'x':1385, 'y':270}, 'code':'IscsRect_13', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':45, 'height':35, 'zlevel':1, 'z':3}, {'point':{'x':930, 'y':160}, 'code':'IscsRect_14', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':90, 'height':95, 'zlevel':1, 'z':3}, {'point':{'x':1020, 'y':160}, 'code':'IscsRect_15', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':50, 'height':95, 'zlevel':1, 'z':3}, {'point':{'x':1070, 'y':160}, 'code':'IscsRect_16', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':85, 'height':95, 'zlevel':1, 'z':3}, {'point':{'x':1155, 'y':160}, 'code':'IscsRect_17', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':90, 'height':95, 'zlevel':1, 'z':3}, {'point':{'x':760, 'y':116}, 'code':'IscsRect_18', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':65, 'height':60, 'zlevel':1, 'z':3}, {'point':{'x':1054, 'y':265}, 'code':'IscsRect_19', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':135, 'height':40, 'zlevel':1, 'z':3}], 'iscsLineList':[{'point1':{'x':0, 'y':15}, 'point2':{'x':260, 'y':15}, 'code':'IscsLine_1', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':0, 'y':15}}, {'point1':{'x':260, 'y':15}, 'point2':{'x':260, 'y':0}, 'code':'IscsLine_2', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':260, 'y':15}}, {'point1':{'x':330, 'y':0}, 'point2':{'x':330, 'y':15}, 'code':'IscsLine_3', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':330, 'y':0}}, {'point1':{'x':330, 'y':15}, 'point2':{'x':810, 'y':15}, 'code':'IscsLine_4', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':330, 'y':15}}, {'point1':{'x':810, 'y':15}, 'point2':{'x':810, 'y':0}, 'code':'IscsLine_5', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':810, 'y':15}}, {'point1':{'x':880, 'y':0}, 'point2':{'x':880, 'y':15}, 'code':'IscsLine_6', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':880, 'y':0}}, {'point1':{'x':880, 'y':15}, 'point2':{'x':1470, 'y':15}, 'code':'IscsLine_7', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':880, 'y':15}}, {'point1':{'x':0, 'y':305}, 'point2':{'x':300, 'y':305}, 'code':'IscsLine_8', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':0, 'y':305}}, {'point1':{'x':300, 'y':305}, 'point2':{'x':300, 'y':320}, 'code':'IscsLine_9', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':300, 'y':305}}, {'point1':{'x':370, 'y':320}, 'point2':{'x':370, 'y':305}, 'code':'IscsLine_10', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':370, 'y':320}}, {'point1':{'x':370, 'y':305}, 'point2':{'x':800, 'y':305}, 'code':'IscsLine_11', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':370, 'y':305}}, {'point1':{'x':800, 'y':305}, 'point2':{'x':800, 'y':320}, 'code':'IscsLine_12', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':800, 'y':305}}, {'point1':{'x':870, 'y':305}, 'point2':{'x':870, 'y':320}, 'code':'IscsLine_13', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':870, 'y':305}}, {'point1':{'x':870, 'y':305}, 'point2':{'x':1470, 'y':305}, 'code':'IscsLine_14', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':870, 'y':305}}, {'point1':{'x':746, 'y':100}, 'point2':{'x':746, 'y':110}, 'code':'IscsLine_15', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':746, 'y':100}}, {'point1':{'x':746, 'y':16}, 'point2':{'x':746, 'y':37}, 'code':'IscsLine_16', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':746, 'y':16}}, {'point1':{'x':729, 'y':190}, 'point2':{'x':729, 'y':212}, 'code':'IscsLine_17', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':729, 'y':190}}, {'point1':{'x':729, 'y':274}, 'point2':{'x':729, 'y':305}, 'code':'IscsLine_18', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':729, 'y':274}}, {'point1':{'x':416, 'y':14}, 'point2':{'x':416, 'y':29}, 'code':'IscsLine_19', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':416, 'y':14}}, {'point1':{'x':416, 'y':92}, 'point2':{'x':416, 'y':110}, 'code':'IscsLine_20', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':416, 'y':92}}, {'point1':{'x':436, 'y':189}, 'point2':{'x':436, 'y':216}, 'code':'IscsLine_21', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':436, 'y':189}}, {'point1':{'x':436, 'y':280}, 'point2':{'x':436, 'y':305}, 'code':'IscsLine_22', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':436, 'y':280}}], 'iscsTextList':[{'point':{'x':262, 'y':9}, 'code':'IscsText_1', '_type':'IscsText', 'context':'2号出入口', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':304, 'y':296}, 'code':'IscsText_2', '_type':'IscsText', 'context':'5号出入口', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':813, 'y':10}, 'code':'IscsText_3', '_type':'IscsText', 'context':'3号出入口', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':804, 'y':297}, 'code':'IscsText_4', '_type':'IscsText', 'context':'4号出入口', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':183, 'y':107}, 'code':'IscsText_5', '_type':'IscsText', 'context':'配电间', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':33, 'y':246}, 'code':'IscsText_6', '_type':'IscsText', 'context':'空调机房', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':170, 'y':248}, 'code':'IscsText_7', '_type':'IscsText', 'context':'环控\n电控室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':333, 'y':160}, 'code':'IscsText_8', '_type':'IscsText', 'context':'客服中心', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':764, 'y':159}, 'code':'IscsText_9', '_type':'IscsText', 'context':'客服中心', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':949, 'y':38}, 'code':'IscsText_10', '_type':'IscsText', 'context':'通信\n设备室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1020, 'y':40}, 'code':'IscsText_11', '_type':'IscsText', 'context':'通信\n电源室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1088, 'y':40}, 'code':'IscsText_12', '_type':'IscsText', 'context':'AFC\n设备室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':41}, 'code':'IscsText_13', '_type':'IscsText', 'context':'交\n接\n班\n室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':950, 'y':171}, 'code':'IscsText_14', '_type':'IscsText', 'context':'车站\n控制室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1026, 'y':175}, 'code':'IscsText_15', '_type':'IscsText', 'context':'站长室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1091, 'y':169}, 'code':'IscsText_16', '_type':'IscsText', 'context':'信号\n设备室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1173, 'y':169}, 'code':'IscsText_17', '_type':'IscsText', 'context':'信号\n电源室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1061, 'y':273}, 'code':'IscsText_18', '_type':'IscsText', 'context':'中和监控\n设备室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1346, 'y':281}, 'code':'IscsText_19', '_type':'IscsText', 'context':'男更', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1393, 'y':280}, 'code':'IscsText_20', '_type':'IscsText', 'context':'女更', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1372, 'y':144}, 'code':'IscsText_21', '_type':'IscsText', 'context':'票务室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1355, 'y':64}, 'code':'IscsText_22', '_type':'IscsText', 'context':'环控\n电控室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':13, 'y':122}, 'code':'IscsText_23', '_type':'IscsText', 'context':'01022#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':59, 'y':183}, 'code':'IscsText_24', '_type':'IscsText', 'context':'01023#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':267, 'y':263}, 'code':'IscsText_25', '_type':'IscsText', 'context':'01024#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':332, 'y':279}, 'code':'IscsText_26', '_type':'IscsText', 'context':'01001#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':333, 'y':145}, 'code':'IscsText_27', '_type':'IscsText', 'context':'01002#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':570, 'y':281}, 'code':'IscsText_28', '_type':'IscsText', 'context':'01004#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':464, 'y':59}, 'code':'IscsText_29', '_type':'IscsText', 'context':'01003#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':568, 'y':110}, 'code':'IscsText_30', '_type':'IscsText', 'context':'01028#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':523, 'y':183}, 'code':'IscsText_31', '_type':'IscsText', 'context':'01027#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':615, 'y':186}, 'code':'IscsText_32', '_type':'IscsText', 'context':'01029#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':469, 'y':238}, 'code':'IscsText_33', '_type':'IscsText', 'context':'01026#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':662, 'y':238}, 'code':'IscsText_34', '_type':'IscsText', 'context':'01030#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':766, 'y':142}, 'code':'IscsText_35', '_type':'IscsText', 'context':'01005#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':774, 'y':80}, 'code':'IscsText_36', '_type':'IscsText', 'context':'01031#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':840, 'y':64}, 'code':'IscsText_37', '_type':'IscsText', 'context':'01033#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':783, 'y':269}, 'code':'IscsText_38', '_type':'IscsText', 'context':'01006#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':849, 'y':249}, 'code':'IscsText_39', '_type':'IscsText', 'context':'01032#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':948, 'y':232}, 'code':'IscsText_40', '_type':'IscsText', 'context':'01008#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':947, 'y':97}, 'code':'IscsText_41', '_type':'IscsText', 'context':'01007#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1017, 'y':97}, 'code':'IscsText_42', '_type':'IscsText', 'context':'01009#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1089, 'y':98}, 'code':'IscsText_43', '_type':'IscsText', 'context':'01010#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':142}, 'code':'IscsText_44', '_type':'IscsText', 'context':'01037#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1114, 'y':142}, 'code':'IscsText_45', '_type':'IscsText', 'context':'01034#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1088, 'y':233}, 'code':'IscsText_46', '_type':'IscsText', 'context':'01011#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1176, 'y':233}, 'code':'IscsText_47', '_type':'IscsText', 'context':'01012#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1127, 'y':290}, 'code':'IscsText_48', '_type':'IscsText', 'context':'01013#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':933, 'y':292}, 'code':'IscsText_49', '_type':'IscsText', 'context':'01035#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':994, 'y':291}, 'code':'IscsText_50', '_type':'IscsText', 'context':'01036#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1317, 'y':169}, 'code':'IscsText_51', '_type':'IscsText', 'context':'01014#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1379, 'y':211}, 'code':'IscsText_52', '_type':'IscsText', 'context':'01038#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':742, 'y':128}, 'code':'IscsText_53', '_type':'IscsText', 'context':'上', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':167}, 'code':'IscsText_54', '_type':'IscsText', 'context':'下', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':284, 'y':94}, 'code':'IscsText_55', '_type':'IscsText', 'context':'01025#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':397, 'y':127}, 'code':'IscsText_56', '_type':'IscsText', 'context':'上', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':456, 'y':169}, 'code':'IscsText_57', '_type':'IscsText', 'context':'下', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}], 'vidiconList':[{'_type':'Vidicon', 'code':'Vidicon_1', 'width':40, 'right':true, 'point':{'x':14, 'y':99}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_2', 'width':40, 'right':true, 'point':{'x':59, 'y':160}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_3', 'width':40, 'right':true, 'point':{'x':299, 'y':86}, 'rotationAngle':90, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_4', 'width':40, 'right':true, 'point':{'x':267, 'y':239}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_5', 'width':40, 'right':true, 'point':{'x':569, 'y':87}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_6', 'width':40, 'right':true, 'point':{'x':614, 'y':160}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_7', 'width':40, 'right':false, 'point':{'x':526, 'y':159}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_8', 'width':40, 'right':false, 'point':{'x':474, 'y':217}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_9', 'width':40, 'right':true, 'point':{'x':660, 'y':217}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_10', 'width':40, 'right':false, 'point':{'x':779, 'y':61}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_11', 'width':40, 'right':true, 'point':{'x':839, 'y':44}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_12', 'width':40, 'right':true, 'point':{'x':850, 'y':227}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_13', 'width':40, 'right':true, 'point':{'x':993, 'y':272}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_14', 'width':40, 'right':false, 'point':{'x':940, 'y':272}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_15', 'width':40, 'right':true, 'point':{'x':1115, 'y':120}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_16', 'width':40, 'right':false, 'point':{'x':965, 'y':120}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_17', 'width':40, 'right':false, 'point':{'x':1387, 'y':190}, 'rotationAngle':0, 'zlevel':1, 'z':4}], 'vidiconCloudList':[{'_type':'VidiconCloud', 'code':'VidiconCloud_1', 'r':18, 'point':{'x':353, 'y':255}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_2', 'r':18, 'point':{'x':349, 'y':122}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_3', 'r':18, 'point':{'x':487, 'y':32}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_4', 'r':18, 'point':{'x':803, 'y':120}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_5', 'r':18, 'point':{'x':592, 'y':252}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_6', 'r':18, 'point':{'x':805, 'y':245}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_7', 'r':18, 'point':{'x':970, 'y':70}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_8', 'r':18, 'point':{'x':1042, 'y':70}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_9', 'r':18, 'point':{'x':1110, 'y':70}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_10', 'r':18, 'point':{'x':1198, 'y':210}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_11', 'r':18, 'point':{'x':970, 'y':210}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_12', 'r':18, 'point':{'x':1110, 'y':210}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_13', 'r':18, 'point':{'x':1149, 'y':272}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_14', 'r':18, 'point':{'x':1340, 'y':145}, 'zlevel':1, 'z':4}], 'brakeMachineList':[{'point':{'x':730, 'y':36}, 'isRight':false, 'code':'BrakeMachine_1', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':730, 'y':48}, 'isRight':false, 'code':'BrakeMachine_2', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':730, 'y':60}, 'isRight':false, 'code':'BrakeMachine_3', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':730, 'y':72}, 'isRight':false, 'code':'BrakeMachine_4', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':730, 'y':84}, 'isRight':false, 'code':'BrakeMachine_5', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':212}, 'isRight':true, 'code':'BrakeMachine_6', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':224}, 'isRight':true, 'code':'BrakeMachine_7', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':236}, 'isRight':true, 'code':'BrakeMachine_8', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':248}, 'isRight':true, 'code':'BrakeMachine_9', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':30}, 'isRight':true, 'code':'BrakeMachine_10', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':42}, 'isRight':true, 'code':'BrakeMachine_11', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':54}, 'isRight':true, 'code':'BrakeMachine_12', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':66}, 'isRight':true, 'code':'BrakeMachine_13', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':217}, 'isRight':true, 'code':'BrakeMachine_14', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':229}, 'isRight':true, 'code':'BrakeMachine_15', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':241}, 'isRight':true, 'code':'BrakeMachine_16', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':253}, 'isRight':true, 'code':'BrakeMachine_17', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':265}, 'isRight':true, 'code':'BrakeMachine_18', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':260}, 'isRight':true, 'code':'BrakeMachine_19', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':78}, 'isRight':true, 'code':'BrakeMachine_20', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}], 'staircaseList':[{'point':{'x':700, 'y':111}, 'fill':'#fff', 'isRight':true, 'rotationAngle':180, 'code':'Staircase_1', '_type':'Staircase', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':457, 'y':192}, 'fill':'#fff', 'isRight':false, 'rotationAngle':180, 'code':'Staircase_2', '_type':'Staircase', 'width':60, 'zlevel':1, 'z':4}]},
diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index ea4ed5fea..c93a91fd7 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -122,8 +122,9 @@ const RunPlanApproval = () => import('@/views/approval/runPlan/index');
 const DeviceManage = () => import('@/views/system/deviceManage/index');
 const MapSort = () => import('@/views/publish/publishMap/mapSort');
 const StudentManage = () => import('@/views/studentManage');
-const RaceManage = () => import('@/views/competitionManage/index');
+const RaceManage = () => import('@/views/competitionManage/competition/index');
 const BankManage = () => import('@/views/competitionManage/bankList/index');
+const PracticeManage = () => import('@/views/competitionManage/practiceList/index');
 const QuestionCreatePage = () => import('@/views/competitionManage/bankList/question-create-page');
 const QuestionUpdatePage = () => import('@/views/competitionManage/bankList/question-update-page');
 
@@ -940,6 +941,14 @@ export const asyncRouter = [
                     icon: 'design'
                 }
             },
+            {
+                path: 'practice',
+                component: PracticeManage,
+                meta: {
+                    i18n: 'router.practiceManage',
+                    icon: 'design'
+                }
+            },
             {
                 path: 'questionCreate',
                 component: QuestionCreatePage,
diff --git a/src/views/competitionManage/bankList/question-create-page.vue b/src/views/competitionManage/bankList/question-create-page.vue
index 6108d55bd..804953422 100644
--- a/src/views/competitionManage/bankList/question-create-page.vue
+++ b/src/views/competitionManage/bankList/question-create-page.vue
@@ -84,6 +84,7 @@ export default {
 		&__container {
 			width: 55%;
 			margin: auto;
+            padding:20px 0px;
 			&-header {
 				margin-bottom: 10px;
 				.step-group {
diff --git a/src/views/competitionManage/create.vue b/src/views/competitionManage/competition/create.vue
similarity index 100%
rename from src/views/competitionManage/create.vue
rename to src/views/competitionManage/competition/create.vue
diff --git a/src/views/competitionManage/index.vue b/src/views/competitionManage/competition/index.vue
similarity index 100%
rename from src/views/competitionManage/index.vue
rename to src/views/competitionManage/competition/index.vue
diff --git a/src/views/competitionManage/practiceList/create.vue b/src/views/competitionManage/practiceList/create.vue
new file mode 100644
index 000000000..bb9e54bbf
--- /dev/null
+++ b/src/views/competitionManage/practiceList/create.vue
@@ -0,0 +1,110 @@
+<template>
+  <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
+    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doCreate">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getScriptByIdBasic} from '@/api/script';
+
+export default {
+    name: 'ScriptDraft',
+    props: {
+        title: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            mapList: [],
+            taskStatusList: [],
+            formModel: {
+                name: '',
+                mapId: '',
+                description:''
+            }
+        };
+    },
+    computed: {
+        form() {
+            const form = {
+                labelWidth: '150px',
+                items: [
+                    { prop: 'name', label: '实操名称', type: 'text' },
+                    { prop: 'description', label: '实操描述', type: 'textarea' }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                name: [
+                    { validator: this.validateScriptName, trigger: 'blur' },
+                    { validator: this.validateScriptName, trigger: 'change' }
+                ],
+                description: [
+                    { validator: this.validateDescription, trigger: 'blur' },
+                    { validator: this.validateDescription, trigger: 'change' }
+                ]
+            };
+            return crules;
+        }
+    },
+    methods: {
+        validateScriptName(rule, value, callback) {
+            if (value.trim().length === 0) {
+                this.formModel.name = this.formModel.name.replace(/\s/g, '');
+                return callback(new Error('请输入实操名称'));
+            } else {
+                return callback();
+            }
+        },
+        validateDescription(rule, value, callback) {
+            if (value.trim().length === 0) {
+                this.formModel.description = this.formModel.description.replace(/\s/g, '');
+                return callback(new Error('请输入实操描述'));
+            } else {
+                return callback();
+            }
+        },
+        doShow(questid) {
+            if (questid) {
+                getScriptByIdBasic(questid).then(resp=>{
+                    const data = {'name':resp.data.name, 'description':resp.data.description, 'mapId':resp.data.mapId};
+                    this.formModel = data;
+                    this.formModel.id = questid;
+                    this.dialogVisible = true;
+                });
+            } else {
+                this.formModel.mapId = this.$route.params.mapId;
+                this.dialogVisible = true;
+            }
+
+        },
+        doCreate() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                self.$emit('create', Object.assign({}, this.formModel));
+                self.doClose();
+            });
+        },
+        doClose() {
+            this.$refs.dataform.resetForm();
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+/deep/ .el-dialog--center .el-dialog__body{
+    padding: 25px 65px 30px 10px;
+}
+</style>
diff --git a/src/views/competitionManage/practiceList/index.vue b/src/views/competitionManage/practiceList/index.vue
new file mode 100644
index 000000000..5acb087d2
--- /dev/null
+++ b/src/views/competitionManage/practiceList/index.vue
@@ -0,0 +1,126 @@
+<template>
+  <div>
+    <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <create-practice ref="createPractice" title="创建实操" @reloadTable="reloadTable" @create="handleConfirmCreate" />
+    <create-practice ref="modifyPractice" title="修改实操" @reloadTable="reloadTable" @create="handleConfirmModify" />
+  </div>
+</template>
+<script>
+import { getPracticeList } from '@/api/competitionManage';
+import CreatePractice from './create';
+export default {
+    name:'PracticeManage',
+    components:{
+        CreatePractice
+    },
+    data() {
+        return {
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '80px',
+                queryObject: {
+                    raceId: {
+                        type: 'select',
+                        label: '竞赛名称',
+                        config: {
+                            data: []
+                        }
+                    },
+                    name: {
+                        type: 'text',
+                        label: '实操名称'
+                    }
+                }
+            },
+            queryList: {
+                // query: getPracticeList,
+                data:[],
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '竞赛名称',
+                        prop: 'raceId',
+                        type: 'tag',
+                        width: '320',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.type, 'QuestionTypeList'); },
+                        tagType: (row) => {
+                            return '';
+                        }
+                    },
+                    {
+                        title: '实操名称',
+                        prop: 'topic'
+                    },
+                    {
+                        title: '创建人',
+                        prop: 'createUserName',
+                        width: '100'
+                    },
+                    {
+                        type: 'button',
+                        title: '操 作',
+                        width: '420',
+                        buttons: [
+                            {
+                                name: '录 制',
+                                handleClick: this.doRecord,
+                                type: 'success'
+                            },
+                            {
+                                name: '更 新',
+                                handleClick: this.doUpdate,
+                                type: 'primary'
+                            },
+                            {
+                                name: '删 除',
+                                handleClick: this.doDelete,
+                                type: 'danger'
+                            },
+                            {
+                                name: '预 览',
+                                handleClick: this.doDetail
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: '添 加', handler: this.doCreate }
+                ]
+            }
+        };
+    },
+    methods:{
+        doCreate() {
+            this.$refs.createPractice.doShow(null);
+        },
+        doDetail() {
+
+        },
+        doDelete() {
+
+        },
+        doRecord() {
+
+        },
+        doUpdate() {
+
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        },
+        handleConfirmCreate() {
+
+        },
+        handleConfirmModify() {
+
+        }
+    }
+};
+</script>

From 92b144ddebcdff1ce415a2354caf49ae83ee64ae Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 26 May 2020 18:12:42 +0800
Subject: [PATCH 47/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=90=86=E8=AE=BA?=
 =?UTF-8?q?=E8=80=83=E8=AF=95=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/questionBank.js                       | 70 +++++++++++++-
 src/utils/baseUrl.js                          |  4 +-
 .../bankList/dialog-detail.vue                | 62 ++++++-------
 .../bankList/dialog-update-answer.vue         | 92 +++++++++----------
 .../competitionManage/bankList/index.vue      | 50 +++++-----
 .../bankList/question-create-page.vue         |  2 +
 .../bankList/question-form.vue                | 17 ++++
 .../bankList/question-update-page.vue         |  3 +-
 src/views/competitionManage/index.vue         |  1 +
 9 files changed, 191 insertions(+), 110 deletions(-)

diff --git a/src/api/questionBank.js b/src/api/questionBank.js
index dd2538322..0b26d4897 100644
--- a/src/api/questionBank.js
+++ b/src/api/questionBank.js
@@ -1,10 +1,70 @@
 import request from '@/utils/request';
 
-/** 推送通知消息*/
-export function listQuestionPage(data) {
+// 分页查询理论试题
+export function listQuestionPage(params) {
     return request({
-        // url: `/api/pushMessage`,
-        // method: 'post',
-        // data: data
+        url: `/api/questionBank/questions/paging`,
+        method: 'get',
+        params
+    });
+}
+
+// 创建题目
+export function createQuestion(data) {
+    return request({
+        url: `/api/questionBank/questions`,
+        method: 'post',
+        data
+    });
+}
+
+// 删除题目
+export function deleteQuestion(questionId) {
+    return request({
+        url: `/api/questionBank/questions/${questionId}`,
+        method: 'delete'
+    });
+}
+
+// 更新题目
+export function updateQuestion(questionId, data) {
+    return request({
+        url: `/api/questionBank/questions/${questionId}`,
+        method: 'put',
+        data
+    });
+}
+
+// 更新正确选项
+export function updateAnswer(questionId, data) {
+    return request({
+        url: `/api/questionBank/questions/${questionId}/answer`,
+        method: 'put',
+        data
+    });
+}
+
+// 更新选项
+export function updateOption(optionId, data) {
+    return request({
+        url: `/api/questionBank/questions/options/${optionId}`,
+        method: 'put',
+        data
+    });
+}
+
+// 获取题目信息
+export function getQuestionInfo(questionId) {
+    return request({
+        url: `/api/questionBank/questions/${questionId}`,
+        method: 'get'
+    });
+}
+
+// 根据题目查询选项
+export function getOptionsByQuestionId(questionId) {
+    return request({
+        url: `/api/questionBank/questions/${questionId}/options`,
+        method: 'get'
     });
 }
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 818fe4147..b62985baa 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,11 +2,11 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip';    // 张赛
diff --git a/src/views/competitionManage/bankList/dialog-detail.vue b/src/views/competitionManage/bankList/dialog-detail.vue
index 2ce0f390a..bf2898d96 100644
--- a/src/views/competitionManage/bankList/dialog-detail.vue
+++ b/src/views/competitionManage/bankList/dialog-detail.vue
@@ -31,37 +31,37 @@
 <script>
 
 export default {
-	data() {
-		return {
-			show: false,
-			form: {
-				optionList: []
-			}
-		};
-	},
-	computed: {
-		title() {
-			return '详 情';
-		},
-		options() {
-			return this.form.optionList;
-		}
-	},
-	methods: {
-		checkType(option, type) {
-			return option.type == type;
-		},
-		appendIndex(str, index) {
-			return `${index+1}. ${str}`;
-		},
-		doShow(node) {
-			this.form = node.row||{};
-			this.show = true;
-		},
-		doClose(done) {
-			this.show = false;
-		}
-	}
+    data() {
+        return {
+            show: false,
+            form: {
+                optionList: []
+            }
+        };
+    },
+    computed: {
+        title() {
+            return '详 情';
+        },
+        options() {
+            return this.form.optionList;
+        }
+    },
+    methods: {
+        checkType(option, type) {
+            return option.type == type;
+        },
+        appendIndex(str, index) {
+            return `${index + 1}. ${str}`;
+        },
+        doShow(node) {
+            this.form = node.row || {};
+            this.show = true;
+        },
+        doClose(done) {
+            this.show = false;
+        }
+    }
 };
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/competitionManage/bankList/dialog-update-answer.vue b/src/views/competitionManage/bankList/dialog-update-answer.vue
index 0dcc748ce..0bcbf8979 100644
--- a/src/views/competitionManage/bankList/dialog-update-answer.vue
+++ b/src/views/competitionManage/bankList/dialog-update-answer.vue
@@ -11,54 +11,54 @@
 
 <script>
 import ItemAnswer from './item-answer';
-import { getOptionsByQuestionId} from '@/api/questionBank.js';
+import { getOptionsByQuestionId } from '@/api/questionBank.js';
 
 export default {
-	components: {
-		ItemAnswer
-	},
-	data() {
-		return {
-			show: false,
-			content: '',
-			optionList: [],
-			formParam: {}
-		};
-	},
-	computed: {
-		title() {
-			return '更新答案';
-		}
-	},
-	methods: {
-		doShow({index, row}) {
-			this.formParam = row;
-			this.content = row.topic;
-			getOptionsByQuestionId(row.id).then(resp => {
-				this.optionList = resp.data;
-				this.optionList.forEach((el, i) => {
-					if (el.correct) {
-						this.formParam.answer = i;
-					}
-				});
-			});
-			this.show = true;
-		},
-		doClose(done) {
-			this.show = false;
-		},
-		onAnswerChnage(answer) {
-			this.optionList.forEach((el, i) => { el.correct = i == answer; });
-		},
-		doUpdate() {
-			const index = this.optionList.findIndex((el, i) => { return i == this.formParam.answer; });
-			if (index >= 0) {
-				const answer = this.optionList[index];
-				this.$emit('updateAnswer', {questionId: answer.questionId, id: answer.id, correct: answer.correct});
-			}
-			this.doClose();
-		}
-	}
+    components: {
+        ItemAnswer
+    },
+    data() {
+        return {
+            show: false,
+            content: '',
+            optionList: [],
+            formParam: {}
+        };
+    },
+    computed: {
+        title() {
+            return '更新答案';
+        }
+    },
+    methods: {
+        doShow({index, row}) {
+            this.formParam = row;
+            this.content = row.topic;
+            getOptionsByQuestionId(row.id).then(resp => {
+                this.optionList = resp.data;
+                this.optionList.forEach((el, i) => {
+                    if (el.correct) {
+                        this.formParam.answer = i;
+                    }
+                });
+            });
+            this.show = true;
+        },
+        doClose(done) {
+            this.show = false;
+        },
+        onAnswerChnage(answer) {
+            this.optionList.forEach((el, i) => { el.correct = i == answer; });
+        },
+        doUpdate() {
+            const index = this.optionList.findIndex((el, i) => { return i == this.formParam.answer; });
+            if (index >= 0) {
+                const answer = this.optionList[index];
+                this.$emit('updateAnswer', {questionId: answer.questionId, id: answer.id, correct: answer.correct});
+            }
+            this.doClose();
+        }
+    }
 };
 </script>
 
diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue
index ee3566120..d396c58cd 100644
--- a/src/views/competitionManage/bankList/index.vue
+++ b/src/views/competitionManage/bankList/index.vue
@@ -9,7 +9,7 @@
 
 <script>
 import { UrlConfig } from '@/scripts/ConstDic';
-import { listQuestionPage } from '@/api/questionBank.js';
+import { listQuestionPage, deleteQuestion, updateQuestion, updateAnswer } from '@/api/questionBank.js';
 import DialogUpdateQuestion from './dialog-update-question';
 import DialogUpdateAnswer from './dialog-update-answer';
 import DialogDetail from './dialog-detail';
@@ -48,6 +48,10 @@ export default {
                 selectCheckShow: false,
                 indexShow: true,
                 columns: [
+                    {
+                        title: '题 目',
+                        prop: 'topic'
+                    },
                     {
                         title: '类 型',
                         prop: 'type',
@@ -58,10 +62,6 @@ export default {
                             return '';
                         }
                     },
-                    {
-                        title: '题 目',
-                        prop: 'topic'
-                    },
                     {
                         title: '答 案',
                         prop: 'answer',
@@ -72,6 +72,11 @@ export default {
                             return '';
                         }
                     },
+                    {
+                        title: '分值',
+                        prop: 'score',
+                        width: '100'
+                    },
                     {
                         title: '创建人',
                         prop: 'createUserName',
@@ -130,10 +135,6 @@ export default {
             this.$router.push({path: `${UrlConfig.bank.questionCreate}`});
         },
 
-        doUpdate(index, row) {
-            this.$router.push({path: `${UrlConfig.bank.questionModify}/${row.id}`});
-        },
-
         doUpdateQuestion(index, row) {
             this.$refs.question.doShow({index, row});
         },
@@ -152,11 +153,11 @@ export default {
                 cancelButtonText: '取 消',
                 type: 'warning'
             }).then(() => {
-                // deleteQuestion(row.id).then(resp => {
-                //     this.reloadTable();
-                // }).catch(error => {
-                //     this.$message.error(`删除试题失败: ${error.message}`);
-                // });
+                deleteQuestion(row.id).then(resp => {
+                    this.reloadTable();
+                }).catch(error => {
+                    this.$message.error(`删除试题失败: ${error.message}`);
+                });
             }).catch( () => { });
         },
 
@@ -165,20 +166,19 @@ export default {
         },
 
         updateQuestion(form) {
-            // updateQuestion(form.id, form).then(resp => {
-            //     this.reloadTable();
-            // }).catch(error => {
-            //     this.$message.error(`修改问题失败: ${error.message}`);
-            // });
+            updateQuestion(form.id, form).then(resp => {
+                this.reloadTable();
+            }).catch(error => {
+                this.$message.error(`修改问题失败: ${error.message}`);
+            });
         },
 
         updateAnswer(form) {
-            // updateAnswer(form.questionId, form).then(resp => {
-            //     this.reloadTable();
-            // }).catch(error => {
-            //     this.$message.error(`修改答案失败: ${error.message}`);
-            // });
-
+            updateAnswer(form.questionId, form).then(resp => {
+                this.reloadTable();
+            }).catch(error => {
+                this.$message.error(`修改答案失败: ${error.message}`);
+            });
         },
         answerTags(row) {
             const answer = [];
diff --git a/src/views/competitionManage/bankList/question-create-page.vue b/src/views/competitionManage/bankList/question-create-page.vue
index 6108d55bd..bd48394b5 100644
--- a/src/views/competitionManage/bankList/question-create-page.vue
+++ b/src/views/competitionManage/bankList/question-create-page.vue
@@ -32,6 +32,7 @@ export default {
                 topic: '',
                 type: 'select',
                 answer: 0,
+                score: '',
                 optionList: []
             }
         };
@@ -61,6 +62,7 @@ export default {
         create() {
             this.$refs.info.validate().then(valid => {
                 if (valid) {
+                    // console.log(this.formModel);
                     createQuestion(this.formModel).then(resp => {
                         authUtils.setSessionStorage(this.path, JSON.stringify({
                             type: this.formModel.type
diff --git a/src/views/competitionManage/bankList/question-form.vue b/src/views/competitionManage/bankList/question-form.vue
index bdfb6b208..62c7c5e0a 100644
--- a/src/views/competitionManage/bankList/question-form.vue
+++ b/src/views/competitionManage/bankList/question-form.vue
@@ -1,6 +1,9 @@
 <template>
   <div>
     <el-form ref="form" :model="option" :rules="rules" label-width="80px">
+      <el-form-item label="分 值" prop="score">
+        <el-input v-model="option.score" placeholder="请输入分值" style="width: 200px;" />
+      </el-form-item>
       <el-form-item label="类 型" prop="type">
         <el-select v-model="option.type" :disabled="disabled" placeholder="请选择试题类型" @change="onTypeChnage">
           <el-option v-for="it in QuestionTypeList" :key="it.value" :label="it.label" :value="it.value" />
@@ -87,6 +90,10 @@ export default {
                 topic: [
                     { required: true, message: '请输入试题内容', trigger: 'blur' }
                 ],
+                score: [
+                    { required: true, message: '请输入试题分值', trigger: 'blur' },
+                    { validator: this.validateScore, trigger: 'blur' }
+                ],
                 type: [
                     { required: true, message: '请输入试题类型', trigger: 'change' }
                 ],
@@ -112,6 +119,16 @@ export default {
                 this.option.optionList = this.templateMap[type]();
             }
         },
+        validateScore(rule, value, callback) {
+            if (Number(value) <= 0) {
+                callback(new Error('请输入正确的分值'));
+            } else if (Number(value)) {
+                this.option.score = Number(value);
+                callback();
+            } else {
+                callback(new Error('请输入数字'));
+            }
+        },
         onAnswerChnage(answer) {
             this.option.optionList.forEach((el, i) => { el.correct = i == answer; });
         },
diff --git a/src/views/competitionManage/bankList/question-update-page.vue b/src/views/competitionManage/bankList/question-update-page.vue
index 46eb59ee8..8660aa122 100644
--- a/src/views/competitionManage/bankList/question-update-page.vue
+++ b/src/views/competitionManage/bankList/question-update-page.vue
@@ -28,7 +28,8 @@ export default {
                 id: '',
                 topic: '',
                 type: '',
-                answer: 0
+                answer: 0,
+                score: ''
             },
             optionList: []
         };
diff --git a/src/views/competitionManage/index.vue b/src/views/competitionManage/index.vue
index 7b013f3eb..83c54fd93 100644
--- a/src/views/competitionManage/index.vue
+++ b/src/views/competitionManage/index.vue
@@ -3,6 +3,7 @@
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <create-race ref="createRace" :map-list="mapList" @refresh="refresh" />
     <input id="competition-manage-url" v-model="url" style="opacity: 0;">
+    <div id="bm" ref="bm" />
   </div>
 </template>
 

From f91a46552b3bba26b2ebf78a2d1d8b3e2506a225 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 May 2020 18:28:18 +0800
Subject: [PATCH 48/85] =?UTF-8?q?=E5=AE=9E=E6=93=8D=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competitionManage.js                  |  9 -----
 src/api/race.js                               | 17 +++++++++
 .../competitionManage/practiceList/create.vue |  6 +--
 .../competitionManage/practiceList/index.vue  | 38 +++++++++++++++----
 4 files changed, 51 insertions(+), 19 deletions(-)
 delete mode 100644 src/api/competitionManage.js

diff --git a/src/api/competitionManage.js b/src/api/competitionManage.js
deleted file mode 100644
index 0531336a6..000000000
--- a/src/api/competitionManage.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import request from '@/utils/request';
-
-/** 获取实操列表（题库）*/
-export function getPracticeList() {
-    return request({
-        url: `/api/v1/competitionPractical/competition`,
-        method: 'get'
-    });
-}
diff --git a/src/api/race.js b/src/api/race.js
index 13d7ecb91..b900388e5 100644
--- a/src/api/race.js
+++ b/src/api/race.js
@@ -24,3 +24,20 @@ export function updateRace(id, data) {
         data
     });
 }
+
+/** 获取实操列表（题库）*/
+export function getPracticeList() {
+    return request({
+        url: `/api/v1/competitionPractical/competition`,
+        method: 'get'
+    });
+}
+
+/** 获取单个实操详情（题库）*/
+export function getPracticeByIdBasic() {
+    return request({
+        url: `/api/v1/competitionPractical/competition`,
+        method: 'get'
+    });
+}
+
diff --git a/src/views/competitionManage/practiceList/create.vue b/src/views/competitionManage/practiceList/create.vue
index bb9e54bbf..498c4d1a6 100644
--- a/src/views/competitionManage/practiceList/create.vue
+++ b/src/views/competitionManage/practiceList/create.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import { getScriptByIdBasic} from '@/api/script';
+import { getPracticeByIdBasic} from '@/api/race';
 
 export default {
     name: 'ScriptDraft',
@@ -36,7 +36,7 @@ export default {
     computed: {
         form() {
             const form = {
-                labelWidth: '150px',
+                labelWidth: '120px',
                 items: [
                     { prop: 'name', label: '实操名称', type: 'text' },
                     { prop: 'description', label: '实操描述', type: 'textarea' }
@@ -77,7 +77,7 @@ export default {
         },
         doShow(questid) {
             if (questid) {
-                getScriptByIdBasic(questid).then(resp=>{
+                getPracticeByIdBasic(questid).then(resp=>{
                     const data = {'name':resp.data.name, 'description':resp.data.description, 'mapId':resp.data.mapId};
                     this.formModel = data;
                     this.formModel.id = questid;
diff --git a/src/views/competitionManage/practiceList/index.vue b/src/views/competitionManage/practiceList/index.vue
index 5acb087d2..55e0f3f34 100644
--- a/src/views/competitionManage/practiceList/index.vue
+++ b/src/views/competitionManage/practiceList/index.vue
@@ -6,7 +6,7 @@
   </div>
 </template>
 <script>
-import { getPracticeList } from '@/api/competitionManage';
+import { getPracticeList, getRaceList } from '@/api/race';
 import CreatePractice from './create';
 export default {
     name:'PracticeManage',
@@ -15,6 +15,7 @@ export default {
     },
     data() {
         return {
+            raceList:[],
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
@@ -38,7 +39,11 @@ export default {
             },
             queryList: {
                 // query: getPracticeList,
-                data:[],
+                data:[
+                    {id:1, raceId:2, name:'行调进行扣车操作', creatorName:'水墨'},
+                    {id:2, raceId:4, name:'行调进行扣车操作', creatorName:'zyy'},
+                    {id:3, raceId:3, name:'行调进行扣车操作', creatorName:'水墨'}
+                ],
                 selectCheckShow: false,
                 indexShow: true,
                 columns: [
@@ -47,18 +52,18 @@ export default {
                         prop: 'raceId',
                         type: 'tag',
                         width: '320',
-                        columnValue: (row) => { return this.$ConstSelect.translate(row.type, 'QuestionTypeList'); },
+                        columnValue: (row) => { return this.getRaceName(row.raceId); },
                         tagType: (row) => {
                             return '';
                         }
                     },
                     {
                         title: '实操名称',
-                        prop: 'topic'
+                        prop: 'name'
                     },
                     {
                         title: '创建人',
-                        prop: 'createUserName',
+                        prop: 'creatorName',
                         width: '100'
                     },
                     {
@@ -94,6 +99,15 @@ export default {
             }
         };
     },
+    mounted() {
+        getRaceList({pageSize:999, pageNum:1}).then(res=>{
+            this.raceList = res.data.list;
+            this.queryForm.queryObject.raceId.config.data = [];
+            this.raceList.forEach(each=>{
+                this.queryForm.queryObject.raceId.config.data.push({label:each.name, value:each.id});
+            });
+        });
+    },
     methods:{
         doCreate() {
             this.$refs.createPractice.doShow(null);
@@ -107,8 +121,18 @@ export default {
         doRecord() {
 
         },
-        doUpdate() {
-
+        // 修改
+        doUpdate(index, row) {
+            this.$refs.modifyPractice.doShow(row.id);
+        },
+        getRaceName(raceId) {
+            let raceName = '';
+            this.raceList.forEach(each=>{
+                if (each.id == raceId) {
+                    raceName = each.name;
+                }
+            });
+            return raceName;
         },
         reloadTable() {
             if (this.queryList && this.queryList.reload) {

From 94dddea3bd0f971a900e367d803d14d8879bc27f Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 26 May 2020 18:30:17 +0800
Subject: [PATCH 49/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bankList/dialog-update-question.vue       | 54 +++++++++----------
 .../competitionManage/bankList/index.vue      | 12 ++---
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/views/competitionManage/bankList/dialog-update-question.vue b/src/views/competitionManage/bankList/dialog-update-question.vue
index 3d525d302..c592edddd 100644
--- a/src/views/competitionManage/bankList/dialog-update-question.vue
+++ b/src/views/competitionManage/bankList/dialog-update-question.vue
@@ -11,32 +11,32 @@
 <script>
 
 export default {
-	data() {
-		return {
-			show: false,
-			content: '',
-			formParam: null
-		};
-	},
-	computed: {
-		title() {
-			return '更新题目';
-		}
-	},
-	methods: {
-		doShow({index, row}) {
-			this.formParam = row;
-			this.content = row.topic;
-			this.show = true;
-		},
-		doClose(done) {
-			this.show = false;
-		},
-		doInput() {
-			this.formParam.topic = this.content;
-			this.$emit('updateQuestion', this.formParam);
-			this.doClose();
-		}
-	}
+    data() {
+        return {
+            show: false,
+            content: '',
+            formParam: null
+        };
+    },
+    computed: {
+        title() {
+            return '更新题目';
+        }
+    },
+    methods: {
+        doShow({index, row}) {
+            this.formParam = row;
+            this.content = row.topic;
+            this.show = true;
+        },
+        doClose(done) {
+            this.show = false;
+        },
+        doInput() {
+            this.formParam.topic = this.content;
+            this.$emit('updateQuestion', this.formParam);
+            this.doClose();
+        }
+    }
 };
 </script>
diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue
index d396c58cd..d1421f323 100644
--- a/src/views/competitionManage/bankList/index.vue
+++ b/src/views/competitionManage/bankList/index.vue
@@ -90,31 +90,31 @@ export default {
                             {
                                 name: '更新题目',
                                 handleClick: this.doUpdateQuestion,
-                                showControl: (row) => { return row.createUserId == this.userId; },
+                                // showControl: (row) => { return row.createUserId == this.userId; },
                                 type: 'success'
                             },
                             {
                                 name: '更新选项',
                                 handleClick: this.doupdateAnswers,
-                                showControl: (row) => { return row.createUserId == this.userId && row.type != 'judge'; },
+                                // showControl: (row) => { return row.createUserId == this.userId && row.type != 'judge'; },
                                 type: 'success'
                             },
                             {
                                 name: '更新答案',
                                 handleClick: this.doUpdateAnswer,
-                                showControl: (row) => { return row.createUserId == this.userId; },
+                                // showControl: (row) => { return row.createUserId == this.userId; },
                                 type: 'success'
                             },
                             {
                                 name: '删 除',
                                 handleClick: this.doDelete,
-                                showControl: (row) => { return row.createUserId == this.userId; },
+                                // showControl: (row) => { return row.createUserId == this.userId; },
                                 type: 'danger'
                             },
                             {
                                 name: '预 览',
-                                handleClick: this.doDetail,
-                                showControl: (row) => { return row.createUserId != this.userId; }
+                                handleClick: this.doDetail
+                                // showControl: (row) => { return row.createUserId != this.userId; }
                             }
                         ]
                     }

From 8e2537a9d04982d8c323eadcb5a296f21ceb2364 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 26 May 2020 18:43:59 +0800
Subject: [PATCH 50/85] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AF=95=E9=A2=98?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/competitionManage/generatePaper.vue |  31 ++-
 .../competitionManage/theoryQuestion.vue      | 196 +++++++++++++++
 src/views/competitionManage/theoryReview.vue  | 226 ++++++++++++++++++
 3 files changed, 446 insertions(+), 7 deletions(-)
 create mode 100644 src/views/competitionManage/theoryQuestion.vue
 create mode 100644 src/views/competitionManage/theoryReview.vue

diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index 2394cf54b..c1964df96 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -4,14 +4,14 @@
       <el-button size="small" type="primary">导出试题</el-button>
       <el-button size="small" type="primary" @click="goBack">返回</el-button>
     </div>
-    <el-card style="width: 45%;margin-left: 50px;margin-top: 60px;display: inline-block;">
+    <el-card style="width: 45%;margin-left: 50px;margin-top: 60px;display: inline-block;height: calc(100% - 100px);">
       <div slot="header">
         <span>理论试题列表</span>
-        <el-button style="float: right; padding: 3px 0" type="text">添加试题</el-button>
-        <el-button style="float: right; padding: 3px 0;margin-right: 5px" type="text">预览</el-button>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="addTheoryQuestion">添加试题</el-button>
+        <el-button style="float: right; padding: 3px 0;margin-right: 5px" type="text" @click="theoryReview">预览</el-button>
       </div>
       <el-table
-        :data="tableData"
+        :data="theoryQuestionList"
         style="width: 100%"
       >
         <el-table-column
@@ -40,11 +40,11 @@
         </el-table-column>
       </el-table>
     </el-card>
-    <el-card style="width: 45%;margin-left: calc(10% - 100px);margin-top: 60px;display: inline-block;">
+    <el-card style="width: 45%;margin-left: calc(10% - 100px);margin-top: 60px;display: inline-block;height: calc(100% - 100px);">
       <div slot="header">
         <span>实操试题列表</span>
         <el-button style="float: right; padding: 3px 0" type="text">添加试题</el-button>
-        <el-button style="float: right; padding: 3px 0;margin-right: 5px" type="text">预览</el-button>
+        <el-button style="float: right; padding: 3px 0;margin-right: 5px" type="text" @click="operateReview">预览</el-button>
       </div>
       <el-table
         :data="tableData"
@@ -76,25 +76,42 @@
         </el-table-column>
       </el-table>
     </el-card>
+    <theory-review ref="theoryReview" />
+    <theory-question ref="theoryQuestion" />
   </div>
 </template>
 
 <script>
+import TheoryReview from './theoryReview';
+import TheoryQuestion from './theoryQuestion';
 export default {
     name: 'GeneratPaper',
+    components: {
+        TheoryReview,
+        TheoryQuestion
+    },
     data() {
         return {
             tableData: [],
             QuestionTypeMap: {
                 select: '选择题',
                 judge: '判断题'
-            }
+            },
+            theoryQuestionList: []
         };
     },
     methods: {
         removeQuestion(index, row) {},
+        addTheoryQuestion() {
+            this.$refs.theoryQuestion.doShow();
+        },
         goBack() {
             this.$router.go(-1);
+        },
+        theoryReview() {
+            this.$refs.theoryReview.doShow();
+        },
+        operateReview() {
         }
     }
 };
diff --git a/src/views/competitionManage/theoryQuestion.vue b/src/views/competitionManage/theoryQuestion.vue
new file mode 100644
index 000000000..9a9fa74d2
--- /dev/null
+++ b/src/views/competitionManage/theoryQuestion.vue
@@ -0,0 +1,196 @@
+<template>
+  <el-dialog :visible.sync="dialogVisible" :before-close="handleClose" title="理论试题">
+    <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </el-dialog>
+
+</template>
+
+<script>
+import { listQuestionPage } from '@/api/questionBank.js';
+export default {
+    mixins: [
+        // WindowResizeHandler
+    ],
+    data() {
+        return {
+            index: 0,
+            height: 0,
+            loading: false,
+            dialogVisible: false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '80px',
+                queryObject: {
+                    type: {
+                        type: 'select',
+                        label: '类 型',
+                        config: {
+                            data: this.$ConstSelect.QuestionTypeList
+                        }
+                    },
+                    topic: {
+                        type: 'text',
+                        label: '题 目'
+                    }
+                }
+            },
+            queryList: {
+                query: listQuestionPage,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '类 型',
+                        prop: 'type',
+                        type: 'tag',
+                        width: '120',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.type, 'QuestionTypeList'); },
+                        tagType: (row) => {
+                            return '';
+                        }
+                    },
+                    {
+                        title: '题 目',
+                        prop: 'topic'
+                    },
+                    {
+                        title: '答 案',
+                        prop: 'answer',
+                        type: 'tagMore',
+                        width: '100',
+                        columnValue: (row) => { return this.answerTags(row); },
+                        tagType: (row) => {
+                            return '';
+                        }
+                    },
+                    {
+                        title: '创建人',
+                        prop: 'createUserName',
+                        width: '100'
+                    },
+                    {
+                        type: 'button',
+                        title: '操 作',
+                        width: '420',
+                        buttons: [
+                            {
+                                name: '添加',
+                                handleClick: this.addQuestion,
+                                showControl: (row) => { return row.createUserId == this.userId; },
+                                type: 'success'
+                            },
+                            {
+                                name: '移出',
+                                handleClick: this.removeQuestion,
+                                showControl: (row) => { return row.createUserId == this.userId; },
+                                type: 'warning'
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+    },
+    watch: {
+
+    },
+    methods: {
+        loadInitData() {
+            console.log('获取试题列表');
+        },
+        doShow() {
+            this.dialogVisible = true;
+            this.loadInitData();
+        },
+        handleClose() {
+            this.dialogVisible = false;
+        },
+        addQuestion() {
+
+        }
+    }
+};
+
+</script>
+<style lang="scss" scoped>
+	.layer-center {
+		width: 900px;
+		height: 100%;
+		margin: auto;
+		background: #fff;
+	}
+
+	.quiz {
+		background: #eee;
+		height: 100%;
+
+		&::-webkit-scrollbar {
+			display:none
+		}
+
+		&__card {
+			height: 100%;
+			.dir-item {
+				padding-left: 25px;
+			}
+
+			.dir-caption {
+				padding-left: 10px;
+				line-height: 26px;
+				background: #f1f1f1;
+			}
+
+		}
+
+		&__container {
+			height: 100%;
+
+			&-header {
+				height: auto !important;
+
+				.title {
+					font-size: 24px;
+					line-height: 60px;
+					font-weight: bold;
+					text-align: center;
+				}
+
+				.notes {
+					color:#606266;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					margin:  0 20px;
+				}
+			}
+
+			&-main {
+				.section {
+					padding: 5px 20px;
+					.caption {
+						line-height: 26px;
+					}
+					.context {
+					}
+				}
+			}
+
+			&-footer {
+				text-align: right;
+				position: sticky;
+				bottom: 0px;
+				padding: 40px ;
+				.buttons {
+					position: relative;
+					bottom: 20px;
+				}
+			}
+		}
+	}
+</style>
diff --git a/src/views/competitionManage/theoryReview.vue b/src/views/competitionManage/theoryReview.vue
new file mode 100644
index 000000000..a9f53231a
--- /dev/null
+++ b/src/views/competitionManage/theoryReview.vue
@@ -0,0 +1,226 @@
+<template>
+  <el-dialog fullscreen :visible.sync="dialogVisible" :before-close="handleClose" style="height: 100%;" title="理论试题预览" :show-close="showClose" center>
+    <el-container class="quiz">
+      <el-container class="quiz__container">
+        <el-header class="quiz__container-header layer-center">
+          <div class="title">{{ formModel.name }}</div>
+          <div class="notes">{{ formModel.description }}</div>
+        </el-header>
+        <el-main class="quiz__container-main layer-center">
+          <div v-for="(el,i) in sortedList" :id="'anchor__lst-'+i" :key="i" class="section">
+            <template v-if="el.children.length">
+              <div class="caption">{{ index2UnicodeList[i] }}、{{ el.title }} </div>
+              <question v-for="(item,j) in el.children" :id="'anchor__lst-'+item.type+'-'+item.index" :key="j" v-model="item.answer" class="context" :option="item" @save="onSave" />
+            </template>
+          </div>
+        </el-main>
+        <el-footer class="quiz__container-footer layer-center" @click="returnTop">
+          <el-button-group class="buttons">
+            <el-button v-loading="loading" type="primary" @click="handleClose">返回</el-button>
+          </el-button-group>
+        </el-footer>
+      </el-container>
+    </el-container>
+  </el-dialog>
+
+</template>
+
+<script>
+import Question from '@/views/jsxt/competition/theory/quiz/question';
+
+export default {
+    components: {
+        Question
+    },
+    mixins: [
+        // WindowResizeHandler
+    ],
+    data() {
+        return {
+            index: 0,
+            height: 0,
+            loading: false,
+            showClose: false,
+            dialogVisible: false,
+            formModel: {
+                description: '',
+                duration: 10,
+                name: '',
+                status: '',
+                totalScore: 0,
+                passScore: 10
+            },
+            examQuestions: [
+                {
+                    topic: 'PH玻璃电极只能在5~60℃范围内使用，而且还应通过温度校正装置来消除影响。',
+                    type: 'judge',
+                    optionList: [
+                        {id: '160', content: '√', correct: true},
+                        {id: '161', content: '×', correct: false}
+                    ]
+                },
+                {
+                    topic: '调度工作是（ ___ ）工作中的一个重要组成部分。',
+                    type: 'select',
+                    optionList: [
+                        {id: '40', content: '<span style="color: windowtext;">煤矿管理</span>', correct: false},
+                        {id: '41', content: '<span style="color: windowtext;">企业管理</span>', correct: true},
+                        {id: '42', content: '<span style="color: windowtext;">安全生产</span>', correct: false},
+                        {id: '43', content: '<span style="color: windowtext;">生产组织</span>', correct: false}
+                    ]
+                }
+            ]
+        };
+    },
+    computed: {
+        examId() {
+            return this.$route.params.examId;
+        },
+        userExamId() {
+            return this.$route.params.userExamId;
+        },
+        question() {
+            return this.examQuestions[this.index] || {};
+        },
+        index2UnicodeList() {
+            return ['一', '二', '三', '四'];
+        },
+        sortedList() {
+            return [
+                {
+                    title: '判断题',
+                    children: this.examQuestions.filter(el => { return el.type === 'judge'; })
+                },
+                {
+                    title: '选择题',
+                    children: this.examQuestions.filter(el => { return el.type === 'select'; })
+                }
+            ];
+        }
+    },
+    watch: {
+        '$router': function() {
+            this.loadInitData();
+        }
+    },
+    methods: {
+        loadInitData() {
+            console.log('获取试题详情');
+        },
+        doShow() {
+            this.dialogVisible = true;
+            this.loadInitData();
+        },
+        resizeHandler() {
+            this.height = this._clientHeight;
+        },
+        appendIndex(str, index) {
+            return `${index + 1}. ${str}`;
+        },
+        goAnchor(selector) {
+            const anchor = this.$el.querySelector(selector);
+            const el = this.$el.querySelector('.el-main');
+            if (anchor && el) {
+                el.scrollTop = anchor.offsetTop;
+            }
+        },
+        returnTop() {
+            document.querySelector('.el-header').scrollIntoView(true);
+        },
+        onSave(data) {
+            console.log(data, '问答题');
+        },
+        handleClose() {
+            this.dialogVisible = false;
+        }
+    }
+};
+
+</script>
+<style lang="scss" scoped>
+	.layer-center {
+		width: 900px;
+		height: 100%;
+		margin: auto;
+		background: #fff;
+	}
+
+	.quiz {
+		background: #eee;
+		height: 100%;
+
+		&::-webkit-scrollbar {
+			display:none
+		}
+
+		&__card {
+			height: 100%;
+			.dir-item {
+				padding-left: 25px;
+			}
+
+			.dir-caption {
+				padding-left: 10px;
+				line-height: 26px;
+				background: #f1f1f1;
+			}
+
+		}
+
+		&__container {
+			height: 100%;
+
+			&-header {
+				height: auto !important;
+
+				.title {
+					font-size: 24px;
+					line-height: 60px;
+					font-weight: bold;
+					text-align: center;
+				}
+
+				.notes {
+					color:#606266;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					margin:  0 20px;
+				}
+			}
+
+			&-main {
+				.section {
+					padding: 5px 20px;
+					.caption {
+						line-height: 26px;
+					}
+					.context {
+					}
+				}
+			}
+
+			&-footer {
+				text-align: right;
+				position: sticky;
+				bottom: 0px;
+				padding: 40px ;
+				.buttons {
+					position: relative;
+					bottom: 20px;
+				}
+			}
+		}
+	}
+	/deep/
+	.el-dialog__body {
+		height: calc(100% - 24px);
+		padding: 0;
+	}
+	/deep/
+	.el-dialog__header {
+		padding: 0;
+		background: #409EFF;
+		height: 24px;
+	}
+</style>

From 0a54a5988e6af7b92d5af275376217ae0cf85320 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 27 May 2020 09:09:29 +0800
Subject: [PATCH 51/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=90=86=E8=AE=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/competitionManage/bankList/dialog-detail.vue |  5 +++--
 src/views/competitionManage/bankList/index.vue         | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/competitionManage/bankList/dialog-detail.vue b/src/views/competitionManage/bankList/dialog-detail.vue
index bf2898d96..22ef3c89a 100644
--- a/src/views/competitionManage/bankList/dialog-detail.vue
+++ b/src/views/competitionManage/bankList/dialog-detail.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog v-dialogDrag :close-on-click-moda="false" :title="title" :visible.sync="show" width="860px" :close-on-click-modal="false" :before-close="doClose">
-    <div class="ql-editor" v-html="$escapeHTML(`${form.topic}`)" />
+    <div class="ql-editor" v-html="$escapeHTML(`题 目:  ${form.topic}`)" />
     <template v-if="checkType(form, 'judge')">
       <div class="answer">
         答 案:
@@ -67,11 +67,12 @@ export default {
 <style lang="scss" scoped>
 	.option {
 		line-height: 22px;
+		padding-left: 20px;
 	}
 
 	.answer {
 		line-height: 32px;
-		padding-left: 0;
 		color: #000;
+		padding-left: 15px;
 	}
 </style>
diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue
index d1421f323..062371ed3 100644
--- a/src/views/competitionManage/bankList/index.vue
+++ b/src/views/competitionManage/bankList/index.vue
@@ -77,11 +77,11 @@ export default {
                         prop: 'score',
                         width: '100'
                     },
-                    {
-                        title: '创建人',
-                        prop: 'createUserName',
-                        width: '100'
-                    },
+                    // {
+                    //     title: '创建人',
+                    //     prop: 'createUserName',
+                    //     width: '100'
+                    // },
                     {
                         type: 'button',
                         title: '操 作',

From 5beb83438455d388e715d585c7e3fe5aea14498a Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 27 May 2020 09:56:59 +0800
Subject: [PATCH 52/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E7=B3=BB=E7=BB=9F=20?=
 =?UTF-8?q?=E5=AE=9E=E6=93=8D=E8=AF=95=E9=A2=98=E5=88=A0=E9=99=A4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/race.js                               | 38 +++++++++++-
 src/router/index_Common.js                    |  6 ++
 src/scripts/ConstDic.js                       |  1 +
 .../practiceList/display/index.vue            | 59 +++++++++++++++++++
 .../practiceList/display/practiceRecord.vue   | 10 ++++
 .../competitionManage/practiceList/index.vue  | 55 +++++++++++++----
 6 files changed, 154 insertions(+), 15 deletions(-)
 create mode 100644 src/views/competitionManage/practiceList/display/index.vue
 create mode 100644 src/views/competitionManage/practiceList/display/practiceRecord.vue

diff --git a/src/api/race.js b/src/api/race.js
index b900388e5..902bfc983 100644
--- a/src/api/race.js
+++ b/src/api/race.js
@@ -25,7 +25,7 @@ export function updateRace(id, data) {
     });
 }
 
-/** 获取实操列表（题库）*/
+/** 获取实操试题列表（题库）*/
 export function getPracticeList() {
     return request({
         url: `/api/v1/competitionPractical/competition`,
@@ -33,7 +33,7 @@ export function getPracticeList() {
     });
 }
 
-/** 获取单个实操详情（题库）*/
+/** 获取单个实操试题详情（题库）*/
 export function getPracticeByIdBasic() {
     return request({
         url: `/api/v1/competitionPractical/competition`,
@@ -41,3 +41,37 @@ export function getPracticeByIdBasic() {
     });
 }
 
+/** 创建实操试题 */
+export function createPractice(data) {
+    return request({
+        url: `/api/v1/competitionPractical/competition`,
+        method: 'post',
+        data
+    });
+}
+
+/** 更新实操试题信息 */
+export function putPracticeInfo(id, params) {
+    return request({
+        url: `/api/v1/competitionPractical/competition/${id}`,
+        method: 'put',
+        data: params
+    });
+}
+
+/** 删除实操试题 */
+export function deletePractice(id) {
+    return request({
+        url: `/api/v1/competitionPractical/competition/${id}`,
+        method: 'delete'
+    });
+}
+
+/** 录制实操试题 */
+export function practiceRecordNotify(practiceId) {
+    return request({
+        url: `/api/simulation/scriptWrite/${practiceId}`,
+        method: 'get'
+    });
+}
+
diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index 435548525..d73e884a4 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -64,6 +64,7 @@ const LessonDetail = () => import('@/views/lesson/details');
 const ScriptmanageHome = () => import('@/views/scriptManage/home');
 const ScriptDisplay = () => import('@/views/scriptManage/display/index');
 const ScriptDisplayNew = () => import('@/views/scriptManage/display/indexNew');
+const PracticeDisplayNew = () => import('@/views/competitionManage/practiceList/display/index');
 
 const IbpHome = () => import('@/views/ibp/home');
 const IbpDraw = () => import('@/views/ibp/ibpDraw/index');
@@ -282,6 +283,11 @@ export const publicAsyncRoute = [
         component: ScriptDisplayNew,
         hidden: true
     },
+    { // 实操试题编辑 战场图
+        path: '/practiceDisplayNew/:mode',
+        component: PracticeDisplayNew,
+        hidden: true
+    },
     {
         path: '/displayBigScreen/:mapId',
         component: BigScreen,
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index aee02b272..0c2feb35b 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -2222,6 +2222,7 @@ export const UrlConfig = {
     displayNew: '/displayNew',
     scriptDisplay: '/scriptDisplay',
     scriptDisplayNew:'/scriptDisplayNew',
+    practiceDisplayNew:'/practiceDisplayNew',
     examRuleDraft: '/examRule/draft',
     examRuleManage: '/examRule/manage',
     lesson: {
diff --git a/src/views/competitionManage/practiceList/display/index.vue b/src/views/competitionManage/practiceList/display/index.vue
new file mode 100644
index 000000000..757261ba4
--- /dev/null
+++ b/src/views/competitionManage/practiceList/display/index.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="script-parent">
+    <div class="script-card" :style="{width: widthLeft+'px'}">
+      <practice-record ref="tipTaskRecord" :group="group" :width="widthLeft" />
+    </div>
+    <drap-left :width-left="widthLeft" :min="780" :max="980" @drapWidth="drapWidth" />
+    <div class="script-display">
+      <display ref="display" :size="size" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Display from '@/views/newMap/displayNew/index';
+import PracticeRecord from './practiceRecord';
+import drapLeft from '@/views/components/drapLeft/index';
+
+export default {
+    name: 'ScriptDisplayNew',
+    components: {
+        Display,
+        PracticeRecord,
+        drapLeft
+    },
+    data() {
+        return {
+            widthLeft: 780,
+            size: {
+                width: document.documentElement.clientWidth - 780,
+                height: document.documentElement.clientHeight
+            },
+            group: this.$route.query.group
+        };
+    },
+    watch: {
+        '$store.state.app.windowSizeCount': function() {
+            this.size = { width: this.$store.state.app.width - 780, height: this.$store.state.app.height};
+        },
+        widthLeft: function(val) {
+            this.size = { width: this.$store.state.app.width - val, height: this.$store.state.app.height};
+        }
+    },
+    methods: {
+        drapWidth(width) {
+            this.widthLeft = Number(width);
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+    .script-parent {
+        display: flex;
+        flex-flow: row;
+        .script-card {
+            width: 780px;
+        }
+    }
+</style>
diff --git a/src/views/competitionManage/practiceList/display/practiceRecord.vue b/src/views/competitionManage/practiceList/display/practiceRecord.vue
new file mode 100644
index 000000000..ca5fc3c8e
--- /dev/null
+++ b/src/views/competitionManage/practiceList/display/practiceRecord.vue
@@ -0,0 +1,10 @@
+<template>
+  <div>
+    111
+  </div>
+</template>
+<script>
+export default {
+
+};
+</script>
diff --git a/src/views/competitionManage/practiceList/index.vue b/src/views/competitionManage/practiceList/index.vue
index 55e0f3f34..95512d719 100644
--- a/src/views/competitionManage/practiceList/index.vue
+++ b/src/views/competitionManage/practiceList/index.vue
@@ -6,7 +6,9 @@
   </div>
 </template>
 <script>
-import { getPracticeList, getRaceList } from '@/api/race';
+import { getPracticeList, getRaceList, putPracticeInfo, deletePractice, createPractice, practiceRecordNotify } from '@/api/race';
+import { launchFullscreen } from '@/utils/screen';
+import { UrlConfig } from '@/scripts/ConstDic';
 import CreatePractice from './create';
 export default {
     name:'PracticeManage',
@@ -85,11 +87,11 @@ export default {
                                 name: '删 除',
                                 handleClick: this.doDelete,
                                 type: 'danger'
-                            },
-                            {
-                                name: '预 览',
-                                handleClick: this.doDetail
                             }
+                            // {
+                            //     name: '预 览',
+                            //     handleClick: this.doDetail
+                            // }
                         ]
                     }
                 ],
@@ -115,11 +117,28 @@ export default {
         doDetail() {
 
         },
-        doDelete() {
-
+        doDelete(index, row) {
+            this.$confirm('此操作将删除此实操, 是否继续?', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                deletePractice(row.id).then(response => {
+                    this.$message.success('删除实操试题成功');
+                    this.reloadTable();
+                }).catch((error) => {
+                    this.$messageBox(`删除实操试题失败: ${error.message}`);
+                });
+            }).catch(() => { });
         },
-        doRecord() {
-
+        doRecord(index, row) {
+            practiceRecordNotify(row.id).then(resp => {
+                const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, lineCode:this.$route.query.lineCode};
+                this.$router.push({ path: `${UrlConfig.practiceDisplayNew}/practice`, query });
+                launchFullscreen();
+            }).catch(error => {
+                this.$messageBox(`创建仿真失败: ${error.message}`);
+            });
         },
         // 修改
         doUpdate(index, row) {
@@ -139,11 +158,21 @@ export default {
                 this.queryList.reload();
             }
         },
-        handleConfirmCreate() {
-
+        handleConfirmCreate(data) {
+            createPractice(data).then(resp => {
+                this.reloadTable();
+                this.$message.success('创建实操试题成功');
+            }).catch(error => {
+                this.$messageBox(`创建实操试题失败: ${error.message}`);
+            });
         },
-        handleConfirmModify() {
-
+        handleConfirmModify(data) {
+            putPracticeInfo(data.id, data).then(resp => {
+                this.reloadTable();
+                this.$message.success('修改实操试题成功');
+            }).catch(error => {
+                this.$messageBox(`修改实操试题失败: ${error.message}`);
+            });
         }
     }
 };

From d492634c98d5340b34e223c27aff65cb6c64c15c Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 10:33:26 +0800
Subject: [PATCH 53/85] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AF=95=E9=A2=98?=
 =?UTF-8?q?=E7=90=86=E8=AE=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/competitionManage/generatePaper.vue | 65 +++++++++++++++----
 .../competitionManage/theoryQuestion.vue      | 60 +++++++++++++++--
 src/views/competitionManage/theoryReview.vue  | 14 +++-
 3 files changed, 115 insertions(+), 24 deletions(-)

diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index c1964df96..bc4b5e10b 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -32,10 +32,16 @@
         <el-table-column
           prop="score"
           label="分值"
-        />
-        <el-table-column prop="operate" label="操作">
+        >
           <template slot-scope="scope">
-            <el-button type="warning" size="mini" @click="removeQuestion(index, scope)">移出</el-button>
+            <span v-if="!scope.row.editScope" @click="editScope(scope.row)">{{ scope.row.score }}</span>
+            <i v-if="!scope.row.editScope" class="el-icon-edit" @click="editScope(scope.row)" />
+            <el-input v-if="scope.row.editScope" v-model="scope.row.score" v-focus="scope.row.editFocus" size="small" style="width: 50px;" @blur="editScopeBlur(scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="operate" label="操作11">
+          <template slot-scope="scope">
+            <el-button type="warning" size="mini" @click="removeTheoryQuestion(scope)">移出</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -47,7 +53,7 @@
         <el-button style="float: right; padding: 3px 0;margin-right: 5px" type="text" @click="operateReview">预览</el-button>
       </div>
       <el-table
-        :data="tableData"
+        :data="operateQuestionList"
         style="width: 100%"
       >
         <el-table-column
@@ -65,19 +71,20 @@
           prop="topic"
           label="题目"
         />
-        <el-table-column
-          prop="score"
-          label="分值"
-        />
+        <el-table-column prop="score" label="分值">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.score" size="small" />
+          </template>
+        </el-table-column>
         <el-table-column prop="operate" label="操作">
           <template slot-scope="scope">
-            <el-button type="warning" size="mini" @click="removeQuestion(index, scope)">移出</el-button>
+            <el-button type="warning" size="mini" @click="removeOperateQuestion(scope)">移出</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
-    <theory-review ref="theoryReview" />
-    <theory-question ref="theoryQuestion" />
+    <theory-review ref="theoryReview" :theory-question-list="theoryQuestionList" />
+    <theory-question ref="theoryQuestion" :theory-index-list="theoryIndexList" @addQuestion="addTheoryQuestionList" @removeQuestion="removeTheoryQuestion" />
   </div>
 </template>
 
@@ -92,16 +99,35 @@ export default {
     },
     data() {
         return {
-            tableData: [],
             QuestionTypeMap: {
                 select: '选择题',
                 judge: '判断题'
             },
-            theoryQuestionList: []
+            theoryQuestionList: [], // 理论试卷试题列表
+            operateQuestionList: [], // 实操试卷试题列表
+            theoryIndexList: [], // 理论试卷试题索引列表
+            operateIndexList: []// 实操试卷试题索引列表
         };
     },
     methods: {
-        removeQuestion(index, row) {},
+        removeOperateQuestion(row) {
+            const index = this.operateIndexList.indexOf(row.id);
+            this.operateIndexList.splice(index, 1);
+            this.operateQuestionList.splice(index, 1);
+        },
+        removeTheoryQuestion(row) {
+            const index = this.theoryIndexList.indexOf(row.id);
+            this.theoryIndexList.splice(index, 1);
+            this.theoryQuestionList.splice(index, 1);
+        },
+        addTheoryQuestionList(row) {
+            this.theoryIndexList.push(row.id);
+            this.theoryQuestionList.push(row);
+        },
+        addOperateQuestionList(row) {
+            this.operateIndexList.push(row.id);
+            this.operateQuestionList.push(row);
+        },
         addTheoryQuestion() {
             this.$refs.theoryQuestion.doShow();
         },
@@ -112,6 +138,17 @@ export default {
             this.$refs.theoryReview.doShow();
         },
         operateReview() {
+        },
+        editScope(row) {
+            this.$set(row, 'editScope', true);
+            this.$nextTick(() => {
+                this.$set(row, 'editFocus', true);
+                console.log(row);
+            });
+        },
+        editScopeBlur(row) {
+            this.$set(row, 'editScope', false);
+            this.$set(row, 'editFocus', false);
         }
     }
 };
diff --git a/src/views/competitionManage/theoryQuestion.vue b/src/views/competitionManage/theoryQuestion.vue
index 9a9fa74d2..c93b3f258 100644
--- a/src/views/competitionManage/theoryQuestion.vue
+++ b/src/views/competitionManage/theoryQuestion.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogVisible" :before-close="handleClose" title="理论试题">
+  <el-dialog :visible.sync="dialogVisible" :before-close="handleClose" title="理论试题" width="80%">
     <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
   </el-dialog>
 
@@ -11,6 +11,14 @@ export default {
     mixins: [
         // WindowResizeHandler
     ],
+    props: {
+        theoryIndexList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
     data() {
         return {
             index: 0,
@@ -42,6 +50,7 @@ export default {
                 query: listQuestionPage,
                 selectCheckShow: false,
                 indexShow: true,
+                afterQuery: this.afterQuery,
                 columns: [
                     {
                         title: '类 型',
@@ -75,18 +84,18 @@ export default {
                     {
                         type: 'button',
                         title: '操 作',
-                        width: '420',
+                        width: '100',
                         buttons: [
                             {
                                 name: '添加',
                                 handleClick: this.addQuestion,
-                                showControl: (row) => { return row.createUserId == this.userId; },
+                                showControl: (row) => { return !row.paper; },
                                 type: 'success'
                             },
                             {
                                 name: '移出',
                                 handleClick: this.removeQuestion,
-                                showControl: (row) => { return row.createUserId == this.userId; },
+                                showControl: (row) => { return row.paper; },
                                 type: 'warning'
                             }
                         ]
@@ -102,7 +111,9 @@ export default {
     },
     methods: {
         loadInitData() {
-            console.log('获取试题列表');
+            this.$nextTick(() => {
+                this.queryList.reload();
+            });
         },
         doShow() {
             this.dialogVisible = true;
@@ -111,8 +122,43 @@ export default {
         handleClose() {
             this.dialogVisible = false;
         },
-        addQuestion() {
-
+        addQuestion(index, row) {
+            this.$set(row, 'paper', true);
+            this.$emit('addQuestion', row);
+        },
+        afterQuery(data) {
+            if (data && data.list) {
+                const that = this;
+                const list = data.list;
+                if (list) {
+                    list.map(elem => {
+                        this.$set(elem, 'paper', that.theoryIndexList.includes(elem.id));
+                    });
+                }
+            }
+            return data;
+        },
+        removeQuestion(index, row) {
+            this.$set(row, 'paper', false);
+            this.$emit('removeQuestion', row);
+        },
+        answerTags(row) {
+            const answer = [];
+            row.optionList.forEach((el, i) => {
+                switch (row.type) {
+                case 'select':
+                    if (el.correct) {
+                        answer.push(this.$asc2chart(i + 65));
+                    }
+                    break;
+                case 'judge':
+                    if (el.correct) {
+                        answer.push(el.content);
+                    }
+                    break;
+                }
+            });
+            return answer;
         }
     }
 };
diff --git a/src/views/competitionManage/theoryReview.vue b/src/views/competitionManage/theoryReview.vue
index a9f53231a..f7b52b3f0 100644
--- a/src/views/competitionManage/theoryReview.vue
+++ b/src/views/competitionManage/theoryReview.vue
@@ -35,6 +35,14 @@ export default {
     mixins: [
         // WindowResizeHandler
     ],
+    props: {
+        theoryQuestionList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
     data() {
         return {
             index: 0,
@@ -80,7 +88,7 @@ export default {
             return this.$route.params.userExamId;
         },
         question() {
-            return this.examQuestions[this.index] || {};
+            return this.theoryQuestionList[this.index] || {};
         },
         index2UnicodeList() {
             return ['一', '二', '三', '四'];
@@ -89,11 +97,11 @@ export default {
             return [
                 {
                     title: '判断题',
-                    children: this.examQuestions.filter(el => { return el.type === 'judge'; })
+                    children: this.theoryQuestionList.filter(el => { return el.type === 'judge'; })
                 },
                 {
                     title: '选择题',
-                    children: this.examQuestions.filter(el => { return el.type === 'select'; })
+                    children: this.theoryQuestionList.filter(el => { return el.type === 'select'; })
                 }
             ];
         }

From b7d4eb7bda338ef2e20ac443bc517036c97e34b4 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 27 May 2020 10:36:40 +0800
Subject: [PATCH 54/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=BA=E6=AE=B5?=
 =?UTF-8?q?=E7=BB=98=E5=9B=BE=E5=85=83=E7=B4=A0=E5=B1=82=E7=BA=A7=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/{Automactic => AutoTurnBack}/EMouse.js      | 0
 src/jmapNew/shape/{Automactic => AutoTurnBack}/index.js       | 2 +-
 src/jmapNew/shape/Section/ESeparator.js                       | 2 +-
 src/jmapNew/shape/Section/index.js                            | 2 ++
 src/jmapNew/shape/factory.js                                  | 2 +-
 src/views/competitionManage/bankList/question-create-page.vue | 1 -
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename src/jmapNew/shape/{Automactic => AutoTurnBack}/EMouse.js (100%)
 rename src/jmapNew/shape/{Automactic => AutoTurnBack}/index.js (99%)

diff --git a/src/jmapNew/shape/Automactic/EMouse.js b/src/jmapNew/shape/AutoTurnBack/EMouse.js
similarity index 100%
rename from src/jmapNew/shape/Automactic/EMouse.js
rename to src/jmapNew/shape/AutoTurnBack/EMouse.js
diff --git a/src/jmapNew/shape/Automactic/index.js b/src/jmapNew/shape/AutoTurnBack/index.js
similarity index 99%
rename from src/jmapNew/shape/Automactic/index.js
rename to src/jmapNew/shape/AutoTurnBack/index.js
index 942029bab..83c303df7 100644
--- a/src/jmapNew/shape/Automactic/index.js
+++ b/src/jmapNew/shape/AutoTurnBack/index.js
@@ -9,7 +9,7 @@ import EMouse from './EMouse';
 import BoundingRect from 'zrender/src/core/BoundingRect';
 import {isShowThePrdType} from '../../utils/handlePath';
 
-export default class Automactic extends Group {
+export default class AutoTurnBack extends Group {
     constructor(model, style) {
         super();
         this.z = 20;
diff --git a/src/jmapNew/shape/Section/ESeparator.js b/src/jmapNew/shape/Section/ESeparator.js
index 562db4652..7aa299a93 100644
--- a/src/jmapNew/shape/Section/ESeparator.js
+++ b/src/jmapNew/shape/Section/ESeparator.js
@@ -8,7 +8,7 @@ export default class ESeparator extends Group {
         super();
         this.model = model;
         this.zlevel = model.zlevel;
-        this.z = model.style.Section.separator.z || 6;
+        this.z = model.z || 6;
         this.style = model.style;
         this.setType();
     }
diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index 6815330f6..08542bfdf 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -481,6 +481,7 @@ export default class Section extends Group {
             this.lPartition = new ESeparator({
                 style: style,
                 zlevel: this.zlevel,
+                z: this.z + 3,
                 traingle: traingle,
                 point: {
                     x: model.points[0].x,
@@ -495,6 +496,7 @@ export default class Section extends Group {
             this.rPartition = new ESeparator({
                 style: style,
                 zlevel: this.zlevel,
+                z: this.z + 3,
                 traingle: traingle,
                 point: {
                     x: model.points[model.points.length - 1].x,
diff --git a/src/jmapNew/shape/factory.js b/src/jmapNew/shape/factory.js
index c943149dd..4741ab55a 100644
--- a/src/jmapNew/shape/factory.js
+++ b/src/jmapNew/shape/factory.js
@@ -17,7 +17,7 @@ import Line from './Line/index.js';
 import Text2 from './Text/index.js';
 import AxleReset from './AxleReset/index';
 import GuideLock from './GuideLock/index';
-import AutoTurnBack from './Automactic/index.js';
+import AutoTurnBack from './AutoTurnBack/index.js';
 import OutFrame from './OutFrame/index.js';
 import CheckBox from './checkBox/checkBox.js';
 import AutomaticRoute from './AutomacticRoute/index.js';
diff --git a/src/views/competitionManage/bankList/question-create-page.vue b/src/views/competitionManage/bankList/question-create-page.vue
index bfdc066c9..57f6c026c 100644
--- a/src/views/competitionManage/bankList/question-create-page.vue
+++ b/src/views/competitionManage/bankList/question-create-page.vue
@@ -62,7 +62,6 @@ export default {
         create() {
             this.$refs.info.validate().then(valid => {
                 if (valid) {
-                    // console.log(this.formModel);
                     createQuestion(this.formModel).then(resp => {
                         authUtils.setSessionStorage(this.path, JSON.stringify({
                             type: this.formModel.type

From 60c90f24e85155da39ee6af081dafafa6b97a2b2 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 27 May 2020 10:49:53 +0800
Subject: [PATCH 55/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/race.js                                           | 2 +-
 src/permission.js                                         | 2 +-
 src/views/competitionManage/generatePaper.vue             | 6 ++----
 .../competitionManage/practiceList/display/index.vue      | 8 ++++----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/api/race.js b/src/api/race.js
index 902bfc983..2d8d24498 100644
--- a/src/api/race.js
+++ b/src/api/race.js
@@ -70,7 +70,7 @@ export function deletePractice(id) {
 /** 录制实操试题 */
 export function practiceRecordNotify(practiceId) {
     return request({
-        url: `/api/simulation/scriptWrite/${practiceId}`,
+        url: `/api/scriptSimulation/${practiceId}/scriptWrite`,
         method: 'get'
     });
 }
diff --git a/src/permission.js b/src/permission.js
index 53dc0d483..96d5874f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -19,7 +19,7 @@ function hasPermission(roles, permissionRoles) {
 
 const whiteList = ['/login', '/design/login', '/gzzbxy/relay']; // 不重定向白名单
 
-const designPageRegex = [/^\/design/, /^\/scriptDisplay/, /^\/publish/, /^\/orderauthor/, /^\/system/, /^\/iscs/, /^\/display\/record/, /^\/display\/manage/, /^\/apply/, /^\/plan/, /^\/display\/plan/, /^\/displayNew\/record/, /^\/displayNew\/manage/, /^\/displayNew\/plan/];
+const designPageRegex = [/^\/design/, /^\/scriptDisplay/, /^\/publish/, /^\/orderauthor/, /^\/system/, /^\/iscs/, /^\/display\/record/, /^\/display\/manage/, /^\/apply/, /^\/plan/, /^\/display\/plan/, /^\/displayNew\/record/, /^\/displayNew\/manage/, /^\/displayNew\/plan/, /^\/practiceDisplayNew/];
 
 function isDesignPage(toRoutePath) {
     return designPageRegex.some(item => item.test(toRoutePath) );
diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index bc4b5e10b..4838a610b 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -36,7 +36,7 @@
           <template slot-scope="scope">
             <span v-if="!scope.row.editScope" @click="editScope(scope.row)">{{ scope.row.score }}</span>
             <i v-if="!scope.row.editScope" class="el-icon-edit" @click="editScope(scope.row)" />
-            <el-input v-if="scope.row.editScope" v-model="scope.row.score" v-focus="scope.row.editFocus" size="small" style="width: 50px;" @blur="editScopeBlur(scope.row)" />
+            <el-input v-if="scope.row.editScope" :ref="'input'+scope.row.id" v-model="scope.row.score" size="small" style="width: 50px;" @blur="editScopeBlur(scope.row)" />
           </template>
         </el-table-column>
         <el-table-column prop="operate" label="操作11">
@@ -142,13 +142,11 @@ export default {
         editScope(row) {
             this.$set(row, 'editScope', true);
             this.$nextTick(() => {
-                this.$set(row, 'editFocus', true);
-                console.log(row);
+                this.$refs['input' + row.id].focus();
             });
         },
         editScopeBlur(row) {
             this.$set(row, 'editScope', false);
-            this.$set(row, 'editFocus', false);
         }
     }
 };
diff --git a/src/views/competitionManage/practiceList/display/index.vue b/src/views/competitionManage/practiceList/display/index.vue
index 757261ba4..5a1a1ea0d 100644
--- a/src/views/competitionManage/practiceList/display/index.vue
+++ b/src/views/competitionManage/practiceList/display/index.vue
@@ -3,7 +3,7 @@
     <div class="script-card" :style="{width: widthLeft+'px'}">
       <practice-record ref="tipTaskRecord" :group="group" :width="widthLeft" />
     </div>
-    <drap-left :width-left="widthLeft" :min="780" :max="980" @drapWidth="drapWidth" />
+    <drap-left :width-left="widthLeft" :min="480" :max="580" @drapWidth="drapWidth" />
     <div class="script-display">
       <display ref="display" :size="size" />
     </div>
@@ -24,9 +24,9 @@ export default {
     },
     data() {
         return {
-            widthLeft: 780,
+            widthLeft: 480,
             size: {
-                width: document.documentElement.clientWidth - 780,
+                width: document.documentElement.clientWidth - 480,
                 height: document.documentElement.clientHeight
             },
             group: this.$route.query.group
@@ -34,7 +34,7 @@ export default {
     },
     watch: {
         '$store.state.app.windowSizeCount': function() {
-            this.size = { width: this.$store.state.app.width - 780, height: this.$store.state.app.height};
+            this.size = { width: this.$store.state.app.width - 480, height: this.$store.state.app.height};
         },
         widthLeft: function(val) {
             this.size = { width: this.$store.state.app.width - val, height: this.$store.state.app.height};

From eb7dd84c488c1b5eb0cf23a452301ac02ea1595a Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 11:07:04 +0800
Subject: [PATCH 56/85] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AF=95=E5=8D=B7?=
 =?UTF-8?q?=E5=AE=9E=E6=93=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/competitionManage/generatePaper.vue |  27 ++-
 .../competitionManage/operateQuestion.vue     | 218 ++++++++++++++++++
 src/views/competitionManage/theoryReview.vue  |  22 +-
 3 files changed, 232 insertions(+), 35 deletions(-)
 create mode 100644 src/views/competitionManage/operateQuestion.vue

diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index bc4b5e10b..124c7df3f 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -49,7 +49,7 @@
     <el-card style="width: 45%;margin-left: calc(10% - 100px);margin-top: 60px;display: inline-block;height: calc(100% - 100px);">
       <div slot="header">
         <span>实操试题列表</span>
-        <el-button style="float: right; padding: 3px 0" type="text">添加试题</el-button>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="addOperateQuestion">添加试题</el-button>
         <el-button style="float: right; padding: 3px 0;margin-right: 5px" type="text" @click="operateReview">预览</el-button>
       </div>
       <el-table
@@ -57,19 +57,12 @@
         style="width: 100%"
       >
         <el-table-column
-          prop="type"
-          label="类型"
-        >
-          <template slot-scope="scope">
-            <el-tag
-              type="primary"
-              disable-transitions
-            >{{ QuestionTypeMap[scope.row.type] }}</el-tag>
-          </template>
-        </el-table-column>
+          prop="name"
+          label="实操名称"
+        />
         <el-table-column
-          prop="topic"
-          label="题目"
+          prop="creatorName"
+          label="创建人"
         />
         <el-table-column prop="score" label="分值">
           <template slot-scope="scope">
@@ -85,17 +78,20 @@
     </el-card>
     <theory-review ref="theoryReview" :theory-question-list="theoryQuestionList" />
     <theory-question ref="theoryQuestion" :theory-index-list="theoryIndexList" @addQuestion="addTheoryQuestionList" @removeQuestion="removeTheoryQuestion" />
+    <operate-question ref="operateQuestion" :operate-index-list="operateIndexList" @addQuestion="addOperateQuestionList" @removeQuestion="removeOperateQuestion" />
   </div>
 </template>
 
 <script>
 import TheoryReview from './theoryReview';
 import TheoryQuestion from './theoryQuestion';
+import OperateQuestion from './operateQuestion';
 export default {
     name: 'GeneratPaper',
     components: {
         TheoryReview,
-        TheoryQuestion
+        TheoryQuestion,
+        OperateQuestion
     },
     data() {
         return {
@@ -131,6 +127,9 @@ export default {
         addTheoryQuestion() {
             this.$refs.theoryQuestion.doShow();
         },
+        addOperateQuestion() {
+            this.$refs.operateQuestion.doShow();
+        },
         goBack() {
             this.$router.go(-1);
         },
diff --git a/src/views/competitionManage/operateQuestion.vue b/src/views/competitionManage/operateQuestion.vue
new file mode 100644
index 000000000..9954bea80
--- /dev/null
+++ b/src/views/competitionManage/operateQuestion.vue
@@ -0,0 +1,218 @@
+<template>
+  <el-dialog :visible.sync="dialogVisible" :before-close="handleClose" title="实操试题" width="80%">
+    <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </el-dialog>
+
+</template>
+
+<script>
+export default {
+    mixins: [
+        // WindowResizeHandler
+    ],
+    props: {
+        operateIndexList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            index: 0,
+            height: 0,
+            loading: false,
+            dialogVisible: false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '80px',
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: '实操名称'
+                    }
+                }
+            },
+            queryList: {
+                // query: getPracticeList,
+                data:[
+                    {id:1, raceId:2, name:'行调进行扣车操作', creatorName:'水墨'},
+                    {id:2, raceId:4, name:'行调进行扣车操作', creatorName:'zyy'},
+                    {id:3, raceId:3, name:'行调进行扣车操作', creatorName:'水墨'}
+                ],
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '实操名称',
+                        prop: 'name'
+                    },
+                    {
+                        title: '创建人',
+                        prop: 'creatorName',
+                        width: '100'
+                    },
+                    {
+                        type: 'button',
+                        title: '操 作',
+                        width: '420',
+                        buttons: [
+                            {
+                                name: '添加',
+                                handleClick: this.addQuestion,
+                                showControl: (row) => { return !row.paper; },
+                                type: 'success'
+                            },
+                            {
+                                name: '移出',
+                                handleClick: this.removeQuestion,
+                                showControl: (row) => { return row.paper; },
+                                type: 'warning'
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+    },
+    watch: {
+
+    },
+    methods: {
+        loadInitData() {
+            this.$nextTick(() => {
+                this.queryList.reload();
+            });
+        },
+        doShow() {
+            this.dialogVisible = true;
+            this.loadInitData();
+        },
+        handleClose() {
+            this.dialogVisible = false;
+        },
+        addQuestion(index, row) {
+            this.$set(row, 'paper', true);
+            this.$emit('addQuestion', row);
+        },
+        afterQuery(data) {
+            if (data && data.list) {
+                const that = this;
+                const list = data.list;
+                if (list) {
+                    list.map(elem => {
+                        this.$set(elem, 'paper', that.operateIndexList.includes(elem.id));
+                    });
+                }
+            }
+            return data;
+        },
+        removeQuestion(index, row) {
+            this.$set(row, 'paper', false);
+            this.$emit('removeQuestion', row);
+        },
+        answerTags(row) {
+            const answer = [];
+            row.optionList.forEach((el, i) => {
+                switch (row.type) {
+                case 'select':
+                    if (el.correct) {
+                        answer.push(this.$asc2chart(i + 65));
+                    }
+                    break;
+                case 'judge':
+                    if (el.correct) {
+                        answer.push(el.content);
+                    }
+                    break;
+                }
+            });
+            return answer;
+        }
+    }
+};
+
+</script>
+<style lang="scss" scoped>
+	.layer-center {
+		width: 900px;
+		height: 100%;
+		margin: auto;
+		background: #fff;
+	}
+
+	.quiz {
+		background: #eee;
+		height: 100%;
+
+		&::-webkit-scrollbar {
+			display:none
+		}
+
+		&__card {
+			height: 100%;
+			.dir-item {
+				padding-left: 25px;
+			}
+
+			.dir-caption {
+				padding-left: 10px;
+				line-height: 26px;
+				background: #f1f1f1;
+			}
+
+		}
+
+		&__container {
+			height: 100%;
+
+			&-header {
+				height: auto !important;
+
+				.title {
+					font-size: 24px;
+					line-height: 60px;
+					font-weight: bold;
+					text-align: center;
+				}
+
+				.notes {
+					color:#606266;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					margin:  0 20px;
+				}
+			}
+
+			&-main {
+				.section {
+					padding: 5px 20px;
+					.caption {
+						line-height: 26px;
+					}
+					.context {
+					}
+				}
+			}
+
+			&-footer {
+				text-align: right;
+				position: sticky;
+				bottom: 0px;
+				padding: 40px ;
+				.buttons {
+					position: relative;
+					bottom: 20px;
+				}
+			}
+		}
+	}
+</style>
diff --git a/src/views/competitionManage/theoryReview.vue b/src/views/competitionManage/theoryReview.vue
index f7b52b3f0..efc2d4be4 100644
--- a/src/views/competitionManage/theoryReview.vue
+++ b/src/views/competitionManage/theoryReview.vue
@@ -57,27 +57,7 @@ export default {
                 status: '',
                 totalScore: 0,
                 passScore: 10
-            },
-            examQuestions: [
-                {
-                    topic: 'PH玻璃电极只能在5~60℃范围内使用，而且还应通过温度校正装置来消除影响。',
-                    type: 'judge',
-                    optionList: [
-                        {id: '160', content: '√', correct: true},
-                        {id: '161', content: '×', correct: false}
-                    ]
-                },
-                {
-                    topic: '调度工作是（ ___ ）工作中的一个重要组成部分。',
-                    type: 'select',
-                    optionList: [
-                        {id: '40', content: '<span style="color: windowtext;">煤矿管理</span>', correct: false},
-                        {id: '41', content: '<span style="color: windowtext;">企业管理</span>', correct: true},
-                        {id: '42', content: '<span style="color: windowtext;">安全生产</span>', correct: false},
-                        {id: '43', content: '<span style="color: windowtext;">生产组织</span>', correct: false}
-                    ]
-                }
-            ]
+            }
         };
     },
     computed: {

From a585fecf3b57e6201d31943f136e15fc104b041f Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 27 May 2020 11:15:17 +0800
Subject: [PATCH 57/85] =?UTF-8?q?=E8=B0=83=E6=95=B4focus=20=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/directive/focus/focus.js | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/directive/focus/focus.js b/src/directive/focus/focus.js
index 7c3b68b65..512c0d1df 100644
--- a/src/directive/focus/focus.js
+++ b/src/directive/focus/focus.js
@@ -1,18 +1,21 @@
 export default {
-	// 当被绑定的元素插入到 DOM 中时
-	inserted: function (el, obj) {
-		// 这是需要页面刚加载就能进行聚焦操作使用的钩子函数,可以省略的，视具体需求而定
-		// 对值进行判断
-		if (obj.value) {
-			// 聚焦元素
-			el.focus();
-		}
-	},
-	// 当指令所在组件的 VNode 及其子 VNode 全部更新后调用
-	// 这是每当绑定的值发生改变时触发的钩子函数
-	componentUpdated: function (el, obj) {
-		if (obj.value) {
-			el.focus();
-		}
-	}
+    // 当被绑定的元素插入到 DOM 中时
+    inserted: function (el, obj) {
+        // 这是需要页面刚加载就能进行聚焦操作使用的钩子函数,可以省略的，视具体需求而定
+        // 对值进行判断
+        const dom = el.querySelector('input') || el.querySelector('textarea');
+        dom.focus();
+        // el.focus();
+        // if (obj.value) {
+        // 	// 聚焦元素
+        // 	el.focus();
+        // }
+    },
+    // 当指令所在组件的 VNode 及其子 VNode 全部更新后调用
+    // 这是每当绑定的值发生改变时触发的钩子函数
+    componentUpdated: function (el, obj) {
+        if (obj.value) {
+            el.focus();
+        }
+    }
 };

From 61b0d22d5370ffd2bec4cba84b56192d0f52e660 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 27 May 2020 11:20:14 +0800
Subject: [PATCH 58/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E7=B3=BB=E7=BB=9F=20?=
 =?UTF-8?q?=E5=AE=9E=E6=93=8D=E5=88=97=E8=A1=A8=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../competitionManage/practiceList/create.vue | 23 ++++++++++++++++---
 .../competitionManage/practiceList/index.vue  |  7 +++---
 src/views/scriptManage/create.vue             |  2 --
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/views/competitionManage/practiceList/create.vue b/src/views/competitionManage/practiceList/create.vue
index 498c4d1a6..e612b68b7 100644
--- a/src/views/competitionManage/practiceList/create.vue
+++ b/src/views/competitionManage/practiceList/create.vue
@@ -19,13 +19,18 @@ export default {
             default() {
                 return '';
             }
+        },
+        raceList:{
+            type: Array,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             dialogVisible: false,
-            mapList: [],
-            taskStatusList: [],
+            isEdit:false,
             formModel: {
                 name: '',
                 mapId: '',
@@ -34,11 +39,19 @@ export default {
         };
     },
     computed: {
+        raceInfoList() {
+            const racelist = [];
+            this.raceList.forEach(each=>{
+                racelist.push({label:each.name, value:each.id});
+            });
+            return racelist;
+        },
         form() {
             const form = {
                 labelWidth: '120px',
                 items: [
                     { prop: 'name', label: '实操名称', type: 'text' },
+                    { prop:'raceId', label:'竞赛名称', type:'select', options:this.raceInfoList, disabled:this.isEdit},
                     { prop: 'description', label: '实操描述', type: 'textarea' }
                 ]
             };
@@ -53,6 +66,9 @@ export default {
                 description: [
                     { validator: this.validateDescription, trigger: 'blur' },
                     { validator: this.validateDescription, trigger: 'change' }
+                ],
+                raceId:[
+                    { required: true, message: '请选择竞赛', trigger: 'change' }
                 ]
             };
             return crules;
@@ -82,12 +98,13 @@ export default {
                     this.formModel = data;
                     this.formModel.id = questid;
                     this.dialogVisible = true;
+                    this.isEdit = true;
                 });
             } else {
                 this.formModel.mapId = this.$route.params.mapId;
                 this.dialogVisible = true;
+                this.isEdit = false;
             }
-
         },
         doCreate() {
             const self = this;
diff --git a/src/views/competitionManage/practiceList/index.vue b/src/views/competitionManage/practiceList/index.vue
index 95512d719..401a0b737 100644
--- a/src/views/competitionManage/practiceList/index.vue
+++ b/src/views/competitionManage/practiceList/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <create-practice ref="createPractice" title="创建实操" @reloadTable="reloadTable" @create="handleConfirmCreate" />
-    <create-practice ref="modifyPractice" title="修改实操" @reloadTable="reloadTable" @create="handleConfirmModify" />
+    <create-practice ref="createPractice" :race-list="raceList" title="创建实操" @reloadTable="reloadTable" @create="handleConfirmCreate" />
+    <create-practice ref="modifyPractice" :race-list="raceList" title="修改实操" @reloadTable="reloadTable" @create="handleConfirmModify" />
   </div>
 </template>
 <script>
@@ -132,7 +132,8 @@ export default {
             }).catch(() => { });
         },
         doRecord(index, row) {
-            practiceRecordNotify(row.id).then(resp => {
+            // row.id
+            practiceRecordNotify(83).then(resp => {
                 const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, lineCode:this.$route.query.lineCode};
                 this.$router.push({ path: `${UrlConfig.practiceDisplayNew}/practice`, query });
                 launchFullscreen();
diff --git a/src/views/scriptManage/create.vue b/src/views/scriptManage/create.vue
index 8e990e401..c6df9178f 100644
--- a/src/views/scriptManage/create.vue
+++ b/src/views/scriptManage/create.vue
@@ -24,8 +24,6 @@ export default {
     data() {
         return {
             dialogVisible: false,
-            mapList: [],
-            taskStatusList: [],
             formModel: {
                 name: '',
                 mapId: '',

From a44fe915b82ad0bb4185828fb63d3a5246c6e7aa Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 11:25:39 +0800
Subject: [PATCH 59/85] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AF=95=E5=8D=B7?=
 =?UTF-8?q?=E5=AE=9E=E6=93=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/competitionManage/generatePaper.vue |  17 ++-
 src/views/competitionManage/setExamTime.vue   | 143 ++++++++++++++++++
 2 files changed, 156 insertions(+), 4 deletions(-)
 create mode 100644 src/views/competitionManage/setExamTime.vue

diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index 2ce7acb2d..45498d5e2 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%;height: 100%;">
     <div style="margin-top: 10px;position: absolute; right: 50px;">
-      <el-button size="small" type="primary">导出试题</el-button>
+      <el-button size="small" type="primary" @click="exportPaper">导出试题</el-button>
       <el-button size="small" type="primary" @click="goBack">返回</el-button>
     </div>
     <el-card style="width: 45%;margin-left: 50px;margin-top: 60px;display: inline-block;height: calc(100% - 100px);">
@@ -36,7 +36,7 @@
           <template slot-scope="scope">
             <span v-if="!scope.row.editScope" @click="editScope(scope.row)">{{ scope.row.score }}</span>
             <i v-if="!scope.row.editScope" class="el-icon-edit" @click="editScope(scope.row)" />
-            <el-input v-if="scope.row.editScope" :ref="'input'+scope.row.id" v-model="scope.row.score" size="small" style="width: 50px;" @blur="editScopeBlur(scope.row)" />
+            <el-input v-if="scope.row.editScope" v-model="scope.row.score" v-focus="scope.row.editFocus" size="small" style="width: 50px;" @blur="editScopeBlur(scope.row)" />
           </template>
         </el-table-column>
         <el-table-column prop="operate" label="操作11">
@@ -66,7 +66,9 @@
         />
         <el-table-column prop="score" label="分值">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.score" size="small" />
+            <span v-if="!scope.row.editScope" @click="editScope(scope.row)">{{ scope.row.score }}</span>
+            <i v-if="!scope.row.editScope" class="el-icon-edit" @click="editScope(scope.row)" />
+            <el-input v-if="scope.row.editScope" v-model="scope.row.score" v-focus="scope.row.editFocus" size="small" style="width: 50px;" @blur="editScopeBlur(scope.row)" />
           </template>
         </el-table-column>
         <el-table-column prop="operate" label="操作">
@@ -76,6 +78,7 @@
         </el-table-column>
       </el-table>
     </el-card>
+    <set-exam-time ref="setExamTime" />
     <theory-review ref="theoryReview" :theory-question-list="theoryQuestionList" />
     <theory-question ref="theoryQuestion" :theory-index-list="theoryIndexList" @addQuestion="addTheoryQuestionList" @removeQuestion="removeTheoryQuestion" />
     <operate-question ref="operateQuestion" :operate-index-list="operateIndexList" @addQuestion="addOperateQuestionList" @removeQuestion="removeOperateQuestion" />
@@ -86,9 +89,11 @@
 import TheoryReview from './theoryReview';
 import TheoryQuestion from './theoryQuestion';
 import OperateQuestion from './operateQuestion';
+import SetExamTime from './setExamTime';
 export default {
     name: 'GeneratPaper',
     components: {
+        SetExamTime,
         TheoryReview,
         TheoryQuestion,
         OperateQuestion
@@ -141,11 +146,15 @@ export default {
         editScope(row) {
             this.$set(row, 'editScope', true);
             this.$nextTick(() => {
-                this.$refs['input' + row.id].focus();
+                this.$set(row, 'editFocus', true);
             });
         },
         editScopeBlur(row) {
             this.$set(row, 'editScope', false);
+            this.$set(row, 'editFocus', true);
+        },
+        exportPaper() {
+            this.$refs.setExamTime.doShow();
         }
     }
 };
diff --git a/src/views/competitionManage/setExamTime.vue b/src/views/competitionManage/setExamTime.vue
new file mode 100644
index 000000000..1dd4f1848
--- /dev/null
+++ b/src/views/competitionManage/setExamTime.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-dialog :visible.sync="dialogVisible" :before-close="handleClose" title="试卷导出" width="500px">
+    <el-form ref="form" :model="form" label-width="150px" :rules="rules">
+      <el-form-item label="理论竞赛时长:" prop="theoryExamTime">
+        <el-input-number v-model="form.theoryExamTime" controls-position :min="1" /><span>&nbsp&nbsp分</span>
+      </el-form-item>
+      <el-form-item label="实操竞赛时长:" prop="operateExamTime">
+        <el-input-number v-model="form.operateExamTime" controls-position :min="1" /><span>&nbsp&nbsp分</span>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleClose">导出</el-button>
+        <el-button @click="handleClose">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+
+</template>
+
+<script>
+export default {
+    mixins: [
+        // WindowResizeHandler
+    ],
+    props: {
+        operateIndexList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            index: 0,
+            height: 0,
+            loading: false,
+            dialogVisible: false,
+            form: {
+                theoryExamTime: 1,
+                operateExamTime: 1
+            },
+            rules: {
+                theoryExamTime: [
+                    { required: true, message: '请输入理论竞赛时长', trigger: 'blur' }
+                ],
+                operateExamTime: [
+                    { required: true, message: '请输入实操竞赛时长', trigger: 'blur' }
+                ]
+            }
+        };
+    },
+    computed: {
+    },
+    watch: {
+
+    },
+    methods: {
+        doShow() {
+            this.dialogVisible = true;
+        },
+        handleClose() {
+            this.dialogVisible = false;
+        }
+    }
+};
+
+</script>
+<style lang="scss" scoped>
+	.layer-center {
+		width: 900px;
+		height: 100%;
+		margin: auto;
+		background: #fff;
+	}
+
+	.quiz {
+		background: #eee;
+		height: 100%;
+
+		&::-webkit-scrollbar {
+			display:none
+		}
+
+		&__card {
+			height: 100%;
+			.dir-item {
+				padding-left: 25px;
+			}
+
+			.dir-caption {
+				padding-left: 10px;
+				line-height: 26px;
+				background: #f1f1f1;
+			}
+
+		}
+
+		&__container {
+			height: 100%;
+
+			&-header {
+				height: auto !important;
+
+				.title {
+					font-size: 24px;
+					line-height: 60px;
+					font-weight: bold;
+					text-align: center;
+				}
+
+				.notes {
+					color:#606266;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					margin:  0 20px;
+				}
+			}
+
+			&-main {
+				.section {
+					padding: 5px 20px;
+					.caption {
+						line-height: 26px;
+					}
+					.context {
+					}
+				}
+			}
+
+			&-footer {
+				text-align: right;
+				position: sticky;
+				bottom: 0px;
+				padding: 40px ;
+				.buttons {
+					position: relative;
+					bottom: 20px;
+				}
+			}
+		}
+	}
+</style>

From 04bf8a9dda0033625a2795a5a9427945a81d2716 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 11:28:29 +0800
Subject: [PATCH 60/85] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AF=95=E5=8D=B7?=
 =?UTF-8?q?=E5=AE=9E=E6=93=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/competitionManage/generatePaper.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index 45498d5e2..18b052462 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -17,6 +17,7 @@
         <el-table-column
           prop="type"
           label="类型"
+          width="100"
         >
           <template slot-scope="scope">
             <el-tag
@@ -32,6 +33,7 @@
         <el-table-column
           prop="score"
           label="分值"
+          width="100"
         >
           <template slot-scope="scope">
             <span v-if="!scope.row.editScope" @click="editScope(scope.row)">{{ scope.row.score }}</span>
@@ -39,7 +41,7 @@
             <el-input v-if="scope.row.editScope" v-model="scope.row.score" v-focus="scope.row.editFocus" size="small" style="width: 50px;" @blur="editScopeBlur(scope.row)" />
           </template>
         </el-table-column>
-        <el-table-column prop="operate" label="操作11">
+        <el-table-column prop="operate" label="操作" width="100">
           <template slot-scope="scope">
             <el-button type="warning" size="mini" @click="removeTheoryQuestion(scope)">移出</el-button>
           </template>

From 23c49b965d0a2f36ac20b6049372d491e2de2b57 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 13:51:27 +0800
Subject: [PATCH 61/85] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AF=95=E5=8D=B7?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xian_02/menus/dialog/trainDestination.vue | 23 +++++++++----
 src/views/competitionManage/generatePaper.vue |  9 +++--
 src/views/competitionManage/setExamTime.vue   | 34 +++++++++++++++++--
 3 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
index 1d6d0c9ff..1eaa48b54 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
@@ -4,7 +4,7 @@
     class="xian-02__system train-move"
     :title="title"
     :visible.sync="show"
-    width="360px"
+    width="760px"
     :before-close="doClose"
     :z-index="2000"
     :modal="false"
@@ -15,20 +15,29 @@
       <el-col :span="12">追踪号:</el-col>
     </el-row>
     <el-row>
+      <el-col :span="12">
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" style="width: 100px;" @change="inputGroupNumber" />
+      </el-col>
+      <el-col :span="12">
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" style="width: 100px;" @change="inputGroupNumber" />
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">实际的DID</el-col>
       <el-col :span="12">
         <el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" />
       </el-col>
     </el-row>
     <el-row>
-      <el-col :span="12">车站</el-col>
-      <el-col :span="11" :offset="1">车次窗</el-col>
+      <el-col :span="12">被请求的DID</el-col>
+      <el-col :span="12">
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" />
+      </el-col>
     </el-row>
     <el-row>
+      <el-col :span="12">DID浏览选项</el-col>
       <el-col :span="12">
-        <el-input v-model="addModel.stationName" :disabled="true" />
-      </el-col>
-      <el-col :span="11" :offset="1">
-        <el-input v-model="addModel.trainWindowCode" :disabled="true" />
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" />
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index 18b052462..cff903fdc 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -13,6 +13,7 @@
       <el-table
         :data="theoryQuestionList"
         style="width: 100%"
+        height="100%"
       >
         <el-table-column
           prop="type"
@@ -57,6 +58,7 @@
       <el-table
         :data="operateQuestionList"
         style="width: 100%"
+        height="100%"
       >
         <el-table-column
           prop="name"
@@ -80,7 +82,7 @@
         </el-table-column>
       </el-table>
     </el-card>
-    <set-exam-time ref="setExamTime" />
+    <set-exam-time ref="setExamTime" :theory-question-list="theoryQuestionList" :operate-question-list="operateQuestionList" />
     <theory-review ref="theoryReview" :theory-question-list="theoryQuestionList" />
     <theory-question ref="theoryQuestion" :theory-index-list="theoryIndexList" @addQuestion="addTheoryQuestionList" @removeQuestion="removeTheoryQuestion" />
     <operate-question ref="operateQuestion" :operate-index-list="operateIndexList" @addQuestion="addOperateQuestionList" @removeQuestion="removeOperateQuestion" />
@@ -163,5 +165,8 @@ export default {
 </script>
 
 <style scoped>
-
+/deep/
+.el-card__body{
+	height: calc(100% - 50px);
+}
 </style>
diff --git a/src/views/competitionManage/setExamTime.vue b/src/views/competitionManage/setExamTime.vue
index 1dd4f1848..2dba4c70b 100644
--- a/src/views/competitionManage/setExamTime.vue
+++ b/src/views/competitionManage/setExamTime.vue
@@ -8,7 +8,7 @@
         <el-input-number v-model="form.operateExamTime" controls-position :min="1" /><span>&nbsp&nbsp分</span>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="handleClose">导出</el-button>
+        <el-button type="primary" @click="handleExport">导出</el-button>
         <el-button @click="handleClose">取消</el-button>
       </el-form-item>
     </el-form>
@@ -17,12 +17,19 @@
 </template>
 
 <script>
+import { getRaceById } from '@/api/competition';
 export default {
     mixins: [
         // WindowResizeHandler
     ],
     props: {
-        operateIndexList: {
+        operateQuestionList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        },
+        theoryQuestionList: {
             type: Array,
             default() {
                 return [];
@@ -60,6 +67,29 @@ export default {
         },
         handleClose() {
             this.dialogVisible = false;
+        },
+        handleExport() {
+            getRaceById(this.$route.query.raceId).then(resp => {
+                const exportData = {
+                    operateQuestionList: this.operateQuestionList,
+                    theoryQuestionList: this.theoryQuestionList,
+                    raceId: this.$route.query.raceId,
+                    theoryExamTime: this.form.theoryExamTime,
+                    operateExamTime: this.form.operateExamTime
+                };
+                console.log(exportData, '11111111');
+                const content = new Blob([JSON.stringify(exportData)]);
+                const urlObject = window.URL || window.webkitURL || window;
+                const url = urlObject.createObjectURL(content);
+                const el = document.createElement('a');
+                el.href = url;
+                el.download = `${resp.data.name}试卷.json`;
+                el.click();
+                urlObject.revokeObjectURL(url);
+                this.dialogVisible = false;
+            }).catch(()=> {
+                this.$message.error('查询竞赛详情失败！');
+            });
         }
     }
 };

From 160587e333f1487da8c7142063f0f8f3cc1baf38 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 27 May 2020 14:13:47 +0800
Subject: [PATCH 62/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=95=E9=A2=98?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/questionBank.js                       | 29 +-------
 .../bankList/dialog-update-answer.vue         | 70 -------------------
 .../bankList/dialog-update-question.vue       | 42 -----------
 .../competitionManage/bankList/index.vue      | 57 ++-------------
 .../bankList/question-create-page.vue         |  1 -
 .../bankList/question-form.vue                | 27 ++-----
 .../bankList/question-update-page.vue         | 34 +++++----
 7 files changed, 30 insertions(+), 230 deletions(-)
 delete mode 100644 src/views/competitionManage/bankList/dialog-update-answer.vue
 delete mode 100644 src/views/competitionManage/bankList/dialog-update-question.vue

diff --git a/src/api/questionBank.js b/src/api/questionBank.js
index 0b26d4897..90c860824 100644
--- a/src/api/questionBank.js
+++ b/src/api/questionBank.js
@@ -27,27 +27,9 @@ export function deleteQuestion(questionId) {
 }
 
 // 更新题目
-export function updateQuestion(questionId, data) {
+export function updateOption(data) {
     return request({
-        url: `/api/questionBank/questions/${questionId}`,
-        method: 'put',
-        data
-    });
-}
-
-// 更新正确选项
-export function updateAnswer(questionId, data) {
-    return request({
-        url: `/api/questionBank/questions/${questionId}/answer`,
-        method: 'put',
-        data
-    });
-}
-
-// 更新选项
-export function updateOption(optionId, data) {
-    return request({
-        url: `/api/questionBank/questions/options/${optionId}`,
+        url: `/api/questionBank/questions/${data.id}`,
         method: 'put',
         data
     });
@@ -61,10 +43,3 @@ export function getQuestionInfo(questionId) {
     });
 }
 
-// 根据题目查询选项
-export function getOptionsByQuestionId(questionId) {
-    return request({
-        url: `/api/questionBank/questions/${questionId}/options`,
-        method: 'get'
-    });
-}
diff --git a/src/views/competitionManage/bankList/dialog-update-answer.vue b/src/views/competitionManage/bankList/dialog-update-answer.vue
deleted file mode 100644
index 0bcbf8979..000000000
--- a/src/views/competitionManage/bankList/dialog-update-answer.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag :close-on-click-moda="false" :title="title" :visible.sync="show" width="40%" :close-on-click-modal="false" :before-close="doClose">
-    <div class="ql-editor notes" v-html="$escapeHTML(`${formParam.topic}`)" />
-    <item-answer v-model="formParam.answer" :option-list="optionList" :type="formParam.type" @change="onAnswerChnage" />
-    <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="doUpdate">确 定</el-button>
-      <el-button @click="show = false">取 消</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import ItemAnswer from './item-answer';
-import { getOptionsByQuestionId } from '@/api/questionBank.js';
-
-export default {
-    components: {
-        ItemAnswer
-    },
-    data() {
-        return {
-            show: false,
-            content: '',
-            optionList: [],
-            formParam: {}
-        };
-    },
-    computed: {
-        title() {
-            return '更新答案';
-        }
-    },
-    methods: {
-        doShow({index, row}) {
-            this.formParam = row;
-            this.content = row.topic;
-            getOptionsByQuestionId(row.id).then(resp => {
-                this.optionList = resp.data;
-                this.optionList.forEach((el, i) => {
-                    if (el.correct) {
-                        this.formParam.answer = i;
-                    }
-                });
-            });
-            this.show = true;
-        },
-        doClose(done) {
-            this.show = false;
-        },
-        onAnswerChnage(answer) {
-            this.optionList.forEach((el, i) => { el.correct = i == answer; });
-        },
-        doUpdate() {
-            const index = this.optionList.findIndex((el, i) => { return i == this.formParam.answer; });
-            if (index >= 0) {
-                const answer = this.optionList[index];
-                this.$emit('updateAnswer', {questionId: answer.questionId, id: answer.id, correct: answer.correct});
-            }
-            this.doClose();
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-	.notes {
-		padding: 0 0 20px 0;
-		color: #6666;
-	}
-</style>
diff --git a/src/views/competitionManage/bankList/dialog-update-question.vue b/src/views/competitionManage/bankList/dialog-update-question.vue
deleted file mode 100644
index c592edddd..000000000
--- a/src/views/competitionManage/bankList/dialog-update-question.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag :close-on-click-moda="false" :title="title" :visible.sync="show" width="40%" :close-on-click-modal="false" :before-close="doClose">
-    <quill-editor v-model="content" placeholder="请输入内容" />
-    <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="doInput">确 定</el-button>
-      <el-button @click="show = false">取 消</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-
-export default {
-    data() {
-        return {
-            show: false,
-            content: '',
-            formParam: null
-        };
-    },
-    computed: {
-        title() {
-            return '更新题目';
-        }
-    },
-    methods: {
-        doShow({index, row}) {
-            this.formParam = row;
-            this.content = row.topic;
-            this.show = true;
-        },
-        doClose(done) {
-            this.show = false;
-        },
-        doInput() {
-            this.formParam.topic = this.content;
-            this.$emit('updateQuestion', this.formParam);
-            this.doClose();
-        }
-    }
-};
-</script>
diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue
index 062371ed3..4bff2fff2 100644
--- a/src/views/competitionManage/bankList/index.vue
+++ b/src/views/competitionManage/bankList/index.vue
@@ -1,23 +1,17 @@
 <template>
   <div>
     <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <dialog-update-question ref="question" @updateQuestion="updateQuestion" />
-    <dialog-update-answer ref="answer" @updateAnswer="updateAnswer" />
     <dialog-detail ref="detail" />
   </div>
 </template>
 
 <script>
 import { UrlConfig } from '@/scripts/ConstDic';
-import { listQuestionPage, deleteQuestion, updateQuestion, updateAnswer } from '@/api/questionBank.js';
-import DialogUpdateQuestion from './dialog-update-question';
-import DialogUpdateAnswer from './dialog-update-answer';
+import { listQuestionPage, deleteQuestion } from '@/api/questionBank.js';
 import DialogDetail from './dialog-detail';
 
 export default {
     components: {
-        DialogUpdateQuestion,
-        DialogUpdateAnswer,
         DialogDetail
     },
     data() {
@@ -72,11 +66,6 @@ export default {
                             return '';
                         }
                     },
-                    {
-                        title: '分值',
-                        prop: 'score',
-                        width: '100'
-                    },
                     // {
                     //     title: '创建人',
                     //     prop: 'createUserName',
@@ -88,22 +77,8 @@ export default {
                         width: '420',
                         buttons: [
                             {
-                                name: '更新题目',
-                                handleClick: this.doUpdateQuestion,
-                                // showControl: (row) => { return row.createUserId == this.userId; },
-                                type: 'success'
-                            },
-                            {
-                                name: '更新选项',
-                                handleClick: this.doupdateAnswers,
-                                // showControl: (row) => { return row.createUserId == this.userId && row.type != 'judge'; },
-                                type: 'success'
-                            },
-                            {
-                                name: '更新答案',
-                                handleClick: this.doUpdateAnswer,
-                                // showControl: (row) => { return row.createUserId == this.userId; },
-                                type: 'success'
+                                name: '编辑',
+                                handleClick: this.edit
                             },
                             {
                                 name: '删 除',
@@ -114,7 +89,6 @@ export default {
                             {
                                 name: '预 览',
                                 handleClick: this.doDetail
-                                // showControl: (row) => { return row.createUserId != this.userId; }
                             }
                         ]
                     }
@@ -135,18 +109,10 @@ export default {
             this.$router.push({path: `${UrlConfig.bank.questionCreate}`});
         },
 
-        doUpdateQuestion(index, row) {
-            this.$refs.question.doShow({index, row});
-        },
-
-        doupdateAnswers(index, row) {
+        edit(index, row) {
             this.$router.push({path: `${UrlConfig.bank.questionUpdate}/${row.id}`});
         },
 
-        doUpdateAnswer(index, row) {
-            this.$refs.answer.doShow({index, row});
-        },
-
         doDelete(index, row) {
             this.$confirm('删除试题，是否继续？', '提 示', {
                 confirmButtonText: '确 定',
@@ -165,21 +131,6 @@ export default {
             this.$refs.detail.doShow({index, row});
         },
 
-        updateQuestion(form) {
-            updateQuestion(form.id, form).then(resp => {
-                this.reloadTable();
-            }).catch(error => {
-                this.$message.error(`修改问题失败: ${error.message}`);
-            });
-        },
-
-        updateAnswer(form) {
-            updateAnswer(form.questionId, form).then(resp => {
-                this.reloadTable();
-            }).catch(error => {
-                this.$message.error(`修改答案失败: ${error.message}`);
-            });
-        },
         answerTags(row) {
             const answer = [];
             row.optionList.forEach((el, i) => {
diff --git a/src/views/competitionManage/bankList/question-create-page.vue b/src/views/competitionManage/bankList/question-create-page.vue
index 57f6c026c..804953422 100644
--- a/src/views/competitionManage/bankList/question-create-page.vue
+++ b/src/views/competitionManage/bankList/question-create-page.vue
@@ -32,7 +32,6 @@ export default {
                 topic: '',
                 type: 'select',
                 answer: 0,
-                score: '',
                 optionList: []
             }
         };
diff --git a/src/views/competitionManage/bankList/question-form.vue b/src/views/competitionManage/bankList/question-form.vue
index 62c7c5e0a..0d128f3b4 100644
--- a/src/views/competitionManage/bankList/question-form.vue
+++ b/src/views/competitionManage/bankList/question-form.vue
@@ -1,11 +1,8 @@
 <template>
   <div>
     <el-form ref="form" :model="option" :rules="rules" label-width="80px">
-      <el-form-item label="分 值" prop="score">
-        <el-input v-model="option.score" placeholder="请输入分值" style="width: 200px;" />
-      </el-form-item>
       <el-form-item label="类 型" prop="type">
-        <el-select v-model="option.type" :disabled="disabled" placeholder="请选择试题类型" @change="onTypeChnage">
+        <el-select v-model="option.type" :disabled="update" placeholder="请选择试题类型" @change="onTypeChnage">
           <el-option v-for="it in QuestionTypeList" :key="it.value" :label="it.label" :value="it.value" />
         </el-select>
       </el-form-item>
@@ -36,10 +33,6 @@ export default {
         ItemAnswer
     },
     props: {
-        disabled: {
-            type: Boolean,
-            default: false
-        },
         option: {
             type: Object,
             required: true
@@ -51,6 +44,10 @@ export default {
         remove: {
             type: Boolean,
             default: false
+        },
+        update: {
+            type: Boolean,
+            default: false
         }
     },
     data() {
@@ -90,10 +87,6 @@ export default {
                 topic: [
                     { required: true, message: '请输入试题内容', trigger: 'blur' }
                 ],
-                score: [
-                    { required: true, message: '请输入试题分值', trigger: 'blur' },
-                    { validator: this.validateScore, trigger: 'blur' }
-                ],
                 type: [
                     { required: true, message: '请输入试题类型', trigger: 'change' }
                 ],
@@ -119,16 +112,6 @@ export default {
                 this.option.optionList = this.templateMap[type]();
             }
         },
-        validateScore(rule, value, callback) {
-            if (Number(value) <= 0) {
-                callback(new Error('请输入正确的分值'));
-            } else if (Number(value)) {
-                this.option.score = Number(value);
-                callback();
-            } else {
-                callback(new Error('请输入数字'));
-            }
-        },
         onAnswerChnage(answer) {
             this.option.optionList.forEach((el, i) => { el.correct = i == answer; });
         },
diff --git a/src/views/competitionManage/bankList/question-update-page.vue b/src/views/competitionManage/bankList/question-update-page.vue
index 8660aa122..0e2a41161 100644
--- a/src/views/competitionManage/bankList/question-update-page.vue
+++ b/src/views/competitionManage/bankList/question-update-page.vue
@@ -2,24 +2,25 @@
   <div class="page">
     <div class="page__container">
       <el-card class="page__container-body">
-        <item-options :option-list="optionList" :type="formModel.type" @modify="doModify" />
+        <question-form ref="info" :option="formModel" :remove="true" :update="true" @modify="doModify" />
       </el-card>
     </div>
     <div class="page__container-footer">
+      <el-button type="primary" :is-create="true" @click="update">更 新</el-button>
       <el-button @click="back">返 回</el-button>
     </div>
-    <dialog-modify-rich ref="rich" @update="update" />
+    <dialog-modify-rich ref="rich" />
   </div>
 </template>
 
 <script>
-import ItemOptions from './item-options';
+import QuestionForm from './question-form.vue';
 import DialogModifyRich from './dialog-modify-rich';
-import { getQuestionInfo, getOptionsByQuestionId, updateOption } from '@/api/questionBank.js';
+import { getQuestionInfo, updateOption } from '@/api/questionBank.js';
 
 export default {
     components: {
-        ItemOptions,
+        QuestionForm,
         DialogModifyRich
     },
     data() {
@@ -27,9 +28,9 @@ export default {
             formModel: {
                 id: '',
                 topic: '',
-                type: '',
+                type: 'select',
                 answer: 0,
-                score: ''
+                optionList: []
             },
             optionList: []
         };
@@ -51,9 +52,7 @@ export default {
         loadInitData() {
             getQuestionInfo(this.questionId).then(resp => {
                 this.formModel = resp.data;
-                getOptionsByQuestionId(this.questionId).then(resp => {
-                    this.optionList = resp.data;
-                });
+                this.formModel.answer = this.formModel.optionList.findIndex(ele => ele.correct);
             });
         },
         doBack() {
@@ -62,11 +61,16 @@ export default {
         doModify(node) {
             this.$refs.rich.doShow(node);
         },
-        update(data) {
-            updateOption(data.id, data).then(resp => {
-            }).catch(error => {
-                this.$message.error(`更新选项失败: ${error.message}`);
-            });
+        update() {
+            this.$refs.info.validate().then(valid => {
+                if (valid) {
+                    updateOption(this.formModel).then(resp => {
+                        this.doBack();
+                    }).catch(error => {
+                        this.$message.error(`创建试题失败: ${error.message}`);
+                    });
+                }
+            }).catch(error => { this.$message.warning(error.message); });
         },
         back() {
             this.$router.go(-1);

From 53c8c13405d755aa76730f4412875190ccdf91b5 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 27 May 2020 14:45:32 +0800
Subject: [PATCH 63/85] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E7=B3=BB=E7=BB=9F=20?=
 =?UTF-8?q?=E5=AE=9E=E6=93=8D=E9=A2=98=E7=9B=AE=E5=BD=95=E5=88=B6=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../competitionManage/practiceList/index.vue  |   8 +-
 src/views/newMap/displayNew/index.vue         |  33 +++
 src/views/newMap/displayNew/menuPractice.vue  | 206 ++++++++++++++++++
 .../newMap/displayNew/menuSystemTime.vue      |   3 +-
 4 files changed, 248 insertions(+), 2 deletions(-)
 create mode 100644 src/views/newMap/displayNew/menuPractice.vue

diff --git a/src/views/competitionManage/practiceList/index.vue b/src/views/competitionManage/practiceList/index.vue
index 401a0b737..44d86ad87 100644
--- a/src/views/competitionManage/practiceList/index.vue
+++ b/src/views/competitionManage/practiceList/index.vue
@@ -133,8 +133,14 @@ export default {
         },
         doRecord(index, row) {
             // row.id
+            let raceInfo;
+            this.raceList.forEach(each=>{
+                if (each.id == row.raceId) {
+                    raceInfo = each;
+                }
+            });
             practiceRecordNotify(83).then(resp => {
-                const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, lineCode:this.$route.query.lineCode};
+                const query = { mapId: raceInfo.mapId, group: resp.data, scriptId: row.id, lineCode:raceInfo.lineCode};
                 this.$router.push({ path: `${UrlConfig.practiceDisplayNew}/practice`, query });
                 launchFullscreen();
             }).catch(error => {
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index af089a31a..362a4270f 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -52,6 +52,20 @@
 
       <menu-script v-if="isScript" ref="menuScript" :offset-bottom="offsetBottom" :group="group" :data-error="dataError" />
 
+      <menu-practice
+        v-if="isPractice"
+        ref="menuPractice"
+        :group="group"
+        :offset="offset"
+        :offset-bottom="offsetBottom"
+        :show-station="showStation"
+        :station-list="stationList"
+        :show-select-station="showSelectStation"
+        :data-error="dataError"
+        @switchMode="switchMode"
+        @switchStationMode="switchStationMode"
+      />
+
       <menu-train-list v-if="isDemon" @setCenter="setCenter" />
 
       <menu-schema
@@ -96,6 +110,7 @@ import MenuDemon from '@/views/newMap/displayNew/menuDemon';
 import MenuSchema from '@/views/newMap/displayNew/menuSchema';
 import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
 import MenuScript from '@/views/newMap/displayNew/menuScript';
+import MenuPractice from '@/views/newMap/displayNew/menuPractice';
 import Scheduling from './demon/scheduling';
 import { mapGetters } from 'vuex';
 import { getTrainingStepsDetailNew, getTrainingDetailNew } from '@/api/jmap/training';
@@ -128,6 +143,7 @@ export default {
         MenuSchema,
         MenuSystemTime,
         MenuTrainList,
+        MenuPractice,
         // Jl3dSimulation,
         Jl3dDrive,
         Jl3dDevice,
@@ -223,6 +239,9 @@ export default {
         isScript() {
             return this.mode === 'script';
         },
+        isPractice() {
+            return this.mode === 'practice';
+        },
         isScreen() {
             return this.model === 'dp';
         },
@@ -426,6 +445,8 @@ export default {
                     await this.initLoadDemonData();
                 } else if (this.isScript) {
                     await this.initLoadTaskData();
+                } else if (this.isPractice) {
+                    await this.initPracticeData();
                 } else {
                     await this.initLoadLessonOrExamData();
                 }
@@ -481,6 +502,18 @@ export default {
                 this.endViewLoading();
             }
         },
+        // 加载实操地图数据
+        async initPracticeData() {
+            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            this.switchMode('01');
+
+            if (parseInt(this.mapId)) {
+                await this.loadNewMapDataByGroup(this.group);
+            } else {
+                this.endViewLoading();
+            }
+        },
         // 选择脚本
         async selectQuest(row, id, mapLocation, roleName) {
             try {
diff --git a/src/views/newMap/displayNew/menuPractice.vue b/src/views/newMap/displayNew/menuPractice.vue
new file mode 100644
index 000000000..a11b241f4
--- /dev/null
+++ b/src/views/newMap/displayNew/menuPractice.vue
@@ -0,0 +1,206 @@
+<template>
+  <div class="menuPractice">
+    <div class="practice-schema" :style="{top: offset+'px'}">
+      <el-select v-model="swch" size="small" :placeholder="$t('display.schema.selectProduct')" @change="switchMode">
+        <el-option v-for="item in swchList" :key="item.value" :label="item.name" :value="item.value" />
+      </el-select>
+      <el-select v-if="showSelectStation&&swch=='01'" v-model="showStationContent" style="width: 100px;" size="small" @change="switchStationModeInfo">
+        <el-option v-for="item in stationList" :key="item.value" :label="item.name" :value="item.value" />
+      </el-select>
+    </div>
+    <div class="practice-bottom" :style="{bottom: offsetBottom + 'px'}">
+      <el-button-group>
+        <!-- v-if="!isScriptCommand"  -->
+        <!-- v-if="!isScriptCommand"  -->
+        <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">按计划行车</el-button>
+        <el-button type="danger" :disabled="!isDisable" @click="end">退出计划</el-button>
+        <el-button type="primary" @click="back">返回</el-button>
+      </el-button-group>
+    </div>
+    <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
+  </div>
+</template>
+<script>
+import SetTime from '@/views/newMap/displayNew/demon/setTime';
+import { ranAsPlan, exitRunPlan } from '@/api/simulation';
+import { Notification } from 'element-ui';
+export default {
+    name: 'MenuPractice',
+    components:{
+        SetTime
+    },
+    props: {
+        group: {
+            type: String,
+            required: true
+        },
+        offset: {
+            type: Number,
+            required: true
+        },
+        offsetBottom: {
+            type: Number,
+            required: true
+        },
+        dataError: {
+            type: Boolean,
+            default() {
+                return false;
+            }
+        },
+        showSelectStation: {
+            type: Boolean,
+            default() {
+                return false;
+            }
+        },
+        showStation: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        stationList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            isDisable: false,
+            swch: '01',
+            showStationContent:'',
+            swchList: [
+                { value: '01', name: '现地' },
+                { value: '02', name: '行调' }
+            ]
+        };
+    },
+    watch:{
+        'showStation':function(val) {
+            this.showStationContent = this.showStation;
+        }
+    },
+    methods:{
+        back() {
+            this.$store.dispatch('training/over').then(() => {
+                history.go(-1);
+                Notification.closeAll();
+            });
+        },
+        selectBeginTime() {
+            this.$refs.setTime.doShow();
+        },
+        start(model) {
+            this.isDisable = true;
+            const data = {
+                time: model.initTime
+                // loadNumber:this.trainList.length
+            };
+            // const data = {
+            //     time: model.initTime
+            // };
+            // if (this.$route.query.prdType === '04') {
+            //     data.loadNumber = model.loadNum;
+            // }
+            ranAsPlan(data, this.group).then(res => {
+                this.$store.dispatch('training/simulationStart').then(() => {
+                    this.$store.dispatch('map/setRunPlanStatus', true);
+                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
+                    this.$store.dispatch('map/setShowCentralizedStationNum');
+                });
+            }).catch((error) => {
+                this.isDisable = false;
+                if (error.code == '5001') {
+                    this.$messageBox(this.$t('error.mapDataError') + '，' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '5002') {
+                    this.$messageBox(this.$t('error.runningChartDataError') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '5003') {
+                    this.$messageBox(this.$t('error.runningChartIsNotLoaded') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '5004') {
+                    this.$messageBox(this.$t('error.runningDataError') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '5000') {
+                    this.$messageBox(this.$t('error.systemError') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4000') {
+                    this.$messageBox(this.$t('error.simulationDoesNotExist') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4001') {
+                    this.$messageBox(this.$t('error.simulationOperationIsNotDefined') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4002') {
+                    this.$messageBox(this.$t('error.simulationOperationProcessingMethodNotFound') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4003') {
+                    this.$messageBox(this.$t('error.simulationOperationFailed') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4004') {
+                    this.$messageBox(this.$t('error.operationConflict') + ',' + this.$t('error.startSimulationFailed'));
+                }
+            });
+        },
+        switchMode(swch) {
+            this.$emit('switchMode', swch);
+            this.switchModeInner(swch);
+        },
+        switchModeInner(swch) {
+            let showMode = '03';
+            if (swch == '01') {
+                showMode = '03';
+            } else if (swch == '02') {
+                showMode = '02';
+            }
+            const nameList = Object.keys(this.$store.state.map.map || {});
+            let list = [];
+            nameList.forEach(item => {
+                if (item !== 'skinVO') {
+                    const data = this.$store.state.map.map[item];
+                    if (data && data.constructor === Array) {
+                        list = [...list, ...data];
+                    }
+                }
+            });
+            this.$jlmap.updateShowMode(list, showMode);
+            if (swch == '02') {
+                this.switchStationMode('');
+            } else {
+                this.switchStationMode(null);
+            }
+        },
+        switchStationModeInfo(val) {
+            this.showStationContent = val;
+            this.$emit('switchStationMode', val);
+        },
+        switchStationMode(val) {
+            this.$emit('switchStationMode', val);
+        },
+        end() {
+            this.isDisable = false;
+            exitRunPlan(this.group).then(() => {
+                this.$store.dispatch('training/over').then(() => {
+                    this.$store.dispatch('training/setMapDefaultState').then(() => {
+                        this.$store.dispatch('map/setRunPlanStatus', false);
+                        this.$store.dispatch('map/clearJlmapTrainView');
+                        this.$store.dispatch('map/setTrainWindowShow', false);
+                    });
+                });
+            }).catch(() => {
+                this.isDisable = true;
+                this.$messageBox(this.$t('display.demon.endSimulationFail'));
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.practice-schema {
+    z-index: 9;
+    display: inline;
+    position: absolute;
+    right: 15px;
+}
+.practice-bottom {
+    position: absolute;
+    float: right;
+    right: 15px;
+    bottom: 15px;
+}
+</style>
+
diff --git a/src/views/newMap/displayNew/menuSystemTime.vue b/src/views/newMap/displayNew/menuSystemTime.vue
index 154c0fb62..0e5ed6dca 100644
--- a/src/views/newMap/displayNew/menuSystemTime.vue
+++ b/src/views/newMap/displayNew/menuSystemTime.vue
@@ -47,7 +47,8 @@ export default {
             return this.$route.params.mode == 'demon' ||
 					this.$route.params.mode == 'dp' ||
 					this.$route.params.mode == 'plan' ||
-					this.$route.params.mode == 'script' ||
+                    this.$route.params.mode == 'script' ||
+                    this.$route.params.mode == 'practice' ||
 					!this.$route.params.mode;
         },
         pause() {

From bb009011c34dc16fc20232742b20be9dfd34dcfa Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 14:57:25 +0800
Subject: [PATCH 64/85] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=BD=A6?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=8F=B7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/simulation.js                         |  8 +++
 .../xian_01/menus/dialog/trainControl.vue     | 58 ++++++++++++++++---
 src/utils/baseUrl.js                          |  4 +-
 src/views/newMap/displayNew/menuTrainList.vue |  1 -
 4 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/src/api/simulation.js b/src/api/simulation.js
index 29407127d..921119a33 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -685,3 +685,11 @@ export function simulationLoadRunPlan(group, templateId) {
         method: 'put'
     });
 }
+/** 根据车次号获取列车信息 */
+export function getTrainDetailBytripNumber(group, params) {
+    return request({
+        url: `/simulation/${group}/planTripInfo`,
+        method: 'get',
+        params: params
+    });
+}
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
index 39418e54e..e940113e5 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
@@ -29,7 +29,7 @@
           <el-radio :label="'MANUAL'" style="margin-top:5px;">{{ $t('menu.artificialTrain') }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-if="formModel.type == 'PLAN'" prop="serviceNumber">
+      <el-form-item v-if="formModel.type == 'PLAN'|| formModel.type == 'HEAD'" prop="serviceNumber">
         <span slot="label">{{ $t('menu.serviceNumber') + '：' }}</span>
         <el-input
           :id="domIdServerNo"
@@ -37,7 +37,7 @@
           :disabled="serverNoIsDisabled"
         />
       </el-form-item>
-      <el-form-item v-if="formModel.type == 'PLAN'|| formModel.type == 'HEAD'" :label="this.$t('menu.tripNumber')+this.$t('global.colon')" prop="tripNumber">
+      <el-form-item v-if="formModel.type == 'PLAN'" :label="this.$t('menu.tripNumber')+this.$t('global.colon')" prop="tripNumber">
         <el-input
           :id="domIdTrainNo"
           v-model="formModel.tripNumber"
@@ -48,8 +48,23 @@
         <el-input
           :id="domIdTargetCode"
           v-model="formModel.destinationCode"
+          :disabled="formModel.type !== 'HEAD'"
         />
       </el-form-item>
+      <el-form-item v-if="formModel.type == 'MANUAL'" :label="this.$t('menu.category')+this.$t('global.colon')" prop="category">
+        <el-select
+          :id="domIdTrainNumber"
+          v-model="formModel.category"
+          filterable
+        >
+          <el-option
+            v-for="item in categoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
     </el-form>
     <el-row justify="center" class="button-group">
       <el-col :span="10" :offset="2">
@@ -67,11 +82,11 @@
 <script>
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import ConfirmTrain from './childDialog/confirmTrain';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 import Handler from '@/scripts/cmdPlugin/Handler';
 import { menuOperate, commitOperate } from '../utils/menuOperate';
+import {getTrainDetailBytripNumber} from '@/api/simulation';
 
 export default {
     name: 'TrainControl',
@@ -82,6 +97,7 @@ export default {
     data() {
         return {
             trainList: [],
+            serviceNumber:'',
             formModel: {
                 tripNumber: '',
                 groupNumber: '',
@@ -90,7 +106,9 @@ export default {
                 destinationCode: '',
                 category: 'MM'
             },
-
+            categoryList: [
+                { name: 'MM', value: '01' }
+            ],
             rules: {
                 groupNumber: [
                     { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'change' }
@@ -98,9 +116,6 @@ export default {
                 type: [
                     { required: true, message: this.$t('rules.selectATrainType'), trigger: 'change' }
                 ],
-                serviceNumber: [
-                    { required: true, message: this.$t('rules.enterTheServiceNumber'), trigger: 'blur' }
-                ],
                 tripNumber: [
                     { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
                 ],
@@ -214,7 +229,22 @@ export default {
             return '';
         }
     },
-    watch: {},
+    watch: {
+        'formModel.tripNumber': function(val) {
+            if (val.length == 4) {
+                this.trainNoChange(val);
+            } else {
+                this.formModel = {
+                    groupNumber: this.formModel.groupNumber,
+                    tripNumber: val,
+                    type: this.formModel.type,
+                    serviceNumber: '',
+                    targetCode: '',
+                    category: 'MM'
+                };
+            }
+        }
+    },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');
@@ -228,6 +258,7 @@ export default {
                 this.operation = operate.operation;
             }
             const model = this.$store.getters['map/getDeviceByCode'](selected.code);
+            this.serviceNumber = model.serviceNumber;
             this.formModel = {
                 groupNumber: model.groupNumber,
                 tripNumber: model.tripNumber,
@@ -267,6 +298,11 @@ export default {
             });
         },
         trainTypeChange(trainType) {
+            if (trainType === 'HEAD') {
+                this.formModel.serviceNumber = '';
+            } else if (trainType === 'PLAN' && this.serviceNumber) {
+                this.formModel.serviceNumber = this.serviceNumber;
+            }
             const operate = {
                 type: trainType,
                 operation: ''
@@ -293,6 +329,12 @@ export default {
                 operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
             }
             Handler.undo(1);
+            getTrainDetailBytripNumber(this.$route.query.group, {tripNumber:tripNumber}).then(resp => {
+                this.formModel.serviceNumber = resp.data.serviceNumber;
+                this.formModel.destinationCode = resp.data.destinationCode;
+            }).catch(() => {
+                this.$message.error('获取列车信息失败！');
+            });
             this.$store.dispatch('training/tripNumber', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 836771751..c59924e25 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -4,9 +4,9 @@ export function getBaseUrl() {
         // BASE_API = 'https://joylink.club/jlcloud';
         // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
+        BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
diff --git a/src/views/newMap/displayNew/menuTrainList.vue b/src/views/newMap/displayNew/menuTrainList.vue
index 97557e482..276455a38 100644
--- a/src/views/newMap/displayNew/menuTrainList.vue
+++ b/src/views/newMap/displayNew/menuTrainList.vue
@@ -43,7 +43,6 @@ export default {
             this.trainList = this.$store.state.map.map.trainList.filter((train)=>{
                 return train.serviceNumber != '' && train.serviceNumber != undefined;
             });
-            console.log(this.trainList);
         },
         '$store.state.map.runPlanStatus': function (val) {
             if (!val) {

From b7bb33bd1aa708dcc207b4d3766698dc48e7638e Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 15:07:14 +0800
Subject: [PATCH 65/85] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=BD=A6?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=8F=B7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
index e940113e5..eebf40bcf 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
@@ -330,8 +330,10 @@ export default {
             }
             Handler.undo(1);
             getTrainDetailBytripNumber(this.$route.query.group, {tripNumber:tripNumber}).then(resp => {
-                this.formModel.serviceNumber = resp.data.serviceNumber;
-                this.formModel.destinationCode = resp.data.destinationCode;
+                if (resp.data) {
+                    this.formModel.serviceNumber = resp.data.serviceNumber;
+                    this.formModel.destinationCode = resp.data.destinationCode;
+                }
             }).catch(() => {
                 this.$message.error('获取列车信息失败！');
             });

From 643c5e0b9e1c94ea9e2bdc6a31ed01dd1edff94d Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 15:31:47 +0800
Subject: [PATCH 66/85] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E5=80=BC?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=92=8C=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baseUrl.js                          |  4 +--
 src/views/competitionManage/generatePaper.vue | 33 +++++++++++++++++--
 .../competitionManage/operateQuestion.vue     |  1 +
 .../competitionManage/theoryQuestion.vue      |  1 +
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index c59924e25..836771751 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -4,9 +4,9 @@ export function getBaseUrl() {
         // BASE_API = 'https://joylink.club/jlcloud';
         // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-        BASE_API = 'http://192.168.3.6:9000'; // 旭强
+        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index cff903fdc..26ac73bd0 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -14,6 +14,7 @@
         :data="theoryQuestionList"
         style="width: 100%"
         height="100%"
+        :row-style="handleRowStyle"
       >
         <el-table-column
           prop="type"
@@ -39,7 +40,7 @@
           <template slot-scope="scope">
             <span v-if="!scope.row.editScope" @click="editScope(scope.row)">{{ scope.row.score }}</span>
             <i v-if="!scope.row.editScope" class="el-icon-edit" @click="editScope(scope.row)" />
-            <el-input v-if="scope.row.editScope" v-model="scope.row.score" v-focus="scope.row.editFocus" size="small" style="width: 50px;" @blur="editScopeBlur(scope.row)" />
+            <el-input-number v-if="scope.row.editScope" v-model="scope.row.score" v-focus="scope.row.editFocus" :controls="noControls" :min="0" size="mini" style="width: 90px" @blur="editScopeBlur(scope.row)" />
           </template>
         </el-table-column>
         <el-table-column prop="operate" label="操作" width="100">
@@ -59,6 +60,7 @@
         :data="operateQuestionList"
         style="width: 100%"
         height="100%"
+        :row-style="handleRowStyle"
       >
         <el-table-column
           prop="name"
@@ -72,7 +74,7 @@
           <template slot-scope="scope">
             <span v-if="!scope.row.editScope" @click="editScope(scope.row)">{{ scope.row.score }}</span>
             <i v-if="!scope.row.editScope" class="el-icon-edit" @click="editScope(scope.row)" />
-            <el-input v-if="scope.row.editScope" v-model="scope.row.score" v-focus="scope.row.editFocus" size="small" style="width: 50px;" @blur="editScopeBlur(scope.row)" />
+            <el-input-number v-if="scope.row.editScope" v-model="scope.row.score" v-focus="scope.row.editFocus" :controls="noControls" :min="0" size="mini" @blur="editScopeBlur(scope.row)" />
           </template>
         </el-table-column>
         <el-table-column prop="operate" label="操作">
@@ -108,6 +110,7 @@ export default {
                 select: '选择题',
                 judge: '判断题'
             },
+            noControls: false,
             theoryQuestionList: [], // 理论试卷试题列表
             operateQuestionList: [], // 实操试卷试题列表
             theoryIndexList: [], // 理论试卷试题索引列表
@@ -156,9 +159,33 @@ export default {
         editScopeBlur(row) {
             this.$set(row, 'editScope', false);
             this.$set(row, 'editFocus', true);
+            if (row.score > 0) {
+                this.$set(row, 'isError', false);
+            }
+        },
+        handleRowStyle({row, rowIndex}) {
+        	return row.isError ? {background: '#F00'} : {background: '#FFF'};
         },
         exportPaper() {
-            this.$refs.setExamTime.doShow();
+            let flag = false;
+            this.theoryQuestionList.forEach((item) => {
+                if (item.score <= 0) {
+                    flag = true;
+                    this.$set(item, 'isError', true);
+                }
+            });
+            this.operateQuestionList.forEach((item) => {
+                if (item.score <= 0) {
+                    flag = true;
+                    this.$set(item, 'isError', true);
+                }
+            });
+            console.log(this.theoryQuestionList, this.operateQuestionList);
+            if (flag) {
+                this.$message.error('试题分分值不得为0');
+            } else {
+                this.$refs.setExamTime.doShow();
+            }
         }
     }
 };
diff --git a/src/views/competitionManage/operateQuestion.vue b/src/views/competitionManage/operateQuestion.vue
index 9954bea80..9c1f017b9 100644
--- a/src/views/competitionManage/operateQuestion.vue
+++ b/src/views/competitionManage/operateQuestion.vue
@@ -100,6 +100,7 @@ export default {
         },
         addQuestion(index, row) {
             this.$set(row, 'paper', true);
+            row.score = 0;
             this.$emit('addQuestion', row);
         },
         afterQuery(data) {
diff --git a/src/views/competitionManage/theoryQuestion.vue b/src/views/competitionManage/theoryQuestion.vue
index c93b3f258..3985a302b 100644
--- a/src/views/competitionManage/theoryQuestion.vue
+++ b/src/views/competitionManage/theoryQuestion.vue
@@ -124,6 +124,7 @@ export default {
         },
         addQuestion(index, row) {
             this.$set(row, 'paper', true);
+            row.score = 0;
             this.$emit('addQuestion', row);
         },
         afterQuery(data) {

From 6ebfffd36b91ccb12a08bee2ee87e3b326c283fe Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 15:38:40 +0800
Subject: [PATCH 67/85] =?UTF-8?q?=E8=B0=83=E6=95=B4table=E7=A7=BB=E5=87=BA?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/competitionManage/generatePaper.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index 26ac73bd0..82afd093c 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -45,7 +45,7 @@
         </el-table-column>
         <el-table-column prop="operate" label="操作" width="100">
           <template slot-scope="scope">
-            <el-button type="warning" size="mini" @click="removeTheoryQuestion(scope)">移出</el-button>
+            <el-button type="warning" size="mini" @click="removeTheoryQuestion(scope.row)">移出</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -79,7 +79,7 @@
         </el-table-column>
         <el-table-column prop="operate" label="操作">
           <template slot-scope="scope">
-            <el-button type="warning" size="mini" @click="removeOperateQuestion(scope)">移出</el-button>
+            <el-button type="warning" size="mini" @click="removeOperateQuestion(scope.row)">移出</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -125,6 +125,7 @@ export default {
         },
         removeTheoryQuestion(row) {
             const index = this.theoryIndexList.indexOf(row.id);
+            console.log(row, index);
             this.theoryIndexList.splice(index, 1);
             this.theoryQuestionList.splice(index, 1);
         },
@@ -164,7 +165,7 @@ export default {
             }
         },
         handleRowStyle({row, rowIndex}) {
-        	return row.isError ? {background: '#F00'} : {background: '#FFF'};
+            return row.isError ? {background: '#F00'} : {background: '#FFF'};
         },
         exportPaper() {
             let flag = false;
@@ -180,7 +181,6 @@ export default {
                     this.$set(item, 'isError', true);
                 }
             });
-            console.log(this.theoryQuestionList, this.operateQuestionList);
             if (flag) {
                 this.$message.error('试题分分值不得为0');
             } else {

From ff3d4329d6727e410f1738911f1f993a4854340f Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 16:36:55 +0800
Subject: [PATCH 68/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=AF=95=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QueryListPage/QueryListPage.vue           | 14 +++++
 src/views/competitionManage/generatePaper.vue | 55 +++++++++++++++++--
 .../competitionManage/theoryQuestion.vue      |  3 +-
 3 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue
index 132a02c8d..54abab9d7 100644
--- a/src/components/QueryListPage/QueryListPage.vue
+++ b/src/components/QueryListPage/QueryListPage.vue
@@ -49,6 +49,20 @@
             :sortable="column.sortable"
             :sort-by="column.sortBy"
           />
+          <el-table-column
+            v-else-if="checkColumnTyep(column, 'html')"
+            :key="index"
+            :prop="column.prop"
+            :label="column.title"
+            :width="column.width"
+            show-overflow-tooltip
+            :sortable="column.sortable"
+            :sort-by="column.sortBy"
+          >
+            <template slot-scope="scope">
+              <div v-html="scope.row[column.prop]" />
+            </template>
+          </el-table-column>
           <el-table-column
             v-else-if="checkColumnTyep(column, 'basicText')"
             :key="index"
diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index 82afd093c..dead2ef1c 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -14,6 +14,8 @@
         :data="theoryQuestionList"
         style="width: 100%"
         height="100%"
+        :summary-method="getSummaries"
+        show-summary
         :row-style="handleRowStyle"
       >
         <el-table-column
@@ -31,7 +33,11 @@
         <el-table-column
           prop="topic"
           label="题目"
-        />
+        >
+          <template slot-scope="scope">
+            <span v-html="scope.row.topic" />
+          </template>
+        </el-table-column>
         <el-table-column
           prop="score"
           label="分值"
@@ -61,6 +67,8 @@
         style="width: 100%"
         height="100%"
         :row-style="handleRowStyle"
+        :summary-method="getSummaries"
+        show-summary
       >
         <el-table-column
           prop="name"
@@ -125,17 +133,26 @@ export default {
         },
         removeTheoryQuestion(row) {
             const index = this.theoryIndexList.indexOf(row.id);
-            console.log(row, index);
             this.theoryIndexList.splice(index, 1);
             this.theoryQuestionList.splice(index, 1);
         },
         addTheoryQuestionList(row) {
-            this.theoryIndexList.push(row.id);
-            this.theoryQuestionList.push(row);
+            if (this.theoryQuestionList.length) {
+                this.theoryIndexList.push(row.id);
+                this.theoryQuestionList.push(row);
+            } else {
+                this.theoryIndexList = [row.id];
+                this.theoryQuestionList = [row];
+            }
         },
         addOperateQuestionList(row) {
-            this.operateIndexList.push(row.id);
-            this.operateQuestionList.push(row);
+            if (this.operateQuestionList.length) {
+                this.operateIndexList.push(row.id);
+                this.operateQuestionList.push(row);
+            } else {
+                this.operateIndexList = [row.id];
+                this.operateQuestionList = [row];
+            }
         },
         addTheoryQuestion() {
             this.$refs.theoryQuestion.doShow();
@@ -167,6 +184,32 @@ export default {
         handleRowStyle({row, rowIndex}) {
             return row.isError ? {background: '#F00'} : {background: '#FFF'};
         },
+        getSummaries(param) {
+            const { columns, data } = param;
+            const sums = [];
+            columns.forEach((column, index) => {
+                if (index === 0) {
+                    sums[index] = '总分';
+                    return;
+                }
+                const values = data.map(item => Number(item[column.property]));
+                if (!values.every(value => isNaN(value))) {
+                    sums[index] = values.reduce((prev, curr) => {
+                        const value = Number(curr);
+                        if (!isNaN(value)) {
+                            return prev + curr;
+                        } else {
+                            return prev;
+                        }
+                    }, 0);
+                    sums[index] += ' 分';
+                } else {
+                    sums[index] = '/';
+                }
+            });
+
+            return sums;
+        },
         exportPaper() {
             let flag = false;
             this.theoryQuestionList.forEach((item) => {
diff --git a/src/views/competitionManage/theoryQuestion.vue b/src/views/competitionManage/theoryQuestion.vue
index 3985a302b..4085c872e 100644
--- a/src/views/competitionManage/theoryQuestion.vue
+++ b/src/views/competitionManage/theoryQuestion.vue
@@ -64,7 +64,8 @@ export default {
                     },
                     {
                         title: '题 目',
-                        prop: 'topic'
+                        prop: 'topic',
+                        type: 'html'
                     },
                     {
                         title: '答 案',

From 7fbc7595955f2e721870d0c14048e5a2eb6efe35 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 27 May 2020 17:27:50 +0800
Subject: [PATCH 69/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=80=BB=E5=88=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/competitionManage/generatePaper.vue | 85 ++++++++-----------
 1 file changed, 34 insertions(+), 51 deletions(-)

diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index dead2ef1c..776ca1262 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -15,34 +15,20 @@
         style="width: 100%"
         height="100%"
         :summary-method="getSummaries"
-        show-summary
+        :show-summary="showSummary"
         :row-style="handleRowStyle"
       >
-        <el-table-column
-          prop="type"
-          label="类型"
-          width="100"
-        >
+        <el-table-column prop="type" label="类型" width="100">
           <template slot-scope="scope">
-            <el-tag
-              type="primary"
-              disable-transitions
-            >{{ QuestionTypeMap[scope.row.type] }}</el-tag>
+            <el-tag type="primary" disable-transitions>{{ QuestionTypeMap[scope.row.type] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="topic"
-          label="题目"
-        >
+        <el-table-column prop="topic" label="题目">
           <template slot-scope="scope">
             <span v-html="scope.row.topic" />
           </template>
         </el-table-column>
-        <el-table-column
-          prop="score"
-          label="分值"
-          width="100"
-        >
+        <el-table-column prop="score" label="分值" width="100">
           <template slot-scope="scope">
             <span v-if="!scope.row.editScope" @click="editScope(scope.row)">{{ scope.row.score }}</span>
             <i v-if="!scope.row.editScope" class="el-icon-edit" @click="editScope(scope.row)" />
@@ -68,16 +54,10 @@
         height="100%"
         :row-style="handleRowStyle"
         :summary-method="getSummaries"
-        show-summary
+        :show-summary="showSummary"
       >
-        <el-table-column
-          prop="name"
-          label="实操名称"
-        />
-        <el-table-column
-          prop="creatorName"
-          label="创建人"
-        />
+        <el-table-column prop="name" label="实操名称" />
+        <el-table-column prop="creatorName" label="创建人" />
         <el-table-column prop="score" label="分值">
           <template slot-scope="scope">
             <span v-if="!scope.row.editScope" @click="editScope(scope.row)">{{ scope.row.score }}</span>
@@ -118,6 +98,7 @@ export default {
                 select: '选择题',
                 judge: '判断题'
             },
+            showSummary: true,
             noControls: false,
             theoryQuestionList: [], // 理论试卷试题列表
             operateQuestionList: [], // 实操试卷试题列表
@@ -180,34 +161,32 @@ export default {
             if (row.score > 0) {
                 this.$set(row, 'isError', false);
             }
+            this.showSummary = false;
+
+            this.$nextTick(() => {
+                this.getSummaries({data: this.theoryQuestionList});
+            });
         },
         handleRowStyle({row, rowIndex}) {
             return row.isError ? {background: '#F00'} : {background: '#FFF'};
         },
         getSummaries(param) {
-            const { columns, data } = param;
+            const { data } = param;
             const sums = [];
-            columns.forEach((column, index) => {
-                if (index === 0) {
-                    sums[index] = '总分';
-                    return;
-                }
-                const values = data.map(item => Number(item[column.property]));
-                if (!values.every(value => isNaN(value))) {
-                    sums[index] = values.reduce((prev, curr) => {
-                        const value = Number(curr);
-                        if (!isNaN(value)) {
-                            return prev + curr;
-                        } else {
-                            return prev;
-                        }
-                    }, 0);
-                    sums[index] += ' 分';
-                } else {
-                    sums[index] = '/';
-                }
-            });
-
+            sums[0] = '总分';
+            const values = data.map(item => Number(item.score));
+            if (!values.every(value => isNaN(value))) {
+                sums[2] = values.reduce((prev, curr) => {
+                    const value = Number(curr);
+                    if (!isNaN(value)) {
+                        return prev + curr;
+                    } else {
+                        return prev;
+                    }
+                }, 0);
+                sums[2] += ' 分';
+            }
+            this.showSummary = true;
             return sums;
         },
         exportPaper() {
@@ -237,6 +216,10 @@ export default {
 <style scoped>
 /deep/
 .el-card__body{
-	height: calc(100% - 50px);
+	height: calc(100% - 47px);
+}
+/deep/
+.el-table__body-wrapper {
+	height: calc(100% - 97px) !important;
 }
 </style>

From 18735986e609bf9ed8de5860a2c4cedd88a38dd7 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 17:30:39 +0800
Subject: [PATCH 70/85] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=BD=A6?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=8F=B7=E7=A6=81=E7=94=A8=E4=BA=BA=E5=B7=A5?=
 =?UTF-8?q?=E8=BD=A6=E7=B1=BB=E5=9E=8B&=E7=94=9F=E6=88=90=E8=AF=95?=
 =?UTF-8?q?=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue | 1 +
 src/views/competitionManage/generatePaper.vue           | 1 +
 src/views/competitionManage/setExamTime.vue             | 7 +++----
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
index eebf40bcf..3e6bef581 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
@@ -56,6 +56,7 @@
           :id="domIdTrainNumber"
           v-model="formModel.category"
           filterable
+          :disabled="true"
         >
           <el-option
             v-for="item in categoryList"
diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index dead2ef1c..98e93ef83 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -33,6 +33,7 @@
         <el-table-column
           prop="topic"
           label="题目"
+          show-overflow-tooltip
         >
           <template slot-scope="scope">
             <span v-html="scope.row.topic" />
diff --git a/src/views/competitionManage/setExamTime.vue b/src/views/competitionManage/setExamTime.vue
index 2dba4c70b..c546c8cc4 100644
--- a/src/views/competitionManage/setExamTime.vue
+++ b/src/views/competitionManage/setExamTime.vue
@@ -71,13 +71,12 @@ export default {
         handleExport() {
             getRaceById(this.$route.query.raceId).then(resp => {
                 const exportData = {
-                    operateQuestionList: this.operateQuestionList,
-                    theoryQuestionList: this.theoryQuestionList,
-                    raceId: this.$route.query.raceId,
+                    practicalQuestions: this.operateQuestionList,
+                    theoryQuestions: this.theoryQuestionList,
+                    competitionId: this.$route.query.raceId,
                     theoryExamTime: this.form.theoryExamTime,
                     operateExamTime: this.form.operateExamTime
                 };
-                console.log(exportData, '11111111');
                 const content = new Blob([JSON.stringify(exportData)]);
                 const urlObject = window.URL || window.webkitURL || window;
                 const url = urlObject.createObjectURL(content);

From cfed64b4d5dd09b6b22e9fc33f8bddf1200b1fa2 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 17:37:32 +0800
Subject: [PATCH 71/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/competitionManage/generatePaper.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index ca070222b..cfd122ac4 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -23,7 +23,6 @@
             <el-tag type="primary" disable-transitions>{{ QuestionTypeMap[scope.row.type] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="topic" label="题目">
         <el-table-column
           prop="topic"
           label="题目"

From 707fa4ba434717d91ae1a8a3220ba060eed285c0 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 27 May 2020 18:09:21 +0800
Subject: [PATCH 72/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=90=86=E8=AE=BA?=
 =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competition.js                        | 14 ++++-
 src/views/competitionManage/generatePaper.vue |  5 --
 src/views/jsxt/competition/result.vue         |  9 +++
 .../jsxt/competition/theory/quiz/index.vue    | 60 +++++++------------
 src/views/jsxt/refereeList/index.vue          | 31 ++++++++--
 5 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/src/api/competition.js b/src/api/competition.js
index eff437a1a..15fe0b588 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -49,7 +49,7 @@ export function getQuestionListByMapId(params) {
 // 加载试卷
 export function loadingPaper(competitionId, data) {
     return request({
-        url: `api/v1/competition/${competitionId}/testPaper`,
+        url: `/api/v1/competition/${competitionId}/testPaper`,
         method: 'post',
         data
     });
@@ -91,9 +91,9 @@ export function getRaceUserList(params) {
 // }
 
 /** 提交试卷 */
-export function postCompetitionTheory(theoryId, data) {
+export function postCompetitionTheory(data) {
     return request({
-        url: `/api/v1/competitionTheory/${theoryId}/submit`,
+        url: `/api/v1/competitionTheory/submit`,
         method: 'post',
         data
     });
@@ -131,6 +131,14 @@ export function getTheoryQuestion(competitionId) {
     });
 }
 
+/** 查询理论题作答详情 */
+export function getCompetitionDetail(competitionId) {
+    return request({
+        url: `/api/v1/competitionTheory/detail/competition/${competitionId}`,
+        method: 'get'
+    });
+}
+
 /** 根据id查询竞赛信息 */
 export function getRaceById(id) {
     return request({
diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index ca070222b..776ca1262 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -24,11 +24,6 @@
           </template>
         </el-table-column>
         <el-table-column prop="topic" label="题目">
-        <el-table-column
-          prop="topic"
-          label="题目"
-          show-overflow-tooltip
-        >
           <template slot-scope="scope">
             <span v-html="scope.row.topic" />
           </template>
diff --git a/src/views/jsxt/competition/result.vue b/src/views/jsxt/competition/result.vue
index 0f9034df6..2a28b381f 100644
--- a/src/views/jsxt/competition/result.vue
+++ b/src/views/jsxt/competition/result.vue
@@ -40,6 +40,7 @@
 <script>
 // import { submitExam } from '@/api/management/userexam';
 // import { UrlConfig } from '@/scripts/ConstDic';
+import { getCompetitionDetail } from '@/api/competition';
 
 export default {
     name: 'ExamResult',
@@ -76,10 +77,18 @@ export default {
             return this.$store.state.app.height - 50;
         }
     },
+    created() {
+        this.getResult();
+    },
     mounted() {
         this.submitExamData();
     },
     methods: {
+        async getResult() {
+            getCompetitionDetail(this.$route.query.raceId).then(res => {
+                console.log(res);
+            });
+        },
         getSummaries(param) {
             const { columns, data } = param;
             const sums = [];
diff --git a/src/views/jsxt/competition/theory/quiz/index.vue b/src/views/jsxt/competition/theory/quiz/index.vue
index 724158926..6c78db0ac 100644
--- a/src/views/jsxt/competition/theory/quiz/index.vue
+++ b/src/views/jsxt/competition/theory/quiz/index.vue
@@ -26,7 +26,7 @@
 // import { commitExam, getExamInfo, getUserExam, saveExamAnswer } from '@/api/exam.js';
 // import WindowResizeHandler from '@/mixin/WindowResizeHandler';
 import Question from './question';
-import {postCompetitionTheory} from '@/api/competition';
+import { postCompetitionTheory, getTheoryQuestion } from '@/api/competition';
 
 export default {
     components: {
@@ -48,26 +48,8 @@ export default {
                 totalScore: 0,
                 passScore: 10
             },
-            examQuestions: [
-                {
-                    topic: 'PH玻璃电极只能在5~60℃范围内使用，而且还应通过温度校正装置来消除影响。',
-                    type: 'judge',
-                    optionList: [
-                        {id: '160', content: '√', correct: true},
-                        {id: '161', content: '×', correct: false}
-                    ]
-                },
-                {
-                    topic: '调度工作是（ ___ ）工作中的一个重要组成部分。',
-                    type: 'select',
-                    optionList: [
-                        {id: '40', content: '<span style="color: windowtext;">煤矿管理</span>', correct: false},
-                        {id: '41', content: '<span style="color: windowtext;">企业管理</span>', correct: true},
-                        {id: '42', content: '<span style="color: windowtext;">安全生产</span>', correct: false},
-                        {id: '43', content: '<span style="color: windowtext;">生产组织</span>', correct: false}
-                    ]
-                }
-            ]
+            examQuestions: [],
+            theoryAnswers: []
         };
     },
     computed: {
@@ -106,18 +88,15 @@ export default {
     },
     methods: {
         loadInitData() {
-            console.log('获取试题详情');
-            // getExamInfo(this.examId).then(resp => {
-            //     this.formModel = resp.data;
-            //     getUserExam(this.userExamId).then(rest => {
-            //         this.examQuestions = rest.data.map((el, i) => {
-            //             el.index = i;
-            //             return el;
-            //         });
-            //     });
-            // }).catch(error => {
-            //     this.$message.error(`加载考试详情失败：${error.message}`);
-            // });
+            this.theoryAnswers = [];
+            getTheoryQuestion(this.$route.query.raceId).then((resp)=>{
+                if (resp.data) {
+                    this.examQuestions = resp.data.questions.map((el, i) => {
+                        el.index = i;
+                        return el;
+                    });
+                }
+            }).catch(error => { this.$message.error(`加载考试详情失败：${error.message}`); });
         },
         resizeHandler() {
             this.height = this._clientHeight;
@@ -154,15 +133,20 @@ export default {
             }
         },
         doEnd() {
-            // console.log('考试成绩');
-            // this.$router.push({ path: `/jsxt/home`});
-            const params = {competitionId:this.$route.query.raceId};
-            postCompetitionTheory(1, params).then(()=>{
+            const params = {
+                competitionId: this.$route.query.raceId,
+                theoryAnswers: this.theoryAnswers
+            };
+            postCompetitionTheory(params).then(()=>{
                 this.$router.push({ path: `/jsxt/result`, query: { type: 'theory', raceId:this.$route.query.raceId } });
             });
         },
         onSave(data) {
-            console.log(data, '问答题');
+            // console.log(data, '问答题');
+            this.theoryAnswers.push({
+                answerOptionId: data.answer,
+                questionId: data.userExamQuestionId
+            });
         }
     }
 };
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 9dc8ef9ef..627c170a4 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -113,7 +113,7 @@ export default {
                     }
                 ],
                 actions: [
-                    { text: '导入试题', handler: this.handleAdd }
+                    { text: '导入试题', handler: this.handleAdd, fileType: 'file' }
                 ]
             },
             isLeaving:false,
@@ -149,10 +149,31 @@ export default {
             });
         },
         handleAdd() {
-            loadingPaper(this.$route.query.raceId, {}).then((response)=>{
-                this.$message('试题加载成功');
-            }).catch(()=>{
-                this.$message('试题加载失败');
+            const loading = this.$loading({
+                lock: true,
+                text: '正在导入中...',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
+            setTimeout(() => {
+                const obj = document.getElementById('queryFormFilesInput');
+                if (!obj.files) return;
+                const f = obj.files[0];
+                const reader = new FileReader();
+                const that = this;
+                reader.readAsText(f, 'utf-8');
+                reader.onload = function(e) {
+                    const data = e.target.result;
+                    console.log(JSON.parse(data));
+                    loadingPaper(that.$route.query.raceId, JSON.parse(data)).then(res => {
+                        that.$message.success('试题加载成功');
+                        loading.close();
+                    }).catch(error => {
+                        loading.close();
+                        that.$message.error('试题加载失败' + error.message);
+                    });
+                    obj.value = '';
+                };
             });
         },
         // 查询函数

From 07679a37e7ff726313e27a4346a14f43f511d87e Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 27 May 2020 18:30:14 +0800
Subject: [PATCH 73/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=90=86=E8=AE=BA?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/competition/examDetail.vue |  3 --
 src/views/jsxt/competition/result.vue     | 44 +++++++++++------------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 5dd2b83a4..b7290c1fd 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -159,7 +159,6 @@ export default {
         async getUserStatus() {
             this.resultFlag = false;
             const res = await getRaceUserById(this.$route.query.raceId);
-            // console.log(res.data.status);
             if (this.$route.query.type == 'theory' && (res.data.status == 4 || res.data.status == 5)) {
                 this.$router.replace({ path: `/jsxt/result`, query: { type: 'theory', raceId:this.$route.query.raceId } });
             } else if (this.$route.query.type == 'operation' && (res.data.status == 4 || res.data.status == 6)) {
@@ -182,8 +181,6 @@ export default {
                 getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
                     if (responese.data) {
                         participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
-                            // const query = { lineCode: '11', mapId: '41', group: resp.data, prdType: '03', raceId: this.$route.query.raceId};
-                            // this.$router.replace({ path: `/displayNew/demon`, query: query});
                             const query = { lineCode: '11', mapId: '41', group: resp.data, raceId: this.$route.query.raceId};
                             this.$router.replace({ path: `/jointTrainingNew`, query: query});
                         });
diff --git a/src/views/jsxt/competition/result.vue b/src/views/jsxt/competition/result.vue
index 2a28b381f..9882d484a 100644
--- a/src/views/jsxt/competition/result.vue
+++ b/src/views/jsxt/competition/result.vue
@@ -4,23 +4,19 @@
       <span style="font-weight:bold ">{{ $t('exam.examResultsDetails') }}</span>
     </div>
     <div class="context">
-      <el-form ref="form" :model="resultModel" size="mini">
+      <!-- <el-form ref="form" :model="resultModel" size="mini">
         <el-form-item :label="this.$t('exam.testScores')+':'" prop="score">
           <span>{{ resultModel.score + ' '+ $t('exam.points') }}</span>
         </el-form-item>
         <el-form-item :label="this.$t('exam.examTime')+':'" prop="detail">
           <span>{{ Math.ceil((resultModel.usedTime || 0)/60) + ' '+ $t('global.minutes') }}</span>
         </el-form-item>
-      </el-form>
+      </el-form> -->
       <el-table :data="tableData" border style="width: 100%; min-height: 200px;" :summary-method="getSummaries" show-summary :span-method="objectSpanMethod">
-        <el-table-column prop="title" label="题数">
-          <template slot-scope="scope">
-            <span>{{ '第'+scope.row.title + '题' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="score" label="分值(分)" />
-        <el-table-column prop="goal" label="得分(分)" />
-        <el-table-column v-if="this.$route.query.type ==='theory'" prop="correctAnswer" label="正确答案" />
+        <el-table-column prop="title" label="题目" />
+        <el-table-column prop="score" label="分值" />
+        <el-table-column prop="goal" label="得分" />
+        <el-table-column v-if="this.$route.query.type ==='theory'" prop="correctAnswer" label="答题结果" />
         <el-table-column v-if="this.$route.query.type ==='theory'" prop="explain" label="说明" />
         <el-table-column v-if="this.$route.query.type ==='operate'" prop="scoringPointIndex" label="得分点">
           <template slot-scope="scope">
@@ -78,18 +74,10 @@ export default {
         }
     },
     created() {
-        this.getResult();
-    },
-    mounted() {
         this.submitExamData();
     },
     methods: {
-        async getResult() {
-            getCompetitionDetail(this.$route.query.raceId).then(res => {
-                console.log(res);
-            });
-        },
-        getSummaries(param) {
+        getSummaries(param) { // 计算总分
             const { columns, data } = param;
             const sums = [];
             columns.forEach((column, index) => {
@@ -118,9 +106,21 @@ export default {
         },
         submitExamData() {
             this.loading = false;
-            if (this.$route.query.type === 'theory') {
-                this.tableData = this.theoryData;
-            } else if (this.$route.query.type === 'operate') {
+            if (this.$route.query.type == 'theory') {
+                getCompetitionDetail(this.$route.query.raceId).then(res => {
+                    console.log(res);
+                    this.tableData = [];
+                    res.data.forEach(item => {
+                        this.tableData.push({
+                            title: item.topic,
+                            score: item.totalScore,
+                            goal: item.score,
+                            correctAnswer: item.correct ? '正确' : '错误',
+                            explain: item.remarks
+                        });
+                    });
+                });
+            } else if (this.$route.query.type == 'operate') {
                 this.tableData = [];
                 this.operateData.forEach(item => {
                     if (item.scoringPoints && item.scoringPoints.length) {

From 56bbb9441cc8ba87af154cca449e318b63fa9aa6 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 18:35:05 +0800
Subject: [PATCH 74/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E6=9C=BAats=E4=BA=BA=E5=B7=A5=E6=8E=A7=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/map.js       | 24 ++++++++++++++++--------
 src/store/modules/map.js | 13 +++++++++++++
 src/utils/baseUrl.js     |  4 ++--
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index df076df0e..db61befd0 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -378,7 +378,6 @@ class Jlmap {
     update(list) {
         this.setUpdateMapDevice(list || []); // 增加一个 前数据 处理 为了在区段中 获取全部的 道岔信息
         const signalDeviceList = [];
-        const signalStatusList = [];
         (list || []).forEach(elem => {
             const code = elem.code;
             const type = elem._type;
@@ -393,13 +392,9 @@ class Jlmap {
                     }
                 }
                 const signalDevice = this.mapDevice[route.startSignalCode];
-                const signalStatus = {atsControl: elem.atsControl, fleetMode: elem.fleetMode};
                 const index = signalDeviceList.indexOf(signalDevice);
                 if (index === -1) {
                     signalDeviceList.push(signalDevice);
-                    signalStatusList.push(signalStatus);
-                } else {
-                    signalStatusList[index] = {atsControl: signalStatusList[index].atsControl && elem.atsControl, fleetMode: signalStatusList[index].fleetMode || elem.fleetMode};
                 }
             } else if (elem.deviceType === 'CYCLE') {
                 store.dispatch('map/updateAutoReentryState', elem);
@@ -438,15 +433,28 @@ class Jlmap {
                 }
             }
         });
-        this.handleRouteSignalStatus(signalDeviceList, signalStatusList);
+        this.handleRouteSignalStatus(signalDeviceList);
         // 状态后处理
         this.postHandle(list || []);
 
         if (this.methods.stateUpdate instanceof Function) { this.methods.stateUpdate(list); }
     }
-    handleRouteSignalStatus(signalDeviceList, signalStatusList) {
+    handleRouteSignalStatus(signalDeviceList) {
+        const routeStartSignalData = store.state.map.routeStartSignalData;
         signalDeviceList.forEach((item, index)=> {
-            if (item && this.hookHandle(item, signalStatusList[index])) {
+            const status = {};
+            if (routeStartSignalData[item.code] && routeStartSignalData[item.code].length) {
+                routeStartSignalData[item.code].forEach((elem, index)=> {
+                    if (index) {
+                        status.atsControl = status.atsControl && elem.atsControl;
+                        status.fleetMode = status.fleetMode || elem.fleetMode;
+                    } else {
+                        status.atsControl = elem.atsControl;
+                        status.fleetMode = elem.fleetMode;
+                    }
+                });
+            }
+            if (item && this.hookHandle(item, status)) {
                 this.$painter.update(item);
             }
         });
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index 8de77f1b7..3205a7be4 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -181,6 +181,7 @@ const map = {
     state: {
         routeData: {}, // 进路数据
         routeList: [], // 进路list
+        routeStartSignalData: {}, // 进路始端信号机数据
         autoReentryData: {}, // 自动折返数据
         autoReentryList: [], // 自动折返list
         signalApproachSectionData: {}, // 信号机接近区段数据
@@ -232,6 +233,13 @@ const map = {
         routeData: (state) => {
             return state.routeData;
         },
+        routeStartSignalData: (state) => {
+            if (state.map) {
+                return state.map.routeStartSignalData || {};
+            } else {
+                return {};
+            }
+        },
         overlapData: (state) => {
             return state.overlapData;
         },
@@ -719,6 +727,11 @@ const map = {
         setRouteData: (state, routeDataList) => {
             routeDataList.forEach(data => {
                 state.routeData[data.code] = data;
+                if (state.routeStartSignalData[data.startSignalCode] && state.routeStartSignalData[data.startSignalCode].length) {
+                    state.routeStartSignalData[data.startSignalCode].push(data);
+                } else {
+                    state.routeStartSignalData[data.startSignalCode] = [data];
+                }
             });
             state.map.automaticRouteButtonList && state.map.automaticRouteButtonList.forEach(item => {
                 state.routeData[item.automaticRouteCode].automaticRouteCode = item.code;
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 836771751..778caeb7b 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,11 +2,11 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛

From 4fe13309900342323acd33ce3e0ec9f84a4d14ea Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 27 May 2020 19:02:34 +0800
Subject: [PATCH 75/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=95=E5=8D=B7?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/competition/examDetail.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index b7290c1fd..48ecc8904 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -176,7 +176,9 @@ export default {
                         this.$messageBox('试卷还没被加载');
                     }
 
-                }).catch(()=>{});
+                }).catch(()=>{
+                    this.$messageBox('试卷还没被加载');
+                });
             } else {
                 getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
                     if (responese.data) {
@@ -187,6 +189,8 @@ export default {
                     } else {
                         this.$messageBox('试卷还没被加载');
                     }
+                }).catch(()=>{
+                    this.$messageBox('试卷还没被加载');
                 });
             }
         }

From 4afcef1ce23ec0d0895838ee501aff0b4a78e481 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 27 May 2020 19:02:39 +0800
Subject: [PATCH 76/85] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83=20?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=20=E5=88=9B=E5=BB=BA=E7=BE=A4=E8=81=8A?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/chat.js                               |   6 +-
 src/store/modules/socket.js                   |   2 +-
 src/views/newMap/jointTrainingNew/chatBox.vue |  40 +++-
 .../newMap/jointTrainingNew/chatContent.vue   |   6 +-
 .../jointTrainingNew/chatCoversitionList.vue  |  26 ++-
 .../jointTrainingNew/chatCreateGroup.vue      | 219 ++++++++++++++++++
 .../jointTrainingNew/chatMemberList.vue       |  24 +-
 .../newMap/jointTrainingNew/menuDemon.vue     |   2 +-
 8 files changed, 281 insertions(+), 44 deletions(-)
 create mode 100644 src/views/newMap/jointTrainingNew/chatCreateGroup.vue

diff --git a/src/api/chat.js b/src/api/chat.js
index 7b493411a..f9d1220a2 100644
--- a/src/api/chat.js
+++ b/src/api/chat.js
@@ -312,11 +312,11 @@ export function getSimulationConversationListNew(group) {
 }
 
 // 获取/创建仿真会话（新版地图）
-export function getSimulationConversationIdNew(params, group) {
+export function getSimulationConversationIdNew(data, group) {
     return request({
         url: `/simulation/${group}/wx/conversation`,
-        method: 'get',
-        params: params
+        method: 'post',
+        data
     });
 }
 
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index 470488e82..e287a3194 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -163,7 +163,7 @@ function handleSimulationInfo(state, data) {
         targetOnline:data.targetMember ? data.targetMember.online : null,
         targetName:data.targetMember ? data.targetMember : 'All',
         targetRole:data.targetMember ? data.targetMember.role : null,
-        group: data.group,
+        all: data.all,
         date: +new Date(`${myDate1} ${chatTime}`)
     };
     state.simulationText = params;
diff --git a/src/views/newMap/jointTrainingNew/chatBox.vue b/src/views/newMap/jointTrainingNew/chatBox.vue
index 72f0a1b69..cc7a33ed7 100644
--- a/src/views/newMap/jointTrainingNew/chatBox.vue
+++ b/src/views/newMap/jointTrainingNew/chatBox.vue
@@ -11,8 +11,11 @@
             <div class="minimality" @click="handleMinimality('min')">
               <i class="el-icon-remove" />
             </div>
-            <div v-show="currentCoversition.group==undefined?true:currentCoversition.group" class="showMembers" @click="handleMembers()">
+            <!-- <div v-show="currentCoversition.group==undefined?true:currentCoversition.group" class="showMembers" @click="handleMembers()">
               <i class="el-icon-user-solid" />
+            </div> -->
+            <div v-show="currentCoversition.all==undefined?true&&isShow:currentCoversition.all&&isShow" class="chat-createGroup" @click="handleCreateGroup()">
+              <i class="el-icon-plus" style="font-weight: bolder;" />
             </div>
             <div class="chat-setting" @click="handleSetting()">
               <i class="el-icon-s-tools" />
@@ -42,6 +45,7 @@
       </div>
     </div>
     <chat-setting ref="chatSetting" :form="form" @setSetting="setSetting" />
+    <chat-create-group ref="createGroup" :group="group" @addCoversition="addCoversition" />
   </div>
 </template>
 <script>
@@ -49,6 +53,7 @@ import ChatSetting from './chatSetting';
 import ChatContent from './chatContent';
 import ChatMemberList from './chatMemberList';
 import ChatCoversitionList from './chatCoversitionList';
+import ChatCreateGroup from './chatCreateGroup';
 import RecordRTC from 'recordrtc';
 import {uploadAudioFileNew} from '@/api/chat';
 export default {
@@ -57,12 +62,17 @@ export default {
         ChatSetting,
         ChatContent,
         ChatMemberList,
-        ChatCoversitionList
+        ChatCoversitionList,
+        ChatCreateGroup
     },
     props: {
         group: {
             type: String,
             required: true
+        },
+        userRole: {
+            type: String,
+            required: true
         }
     },
     data() {
@@ -81,6 +91,11 @@ export default {
             headerTitle:'所有人'
         };
     },
+    computed:{
+        isShow() {
+            return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE';
+        }
+    },
     watch: {
         '$store.state.socket.simulationRoleList': function (val) {
             if (val && val.length) {
@@ -110,7 +125,7 @@ export default {
         },
         setCurrentCoversition(coversition) {
             this.currentCoversition = coversition;
-            if (coversition.group) {
+            if (coversition.all) {
                 this.headerTitle = coversition.name;
             }
             if (this.recordSending) {
@@ -123,7 +138,7 @@ export default {
         },
         addCoversition({data, headerTitle}) {
             this.$refs.chatCoversitionList.addCoversition(data);
-            this.currentCoversition = {id:data.id, group:data.group};
+            this.currentCoversition = {id:data.id, all:data.all};
             this.headerTitle = headerTitle;
         },
         // 语音录制开始
@@ -229,9 +244,12 @@ export default {
         handleSetting() {
             this.$refs.chatSetting.doShow();
         },
-        handleMembers() {
-            this.$refs.chatSetting.doClose();
-            this.$refs.chatMemberList.doShow();
+        // handleMembers() {
+        //     this.$refs.chatSetting.doClose();
+        //     this.$refs.chatMemberList.doShow();
+        // },
+        handleCreateGroup() {
+            this.$refs.createGroup.doShow();
         }
     }
 };
@@ -285,6 +303,14 @@ export default {
     cursor: pointer;
     font-size: 16px;
 }
+.chat-createGroup{
+    float: right;
+    line-height: 40px;
+    margin-right: 10px;
+    cursor: pointer;
+    font-size: 16px;
+    position: relative;
+}
 .chat-box-footer-tool{
     width: 100%;
     height: 30px;
diff --git a/src/views/newMap/jointTrainingNew/chatContent.vue b/src/views/newMap/jointTrainingNew/chatContent.vue
index 2bca5bdc6..ea4596f1a 100644
--- a/src/views/newMap/jointTrainingNew/chatContent.vue
+++ b/src/views/newMap/jointTrainingNew/chatContent.vue
@@ -4,12 +4,12 @@
       <div v-for="(chatContent,index) in chatContentList" :key="index" class="chatContentInClass">
         <div :class="chatContent.self?'rightUser':'leftUser'">
           <div class="userHeader">
-            <div v-if="chatContent.group&& !chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
+            <div v-if="chatContent.all&& !chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
             <div :class="chatContent.self?'userChatTime textRight':'userChatTime'">{{ formatTime(chatContent.chatTime) }}</div>
           </div>
           <div class="userBubble" @click="playAudio('audio'+index)">
             <div class="userMessage">
-              <span v-if="chatContent.group&&!chatContent.member.robot">@{{ covertName(chatContent.targetName) }}</span>
+              <span v-if="chatContent.all&&!chatContent.member.robot">@{{ covertName(chatContent.targetName) }}</span>
               <span class="el-icon-video-play playicon" />
               <span class="messageText">{{ chatContent.message }}</span>
               <audio :id="'audio'+index" :src="baseUrl+chatContent.src" style="display:none" />
@@ -59,7 +59,7 @@ export default {
                 }
                 this.scrollTop();
             } else {
-                if (!simulationText.group) {
+                if (!simulationText.all) {
                     this.$emit('changeCoversition', simulationText);
                     // this.$emit('addCoversition', {data:simulationText, headerTitle:''});
                     this.chatContentList.push(simulationText);
diff --git a/src/views/newMap/jointTrainingNew/chatCoversitionList.vue b/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
index 4516e5b0f..d3ddc2891 100644
--- a/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
+++ b/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
@@ -32,9 +32,15 @@ export default {
                 if (resp.data) {
                     const data = resp.data;
                     data.map(coversition=>{
-                        const objectCover = this.handleMemberName(coversition);
-                        coversition.coverName = objectCover.coversitionName;
-                        coversition.isOnline = objectCover.isOnline;
+                        if (coversition.name) {
+                            coversition.coverName = coversition.name;
+                            coversition.isOnline = true;
+                        } else {
+                            const objectCover = this.handleMemberName(coversition);
+                            coversition.coverName = objectCover.coversitionName;
+                            coversition.isOnline = objectCover.isOnline;
+                        }
+
                         return coversition;
                     });
                     this.coversitionList = data;
@@ -49,15 +55,21 @@ export default {
             const index = this.coversitionList.findIndex(item=>{ return item.id == data.id; });
             if (index < 0) {
                 const objectCover = this.handleMemberName(data);
-                data.coverName = objectCover.coversitionName;
-                data.isOnline = objectCover.isOnline;
+                if (data.name) {
+                    data.coverName = data.name;
+                    data.isOnline = true;
+                } else {
+                    data.coverName = objectCover.coversitionName;
+                    data.isOnline = objectCover.isOnline;
+                }
+
                 this.coversitionList.push(data);
                 this.currentCoversition = data;
             }
         },
         changeCoversition(coversition) {
             this.$emit('setHeadTitle', !coversition.isOnline ? coversition.coverName + ' (离线)' : coversition.coverName);
-            this.currentCoversition = {id:coversition.id, group:coversition.group};
+            this.currentCoversition = {id:coversition.id, all:coversition.all};
             this.$emit('setCurrentCoversition', coversition);
             // this.$refs.chatContent.reloadData(this.currentCoversition);
         },
@@ -72,7 +84,7 @@ export default {
             this.changeCoversition(coversition);
         },
         handleMemberName(conversition) {
-            if (conversition.group) {
+            if (conversition.all) {
                 return {coversitionName:conversition.name, isOnline:true};
             } else {
                 let coversitionName = '';
diff --git a/src/views/newMap/jointTrainingNew/chatCreateGroup.vue b/src/views/newMap/jointTrainingNew/chatCreateGroup.vue
new file mode 100644
index 000000000..a561b336c
--- /dev/null
+++ b/src/views/newMap/jointTrainingNew/chatCreateGroup.vue
@@ -0,0 +1,219 @@
+<template>
+  <div v-show="dialogVisible" class="chat-create-group">
+    <div class="create-group-header">
+      <div class="create-group-title">添加会话对象</div>
+      <div class="create-group-close">
+        <i class="el-icon-close" @click="dialogVisible=false" />
+      </div>
+    </div>
+    <div class="create-group-content">
+      <div class="chat-member-list">
+        <el-checkbox-group v-model="checkList">
+          <el-checkbox
+            v-for="member in memberList"
+            :key="member.id"
+            class="each-chat-member"
+            :label="member"
+            :disabled="member.userId === userId"
+          >{{ member.memberName }}</el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="currentSelectList">
+        <div
+          v-for="member in checkList"
+          :key="member.id"
+          class="eachSelect"
+        >
+          {{ member.memberName }}
+        </div>
+
+      </div>
+      <!-- :style="member.userId === userId ?'color:red':''" -->
+    </div>
+    <div class="create-group-bottom">
+      <el-button :loading="loading" size="small" type="primary" @click="doCreate">创建会话</el-button>
+      <el-button size="small" @click="doClose">取消</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import {getSimulationMembersNew, getSimulationConversationIdNew} from '@/api/chat';
+import ConstConfig from '@/scripts/ConstConfig';
+import Cookies from 'js-cookie';
+export default {
+    name:'ChatCreateGroup',
+    props: {
+        group: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible:false,
+            loading:false,
+            memberList:[],
+            checkList:[]
+        };
+    },
+    computed:{
+        userId() {
+            return this.$store.state.user.id;
+        }
+    },
+    methods:{
+        doShow() {
+            this.getSimulationMembers();
+            this.dialogVisible = true;
+        },
+        getSimulationMembers() {
+            getSimulationMembersNew(this.$route.query.group).then(resp => {
+                let lastData = JSON.stringify(resp.data);
+                const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
+                roleTypeList.forEach(function(element) {
+                    const rolename = element.value;
+                    if (Cookies.get('user_lang') == 'en') {
+                        lastData = lastData.replace(new RegExp(rolename, 'g'), element.enLabel);
+                    } else {
+                        lastData = lastData.replace(new RegExp(rolename, 'g'), element.label);
+                    }
+                });
+                lastData = JSON.parse(lastData);
+                lastData = lastData.filter(memberIn=>{ return memberIn.role != '观众'; });
+                lastData.map(member=>{
+                    const deviceName = member.deviceName ? '-' + member.deviceName : '';
+                    const memberName = member.name ? '-' + member.name : '';
+                    member.memberName = member.role + deviceName + memberName;
+                    return member;
+                });
+                this.memberList = lastData;
+            });
+        },
+        doCreate() {
+            if (this.checkList.length > 0) {
+                this.loading = true;
+                const checkList = this.checkList.map(function(check) { return check.id; });
+                getSimulationConversationIdNew(checkList, this.group).then(resp => {
+                    if (resp.data) {
+                        const data = resp.data;
+                        this.loading = false;
+                        this.$emit('addCoversition', {data:data, headerTitle:resp.data.name});
+                        this.dialogVisible = false;
+                        this.checkList = [];
+                    }
+                });
+            }
+
+        },
+        doClose() {
+            this.checkList = [];
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.chat-create-group{
+    position: absolute;
+    width: 70%;
+    height: 300px;
+    border: 1px #dedede solid;
+    left: 26%;
+    top: 8%;
+    z-index: 7;
+    border-radius: 8px;
+    box-shadow: #b5aeae 0 0 10px;
+    background: #fff;
+}
+.create-group-header{
+    padding-left: 10px;
+    padding-top: 6px;
+    font-size: 14px;
+    border-bottom: 1px #dedede solid;
+    padding-bottom: 6px;
+}
+.create-group-title{
+    display: inline-block;
+}
+.create-group-close{
+    float: right;
+    display: inline-block;
+    margin-right: 5px;
+    font-size: 16px;
+    cursor: pointer;
+}
+.chat-member-list{
+    width: 54%;
+    height: 216px;
+    overflow-y: auto;
+    padding: 5px 10px;
+    font-size: 14px;
+    overflow-x: hidden;
+    border-right: 1px #ccc solid;
+    display:inline-block;
+}
+.create-group-content{
+    width: 100%;
+    height: 220px;
+    padding-bottom: 10px;
+    border-bottom: 1px #dedede solid;
+}
+.create-group-bottom{
+    text-align: center;
+    margin-top:8px;
+}
+.each-chat-member{
+    display:block;
+    margin-top:5px;
+}
+.currentSelectList{
+    display: inline-block;
+    width: 44%;
+    font-size: 14px;
+    vertical-align: top;
+    padding: 5px 10px;
+    overflow-x: hidden;
+    overflow-y: auto;
+    height: 216px;
+}
+.eachSelect{
+    display:block;
+    margin-top:5px;
+}
+// 谷歌、safari、qq浏览器、360浏览器滚动条样式
+// 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸
+.chat-member-list::-webkit-scrollbar,.currentSelectList::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+    // height: 110px;
+    background-color: #FFFFFF;
+}
+/*定义滚动条轨道 内阴影+圆角*/
+.chat-member-list::-webkit-scrollbar-track,.currentSelectList::-webkit-scrollbar-track{
+    // box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+    border-radius: 10px;
+    background-color: #FFFFFF;;
+}
+/*定义滑块 内阴影+圆角*/
+.chat-member-list::-webkit-scrollbar-thumb,.currentSelectList::-webkit-scrollbar-thumb{
+    border-radius: 10px;
+    // box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+    background-color: #cacaca;
+}
+/*滑块效果*/
+.chat-member-list::-webkit-scrollbar-thumb:hover,.currentSelectList::-webkit-scrollbar-thumb:hover {
+    border-radius: 5px;
+    // box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    background: rgba(0,0,0,0.4);
+}
+/*IE滚动条颜色*/
+html {
+    scrollbar-face-color:#bfbfbf;/*滚动条颜色*/
+    scrollbar-highlight-color:#000;
+    scrollbar-3dlight-color:#000;
+    scrollbar-darkshadow-color:#000;
+    scrollbar-Shadow-color:#adadad;/*滑块边色*/
+    scrollbar-arrow-color:rgba(0,0,0,0.4);/*箭头颜色*/
+    scrollbar-track-color:#eeeeee;/*背景颜色*/
+}
+</style>
diff --git a/src/views/newMap/jointTrainingNew/chatMemberList.vue b/src/views/newMap/jointTrainingNew/chatMemberList.vue
index ed497a016..150af4e94 100644
--- a/src/views/newMap/jointTrainingNew/chatMemberList.vue
+++ b/src/views/newMap/jointTrainingNew/chatMemberList.vue
@@ -7,13 +7,12 @@
         :key="member.id"
         :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'"
         :style="member.userId === userId ?'color:red':''"
-        @click="createConversition(member)"
       >{{ member.memberName }}</div>
     </div>
   </div>
 </template>
 <script>
-import {getSimulationMembersNew, getSimulationConversationIdNew} from '@/api/chat';
+import {getSimulationMembersNew} from '@/api/chat';
 import ConstConfig from '@/scripts/ConstConfig';
 import Cookies from 'js-cookie';
 export default {
@@ -26,7 +25,7 @@ export default {
     },
     data() {
         return {
-            showMembers:false,
+            showMembers:true,
             memberList:[]
         };
     },
@@ -39,17 +38,6 @@ export default {
         this.getSimulationMembers();
     },
     methods:{
-        createConversition(member) {
-            if (member.userId != this.$store.state.user.id && member.online) {
-                getSimulationConversationIdNew({ memberId: member.id }, this.group).then(resp => {
-                    if (resp.data) {
-                        const data = resp.data;
-                        this.$emit('addCoversition', {data:data, headerTitle:member.memberName});
-                        this.showMembers = false;
-                    }
-                });
-            }
-        },
         setMemberStatus(memberInfo) {
             this.getSimulationMembers();
             // memberInfo.forEach(member=>{
@@ -84,14 +72,6 @@ export default {
                 });
                 this.memberList = lastData;
             });
-        },
-        doShow() {
-            if (this.showMembers) {
-                this.showMembers = false;
-            } else {
-                this.showMembers = true;
-                this.getSimulationMembers();
-            }
         }
     }
 };
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 2432a3fb7..0360aea61 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <chat-box :group="group" />
+    <chat-box :group="group" :user-role="userRole" />
     <div class="display-draft" :class="{'display-type-hb': $route.query.lineCode == '07' && $store.state.training.prdType=='01'}">
       <el-button-group>
         <el-button v-if="isProject && !dataError " type="primary" @click="setRelDevice">{{ $t('joinTraining.connectRealDevices') }}</el-button>

From ce05df581aee6b5b9966bdadb194618da04597de Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 28 May 2020 09:07:29 +0800
Subject: [PATCH 77/85] =?UTF-8?q?=E5=88=97=E8=BD=A6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=88=E5=88=97=E8=BD=A6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?>=E5=A4=A7=E5=B0=8F=E4=BA=A4=E8=B7=AF=E5=9B=9E=E5=BA=93?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Train/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index a93cd9c21..07ba2b4be 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -407,8 +407,8 @@ export default class Train extends Group {
             this.setHoldStatus(model.hold);
             this.setJumpStatus(model.jump);
             this.setSoonerOrLater(model.dt);
-            this.setPlanRoutingTypeColor(model.planRoutingType);
             this.setTrainTypeColor(model.type);
+            this.setPlanRoutingTypeColor(model.planRoutingType);
             const style = this.style;
             if (style.Section.trainPosition.display) {
                 this.updateSection(object);

From d5519590f2583ab18528dfe06a3bf8d17862e8f0 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 28 May 2020 09:26:05 +0800
Subject: [PATCH 78/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/QueryListPage/QueryForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/QueryListPage/QueryForm.vue b/src/components/QueryListPage/QueryForm.vue
index 2707c5a49..28421fb31 100644
--- a/src/components/QueryListPage/QueryForm.vue
+++ b/src/components/QueryListPage/QueryForm.vue
@@ -150,7 +150,7 @@
             <template v-for="(button, index) in queryList.actions">
               <el-button v-if="button.fileType==='file' && (button.hasOwnProperty('show') ? button.show: true)" :key="index" :type="button.type ? button.type: 'primary'" size="small" class="button_style uploadDemo" :disabled="button.disabled" :loading="button.disabled">
                 <input id="queryFormFilesInput" type="file" class="file_box" accept=".json, application/json" @change="button.handler">
-                {{ $t('map.importMap') }}
+                {{ button.text }}
               </el-button>
               <el-button
                 v-else-if="button.hasOwnProperty('show') ? button.show: true"

From bf1bbbe948d4134e0981c1e5a74ad3465cf0c73b Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 28 May 2020 09:54:47 +0800
Subject: [PATCH 79/85] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E6=8C=87=E4=BB=A4&=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=AF=95=E5=8D=B7=E5=8F=82=E6=95=B0&?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/xian_01/menus/utils/menuOperate.js  |   2 +-
 src/scripts/cmdPlugin/CommandEnum.js          |   2 +
 src/views/competitionManage/setExamTime.vue   |   2 +-
 .../newMap/mapsystemNew/common/commonMenu.vue |  22 ++
 .../mapsystemNew/common/menus/noticeInfo.vue  |  84 +++++++
 .../mapsystemNew/common/menus/setFault.vue    | 189 +++++++++++++++
 .../common/menus/trainAddPlan.vue             | 216 ++++++++++++++++++
 7 files changed, 515 insertions(+), 2 deletions(-)
 create mode 100644 src/views/newMap/mapsystemNew/common/commonMenu.vue
 create mode 100644 src/views/newMap/mapsystemNew/common/menus/noticeInfo.vue
 create mode 100644 src/views/newMap/mapsystemNew/common/menus/setFault.vue
 create mode 100644 src/views/newMap/mapsystemNew/common/menus/trainAddPlan.vue

diff --git a/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js b/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js
index cf5475044..8fbceaea2 100644
--- a/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js
+++ b/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js
@@ -60,7 +60,7 @@ export const menuOperate = {
         cancelTrainRoute:{
             // 取消进路
             operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
-            cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+            cmdType: CMD.Signal.CMD_SIGNAL_FORCE_CANCEL_ROUTE
         },
         lock:{
             // 信号封锁
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index dc911ae3b..68ff8bb54 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -78,6 +78,8 @@ export default {
         CMD_SIGNAL_SET_ROUTE: {value:'Signal_Set_Route', label: '排列进路'},
         /** 取消进路 */
         CMD_SIGNAL_CANCEL_ROUTE: {value:'Signal_Cancel_Route', label: '取消进路'},
+        /** 强制取消进路 */
+        CMD_SIGNAL_FORCE_CANCEL_ROUTE: {value: 'Signal_Force_Cancel_Route', label: '强制取消进路'},
         /** 人解进路 */
         CMD_SIGNAL_HUMAN_RELEASE_ROUTE: {value:'Signal_Human_Release_Route', label: '人解进路'},
         /** 信号关灯 */
diff --git a/src/views/competitionManage/setExamTime.vue b/src/views/competitionManage/setExamTime.vue
index c546c8cc4..1276e6079 100644
--- a/src/views/competitionManage/setExamTime.vue
+++ b/src/views/competitionManage/setExamTime.vue
@@ -75,7 +75,7 @@ export default {
                     theoryQuestions: this.theoryQuestionList,
                     competitionId: this.$route.query.raceId,
                     theoryExamTime: this.form.theoryExamTime,
-                    operateExamTime: this.form.operateExamTime
+                    practicalExamTime: this.form.operateExamTime
                 };
                 const content = new Blob([JSON.stringify(exportData)]);
                 const urlObject = window.URL || window.webkitURL || window;
diff --git a/src/views/newMap/mapsystemNew/common/commonMenu.vue b/src/views/newMap/mapsystemNew/common/commonMenu.vue
new file mode 100644
index 000000000..ef822fdef
--- /dev/null
+++ b/src/views/newMap/mapsystemNew/common/commonMenu.vue
@@ -0,0 +1,22 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <set-fault ref="setFault" />
+  </div>
+</template>
+
+<script>
+import SetFault from './menus/setFault';
+export default {
+    name: 'CommonMenu',
+    components: {
+        SetFault
+    },
+    props: {},
+    computed: {},
+    watch: {}
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/mapsystemNew/common/menus/noticeInfo.vue b/src/views/newMap/mapsystemNew/common/menus/noticeInfo.vue
new file mode 100644
index 000000000..672cfec3d
--- /dev/null
+++ b/src/views/newMap/mapsystemNew/common/menus/noticeInfo.vue
@@ -0,0 +1,84 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="xian-01__systerm notice-info"
+    :title="title"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div class="context">
+      <template v-for="(message,index) in messages">
+        <div :key="index">{{ message }}</div>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="8">
+        <el-button :id="domIdSure" type="primary" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'NoticeInfo',
+    data() {
+        return {
+            dialogShow: false,
+            messages: [this.$t('tip.commandFailed')]
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            return this.$t('tip.hint');
+        },
+        domIdSure() {
+            return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(messages) {
+            this.dialogShow = true;
+            this.messages = [this.$t('tip.commandFailed')];
+            if (messages && messages != 'null') {
+                this.messages.push(messages);
+            }
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.doClose();
+        },
+        cancel() {
+            this.doClose();
+        }
+    }
+};
+
+</script>
+<style>
+    .notice-info .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
diff --git a/src/views/newMap/mapsystemNew/common/menus/setFault.vue b/src/views/newMap/mapsystemNew/common/menus/setFault.vue
new file mode 100644
index 000000000..a26fa68f1
--- /dev/null
+++ b/src/views/newMap/mapsystemNew/common/menus/setFault.vue
@@ -0,0 +1,189 @@
+<template>
+  <el-dialog v-dialogDrag :class="className" :title="title" :visible.sync="show" width="350px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <el-row class="header">
+      <el-col :span="11"><span>设备:</span></el-col>
+      <el-col :span="11" :offset="2"><span>故障类型:</span></el-col>
+    </el-row>
+    <el-row>
+      <el-form ref="form" :model="form" :rules="rules">
+        <el-col :span="11">
+          <el-form-item>
+            <el-input v-model="deviceName" size="small" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="11" :offset="2">
+          <el-form-item prop="faultType">
+            <el-select v-model="form.faultType" size="small" style="height: 28px;" placeholder="请选择">
+              <el-option
+                v-for="item in faultList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
+
+export default {
+    name: 'SwitchControl',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operation: '',
+            stationName: '',
+            switchName: '',
+            activeShow: false,
+            deviceName: '',
+            faultList: [],
+            className: '',
+            form: { faultType: ''},
+            rules: {
+                faultType: [
+                    { required: true, message: '请选择故障类型', trigger: 'change'}
+                ]
+            }
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        title() {
+            if (this.operation === OperationEvent.Section.stoppage.menu.operation) {
+                return '设置故障';
+            } else if (this.operation === OperationEvent.Section.cancelStoppage.menu.operation) {
+                return '取消故障';
+            }
+            return '';
+        }
+    },
+    created() {
+        switch (this.$route.query.lineCode) {
+        case '02':
+        case '05':
+            this.className = 'fuzhou-01__systerm';
+            break;
+        case '03':
+            this.className = 'beijing-01__systerm';
+            break;
+        case '04':
+            this.className = 'chengdou-03__systerm';
+            break;
+        case '06':
+            this.className = 'ningbo-01__systerm';
+            break;
+        case '07':
+            this.className = 'haerbin-01__systerm';
+            break;
+        case '08':
+            this.className = 'foshan-01__systerm';
+            break;
+        case '09':
+            this.className = 'xian-02__system';
+            break;
+        case '10':
+        case '11':
+            this.className = 'xian-01__systerm';
+            break;
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            if (!this.dialogShow) {
+                this.switchName = '';
+                this.stationName = '';
+                this.operation = operate.operation;
+                this.cmdType = operate.cmdType;
+                this.deviceName = deviceType[selected._type] + '-' + selected.name;
+                this.faultList = deviceFaultType[selected._type];
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.form.faultType = '';
+            this.$refs.form.resetFields();
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.sendCommand();
+                }
+            });
+        },
+        sendCommand() { // 发送指令
+            this.loading = true;
+            const setp = {
+                over: true,
+                operation: this.operation,
+                cmdType: this.cmdType,
+                param: {
+                    faultType: this.form.faultType
+                }
+            };
+            this.$store.dispatch('training/nextNew', setp).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                } else {
+                    this.doClose();
+                    this.$messageBox('设置或取消故障操作失败！');
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.doClose();
+                this.$messageBox(error.message || '设置或取消故障操作失败！');
+            });
+        },
+
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/mapsystemNew/common/menus/trainAddPlan.vue b/src/views/newMap/mapsystemNew/common/menus/trainAddPlan.vue
new file mode 100644
index 000000000..c3f32f274
--- /dev/null
+++ b/src/views/newMap/mapsystemNew/common/menus/trainAddPlan.vue
@@ -0,0 +1,216 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="xian-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="340px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
+      <div style="width: 96%;">
+        <el-form-item label="车 次 号:" label-width="95px" prop="tripNumber">
+          <el-select v-model="addModel.tripNumber" filterable @change="tripNumberChange">
+            <el-option
+              v-for="tripNum in tripNumberList"
+              :key="tripNum"
+              :label="tripNum"
+              :value="tripNum"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="服 务 号:" label-width="95px" prop="serviceNumber">
+          <el-select v-model="addModel.serviceNumber" filterable>
+            <el-option
+              v-for="serviceNumber in serviceNumberList"
+              :key="serviceNumber"
+              :label="serviceNumber"
+              :value="serviceNumber"
+            />
+          </el-select>
+        </el-form-item>
+      </div>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { getTripNumberList, getServiceNumbersByTripNum } from '@/api/simulation';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import NoticeInfo from './noticeInfo';
+
+export default {
+    name: 'TrainAddPlan',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            trainNoList: [],
+            selected: null,
+            tripNumberList:  [],
+            serviceNumberList: [],
+            addModel: {
+                serviceNumber: '', // 服务号
+                tripNumber: '' // 车次号
+            },
+
+            rules: {
+                serviceNumber: [
+                    { required: true, message: '请输入服务号', trigger: 'blur' }
+                ],
+                tripNumber: [
+                    { required: true, message: '请输入车次号', trigger: 'change' }
+                ]
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'trainList',
+            'stationStandList',
+            'trainWindowSectionCode'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.createPlanTrain.menu.domId : '';
+        },
+        title() {
+            return '创建计划车';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        tripNumberChange(tripNumber) {
+            getServiceNumbersByTripNum(this.$route.query.group, tripNumber).then(resp => {
+                this.serviceNumberList = [];
+                if (typeof resp.data == 'string') {
+                    this.serviceNumberList.push(resp.data);
+                } else {
+                    resp.data.forEach(item => {
+                        if (!this.serviceNumberList.includes(item)) {
+                            this.serviceNumberList.push(item);
+                        }
+                    });
+                }
+                if (this.serviceNumberList.length === 1) {
+                    this.addModel.serviceNumber = this.serviceNumberList[0];
+                }
+            });
+        },
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            // if (!this.dialogShow) {
+
+            // }
+            this.addModel = {
+                tripNumber:'',
+                serviceNumber:''
+            };
+            getTripNumberList(this.$route.query.group).then(resp => {
+                this.tripNumberList = [];
+                resp.data.forEach(item => {
+                    if (!this.tripNumberList.includes(item)) {
+                        this.tripNumberList.push(item);
+                    }
+                });
+            }).catch(error => {
+                console.log(error);
+                // this.$messageBox(error.message);
+            });
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            // this.mouseCancelState(this.selected);
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        over: true,
+                        operation: OperationEvent.Train.createPlanTrain.menu.operation,
+                        cmdType: CMD.Section.CMD_Train_Init_Plan,
+                        param: {
+                            serviceNumber: this.addModel.serviceNumber, // 服务号
+                            tripNumber: this.addModel.tripNumber // 车次号
+                        }
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.$refs.noticeInfo.doShow();
+                        this.doClose();
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store
+                .dispatch('training/nextNew', operate)
+                .then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                })
+                .catch(() => {
+                    this.doClose();
+                });
+        }
+    }
+};
+</script>
+<style scoped>
+    .foshan-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>

From a471120ea0add69dc604e598618e26ec7c38392e Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 28 May 2020 10:16:13 +0800
Subject: [PATCH 80/85] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83=20?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/chat.js                               |  9 +++++
 src/views/newMap/jointTrainingNew/chatBox.vue | 23 +++----------
 .../newMap/jointTrainingNew/chatContent.vue   | 20 +++++------
 .../jointTrainingNew/chatCoversitionList.vue  |  5 ---
 .../jointTrainingNew/chatCreateGroup.vue      |  5 +++
 .../jointTrainingNew/chatMemberList.vue       | 33 ++++++++++---------
 6 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/src/api/chat.js b/src/api/chat.js
index f9d1220a2..06ec79b98 100644
--- a/src/api/chat.js
+++ b/src/api/chat.js
@@ -336,3 +336,12 @@ export function getSimulationContextListNew(group, conversationId) {
         method: 'get'
     });
 }
+
+// 获取仿真会话消息列表（新版地图）
+export function getSimulationChatMemberNew(group, conversationId) {
+    return request({
+        url: `/simulation/${group}/${conversationId}/members`,
+        method: 'get'
+    });
+}
+
diff --git a/src/views/newMap/jointTrainingNew/chatBox.vue b/src/views/newMap/jointTrainingNew/chatBox.vue
index cc7a33ed7..d1c1f8846 100644
--- a/src/views/newMap/jointTrainingNew/chatBox.vue
+++ b/src/views/newMap/jointTrainingNew/chatBox.vue
@@ -2,7 +2,7 @@
   <!-- v-quickMenuDrag  -->
   <div class="chatBox">
     <div v-show="!minimize" class="chat-box">
-      <chat-member-list ref="chatMemberList" :group="group" @addCoversition="addCoversition" />
+      <chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" @addCoversition="addCoversition" />
       <div class="chat-box-main">
         <chat-coversition-list ref="chatCoversitionList" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
         <div class="chat-window">
@@ -11,9 +11,6 @@
             <div class="minimality" @click="handleMinimality('min')">
               <i class="el-icon-remove" />
             </div>
-            <!-- <div v-show="currentCoversition.group==undefined?true:currentCoversition.group" class="showMembers" @click="handleMembers()">
-              <i class="el-icon-user-solid" />
-            </div> -->
             <div v-show="currentCoversition.all==undefined?true&&isShow:currentCoversition.all&&isShow" class="chat-createGroup" @click="handleCreateGroup()">
               <i class="el-icon-plus" style="font-weight: bolder;" />
             </div>
@@ -96,16 +93,6 @@ export default {
             return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE';
         }
     },
-    watch: {
-        '$store.state.socket.simulationRoleList': function (val) {
-            if (val && val.length) {
-                this.$nextTick(() => {
-                    this.$refs.chatMemberList.setMemberStatus(val);
-                    this.$refs.chatCoversitionList.setCoversitionStatus(val);
-                });
-            }
-        }
-    },
     mounted() {
         this.initPage();
     },
@@ -244,10 +231,6 @@ export default {
         handleSetting() {
             this.$refs.chatSetting.doShow();
         },
-        // handleMembers() {
-        //     this.$refs.chatSetting.doClose();
-        //     this.$refs.chatMemberList.doShow();
-        // },
         handleCreateGroup() {
             this.$refs.createGroup.doShow();
         }
@@ -278,6 +261,10 @@ export default {
   margin-left: 15px;
   display: inline-block;
   margin-top: 10px;
+  width: 70%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .chat-box-content{
     width: 100%;
diff --git a/src/views/newMap/jointTrainingNew/chatContent.vue b/src/views/newMap/jointTrainingNew/chatContent.vue
index ea4596f1a..78fae8f85 100644
--- a/src/views/newMap/jointTrainingNew/chatContent.vue
+++ b/src/views/newMap/jointTrainingNew/chatContent.vue
@@ -7,14 +7,14 @@
             <div v-if="chatContent.all&& !chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
             <div :class="chatContent.self?'userChatTime textRight':'userChatTime'">{{ formatTime(chatContent.chatTime) }}</div>
           </div>
-          <div class="userBubble" @click="playAudio('audio'+index)">
+          <div class="userBubble" @click="playAudio(baseUrl+chatContent.src)">
             <div class="userMessage">
               <span v-if="chatContent.all&&!chatContent.member.robot">@{{ covertName(chatContent.targetName) }}</span>
               <span class="el-icon-video-play playicon" />
               <span class="messageText">{{ chatContent.message }}</span>
-              <audio :id="'audio'+index" :src="baseUrl+chatContent.src" style="display:none" />
             </div>
           </div>
+          <audio id="audioPlay" style="display:none" />
         </div>
       </div>
     </div>
@@ -37,7 +37,6 @@ export default {
             coversition:{},
             currentAudioList:[],
             isPlay:false,
-            currentAudioIndex:0,
             baseUrl:process.env.VUE_APP_VOICE_API
         };
     },
@@ -51,7 +50,7 @@ export default {
             if (this.currentCoversition.id == val.id) {
                 this.chatContentList.push(simulationText);
                 if (simulationText.member.userId != this.$store.state.user.id) {
-                    this.currentAudioList.push(this.chatContentList.length - 1);
+                    this.currentAudioList.push(this.baseUrl + simulationText.src);
                     if (!this.isPlay) {
                         this.isPlay = true;
                         this.playAllAudio();
@@ -64,7 +63,7 @@ export default {
                     // this.$emit('addCoversition', {data:simulationText, headerTitle:''});
                     this.chatContentList.push(simulationText);
                     if (simulationText.member.userId != this.$store.state.user.id) {
-                        this.currentAudioList.push(this.chatContentList.length - 1);
+                        this.currentAudioList.push(this.baseUrl + simulationText.src);
                         if (!this.isPlay) {
                             this.isPlay = true;
                             this.playAllAudio();
@@ -120,7 +119,7 @@ export default {
             return /\d{2}:\d{2}:\d{2}/.exec(time)[0] || time;
         },
         playAllAudio() {
-            this.playEachAudio(this.currentAudioList[this.currentAudioIndex]);
+            // this.playEachAudio(this.currentAudioList[this.currentAudioIndex]);
         },
         playEachAudio(index) {
             this.$nextTick(function() {
@@ -129,8 +128,8 @@ export default {
                 document.querySelector('#audio' + index).onended = function() {
                     that.currentAudioList.shift();
                     if (that.currentAudioList.length > 0) {
-                        that.currentAudioIndex++;
-                        that.playEachAudio(that.currentAudioList[that.currentAudioIndex]);
+                        // that.currentAudioIndex++;
+                        // that.playEachAudio(that.currentAudioList[that.currentAudioIndex]);
                     } else {
                         that.isPlay = false;
                     }
@@ -159,8 +158,9 @@ export default {
                 return 'All';
             }
         },
-        playAudio(id) {
-            document.querySelector('#' + id).play();
+        playAudio(audioUrl) {
+            document.querySelector('#audioPlay').src = audioUrl;
+            document.querySelector('#audioPlay').play();
         }
         // reloadData(currentCoversition) {
         //     this.chatContentList = [];
diff --git a/src/views/newMap/jointTrainingNew/chatCoversitionList.vue b/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
index d3ddc2891..2b9ce115a 100644
--- a/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
+++ b/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
@@ -129,11 +129,6 @@ export default {
                 }
                 return {coversitionName:coversitionName, isOnline:isOnline};
             }
-        },
-        setCoversitionStatus(data) {
-            this.initPage(false);
-            this.$emit('setHeadTitle', !this.currentCoversition.isOnline ? this.currentCoversition.coverName + ' (离线)' : this.currentCoversition.coverName);
-            // this.changeCoversition(this.currentCoversition);
         }
     }
 };
diff --git a/src/views/newMap/jointTrainingNew/chatCreateGroup.vue b/src/views/newMap/jointTrainingNew/chatCreateGroup.vue
index a561b336c..68bcf6b89 100644
--- a/src/views/newMap/jointTrainingNew/chatCreateGroup.vue
+++ b/src/views/newMap/jointTrainingNew/chatCreateGroup.vue
@@ -101,6 +101,11 @@ export default {
                         this.dialogVisible = false;
                         this.checkList = [];
                     }
+                }).catch(error=>{
+                    this.$messageBox('创建会话失败: ' + error.messagfe);
+                    this.loading = false;
+                    this.dialogVisible = false;
+                    this.checkList = [];
                 });
             }
 
diff --git a/src/views/newMap/jointTrainingNew/chatMemberList.vue b/src/views/newMap/jointTrainingNew/chatMemberList.vue
index 150af4e94..26d148355 100644
--- a/src/views/newMap/jointTrainingNew/chatMemberList.vue
+++ b/src/views/newMap/jointTrainingNew/chatMemberList.vue
@@ -5,14 +5,16 @@
       <div
         v-for="member in memberList"
         :key="member.id"
-        :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'"
+        class="each-chat-member"
         :style="member.userId === userId ?'color:red':''"
       >{{ member.memberName }}</div>
+      <!-- :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'" -->
     </div>
   </div>
 </template>
 <script>
-import {getSimulationMembersNew} from '@/api/chat';
+// getSimulationMembersNew,
+import {getSimulationChatMemberNew} from '@/api/chat';
 import ConstConfig from '@/scripts/ConstConfig';
 import Cookies from 'js-cookie';
 export default {
@@ -21,6 +23,10 @@ export default {
         group: {
             type: String,
             required: true
+        },
+        currentCoversition:{
+            type: Object,
+            required: true
         }
     },
     data() {
@@ -34,24 +40,19 @@ export default {
             return this.$store.state.user.id;
         }
     },
+    watch:{
+        currentCoversition:function (val, old) {
+            if (val) {
+                this.getSimulationMembers();
+            }
+        }
+    },
     mounted() {
-        this.getSimulationMembers();
     },
     methods:{
-        setMemberStatus(memberInfo) {
-            this.getSimulationMembers();
-            // memberInfo.forEach(member=>{
-            //     if (this.coversitionList) {
-            //         this.coversitionList.forEach(item=>{
-            //             if (item.id == member.id) {
-            //                 item.online = member.online;
-            //             }
-            //         });
-            //     }
-            // });
-        },
         getSimulationMembers() {
-            getSimulationMembersNew(this.$route.query.group).then(resp => {
+            this.memberList = [];
+            getSimulationChatMemberNew(this.$route.query.group, this.currentCoversition.id).then(resp => {
                 let lastData = JSON.stringify(resp.data);
                 const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
                 roleTypeList.forEach(function(element) {

From 062cdc69dd7d493b55a83653af902112c5ab39e1 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 28 May 2020 10:35:16 +0800
Subject: [PATCH 81/85] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/jointTrainingNew/chatContent.vue    | 7 +++++--
 src/views/newMap/jointTrainingNew/chatMemberList.vue | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/newMap/jointTrainingNew/chatContent.vue b/src/views/newMap/jointTrainingNew/chatContent.vue
index 78fae8f85..a93c12598 100644
--- a/src/views/newMap/jointTrainingNew/chatContent.vue
+++ b/src/views/newMap/jointTrainingNew/chatContent.vue
@@ -4,12 +4,14 @@
       <div v-for="(chatContent,index) in chatContentList" :key="index" class="chatContentInClass">
         <div :class="chatContent.self?'rightUser':'leftUser'">
           <div class="userHeader">
-            <div v-if="chatContent.all&& !chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
+            <!-- chatContent.all&&  -->
+            <div v-if="!chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
             <div :class="chatContent.self?'userChatTime textRight':'userChatTime'">{{ formatTime(chatContent.chatTime) }}</div>
           </div>
           <div class="userBubble" @click="playAudio(baseUrl+chatContent.src)">
             <div class="userMessage">
-              <span v-if="chatContent.all&&!chatContent.member.robot">@{{ covertName(chatContent.targetName) }}</span>
+              <!-- chatContent.all&& -->
+              <span v-if="!chatContent.member.robot">@{{ covertName(chatContent.targetName) }}</span>
               <span class="el-icon-video-play playicon" />
               <span class="messageText">{{ chatContent.message }}</span>
             </div>
@@ -58,6 +60,7 @@ export default {
                 }
                 this.scrollTop();
             } else {
+                debugger;
                 if (!simulationText.all) {
                     this.$emit('changeCoversition', simulationText);
                     // this.$emit('addCoversition', {data:simulationText, headerTitle:''});
diff --git a/src/views/newMap/jointTrainingNew/chatMemberList.vue b/src/views/newMap/jointTrainingNew/chatMemberList.vue
index 26d148355..eb68d680a 100644
--- a/src/views/newMap/jointTrainingNew/chatMemberList.vue
+++ b/src/views/newMap/jointTrainingNew/chatMemberList.vue
@@ -7,6 +7,7 @@
         :key="member.id"
         class="each-chat-member"
         :style="member.userId === userId ?'color:red':''"
+        :title="member.memberName"
       >{{ member.memberName }}</div>
       <!-- :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'" -->
     </div>

From d301e9d9f4dd75a82f5727e92166aa52b1dbcebb Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 28 May 2020 11:27:53 +0800
Subject: [PATCH 82/85] =?UTF-8?q?=E6=95=B4=E7=90=86=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xian_01/menus/dialog/trainAddPlan.vue     | 227 ------------------
 .../theme/xian_01/menus/menuSection.vue       |  14 +-
 .../theme/xian_01/menus/menuSignal.vue        |   9 +-
 .../theme/xian_01/menus/menuStationStand.vue  |   9 +-
 .../theme/xian_01/menus/menuSwitch.vue        |   9 +-
 .../theme/xian_01/menus/utils/menuOperate.js  |   4 +-
 .../xian_02/menus/dialog/trainAddPlan.vue     | 212 ----------------
 .../theme/xian_02/menus/menuSection.vue       |  13 +-
 .../theme/xian_02/menus/menuSignal.vue        |   9 +-
 .../theme/xian_02/menus/menuSwitch.vue        |   9 +-
 src/jmapNew/theme/xian_02/menus/menuTrain.vue |   3 -
 .../theme/xian_02/menus/popStationStand.vue   |   9 +-
 .../theme/xian_02/menus/utils/menuOperate.js  |   4 +-
 src/scripts/cmdPlugin/OperationHandler.js     |  12 +
 src/store/modules/training.js                 |  19 +-
 .../newMap/mapsystemNew/common/commonMenu.vue |  37 ++-
 .../newMap/mapsystemNew/common/index.vue      |   5 +-
 .../mapsystemNew/common/menus/setFault.vue    |   4 +-
 .../common/menus/trainAddPlan.vue             |  33 ++-
 19 files changed, 131 insertions(+), 510 deletions(-)
 delete mode 100644 src/jmapNew/theme/xian_01/menus/dialog/trainAddPlan.vue
 delete mode 100644 src/jmapNew/theme/xian_02/menus/dialog/trainAddPlan.vue

diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainAddPlan.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainAddPlan.vue
deleted file mode 100644
index 8d9d21818..000000000
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainAddPlan.vue
+++ /dev/null
@@ -1,227 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="xian-01__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="340px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
-      <div style="width: 96%;">
-        <!--<el-form-item label="车 组 号:" label-width="95px" prop="trainCode">-->
-        <!--<el-select v-model="addModel.trainCode" filterable>-->
-        <!--<el-option-->
-        <!--v-for="train in trainList"-->
-        <!--:key="train.groupNumber"-->
-        <!--:label="train.groupNumber"-->
-        <!--:value="train.code"-->
-        <!--/>-->
-        <!--</el-select>-->
-        <!--</el-form-item>-->
-        <el-form-item label="车 次 号:" label-width="95px" prop="tripNumber">
-          <el-select v-model="addModel.tripNumber" filterable @change="tripNumberChange">
-            <el-option
-              v-for="tripNum in tripNumberList"
-              :key="tripNum"
-              :label="tripNum"
-              :value="tripNum"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="服 务 号:" label-width="95px" prop="serviceNumber">
-          <el-select v-model="addModel.serviceNumber" filterable>
-            <el-option
-              v-for="serviceNumber in serviceNumberList"
-              :key="serviceNumber"
-              :label="serviceNumber"
-              :value="serviceNumber"
-            />
-          </el-select>
-        </el-form-item>
-      </div>
-    </el-form>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import { getTripNumberList, getServiceNumbersByTripNum } from '@/api/simulation';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    // name: 'TrainMove',
-    name: 'TrainAddPlan',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            trainNoList: [],
-            selected: null,
-            tripNumberList:  [],
-            serviceNumberList: [],
-            addModel: {
-                serviceNumber: '', // 服务号
-                tripNumber: '' // 车次号
-            },
-
-            rules: {
-                serviceNumber: [
-                    { required: true, message: '请输入服务号', trigger: 'blur' }
-                ],
-                tripNumber: [
-                    { required: true, message: '请输入车次号', trigger: 'change' }
-                ]
-            },
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'trainList',
-            'stationStandList',
-            'trainWindowSectionCode'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Train.createPlanTrain.menu.domId : '';
-        },
-        title() {
-            return '创建计划车';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        tripNumberChange(tripNumber) {
-            getServiceNumbersByTripNum(this.$route.query.group, tripNumber).then(resp => {
-                this.serviceNumberList = [];
-                if (typeof resp.data == 'string') {
-                    this.serviceNumberList.push(resp.data);
-                } else {
-                    resp.data.forEach(item => {
-                        if (!this.serviceNumberList.includes(item)) {
-                            this.serviceNumberList.push(item);
-                        }
-                    });
-                }
-                if (this.serviceNumberList.length === 1) {
-                    this.addModel.serviceNumber = this.serviceNumberList[0];
-                }
-            });
-        },
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            // if (!this.dialogShow) {
-
-            // }
-            this.addModel = {
-                tripNumber:'',
-                serviceNumber:''
-            };
-            getTripNumberList(this.$route.query.group).then(resp => {
-                this.tripNumberList = [];
-                resp.data.forEach(item => {
-                    if (!this.tripNumberList.includes(item)) {
-                        this.tripNumberList.push(item);
-                    }
-                });
-            }).catch(error => {
-                console.log(error);
-                // this.$messageBox(error.message);
-            });
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            // this.mouseCancelState(this.selected);
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        over: true,
-                        operation: OperationEvent.Train.createPlanTrain.menu.operation,
-                        cmdType: CMD.Section.CMD_Train_Init_Plan,
-                        param: {
-                            serviceNumber: this.addModel.serviceNumber, // 服务号
-                            tripNumber: this.addModel.tripNumber // 车次号
-                        }
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                        }
-                    }).catch(() => {
-                        this.loading = false;
-                        this.$refs.noticeInfo.doShow();
-                        this.doClose();
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store
-                .dispatch('training/nextNew', operate)
-                .then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                })
-                .catch(() => {
-                    this.doClose();
-                });
-        }
-    }
-};
-</script>
-<style scoped>
-    .foshan-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuSection.vue b/src/jmapNew/theme/xian_01/menus/menuSection.vue
index 778ff14f8..dedd28ab0 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSection.vue
@@ -5,8 +5,6 @@
     <section-cmd-control ref="sectionCmdControl" />
     <speed-cmd-control ref="speedCmdControl" />
     <notice-info ref="noticeInfo" />
-    <set-fault ref="setFault" />
-    <train-add-plan ref="trainAddPlan" />
   </div>
 </template>
 
@@ -21,9 +19,7 @@ import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from './utils/menuOperate';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import TrainAddPlan from './dialog/trainAddPlan';
 
 export default {
     name: 'SectionMenu',
@@ -32,9 +28,7 @@ export default {
         SectionControl,
         SectionCmdControl,
         SpeedCmdControl,
-        NoticeInfo,
-        SetFault,
-        TrainAddPlan
+        NoticeInfo
     },
     props: {
         selected: {
@@ -199,7 +193,7 @@ export default {
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainAddPlan.doShow(step, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', step);
                 }
             });
         },
@@ -207,7 +201,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -215,7 +209,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
index ed06cac66..b9cf196a7 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
@@ -8,7 +8,6 @@
     <route-hand-control ref="routeHandControl" />
     <route-detail ref="routeDetail" />
     <notice-info ref="noticeInfo" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -26,7 +25,6 @@ import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import { menuOperate, commitOperate } from './utils/menuOperate';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 
 export default {
     name: 'SignalMenu',
@@ -38,8 +36,7 @@ export default {
         RouteCmdControl,
         RouteHandControl,
         RouteDetail,
-        NoticeInfo,
-        SetFault
+        NoticeInfo
     },
     props: {
         selected: {
@@ -231,7 +228,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -239,7 +236,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
index 56fc78fef..92383cc75 100644
--- a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
@@ -8,7 +8,6 @@
     <stand-detain-train-all ref="standDetainTrainAll" />
     <notice-info ref="noticeInfo" />
     <stand-back-strategy ref="standBackStrategy" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -27,7 +26,6 @@ import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from './utils/menuOperate';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 
 export default {
     name: 'StationStandMenu',
@@ -39,8 +37,7 @@ export default {
         NoticeInfo,
         StandBackStrategy,
         StandStopTime,
-        StandDetainTrainAll,
-        SetFault
+        StandDetainTrainAll
     },
     props: {
         selected: {
@@ -196,7 +193,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -204,7 +201,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
index 373759158..767b37f07 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
@@ -5,7 +5,6 @@
     <switch-cmd-control ref="switchCmdControl" />
     <speed-cmd-control ref="speedCmdControl" />
     <notice-info ref="noticeInfo" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -20,7 +19,6 @@ import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from './utils/menuOperate';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 
 export default {
     name: 'SwitchMenu',
@@ -29,8 +27,7 @@ export default {
         SwitchControl,
         SwitchCmdControl,
         SpeedCmdControl,
-        NoticeInfo,
-        SetFault
+        NoticeInfo
     },
     props: {
         selected: {
@@ -220,7 +217,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -228,7 +225,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js b/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js
index 8fbceaea2..c084d1998 100644
--- a/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js
+++ b/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js
@@ -276,11 +276,11 @@ export const menuOperate = {
     },
     Common: {
         setFault: {
-            operation: OperationEvent.Section.stoppage.menu.operation,
+            operation: OperationEvent.MixinCommand.stoppage.menu.operation,
             cmdType: CMD.Fault.CMD_SET_FAULT
         },
         cancelFault: {
-            operation: OperationEvent.Section.cancelStoppage.menu.operation,
+            operation: OperationEvent.MixinCommand.cancelStoppage.menu.operation,
             cmdType: CMD.Fault.CMD_CANCEL_FAULT
         }
     }
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainAddPlan.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainAddPlan.vue
deleted file mode 100644
index 6c4c3fca4..000000000
--- a/src/jmapNew/theme/xian_02/menus/dialog/trainAddPlan.vue
+++ /dev/null
@@ -1,212 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="xian-02__system stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="340px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
-      <div style="width: 96%;">
-        <el-form-item label="车 次 号:" label-width="95px" prop="tripNumber">
-          <el-select v-model="addModel.tripNumber" filterable @change="tripNumberChange">
-            <el-option
-              v-for="tripNum in tripNumberList"
-              :key="tripNum"
-              :label="tripNum"
-              :value="tripNum"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="服 务 号:" label-width="95px" prop="serviceNumber">
-          <el-select v-model="addModel.serviceNumber" filterable>
-            <el-option
-              v-for="serviceNumber in serviceNumberList"
-              :key="serviceNumber"
-              :label="serviceNumber"
-              :value="serviceNumber"
-            />
-          </el-select>
-        </el-form-item>
-      </div>
-    </el-form>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import { getTripNumberList, getServiceNumbersByTripNum } from '@/api/simulation';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-
-export default {
-    // name: 'TrainMove',
-    name: 'TrainAddPlan',
-    components: {
-    },
-    data() {
-        return {
-            trainNoList: [],
-            selected: null,
-            tripNumberList:  [],
-            serviceNumberList: [],
-            addModel: {
-                serviceNumber: '', // 服务号
-                tripNumber: '' // 车次号
-            },
-
-            rules: {
-                serviceNumber: [
-                    { required: true, message: '请输入服务号', trigger: 'blur' }
-                ],
-                tripNumber: [
-                    { required: true, message: '请输入车次号', trigger: 'change' }
-                ]
-            },
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'trainList',
-            'stationStandList',
-            'trainWindowSectionCode'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Train.createPlanTrain.menu.domId : '';
-        },
-        title() {
-            return '创建计划车';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        tripNumberChange(tripNumber) {
-            getServiceNumbersByTripNum(this.$route.query.group, tripNumber).then(resp => {
-                this.serviceNumberList = [];
-                if (typeof resp.data == 'string') {
-                    this.serviceNumberList.push(resp.data);
-                } else {
-                    resp.data.forEach(item => {
-                        if (!this.serviceNumberList.includes(item)) {
-                            this.serviceNumberList.push(item);
-                        }
-                    });
-                }
-                if (this.serviceNumberList.length === 1) {
-                    this.addModel.serviceNumber = this.serviceNumberList[0];
-                }
-            });
-        },
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            // if (!this.dialogShow) {
-
-            // }
-            this.addModel = {
-                tripNumber:'',
-                serviceNumber:''
-            };
-            getTripNumberList(this.$route.query.group).then(resp => {
-                this.tripNumberList = [];
-                resp.data.forEach(item => {
-                    if (!this.tripNumberList.includes(item)) {
-                        this.tripNumberList.push(item);
-                    }
-                });
-            }).catch(error => {
-                console.log(error);
-                // this.$messageBox(error.message);
-            });
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            // this.mouseCancelState(this.selected);
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        over: true,
-                        operation: OperationEvent.Train.createPlanTrain.menu.operation,
-                        cmdType: CMD.Section.CMD_Train_Init_Plan,
-                        param: {
-                            serviceNumber: this.addModel.serviceNumber, // 服务号
-                            tripNumber: this.addModel.tripNumber // 车次号
-                        }
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                        }
-                    }).catch(() => {
-                        this.loading = false;
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store
-                .dispatch('training/nextNew', operate)
-                .then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                })
-                .catch(() => {
-                    this.doClose();
-                });
-        }
-    }
-};
-</script>
-<style scoped>
-    .xian-02__system .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue
index db33f9363..8ab55f8c0 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue
@@ -6,8 +6,6 @@
     <speed-limit-control ref="speedLimitControl" />
     <alxe-effective ref="alxeEffective" />
     <notice-info ref="noticeInfo" />
-    <train-add-plan ref="trainAddPlan" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -24,8 +22,6 @@ import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 // import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from './utils/menuOperate';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
-import TrainAddPlan from './dialog/trainAddPlan';
 
 export default {
     name: 'SectionMenu',
@@ -36,8 +32,6 @@ export default {
         SpeedLimitControl,
         AlxeEffective,
         NoticeInfo,
-        SetFault,
-        TrainAddPlan
     },
     props: {
         selected: {
@@ -205,7 +199,8 @@ export default {
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainAddPlan.doShow(step, this.selected);
+                    // this.$refs.trainAddPlan.doShow(step, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', step);
                 }
             });
         },
@@ -213,7 +208,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -221,7 +216,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
index 7ed66994a..d769bb877 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@@ -9,7 +9,6 @@
     <route-detail ref="routeDetail" />
     <router-command ref="routerCommand" />
     <notice-info ref="noticeInfo" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -29,7 +28,6 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 
 export default {
     name: 'SignalMenu',
@@ -42,8 +40,7 @@ export default {
         RouteHandControl,
         RouteDetail,
         RouterCommand,
-        NoticeInfo,
-        SetFault
+        NoticeInfo
     },
     props: {
         selected: {
@@ -268,7 +265,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -276,7 +273,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
index 62efcc86f..f785dda55 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
@@ -6,7 +6,6 @@
     <speed-limit-control ref="speedLimitControl" />
     <alxe-effective ref="alxeEffective" />
     <notice-info ref="noticeInfo" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -24,7 +23,6 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from './utils/menuOperate';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 
 export default {
     name: 'SwitchMenu',
@@ -34,8 +32,7 @@ export default {
         SwitchUnLock,
         SpeedLimitControl,
         AlxeEffective,
-        NoticeInfo,
-        SetFault
+        NoticeInfo
     },
     props: {
         selected: {
@@ -245,7 +242,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -253,7 +250,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
index 761bdd473..91736ebf8 100644
--- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
@@ -6,7 +6,6 @@
     <train-define ref="trainDefine" />
     <train-move ref="trainMove" />
     <train-set-plan ref="trainSetPlan" />
-    <train-add-plan ref="trainAddPlan" />
     <train-set-head ref="trainSetHead" />
     <train-set-work ref="trainSetWork" />
     <trainSetWorkATP ref="trainSetWorkATP" />
@@ -22,7 +21,6 @@ import TrainDelete from './dialog/trainDelete';
 import TrainDefine from './dialog/trainDefine';
 import TrainMove from './dialog/trainMove';
 import TrainSetPlan from './dialog/trainSetPlan';
-import TrainAddPlan from './dialog/trainAddPlan';
 import TrainSetHead from './dialog/trainSetHead';
 import TrainSetWork from './dialog/trainSetWork';
 import trainSetWorkATP from './dialog/trainSetWorkATP';
@@ -43,7 +41,6 @@ export default {
         TrainDefine,
         TrainMove,
         TrainSetPlan,
-        TrainAddPlan,
         TrainSetHead,
         TrainSetWork,
         trainSetWorkATP,
diff --git a/src/jmapNew/theme/xian_02/menus/popStationStand.vue b/src/jmapNew/theme/xian_02/menus/popStationStand.vue
index ab4b09b25..e89137065 100644
--- a/src/jmapNew/theme/xian_02/menus/popStationStand.vue
+++ b/src/jmapNew/theme/xian_02/menus/popStationStand.vue
@@ -5,7 +5,6 @@
     <update-stand-plan ref="updateStandPlan" :selected="selected" />
     <warning-confirm ref="warningConfirm" :selected="selected" />
     <stop-profile ref="stopProfile" :selected="selected" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -19,7 +18,6 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 import {menuOperate, commitOperate} from './utils/menuOperate';
 
 export default {
@@ -29,8 +27,7 @@ export default {
         NoticeInfo,
         UpdateStandPlan,
         WarningConfirm,
-        StopProfile,
-        SetFault
+        StopProfile
     },
     props: {
         selected: {
@@ -282,7 +279,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -290,7 +287,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_02/menus/utils/menuOperate.js b/src/jmapNew/theme/xian_02/menus/utils/menuOperate.js
index 929324f24..ce474fd46 100644
--- a/src/jmapNew/theme/xian_02/menus/utils/menuOperate.js
+++ b/src/jmapNew/theme/xian_02/menus/utils/menuOperate.js
@@ -260,11 +260,11 @@ export const menuOperate = {
     },
     Common: {
         setFault: {
-            operation: OperationEvent.Section.stoppage.menu.operation,
+            operation: OperationEvent.MixinCommand.stoppage.menu.operation,
             cmdType: CMD.Fault.CMD_SET_FAULT
         },
         cancelFault: {
-            operation: OperationEvent.Section.cancelStoppage.menu.operation,
+            operation: OperationEvent.MixinCommand.cancelStoppage.menu.operation,
             cmdType: CMD.Fault.CMD_CANCEL_FAULT
         }
     }
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 69bedb83b..1cb6c3ca6 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -2079,6 +2079,18 @@ export const OperationEvent = {
                 operation: '2994',
                 domId: '_Tips-TotalCancel-Button{TOP}'
             }
+        },
+        // 取消故障
+        cancelStoppage: {
+            menu: {
+                operation: '2995'
+            }
+        },
+        // 道岔故障
+        stoppage: {
+            menu: {
+                operation: '2996'
+            }
         }
     }
 
diff --git a/src/store/modules/training.js b/src/store/modules/training.js
index f335e1a1d..86b1e400f 100644
--- a/src/store/modules/training.js
+++ b/src/store/modules/training.js
@@ -35,7 +35,9 @@ const training = {
         prdType: '', 				// 产品类型
         roles: '', 					// 角色权限类型
         group: '',					// 设置全局 group
-        centerStationCode:'' // 当前居中的集中站code
+        centerStationCode:'', // 当前居中的集中站code
+        commonMenuCount: 0,			// 公共菜单计数
+        commonMenuStep: null		// 公共菜单步骤
     },
 
     getters: {
@@ -92,6 +94,12 @@ const training = {
             });
 
             return trainList;
+        },
+        commonMenuCount: (state) => {
+            return state.commonMenuCount;
+        },
+        commonMenuStep: (state) => {
+            return state.commonMenuStep;
         }
     },
 
@@ -209,6 +217,10 @@ const training = {
         },
         setCenterStationCode:(state, centerStationCode) => {
             state.centerStationCode = centerStationCode;
+        },
+        setCommonMenuStep: (state, commonMenuStep) => {
+            state.commonMenuStep = commonMenuStep;
+            state.commonMenuCount++;
         }
     },
 
@@ -611,6 +623,11 @@ const training = {
         /** 设置当前居中的集中站code */
         setCenterStationCode:({ commit }, centerStationCode) => {
             commit('setCenterStationCode', centerStationCode);
+        },
+
+        /** 公共菜单操作 */
+        setCommonMenuStep:({ commit }, commonMenuStep) => {
+            commit('setCommonMenuStep', commonMenuStep);
         }
     }
 };
diff --git a/src/views/newMap/mapsystemNew/common/commonMenu.vue b/src/views/newMap/mapsystemNew/common/commonMenu.vue
index ef822fdef..f10404952 100644
--- a/src/views/newMap/mapsystemNew/common/commonMenu.vue
+++ b/src/views/newMap/mapsystemNew/common/commonMenu.vue
@@ -1,19 +1,48 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
     <set-fault ref="setFault" />
+    <train-add-plan ref="trainAddPlan" />
   </div>
 </template>
 
 <script>
 import SetFault from './menus/setFault';
+import TrainAddPlan from './menus/trainAddPlan';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
 export default {
     name: 'CommonMenu',
     components: {
-        SetFault
+        SetFault,
+        TrainAddPlan
     },
-    props: {},
-    computed: {},
-    watch: {}
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {
+        '$store.state.training.commonMenuCount': function (val) {
+            const operate = this.$store.state.training.commonMenuStep || {};
+            switch (operate.operation) {
+            case OperationEvent.MixinCommand.stoppage.menu.operation:
+            case OperationEvent.MixinCommand.cancelStoppage.menu.operation:
+                this.$refs.setFault.doShow(operate, this.selected);
+                break;
+            case OperationEvent.Train.createPlanTrain.menu.operation:
+                this.$refs.trainAddPlan.doShow(operate, this.selected);
+                break;
+            }
+        }
+    }
 };
 </script>
 
diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue
index ccbba871a..0c55fe6b1 100644
--- a/src/views/newMap/mapsystemNew/common/index.vue
+++ b/src/views/newMap/mapsystemNew/common/index.vue
@@ -3,6 +3,7 @@
     <training-tips ref="trainingTips" />
     <component :is="menus" :selected="selected" />
     <jlmap-visual ref="jlmapVisual" @onSelect="clickEvent" @onMenu="contextmenu" />
+    <common-menu ref="commonMenu" :selected="selected" />
   </div>
 </template>
 
@@ -13,12 +14,14 @@ import { getDeviceMenuByDeviceType, OperationEvent } from '@/scripts/ConstDic';
 import deviceType from '@/jmap/constant/deviceType';
 import JlmapVisual from '@/views/newMap/jlmapNew/index';
 import TrainingTips from '@/views/newMap/mapsystemNew/plugin/trainingtip';
+import CommonMenu from './commonMenu';
 
 export default {
     name: 'LessonCanvas',
     components: {
         JlmapVisual,
-        TrainingTips
+        TrainingTips,
+        CommonMenu
     },
     data() {
         return {
diff --git a/src/views/newMap/mapsystemNew/common/menus/setFault.vue b/src/views/newMap/mapsystemNew/common/menus/setFault.vue
index a26fa68f1..cf848894f 100644
--- a/src/views/newMap/mapsystemNew/common/menus/setFault.vue
+++ b/src/views/newMap/mapsystemNew/common/menus/setFault.vue
@@ -73,9 +73,9 @@ export default {
             return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
         },
         title() {
-            if (this.operation === OperationEvent.Section.stoppage.menu.operation) {
+            if (this.operation === OperationEvent.MixinCommand.stoppage.menu.operation) {
                 return '设置故障';
-            } else if (this.operation === OperationEvent.Section.cancelStoppage.menu.operation) {
+            } else if (this.operation === OperationEvent.MixinCommand.cancelStoppage.menu.operation) {
                 return '取消故障';
             }
             return '';
diff --git a/src/views/newMap/mapsystemNew/common/menus/trainAddPlan.vue b/src/views/newMap/mapsystemNew/common/menus/trainAddPlan.vue
index c3f32f274..d30bee7e2 100644
--- a/src/views/newMap/mapsystemNew/common/menus/trainAddPlan.vue
+++ b/src/views/newMap/mapsystemNew/common/menus/trainAddPlan.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="xian-01__systerm stand-stop-time"
+    :class="className"
     :title="title"
     :visible.sync="show"
     width="340px"
@@ -64,6 +64,7 @@ export default {
             selected: null,
             tripNumberList:  [],
             serviceNumberList: [],
+            className: '',
             addModel: {
                 serviceNumber: '', // 服务号
                 tripNumber: '' // 车次号
@@ -100,6 +101,36 @@ export default {
             return '创建计划车';
         }
     },
+    created() {
+        switch (this.$route.query.lineCode) {
+        case '02':
+        case '05':
+            this.className = 'fuzhou-01__systerm stand-stop-time';
+            break;
+        case '03':
+            this.className = 'beijing-01__systerm stand-stop-time';
+            break;
+        case '04':
+            this.className = 'chengdou-03__systerm stand-stop-time';
+            break;
+        case '06':
+            this.className = 'ningbo-01__systerm stand-stop-time';
+            break;
+        case '07':
+            this.className = 'haerbin-01__systerm stand-stop-time';
+            break;
+        case '08':
+            this.className = 'foshan-01__systerm stand-stop-time';
+            break;
+        case '09':
+            this.className = 'xian-02__system stand-stop-time';
+            break;
+        case '10':
+        case '11':
+            this.className = 'xian-01__systerm stand-stop-time';
+            break;
+        }
+    },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');

From 27981666b18bff8e95ff9add4f23535e23f23690 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 28 May 2020 13:21:51 +0800
Subject: [PATCH 83/85] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/displayNew/chatView/chatBox.vue    |  51 ++--
 .../displayNew/chatView/chatContent.vue       |   6 +-
 .../chatView/chatCoversitionList.vue          |  31 ++-
 .../displayNew/chatView/chatCreateGroup.vue   | 224 ++++++++++++++++++
 .../displayNew/chatView/chatMemberList.vue    |  60 ++---
 src/views/newMap/displayNew/index.vue         |  12 +
 src/views/newMap/displayNew/menuDemon.vue     |   6 +-
 .../newMap/jointTrainingNew/chatContent.vue   |  14 +-
 .../jointTrainingNew/chatCoversitionList.vue  |   2 +-
 9 files changed, 327 insertions(+), 79 deletions(-)
 create mode 100644 src/views/newMap/displayNew/chatView/chatCreateGroup.vue

diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue
index 64278f6be..c0221b57c 100644
--- a/src/views/newMap/displayNew/chatView/chatBox.vue
+++ b/src/views/newMap/displayNew/chatView/chatBox.vue
@@ -2,7 +2,7 @@
   <!-- v-quickMenuDrag  -->
   <div class="chatBox">
     <div v-if="!minimize" class="chat-box">
-      <chat-member-list ref="chatMemberList" :group="group" @addCoversition="addCoversition" />
+      <chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" @addCoversition="addCoversition" />
       <div class="chat-box-main">
         <chat-coversition-list ref="chatCoversitionList" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
         <div class="chat-window">
@@ -11,8 +11,8 @@
             <div class="minimality" @click="handleMinimality('min')">
               <i class="el-icon-remove" />
             </div>
-            <div v-show="currentCoversition.group==undefined?true:currentCoversition.group" class="showMembers" @click="handleMembers()">
-              <i class="el-icon-user-solid" />
+            <div v-show="currentCoversition.all==undefined?true&&isShow:currentCoversition.all&&isShow" class="chat-createGroup" @click="handleCreateGroup()">
+              <i class="el-icon-plus" style="font-weight: bolder;" />
             </div>
             <div class="chat-setting" @click="handleSetting()">
               <i class="el-icon-s-tools" />
@@ -43,12 +43,14 @@
       </div>
     </div>
     <chat-setting ref="chatSetting" :form="form" @setSetting="setSetting" />
+    <chat-create-group ref="createGroup" :group="group" @addCoversition="addCoversition" />
   </div>
 </template>
 <script>
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import ChatSetting from './chatSetting';
 import ChatContent from './chatContent';
+import ChatCreateGroup from './chatCreateGroup';
 import ChatMemberList from './chatMemberList';
 import ChatCoversitionList from './chatCoversitionList';
 import RecordRTC from 'recordrtc';
@@ -59,12 +61,17 @@ export default {
         ChatSetting,
         ChatContent,
         ChatMemberList,
-        ChatCoversitionList
+        ChatCoversitionList,
+        ChatCreateGroup
     },
     props: {
         group: {
             type: String,
             required: true
+        },
+        userRole: {
+            type: String,
+            required: true
         }
     },
     data() {
@@ -84,15 +91,12 @@ export default {
             headerTitle:''
         };
     },
+    computed:{
+        isShow() {
+            return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE';
+        }
+    },
     watch: {
-        '$store.state.socket.simulationRoleList': function (val) {
-            if (val && val.length) {
-                this.$nextTick(() => {
-                    this.$refs.chatMemberList && this.$refs.chatMemberList.setMemberStatus(val);
-                    this.$refs.chatCoversitionList && this.$refs.chatCoversitionList.setCoversitionStatus(val);
-                });
-            }
-        },
         '$store.state.socket.simulationScriptTip':function(val, old) {
             if (val) {
                 if (val.type == 'Conversation') {
@@ -134,7 +138,7 @@ export default {
         },
         setCurrentCoversition(coversition) {
             this.currentCoversition = coversition;
-            if (coversition.group) {
+            if (coversition.all) {
                 this.headerTitle = coversition.name;
             }
             if (this.recordSending) {
@@ -147,7 +151,7 @@ export default {
         },
         addCoversition({data, headerTitle}) {
             this.$refs.chatCoversitionList.addCoversition(data, headerTitle);
-            this.currentCoversition = {id:data.id, group:data.group};
+            this.currentCoversition = {id:data.id, all:data.all};
             this.headerTitle = headerTitle;
         },
         changeCoversition(data) {
@@ -259,12 +263,11 @@ export default {
                 }
             });
         },
+        handleCreateGroup() {
+            this.$refs.createGroup.doShow();
+        },
         handleSetting() {
             this.$refs.chatSetting.doShow();
-        },
-        handleMembers() {
-            this.$refs.chatSetting.doClose();
-            this.$refs.chatMemberList.doShow();
         }
     }
 };
@@ -293,6 +296,10 @@ export default {
   margin-left: 15px;
   display: inline-block;
   margin-top: 10px;
+  width: 70%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .chat-box-content{
     width: 100%;
@@ -312,6 +319,14 @@ export default {
     display: inline-block;
     width: 400px;
 }
+.chat-createGroup{
+    float: right;
+    line-height: 40px;
+    margin-right: 10px;
+    cursor: pointer;
+    font-size: 16px;
+    position: relative;
+}
 .chat-setting{
     float: right;
     line-height: 40px;
diff --git a/src/views/newMap/displayNew/chatView/chatContent.vue b/src/views/newMap/displayNew/chatView/chatContent.vue
index 3a94a2e08..ff89831a5 100644
--- a/src/views/newMap/displayNew/chatView/chatContent.vue
+++ b/src/views/newMap/displayNew/chatView/chatContent.vue
@@ -4,13 +4,13 @@
       <div v-for="(chatContent,index) in chatContentList" :key="index" class="chatContentInClass">
         <div :class="chatContent.self?'rightUser':'leftUser'">
           <div class="userHeader">
-            <div v-if="chatContent.group&& !chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
+            <div v-if="chatContent.all&& !chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
             <div :class="chatContent.self?'userChatTime textRight':'userChatTime'">{{ formatTime(chatContent.chatTime) }}</div>
           </div>
           <div class="userBubble" @click="playAudio('audio'+index)">
             <div class="userMessage">
               <!-- &&!(chatContent.self) -->
-              <span v-if="chatContent.group">@{{ covertName(chatContent.targetName) }}</span>
+              <span v-if="chatContent.all">@{{ covertName(chatContent.targetName) }}</span>
               <span class="el-icon-video-play playicon" />
               <span class="messageText">{{ chatContent.message }}</span>
               <audio :id="'audio'+index" :src="baseUrl+chatContent.src" style="display:none" />
@@ -46,7 +46,7 @@ export default {
                 this.chatContentList.push(simulationText);
                 this.scrollTop();
             } else {
-                if (!simulationText.group) {
+                if (!simulationText.all) {
                     this.$emit('changeCoversition', simulationText);
                     // this.$emit('addCoversition', {data:simulationText, headerTitle:''});
                     this.chatContentList.push(simulationText);
diff --git a/src/views/newMap/displayNew/chatView/chatCoversitionList.vue b/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
index c5512932c..f1a4a4b03 100644
--- a/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
+++ b/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
@@ -32,9 +32,14 @@ export default {
                 if (resp.data) {
                     const data = resp.data;
                     data.map(coversition=>{
-                        const objectCover = this.handleMemberName(coversition);
-                        coversition.coverName = objectCover.coversitionName;
-                        coversition.isOnline = objectCover.isOnline;
+                        if (coversition.name) {
+                            coversition.coverName = coversition.name;
+                            coversition.isOnline = true;
+                        } else {
+                            const objectCover = this.handleMemberName(coversition);
+                            coversition.coverName = objectCover.coversitionName;
+                            coversition.isOnline = objectCover.isOnline;
+                        }
                         return coversition;
                     });
                     this.coversitionList = data;
@@ -49,8 +54,13 @@ export default {
             const index = this.coversitionList.findIndex(item=>{ return item.id == data.id; });
             if (index < 0) {
                 const objectCover = this.handleMemberName(data);
-                data.coverName = objectCover.coversitionName;
-                data.isOnline = objectCover.isOnline;
+                if (data.name) {
+                    data.coverName = data.name;
+                    data.isOnline = true;
+                } else {
+                    data.coverName = objectCover.coversitionName;
+                    data.isOnline = objectCover.isOnline;
+                }
                 this.coversitionList.push(data);
                 if (headerTitle) {
                     this.currentCoversition = data;
@@ -58,8 +68,8 @@ export default {
             }
         },
         changeCoversition(coversition) {
-            this.$emit('setHeadTitle', !coversition.isOnline ? coversition.coverName + ' (离线)' : coversition.coverName);
-            this.currentCoversition = {id:coversition.id, group:coversition.group};
+            this.$emit('setHeadTitle', coversition.coverName);
+            this.currentCoversition = {id:coversition.id, all:coversition.all};
             this.$emit('setCurrentCoversition', coversition);
             // this.$refs.chatContent.reloadData(this.currentCoversition);
         },
@@ -74,7 +84,7 @@ export default {
             this.changeCoversition(coversition);
         },
         handleMemberName(conversition) {
-            if (conversition.group) {
+            if (conversition.all) {
                 return {coversitionName:conversition.name, isOnline:true};
             } else {
                 let coversitionName = '';
@@ -119,11 +129,6 @@ export default {
                 }
                 return {coversitionName:coversitionName, isOnline:isOnline};
             }
-        },
-        setCoversitionStatus(data) {
-            this.initPage(false);
-            this.$emit('setHeadTitle', !this.currentCoversition.isOnline ? this.currentCoversition.coverName + ' (离线)' : this.currentCoversition.coverName);
-            // this.changeCoversition(this.currentCoversition);
         }
     }
 };
diff --git a/src/views/newMap/displayNew/chatView/chatCreateGroup.vue b/src/views/newMap/displayNew/chatView/chatCreateGroup.vue
new file mode 100644
index 000000000..68bcf6b89
--- /dev/null
+++ b/src/views/newMap/displayNew/chatView/chatCreateGroup.vue
@@ -0,0 +1,224 @@
+<template>
+  <div v-show="dialogVisible" class="chat-create-group">
+    <div class="create-group-header">
+      <div class="create-group-title">添加会话对象</div>
+      <div class="create-group-close">
+        <i class="el-icon-close" @click="dialogVisible=false" />
+      </div>
+    </div>
+    <div class="create-group-content">
+      <div class="chat-member-list">
+        <el-checkbox-group v-model="checkList">
+          <el-checkbox
+            v-for="member in memberList"
+            :key="member.id"
+            class="each-chat-member"
+            :label="member"
+            :disabled="member.userId === userId"
+          >{{ member.memberName }}</el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="currentSelectList">
+        <div
+          v-for="member in checkList"
+          :key="member.id"
+          class="eachSelect"
+        >
+          {{ member.memberName }}
+        </div>
+
+      </div>
+      <!-- :style="member.userId === userId ?'color:red':''" -->
+    </div>
+    <div class="create-group-bottom">
+      <el-button :loading="loading" size="small" type="primary" @click="doCreate">创建会话</el-button>
+      <el-button size="small" @click="doClose">取消</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import {getSimulationMembersNew, getSimulationConversationIdNew} from '@/api/chat';
+import ConstConfig from '@/scripts/ConstConfig';
+import Cookies from 'js-cookie';
+export default {
+    name:'ChatCreateGroup',
+    props: {
+        group: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible:false,
+            loading:false,
+            memberList:[],
+            checkList:[]
+        };
+    },
+    computed:{
+        userId() {
+            return this.$store.state.user.id;
+        }
+    },
+    methods:{
+        doShow() {
+            this.getSimulationMembers();
+            this.dialogVisible = true;
+        },
+        getSimulationMembers() {
+            getSimulationMembersNew(this.$route.query.group).then(resp => {
+                let lastData = JSON.stringify(resp.data);
+                const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
+                roleTypeList.forEach(function(element) {
+                    const rolename = element.value;
+                    if (Cookies.get('user_lang') == 'en') {
+                        lastData = lastData.replace(new RegExp(rolename, 'g'), element.enLabel);
+                    } else {
+                        lastData = lastData.replace(new RegExp(rolename, 'g'), element.label);
+                    }
+                });
+                lastData = JSON.parse(lastData);
+                lastData = lastData.filter(memberIn=>{ return memberIn.role != '观众'; });
+                lastData.map(member=>{
+                    const deviceName = member.deviceName ? '-' + member.deviceName : '';
+                    const memberName = member.name ? '-' + member.name : '';
+                    member.memberName = member.role + deviceName + memberName;
+                    return member;
+                });
+                this.memberList = lastData;
+            });
+        },
+        doCreate() {
+            if (this.checkList.length > 0) {
+                this.loading = true;
+                const checkList = this.checkList.map(function(check) { return check.id; });
+                getSimulationConversationIdNew(checkList, this.group).then(resp => {
+                    if (resp.data) {
+                        const data = resp.data;
+                        this.loading = false;
+                        this.$emit('addCoversition', {data:data, headerTitle:resp.data.name});
+                        this.dialogVisible = false;
+                        this.checkList = [];
+                    }
+                }).catch(error=>{
+                    this.$messageBox('创建会话失败: ' + error.messagfe);
+                    this.loading = false;
+                    this.dialogVisible = false;
+                    this.checkList = [];
+                });
+            }
+
+        },
+        doClose() {
+            this.checkList = [];
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.chat-create-group{
+    position: absolute;
+    width: 70%;
+    height: 300px;
+    border: 1px #dedede solid;
+    left: 26%;
+    top: 8%;
+    z-index: 7;
+    border-radius: 8px;
+    box-shadow: #b5aeae 0 0 10px;
+    background: #fff;
+}
+.create-group-header{
+    padding-left: 10px;
+    padding-top: 6px;
+    font-size: 14px;
+    border-bottom: 1px #dedede solid;
+    padding-bottom: 6px;
+}
+.create-group-title{
+    display: inline-block;
+}
+.create-group-close{
+    float: right;
+    display: inline-block;
+    margin-right: 5px;
+    font-size: 16px;
+    cursor: pointer;
+}
+.chat-member-list{
+    width: 54%;
+    height: 216px;
+    overflow-y: auto;
+    padding: 5px 10px;
+    font-size: 14px;
+    overflow-x: hidden;
+    border-right: 1px #ccc solid;
+    display:inline-block;
+}
+.create-group-content{
+    width: 100%;
+    height: 220px;
+    padding-bottom: 10px;
+    border-bottom: 1px #dedede solid;
+}
+.create-group-bottom{
+    text-align: center;
+    margin-top:8px;
+}
+.each-chat-member{
+    display:block;
+    margin-top:5px;
+}
+.currentSelectList{
+    display: inline-block;
+    width: 44%;
+    font-size: 14px;
+    vertical-align: top;
+    padding: 5px 10px;
+    overflow-x: hidden;
+    overflow-y: auto;
+    height: 216px;
+}
+.eachSelect{
+    display:block;
+    margin-top:5px;
+}
+// 谷歌、safari、qq浏览器、360浏览器滚动条样式
+// 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸
+.chat-member-list::-webkit-scrollbar,.currentSelectList::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+    // height: 110px;
+    background-color: #FFFFFF;
+}
+/*定义滚动条轨道 内阴影+圆角*/
+.chat-member-list::-webkit-scrollbar-track,.currentSelectList::-webkit-scrollbar-track{
+    // box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+    border-radius: 10px;
+    background-color: #FFFFFF;;
+}
+/*定义滑块 内阴影+圆角*/
+.chat-member-list::-webkit-scrollbar-thumb,.currentSelectList::-webkit-scrollbar-thumb{
+    border-radius: 10px;
+    // box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+    background-color: #cacaca;
+}
+/*滑块效果*/
+.chat-member-list::-webkit-scrollbar-thumb:hover,.currentSelectList::-webkit-scrollbar-thumb:hover {
+    border-radius: 5px;
+    // box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    background: rgba(0,0,0,0.4);
+}
+/*IE滚动条颜色*/
+html {
+    scrollbar-face-color:#bfbfbf;/*滚动条颜色*/
+    scrollbar-highlight-color:#000;
+    scrollbar-3dlight-color:#000;
+    scrollbar-darkshadow-color:#000;
+    scrollbar-Shadow-color:#adadad;/*滑块边色*/
+    scrollbar-arrow-color:rgba(0,0,0,0.4);/*箭头颜色*/
+    scrollbar-track-color:#eeeeee;/*背景颜色*/
+}
+</style>
diff --git a/src/views/newMap/displayNew/chatView/chatMemberList.vue b/src/views/newMap/displayNew/chatView/chatMemberList.vue
index ddb243928..1fc6bcdb3 100644
--- a/src/views/newMap/displayNew/chatView/chatMemberList.vue
+++ b/src/views/newMap/displayNew/chatView/chatMemberList.vue
@@ -5,14 +5,16 @@
       <div
         v-for="member in memberList"
         :key="member.id"
-        :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'"
-        @click="createConversition(member)"
+        :style="member.userId === userId ?'color:red':''"
+        class="each-chat-member"
+        :title="member.memberName"
       >{{ member.memberName }}</div>
+      <!-- :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'" -->
     </div>
   </div>
 </template>
 <script>
-import {getSimulationMembersNew, getSimulationConversationIdNew} from '@/api/chat';
+import {getSimulationChatMemberNew} from '@/api/chat';
 import ConstConfig from '@/scripts/ConstConfig';
 import Cookies from 'js-cookie';
 export default {
@@ -21,43 +23,35 @@ export default {
         group: {
             type: String,
             required: true
+        },
+        currentCoversition:{
+            type: Object,
+            required: true
         }
     },
     data() {
         return {
-            showMembers:false,
+            showMembers:true,
             memberList:[]
         };
     },
+    computed:{
+        userId() {
+            return this.$store.state.user.id;
+        }
+    },
+    watch:{
+        currentCoversition:function (val, old) {
+            if (val) {
+                this.getSimulationMembers();
+            }
+        }
+    },
     mounted() {
-        this.getSimulationMembers();
     },
     methods:{
-        createConversition(member) {
-            if (member.userId != this.$store.state.user.id && member.online) {
-                getSimulationConversationIdNew({ memberId: member.id }, this.group).then(resp => {
-                    if (resp.data) {
-                        const data = resp.data;
-                        this.$emit('addCoversition', {data:data, headerTitle:member.memberName});
-                        this.showMembers = false;
-                    }
-                });
-            }
-        },
-        setMemberStatus(memberInfo) {
-            this.getSimulationMembers();
-            // memberInfo.forEach(member=>{
-            //     if (this.coversitionList) {
-            //         this.coversitionList.forEach(item=>{
-            //             if (item.id == member.id) {
-            //                 item.online = member.online;
-            //             }
-            //         });
-            //     }
-            // });
-        },
         getSimulationMembers() {
-            getSimulationMembersNew(this.$route.query.group).then(resp => {
+            getSimulationChatMemberNew(this.$route.query.group, this.currentCoversition.id).then(resp => {
                 let lastData = JSON.stringify(resp.data);
                 const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
                 roleTypeList.forEach(function(element) {
@@ -82,14 +76,6 @@ export default {
             return this.memberList.filter(member=>{
                 return member.id == memberId;
             });
-        },
-        doShow() {
-            if (this.showMembers) {
-                this.showMembers = false;
-            } else {
-                this.showMembers = true;
-                this.getSimulationMembers();
-            }
         }
     }
 };
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 362a4270f..300e73f1c 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -41,6 +41,7 @@
         :group="group"
         :quest-id="questId"
         :show-station="showStation"
+        :user-role="userRole"
         @tryTime="tryTime"
         @hidepanel="hidepanel"
         @passflow="passflow"
@@ -253,6 +254,17 @@ export default {
         },
         project() {
             return getSessionStorage('project');
+        },
+        userRole() {
+            if (this.$route.query.prdType == '02') {
+                return 'DISPATCHER';
+            } else if (this.$route.query.prdType == '01') {
+                return 'STATION_SUPERVISOR';
+            } else if (this.$route.query.prdType == '04') {
+                return 'DRIVER';
+            } else {
+                return 'AUDIENCE';
+            }
         }
     },
     watch: {
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index cba5b9e87..68ed595d1 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <chat-box ref="chatbox" :group="group" />
+    <chat-box ref="chatbox" :group="group" :user-role="userRole" />
     <div class="display-card" :style="{top: offset+'px'}">
       <el-row>
         <span v-if="countTime" class="display-score">{{ $t('display.demon.trialTime') }} {{ countTime }}</span>
@@ -77,6 +77,10 @@ export default {
             default() {
                 return false;
             }
+        },
+        userRole: {
+            type: String,
+            required: true
         }
     },
     data() {
diff --git a/src/views/newMap/jointTrainingNew/chatContent.vue b/src/views/newMap/jointTrainingNew/chatContent.vue
index a93c12598..5e0864de6 100644
--- a/src/views/newMap/jointTrainingNew/chatContent.vue
+++ b/src/views/newMap/jointTrainingNew/chatContent.vue
@@ -38,6 +38,7 @@ export default {
             chatContentList:[],
             coversition:{},
             currentAudioList:[],
+            currentAudioIndex:0,
             isPlay:false,
             baseUrl:process.env.VUE_APP_VOICE_API
         };
@@ -122,17 +123,18 @@ export default {
             return /\d{2}:\d{2}:\d{2}/.exec(time)[0] || time;
         },
         playAllAudio() {
-            // this.playEachAudio(this.currentAudioList[this.currentAudioIndex]);
+            this.playEachAudio(this.currentAudioList[this.currentAudioIndex]);
         },
-        playEachAudio(index) {
+        playEachAudio(audioUrl) {
             this.$nextTick(function() {
-                document.querySelector('#audio' + index).play();
+                document.querySelector('#audioPlay').src = audioUrl;
+                document.querySelector('#audioPlay').play();
                 const that = this;
-                document.querySelector('#audio' + index).onended = function() {
+                document.querySelector('#audioPlay').onended = function() {
                     that.currentAudioList.shift();
                     if (that.currentAudioList.length > 0) {
-                        // that.currentAudioIndex++;
-                        // that.playEachAudio(that.currentAudioList[that.currentAudioIndex]);
+                        that.currentAudioIndex++;
+                        that.playEachAudio(that.currentAudioList[that.currentAudioIndex]);
                     } else {
                         that.isPlay = false;
                     }
diff --git a/src/views/newMap/jointTrainingNew/chatCoversitionList.vue b/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
index 2b9ce115a..530229abe 100644
--- a/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
+++ b/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
@@ -68,7 +68,7 @@ export default {
             }
         },
         changeCoversition(coversition) {
-            this.$emit('setHeadTitle', !coversition.isOnline ? coversition.coverName + ' (离线)' : coversition.coverName);
+            this.$emit('setHeadTitle', coversition.coverName);
             this.currentCoversition = {id:coversition.id, all:coversition.all};
             this.$emit('setCurrentCoversition', coversition);
             // this.$refs.chatContent.reloadData(this.currentCoversition);

From 1fa3e7f6d85690c0c647f786a8f389aa7d30f538 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Thu, 28 May 2020 13:33:39 +0800
Subject: [PATCH 84/85] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?=
 =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E9=80=9A=E4=BF=A1=E4=B8=AD=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E5=90=8E=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../connect/Jlmap3dSubscribeNew.js            | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
index 57285b9f7..c35bdce7e 100644
--- a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
+++ b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
@@ -53,12 +53,12 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 		jsonwebwork.onmessage = function (event) {
 
 
-
+			// console.log(event.data);
 			// if(event.data.deviceType == "TRAIN"){
 			// 	// console.log(event.data);
 			//
 			// }
-			console.log(event.data);
+			// console.log(event.data);
 			if(event.data.type == "Device_Load_Destroy_3D"){
 				DeviceDestroy(event.data);
 				return;
@@ -150,7 +150,6 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 		let code = data.code;
 
 		if(trainlisttest.list[code].right != data.right){
-
 			if(data.right == "0"){
 				trainlisttest.list[code].right = "0";
 				trainlisttest.list[code].rotation.y = Math.PI;
@@ -442,27 +441,28 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 		for(let i=0,leni=data.length;i<leni;i++){
 			if(data[i].deviceType == "SWITCH"){
 				initswitch(data[i]);
-			}
-			if(data[i].deviceType == "PSD"){
+			}else if(data[i].deviceType == "PSD"){
 				initstand(data[i]);
+			}else{
+				console.log(data[i]);
 			}
 		}
 	}
 
 	function DeviceDestroy(data){
-		for(let i=0,leni=data.body.length;i<leni;i++){
+		for(let i=0,leni=data.body.deviceList.length;i<leni;i++){
 
-			if(data.body[i].type == "TRAIN"){
-				code =data.body[i].code;
-				if (trainlisttest.list[code].dispose != data.body[i].dispose && data.body[i].dispose == "0") {
+			if(data.body.deviceList[i].type == "TRAIN"){
+				code =data.body.deviceList[i].code;
+				if (trainlisttest.list[code].dispose != data.body.deviceList[i].dispose && data.body.deviceList[i].dispose == "0") {
 
-					if (rails.sectionrail[data.body[i].section]) {
+					if (rails.sectionrail[data.body.deviceList[i].section]) {
 
 						trainlisttest.group.add(trainlisttest.list[code]);
 						trainlisttest.list[code].position.y = 0;
 						// trainlisttest.list[code].progress = 0;
 						trainlisttest.list[code].dispose = "0";
-						trainlisttest.list[code].nowcode = data.body[i].section;
+						trainlisttest.list[code].nowcode = data.body.deviceList[i].section;
 						trainlisttest.list[code].nextcode = null;
 						trainlisttest.list[code].curve = null;
 						trainlisttest.list[code].nextcurve = null;
@@ -476,7 +476,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 							trainlisttest.list[code].mixerpush = true;
 						}
 					}
-				} else if (trainlisttest.list[code].dispose != data.body[i].dispose && data.body[i].dispose == "1") {
+				} else if (trainlisttest.list[code].dispose != data.body.deviceList[i].dispose && data.body.deviceList[i].dispose == "1") {
 					trainlisttest.list[code].status = 1;
 					trainlisttest.group.remove(trainlisttest.list[code]);
 					trainlisttest.list[code].progress = null;
@@ -493,17 +493,17 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 
 				}
 			}
-			if(data.body[i].type == "SIGNAL"){
-				signalupdate(data.body[i]);
+			if(data.body.deviceList[i].type == "SIGNAL"){
+				signalupdate(data.body.deviceList[i]);
 			}
-			if(data.body[i].type == "SWITCH"){
-				switchupdate(data.body[i]);
+			if(data.body.deviceList[i].type == "SWITCH"){
+				switchupdate(data.body.deviceList[i]);
 			}
-			if(data.body[i].type == "PSD"){
-				standupdate(data.body[i]);
+			if(data.body.deviceList[i].type == "PSD"){
+				standupdate(data.body.deviceList[i]);
 			}
-			if(data.body[i].type == "TRAIN_DOOR"){
-				traindoorupdate(data.body[i]);
+			if(data.body.deviceList[i].type == "TRAIN_DOOR"){
+				traindoorupdate(data.body.deviceList[i]);
 			}
 		}
 	}

From fe5bfa50e067cbe871ce714a4f6ce65c61330a23 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Thu, 28 May 2020 13:39:41 +0800
Subject: [PATCH 85/85] =?UTF-8?q?=E4=B8=89=E7=BB=B4cctv=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jlmap3d/jl3dpassflow/jl3dpassflow.js      |    9 +-
 src/jlmap3d/jl3dpassflow/jl3dpassflownew.js   | 1102 ++++++++
 .../jl3dpassflow/model/humanmanager.js        |    0
 src/jlmap3d/jl3dpassflow/model/humanmodel.js  |    0
 src/jlmap3d/jl3dpassflow/model/zonemanager.js |  136 +
 src/jlmap3d/jl3dpassflow/model/zonemodel.js   |   15 +
 src/jlmap3d/jl3dpassflow/utils/AStar.js       |  123 +
 src/jlmap3d/jl3dpassflow/utils/BinaryHeap.js  |  134 +
 src/jlmap3d/jl3dpassflow/utils/Builder.js     |  200 ++
 src/jlmap3d/jl3dpassflow/utils/Channel.js     |   93 +
 src/jlmap3d/jl3dpassflow/utils/Pathfinding.js |  315 +++
 .../jl3dpassflow/utils/PathfindingHelper.js   |   53 +
 src/jlmap3d/jl3dpassflow/utils/Utils.js       |   66 +
 src/jlmap3d/jl3dpassflow/utils/index.js       |    4 +
 src/utils/baseUrl.js                          |    4 +-
 src/views/jlmap3d/passflow/jl3dpassflow.vue   |    2 +-
 static/model/path/path.obj                    | 2339 +++++++++++++++++
 static/workertest/passsimulation/passer.js    |   25 +
 static/workertest/passsimulation/station.js   |   25 +
 19 files changed, 4637 insertions(+), 8 deletions(-)
 create mode 100644 src/jlmap3d/jl3dpassflow/jl3dpassflownew.js
 create mode 100644 src/jlmap3d/jl3dpassflow/model/humanmanager.js
 create mode 100644 src/jlmap3d/jl3dpassflow/model/humanmodel.js
 create mode 100644 src/jlmap3d/jl3dpassflow/model/zonemanager.js
 create mode 100644 src/jlmap3d/jl3dpassflow/model/zonemodel.js
 create mode 100644 src/jlmap3d/jl3dpassflow/utils/AStar.js
 create mode 100644 src/jlmap3d/jl3dpassflow/utils/BinaryHeap.js
 create mode 100644 src/jlmap3d/jl3dpassflow/utils/Builder.js
 create mode 100644 src/jlmap3d/jl3dpassflow/utils/Channel.js
 create mode 100644 src/jlmap3d/jl3dpassflow/utils/Pathfinding.js
 create mode 100644 src/jlmap3d/jl3dpassflow/utils/PathfindingHelper.js
 create mode 100644 src/jlmap3d/jl3dpassflow/utils/Utils.js
 create mode 100644 src/jlmap3d/jl3dpassflow/utils/index.js
 create mode 100644 static/model/path/path.obj
 create mode 100644 static/workertest/passsimulation/passer.js
 create mode 100644 static/workertest/passsimulation/station.js

diff --git a/src/jlmap3d/jl3dpassflow/jl3dpassflow.js b/src/jlmap3d/jl3dpassflow/jl3dpassflow.js
index ada87e2ab..723a90ca9 100644
--- a/src/jlmap3d/jl3dpassflow/jl3dpassflow.js
+++ b/src/jlmap3d/jl3dpassflow/jl3dpassflow.js
@@ -354,7 +354,7 @@ export function Jl3dpassflow(dom) {
 						}
 					}
 				}
-			},3000);
+			},1000);
 		};
 	},1000);
 
@@ -390,7 +390,7 @@ export function Jl3dpassflow(dom) {
     }
     moveanimateupdate();
 
-		scope.anime = requestAnimationFrame(animate);
+		requestAnimationFrame(animate);
 
 	}
 
@@ -468,7 +468,7 @@ export function Jl3dpassflow(dom) {
 											}
 
 											if(humans[i].stage == 0){
-												console.log(humans[i].doors);
+												// console.log(humans[i].doors);
 												zhajiin[humans[i].doors].waiting = 0;
 												humans[i].stage = 1;
 											}
@@ -805,8 +805,7 @@ export function Jl3dpassflow(dom) {
 		}
 
 		function zhajicontrol(type,door){
-			console.log(door);
-			console.log(zhajiin);
+			
 			let devicenum = door-1;
 			if(type == "in"){
 				deviceaction[zhajiin[devicenum].id].action.reset();
diff --git a/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js b/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js
new file mode 100644
index 000000000..b05c2fc8d
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js
@@ -0,0 +1,1102 @@
+import { Staticmodel } from '@/jlmap3d/jl3dpassflow/config.js';
+//loader
+import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
+import { OBJLoader } from '@/jlmap3d/main/loaders/OBJLoader';
+
+import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
+
+import { ModelManager } from '@/jlmap3d/jl3dpassflow/loader.js';
+import { SkeletonUtils } from '@/jlmap3d/main/utils/SkeletonUtils.js';
+
+import { Pathfinding } from '@/jlmap3d/jl3dpassflow/utils/Pathfinding.js';
+// const Pathfinding = window.threePathfinding.Pathfinding;
+import { ZoneManager } from '@/jlmap3d/jl3dpassflow/model/zonemanager.js';
+
+import StompClient from '@/utils/sock';
+import { Loading } from 'element-ui';
+
+// const Pathfinding = window.threePathfinding.Pathfinding;
+var clock = new THREE.Clock();
+let delta;
+let scene,camerass,renderer;
+let rendermode = 0;
+
+var mixers = [];
+var testmesh1,testmesh2;
+var humans = [];
+var checkdoor1 = [];
+var checkdoor2 = [];
+var station;
+var zhajiinmodel;
+var zhajioutmodel;
+var monitor;
+let ids = 0;
+
+let humanlist = new THREE.Group();
+
+let originhuman1 = null;
+let originhuman2 = null;
+let originanima1 = null;
+let originanima2 = null;
+let moveanimatelist = [];
+
+let zhajiin = [];
+let zhajiout = [];
+
+let deviceaction = [];
+
+let passerwebwork = new Worker("../../static/workertest/passsimulation/passer.js");
+let stationwebwork = new Worker("../../static/workertest/passsimulation/station.js");
+
+let stationzon = new ZoneManager();
+
+for(let i=0;i<5;i++){
+	checkdoor1[i]={
+		id:"c1"+i,
+		status:0,
+		pos:[],
+		max:10
+	};
+}
+
+for(let i=0;i<5;i++){
+	let zhaji = {
+		id:"in0"+(i+1),
+		status:0,
+		waiting:0
+	}
+	zhajiin.push(zhaji);
+}
+
+for(let i=0;i<5;i++){
+	let zhaji = {
+		id:"out0"+(i+1),
+		status:0,
+		waiting:0
+	}
+	zhajiout.push(zhaji);
+}
+
+let stationleft = [];
+let stationright = [];
+
+for(let i=0;i<22;i++){
+	let sl = {
+		id:"left"+i,
+		status:0,
+		waiting:0
+	}
+	stationleft.push(sl);
+}
+
+for(let i=0;i<22;i++){
+	let sr = {
+		id:"right"+i,
+		status:0,
+		waiting:0
+	}
+	stationright.push(sr);
+}
+
+var windowWidth = window.innerWidth ;
+var windowHeight = window.innerHeight;
+var views = [
+			{
+				left: 0,
+				bottom: 0,
+				width: 0.5,
+				height: 0.5,
+				background: new THREE.Color( 0.5, 0.5, 0.7 ),
+				eye: [ 3.7, 16, 26 ],
+				up: [3.7, 10 ,16 ],
+				fov: 30
+			},
+			{
+				left: 0,
+				bottom: 0.5,
+				width: 0.5,
+				height: 0.5,
+				background: new THREE.Color( 0.5, 0.5, 0.7 ),
+				eye: [ 3.7,17,-4 ],
+				up: [  3.7, 10 ,16],
+				fov: 30
+			},
+			{
+				left: 0.5,
+				bottom: 0,
+				width: 0.5,
+				height: 0.5,
+				background: new THREE.Color( 0.7, 0.5, 0.5 ),
+				eye: [ -60, 6,11],
+				up: [ -59, 5.9,11 ],
+				fov: 45
+			},
+			{
+				left: 0.5,
+				bottom: 0.5,
+				width: 0.5,
+				height: 0.5,
+				background: new THREE.Color( 0.5, 0.7, 0.7 ),
+				eye: [ -7,17,2],
+				up: [-7, 10, 8],
+				fov: 60
+			}
+		];
+
+
+export function Jl3dpassflow(dom) {
+	var scope = this;
+
+	this.dom = dom;
+	this.nowcode = null;
+	this.animateswitch = false;
+	this.signallights = [];
+	this.mixers = [];
+	this.showmodel = null;
+	//初始化webgl渲染
+	renderer = new THREE.WebGLRenderer({ antialias: true });
+
+	renderer.setClearColor(new THREE.Color(0x000000));
+	renderer.setSize(dom.offsetWidth, dom.offsetHeight);
+
+	this.dom.appendChild(renderer.domElement);
+
+	//定义相机
+
+	camerass = new THREE.PerspectiveCamera(70, dom.offsetWidth / dom.offsetHeight, 0.01, 1000);
+	camerass.position.set(0, 80, 40);
+	camerass.aspect = dom.offsetWidth / dom.offsetHeight;
+	camerass.updateProjectionMatrix();
+
+	for ( var ii = 0; ii < views.length; ++ ii ) {
+
+			var view = views[ ii ];
+			var camera = new THREE.PerspectiveCamera( view.fov, window.innerWidth / window.innerHeight, 1, 200 );
+			camera.position.fromArray( view.eye );
+			camera.lookAt( view.up[0],view.up[1],view.up[2] );
+			view.camera = camera;
+
+		}
+
+
+
+	//定义场景(渲染容器)
+	scene = new THREE.Scene();
+	scene.background = new THREE.Color(0xa0a0a0);
+
+	var mesh = new THREE.Mesh(new THREE.PlaneBufferGeometry(200, 200), new THREE.MeshPhongMaterial({ color: 0x999999, depthWrite: false }));
+	mesh.rotation.x = - Math.PI / 2;
+	mesh.receiveShadow = true;
+	scene.add(mesh);
+
+	var grid = new THREE.GridHelper(200, 20, 0x000000, 0x000000);
+	grid.material.opacity = 0.2;
+	grid.material.transparent = true;
+	scene.add(grid);
+
+
+	//定义全局光
+	let ambientLight = new THREE.AmbientLight(0xffffff, 1.3);
+	scene.add(ambientLight);
+
+	//
+	// var spotLight = new THREE.SpotLight(0xffffff);
+	// spotLight.position.set(-50, 60, 15);
+	// spotLight.castShadow = true;
+	// spotLight.shadow.mapSize.width = 1024;
+	// spotLight.shadow.mapSize.height = 1024;
+	// scene.add(spotLight);
+
+
+
+	this.controls = new THREE.OrbitControls(camerass, dom);
+	this.controls.maxPolarAngle = Math.PI / 2;
+	this.controls.minPolarangle = Math.PI / 5;
+	this.controls.maxDistance = 800;
+	this.controls.screenSpacePanning = true;
+	this.controls.update();
+	this.selectmodel = null;
+
+
+	const Color = {
+		GROUND: new THREE.Color( 0x606060 ).convertGammaToLinear( 2.2 ).getHex(),
+		NAVMESH: new THREE.Color( 0xFFFFFF ).convertGammaToLinear( 2.2 ).getHex(),
+	};
+
+	const ZONE = 'level';
+	const SPEED = 10;
+	const OFFSET = 0.2;
+
+	THREE.Pathfinding = Pathfinding;
+
+	let level, navmesh;
+
+	let groupID, path;
+
+	const playerPosition = new THREE.Vector3( -3.5, 0.5, 5.5 );
+	const targetPosition = new THREE.Vector3();
+
+	const pathfinder = new THREE.Pathfinding();
+	const mouse = new THREE.Vector2();
+	const raycaster = new THREE.Raycaster();
+
+	var loader = new THREE.OBJLoader();
+
+	// load a resource
+	loader.load(
+		// resource URL
+		'../../static/model/path/path.obj',
+		// called when resource is loaded
+		function ( object ) {
+
+
+			console.time('createZone()');
+			const zone = THREE.Pathfinding.createZone(object.children[0].geometry);
+			console.timeEnd('createZone()');
+
+			pathfinder.setZoneData( ZONE, zone );
+
+			const navWireframe = new THREE.Mesh(object.children[0].geometry, new THREE.MeshBasicMaterial({
+				color: 0x808080,
+				wireframe: true
+			}));
+			navWireframe.position.y = OFFSET / 2;
+			// scene.add(navWireframe);
+
+			navmesh = object.children[0];
+			// scene.add(navmesh);
+
+			// Set the player's navigation mesh group
+			groupID = pathfinder.getGroup( ZONE, playerPosition );
+
+		},
+		// called when loading is in progresses
+		function ( xhr ) {
+
+			console.log( ( xhr.loaded / xhr.total * 100 ) + '% loaded' );
+
+		},
+		// called when loading has errors
+		function ( error ) {
+
+			console.log( 'An error happened' );
+
+		}
+	);
+	document.addEventListener( 'mouseup', onDocumentMouseUp, false );
+
+	function onDocumentMouseUp (event) {
+
+		mouse.x = ( event.clientX / window.innerWidth ) * 2 - 1;
+		mouse.y = - ( event.clientY / window.innerHeight ) * 2 + 1;
+
+
+		camerass.updateMatrixWorld();
+
+		raycaster.setFromCamera( mouse, camerass );
+
+		const intersects = raycaster.intersectObject( navmesh );
+
+		if ( !intersects.length ) return;
+		console.log(intersects[0].point);
+		targetPosition.copy( intersects[0].point );
+
+		originhuman1.position.copy( playerPosition );
+		// Teleport on ctrl/cmd click or RMB.
+		if (event.metaKey || event.ctrlKey || event.button === 2) {
+
+			path = null;
+			originhuman1.position.copy( playerPosition.copy( targetPosition ) );
+
+			return;
+
+		}
+
+		path = pathfinder.findPath( playerPosition, targetPosition, ZONE, groupID );
+
+		let points = [];
+		points.push(new THREE.Vector3(originhuman1.position.x,originhuman1.position.y,originhuman1.position.z));
+		for(let i=0;i<path.length;i++){
+			points.push(path[i]);
+		}
+		originhuman1.curve =  new THREE.CatmullRomCurve3(points);
+    originhuman1.curve.curvrtype = "chordal";
+		originhuman1.progress = 0;
+		console.log(path);
+
+	}
+
+	function tick ( dt ) {
+		// if ( !level || !(path||[]).length ) return
+		//
+		// let targetPosition = path[ 0 ];
+		// const velocity = targetPosition.clone().sub( playerPosition );
+		//
+		// if (velocity.lengthSq() > 0.05 * 0.05) {
+		// 	velocity.normalize();
+		// 	// Move player to target
+		// 	playerPosition.add( velocity.multiplyScalar( dt * SPEED ) );
+		// 	// originhuman1.lookAt();
+		// 	originhuman1.position.copy( playerPosition );
+		// } else {
+		// 	// Remove node from the path we calculated
+		// 	path.shift();
+		// }
+		if(originhuman1.curve){
+			if(originhuman1.progress<1){
+				let point = originhuman1.curve.getPointAt(originhuman1.progress);
+
+				//更新模型坐标
+				originhuman1.position.x = point.x;
+				originhuman1.position.y = point.y;
+				originhuman1.position.z = point.z;
+				if((originhuman1.progress+0.001)<1){
+					let tangent = originhuman1.curve.getPointAt(originhuman1.progress+0.001);
+					originhuman1.lookAt(new THREE.Vector3(tangent.x,originhuman1.position.y,tangent.z));
+				}
+
+				originhuman1.progress += 0.05;
+			}else{
+				playerPosition.copy( originhuman1.position )
+			}
+
+		}
+
+	}
+
+	window.onresize = function () {
+
+		renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
+		windowWidth = scope.dom.offsetWidth ;
+		windowHeight = scope.dom.offsetHeight;
+
+		camerass.aspect = scope.dom.offsetWidth / scope.dom.offsetHeight;
+		camerass.updateProjectionMatrix();
+	}
+
+	this.anime = null;
+
+	this.modelmanager = new ModelManager();
+  let loadingInstance = Loading.service({ fullscreen: true });
+	this.modelmanager.loadpromise(Staticmodel, scope.mixers).then(function (data) {
+		// console.log(scope.modelmanager);
+		initstationanimation(scope.modelmanager.station.mesh);
+		initzhajiinaimation(scope.modelmanager.zhajiin.mesh);
+		initzhajioutanimation(scope.modelmanager.zhajiout.mesh);
+
+		level = scope.modelmanager.station.mesh;
+
+		monitor = scope.modelmanager.monitor.mesh;
+		scene.add(monitor);
+
+
+
+
+		inithumans();
+
+	  loadingInstance.close();
+
+		scope.switchrender(true);
+
+		animate();
+	})
+
+	function inithumans(){
+
+		originhuman1 = scope.modelmanager.man1.mesh;
+		originhuman1.progress = 1;
+		scene.add(originhuman1);
+		originhuman2 =  scope.modelmanager.man2.mesh;
+		let mixer1 = new THREE.AnimationMixer( originhuman1 );
+		let mixer2 = new THREE.AnimationMixer( originhuman2 );
+		originanima1 = originhuman1.animations[ 0 ];
+		originanima2 = originhuman2.animations[ 0 ];
+		originhuman1.remove(originhuman1.children[2]);
+		scene.add(humanlist);
+		scene.add(scope.modelmanager.man1.mesh);
+
+		for(let i=0;i<200;i++){
+			var mantype = Math.floor(Math.random()*(3-1+1))+1;
+			let newhuman;
+			if(mantype == 1){
+				newhuman = THREE.SkeletonUtils.clone( originhuman1 );
+				newhuman.animations = [];
+				newhuman.animations.push(originanima1.clone());
+			}else{
+				newhuman = THREE.SkeletonUtils.clone( originhuman2 );
+				newhuman.animations = [];
+				newhuman.animations.push(originanima2.clone());
+			}
+
+			// zhajiin[j].waiting = 1;
+
+			let mixer = new THREE.AnimationMixer( newhuman );
+			mixer.runplay = false;
+			let action = mixer.clipAction( newhuman.animations[ 0 ] );
+
+			newhuman.status = 1;
+			newhuman.stage = 0;
+			let newone = {
+				id:i,
+				mesh:newhuman,
+				direct:null,
+				doorstatus:null,
+				doors:null,
+				action:action,
+				mixer:mixer,
+				runrail:null
+			};
+
+
+
+			humans.push(newone);
+			mixers.push(mixer);
+			humanlist.add(newhuman);
+		}
+
+
+
+	}
+
+
+	let checkobject = setInterval(function(){
+		// console.log(originhuman1);
+		if(originhuman1){
+			console.log("start");
+			clearInterval(checkobject);
+			//进站控制
+			startWorker();
+			// stationwebwork.postMessage("on");
+			// passerwebwork.postMessage("on");
+
+		};
+	},1000);
+
+
+
+	this.switchrender = function(mode){
+		if(mode){
+			rendermode = 0;
+			renderer.setViewport( 0, 0, scope.dom.offsetWidth, scope.dom.offsetHeight );
+			renderer.setScissor( 0, 0, scope.dom.offsetWidth, scope.dom.offsetHeight );
+			renderer.setScissorTest( false );
+			renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
+			camerass.aspect = dom.offsetWidth / dom.offsetHeight;
+			camerass.updateProjectionMatrix();
+		}else{
+			rendermode = 1;
+		}
+	}
+
+	function startWorker(){
+		passerwebwork.onmessage = function (event) {
+			if(humans){
+				// console.log(humans.length);
+
+				// console.log(humans.length);
+				for(let i=0;i<humans.length;i++){
+					// console.log(humans[i]);
+
+					if(humans[i].status == 0){
+
+						if(humans[i].stage == 1){
+									let points = [];
+									points.push(new THREE.Vector3(humans[i].mesh.position.x,humans[i].mesh.position.y,humans[i].mesh.position.z));
+									points.push(new THREE.Vector3(humans[i].mesh.position.x,humans[i].mesh.position.y,humans[i].mesh.position.z-5));
+									zhajicontrol("in",humans[i].doors);
+									moveanimateinit(humans[i],i,points,i,0.02);
+						}
+						if(humans[i].stage == 2){
+							let points = [];
+							points.push(new THREE.Vector3(humans[i].mesh.position.x,humans[i].mesh.position.y,humans[i].mesh.position.z));
+							points.push(new THREE.Vector3(12,10,12.9));
+							points.push(new THREE.Vector3(28,1.7,12.9));
+							points.push(new THREE.Vector3(34,1.7,12.9));
+
+							//1--left
+							//2-- right
+							if(humans[i].direct == 1){
+								points.push(new THREE.Vector3(34,1.7,16));
+								for(let j =0;j<22;j++){
+									if(stationleft[j].waiting == 0){
+
+										points.push(new THREE.Vector3(51-j*5,1.7,22));
+
+										points.push(new THREE.Vector3(51-j*5,1.7,23));
+
+										humans[i].doors = j;
+										stationright[j].waiting = 1;
+										moveanimateinit(humans[i],i,points,i,0.002);
+										j =22;
+									}
+								}
+							}else{
+								points.push(new THREE.Vector3(34,1.7,16));
+								points.push(new THREE.Vector3(14,1.7,17));
+								points.push(new THREE.Vector3(14,1.7,3));
+								for(let j =0;j<22;j++){
+									if(stationright[j].waiting == 0){
+
+										points.push(new THREE.Vector3(51-j*5,1.7,3));
+
+										points.push(new THREE.Vector3(51-j*5,1.7,2));
+										humans[i].doors = j;
+										stationright[j].waiting = 1;
+										moveanimateinit(humans[i],i,points,i,0.002);
+										j =22;
+									}
+								}
+							}
+							moveanimateinit(humans[i],i,points,i,0.002);
+						}
+						//出站
+						if(humans[i].stage == 3){
+							let points = [];
+							points.push(new THREE.Vector3(humans[i].mesh.position.x,humans[i].mesh.position.y,humans[i].mesh.position.z));
+							if(humans[i].doors<11){
+								if(humans[i].direct == 1){
+									points.push(new THREE.Vector3(10,1.7,17));
+								}else{
+									points.push(new THREE.Vector3(8,1.7,5));
+								}
+								points.push(new THREE.Vector3(8,1.7,13));
+								points.push(new THREE.Vector3(5,1.7,13));
+								points.push(new THREE.Vector3(-4,6,13));
+							}else{
+								if(humans[i].direct == 1){
+									points.push(new THREE.Vector3(-19,1.7,17));
+								}else{
+									points.push(new THREE.Vector3(-18,1.7,6.4));
+								}
+								points.push(new THREE.Vector3(-18,1.7,13));
+								points.push(new THREE.Vector3(-12,1.7,13));
+								points.push(new THREE.Vector3(-7,6.8,12));
+							}
+							points.push(new THREE.Vector3(-5,10,4));
+							points.push(new THREE.Vector3(14,10,3));
+							var j = Math.floor(Math.random()*(4-1+1))+1;
+							points.push(new THREE.Vector3(19,10,-2+j*1.4));
+
+							humans[i].doors = j;
+							moveanimateinit(humans[i],i,points,i,0.002);
+						}
+						if(humans[i].stage == 4){
+
+								let points = [];
+								points.push(new THREE.Vector3(humans[i].mesh.position.x,humans[i].mesh.position.y,humans[i].mesh.position.z));
+
+								points.push(new THREE.Vector3(humans[i].mesh.position.x+4,humans[i].mesh.position.y,humans[i].mesh.position.z));
+
+								if(humans[i].direct == 1){
+									points.push(new THREE.Vector3(33,10,25));
+								}else{
+									points.push(new THREE.Vector3(33.5,10,-5));
+								}
+								zhajicontrol("out",humans[i].doors);
+								moveanimateinit(humans[i],i,points,i,0.002);
+						}
+					}
+				}
+			}
+			moveanimateupdate();
+			// delta = clock.getDelta();
+			// tick(delta);
+
+			if(mixers[i]._actions[0].isRunning()){
+				mixers[i].update( delta );
+			}
+
+	    for(let i=mixers.length-1;i>=0;i--){
+				if(mixers[i]._actions[0].isRunning()){
+					mixers[i].update( delta );
+				}
+	    }
+
+		};
+		stationwebwork.onmessage = function (event) {
+			// console.log("stationwebwork");
+			if(humans.length<200){
+				newhumancreate();
+			}
+		};
+	}
+
+
+	//循环渲染函数
+	function animate() {
+		// console.log(rendermode);
+		if(rendermode == 0){
+			renderer.render(scene, camerass);
+			scope.controls.update();
+		}else{
+			monitorrender();
+		}
+
+		delta = clock.getDelta();
+		tick(delta);
+		requestAnimationFrame(animate);
+
+	}
+
+	function moveanimateinit(model,name,points,index,speed){
+
+    let curve =  new THREE.CatmullRomCurve3(points);
+    curve.curvrtype = "chordal";
+		// curve.getLength();
+    // curve动画轨迹
+    // progress动画进度
+    // enable当前动画开关
+    // speed动画速度
+		// console.log(curve);
+    let animate = {
+      name:index,
+      index:index,
+      curve:curve,
+      progress:0,
+      directchange:false,
+      enable:true,
+      status:"start",
+      speed:speed,
+    };
+   	humans[index].runrail = animate;
+		humans[index].status = 1;
+    humans[index].action.play();
+    humans[index].mixer.runplay = true;
+    moveanimatelist.push(animate);
+  }
+
+	function moveanimateupdate(){
+			if(humans.length>0){
+				for(let i=0;i<humans.length;i++){
+							if(humans[i].runrail.enable){
+									// 动画播放结束
+									if(humans[i].runrail.progress>=1){
+										// let point = humans[i].runrail.curve.getPointAt(1);
+										//更新模型坐标
+										// console.log(moveanimatelist);
+										if(humans[i].status == 1){
+											humans[i].runrail.enable = false;
+											humans[i].runrail.progress = 1;
+											humans[i].mixer.runplay = false;
+											humans[i].action.stop();
+											humans[i].status = 0;
+
+											if(humans[i].stage == 4){
+
+												humanlist.remove(humans[i].mesh);
+												// humans.splice(i,1);
+											}
+
+											if(humans[i].stage == 3){
+
+												if(humans[i].direct == 1){
+
+													stationleft[humans[i].doors].waiting = 0;
+												}else{
+
+													stationright[humans[i].doors].waiting = 0;
+												}
+												humans[i].stage = 4;
+
+											}
+
+											if(humans[i].stage == 2){
+												humans[i].stage = 3;
+
+											}
+
+											if(humans[i].stage == 1){
+
+
+												humans[i].stage = 2;
+
+											}
+
+											if(humans[i].stage == 0){
+												// console.log(humans[i].doors);
+												zhajiin[humans[i].doors].waiting = 0;
+												humans[i].stage = 1;
+											}
+
+											moveanimatelist.splice(i,1);
+
+										}
+
+									}else{
+							//根据动画进度获取动画轨迹上点
+
+										let point = humans[i].runrail.curve.getPointAt(humans[i].runrail.progress);
+
+										//更新模型坐标
+										humans[i].mesh.position.x = point.x;
+										humans[i].mesh.position.y = point.y;
+										humans[i].mesh.position.z = point.z;
+										if((humans[i].runrail.progress+0.001)<1){
+											let tangent = humans[i].runrail.curve.getPointAt(humans[i].runrail.progress+0.001);
+											humans[i].mesh.lookAt(new THREE.Vector3(tangent.x,humans[i].mesh.position.y,tangent.z));
+										}
+
+										humans[i].runrail.progress += humans[i].runrail.speed;
+										point = null;
+
+									}
+
+							}
+						}
+			}
+		}
+
+		function newhumancreate(){
+			var direct = Math.floor(Math.random()*(3-1+1))+1;
+			var mantype = Math.floor(Math.random()*(3-1+1))+1;
+			// console.log(direct);
+			let points = [];
+			let newhuman;
+			if(mantype == 1){
+				newhuman = THREE.SkeletonUtils.clone( originhuman1 );
+				newhuman.animations = [];
+				newhuman.animations.push(originanima1.clone());
+			}else{
+				newhuman = THREE.SkeletonUtils.clone( originhuman2 );
+				newhuman.animations = [];
+				newhuman.animations.push(originanima2.clone());
+			}
+
+			if(direct == 1|| direct == 2){
+				let testposition = stationzon.getzoneposition("enter1");
+				newhuman.position.set(32,10,25);
+				points.push(testposition);
+				points.push(new THREE.Vector3(26,10,21));
+				points.push(new THREE.Vector3(18,10,18));
+			}else{
+				let testposition = stationzon.getzoneposition("enter2");
+				newhuman.position.set(32,10,-5);
+				points.push(testposition);
+				points.push(new THREE.Vector3(26,10,12));
+				points.push(new THREE.Vector3(24,10,17));
+				points.push(new THREE.Vector3(18,10,18));
+			}
+
+			let j = Math.floor(Math.random()*(4-1+1))+1;
+			points.push(new THREE.Vector3(-0.5+j*1.4,10,18.5));
+			// zhajiin[j].waiting = 1;
+
+			let mixer = new THREE.AnimationMixer( newhuman );
+			mixer.runplay = false;
+			let action = mixer.clipAction( newhuman.animations[ 0 ] );
+
+			var stationdirection = Math.floor(Math.random()*(2-1+1))+1;
+			let newone = {
+				id:humans.length,
+				mesh:newhuman,
+				status:1,
+				stage:0,
+				direct:stationdirection,
+				doorstatus:null,
+				doors:j,
+				action:action,
+				mixer:mixer,
+				runrail:null
+			};
+
+			humans.push(newone);
+			mixers.push(mixer);
+			humanlist.add(newhuman);
+
+
+			moveanimateinit(newone,humans.length,points,newone.id,0.002);
+
+					// return newone;
+		}
+
+		function initstationanimation(object){
+			let mixer = new THREE.AnimationMixer( object );
+
+			let newclip = object.animations[ 0 ];
+			for(let j=0;j<object.children.length;j++){
+
+				if(object.children[j].name == "top"){
+					object.children[j].animations = [];
+					object.children[j].animations.push(newclip.clone());
+
+					let mixer = new THREE.AnimationMixer(  object.children[j] );
+
+					let action =mixer.clipAction( object.children[j].animations[0])
+					action.setLoop(THREE.LoopOnce);
+					action.clampWhenFinished = true;
+					// action.play();
+					mixer.runplay = true;
+					mixers.push(mixer);
+					let device = {
+						action:action,
+						mixer:mixer,
+					};
+					deviceaction[object.children[j].name] = device;
+				}
+				if(object.children[j].name == "down"){
+					object.children[j].animations = [];
+					object.children[j].animations.push(newclip.clone());
+
+					let mixer = new THREE.AnimationMixer( object.children[j] );
+
+
+					let action =mixer.clipAction( object.children[j].animations[0])
+					// action.play();
+					action.setLoop(THREE.LoopOnce);
+					action.clampWhenFinished = true;
+					mixer.runplay = true;
+					mixers.push(mixer);
+					let device = {
+						action:action,
+						mixer:mixer,
+					};
+					deviceaction[object.children[j].name] = device;
+				}
+      }
+			station = object;
+	    scene.add(object);
+
+		}
+
+		function initzhajiinaimation(object){
+			let mixer = new THREE.AnimationMixer(  object );
+			let newclip = object.animations[ 0 ];
+			let newzhaji = object;
+			for(let i=0;i<newzhaji.children.length;i++){
+				if(newzhaji.children[i].name == "in01"){
+					newzhaji.children[i].animations = [];
+					newzhaji.children[i].animations.push(newclip.clone());
+
+					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+					action.setLoop(THREE.LoopOnce);
+					action.clampWhenFinished = true;
+					mixer.runplay = true;
+					mixers.push(mixer);
+					let device = {
+						action:action,
+						mixer:mixer,
+					};
+					deviceaction[object.children[i].name] = device;
+				}
+				if(newzhaji.children[i].name == "in02"){
+					newzhaji.children[i].animations = [];
+					newzhaji.children[i].animations.push(newclip.clone());
+
+					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+					action.setLoop(THREE.LoopOnce);
+					action.clampWhenFinished = true;
+					mixer.runplay = true;
+					mixers.push(mixer);
+					let device = {
+						action:action,
+						mixer:mixer,
+					};
+					deviceaction[object.children[i].name] = device;
+				}
+				if(newzhaji.children[i].name == "in03"){
+					newzhaji.children[i].animations = [];
+					newzhaji.children[i].animations.push(newclip.clone());
+
+					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+					action.setLoop(THREE.LoopOnce);
+					action.clampWhenFinished = true;
+					mixer.runplay = true;
+					mixers.push(mixer);
+					let device = {
+						action:action,
+						mixer:mixer,
+					};
+					deviceaction[object.children[i].name] = device;
+				}
+				if(newzhaji.children[i].name == "in04"){
+					newzhaji.children[i].animations = [];
+					newzhaji.children[i].animations.push(newclip.clone());
+
+					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+					action.setLoop(THREE.LoopOnce);
+					action.clampWhenFinished = true;
+					mixer.runplay = true;
+					mixers.push(mixer);
+					let device = {
+						action:action,
+						mixer:mixer,
+					};
+					deviceaction[object.children[i].name] = device;
+				}
+				if(newzhaji.children[i].name == "in05"){
+					newzhaji.children[i].animations = [];
+					newzhaji.children[i].animations.push(newclip.clone());
+
+					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+					action.setLoop(THREE.LoopOnce);
+					action.clampWhenFinished = true;
+					mixer.runplay = true;
+					mixers.push(mixer);
+					let device = {
+						action:action,
+						mixer:mixer,
+					};
+					deviceaction[object.children[i].name] = device;
+				}
+
+			}
+			zhajiinmodel = newzhaji;
+    	scene.add(newzhaji);
+
+		}
+
+		function initzhajioutanimation(object){
+			let mixer = new THREE.AnimationMixer(  object );
+			let newclip = object.animations[ 0 ];
+			let newzhaji = object;
+			for(let i=0;i<newzhaji.children.length;i++){
+
+				if(newzhaji.children[i].name == "out01"){
+					newzhaji.children[i].animations = [];
+					newzhaji.children[i].animations.push(newclip.clone());
+
+					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+					action.setLoop(THREE.LoopOnce);
+					action.clampWhenFinished = true;
+					mixer.runplay = true;
+					mixers.push(mixer);
+					let device = {
+						action:action,
+						mixer:mixer,
+					};
+					deviceaction[object.children[i].name] = device;
+				}
+				if(newzhaji.children[i].name == "out02"){
+					newzhaji.children[i].animations = [];
+					newzhaji.children[i].animations.push(newclip.clone());
+
+					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+					action.setLoop(THREE.LoopOnce);
+					action.clampWhenFinished = true;
+					mixer.runplay = true;
+					mixers.push(mixer);
+					let device = {
+						action:action,
+						mixer:mixer,
+					};
+					deviceaction[object.children[i].name] = device;
+				}
+				if(newzhaji.children[i].name == "out03"){
+					newzhaji.children[i].animations = [];
+					newzhaji.children[i].animations.push(newclip.clone());
+
+					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+					action.setLoop(THREE.LoopOnce);
+					action.clampWhenFinished = true;
+					mixer.runplay = true;
+					mixers.push(mixer);
+					let device = {
+						action:action,
+						mixer:mixer,
+					};
+					deviceaction[object.children[i].name] = device;
+				}
+				if(newzhaji.children[i].name == "out04"){
+					newzhaji.children[i].animations = [];
+					newzhaji.children[i].animations.push(newclip.clone());
+
+					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+					action.setLoop(THREE.LoopOnce);
+					action.clampWhenFinished = true;
+					mixer.runplay = true;
+					mixers.push(mixer);
+					let device = {
+						action:action,
+						mixer:mixer,
+					};
+					deviceaction[object.children[i].name] = device;
+				}
+				if(newzhaji.children[i].name == "out05"){
+					newzhaji.children[i].animations = [];
+					newzhaji.children[i].animations.push(newclip.clone());
+
+					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+					action.setLoop(THREE.LoopOnce);
+					action.clampWhenFinished = true;
+					mixer.runplay = true;
+					mixers.push(mixer);
+					let device = {
+						action:action,
+						mixer:mixer,
+					};
+					deviceaction[object.children[i].name] = device;
+				}
+
+			}
+			zhajioutmodel = newzhaji
+    	scene.add(newzhaji);
+		}
+
+		function zhajicontrol(type,door){
+			// console.log(door);
+			// console.log(zhajiin);
+			let devicenum = door-1;
+			if(type == "in"){
+				deviceaction[zhajiin[devicenum].id].action.reset();
+				deviceaction[zhajiin[devicenum].id].action.time = 0;
+				deviceaction[zhajiin[devicenum].id].action.timeScale = 1;
+				deviceaction[zhajiin[devicenum].id].action.play();
+			}else if(type == "out"){
+				deviceaction[zhajiout[devicenum].id].action.reset();
+				deviceaction[zhajiout[devicenum].id].action.time = 0;
+				deviceaction[zhajiout[devicenum].id].action.timeScale = 1;
+				deviceaction[zhajiout[devicenum].id].action.play();
+			}
+
+		}
+
+		function monitorrender() {
+
+			// updateSize();
+
+			for ( var ii = 0; ii < views.length; ++ ii ) {
+
+				var view = views[ ii ];
+				var camera = view.camera;
+
+				// view.updateCamera( camera, scene, mouseX, mouseY );
+
+				var left = Math.floor( windowWidth * view.left );
+				var bottom = Math.floor( windowHeight * view.bottom );
+				var width = Math.floor( windowWidth * view.width );
+				var height = Math.floor( windowHeight * view.height );
+
+				renderer.setViewport( left, bottom, width, height );
+				renderer.setScissor( left, bottom, width, height );
+				renderer.setScissorTest( true );
+
+				camera.aspect = width / height;
+				camera.updateProjectionMatrix();
+
+				renderer.render( scene, camera );
+
+			}
+
+		}
+
+}
diff --git a/src/jlmap3d/jl3dpassflow/model/humanmanager.js b/src/jlmap3d/jl3dpassflow/model/humanmanager.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/jlmap3d/jl3dpassflow/model/humanmodel.js b/src/jlmap3d/jl3dpassflow/model/humanmodel.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/jlmap3d/jl3dpassflow/model/zonemanager.js b/src/jlmap3d/jl3dpassflow/model/zonemanager.js
new file mode 100644
index 000000000..ef7c16c1d
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/model/zonemanager.js
@@ -0,0 +1,136 @@
+import { ZoneModel } from '@/jlmap3d/jl3dpassflow/model/zonemodel.js';
+
+let enter1 = {
+  code : '001',
+  name : "enter1",
+  type : "normal",
+  stage : "0",
+  railpoints : [
+    new THREE.Vector3(34,9.8,-6),
+    new THREE.Vector3(32,9.8,-6)
+  ]
+};
+
+let enter2 = {
+  code : '002',
+  name : "enter2",
+  type : "normal",
+  stage : "0",
+  railpoints : [
+    new THREE.Vector3(35,9.8,31.5),
+    new THREE.Vector3(31,9.8,31.5)
+  ]
+};
+
+let security = {
+  code : '003',
+  name : "security",
+  type : "device",
+  stage : "1",
+  railpoints : [
+    new THREE.Vector3(20.5,9.8,18),
+    new THREE.Vector3(21,9.8,21)
+  ]
+};
+
+let entergate = {
+  code : '004',
+  name : "entergate",
+  type : "device",
+  stage : "2",
+  railpoints : [
+    new THREE.Vector3(6.3,9.8,17.4),
+    new THREE.Vector3(4.8,9.8,17.4),
+    new THREE.Vector3(3.4,9.8,17.4),
+    new THREE.Vector3(2.1,9.8,17.4),
+    new THREE.Vector3(0.7,9.8,17.4)
+  ]
+};
+
+let standtop = {
+  code : '005',
+  name : "standtop",
+  type : "stand",
+  stage : "3",
+  railpoints : [
+    new THREE.Vector3(52.1,1.77,-1.8),
+    new THREE.Vector3(-63.5,1.77,-1.8)
+  ]
+};
+
+let standdown = {
+  code : '006',
+  name : "standdown",
+  type : "stand",
+  stage : "3",
+  railpoints : [
+    new THREE.Vector3(52.1,1.77,24),
+    new THREE.Vector3(-64,1.77,24)
+  ]
+};
+//4是刚下车状态
+let exitgate = {
+  code : '007',
+  name : "exitgate",
+  type : "device",
+  stage : "5",
+  railpoints : [
+    new THREE.Vector3(18.8,9.8,-0.27),
+    new THREE.Vector3(18.8,9.8,1.18),
+    new THREE.Vector3(18.8,9.8,2.64),
+    new THREE.Vector3(18.8,9.8,4.1),
+    new THREE.Vector3(18.8,9.8,5.4)
+  ]
+};
+
+let exit1 = {
+  code : '008',
+  name : "exit1",
+  type : "normal",
+  stage : "6",
+  railpoints : [
+    new THREE.Vector3(28.2,9.8,-7),
+    new THREE.Vector3(30.5,9.8,-7.4)
+  ]
+};
+
+let exit2 = {
+  code : '009',
+  name : "exit2",
+  type : "normal",
+  stage : "6",
+  railpoints : [
+    new THREE.Vector3(28.3,9.8,28.8),
+    new THREE.Vector3(31.2,9.8,28.8)
+  ]
+};
+
+export function ZoneManager() {
+
+	var scope = this;
+
+  this.name = "test";
+
+  this.list = [];
+
+  initzone();
+
+  function initzone(){
+    scope.list[enter1.name] = new ZoneModel(enter1);
+    scope.list[enter2.name] = new ZoneModel(enter2);
+    scope.list[security.name] = new ZoneModel(security);
+    scope.list[entergate.name] = new ZoneModel(entergate);
+    scope.list[standtop.name] = new ZoneModel(standtop);
+    scope.list[standdown.name] = new ZoneModel(standdown);
+    scope.list[exitgate.name] = new ZoneModel(exitgate);
+    scope.list[exit1.name] = new ZoneModel(exit1);
+    scope.list[exit2.name] = new ZoneModel(exit2);
+  }
+
+  this.getzoneposition = function(name){
+    // let random = Math.random();
+    let position = scope.list[name].railline.getPointAt(Math.random());
+    return position;
+  }
+
+}
diff --git a/src/jlmap3d/jl3dpassflow/model/zonemodel.js b/src/jlmap3d/jl3dpassflow/model/zonemodel.js
new file mode 100644
index 000000000..8d18ebde5
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/model/zonemodel.js
@@ -0,0 +1,15 @@
+export function  ZoneModel(data) {
+	var scope = this;
+  //code
+  this.code = data.code;
+	//命名
+	this.name = data.name;
+  this.type = data.type;
+	this.stage = data.stage;
+  this.status = 0;
+	//轨迹点
+	this.railpoints = data.railpoints;
+
+	this.railline = new THREE.CatmullRomCurve3(data.railpoints);
+
+}
diff --git a/src/jlmap3d/jl3dpassflow/utils/AStar.js b/src/jlmap3d/jl3dpassflow/utils/AStar.js
new file mode 100644
index 000000000..2bc6fb469
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/utils/AStar.js
@@ -0,0 +1,123 @@
+import { BinaryHeap } from './BinaryHeap';
+import { Utils } from './Utils.js';
+
+class AStar {
+  static init (graph) {
+    for (let x = 0; x < graph.length; x++) {
+      //for(var x in graph) {
+      const node = graph[x];
+      node.f = 0;
+      node.g = 0;
+      node.h = 0;
+      node.cost = 1.0;
+      node.visited = false;
+      node.closed = false;
+      node.parent = null;
+    }
+  }
+
+  static cleanUp (graph) {
+    for (let x = 0; x < graph.length; x++) {
+      const node = graph[x];
+      delete node.f;
+      delete node.g;
+      delete node.h;
+      delete node.cost;
+      delete node.visited;
+      delete node.closed;
+      delete node.parent;
+    }
+  }
+
+  static heap () {
+    return new BinaryHeap(function (node) {
+      return node.f;
+    });
+  }
+
+  static search (graph, start, end) {
+    this.init(graph);
+    //heuristic = heuristic || astar.manhattan;
+
+
+    const openHeap = this.heap();
+
+    openHeap.push(start);
+
+    while (openHeap.size() > 0) {
+
+      // Grab the lowest f(x) to process next.  Heap keeps this sorted for us.
+      const currentNode = openHeap.pop();
+
+      // End case -- result has been found, return the traced path.
+      if (currentNode === end) {
+        let curr = currentNode;
+        const ret = [];
+        while (curr.parent) {
+          ret.push(curr);
+          curr = curr.parent;
+        }
+        this.cleanUp(ret);
+        return ret.reverse();
+      }
+
+      // Normal case -- move currentNode from open to closed, process each of its neighbours.
+      currentNode.closed = true;
+
+      // Find all neighbours for the current node. Optionally find diagonal neighbours as well (false by default).
+      const neighbours = this.neighbours(graph, currentNode);
+
+      for (let i = 0, il = neighbours.length; i < il; i++) {
+        const neighbour = neighbours[i];
+
+        if (neighbour.closed) {
+          // Not a valid node to process, skip to next neighbour.
+          continue;
+        }
+
+        // The g score is the shortest distance from start to current node.
+        // We need to check if the path we have arrived at this neighbour is the shortest one we have seen yet.
+        const gScore = currentNode.g + neighbour.cost;
+        const beenVisited = neighbour.visited;
+
+        if (!beenVisited || gScore < neighbour.g) {
+
+          // Found an optimal (so far) path to this node.  Take score for node to see how good it is.
+          neighbour.visited = true;
+          neighbour.parent = currentNode;
+          if (!neighbour.centroid || !end.centroid) throw new Error('Unexpected state');
+          neighbour.h = neighbour.h || this.heuristic(neighbour.centroid, end.centroid);
+          neighbour.g = gScore;
+          neighbour.f = neighbour.g + neighbour.h;
+
+          if (!beenVisited) {
+            // Pushing to heap will put it in proper place based on the 'f' value.
+            openHeap.push(neighbour);
+          } else {
+            // Already seen the node, but since it has been rescored we need to reorder it in the heap
+            openHeap.rescoreElement(neighbour);
+          }
+        }
+      }
+    }
+
+    // No result was found - empty array signifies failure to find path.
+    return [];
+  }
+
+  static heuristic (pos1, pos2) {
+    return Utils.distanceToSquared(pos1, pos2);
+  }
+
+  static neighbours (graph, node) {
+    const ret = [];
+
+    for (let e = 0; e < node.neighbours.length; e++) {
+      ret.push(graph[node.neighbours[e]]);
+    }
+
+    return ret;
+  }
+}
+
+export { AStar };
diff --git a/src/jlmap3d/jl3dpassflow/utils/BinaryHeap.js b/src/jlmap3d/jl3dpassflow/utils/BinaryHeap.js
new file mode 100644
index 000000000..07e4fac18
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/utils/BinaryHeap.js
@@ -0,0 +1,134 @@
+// javascript-astar
+// http://github.com/bgrins/javascript-astar
+// Freely distributable under the MIT License.
+// Implements the astar search algorithm in javascript using a binary heap.
+
+class BinaryHeap {
+  constructor (scoreFunction) {
+    this.content = [];
+    this.scoreFunction = scoreFunction;
+  }
+
+  push (element) {
+    // Add the new element to the end of the array.
+    this.content.push(element);
+
+    // Allow it to sink down.
+    this.sinkDown(this.content.length - 1);
+  }
+
+  pop () {
+    // Store the first element so we can return it later.
+    const result = this.content[0];
+    // Get the element at the end of the array.
+    const end = this.content.pop();
+    // If there are any elements left, put the end element at the
+    // start, and let it bubble up.
+    if (this.content.length > 0) {
+      this.content[0] = end;
+      this.bubbleUp(0);
+    }
+    return result;
+  }
+
+  remove (node) {
+    const i = this.content.indexOf(node);
+
+    // When it is found, the process seen in 'pop' is repeated
+    // to fill up the hole.
+    const end = this.content.pop();
+
+    if (i !== this.content.length - 1) {
+      this.content[i] = end;
+
+      if (this.scoreFunction(end) < this.scoreFunction(node)) {
+        this.sinkDown(i);
+      } else {
+        this.bubbleUp(i);
+      }
+    }
+  }
+
+  size () {
+    return this.content.length;
+  }
+
+  rescoreElement (node) {
+    this.sinkDown(this.content.indexOf(node));
+  }
+
+  sinkDown (n) {
+    // Fetch the element that has to be sunk.
+    const element = this.content[n];
+
+    // When at 0, an element can not sink any further.
+    while (n > 0) {
+      // Compute the parent element's index, and fetch it.
+      const parentN = ((n + 1) >> 1) - 1;
+      const parent = this.content[parentN];
+
+      if (this.scoreFunction(element) < this.scoreFunction(parent)) {
+        // Swap the elements if the parent is greater.
+        this.content[parentN] = element;
+        this.content[n] = parent;
+        // Update 'n' to continue at the new position.
+        n = parentN;
+      } else {
+        // Found a parent that is less, no need to sink any further.
+        break;
+      }
+    }
+  }
+
+  bubbleUp (n) {
+    // Look up the target element and its score.
+    const length = this.content.length,
+      element = this.content[n],
+      elemScore = this.scoreFunction(element);
+
+    while (true) {
+      // Compute the indices of the child elements.
+      const child2N = (n + 1) << 1,
+        child1N = child2N - 1;
+      // This is used to store the new position of the element,
+      // if any.
+      let swap = null;
+      let child1Score;
+      // If the first child exists (is inside the array)...
+      if (child1N < length) {
+        // Look it up and compute its score.
+        const child1 = this.content[child1N];
+        child1Score = this.scoreFunction(child1);
+
+        // If the score is less than our element's, we need to swap.
+        if (child1Score < elemScore) {
+          swap = child1N;
+        }
+      }
+
+      // Do the same checks for the other child.
+      if (child2N < length) {
+        const child2 = this.content[child2N],
+          child2Score = this.scoreFunction(child2);
+        if (child2Score < (swap === null ? elemScore : child1Score)) {
+          swap = child2N;
+        }
+      }
+
+      // If the element needs to be moved, swap it, and continue.
+      if (swap !== null) {
+        this.content[n] = this.content[swap];
+        this.content[swap] = element;
+        n = swap;
+      }
+
+      // Otherwise, we are done.
+      else {
+        break;
+      }
+    }
+  }
+
+}
+
+export { BinaryHeap };
diff --git a/src/jlmap3d/jl3dpassflow/utils/Builder.js b/src/jlmap3d/jl3dpassflow/utils/Builder.js
new file mode 100644
index 000000000..2c4a44749
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/utils/Builder.js
@@ -0,0 +1,200 @@
+import {
+  Vector3,
+} from 'three';
+
+import { Utils } from './Utils';
+
+class Builder {
+  /**
+   * Constructs groups from the given navigation mesh.
+   * @param  {Geometry} geometry
+   * @return {Zone}
+   */
+  static buildZone (geometry) {
+
+    const navMesh = this._buildNavigationMesh(geometry);
+
+    const zone = {};
+
+    navMesh.vertices.forEach((v) => {
+      v.x = Utils.roundNumber(v.x, 2);
+      v.y = Utils.roundNumber(v.y, 2);
+      v.z = Utils.roundNumber(v.z, 2);
+    });
+
+    zone.vertices = navMesh.vertices;
+
+    const groups = this._buildPolygonGroups(navMesh);
+
+    // TODO: This block represents a large portion of navigation mesh construction time
+    // and could probably be optimized. For example, construct portals while
+    // determining the neighbor graph.
+    zone.groups = new Array(groups.length);
+    groups.forEach((group, groupIndex) => {
+
+      const indexByPolygon = new Map(); // { polygon: index in group }
+      group.forEach((poly, polyIndex) => { indexByPolygon.set(poly, polyIndex); });
+
+      const newGroup = new Array(group.length);
+      group.forEach((poly, polyIndex) => {
+
+        const neighbourIndices = [];
+        poly.neighbours.forEach((n) => neighbourIndices.push(indexByPolygon.get(n)));
+
+        // Build a portal list to each neighbour
+        const portals = [];
+        poly.neighbours.forEach((n) => portals.push(this._getSharedVerticesInOrder(poly, n)));
+
+        const centroid = new Vector3( 0, 0, 0 );
+        centroid.add( zone.vertices[ poly.vertexIds[0] ] );
+        centroid.add( zone.vertices[ poly.vertexIds[1] ] );
+        centroid.add( zone.vertices[ poly.vertexIds[2] ] );
+        centroid.divideScalar( 3 );
+        centroid.x = Utils.roundNumber(centroid.x, 2);
+        centroid.y = Utils.roundNumber(centroid.y, 2);
+        centroid.z = Utils.roundNumber(centroid.z, 2);
+
+        newGroup[polyIndex] = {
+          id: polyIndex,
+          neighbours: neighbourIndices,
+          vertexIds: poly.vertexIds,
+          centroid: centroid,
+          portals: portals
+        };
+      });
+
+      zone.groups[groupIndex] = newGroup;
+    });
+
+    return zone;
+  }
+
+  /**
+   * Constructs a navigation mesh from the given geometry.
+   * @param {Geometry} geometry
+   * @return {Object}
+   */
+  static _buildNavigationMesh (geometry) {
+    geometry.mergeVertices();
+    return this._buildPolygonsFromGeometry(geometry);
+  }
+
+  static _buildPolygonGroups (navigationMesh) {
+
+    const polygons = navigationMesh.polygons;
+
+    const polygonGroups = [];
+
+    const spreadGroupId = function (polygon) {
+      polygon.neighbours.forEach((neighbour) => {
+        if (neighbour.group === undefined) {
+          neighbour.group = polygon.group;
+          spreadGroupId(neighbour);
+        }
+      });
+    };
+
+    polygons.forEach((polygon) => {
+      if (polygon.group !== undefined) {
+        // this polygon is already part of a group
+        polygonGroups[polygon.group].push(polygon);
+      } else {
+        // we need to make a new group and spread its ID to neighbors
+        polygon.group = polygonGroups.length;
+        spreadGroupId(polygon);
+        polygonGroups.push([polygon]);
+      }
+    });
+
+    return polygonGroups;
+  }
+
+  static _buildPolygonNeighbours (polygon, vertexPolygonMap) {
+    const neighbours = new Set();
+
+    const groupA = vertexPolygonMap[polygon.vertexIds[0]];
+    const groupB = vertexPolygonMap[polygon.vertexIds[1]];
+    const groupC = vertexPolygonMap[polygon.vertexIds[2]];
+
+    // It's only necessary to iterate groups A and B. Polygons contained only
+    // in group C cannot share a >1 vertex with this polygon.
+    // IMPORTANT: Bublé cannot compile for-of loops.
+    groupA.forEach((candidate) => {
+      if (candidate === polygon) return;
+      if (groupB.includes(candidate) || groupC.includes(candidate)) {
+        neighbours.add(candidate);
+      }
+    });
+    groupB.forEach((candidate) => {
+      if (candidate === polygon) return;
+      if (groupC.includes(candidate)) {
+        neighbours.add(candidate);
+      }
+    });
+
+    return neighbours;
+  }
+
+  static _buildPolygonsFromGeometry (geometry) {
+
+    const polygons = [];
+    const vertices = geometry.vertices;
+
+    // Constructing the neighbor graph brute force is O(n²). To avoid that,
+    // create a map from vertices to the polygons that contain them, and use it
+    // while connecting polygons. This reduces complexity to O(n*m), where 'm'
+    // is related to connectivity of the mesh.
+    const vertexPolygonMap = new Array(vertices.length); // array of polygon objects by vertex index
+    for (let i = 0; i < vertices.length; i++) {
+      vertexPolygonMap[i] = [];
+    }
+
+    // Convert the faces into a custom format that supports more than 3 vertices
+    geometry.faces.forEach((face) => {
+      const poly = { vertexIds: [face.a, face.b, face.c], neighbours: null };
+      polygons.push(poly);
+      vertexPolygonMap[face.a].push(poly);
+      vertexPolygonMap[face.b].push(poly);
+      vertexPolygonMap[face.c].push(poly);
+    });
+
+    // Build a list of adjacent polygons
+    polygons.forEach((polygon) => {
+      polygon.neighbours = this._buildPolygonNeighbours(polygon, vertexPolygonMap);
+    });
+
+    return {
+      polygons: polygons,
+      vertices: vertices
+    };
+  }
+
+  static _getSharedVerticesInOrder (a, b) {
+
+    const aList = a.vertexIds;
+    const a0 = aList[0], a1 = aList[1], a2 = aList[2];
+
+    const bList = b.vertexIds;
+    const shared0 = bList.includes(a0);
+    const shared1 = bList.includes(a1);
+    const shared2 = bList.includes(a2);
+
+    // it seems that we shouldn't have an a and b with <2 shared vertices here unless there's a bug
+    // in the neighbor identification code, or perhaps a malformed input geometry; 3 shared vertices
+    // is a kind of embarrassing but possible geometry we should handle
+    if (shared0 && shared1 && shared2) {
+      return Array.from(aList);
+    } else if (shared0 && shared1) {
+      return [a0, a1];
+    } else if (shared1 && shared2) {
+      return [a1, a2];
+    } else if (shared0 && shared2) {
+      return [a2, a0]; // this ordering will affect the string pull algorithm later, not clear if significant
+    } else {
+      console.warn("Error processing navigation mesh neighbors; neighbors with <2 shared vertices found.");
+      return [];
+    }
+  }
+}
+
+export { Builder };
diff --git a/src/jlmap3d/jl3dpassflow/utils/Channel.js b/src/jlmap3d/jl3dpassflow/utils/Channel.js
new file mode 100644
index 000000000..1850bd2f7
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/utils/Channel.js
@@ -0,0 +1,93 @@
+import { Utils } from './Utils';
+
+class Channel {
+  constructor () {
+    this.portals = [];
+  }
+
+  push (p1, p2) {
+    if (p2 === undefined) p2 = p1;
+    this.portals.push({
+      left: p1,
+      right: p2
+    });
+  }
+
+  stringPull () {
+    const portals = this.portals;
+    const pts = [];
+    // Init scan state
+    let portalApex, portalLeft, portalRight;
+    let apexIndex = 0,
+      leftIndex = 0,
+      rightIndex = 0;
+
+    portalApex = portals[0].left;
+    portalLeft = portals[0].left;
+    portalRight = portals[0].right;
+
+    // Add start point.
+    pts.push(portalApex);
+
+    for (let i = 1; i < portals.length; i++) {
+      const left = portals[i].left;
+      const right = portals[i].right;
+
+      // Update right vertex.
+      if (Utils.triarea2(portalApex, portalRight, right) <= 0.0) {
+        if (Utils.vequal(portalApex, portalRight) || Utils.triarea2(portalApex, portalLeft, right) > 0.0) {
+          // Tighten the funnel.
+          portalRight = right;
+          rightIndex = i;
+        } else {
+          // Right over left, insert left to path and restart scan from portal left point.
+          pts.push(portalLeft);
+          // Make current left the new apex.
+          portalApex = portalLeft;
+          apexIndex = leftIndex;
+          // Reset portal
+          portalLeft = portalApex;
+          portalRight = portalApex;
+          leftIndex = apexIndex;
+          rightIndex = apexIndex;
+          // Restart scan
+          i = apexIndex;
+          continue;
+        }
+      }
+
+      // Update left vertex.
+      if (Utils.triarea2(portalApex, portalLeft, left) >= 0.0) {
+        if (Utils.vequal(portalApex, portalLeft) || Utils.triarea2(portalApex, portalRight, left) < 0.0) {
+          // Tighten the funnel.
+          portalLeft = left;
+          leftIndex = i;
+        } else {
+          // Left over right, insert right to path and restart scan from portal right point.
+          pts.push(portalRight);
+          // Make current right the new apex.
+          portalApex = portalRight;
+          apexIndex = rightIndex;
+          // Reset portal
+          portalLeft = portalApex;
+          portalRight = portalApex;
+          leftIndex = apexIndex;
+          rightIndex = apexIndex;
+          // Restart scan
+          i = apexIndex;
+          continue;
+        }
+      }
+    }
+
+    if ((pts.length === 0) || (!Utils.vequal(pts[pts.length - 1], portals[portals.length - 1].left))) {
+      // Append last point to path.
+      pts.push(portals[portals.length - 1].left);
+    }
+
+    this.path = pts;
+    return pts;
+  }
+}
+
+export { Channel };
diff --git a/src/jlmap3d/jl3dpassflow/utils/Pathfinding.js b/src/jlmap3d/jl3dpassflow/utils/Pathfinding.js
new file mode 100644
index 000000000..be7925f58
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/utils/Pathfinding.js
@@ -0,0 +1,315 @@
+import {
+	Vector3,
+	Plane,
+	Geometry,
+	Triangle,
+} from 'three';
+
+import { Utils } from './Utils';
+import { AStar } from './AStar';
+import { Builder } from './Builder';
+import { Channel } from './Channel';
+
+/**
+ * Defines an instance of the pathfinding module, with one or more zones.
+ */
+class Pathfinding {
+	constructor () {
+		this.zones = {};
+	}
+
+	/**
+	 * (Static) Builds a zone/node set from navigation mesh geometry.
+	 * @param  {BufferGeometry} geometry
+	 * @return {Zone}
+	 */
+	static createZone (geometry) {
+		if ( geometry.isGeometry ) {
+			// Haven't actually implemented support for BufferGeometry yet, but Geometry is somewhat
+			// not-recommended these days, so go ahead and start warning.
+			console.warn('[three-pathfinding]: Use BufferGeometry, not Geometry, to create zone.');
+		} else {
+			geometry = new Geometry().fromBufferGeometry(geometry);
+		}
+
+		return Builder.buildZone(geometry);
+	}
+
+	/**
+	 * Sets data for the given zone.
+	 * @param {string} zoneID
+	 * @param {Zone} zone
+	 */
+	setZoneData (zoneID, zone) {
+		this.zones[zoneID] = zone;
+	}
+
+	/**
+	 * Returns a random node within a given range of a given position.
+	 * @param  {string} zoneID
+	 * @param  {number} groupID
+	 * @param  {Vector3} nearPosition
+	 * @param  {number} nearRange
+	 * @return {Node}
+	 */
+	getRandomNode (zoneID, groupID, nearPosition, nearRange) {
+
+		if (!this.zones[zoneID]) return new Vector3();
+
+		nearPosition = nearPosition || null;
+		nearRange = nearRange || 0;
+
+		const candidates = [];
+		const polygons = this.zones[zoneID].groups[groupID];
+
+		polygons.forEach((p) => {
+			if (nearPosition && nearRange) {
+				if (Utils.distanceToSquared(nearPosition, p.centroid) < nearRange * nearRange) {
+					candidates.push(p.centroid);
+				}
+			} else {
+				candidates.push(p.centroid);
+			}
+		});
+
+		return Utils.sample(candidates) || new Vector3();
+	}
+
+	/**
+	 * Returns the closest node to the target position.
+	 * @param  {Vector3} position
+	 * @param  {string}  zoneID
+	 * @param  {number}  groupID
+	 * @param  {boolean} checkPolygon
+	 * @return {Node}
+	 */
+	getClosestNode (position, zoneID, groupID, checkPolygon = false) {
+		const nodes = this.zones[zoneID].groups[groupID];
+		const vertices = this.zones[zoneID].vertices;
+		let closestNode = null;
+		let closestDistance = Infinity;
+
+		nodes.forEach((node) => {
+			const distance = Utils.distanceToSquared(node.centroid, position);
+			if (distance < closestDistance
+					&& (!checkPolygon || Utils.isVectorInPolygon(position, node, vertices))) {
+				closestNode = node;
+				closestDistance = distance;
+			}
+		});
+
+		return closestNode;
+	}
+
+	/**
+	 * Returns a path between given start and end points. If a complete path
+	 * cannot be found, will return the nearest endpoint available.
+	 *
+	 * @param  {Vector3} startPosition Start position.
+	 * @param  {Vector3} targetPosition Destination.
+	 * @param  {string} zoneID ID of current zone.
+	 * @param  {number} groupID Current group ID.
+	 * @return {Array<Vector3>} Array of points defining the path.
+	 */
+	findPath (startPosition, targetPosition, zoneID, groupID) {
+		const nodes = this.zones[zoneID].groups[groupID];
+		const vertices = this.zones[zoneID].vertices;
+
+		const closestNode = this.getClosestNode(startPosition, zoneID, groupID, true);
+		const farthestNode = this.getClosestNode(targetPosition, zoneID, groupID, true);
+
+		// If we can't find any node, just go straight to the target
+		if (!closestNode || !farthestNode) {
+			return null;
+		}
+
+		const paths = AStar.search(nodes, closestNode, farthestNode);
+
+		const getPortalFromTo = function (a, b) {
+			for (var i = 0; i < a.neighbours.length; i++) {
+				if (a.neighbours[i] === b.id) {
+					return a.portals[i];
+				}
+			}
+		};
+
+		// We have the corridor, now pull the rope.
+		const channel = new Channel();
+		channel.push(startPosition);
+		for (let i = 0; i < paths.length; i++) {
+			const polygon = paths[i];
+			const nextPolygon = paths[i + 1];
+
+			if (nextPolygon) {
+				const portals = getPortalFromTo(polygon, nextPolygon);
+				channel.push(
+					vertices[portals[0]],
+					vertices[portals[1]]
+				);
+			}
+		}
+		channel.push(targetPosition);
+		channel.stringPull();
+
+		// Return the path, omitting first position (which is already known).
+		const path = channel.path.map((c) => new Vector3(c.x, c.y, c.z));
+		path.shift();
+		return path;
+	}
+}
+
+/**
+ * Returns closest node group ID for given position.
+ * @param  {string} zoneID
+ * @param  {Vector3} position
+ * @return {number}
+ */
+Pathfinding.prototype.getGroup = (function() {
+	const plane = new Plane();
+	return function (zoneID, position, checkPolygon = false) {
+		if (!this.zones[zoneID]) return null;
+
+		let closestNodeGroup = null;
+		let distance = Math.pow(50, 2);
+		const zone = this.zones[zoneID];
+
+		for (let i = 0; i < zone.groups.length; i++) {
+			const group = zone.groups[i];
+			for (const node of group) {
+				if (checkPolygon) {
+					plane.setFromCoplanarPoints(
+						zone.vertices[node.vertexIds[0]],
+						zone.vertices[node.vertexIds[1]],
+						zone.vertices[node.vertexIds[2]]
+					);
+					if (Math.abs(plane.distanceToPoint(position)) < 0.01) {
+						const poly = [
+							zone.vertices[node.vertexIds[0]],
+							zone.vertices[node.vertexIds[1]],
+							zone.vertices[node.vertexIds[2]]
+						];
+						if(Utils.isPointInPoly(poly, position)) {
+							return i;
+						}
+					}
+				}
+				const measuredDistance = Utils.distanceToSquared(node.centroid, position);
+				if (measuredDistance < distance) {
+					closestNodeGroup = i;
+					distance = measuredDistance;
+				}
+			}
+		}
+
+		return closestNodeGroup;
+	};
+}());
+
+/**
+ * Clamps a step along the navmesh, given start and desired endpoint. May be
+ * used to constrain first-person / WASD controls.
+ *
+ * @param  {Vector3} start
+ * @param  {Vector3} end Desired endpoint.
+ * @param  {Node} node
+ * @param  {string} zoneID
+ * @param  {number} groupID
+ * @param  {Vector3} endTarget Updated endpoint.
+ * @return {Node} Updated node.
+ */
+Pathfinding.prototype.clampStep = (function () {
+	const point = new Vector3();
+	const plane = new Plane();
+	const triangle = new Triangle();
+
+	const endPoint = new Vector3();
+
+	let closestNode;
+	let closestPoint = new Vector3();
+	let closestDistance;
+
+	return function (startRef, endRef, node, zoneID, groupID, endTarget) {
+		const vertices = this.zones[zoneID].vertices;
+		const nodes = this.zones[zoneID].groups[groupID];
+
+		const nodeQueue = [node];
+		const nodeDepth = {};
+		nodeDepth[node.id] = 0;
+
+		closestNode = undefined;
+		closestPoint.set(0, 0, 0);
+		closestDistance = Infinity;
+
+		// Project the step along the current node.
+		plane.setFromCoplanarPoints(
+			vertices[node.vertexIds[0]],
+			vertices[node.vertexIds[1]],
+			vertices[node.vertexIds[2]]
+		);
+		plane.projectPoint(endRef, point);
+		endPoint.copy(point);
+
+		for (let currentNode = nodeQueue.pop(); currentNode; currentNode = nodeQueue.pop()) {
+
+			triangle.set(
+				vertices[currentNode.vertexIds[0]],
+				vertices[currentNode.vertexIds[1]],
+				vertices[currentNode.vertexIds[2]]
+			);
+
+			triangle.closestPointToPoint(endPoint, point);
+
+			if (point.distanceToSquared(endPoint) < closestDistance) {
+				closestNode = currentNode;
+				closestPoint.copy(point);
+				closestDistance = point.distanceToSquared(endPoint);
+			}
+
+			const depth = nodeDepth[currentNode.id];
+			if (depth > 2) continue;
+
+			for (let i = 0; i < currentNode.neighbours.length; i++) {
+				const neighbour = nodes[currentNode.neighbours[i]];
+				if (neighbour.id in nodeDepth) continue;
+
+				nodeQueue.push(neighbour);
+				nodeDepth[neighbour.id] = depth + 1;
+			}
+		}
+
+		endTarget.copy(closestPoint);
+		return closestNode;
+	};
+}());
+
+/**
+ * Defines a zone of interconnected groups on a navigation mesh.
+ *
+ * @type {Object}
+ * @property {Array<Group>} groups
+ * @property {Array<Vector3>} vertices
+ */
+const Zone = {}; // jshint ignore:line
+
+/**
+ * Defines a group within a navigation mesh.
+ *
+ * @type {Object}
+ */
+const Group = {}; // jshint ignore:line
+
+/**
+ * Defines a node (or polygon) within a group.
+ *
+ * @type {Object}
+ * @property {number} id
+ * @property {Array<number>} neighbours IDs of neighboring nodes.
+ * @property {Array<number>} vertexIds
+ * @property {Vector3} centroid
+ * @property {Array<Array<number>>} portals Array of portals, each defined by two vertex IDs.
+ * @property {boolean} closed
+ * @property {number} cost
+ */
+const Node = {}; // jshint ignore:line
+
+export { Pathfinding };
diff --git a/src/jlmap3d/jl3dpassflow/utils/PathfindingHelper.js b/src/jlmap3d/jl3dpassflow/utils/PathfindingHelper.js
new file mode 100644
index 000000000..20a869e9c
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/utils/PathfindingHelper.js
@@ -0,0 +1,53 @@
+import {
+  Color,
+  Object3D,
+  LineBasicMaterial,
+  MeshBasicMaterial,
+  SphereBufferGeometry,
+  BoxGeometry,
+  Mesh,
+  SphereGeometry,
+  Geometry,
+  Vector3,
+  Line,
+} from 'three';
+
+const OFFSET = 0.2;
+
+/**
+ * Helper for debugging pathfinding behavior.
+ */
+class PathfindingHelper extends Object3D {
+  constructor () {
+    super();
+
+    this._playerMarker = null;
+
+    this._markers = [
+      this._playerMarker,
+    ];
+
+    this._markers.forEach( ( marker ) => {
+      this.add( marker );
+
+    } );
+
+  }
+
+
+
+  /**
+   * @param {Vector3} position
+   * @return {this}
+   */
+  setPlayerPosition( position ) {
+    // this._playerMarker.lookAt(position);
+    this._playerMarker.position.copy( position );
+    return this;
+
+  }
+
+
+}
+
+export { PathfindingHelper };
diff --git a/src/jlmap3d/jl3dpassflow/utils/Utils.js b/src/jlmap3d/jl3dpassflow/utils/Utils.js
new file mode 100644
index 000000000..d8a80b574
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/utils/Utils.js
@@ -0,0 +1,66 @@
+class Utils {
+
+  static roundNumber (value, decimals) {
+    const factor = Math.pow(10, decimals);
+    return Math.round(value * factor) / factor;
+  }
+
+  static sample (list) {
+    return list[Math.floor(Math.random() * list.length)];
+  }
+
+  static distanceToSquared (a, b) {
+
+    var dx = a.x - b.x;
+    var dy = a.y - b.y;
+    var dz = a.z - b.z;
+
+    return dx * dx + dy * dy + dz * dz;
+
+  }
+
+  //+ Jonas Raoni Soares Silva
+  //@ http://jsfromhell.com/math/is-point-in-poly [rev. #0]
+  static isPointInPoly (poly, pt) {
+    for (var c = false, i = -1, l = poly.length, j = l - 1; ++i < l; j = i)
+      ((poly[i].z <= pt.z && pt.z < poly[j].z) || (poly[j].z <= pt.z && pt.z < poly[i].z)) && (pt.x < (poly[j].x - poly[i].x) * (pt.z - poly[i].z) / (poly[j].z - poly[i].z) + poly[i].x) && (c = !c);
+    return c;
+  }
+
+  static isVectorInPolygon (vector, polygon, vertices) {
+
+    // reference point will be the centroid of the polygon
+    // We need to rotate the vector as well as all the points which the polygon uses
+
+    var lowestPoint = 100000;
+    var highestPoint = -100000;
+
+    var polygonVertices = [];
+
+    polygon.vertexIds.forEach((vId) => {
+      lowestPoint = Math.min(vertices[vId].y, lowestPoint);
+      highestPoint = Math.max(vertices[vId].y, highestPoint);
+      polygonVertices.push(vertices[vId]);
+    });
+
+    if (vector.y < highestPoint + 0.5 && vector.y > lowestPoint - 0.5 &&
+      this.isPointInPoly(polygonVertices, vector)) {
+      return true;
+    }
+    return false;
+  }
+
+  static triarea2 (a, b, c) {
+    var ax = b.x - a.x;
+    var az = b.z - a.z;
+    var bx = c.x - a.x;
+    var bz = c.z - a.z;
+    return bx * az - ax * bz;
+  }
+
+  static vequal (a, b) {
+    return this.distanceToSquared(a, b) < 0.00001;
+  }
+}
+
+export { Utils };
diff --git a/src/jlmap3d/jl3dpassflow/utils/index.js b/src/jlmap3d/jl3dpassflow/utils/index.js
new file mode 100644
index 000000000..bd702f6f9
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/utils/index.js
@@ -0,0 +1,4 @@
+import { Pathfinding } from './Pathfinding';
+import { PathfindingHelper } from './PathfindingHelper';
+
+export { Pathfinding, PathfindingHelper };
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 7cedc6817..e9046878d 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,9 +2,9 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-        BASE_API = 'http://192.168.3.6:9000'; // 旭强
+        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
diff --git a/src/views/jlmap3d/passflow/jl3dpassflow.vue b/src/views/jlmap3d/passflow/jl3dpassflow.vue
index b60de1e1b..d5d1f4068 100644
--- a/src/views/jlmap3d/passflow/jl3dpassflow.vue
+++ b/src/views/jlmap3d/passflow/jl3dpassflow.vue
@@ -30,7 +30,7 @@ export default {
         return {
             jl3d: null,
             rendermode:'监控视角',
-            renderswitch:true
+            renderswitch:false
         };
     },
     computed: {
diff --git a/static/model/path/path.obj b/static/model/path/path.obj
new file mode 100644
index 000000000..279d3e50d
--- /dev/null
+++ b/static/model/path/path.obj
@@ -0,0 +1,2339 @@
+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# File Created: 26.05.2020 14:22:29
+
+mtllib path1.mtl
+
+#
+# object Object003
+#
+
+v  -8.9962 1.7700 -3.8817
+v  -8.9962 1.7700 26.4933
+v  -8.9962 1.7700 20.0796
+v  -8.9962 1.7700 3.6701
+v  -73.7774 1.7700 3.6701
+v  -73.7774 1.7700 20.0796
+v  62.6500 1.7700 20.0796
+v  62.6500 1.7700 3.6701
+v  6.5981 1.7700 -3.8817
+v  16.4686 1.7700 -3.8817
+v  33.2752 1.7700 -3.8817
+v  54.4041 1.7700 -3.8817
+v  -67.5531 1.7700 26.4933
+v  -46.4919 1.7700 26.4933
+v  -32.8491 1.7700 26.4933
+v  -19.2064 1.7700 26.4933
+v  -19.2064 1.7700 -3.8817
+v  -32.8491 1.7700 -3.8817
+v  -46.4919 1.7700 -3.8817
+v  -66.9803 1.7700 -3.8817
+v  6.5981 1.7700 26.4933
+v  16.4686 1.7700 26.4933
+v  33.2752 1.7700 26.4933
+v  55.8860 1.7700 26.4933
+v  -19.2064 1.7700 3.6701
+v  -32.8491 1.7700 3.6701
+v  -46.4919 1.7700 3.6701
+v  -66.9803 1.7700 3.6701
+v  -67.5531 1.7700 20.0796
+v  -46.4919 1.7700 20.0796
+v  -32.8491 1.7700 20.0796
+v  -19.2064 1.7700 20.0796
+v  54.4041 1.7700 3.6701
+v  33.2752 1.7700 3.6701
+v  16.4686 1.7700 3.6701
+v  6.5981 1.7700 3.6701
+v  6.5981 1.7700 20.0796
+v  16.4686 1.7700 20.0796
+v  33.2752 1.7700 20.0796
+v  55.8860 1.7700 20.0796
+v  -73.7774 1.7700 7.3729
+v  -73.7774 1.7700 15.4537
+v  -64.5896 1.7700 7.3729
+v  -64.5896 1.7700 15.4537
+v  -46.3581 1.7700 10.6700
+v  -46.3581 1.7700 12.1065
+v  -64.5896 1.7700 10.0665
+v  -64.5896 1.7700 12.7601
+v  -63.4810 1.7700 12.0071
+v  -61.2585 1.7700 12.0071
+v  -54.5549 1.7700 12.0355
+v  -51.0997 1.7700 12.2997
+v  -48.2912 1.7700 11.8423
+v  -46.6636 1.7700 11.8423
+v  -46.6636 1.7700 10.6868
+v  -48.2912 1.7700 10.6868
+v  -51.0997 1.7700 10.1886
+v  -54.5549 1.7700 10.3210
+v  -61.2585 1.7700 10.4683
+v  -63.4810 1.7700 10.4683
+v  -43.0812 1.7700 26.4933
+v  -39.6705 1.7700 26.4933
+v  -36.2598 1.7700 26.4933
+v  -36.2598 1.7700 -3.8817
+v  -39.6705 1.7700 -3.8817
+v  -43.0812 1.7700 -3.8817
+v  -36.2598 1.7700 3.6701
+v  -39.6705 1.7700 3.6701
+v  -43.0812 1.7700 3.6701
+v  -43.0812 1.7700 20.0796
+v  -39.6705 1.7700 20.0796
+v  -36.2598 1.7700 20.0796
+v  -8.9962 1.7700 14.6978
+v  -8.9962 1.7700 7.9943
+v  62.6500 1.7700 14.9969
+v  62.6500 1.7700 7.5672
+v  -20.9192 1.7700 11.9786
+v  -20.9192 1.7700 10.4133
+v  -32.8491 1.7700 14.6097
+v  -32.8491 1.7700 7.9943
+v  6.5981 1.7700 11.3556
+v  6.5981 1.7700 14.6978
+v  16.4686 1.7700 7.9943
+v  16.4686 1.7700 14.6097
+v  50.4514 1.7700 14.9969
+v  50.5224 1.7700 7.5672
+v  33.2752 1.7700 14.6097
+v  33.2752 1.7700 7.9943
+v  -43.7832 1.7700 10.3643
+v  -43.7832 1.7700 11.9764
+v  -41.4092 1.7700 10.3643
+v  -41.4092 1.7700 11.9764
+v  -40.0577 1.7700 14.6097
+v  -40.0577 1.7700 7.9943
+v  -27.3418 1.7700 26.4933
+v  -23.7540 1.7700 26.4933
+v  -23.7540 1.7700 -3.8817
+v  -27.3418 1.7700 -3.8817
+v  -23.7540 1.7700 3.6701
+v  -27.3418 1.7700 3.6701
+v  -27.3418 1.7700 20.0796
+v  -23.7540 1.7700 20.0796
+v  -23.1627 1.7700 10.4133
+v  -27.3418 1.7700 7.9943
+v  -27.3418 1.7700 14.6097
+v  -23.1627 1.7700 11.9786
+v  -13.3889 1.7700 -3.8817
+v  -14.6588 1.7700 -3.8817
+v  -13.3889 1.7700 3.6701
+v  -14.6588 1.7700 3.6701
+v  -14.6588 1.7700 26.4933
+v  -10.1112 1.7700 26.4933
+v  -14.6588 1.7700 20.0796
+v  -10.1112 1.7700 20.0796
+v  -12.5445 1.7700 11.3755
+v  -18.0861 1.7700 11.3755
+v  -18.0861 1.7700 14.6978
+v  -10.6822 1.7700 14.6978
+v  -3.3044 1.7700 -3.8817
+v  2.3873 1.7700 -3.8817
+v  -3.3044 1.7700 26.4933
+v  2.3873 1.7700 26.4933
+v  -3.3044 1.7700 20.0796
+v  2.3873 1.7700 20.0796
+v  2.3873 1.7700 3.6701
+v  -3.6383 1.7700 3.6701
+v  -3.3044 1.7700 14.6978
+v  2.3873 1.7700 14.6978
+v  1.5269 1.7700 11.3556
+v  -3.6383 1.7700 7.9943
+v  -0.3188 1.7700 -3.8817
+v  -0.3188 1.7700 3.6701
+v  -0.3838 1.7700 7.9074
+v  -0.1964 1.7700 10.4165
+v  10.1563 1.7700 -3.8817
+v  12.2524 1.7700 -3.8817
+v  10.1563 1.7700 26.4933
+v  12.2524 1.7700 26.4933
+v  12.2524 1.7700 3.6701
+v  10.1563 1.7700 3.6701
+v  10.1563 1.7700 20.0796
+v  12.2524 1.7700 20.0796
+v  10.1563 1.7700 12.1642
+v  12.2524 1.7700 12.1642
+v  12.2524 1.7700 10.2589
+v  10.1563 1.7700 10.1269
+v  22.7198 1.7700 -3.8817
+v  29.1133 1.7700 -3.8817
+v  22.7198 1.7700 26.4933
+v  29.1133 1.7700 26.4933
+v  29.1133 1.7700 3.6701
+v  22.7198 1.7700 3.6701
+v  22.7198 1.7700 20.0796
+v  29.1133 1.7700 20.0796
+v  22.7198 1.7700 14.6097
+v  29.1133 1.7700 14.6097
+v  29.1133 1.7700 7.9943
+v  22.7198 1.7700 7.9943
+v  41.2768 1.7700 -3.8817
+v  46.7687 1.7700 -3.8817
+v  41.7369 1.7700 26.4933
+v  47.7302 1.7700 26.4933
+v  46.7687 1.7700 3.6701
+v  41.2768 1.7700 3.6701
+v  41.7369 1.7700 20.0796
+v  47.7302 1.7700 20.0796
+v  44.2499 1.7700 7.9943
+v  40.0714 1.7700 7.9943
+v  40.0494 1.7700 14.6097
+v  44.2038 1.7700 14.6097
+v  36.1802 1.7700 -3.8817
+v  38.1806 1.7700 -3.8817
+v  36.2437 1.7700 26.4933
+v  38.3998 1.7700 26.4933
+v  36.2437 1.7700 20.0796
+v  38.3998 1.7700 20.0796
+v  36.0109 1.7700 14.6097
+v  37.5960 1.7700 14.6097
+v  38.1806 1.7700 3.6701
+v  36.1802 1.7700 3.6701
+v  37.6065 1.7700 7.9943
+v  36.0139 1.7700 7.9943
+v  50.4791 1.7700 12.0256
+v  50.4946 1.7700 10.5785
+v  33.2752 1.7700 12.0256
+v  33.2752 1.7700 10.5785
+v  28.6630 1.7740 10.3745
+v  28.6532 1.7740 12.1864
+v  40.0628 1.7700 10.1071
+v  40.0580 1.7700 12.0256
+v  44.2218 1.7700 12.0256
+v  44.2319 1.7700 10.1071
+v  36.0127 1.7700 10.5785
+v  36.0121 1.7700 12.0256
+v  37.6001 1.7700 12.0256
+v  37.6024 1.7700 10.5785
+v  31.6495 1.7700 3.6701
+v  30.7390 1.7700 3.6701
+v  31.6495 1.7700 7.9943
+v  30.7390 1.7700 7.9943
+v  30.7390 1.7700 -3.8817
+v  31.6495 1.7700 -3.8817
+v  30.7390 1.7700 26.4933
+v  31.6495 1.7700 26.4933
+v  30.7390 1.7700 20.0796
+v  31.6495 1.7700 20.0796
+v  30.7390 1.7700 14.6097
+v  31.6495 1.7700 14.6097
+v  31.6495 1.7700 10.5785
+v  30.7390 1.7700 10.5785
+v  30.7390 1.7700 12.0256
+v  31.6495 1.7700 12.0256
+v  51.4215 1.7700 3.6701
+v  49.7513 1.7700 3.6701
+v  48.0722 1.7700 7.9943
+v  46.7001 1.7700 7.9943
+v  49.7513 1.7700 -3.8817
+v  51.4215 1.7700 -3.8817
+v  50.9161 1.7700 26.4933
+v  52.7001 1.7700 26.4933
+v  50.9161 1.7700 20.0796
+v  52.7001 1.7700 20.0796
+v  46.6443 1.7700 14.6097
+v  48.0109 1.7700 14.6097
+v  48.9139 1.7700 10.5943
+v  46.1511 1.7700 10.5173
+v  46.1265 1.7700 11.8126
+v  48.8868 1.7700 11.8126
+v  -59.5387 1.7700 11.3094
+v  -56.7749 1.7700 11.2578
+v  -56.7749 1.7700 10.1483
+v  -59.5387 1.7700 10.1516
+v  -10.5492 1.7700 -3.8817
+v  -10.5492 1.7700 3.6701
+v  -12.5445 1.7700 10.5318
+v  -8.9962 1.7700 11.3757
+v  -3.6383 1.7700 11.3757
+v  -10.3463 1.7700 10.5318
+v  -10.3443 1.7700 11.3757
+v  1.4597 1.7700 3.6701
+v  1.4597 1.7700 -3.8817
+v  1.5269 1.7700 10.4165
+v  -33.1634 9.8454 26.1474
+v  -33.7472 9.8454 14.0505
+v  -23.7444 9.8454 12.1185
+v  -22.0887 9.8454 -5.9874
+v  -33.1634 9.8454 -5.9874
+v  -33.7472 9.8454 8.5854
+v  -33.7472 9.8454 11.2184
+v  -33.7472 9.8454 14.0505
+v  -3.7582 9.8454 26.1474
+v  21.7860 9.8454 14.0505
+v  39.9530 9.8454 14.0505
+v  39.9530 9.8454 10.4284
+v  21.7860 9.8454 12.0085
+v  21.7860 9.8454 14.0505
+v  39.9530 9.8454 26.1475
+v  -8.0470 9.8454 -5.9874
+v  21.7860 9.8454 8.3750
+v  39.9530 9.8454 8.5854
+v  39.9530 9.8454 -5.9874
+v  21.7861 9.8454 -5.9874
+v  11.5320 9.8454 14.0505
+v  11.5365 9.8454 26.1474
+v  11.2845 9.8454 -5.9874
+v  -22.0887 9.8454 26.1474
+v  -24.1194 9.8454 -5.9874
+v  -24.1194 9.8454 8.5854
+v  -8.5704 9.8454 26.1474
+v  -4.4674 9.8454 -5.9874
+v  -22.5111 9.8454 14.4459
+v  11.1340 9.8454 14.2816
+v  -3.7582 9.8454 6.9394
+v  -8.5704 9.8454 6.9394
+v  0.1622 9.8454 11.7284
+v  0.1622 9.8454 14.2816
+v  -11.0396 9.8454 14.4459
+v  -50.3494 9.8454 14.0505
+v  -50.3494 9.8454 26.1474
+v  -50.3494 9.8454 8.5854
+v  -50.3494 9.8454 -5.9874
+v  -50.3494 9.8454 11.2184
+v  -38.8308 9.8454 33.3474
+v  -47.2405 9.8454 33.3474
+v  -38.8308 9.8454 30.2966
+v  -47.2405 9.8454 30.2966
+v  -37.8884 9.8454 -10.5865
+v  -48.7535 9.8454 -10.5865
+v  35.3569 9.8454 -10.3826
+v  27.1679 9.8454 -10.3826
+v  35.3542 9.8454 33.0756
+v  26.9415 9.8454 33.0756
+v  -22.0887 9.8454 8.8551
+v  -23.3414 9.8454 -5.9874
+v  -23.3414 9.8454 8.4894
+v  -8.0470 9.8454 -3.1824
+v  -4.4674 9.8454 -3.1824
+v  -43.0999 9.8454 14.0505
+v  -40.4129 9.8454 14.0505
+v  -41.8927 9.8454 11.8541
+v  -43.7034 9.8454 11.8542
+v  -40.4129 9.8454 8.5854
+v  -43.0999 9.8454 8.5854
+v  -43.7034 9.8454 10.5376
+v  -41.8927 9.8454 10.5376
+v  -8.5704 9.8454 17.2820
+v  -18.7676 9.8454 14.4459
+v  -10.9714 9.8454 14.4459
+v  -10.7366 9.8454 17.2731
+v  -18.7412 9.8454 17.2731
+v  -22.8640 9.8454 26.1474
+v  -22.9049 9.8454 14.0505
+v  -22.8985 9.8454 15.8912
+v  -12.5938 9.8454 12.1185
+v  -20.9597 9.8454 12.1185
+v  -20.9608 9.8454 10.4534
+v  -12.5916 9.8454 10.4922
+v  -22.0887 9.8454 10.4106
+v  -22.5111 9.8454 15.5681
+v  -18.7500 9.8454 15.8920
+v  -18.7588 9.8454 15.5681
+v  -22.0887 9.8454 15.8911
+v  -8.5704 9.8454 16.8646
+v  -10.7348 9.8454 16.8647
+v  -2.8450 9.8454 26.1474
+v  7.1673 9.8454 26.1474
+v  -3.7582 9.8454 17.7820
+v  -2.8828 9.8454 16.8742
+v  -7.4595 9.8454 17.8002
+v  -0.2547 9.8454 16.8708
+v  -0.2554 9.8454 17.2703
+v  1.1990 9.8454 17.2676
+v  7.3434 9.8454 17.2565
+v  7.3406 9.8454 14.2816
+v  8.5060 9.8454 15.9791
+v  7.3426 9.8454 15.9791
+v  11.1340 9.8454 15.5800
+v  9.3256 9.8454 15.5800
+v  7.3420 9.8454 15.5800
+v  -11.3478 9.8454 17.2731
+v  -11.3493 9.8454 21.9935
+v  -8.5704 9.8454 22.0052
+v  -3.7582 9.8454 22.0255
+v  -2.8618 9.8454 22.0293
+v  4.4201 9.8454 22.0600
+v  11.5320 9.8454 22.0666
+v  -10.7357 9.8454 21.4374
+v  -8.5704 9.8454 21.4387
+v  -3.7582 9.8454 21.4383
+v  -2.8636 9.8454 21.4382
+v  4.0538 9.8454 21.4376
+v  11.5320 9.8454 21.4400
+v  19.2251 9.8454 26.1474
+v  19.8916 9.8454 26.1474
+v  19.8916 9.8454 21.4431
+v  19.2251 9.8454 22.0431
+v  -10.3261 9.8454 10.4922
+v  -0.3214 9.8454 7.8960
+v  -11.0396 9.8454 12.1185
+v  -8.5997 9.8454 5.4342
+v  -3.7569 9.8454 5.4342
+v  -3.1144 9.8454 5.4672
+v  -3.0683 9.8454 7.8959
+v  -9.1031 9.8454 5.4122
+v  -8.9990 9.8454 10.2201
+v  -8.9664 9.8454 11.3080
+v  -10.3449 9.8454 11.3111
+v  -0.3199 9.8454 10.4983
+v  1.4590 9.8454 10.5012
+v  1.4621 9.8454 11.7284
+v  -11.0396 9.8454 13.7320
+v  -23.7444 9.8454 13.7320
+v  0.1622 9.8454 12.1864
+v  0.1622 9.8454 13.7280
+v  11.1340 9.8454 13.7280
+v  11.1340 9.8454 12.1864
+v  9.6834 9.8454 -5.9874
+v  9.6671 9.8454 -4.5869
+v  10.1092 9.8454 11.7284
+v  4.6861 9.8454 11.7284
+v  10.1084 9.8454 12.1864
+v  3.8194 9.8454 12.1864
+v  11.1437 9.8454 10.3745
+v  11.1542 9.8454 8.8646
+v  10.4639 9.8454 8.8646
+v  10.4639 9.8454 8.3750
+v  11.2845 9.8454 8.3750
+v  11.5409 9.8454 15.9791
+v  20.5873 9.8454 14.0505
+v  15.6336 9.8454 14.0505
+v  20.5873 9.8454 17.6729
+v  15.6336 9.8454 17.6729
+v  39.9530 9.8454 12.0085
+v  21.7860 9.8454 10.4284
+v  30.7197 9.8454 12.0085
+v  22.9972 9.8454 12.0085
+v  30.7197 9.8454 10.4284
+v  22.9972 9.8454 10.4284
+v  33.2127 9.8454 12.0085
+v  33.2127 9.8454 10.4284
+v  19.1082 9.8454 -5.9874
+v  19.1082 9.8454 8.3750
+v  21.7861 9.8454 -1.5328
+v  21.7860 9.8454 6.5719
+v  19.1082 9.8454 -1.5328
+v  19.1082 9.8454 6.5719
+v  -3.7582 6.8736 11.8549
+v  -8.5704 6.8736 11.8549
+v  -3.7582 6.8736 14.1800
+v  -8.5704 6.8736 14.1800
+v  -17.5004 1.7339 11.8549
+v  -17.5004 1.7339 14.1800
+v  5.1738 1.7622 11.8549
+v  5.1738 1.7622 14.1800
+v  -40.0577 1.7700 12.1094
+v  -40.0577 1.7700 13.6333
+v  -40.0577 1.7700 8.8954
+v  -40.0577 1.7700 10.3934
+v  12.7254 9.8454 13.7280
+v  12.7254 9.8454 12.1864
+v  12.7352 9.8454 10.3745
+v  12.7456 9.8454 8.8646
+v  30.0552 9.8454 14.0505
+v  29.4137 9.8454 16.0219
+v  27.0995 9.8454 23.1333
+v  26.9415 9.8454 26.1691
+v  33.6353 9.8454 14.0505
+v  33.8707 9.8454 15.1882
+v  35.9439 9.8454 25.2073
+v  35.3542 9.8454 26.1691
+v  30.2462 9.8454 8.4730
+v  27.1679 9.8454 -5.9896
+v  33.5236 9.8454 8.5109
+v  35.3569 9.8454 -5.9896
+v  11.2845 9.8454 -4.5869
+v  10.1053 9.8454 10.3995
+v  28.6532 1.7740 13.7280
+v  28.6734 1.7740 8.8646
+v  -38.8308 9.8454 26.1691
+v  -47.2405 9.8454 26.1691
+v  -48.7535 9.8454 -5.9896
+v  -37.8885 9.8454 -5.9896
+v  6.5981 1.7700 11.8805
+v  6.5981 1.7700 14.1989
+v  -18.0861 1.7700 11.9209
+v  -18.0861 1.7700 14.2820
+# 446 vertices
+
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0019 1.0000 0.0000
+vn 0.0019 1.0000 0.0000
+vn 0.0019 1.0000 0.0000
+vn 0.0019 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0015 1.0000 -0.0010
+vn 0.0015 1.0000 -0.0010
+vn 0.0015 1.0000 -0.0010
+vn 0.0015 1.0000 -0.0010
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0019 1.0000 -0.0000
+vn 0.0019 1.0000 -0.0000
+vn 0.0019 1.0000 -0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 0.8558 0.5174
+vn 0.0000 0.8558 0.5174
+vn 0.0000 0.8558 0.5174
+vn 0.0000 0.8558 0.5174
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.4988 0.8667 -0.0000
+vn -0.4988 0.8667 -0.0000
+vn -0.4988 0.8667 -0.0000
+vn -0.4988 0.8667 -0.0000
+vn 0.4967 0.8679 -0.0000
+vn 0.4967 0.8679 -0.0000
+vn 0.4967 0.8679 -0.0000
+vn 0.4967 0.8679 -0.0000
+vn -0.4436 0.8962 -0.0000
+vn -0.4436 0.8962 -0.0000
+vn -0.4436 0.8962 -0.0000
+vn -0.4436 0.8962 -0.0000
+vn -0.4099 0.9121 -0.0000
+vn -0.4099 0.9121 -0.0000
+vn -0.4099 0.9121 -0.0000
+vn -0.4099 0.9121 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.4520 0.8920 0.0000
+vn 0.4520 0.8920 0.0000
+vn 0.4520 0.8920 0.0000
+vn 0.4520 0.8920 0.0000
+vn 0.4520 0.8920 0.0031
+vn 0.4520 0.8920 0.0031
+vn 0.4520 0.8920 0.0031
+vn 0.4520 0.8920 0.0031
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0015 1.0000 0.0010
+vn 0.0015 1.0000 0.0010
+vn 0.0015 1.0000 0.0010
+vn 0.0015 1.0000 0.0010
+vn 0.0019 1.0000 0.0000
+vn 0.0019 1.0000 0.0000
+vn 0.0019 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0054 1.0000 0.0000
+vn -0.0054 1.0000 0.0000
+vn -0.0054 1.0000 0.0000
+vn -0.0054 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0615 0.9981 0.0000
+vn 0.0615 0.9981 0.0000
+vn 0.0615 0.9981 0.0000
+vn 0.0615 0.9981 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 -0.0000
+# 1121 vertex normals
+
+vt 0.9959 0.5045 0.0000
+vt 0.9959 0.8642 0.0000
+vt 0.0063 0.0495 0.0000
+vt 0.0063 0.4092 0.0000
+vt 0.0063 0.2893 0.0000
+vt 0.0063 0.1694 0.0000
+vt 0.9959 0.7443 0.0000
+vt 0.9959 0.6244 0.0000
+vt 0.9952 0.1694 0.0000
+vt 0.9952 0.2893 0.0000
+vt 0.0070 0.7443 0.0000
+vt 0.0070 0.6244 0.0000
+vt 0.7981 0.5045 0.0000
+vt 0.6003 0.5045 0.0000
+vt 0.4025 0.5045 0.0000
+vt 0.2048 0.5045 0.0000
+vt 0.7974 0.4092 0.0000
+vt 0.5997 0.4092 0.0000
+vt 0.4019 0.4092 0.0000
+vt 0.2041 0.4092 0.0000
+vt 0.2041 0.0495 0.0000
+vt 0.4019 0.0495 0.0000
+vt 0.5997 0.0495 0.0000
+vt 0.7974 0.0495 0.0000
+vt 0.7981 0.8642 0.0000
+vt 0.6003 0.8642 0.0000
+vt 0.4025 0.8642 0.0000
+vt 0.2048 0.8642 0.0000
+vt 0.2041 0.1694 0.0000
+vt 0.4019 0.1694 0.0000
+vt 0.5997 0.1694 0.0000
+vt 0.7974 0.1694 0.0000
+vt 0.7974 0.2893 0.0000
+vt 0.5997 0.2893 0.0000
+vt 0.4019 0.2893 0.0000
+vt 0.2041 0.2893 0.0000
+vt 0.2048 0.6244 0.0000
+vt 0.4025 0.6244 0.0000
+vt 0.6003 0.6244 0.0000
+vt 0.7981 0.6244 0.0000
+vt 0.7981 0.7443 0.0000
+vt 0.6003 0.7443 0.0000
+vt 0.4025 0.7443 0.0000
+vt 0.2048 0.7443 0.0000
+vt 0.9952 0.2094 0.0000
+vt 0.9952 0.2493 0.0000
+vt 0.7974 0.2094 0.0000
+vt 0.7974 0.2493 0.0000
+vt 0.5997 0.2094 0.0000
+vt 0.5997 0.2493 0.0000
+vt 0.7974 0.2227 0.0000
+vt 0.7974 0.2360 0.0000
+vt 0.7692 0.2379 0.0000
+vt 0.7409 0.2398 0.0000
+vt 0.7127 0.2417 0.0000
+vt 0.6844 0.2436 0.0000
+vt 0.6562 0.2455 0.0000
+vt 0.6279 0.2474 0.0000
+vt 0.6279 0.2113 0.0000
+vt 0.6562 0.2132 0.0000
+vt 0.6844 0.2151 0.0000
+vt 0.7127 0.2170 0.0000
+vt 0.7409 0.2189 0.0000
+vt 0.7692 0.2208 0.0000
+vt 0.5502 0.4092 0.0000
+vt 0.5008 0.4092 0.0000
+vt 0.4513 0.4092 0.0000
+vt 0.4513 0.0495 0.0000
+vt 0.5008 0.0495 0.0000
+vt 0.5502 0.0495 0.0000
+vt 0.4513 0.1694 0.0000
+vt 0.5008 0.1694 0.0000
+vt 0.5502 0.1694 0.0000
+vt 0.5502 0.2893 0.0000
+vt 0.5008 0.2893 0.0000
+vt 0.4513 0.2893 0.0000
+vt 0.0063 0.2493 0.0000
+vt 0.0063 0.2094 0.0000
+vt 0.9959 0.7043 0.0000
+vt 0.9959 0.6644 0.0000
+vt 0.0070 0.7043 0.0000
+vt 0.0070 0.6644 0.0000
+vt 0.2041 0.2493 0.0000
+vt 0.2041 0.2094 0.0000
+vt 0.4019 0.2493 0.0000
+vt 0.4019 0.2094 0.0000
+vt 0.7981 0.6644 0.0000
+vt 0.7981 0.7043 0.0000
+vt 0.6003 0.6644 0.0000
+vt 0.6003 0.7043 0.0000
+vt 0.2048 0.7043 0.0000
+vt 0.2048 0.6644 0.0000
+vt 0.4025 0.7043 0.0000
+vt 0.4025 0.6644 0.0000
+vt 0.5502 0.2094 0.0000
+vt 0.5502 0.2493 0.0000
+vt 0.5008 0.2094 0.0000
+vt 0.5008 0.2493 0.0000
+vt 0.4513 0.2493 0.0000
+vt 0.4513 0.2094 0.0000
+vt 0.3360 0.4092 0.0000
+vt 0.2700 0.4092 0.0000
+vt 0.2700 0.0495 0.0000
+vt 0.3360 0.0495 0.0000
+vt 0.2700 0.1694 0.0000
+vt 0.3360 0.1694 0.0000
+vt 0.3360 0.2893 0.0000
+vt 0.2700 0.2893 0.0000
+vt 0.2700 0.2094 0.0000
+vt 0.3360 0.2094 0.0000
+vt 0.3360 0.2493 0.0000
+vt 0.2700 0.2493 0.0000
+vt 0.0723 0.0495 0.0000
+vt 0.1382 0.0495 0.0000
+vt 0.0723 0.1694 0.0000
+vt 0.1382 0.1694 0.0000
+vt 0.1382 0.4092 0.0000
+vt 0.0723 0.4092 0.0000
+vt 0.1382 0.2893 0.0000
+vt 0.0723 0.2893 0.0000
+vt 0.0723 0.2094 0.0000
+vt 0.1382 0.2094 0.0000
+vt 0.1382 0.2493 0.0000
+vt 0.0723 0.2493 0.0000
+vt 0.9299 0.5045 0.0000
+vt 0.8640 0.5045 0.0000
+vt 0.9299 0.8642 0.0000
+vt 0.8640 0.8642 0.0000
+vt 0.9299 0.7443 0.0000
+vt 0.8640 0.7443 0.0000
+vt 0.8640 0.6244 0.0000
+vt 0.9299 0.6244 0.0000
+vt 0.9299 0.7043 0.0000
+vt 0.8640 0.7043 0.0000
+vt 0.8640 0.6644 0.0000
+vt 0.9299 0.6644 0.0000
+vt 0.8860 0.5045 0.0000
+vt 0.8860 0.6244 0.0000
+vt 0.9080 0.6644 0.0000
+vt 0.8860 0.6644 0.0000
+vt 0.7516 0.5045 0.0000
+vt 0.7242 0.5045 0.0000
+vt 0.7516 0.8642 0.0000
+vt 0.7242 0.8642 0.0000
+vt 0.7242 0.6244 0.0000
+vt 0.7516 0.6244 0.0000
+vt 0.7516 0.7443 0.0000
+vt 0.7242 0.7443 0.0000
+vt 0.7516 0.7043 0.0000
+vt 0.7242 0.7043 0.0000
+vt 0.7242 0.6644 0.0000
+vt 0.7516 0.6644 0.0000
+vt 0.5349 0.5045 0.0000
+vt 0.4680 0.5045 0.0000
+vt 0.5349 0.8642 0.0000
+vt 0.4680 0.8642 0.0000
+vt 0.4680 0.6244 0.0000
+vt 0.5349 0.6244 0.0000
+vt 0.5349 0.7443 0.0000
+vt 0.4680 0.7443 0.0000
+vt 0.5349 0.7043 0.0000
+vt 0.4680 0.7043 0.0000
+vt 0.4680 0.6644 0.0000
+vt 0.5349 0.6644 0.0000
+vt 0.3411 0.5045 0.0000
+vt 0.2742 0.5045 0.0000
+vt 0.3411 0.8642 0.0000
+vt 0.2742 0.8642 0.0000
+vt 0.2742 0.6244 0.0000
+vt 0.3411 0.6244 0.0000
+vt 0.3411 0.7443 0.0000
+vt 0.2742 0.7443 0.0000
+vt 0.2742 0.6644 0.0000
+vt 0.3411 0.6644 0.0000
+vt 0.3411 0.7043 0.0000
+vt 0.2742 0.7043 0.0000
+vt 0.3941 0.5045 0.0000
+vt 0.3733 0.5045 0.0000
+vt 0.3941 0.8642 0.0000
+vt 0.3733 0.8642 0.0000
+vt 0.3941 0.7443 0.0000
+vt 0.3733 0.7443 0.0000
+vt 0.3941 0.7043 0.0000
+vt 0.3733 0.7043 0.0000
+vt 0.3733 0.6244 0.0000
+vt 0.3941 0.6244 0.0000
+vt 0.3733 0.6644 0.0000
+vt 0.3941 0.6644 0.0000
+vt 0.2048 0.6887 0.0000
+vt 0.2048 0.6800 0.0000
+vt 0.4025 0.6887 0.0000
+vt 0.4025 0.6800 0.0000
+vt 0.4680 0.6800 0.0000
+vt 0.4680 0.6887 0.0000
+vt 0.3411 0.6800 0.0000
+vt 0.3411 0.6887 0.0000
+vt 0.2742 0.6887 0.0000
+vt 0.2742 0.6800 0.0000
+vt 0.3941 0.6800 0.0000
+vt 0.3941 0.6887 0.0000
+vt 0.3733 0.6887 0.0000
+vt 0.3733 0.6800 0.0000
+vt 0.4281 0.6244 0.0000
+vt 0.4424 0.6244 0.0000
+vt 0.4281 0.6644 0.0000
+vt 0.4424 0.6644 0.0000
+vt 0.4424 0.5045 0.0000
+vt 0.4281 0.5045 0.0000
+vt 0.4424 0.8642 0.0000
+vt 0.4281 0.8642 0.0000
+vt 0.4424 0.7443 0.0000
+vt 0.4281 0.7443 0.0000
+vt 0.4424 0.7043 0.0000
+vt 0.4281 0.7043 0.0000
+vt 0.4281 0.6800 0.0000
+vt 0.4424 0.6800 0.0000
+vt 0.4424 0.6887 0.0000
+vt 0.4281 0.6887 0.0000
+vt 0.2319 0.6244 0.0000
+vt 0.2471 0.6244 0.0000
+vt 0.2319 0.6644 0.0000
+vt 0.2471 0.6644 0.0000
+vt 0.2471 0.5045 0.0000
+vt 0.2319 0.5045 0.0000
+vt 0.2471 0.8642 0.0000
+vt 0.2319 0.8642 0.0000
+vt 0.2471 0.7443 0.0000
+vt 0.2319 0.7443 0.0000
+vt 0.2471 0.7043 0.0000
+vt 0.2319 0.7043 0.0000
+vt 0.2319 0.6800 0.0000
+vt 0.2471 0.6800 0.0000
+vt 0.2471 0.6887 0.0000
+vt 0.2319 0.6887 0.0000
+vt 0.7299 0.2406 0.0000
+vt 0.7237 0.2410 0.0000
+vt 0.7237 0.2177 0.0000
+vt 0.7299 0.2182 0.0000
+vt 0.0393 0.0495 0.0000
+vt 0.0393 0.1694 0.0000
+vt 0.0393 0.2094 0.0000
+vt 0.9959 0.6644 0.0000
+vt 0.9299 0.6644 0.0000
+vt 0.0063 0.2094 0.0000
+vt 0.9959 0.6644 0.0000
+vt 0.9959 0.6644 0.0000
+vt 0.8750 0.6244 0.0000
+vt 0.8750 0.5045 0.0000
+vt 0.8750 0.6644 0.0000
+vt 0.3667 0.5133 0.0000
+vt 0.2485 0.5133 0.0000
+vt 0.2485 0.6424 0.0000
+vt 0.3667 0.6672 0.0000
+vt 0.3667 0.8562 0.0000
+vt 0.2485 0.8562 0.0000
+vt 0.2485 0.7007 0.0000
+vt 0.2485 0.6726 0.0000
+vt 0.2485 0.6424 0.0000
+vt 0.5623 0.5133 0.0000
+vt 0.7228 0.5133 0.0000
+vt 0.8348 0.6424 0.0000
+vt 1.2674 0.6424 0.0000
+vt 1.2674 0.6810 0.0000
+vt 0.8348 0.6642 0.0000
+vt 0.8348 0.6424 0.0000
+vt 1.2674 0.5133 0.0000
+vt 0.5109 0.8562 0.0000
+vt 0.8348 0.7007 0.0000
+vt 1.2674 0.7007 0.0000
+vt 1.2674 0.8562 0.0000
+vt 0.8348 0.8562 0.0000
+vt 0.7228 0.6424 0.0000
+vt 0.7228 0.5133 0.0000
+vt 0.7228 0.7007 0.0000
+vt 0.7228 0.8562 0.0000
+vt 0.3667 0.5133 0.0000
+vt 0.3667 0.8562 0.0000
+vt 0.3667 0.7007 0.0000
+vt 0.5109 0.5133 0.0000
+vt 0.5623 0.8562 0.0000
+vt 0.3667 0.6399 0.0000
+vt 0.7228 0.6399 0.0000
+vt 0.5623 0.7275 0.0000
+vt 0.5109 0.7275 0.0000
+vt 0.5958 0.6672 0.0000
+vt 0.5958 0.6399 0.0000
+vt 0.4918 0.6672 0.0000
+vt 0.4918 0.6399 0.0000
+vt 0.0652 0.6424 0.0000
+vt 0.0652 0.5133 0.0000
+vt 0.0652 0.7007 0.0000
+vt 0.0652 0.8562 0.0000
+vt 0.0652 0.6726 0.0000
+vt 0.6215 0.4836 0.0000
+vt 0.6215 0.5602 0.0000
+vt 0.5317 0.4836 0.0000
+vt 0.5317 0.5602 0.0000
+vt 0.6215 0.5162 0.0000
+vt 0.5317 0.5162 0.0000
+vt 0.6317 0.5887 0.0000
+vt 0.5158 0.5887 0.0000
+vt 0.6317 0.5397 0.0000
+vt 0.5158 0.5397 0.0000
+vt 0.6032 0.5418 0.0000
+vt 0.6032 0.5887 0.0000
+vt 0.5158 0.5418 0.0000
+vt 0.5158 0.5887 0.0000
+vt 0.6096 0.9318 0.0000
+vt 0.4826 0.9318 0.0000
+vt 0.6096 1.0055 0.0000
+vt 0.4826 1.0055 0.0000
+vt 0.3667 0.7617 0.0000
+vt 0.3667 0.8562 0.0000
+vt 0.3667 0.7617 0.0000
+vt 0.5109 0.7919 0.0000
+vt 0.5623 0.7919 0.0000
+vt 0.1425 0.6424 0.0000
+vt 0.1712 0.6424 0.0000
+vt 0.1712 0.6726 0.0000
+vt 0.1425 0.6726 0.0000
+vt 0.1712 0.7007 0.0000
+vt 0.1425 0.7007 0.0000
+vt 0.1425 0.6867 0.0000
+vt 0.1712 0.6867 0.0000
+vt 0.5109 0.6228 0.0000
+vt 0.4084 0.6399 0.0000
+vt 0.4501 0.6399 0.0000
+vt 0.4628 0.6228 0.0000
+vt 0.4148 0.6228 0.0000
+vt 0.3584 0.5133 0.0000
+vt 0.3584 0.6424 0.0000
+vt 0.3667 0.6224 0.0000
+vt 0.3584 0.6224 0.0000
+vt 0.4648 0.6672 0.0000
+vt 0.4025 0.6672 0.0000
+vt 0.3978 0.7478 0.0000
+vt 0.4697 0.7157 0.0000
+vt 0.3667 0.7082 0.0000
+vt 0.3667 0.6342 0.0000
+vt 0.3667 0.6256 0.0000
+vt 0.4127 0.6285 0.0000
+vt 0.4105 0.6342 0.0000
+vt 0.5109 0.6313 0.0000
+vt 0.4565 0.6313 0.0000
+vt 0.5720 0.5133 0.0000
+vt 0.6788 0.5133 0.0000
+vt 0.5623 0.6026 0.0000
+vt 0.5716 0.6026 0.0000
+vt 0.5228 0.6113 0.0000
+vt 0.6000 0.6123 0.0000
+vt 0.5996 0.6080 0.0000
+vt 0.6151 0.6081 0.0000
+vt 0.6811 0.6082 0.0000
+vt 0.6812 0.6399 0.0000
+vt 0.7228 0.5507 0.0000
+vt 0.6934 0.6176 0.0000
+vt 0.6811 0.6176 0.0000
+vt 0.7228 0.5770 0.0000
+vt 0.7020 0.6242 0.0000
+vt 0.6812 0.6242 0.0000
+vt 0.4603 0.6228 0.0000
+vt 0.4813 0.5629 0.0000
+vt 0.5109 0.5627 0.0000
+vt 0.5623 0.5573 0.0000
+vt 0.5718 0.5530 0.0000
+vt 0.6495 0.5569 0.0000
+vt 0.7227 0.5284 0.0000
+vt 0.4878 0.5671 0.0000
+vt 0.5109 0.5674 0.0000
+vt 0.5623 0.5620 0.0000
+vt 0.5718 0.5573 0.0000
+vt 0.6456 0.5628 0.0000
+vt 0.7227 0.5308 0.0000
+vt 0.7228 0.5635 0.0000
+vt 0.7228 0.5571 0.0000
+vt 0.8068 0.5133 0.0000
+vt 0.8141 0.5133 0.0000
+vt 0.8141 0.5635 0.0000
+vt 0.8068 0.5571 0.0000
+vt 0.4973 0.7034 0.0000
+vt 0.5985 0.7099 0.0000
+vt 0.5109 0.7324 0.0000
+vt 0.5623 0.7324 0.0000
+vt 0.5691 0.7337 0.0000
+vt 0.5696 0.7103 0.0000
+vt 0.5053 0.7340 0.0000
+vt 0.5071 0.6991 0.0000
+vt 0.5078 0.6781 0.0000
+vt 0.4941 0.6821 0.0000
+vt 0.5994 0.6817 0.0000
+vt 0.6183 0.6816 0.0000
+vt 0.6197 0.6672 0.0000
+vt 0.4918 0.6490 0.0000
+vt 0.3667 0.6490 0.0000
+vt 0.5958 0.6613 0.0000
+vt 0.5958 0.6458 0.0000
+vt 0.7228 0.6458 0.0000
+vt 0.7228 0.6613 0.0000
+vt 0.7228 0.8152 0.0000
+vt 0.7054 0.8562 0.0000
+vt 0.7054 0.8357 0.0000
+vt 0.6884 0.6672 0.0000
+vt 0.6540 0.6672 0.0000
+vt 0.6804 0.6613 0.0000
+vt 0.6381 0.6613 0.0000
+vt 0.7115 0.6799 0.0000
+vt 0.7228 0.6795 0.0000
+vt 0.7228 0.6925 0.0000
+vt 0.7144 0.6937 0.0000
+vt 0.7146 0.6982 0.0000
+vt 0.7228 0.6985 0.0000
+vt 0.7228 0.6038 0.0000
+vt 0.8049 0.6424 0.0000
+vt 0.7676 0.6424 0.0000
+vt 0.8049 0.6038 0.0000
+vt 0.7676 0.6038 0.0000
+vt 1.2674 0.6642 0.0000
+vt 0.8348 0.6804 0.0000
+vt 1.0078 0.6642 0.0000
+vt 0.8636 0.6642 0.0000
+vt 1.0078 0.6807 0.0000
+vt 0.8636 0.6805 0.0000
+vt 1.0779 0.6642 0.0000
+vt 1.0779 0.6808 0.0000
+vt 0.8062 0.8562 0.0000
+vt 0.8062 0.7007 0.0000
+vt 0.8348 0.8080 0.0000
+vt 0.8348 0.7489 0.0000
+vt 0.8062 0.8080 0.0000
+vt 0.8062 0.7489 0.0000
+vt 0.5109 0.7275 0.0000
+vt 0.5623 0.7275 0.0000
+vt 0.5109 0.7275 0.0000
+vt 0.5623 0.7275 0.0000
+vt 0.5109 0.7275 0.0000
+vt 0.5109 0.7275 0.0000
+vt 0.5623 0.7275 0.0000
+vt 0.5623 0.7275 0.0000
+vt 0.3667 0.6672 0.0000
+vt 0.3667 0.6490 0.0000
+vt 0.3667 0.7617 0.0000
+vt 0.3667 0.7082 0.0000
+vt 0.7228 0.6458 0.0000
+vt 0.7228 0.6613 0.0000
+vt 0.7228 0.6795 0.0000
+vt 0.7228 0.6925 0.0000
+vt 0.7228 0.6458 0.0000
+vt 0.7228 0.6613 0.0000
+vt 0.7228 0.6795 0.0000
+vt 0.7228 0.6925 0.0000
+vt 1.0317 0.6424 0.0000
+vt 1.0157 0.6214 0.0000
+vt 0.9770 0.5455 0.0000
+vt 0.9548 0.5133 0.0000
+vt 1.1169 0.6424 0.0000
+vt 1.1221 0.6303 0.0000
+vt 1.1768 0.5234 0.0000
+vt 1.1812 0.5133 0.0000
+vt 1.0362 0.7007 0.0000
+vt 0.9529 0.8562 0.0000
+vt 1.1143 0.7007 0.0000
+vt 1.1702 0.8562 0.0000
+vt 0.7228 0.8444 0.0000
+vt 0.7115 0.6799 0.0000
+vt 0.4513 0.2239 0.0000
+vt 0.4513 0.2342 0.0000
+vt 0.4513 0.2148 0.0000
+vt 0.4513 0.2434 0.0000
+vt 0.4680 0.6989 0.0000
+vt 0.4680 0.6702 0.0000
+vt 0.1939 0.5133 0.0000
+vt 0.0947 0.5133 0.0000
+vt 0.0785 0.8562 0.0000
+vt 0.2026 0.8562 0.0000
+vt 0.5623 0.7275 0.0000
+vt 0.5623 0.7275 0.0000
+vt 0.7981 0.6984 0.0000
+vt 0.7981 0.6707 0.0000
+vt 0.5109 0.7275 0.0000
+vt 0.5109 0.7275 0.0000
+vt 0.1382 0.2159 0.0000
+vt 0.1382 0.2443 0.0000
+# 482 texture coords
+
+g Object003
+usemtl 23___Default
+s off
+f 418/465/1 417/467/2 91/97/3 
+f 67/71/4 64/68/5 65/69/6 68/72/7 
+f 70/74/8 61/65/9 62/66/10 71/75/11 
+f 151/157/12 148/154/13 147/153/14 152/158/15 
+f 153/159/16 149/155/17 150/156/18 154/160/19 
+f 106/112/20 103/109/21 104/110/22 105/111/23 
+f 27/31/24 19/23/25 20/24/26 28/32/27 
+f 108/114/28 110/116/29 109/115/30 107/113/31 
+f 98/104/32 100/106/33 99/105/34 97/103/35 
+f 113/119/36 111/117/37 112/118/38 114/120/39 
+f 101/107/40 95/101/41 96/102/42 102/108/43 
+f 14/18/44 30/34/45 29/33/46 13/17/47 
+f 132/138/48 131/137/49 119/125/50 126/132/51 
+f 139/145/52 136/142/53 135/141/54 140/146/55 
+f 159/165/56 164/170/57 163/169/58 160/166/59 
+f 165/171/60 161/167/61 162/168/62 166/172/63 
+f 122/128/64 124/130/65 123/129/66 121/127/67 
+f 138/144/68 142/148/69 141/147/70 137/143/71 
+f 44/48/72 42/46/73 6/10/74 29/33/75 
+f 41/45/76 43/47/77 28/32/78 5/9/79 
+f 30/34/80 46/50/81 54/58/82 53/57/83 52/56/84 51/55/85 230/236/86 229/235/87 50/54/88 49/53/89 48/52/90 44/48/91 29/33/92 
+f 60/64/93 59/63/94 232/238/95 231/237/96 58/62/97 57/61/98 56/60/99 55/59/100 45/49/101 27/31/102 28/32/103 43/47/104 47/51/105 
+f 45/49/106 55/59/107 54/58/108 46/50/109 
+f 56/60/110 57/61/111 52/56/112 53/57/113 
+f 48/52/114 49/53/115 60/64/116 47/51/117 
+f 89/95/118 69/73/119 27/31/120 45/49/121 
+f 69/73/122 66/70/123 19/23/124 27/31/125 
+f 68/72/126 65/69/127 66/70/128 69/73/129 
+f 64/68/130 67/71/131 26/30/132 18/22/133 
+f 72/76/134 63/67/135 15/19/136 31/35/137 
+f 71/75/138 62/66/139 63/67/140 72/76/141 
+f 61/65/142 70/74/143 30/34/144 14/18/145 
+f 93/99/146 92/98/147 71/75/148 72/76/149 
+f 94/100/150 67/71/151 68/72/152 91/97/153 
+f 155/161/154 153/159/155 154/160/156 156/162/157 
+f 157/163/158 151/157/159 152/158/160 158/164/161 
+f 115/121/162 109/115/163 110/116/164 116/122/165 
+f 118/124/166 117/123/167 113/119/168 114/120/169 
+f 103/109/170 99/105/171 100/106/172 104/110/173 
+f 105/111/174 101/107/175 102/108/176 106/112/177 
+f 127/133/178 123/129/179 124/130/180 128/134/181 
+f 132/138/182 133/139/183 134/140/184 
+f 143/149/185 141/147/186 142/148/187 144/150/188 
+f 145/151/189 139/145/190 140/146/191 146/152/192 
+f 86/92/193 76/82/194 8/12/195 33/37/196 
+f 75/81/197 85/91/198 40/44/199 7/11/200 
+f 167/173/201 163/169/202 164/170/203 168/174/204 
+f 170/176/205 169/175/206 165/171/207 166/172/208 
+f 92/98/209 90/96/210 70/74/211 71/75/212 
+f 89/95/213 91/97/214 68/72/215 69/73/216 
+f 94/100/217 80/86/218 26/30/219 67/71/220 
+f 79/85/221 93/99/222 72/76/223 31/35/224 
+f 90/96/225 89/95/226 45/49/227 46/50/228 
+f 90/96/229 46/50/230 30/34/231 70/74/232 
+f 97/103/233 99/105/234 25/29/235 17/21/236 
+f 100/106/237 98/104/238 18/22/239 26/30/240 
+f 102/108/241 96/102/242 16/20/243 32/36/244 
+f 95/101/245 101/107/246 31/35/247 15/19/248 
+f 104/110/249 100/106/250 26/30/251 80/86/252 
+f 99/105/253 103/109/254 78/84/255 25/29/256 
+f 106/112/257 102/108/258 32/36/259 77/83/260 
+f 101/107/261 105/111/262 79/85/263 31/35/264 
+f 116/122/265 78/84/266 445/481/267 
+f 107/113/268 109/115/269 234/240/270 233/239/271 
+f 110/116/272 108/114/273 17/21/274 25/29/275 
+f 114/120/276 112/118/277 2/4/278 3/5/279 
+f 111/117/280 113/119/281 32/36/282 16/20/283 
+f 116/122/284 110/116/285 25/29/286 78/84/287 
+f 109/115/288 115/121/289 235/241/290 234/240/291 
+f 73/77/292 118/124/293 114/120/294 3/5/295 
+f 32/36/296 113/119/297 117/123/298 77/83/299 
+f 126/132/300 119/125/301 1/1/302 4/8/303 
+f 120/126/304 125/131/305 36/40/306 9/13/307 
+f 121/127/308 123/129/309 3/7/310 2/2/311 
+f 124/130/312 122/128/313 21/25/314 37/41/315 
+f 128/134/316 124/130/317 37/41/318 82/88/319 
+f 123/129/320 127/133/321 73/79/322 3/7/323 
+f 130/136/324 126/132/325 4/8/326 74/80/327 
+f 125/131/328 129/135/329 81/87/330 36/40/331 
+f 131/137/332 132/138/333 240/247/334 241/248/335 
+f 130/136/336 133/139/337 132/138/338 126/132/339 
+f 240/247/340 132/138/341 134/140/342 242/249/343 
+f 145/151/344 144/150/345 84/90/346 83/89/347 
+f 444/477/348 82/88/349 143/149/350 
+f 140/146/351 135/141/352 9/13/353 36/40/354 
+f 136/142/355 139/145/356 35/39/357 10/14/358 
+f 137/143/359 141/147/360 37/41/361 21/25/362 
+f 142/148/363 138/144/364 22/26/365 38/42/366 
+f 144/150/367 142/148/368 38/42/369 84/90/370 
+f 141/147/371 143/149/372 82/88/373 37/41/374 
+f 146/152/375 140/146/376 36/40/377 81/87/378 
+f 139/145/379 145/151/380 83/89/381 35/39/382 
+f 152/158/383 147/153/384 10/14/385 35/39/386 
+f 201/207/387 198/204/388 197/203/389 202/208/390 
+f 205/211/391 203/209/392 204/210/393 206/212/394 
+f 149/155/395 153/159/396 38/42/397 22/26/398 
+f 207/213/399 205/211/400 206/212/401 208/214/402 
+f 153/159/403 155/161/404 84/90/405 38/42/406 
+f 158/164/407 152/158/408 35/39/409 83/89/410 
+f 198/204/411 200/206/412 199/205/413 197/203/414 
+f 217/223/415 214/220/416 213/219/417 218/224/418 
+f 179/185/419 172/178/420 171/177/421 180/186/422 
+f 221/227/423 219/225/424 220/226/425 222/228/426 
+f 174/180/427 176/182/428 175/181/429 173/179/430 
+f 181/187/431 179/185/432 180/186/433 182/188/434 
+f 214/220/435 216/222/436 215/221/437 213/219/438 
+f 224/230/439 223/229/440 221/227/441 222/228/442 
+f 175/181/443 176/182/444 178/184/445 177/183/446 
+f 193/199/447 186/192/448 185/191/449 194/200/450 
+f 195/201/451 190/196/452 189/195/453 196/202/454 
+f 180/186/455 171/177/456 11/15/457 34/38/458 
+f 172/178/459 179/185/460 164/170/461 159/165/462 
+f 173/179/463 175/181/464 39/43/465 23/27/466 
+f 176/182/467 174/180/468 161/167/469 165/171/470 
+f 182/188/471 180/186/472 34/38/473 88/94/474 
+f 179/185/475 181/187/476 168/174/477 164/170/478 
+f 39/43/479 175/181/480 177/183/481 87/93/482 
+f 169/175/483 178/184/484 176/182/485 165/171/486 
+f 191/197/487 190/196/488 169/175/489 170/176/490 
+f 189/195/491 192/198/492 167/173/493 168/174/494 
+f 209/215/495 199/205/496 200/206/497 210/216/498 
+f 211/217/499 207/213/500 208/214/501 212/218/502 
+f 195/201/503 194/200/504 177/183/505 178/184/506 
+f 193/199/507 196/202/508 181/187/509 182/188/510 
+f 226/232/511 225/231/512 215/221/513 216/222/514 
+f 227/233/515 223/229/516 224/230/517 228/234/518 
+f 194/200/519 185/191/520 87/93/521 177/183/522 
+f 186/192/523 193/199/524 182/188/525 88/94/526 
+f 196/202/527 189/195/528 168/174/529 181/187/530 
+f 190/196/531 195/201/532 178/184/533 169/175/534 
+f 211/217/535 210/216/536 187/193/537 188/194/538 
+f 202/208/539 197/203/540 34/38/541 11/15/542 
+f 198/204/543 201/207/544 148/154/545 151/157/546 
+f 206/212/547 204/210/548 23/27/549 39/43/550 
+f 203/209/551 205/211/552 154/160/553 150/156/554 
+f 208/214/555 206/212/556 39/43/557 87/93/558 
+f 205/211/559 207/213/560 156/162/561 154/160/562 
+f 197/203/563 199/205/564 88/94/565 34/38/566 
+f 200/206/567 198/204/568 151/157/569 157/163/570 
+f 210/216/571 200/206/572 157/163/573 438/470/574 
+f 199/205/575 209/215/576 186/192/577 88/94/578 
+f 212/218/579 208/214/580 87/93/581 185/191/582 
+f 188/194/583 437/469/584 211/217/585 
+f 191/197/586 227/233/587 226/232/588 192/198/589 
+f 184/190/590 225/231/591 228/234/592 183/189/593 
+f 218/224/594 213/219/595 33/37/596 12/16/597 
+f 214/220/598 217/223/599 160/166/600 163/169/601 
+f 222/228/602 220/226/603 24/28/604 40/44/605 
+f 219/225/606 221/227/607 166/172/608 162/168/609 
+f 213/219/610 215/221/611 86/92/612 33/37/613 
+f 216/222/614 214/220/615 163/169/616 167/173/617 
+f 85/91/618 224/230/619 222/228/620 40/44/621 
+f 166/172/622 221/227/623 223/229/624 170/176/625 
+f 192/198/626 226/232/627 216/222/628 167/173/629 
+f 86/92/630 215/221/631 225/231/632 184/190/633 
+f 228/234/634 224/230/635 85/91/636 183/189/637 
+f 223/229/638 227/233/639 191/197/640 170/176/641 
+f 229/235/642 232/238/643 59/63/644 50/54/645 
+f 231/237/646 230/236/647 51/55/648 58/62/649 
+f 233/239/650 234/240/651 4/6/652 1/3/653 
+f 234/240/654 235/241/655 74/78/656 4/6/657 
+f 236/242/658 237/243/659 130/136/660 74/80/661 
+f 74/78/662 235/241/663 238/244/664 
+f 238/245/665 239/246/666 236/242/667 74/80/668 
+f 241/248/669 240/247/670 125/131/671 120/126/672 
+f 125/131/673 240/247/674 242/249/675 129/135/676 
+f 359/287/677 314/334/678 315/335/679 245/253/680 372/394/681 371/393/682 
+f 374/396/683 375/397/684 376/398/685 381/404/686 382/405/687 373/395/688 
+f 427/455/689 253/262/690 393/417/691 399/423/692 
+f 257/266/693 429/457/694 430/458/695 
+f 431/459/696 259/268/697 394/418/698 398/422/699 397/421/700 
+f 432/460/701 262/271/702 403/427/703 404/428/704 259/268/705 431/459/706 
+f 243/251/707 311/330/708 313/333/709 312/331/710 244/252/711 
+f 247/255/712 248/256/713 268/278/714 267/277/715 
+f 347/368/716 348/369/717 306/325/718 309/328/719 
+f 301/320/720 298/317/721 299/318/722 300/319/723 
+f 244/252/724 299/318/725 439/471/726 243/251/727 
+f 305/324/728 302/321/729 303/322/730 304/323/731 
+f 280/291/732 303/322/733 441/473/734 281/292/735 
+f 283/294/736 285/298/737 286/299/738 284/296/739 
+f 439/295/740 440/297/741 286/299/742 285/298/743 
+f 442/300/744 287/302/745 288/303/746 441/301/747 
+f 289/304/748 290/306/749 432/307/750 434/305/751 
+f 426/309/752 292/311/753 291/310/754 430/308/755 
+f 317/337/756 316/336/757 315/335/758 314/334/759 
+f 294/313/760 295/314/761 293/312/762 246/254/763 
+f 297/316/764 296/315/765 360/382/766 361/383/767 
+f 299/318/768 244/252/769 250/258/770 249/257/771 300/319/772 
+f 298/317/773 301/320/774 282/293/775 278/289/776 
+f 280/291/777 282/293/778 301/320/779 304/323/780 303/322/781 
+f 249/257/782 248/256/783 302/321/784 305/324/785 300/319/786 
+f 266/250/787 269/279/788 342/363/789 341/362/790 340/361/791 310/329/792 322/340/793 
+f 324/344/794 309/328/795 306/325/796 323/343/797 
+f 313/333/798 311/330/799 266/276/800 322/332/801 
+f 316/336/802 293/312/803 318/338/804 
+f 310/329/805 320/341/806 322/340/807 
+f 319/339/808 321/342/809 307/326/810 271/281/811 
+f 350/371/812 328/348/813 327/347/814 349/370/815 
+f 329/349/816 323/343/817 306/325/818 348/369/819 349/370/820 327/347/821 
+f 331/351/822 330/350/823 328/348/824 350/371/825 351/372/826 332/352/827 
+f 333/353/828 332/352/829 351/372/830 352/373/831 388/355/832 335/356/833 
+f 333/353/834 335/356/835 336/357/836 
+f 337/358/837 272/282/838 338/359/839 
+f 334/354/840 339/360/841 338/359/842 272/282/843 
+f 251/259/844 343/364/845 342/363/846 269/279/847 
+f 344/365/848 343/364/849 251/259/850 325/345/851 
+f 345/366/852 344/365/853 325/345/854 326/346/855 
+f 264/260/856 346/367/857 345/366/858 326/346/859 
+f 353/376/860 356/379/861 346/375/862 264/273/863 
+f 361/383/864 360/382/865 274/284/866 273/283/867 
+f 360/382/868 296/315/869 258/267/870 246/254/871 293/312/872 316/336/873 317/337/874 357/380/875 365/387/876 364/386/877 
+f 366/388/878 365/387/879 357/380/880 367/389/881 
+f 358/381/882 368/390/883 369/391/884 436/406/885 385/409/886 386/410/887 
+f 277/288/888 371/393/889 372/394/890 271/281/891 307/326/892 308/327/893 
+f 374/396/894 276/286/895 334/354/896 272/282/897 375/397/898 
+f 381/404/899 379/402/900 380/403/901 382/405/902 
+f 361/383/903 362/384/904 378/401/905 377/400/906 270/280/907 297/316/908 
+f 373/395/909 382/405/910 380/403/911 370/392/912 275/285/913 
+f 263/272/914 388/412/915 390/414/916 
+f 395/419/917 397/421/918 398/422/919 396/420/920 
+f 400/424/921 399/423/922 393/417/923 254/263/924 
+f 435/463/925 387/274/926 402/426/927 406/430/928 405/429/929 
+f 405/429/930 403/427/931 262/271/932 401/425/933 
+f 404/428/934 406/430/935 402/426/936 259/268/937 
+f 408/431/938 407/432/939 273/283/940 274/284/941 
+f 410/433/942 409/434/943 407/432/944 408/431/945 
+f 411/435/946 412/436/947 410/433/948 408/431/949 
+f 414/437/950 413/438/951 407/432/952 409/434/953 
+f 245/253/954 415/439/955 416/440/956 372/394/957 
+f 417/441/958 418/442/959 318/338/960 293/312/961 
+f 419/443/962 420/444/963 376/398/964 375/397/965 
+f 421/445/966 422/446/967 384/408/968 383/407/969 
+f 437/447/970 188/448/971 420/444/972 419/443/973 
+f 187/449/974 438/450/975 422/446/976 421/445/977 
+f 392/416/978 390/414/979 388/412/980 352/374/981 
+f 391/415/982 392/416/983 352/374/984 355/378/985 
+f 253/262/986 427/455/987 428/456/988 
+f 253/262/989 428/456/990 429/457/991 257/266/992 
+f 255/264/993 256/265/994 252/261/995 423/451/996 395/419/997 396/420/998 
+f 252/261/999 389/413/1000 391/415/1001 424/452/1002 423/451/1003 
+f 391/415/1004 355/378/1005 425/453/1006 424/452/1007 
+f 354/377/1008 426/454/1009 425/453/1010 355/378/1011 
+f 395/419/1012 423/451/1013 427/455/1014 399/423/1015 
+f 427/455/1016 423/451/1017 424/452/1018 428/456/1019 
+f 428/456/1020 424/452/1021 425/453/1022 429/457/1023 
+f 426/454/1024 430/458/1025 429/457/1026 425/453/1027 
+f 397/421/1028 400/424/1029 433/461/1030 431/459/1031 
+f 431/459/1032 433/461/1033 434/462/1034 432/460/1035 
+f 254/263/1036 260/269/1037 433/461/1038 400/424/1039 
+f 260/269/1040 261/270/1041 434/462/1042 433/461/1043 
+f 401/425/1044 265/275/1045 435/463/1046 405/429/1047 
+f 378/401/1048 362/384/1049 363/385/1050 358/381/1051 386/410/1052 387/411/1053 435/399/1054 
+f 436/464/1055 383/407/1056 384/408/1057 385/409/1058 
+f 380/403/1059 379/402/1060 436/406/1061 369/391/1062 370/392/1063 
+f 92/98/1064 415/466/1065 418/465/1066 91/97/1067 
+f 92/98/1068 416/468/1069 415/466/1070 
+f 417/467/1071 94/100/1072 91/97/1073 
+f 92/98/1074 93/99/1075 416/468/1076 
+f 437/469/1077 156/162/1078 207/213/1079 211/217/1080 
+f 438/470/1081 187/193/1082 210/216/1083 
+f 298/317/1084 440/472/1085 439/471/1086 299/318/1087 
+f 278/289/1088 279/290/1089 440/472/1090 298/317/1091 
+f 303/322/1092 302/321/1093 442/474/1094 441/473/1095 
+f 248/256/1096 247/255/1097 442/474/1098 302/321/1099 
+f 413/438/1100 414/437/1101 444/475/1102 443/476/1103 
+f 143/149/1104 146/152/1105 443/478/1106 444/477/1107 
+f 146/152/1108 81/87/1109 443/478/1110 
+f 412/436/1111 411/435/1112 445/479/1113 446/480/1114 
+f 77/83/1115 446/482/1116 445/481/1117 78/84/1118 
+f 77/83/1119 117/123/1120 446/482/1121 
+# 251 polygons - 19 triangles
+
diff --git a/static/workertest/passsimulation/passer.js b/static/workertest/passsimulation/passer.js
new file mode 100644
index 000000000..537fd5e60
--- /dev/null
+++ b/static/workertest/passsimulation/passer.js
@@ -0,0 +1,25 @@
+var i=0;
+var update = null;
+function timedCount(){
+
+  onmessage = (e) => {
+
+
+    if(e.data == "on"){
+
+      update = setInterval("passerupdate()", 50);
+    }
+
+    if(e.data == "off"){
+      clearInterval(update);
+    }
+}
+
+
+}
+function passerupdate(){
+
+  postMessage("up");
+}
+
+timedCount();
diff --git a/static/workertest/passsimulation/station.js b/static/workertest/passsimulation/station.js
new file mode 100644
index 000000000..b6bfb877f
--- /dev/null
+++ b/static/workertest/passsimulation/station.js
@@ -0,0 +1,25 @@
+var i=0;
+var update = null;
+function timedCount(){
+
+  onmessage = (e) => {
+
+
+    if(e.data == "on"){
+      console.log("on");
+      update = setInterval("stationupdate()", 3000);
+    }
+
+    if(e.data == "off"){
+      clearInterval(update);
+    }
+}
+
+
+}
+function stationupdate(){
+
+  postMessage("up");
+}
+
+timedCount();