From d52a5837b4913b4d32e74fb5b6a756cac2f37e3a Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 12 May 2021 14:17:14 +0800
Subject: [PATCH 01/32] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=89=20=E5=88=97?=
 =?UTF-8?q?=E8=BD=A6=E7=BB=98=E5=9B=BE=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/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 f15a3da63..477a0ef64 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -151,7 +151,7 @@ export default class Train extends Group {
                 this.triangle = new ETriangle({
                     style: this.style,
                     zlevel: this.zlevel,
-                    z: 10,
+                    z: 15,
                     right: this.model.right,
                     point: { x: this.startX, y: this.startY }
                 });

From bf69914d21b472110a71a67ed8752b8e70b3b854 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 13 May 2021 13:12:28 +0800
Subject: [PATCH 02/32] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=97=AE=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

(cherry picked from commit 7cd36b7446177d945db140a1b526fbb8ee3c180a)
---
 src/utils/indexedDb.js                     | 6 +++---
 src/views/newMap/displayCity/menuDemon.vue | 3 ++-
 src/views/publish/publishMap/index.vue     | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/utils/indexedDb.js b/src/utils/indexedDb.js
index 2a882c8a3..1fe60c2b9 100644
--- a/src/utils/indexedDb.js
+++ b/src/utils/indexedDb.js
@@ -1,10 +1,10 @@
 import Vue from 'vue';
-import { getBaseUrl } from '@/utils/baseUrl'
+import { getBaseUrl } from '@/utils/baseUrl';
 
 // 创建或者打开数据库
 export function openIndexedDB() {
-	const baseUrl = getBaseUrl();
-	const indexedDBName = baseUrl.replace(/http.?:\/\/(.*)[\/|:].*/, "$1");
+    const baseUrl = getBaseUrl();
+    const indexedDBName = baseUrl.replace(/http.?:\/\/(.*)[\/|:].*/, '$1');
     const request = window.indexedDB.open(indexedDBName, 1);
     request.onerror = function (event) {
         console.log('数据库打开报错');
diff --git a/src/views/newMap/displayCity/menuDemon.vue b/src/views/newMap/displayCity/menuDemon.vue
index c9b5d86d0..dca5cf7a3 100644
--- a/src/views/newMap/displayCity/menuDemon.vue
+++ b/src/views/newMap/displayCity/menuDemon.vue
@@ -54,6 +54,7 @@ import StatusIcon from '@/views/components/StatusIcon/statusIcon';
 import { simulationPause, simulationStart } from '../../../api/rtSimulation';
 // import Vue from 'vue';
 import { getSessionStorage } from '@/utils/auth';
+import { destroySimulation } from '@/api/rtSimulation';
 // import { EventBus } from '@/scripts/event-bus';
 
 export default {
@@ -249,7 +250,7 @@ export default {
         async back() {
             this.isGoback = true;
             if (this.projectDevice || this.project === 'wjls') {
-                clearSimulation(this.group).then(res=>{
+                destroySimulation(this.group).then(res=>{
                     this.$store.dispatch('training/over').then(() => {
                         this.$store.dispatch('LogOut').then(() => {
                             location.reload();
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index a516eb08c..8a6beadc2 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -378,6 +378,8 @@ export default {
                         message = message + ( index ? '、' : '' ) + '《' + item.name + '》';
                     });
                     this.$messageBox(message);
+                } else {
+                    this.$message.success('一键校验地图数据通过！');
                 }
             }).catch(e => {
                 this.loading = false;

From 149d4cf995d5e5cd5d41db6e1438dda075fec98a Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 13 May 2021 13:22:30 +0800
Subject: [PATCH 03/32] =?UTF-8?q?Bug=20206=20=E8=AF=AD=E9=9F=B3=E8=AE=AD?=
 =?UTF-8?q?=E7=BB=83=E7=BB=93=E6=9E=9C=E5=9C=A8=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E9=80=89=E6=8B=A9A=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=EF=BC=8C=E7=BB=93=E6=9E=9C=E9=87=8C=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E4=BA=86B=E7=94=A8=E6=88=B7=E7=9A=84=E8=AF=AD=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/drts/scene/trainingResult.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/views/drts/scene/trainingResult.vue b/src/views/drts/scene/trainingResult.vue
index 12a7cc174..e9cdf59a3 100644
--- a/src/views/drts/scene/trainingResult.vue
+++ b/src/views/drts/scene/trainingResult.vue
@@ -174,6 +174,13 @@ export default {
             if (this.userId) {
                 this.loading = true;
                 audioFilesCheckAllSence(this.$route.query.sceneId, this.userId).then(resp => {
+                    this.actionList.forEach(item => {
+                        item.result = '';
+                        item.wrongKeyWords = [];
+                        item.wrongTripNumbers = [];
+                        item.recordId = '';
+                        item.filePath = '';
+                    });
                     (resp.data || []).forEach(elem => {
                         this.actionList.forEach(item => {
                             if (elem.actionId === item.id) {

From f4cd046f1a6b31384d396032f26f317c8ea8ab72 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 13 May 2021 13:55:02 +0800
Subject: [PATCH 04/32] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BD=A6=E7=AB=99=E5=80=BC=E7=8F=AD=E5=91=98?=
 =?UTF-8?q?=20=E6=98=BE=E7=A4=BA=E7=BB=98=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/SignalButton/index.js    | 12 ++++++++++++
 src/views/newMap/displayCity/menuDemon.vue | 22 ++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/jmapNew/shape/SignalButton/index.js b/src/jmapNew/shape/SignalButton/index.js
index e1d8d15e1..6e6abfc47 100644
--- a/src/jmapNew/shape/SignalButton/index.js
+++ b/src/jmapNew/shape/SignalButton/index.js
@@ -131,6 +131,18 @@ export default class SignalButton extends Group {
     setShowMode() {
     }
     setShowStation(stationCode) {
+        if (!stationCode || this.model.stationCode === stationCode) {
+            this.eachChild(item => {
+                item.show();
+            });
+            this.isShowShape = true;
+            this.setState(this.model);
+        } else {
+            this.eachChild(item => {
+                item.hide();
+            });
+            this.isShowShape = false;
+        }
     }
     getAnchorPoint() {
     }
diff --git a/src/views/newMap/displayCity/menuDemon.vue b/src/views/newMap/displayCity/menuDemon.vue
index c9b5d86d0..44ace6908 100644
--- a/src/views/newMap/displayCity/menuDemon.vue
+++ b/src/views/newMap/displayCity/menuDemon.vue
@@ -188,6 +188,28 @@ export default {
     methods: {
         async initLoadPage() {
             try {
+                const memberData = Object.values(this.$store.state.training.memberData);
+                const member = memberData.find(eachMember=>{
+                    return eachMember.userId == this.$store.state.user.id;
+                });
+                const deviceId = member ? member.deviceId : '';
+                if (deviceId) {
+                    const nameList = Object.keys(this.$store.state.map.map || {});
+                    let list = [];
+                    nameList.forEach(item => {
+                        if (this.$store.state.map.map[item] && this.$store.state.map.map[item].constructor === Array) {
+                            if (item === 'trainList') {
+                                this.$store.state.map.map[item].forEach(elem => {
+                                    elem && list.push(elem);
+                                });
+                            } else {
+                                list = [...list, ...this.$store.state.map.map[item]];
+                            }
+                        }
+                    });
+                    this.$jlmap.updateShowStation(list, deviceId);
+                }
+                // 'Station83189';
                 if (this.try != '0') {
                     this.loadInitData();
                 }

From 02241f455acba97c039fcbbf9652753c2be2605c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 13 May 2021 14:19:58 +0800
Subject: [PATCH 05/32] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=98=E5=9B=BE=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=95=B0=E6=8D=AE=20=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/newMap/newDesignUser/demonList.vue  |  2 +-
 .../newMap/newMapdraft/dataRelation/index.vue | 76 ++++++++++++-------
 2 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/src/views/newMap/newDesignUser/demonList.vue b/src/views/newMap/newDesignUser/demonList.vue
index e69c5e1a1..1c8b58e68 100644
--- a/src/views/newMap/newDesignUser/demonList.vue
+++ b/src/views/newMap/newDesignUser/demonList.vue
@@ -127,7 +127,7 @@ export default {
                 if (this.loadingProjectList.includes(this.project)) {
                     this.$store.dispatch('app/transitionAnimations');
                 }
-                this.$router.push({ path: `${UrlConfig.newDesignuser.mapDraw}/${obj.mapId}/draft`, query: { name: obj.mapName } });
+                this.$router.push({ path: `${UrlConfig.newDesignuser.mapDraw}/${obj.mapId}/draft`, query: { name: obj.mapName, lineCode:obj.lineCode } });
                 break;
             }
             }
diff --git a/src/views/newMap/newMapdraft/dataRelation/index.vue b/src/views/newMap/newMapdraft/dataRelation/index.vue
index cac3ad7d7..846b86194 100644
--- a/src/views/newMap/newMapdraft/dataRelation/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/index.vue
@@ -29,31 +29,31 @@
 </template>
 
 <script>
-// import RouteOperate from './routeoperate/index';
+import RouteOperate from './routeoperate/index';
 import RoutingOperate from './routingoperate/index';
 import BigRoutingOperate from './bigroutingoperate/index';
-// import AutomaticOperate from './automaticoperate/index';
+import AutomaticOperate from './automaticoperate/index';
 // import PathOperate from './pathoperate/index';
-// import RunLevelOperate from './runLeveloperate/index';
-// import SignalOperate from './signaloperate/index';
-// import TurnedOperate from './turnedoperate/index';
-// import FlankProtectOperate from './flankProtectOperate/index';
-// import DwellTimeOperate from './dwellTimeOperate/index';
-// import DestinationOperate from './destinationOperate/index';
+import RunLevelOperate from './runLeveloperate/index';
+import SignalOperate from './signaloperate/index';
+import TurnedOperate from './turnedoperate/index';
+import FlankProtectOperate from './flankProtectOperate/index';
+import DwellTimeOperate from './dwellTimeOperate/index';
+import DestinationOperate from './destinationOperate/index';
 
 export default {
     name: 'DataRelation',
     components: {
-        // RouteOperate,
+        RouteOperate,
         RoutingOperate,
-        BigRoutingOperate
-        // AutomaticOperate,
+        BigRoutingOperate,
+        AutomaticOperate,
         // RunLevelOperte,
-        // FlankProtectOperate
+        FlankProtectOperate,
         // PathOperate,
-        // SignalOperate,
-        // TurnedOperate,
-        // DwellTimeOperate
+        SignalOperate,
+        TurnedOperate,
+        DwellTimeOperate
         // DestinationOperate
     },
     props: {
@@ -73,23 +73,45 @@ export default {
             enabledTab: 'bigRoutingOperate',
             oldDevice: null,
             lazy: true,
-            tabList:[
-                // {label: this.$t('map.routeID'), name:'route', menus:RouteOperate},
+            tabList:[]
+            // tabList:[
+            //     // {label: this.$t('map.routeID'), name:'route', menus:RouteOperate},
 
-                // {label: '自动折返', name:'turned', menus:TurnedOperate},
-                // {label: '目的地码', name:'destination', menus:DestinationOperate},
-                // {label: this.$t('map.automaticSignal'), name:'automatic', menus:AutomaticOperate},
-                // {label: this.$t('map.signalApprochSection'), name:'signal', menus:SignalOperate},
-                {label: '大铁进路', name:'bigRoutingOperate', menus:BigRoutingOperate},
-                // {label: '侧防', name:'flankProtect', menus:FlankProtectOperate},
-                {label: this.$t('map.routing'), name:'routing', menus:RoutingOperate}
-                // {label: '停站时间', name:'dwellTime', menus:DwellTimeOperate},
-                // {label: '设置运行等级', name:'runLevel', menus:RunLevelOperate}
-            ]
+            //     // {label: '自动折返', name:'turned', menus:TurnedOperate},
+            //     // {label: '目的地码', name:'destination', menus:DestinationOperate},
+            //     // {label: this.$t('map.automaticSignal'), name:'automatic', menus:AutomaticOperate},
+            //     // {label: this.$t('map.signalApprochSection'), name:'signal', menus:SignalOperate},
+            //     {label: '大铁进路', name:'bigRoutingOperate', menus:BigRoutingOperate},
+            //     // {label: '侧防', name:'flankProtect', menus:FlankProtectOperate},
+            //     {label: this.$t('map.routing'), name:'routing', menus:RoutingOperate}
+            //     // {label: '停站时间', name:'dwellTime', menus:DwellTimeOperate},
+            //     // {label: '设置运行等级', name:'runLevel', menus:RunLevelOperate}
+            // ]
         };
     },
     mounted() {
         this.initLoad();
+        if (this.$route.query.lineCode == '15') {
+            this.tabList = [
+                {label: '大铁进路', name:'bigRoutingOperate', menus:BigRoutingOperate},
+                {label: this.$t('map.routing'), name:'routing', menus:RoutingOperate}
+            ];
+            this.enabledTab = 'bigRoutingOperate';
+        } else {
+            this.tabList = [
+                {label: this.$t('map.routeID'), name:'route', menus:RouteOperate},
+                {label: '自动折返', name:'turned', menus:TurnedOperate},
+                {label: '目的地码', name:'destination', menus:DestinationOperate},
+                {label: this.$t('map.automaticSignal'), name:'automatic', menus:AutomaticOperate},
+                {label: this.$t('map.signalApprochSection'), name:'signal', menus:SignalOperate},
+                {label: '侧防', name:'flankProtect', menus:FlankProtectOperate},
+                {label: this.$t('map.routing'), name:'routing', menus:RoutingOperate},
+                {label: '停站时间', name:'dwellTime', menus:DwellTimeOperate},
+                {label: '设置运行等级', name:'runLevel', menus:RunLevelOperate}
+            // ]
+            ];
+            this.enabledTab = 'route';
+        }
     },
     methods: {
         showMap() {

From d584e7ea7dcf8f5384aa7aadd1285c160c1aa82d Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 13 May 2021 18:09:10 +0800
Subject: [PATCH 06/32] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=9B=BE=E7=BA=B8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en/router.js             |  3 ++-
 src/i18n/langs/zh/router.js             |  3 ++-
 src/router/index.js                     |  9 +++++++++
 src/views/system/drawingMange/index.vue | 21 +++++++++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 src/views/system/drawingMange/index.vue

diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js
index 1868243a4..d73f59f5a 100644
--- a/src/i18n/langs/en/router.js
+++ b/src/i18n/langs/en/router.js
@@ -91,5 +91,6 @@ export default {
     publishIBPManage:'publish IBP Manage',
     publishISCSManage:'publish ISCS Manage',
     voiceTraining: 'Voice Training',
-    mapGroup: 'Map Group'
+    mapGroup: 'Map Group',
+    drawingMange:'Drawing Mange'
 };
diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js
index eadca6adb..543d415dc 100644
--- a/src/i18n/langs/zh/router.js
+++ b/src/i18n/langs/zh/router.js
@@ -96,5 +96,6 @@ export default {
     publishIBPManage:'发布IBP盘管理',
     publishISCSManage:'发布ISCS管理',
     voiceTraining: '语音训练',
-    mapGroup: '地图分组'
+    mapGroup: '地图分组',
+    drawingMange:'图纸管理'
 };
diff --git a/src/router/index.js b/src/router/index.js
index 8a15ed8d2..f28a25032 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -171,6 +171,7 @@ const OrgDetail = () => import('@/views/system/companyManage/orgDetail');
 const VoiceTraining = () => import('@/views/system/voiceTraining/index');
 const SceneTrainingResult = () => import('@/views/drts/scene/trainingResult');
 const SceneVoiceTraining = () => import('@/views/drts/scene/voiceTraining');
+const DrawingMange = () => import('@/views/system/drawingMange/index');
 
 // import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
 // import { getSessionStorage } from '@/utils/auth';
@@ -1122,7 +1123,15 @@ export const asyncRouter = [
                 meta: {
                     i18n: 'router.voiceTraining'
                 }
+            },
+            {
+                path: 'drawingMange',
+                component: DrawingMange,
+                meta: {
+                    i18n: 'router.drawingMange'
+                }
             }
+
             // {
             //     path: 'deviceManage',
             //     component: DeviceManage,
diff --git a/src/views/system/drawingMange/index.vue b/src/views/system/drawingMange/index.vue
new file mode 100644
index 000000000..2839b3431
--- /dev/null
+++ b/src/views/system/drawingMange/index.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>
+    {{}}
+  </div>
+</template>
+<script>
+export default {
+    name:'DrawingMange',
+    data() {
+        return {
+
+        };
+    },
+    mounted() {
+
+    },
+    methods:{
+
+    }
+};
+</script>

From af9eb2c8b64b03c4bb0b080a0ada03c3a83b5e3f Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 14 May 2021 13:14:08 +0800
Subject: [PATCH 07/32] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                   | 183 +++++++++++++++++----------------
 src/api/editor.js              |  68 ++++++++++++
 src/api/upload.js              |  25 +++++
 src/i18n/langs/zh/router.js    |   3 +
 src/router/index.js            |  35 +++++++
 src/utils/baseUrl.js           |   4 +-
 src/views/editor/edit.vue      | 116 +++++++++++++++++++++
 src/views/editor/index.vue     | 151 +++++++++++++++++++++++++++
 src/views/editor/list.vue      |  87 ++++++++++++++++
 src/views/editor/listDraft.vue | 108 +++++++++++++++++++
 10 files changed, 687 insertions(+), 93 deletions(-)
 create mode 100644 src/api/editor.js
 create mode 100644 src/api/upload.js
 create mode 100644 src/views/editor/edit.vue
 create mode 100644 src/views/editor/index.vue
 create mode 100644 src/views/editor/list.vue
 create mode 100644 src/views/editor/listDraft.vue

diff --git a/package.json b/package.json
index 666b32dc3..e1bd92899 100644
--- a/package.json
+++ b/package.json
@@ -1,93 +1,94 @@
 {
-	"name": "vue-admin-template",
-	"version": "4.1.0",
-	"description": "A vue admin template with Element UI & axios & iconfont & permission control & lint",
-	"author": "Pan <panfree23@gmail.com>",
-	"license": "MIT",
-	"scripts": {
-		"start": "vue-cli-service serve --open",
-		"dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
-		"build": "vue-cli-service build --mode production",
-		"test": "vue-cli-service build --mode staging",
-		"local": "vue-cli-service build --mode",
-		"preview": "node build/index.js --preview",
-		"lint": "eslint --ext .js,.vue src",
-		"test:unit": "jest --clearCache && vue-cli-service test:unit",
-		"test:ci": "npm run lint && npm run test:unit",
-		"svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
-	},
-	"dependencies": {
-		"axios": "0.18.0",
-		"echarts": "^4.7.0",
-		"element-ui": "^2.12.0",
-		"file-saver": "^1.3.3",
-		"js-cookie": "2.2.0",
-		"js-md5": "^0.7.3",
-		"lodash": "^4.17.11",
-		"normalize.css": "7.0.0",
-		"nprogress": "^0.2.0",
-		"path-to-regexp": "2.4.0",
-		"qrcode.vue": "^1.6.2",
-		"qs": "^6.9.3",
-		"quill-emoji": "^0.1.8",
-		"quill-image-extend-module": "^1.1.2",
-		"recordrtc": "^5.5.9",
-		"script-loader": "^0.7.2",
-		"sessionstorage": "^0.1.0",
-		"stompjs": "^2.3.3",
-		"storejs": "^1.0.25",
-		"three": "^0.107.0",
-		"video.js": "^7.8.4",
-		"vue": "^2.6.10",
-		"vue-i18n": "^8.12.0",
-		"vue-quill-editor": "^3.0.6",
-		"vue-router": "^3.1.6",
-		"vuedraggable": "^2.24.3",
-		"vuex": "^3.1.0",
-		"xlsx": "^0.14.2",
-		"zrender": "^4.0.4"
-	},
-	"devDependencies": {
-		"@babel/core": "7.0.0",
-		"@babel/register": "7.0.0",
-		"@vue/cli-plugin-babel": "3.6.0",
-		"@vue/cli-plugin-eslint": "3.6.0",
-		"@vue/cli-plugin-unit-jest": "3.6.3",
-		"@vue/cli-service": "3.6.0",
-		"@vue/test-utils": "1.0.0-beta.29",
-		"autoprefixer": "^9.5.1",
-		"babel-core": "7.0.0-bridge.0",
-		"babel-eslint": "10.0.1",
-		"babel-jest": "23.6.0",
-		"babel-plugin-syntax-dynamic-import": "^6.18.0",
-		"babel-preset-env": "1.6.1",
-		"babel-preset-stage-2": "6.24.1",
-		"chalk": "2.4.2",
-		"compression-webpack-plugin": "^3.1.0",
-		"connect": "3.6.6",
-		"copy-webpack-plugin": "^4.5.2",
-		"eslint": "5.15.3",
-		"eslint-plugin-vue": "5.2.2",
-		"file-loader": "^3.0.1",
-		"html-webpack-plugin": "3.2.0",
-		"mockjs": "1.0.1-beta3",
-		"node-sass": "^4.9.0",
-		"runjs": "^4.3.2",
-		"sass-loader": "^7.1.0",
-		"script-ext-html-webpack-plugin": "2.1.3",
-		"script-loader": "^0.7.2",
-		"serve-static": "^1.13.2",
-		"svg-sprite-loader": "4.1.3",
-		"svgo": "1.2.2",
-		"vue-template-compiler": "^2.6.11"
-	},
-	"engines": {
-		"node": ">=8.9",
-		"npm": ">= 3.0.0"
-	},
-	"browserslist": [
-		"> 1%",
-		"last 2 versions",
-		"not ie <= 8"
-	]
+  "name": "vue-admin-template",
+  "version": "4.1.0",
+  "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint",
+  "author": "Pan <panfree23@gmail.com>",
+  "license": "MIT",
+  "scripts": {
+    "start": "vue-cli-service serve --open",
+    "dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
+    "build": "vue-cli-service build --mode production",
+    "test": "vue-cli-service build --mode staging",
+    "local": "vue-cli-service build --mode",
+    "preview": "node build/index.js --preview",
+    "lint": "eslint --ext .js,.vue src",
+    "test:unit": "jest --clearCache && vue-cli-service test:unit",
+    "test:ci": "npm run lint && npm run test:unit",
+    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
+  },
+  "dependencies": {
+    "axios": "0.18.0",
+    "echarts": "^4.7.0",
+    "element-ui": "^2.12.0",
+    "file-saver": "^1.3.3",
+    "js-cookie": "2.2.0",
+    "js-md5": "^0.7.3",
+    "lodash": "^4.17.11",
+    "normalize.css": "7.0.0",
+    "nprogress": "^0.2.0",
+    "path-to-regexp": "2.4.0",
+    "qrcode.vue": "^1.6.2",
+    "qs": "^6.9.3",
+    "quill-emoji": "^0.1.8",
+    "quill-image-extend-module": "^1.1.2",
+    "recordrtc": "^5.5.9",
+    "script-loader": "^0.7.2",
+    "sessionstorage": "^0.1.0",
+    "stompjs": "^2.3.3",
+    "storejs": "^1.0.25",
+    "three": "^0.107.0",
+    "video.js": "^7.8.4",
+    "vue": "^2.6.10",
+    "vue-i18n": "^8.12.0",
+    "vue-quill-editor": "^3.0.6",
+    "vue-router": "^3.1.6",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.1.0",
+    "wangeditor": "^4.6.17",
+    "xlsx": "^0.14.2",
+    "zrender": "^4.0.4"
+  },
+  "devDependencies": {
+    "@babel/core": "7.0.0",
+    "@babel/register": "7.0.0",
+    "@vue/cli-plugin-babel": "3.6.0",
+    "@vue/cli-plugin-eslint": "3.6.0",
+    "@vue/cli-plugin-unit-jest": "3.6.3",
+    "@vue/cli-service": "3.6.0",
+    "@vue/test-utils": "1.0.0-beta.29",
+    "autoprefixer": "^9.5.1",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-eslint": "10.0.1",
+    "babel-jest": "23.6.0",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-preset-env": "1.6.1",
+    "babel-preset-stage-2": "6.24.1",
+    "chalk": "2.4.2",
+    "compression-webpack-plugin": "^3.1.0",
+    "connect": "3.6.6",
+    "copy-webpack-plugin": "^4.5.2",
+    "eslint": "5.15.3",
+    "eslint-plugin-vue": "5.2.2",
+    "file-loader": "^3.0.1",
+    "html-webpack-plugin": "3.2.0",
+    "mockjs": "1.0.1-beta3",
+    "node-sass": "^4.9.0",
+    "runjs": "^4.3.2",
+    "sass-loader": "^7.1.0",
+    "script-ext-html-webpack-plugin": "2.1.3",
+    "script-loader": "^0.7.2",
+    "serve-static": "^1.13.2",
+    "svg-sprite-loader": "4.1.3",
+    "svgo": "1.2.2",
+    "vue-template-compiler": "^2.6.11"
+  },
+  "engines": {
+    "node": ">=8.9",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
 }
diff --git a/src/api/editor.js b/src/api/editor.js
new file mode 100644
index 000000000..2fa1e80b6
--- /dev/null
+++ b/src/api/editor.js
@@ -0,0 +1,68 @@
+import request from '@/utils/request';
+// 获取文章列表
+export function getDoc() {
+    return request({
+        url: `/api/doc`,
+        method: 'get'
+    });
+}
+// 获取发布内容
+export function getDocById(id) {
+    return request({
+        url: `/api/doc/${id}`,
+        method: 'get'
+    });
+}
+// 获取草稿列表
+export function getDocDraft() {
+    return request({
+        url: `/api/doc/draft`,
+        method: 'get'
+    });
+}
+// 创建
+export function postDocDraft(data) {
+    return request({
+        url: `/api/doc/draft`,
+        method: 'post',
+        data
+    });
+}
+// 获取草稿数据id
+export function getDocDraftById(id) {
+    return request({
+        url: `/api/doc/draft/${id}`,
+        method: 'get'
+    });
+}
+// 更新草稿数据
+export function putDocDraftById(id, data) {
+    return request({
+        url: `/api/doc/draft/${id}`,
+        method: 'put',
+        data
+    });
+}
+// 删除草稿数据
+export function deleteDocDraftById(id) {
+    return request({
+        url: `/api/doc/draft/${id}`,
+        method: 'delete'
+    });
+}
+// 保存内容根据id
+export function putDocDraftByIdData(id, data) {
+    return request({
+        url: `/api/doc/draft/${id}/data`,
+        method: 'put',
+        data
+    });
+}
+// 草稿发布
+export function putDocDraftByIdPublish(id) {
+    return request({
+        url: `/api/doc/draft/${id}/publish`,
+        method: 'put'
+    });
+}
+
diff --git a/src/api/upload.js b/src/api/upload.js
new file mode 100644
index 000000000..806bb8d7e
--- /dev/null
+++ b/src/api/upload.js
@@ -0,0 +1,25 @@
+import request from '@/utils/request';
+
+export const productIdentify = '00001&appSecret=joylink00001';
+
+export const pictureUrl = `/api/upload/PICTURE?appId=${productIdentify}`;
+// export const modelUrl = `/api/upload/model?appId=${productIdentify}`;
+
+// export const attachmentUrl = `/api/upload/attachment?appId=${productIdentify}`;
+// export const meansUrl = `/api/upload/means?appId=${productIdentify}`;
+// export const regulationUrl = `/api/upload/regulation?appId=${productIdentify}`;
+
+export function getUrl(relatedUrl) {
+    return `${process.env.VUE_APP_UPLOAD_API}${relatedUrl}`;
+}
+
+export function uploadFile(url, data) {
+    return request({
+        headers: {
+            'Content-Type': 'multipart/form-data'
+        },
+        url,
+        method: 'post',
+        data: data
+    });
+}
diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js
index eadca6adb..770d6c8c3 100644
--- a/src/i18n/langs/zh/router.js
+++ b/src/i18n/langs/zh/router.js
@@ -4,6 +4,9 @@ export default {
     designhomePage: '公共地图',
     designUserPage: '个人地图',
     newDesignUserPage: '地图绘制',
+    newDesignEditor: '编辑器',
+    newDesignEditorList: '图文列表',
+    newDesignDraftEditorList: '文章草稿',
 
     mapManage: '地图管理',
     skinManage: '皮肤管理',
diff --git a/src/router/index.js b/src/router/index.js
index 8a15ed8d2..dfda13a14 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -172,6 +172,10 @@ const VoiceTraining = () => import('@/views/system/voiceTraining/index');
 const SceneTrainingResult = () => import('@/views/drts/scene/trainingResult');
 const SceneVoiceTraining = () => import('@/views/drts/scene/voiceTraining');
 
+const Ueditor = () => import('@/views/editor/index');
+const UeditorList = () => import('@/views/editor/list');
+const UeditorDraftList = () => import('@/views/editor/listDraft');
+
 // import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
 // import { getSessionStorage } from '@/utils/auth';
 
@@ -1132,6 +1136,37 @@ export const asyncRouter = [
             // }
         ]
     },
+    {
+        path: '/editor',
+        component: Layout,
+        meta: {
+            i18n: 'router.newDesignEditor',
+            roles: [admin, user]
+        },
+        children: [
+            {
+                path: 'list',
+                component: UeditorList,
+                meta: {
+                    i18n: 'router.newDesignEditorList'
+                }
+            },
+            {
+                path: 'listDraft',
+                component: UeditorDraftList,
+                meta: {
+                    i18n: 'router.newDesignDraftEditorList'
+                }
+            },
+            {
+                path: '',
+                component: Ueditor,
+                meta: {
+                    i18n: 'router.newDesignEditor'
+                }
+            }
+        ]
+    },
     { // 新个人地图
         path: '/design',
         component: Layout,
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 11702c286..f4a99c662 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,8 +2,8 @@ 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 = 'http://192.168.8.107:9000'; // 袁琪
+        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'http://192.168.3.119:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
         // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
         // BASE_API = 'http://192.168.3.120:9000'; // 张赛
diff --git a/src/views/editor/edit.vue b/src/views/editor/edit.vue
new file mode 100644
index 000000000..b8a4935af
--- /dev/null
+++ b/src/views/editor/edit.vue
@@ -0,0 +1,116 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center>
+    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+// import { postOperateStepData, putOperateStepData, getPlaceholderList } from '@/api/management/operation';
+import { postDocDraft, getDocDraftById, putDocDraftById } from '@/api/editor';
+
+export default {
+    name: 'TrainingDetailEdit',
+    props: {
+        type: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                id: '',
+                title: ''
+            },
+            placeholderList: []
+        };
+    },
+    computed: {
+        form() {
+            // const isAdd = this.type === 'ADD';
+            const form = {
+                labelWidth: '80px',
+                items: [
+                    { prop: 'title', label: '标题', type: 'text', required: true }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                title: [
+                    {
+                        required: true,
+                        message: '请输入文章标题',
+                        trigger: 'blur'
+                    }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            if (this.type === 'ADD') {
+                return '创建文章';
+            } else {
+                return '更新文章';
+            }
+        }
+    },
+    methods: {
+        async show(data) {
+            this.dialogVisible = true;
+            console.log(data);
+            if (this.type != 'ADD') {
+                const res = await getDocDraftById(data.id);
+                this.formModel.title = res.data.title;
+                this.formModel.id = data.id;
+            } else {
+                this.formModel.title = '';
+                this.formModel.id = '';
+            }
+        },
+        doSave() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                if (self.type === 'ADD') {
+                    self.create();
+                } else {
+                    self.update();
+                }
+            });
+        },
+        create() {
+            const self = this;
+            postDocDraft(this.formModel).then(() => {
+                self.$message.success('创建文章成功!');
+                self.handleClose();
+                self.$emit('reloadTable');
+            }).catch(error => {
+                self.$message.error(`创建文章失败:${error.message}`);
+            });
+        },
+        update() {
+            const self = this;
+            putDocDraftById(this.formModel.id, this.formModel).then(() => {
+                self.$message.success('更新文章成功!');
+                self.handleClose();
+                self.$emit('reloadTable');
+            }).catch(error => {
+                self.$message.error(`更新文章失败:${error.message}`);
+            });
+        },
+        handleClose() {
+            this.formModel = {
+                title: ''
+            };
+            this.$refs.dataform.resetForm();
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
diff --git a/src/views/editor/index.vue b/src/views/editor/index.vue
new file mode 100644
index 000000000..4977cfd24
--- /dev/null
+++ b/src/views/editor/index.vue
@@ -0,0 +1,151 @@
+<template>
+  <div id="wangeditor">
+    <div ref="editorElem" style="text-align:left;" />
+    <button v-if="draft" type="button" class="btn" @click="saveDraftTitle">保存</button>
+    <!-- <button type="button" class="btn" @click="getEditorData">获取当前内容</button>
+    <button type="button" class="btn" @click="setEditorData">设置当前内容</button>
+    <h3>内容预览</h3>
+    <div class="content_html1" v-html="editorContent" /> -->
+  </div>
+</template>
+<script>
+import E from 'wangeditor';
+import { uploadFile, pictureUrl } from '@/api/upload';
+import { putDocDraftByIdData, getDocDraftById } from '@/api/editor';
+
+export default {
+    name: 'Editor',
+    // catchData是一个类似回调函数，来自父组件，当然也可以自己写一个函数，主要是用来获取富文本编辑器中的html内容用来传递给服务端
+    // props: ['catchData'],
+    data() {
+        return {
+            editor: null,
+            formData: '',
+            editorContent: ''
+        };
+    }, // 接收父组件的方法
+    computed: {
+        action() {
+            return `${process.env.VUE_APP_UPLOAD_API}${pictureUrl}`;
+        },
+        draft() {
+            return this.$route.query.draft;
+        },
+        docId() {
+            return this.$route.query.docId;
+        }
+    },
+    mounted() {
+        this.editor = new E(this.$refs.editorElem);
+        this.editor.config.height = 450;
+
+        this.editor.config.uploadImgServer = '/upload-img';
+        // 编辑器的事件，每次改变会获取其html内容
+        this.editor.config.onchange = html => {
+            this.editorContent = html;
+        };
+
+        // this.editor.config.showLinkImg = false; // 隐藏插入网络图片的功能
+        this.editor.config.uploadImgShowBase64 = true;
+        const action = this.action;
+        const that = this;
+        this.editor.config.customUploadImg = function (resultFiles, insertImgFn) {
+            that.formData = new FormData();
+            resultFiles.forEach(file => {
+                that.formData.append('file', file);
+            });
+
+            uploadFile(action, that.formData).then(resp => {
+                const imgUrl = process.env.VUE_APP_VOICE_API + resp.data;
+                insertImgFn(imgUrl);
+            }).catch(error => { console.log(error); });
+        };
+
+        this.editor.config.menus = [
+            // 菜单配置
+            'head', // 标题
+            'bold', // 粗体
+            'fontSize', // 字号
+            'fontName', // 字体
+            'italic', // 斜体
+            'underline', // 下划线
+            'strikeThrough', // 删除线
+            'indent',
+            'lineHeight',
+            'foreColor', // 文字颜色
+            'backColor', // 背景颜色
+            'link', // 插入链接
+            'list', // 列表
+            'justify', // 对齐方式
+            'quote', // 引用
+            'emoticon', // 表情
+            'image', // 插入图片
+            'table', // 表格
+            'code', // 插入代码
+            'splitLine',
+            'undo', // 撤销
+            'redo' // 重复
+        ];
+
+        this.editor.create(); // 创建富文本实例
+
+        this.handleEdit();
+    },
+    beforeDestroy() {
+        // 调用销毁 API 对当前编辑器实例进行销毁
+        this.editor.destroy();
+        this.editor = null;
+    },
+    methods: {
+        async handleEdit() {
+            try {
+                const res = await getDocDraftById(this.docId);
+                this.editor && this.editor.txt.html(res.data.content); // 重新设置编辑器内容
+            } catch (error) {
+                console.log(error);
+            }
+
+        },
+        saveDraftTitle() {
+            const data = this.editor.txt.html();
+            putDocDraftByIdData(this.docId, { content: data }).then(res => {
+                this.$message.success('保存文章成功!');
+                setTimeout(() => {
+                    this.$router.push({path : '/editor/listDraft'});
+                }, 2000);
+            }).catch(error => {
+                this.$message.error(`保存失败:${error.message}`);
+            });
+        },
+        getEditorData() {
+            const data = this.editor.txt.html();
+            console.log(data);
+        },
+        setEditorData() {
+            const html = '<h1 id="gt6dj" style="text-align:center;">测试标题</h1><hr/><p data-we-empty-p="" style="text-align:center;"><img src="https://oss.joylink.club/oss/ddy/picture/2021-05-10/2720-44302.jpg" style="max-width:100%;" contenteditable="false" width="473" height="196.83"/><br/>工艺数据</p>';
+            this.editor && this.editor.txt.html(html); // 重新设置编辑器内容
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+#wangeditor{
+	z-index: 2;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+}
+.content_html {
+	width: 100%;
+	height: 200px;
+	overflow: auto;
+	background: red;
+}
+.content_html1{
+	width: 100%;
+	height: 300px;
+	overflow: auto;
+	background: chartreuse;
+}
+</style>
diff --git a/src/views/editor/list.vue b/src/views/editor/list.vue
new file mode 100644
index 000000000..1fa57b1cb
--- /dev/null
+++ b/src/views/editor/list.vue
@@ -0,0 +1,87 @@
+<template>
+  <div>
+    <el-card>
+      <el-form
+        ref="queryForm"
+        :model="formModel"
+        size="small"
+        style="padding: 6px 20px 6px 20px;overflow: hidden;"
+      >
+        <el-form-item label="标题" style="margin-bottom: 0;float: left; width: 300px;">
+          <el-input v-model="formModel.title" style="width: 240px;" />
+        </el-form-item>
+        <el-button style="margin-right: 10px; float: right;" type="primary" size="small" @click="reloadTable">查询</el-button>
+      </el-form>
+    </el-card>
+    <el-table :data="tableData" border style="width: 100%">
+      <el-table-column label="姓名">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ scope.row.title }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="450">
+        <template slot-scope="scope">
+          <el-button size="mini" @click="handleShow(scope.$index, scope.row)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog
+      title="文章"
+      :visible.sync="dialogVisible"
+      width="100%"
+      top="0"
+      :fullscreen="true"
+      :before-close="beforeClose"
+    >
+      <div class="content_html1" v-html="editorContent" />
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="beforeClose">关闭</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getDoc, getDocById } from '@/api/editor';
+
+export default {
+    name: 'CacheControl',
+    components: {
+    },
+    data() {
+        return {
+            tableData: [],
+            formModel: {
+                title: ''
+            },
+            dialogVisible: false,
+            editorContent: ''
+        };
+    },
+    created() {
+        this.reloadTable();
+    },
+    methods: {
+        handleShow(row, data) {
+            console.log(data);
+            this.dialogVisible = true;
+            getDocById(data.id).then(res => {
+                this.editorContent = res.data.content;
+            }).catch(error => {
+                console.log(error);
+            });
+        },
+        reloadTable() {
+            this.tableData = [];
+            getDoc().then(res => {
+                this.tableData = res.data;
+            }).catch(error => {
+                console.log(error);
+            });
+        },
+        beforeClose() {
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
diff --git a/src/views/editor/listDraft.vue b/src/views/editor/listDraft.vue
new file mode 100644
index 000000000..0735d70d8
--- /dev/null
+++ b/src/views/editor/listDraft.vue
@@ -0,0 +1,108 @@
+<template>
+  <div>
+    <!-- <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" /> -->
+    <el-card>
+      <el-form
+        ref="queryForm"
+        :model="formModel"
+        size="small"
+        style="padding: 6px 20px 6px 20px;overflow: hidden;"
+      >
+        <el-form-item label="标题" style="margin-bottom: 0;float: left; width: 300px;">
+          <el-input v-model="formModel.title" style="width: 240px;" />
+        </el-form-item>
+        <el-button style="margin-right: 10px; float: right;" type="primary" size="small" @click="createTitle">创建</el-button>
+        <el-button style="margin-right: 10px; float: right;" type="primary" size="small" @click="query">查询</el-button>
+      </el-form>
+    </el-card>
+    <el-table :data="tableData" border style="width: 100%">
+      <el-table-column label="姓名">
+        <template slot-scope="scope">
+          <!-- <i class="el-icon-time" /> -->
+          <span style="margin-left: 10px">{{ scope.row.title }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="450">
+        <template slot-scope="scope">
+          <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+          <el-button size="mini" @click="handleUpdate(scope.$index, scope.row)">更新</el-button>
+          <el-button size="mini" @click="handlePublish(scope.$index, scope.row)">发布</el-button>
+          <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Edit ref="edits" type="ADD" @reloadTable="reloadTable" />
+    <Edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
+  </div>
+</template>
+
+<script>
+import { getDocDraft, putDocDraftByIdPublish, deleteDocDraftById } from '@/api/editor';
+import Edit from './edit';
+
+export default {
+    name: 'CacheControl',
+    components: {
+        Edit
+    },
+    data() {
+        return {
+            tableData: [],
+            formModel: {
+                title: ''
+            }
+        };
+    },
+    created() {
+        this.query();
+    },
+    methods: {
+        query() {
+            this.reloadTable();
+        },
+        createTitle() {
+            this.$refs.edits.show();
+        },
+        // 编辑
+        handleEdit(row, data) {
+            this.$router.push({path : '/editor', query: {docId: data.id, draft: 1}});
+        },
+        // 更新标题
+        handleUpdate(row, data) {
+            this.$refs.edit.show(data);
+        },
+        // 草稿发布
+        handlePublish(row, data) {
+            console.log(data);
+            putDocDraftByIdPublish(data.id).then(res => {
+                this.$message.success('创建文章成功!');
+                this.reloadTable();
+            }).catch(error => {
+                this.$message.error(`发布失败: ${error.data}`);
+            });
+        },
+        handleDelete(row, data) {
+            this.$confirm('是否确认删除文章？', this.$t('tip.hint'), {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                deleteDocDraftById(data.id).then(res => {
+                    this.$message.success('删除文章成功!');
+                    this.reloadTable();
+                }).catch(error => {
+                    this.$message.error(`删除失败: ${error.data}`);
+                });
+            }).catch(() => {});
+        },
+        reloadTable() {
+            this.tableData = [];
+            getDocDraft().then(res => {
+                this.tableData = res.data;
+            }).catch(error => {
+                console.log(error);
+            });
+        }
+    }
+};
+</script>

From ddfddfa292713428e6e1e89be6db95917eeb9085 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 14 May 2021 15:05:57 +0800
Subject: [PATCH 08/32] =?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/jmapNew/map.js                            |   1 -
 src/jmapNew/painter.js                        |   5 +-
 src/jmapNew/shape/Train/index.js              |   1 -
 .../theme/haerbin_01/menus/menuButton.vue     | 108 ++++----
 .../nanjing_02/menus/dialog/mapVisual.vue     | 255 ++++++++++++++++++
 .../theme/nanjing_02/menus/dialog/rps.vue     |  95 +++++++
 .../theme/nanjing_02/menus/menuBar.vue        | 125 ++++++---
 .../theme/nanjing_02/menus/menuButton.vue     | 160 +++++++----
 src/scripts/cmdPlugin/CommandEnum.js          |   8 +-
 src/scripts/cmdPlugin/OperationHandler.js     |  12 +
 src/store/modules/map.js                      |   3 +
 src/utils/baseUrl.js                          |   4 +-
 .../newMap/mapsystemNew/common/index.vue      |  16 +-
 13 files changed, 637 insertions(+), 156 deletions(-)
 create mode 100644 src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue
 create mode 100644 src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue

diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 6a24d028d..8bd2b7f69 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -500,7 +500,6 @@ class Jlmap {
                             oDevice['cutOff'] = sectionA.cutOff;
                         }
                     }
-
                     this.$painter.update(oDevice);
                 } else if (elem.deviceType == 'SECTION') {
                     const oDevice = this.mapDevice[code];
diff --git a/src/jmapNew/painter.js b/src/jmapNew/painter.js
index 5f0c5edd2..5f8c3c671 100644
--- a/src/jmapNew/painter.js
+++ b/src/jmapNew/painter.js
@@ -6,6 +6,7 @@ import transitionDeviceStatus from './constant/stateTransition';
 import shapefactory from './shape/factory';
 import TransformHandle from './transformHandle';
 import TransformHandleScreen from './transformHandleScreen';
+import deviceRender from './constant/deviceRender';
 
 class Painter {
     constructor(jmap) {
@@ -136,6 +137,8 @@ class Painter {
         const overlapTrainList = this.checkTrainOverlap(device);
         overlapTrainList.forEach((item, index) => {
             const trainDevice = this.$jmap.getDeviceByCode(item);
+            trainDevice._type = deviceRender['Train']._type;
+            trainDevice.zlevel = deviceRender['Train'].zlevel;
             trainDevice.overLapIndex = index;
             trainDevice.instance && this.mapInstanceLevel[deviceType.Train].remove(trainDevice.instance);
             this.add(trainDevice);
@@ -223,7 +226,7 @@ class Painter {
     getShapeTipPoint(instance, opts) {
         if (instance) {
             var point = instance.getShapeTipPoint(opts);
-			if (point) {
+            if (point) {
                 // 矩阵变换
                 var transPoint = instance.transformCoordToGlobal(point.x, point.y);
                 return {
diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index 477a0ef64..db5c0e5bf 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -60,7 +60,6 @@ export default class Train extends Group {
         this._computed();
         const model = this.model;
         const style = this.style;
-
         if (this.point) {
             this.trainB = new TrainBody({
                 zlevel: this.zlevel,
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
index 411b27c86..38b15bb1f 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
@@ -76,9 +76,9 @@
           <div class="nav-border" style="padding: 5px;">
             <el-row style="height: 25px;">
               <div style="display: flex;justify-content: space-between">
-                <el-button size="mini" plain>车次号修改</el-button>
-                <el-button size="mini" plain :disabled="true">车次号删除</el-button>
-                <el-button size="mini" plain :disabled="true">车次号创建</el-button>
+                <el-button size="mini" plain :disabled="trainOperateType==='update'" @click="handleTrainOperate('update')">车次号修改</el-button>
+                <el-button size="mini" plain :disabled="trainOperateType==='delete'" @click="handleTrainOperate('delete')">车次号删除</el-button>
+                <el-button size="mini" plain :disabled="trainOperateType==='create'" @click="handleTrainOperate('create')">车次号创建</el-button>
                 <el-button size="mini" plain :disabled="true">车次号步进</el-button>
               </div>
             </el-row>
@@ -100,22 +100,29 @@
           <div class="nav-border" style="padding: 5px;">
             <el-row style="display: flex;align-items: center;">
               <el-col :span="7" style="height: 25px;line-height: 25px;">车次号</el-col>
-              <el-col :span="17"><el-input v-model="formModelTripNum" size="mini" style="height: 20px;" :disabled="true" /></el-col>
+              <el-col :span="17">
+                <el-input v-if="trainOperateType!=='create'" v-model="formModelTripNum" size="mini" style="height: 20px;" :disabled="true" />
+                <el-input v-if="trainOperateType==='create'" v-model="formModelNewTrip" size="mini" style="height: 20px;" />
+              </el-col>
             </el-row>
             <el-row style="display: flex;align-items: center;">
               <el-col :span="7" style="height: 25px;line-height: 25px;">轨道号</el-col>
               <el-col :span="17"><el-input v-model="formModelSectionName" size="mini" style="height: 20px;" :disabled="true" /></el-col>
             </el-row>
-            <el-row style="display: flex;align-items: center;">
+            <el-row v-if="trainOperateType ==='update'" style="display: flex;align-items: center;">
               <el-col :span="7" style="height: 25px;line-height: 25px;">新车次号</el-col>
               <el-col :span="17"><el-input v-model="formModelNewTrip" size="mini" style="height: 20px;" /></el-col>
             </el-row>
+            <el-row v-if="trainOperateType ==='create'" style="display: flex;align-items: center;">
+              <el-col :span="7" style="height: 25px;line-height: 25px;">新车组号</el-col>
+              <el-col :span="17"><el-input v-model="formModelNewGroup" size="mini" style="height: 20px;" /></el-col>
+            </el-row>
           </div>
         </el-col>
         <el-col v-if="trainOperationShow" :span="6" style="padding: 1px;">
           <div class="nav-border">
             <div style="display: flex;justify-content: space-around;width: 100%;height: 45px;align-items: center;border-bottom: 2px solid #FBFBFA;">
-              <el-button style="line-height: 18px; width: 100px; margin: 0;" plain :disabled="!trainModel.groupNumber" @click="trainCommit">执行</el-button>
+              <el-button style="line-height: 18px; width: 100px; margin: 0;" plain :disabled="!trainCommitDisabled" @click="trainCommit">执行</el-button>
               <el-button style="line-height: 18px; width: 100px; margin: 0;" plain @click="doClose">退出</el-button>
             </div>
           </div>
@@ -200,7 +207,9 @@ export default {
             formModelTripNum: '',
             formModelSectionName: '',
             formModelNewTrip: '',
-            speedShowCon: false
+            formModelNewGroup: '',
+            speedShowCon: false,
+            trainOperateType: ''
         };
     },
     computed: {
@@ -225,6 +234,10 @@ export default {
         },
         speedShow() {
             return (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) && this.speedShowCon;
+        },
+        trainCommitDisabled() {
+            return (this.trainOperateType === 'create' && this.formModelNewTrip && this.formModelNewTrip.length === 7 && this.formModelNewGroup && this.formModelNewGroup.length === 6) ||
+				(this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete');
         }
     },
     watch: {
@@ -363,6 +376,9 @@ export default {
                 }
             }
         },
+        handleTrainOperate(type) {
+            this.trainOperateType = type;
+        },
         getStationControl(selected) {
             let control;
             if (selected._type == 'StationStand') {
@@ -641,15 +657,7 @@ export default {
                 this.param.routeCodeList = routeCodeList;
             }
             if (this.cmdType == CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER || this.cmdType == CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER) {
-                if (this.selectedObj.centralized) {
-                    this.param = { stationCode: this.selectedObj.code };
-                } else {
-                    this.stationList.forEach(station => {
-                        if (station.centralized && station.chargeStationCodeList.includes(this.selectedObj.code)) {
-                            this.param = { stationCode: station.code };
-                        }
-                    });
-                }
+                this.param = { stationCode: this.selectedObj.code };
             }
             if (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) {
                 this.param.speedLimitValue = this.speedLimitValue;
@@ -745,19 +753,16 @@ export default {
         handleTrainParam() {
             if (this.selectedObj.type === '01') {
                 this.formModelSectionName = this.selectedObj.name;
+                this.trainOperateType = '';
                 this.$store.state.map.activeTrainList.forEach(trainCode => {
                     const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode);
-                    if (trainModel && trainModel.physicalCode === this.selectedObj.code) {
-                        this.formModelTripNum = trainModel.serviceNumber + trainModel.destinationCode + (trainModel.tripNumber.substring(1));
+                    if (trainModel && trainModel.sectionCode === this.selectedObj.code) {
+                        this.formModelTripNum = trainModel.destinationCode + (trainModel.serviceNumber.substring(1)) + (trainModel.tripNumber.substring(1));
                         this.trainModel = trainModel;
                         this.formModelNewTrip = '';
                     }
                 });
             }
-            // this.trainModel = this.selectedObj; physicalCode
-            // this.formModelTripNum = this.trainModel.destinationCode + this.trainModel.serviceNumber + this.trainModel.tripNumber;
-            // this.formModelSectionName = this.trainModel.sectionModel.name;
-            // this.formModelNewTrip = '';
         },
         setSpeedLimitValue(val) {
             this.speedLimitValue = val;
@@ -768,34 +773,47 @@ export default {
                 this.formModelTripNum = '';
                 this.formModelSectionName = '';
                 this.formModelNewTrip = '';
+                this.formModelNewGroup = '';
+                this.trainOperateType = '';
                 this.trainOperationShow = flag;
             }
         },
         trainCommit() {
-            if (this.formModelNewTrip && this.formModelNewTrip.length === 9) {
-                const params = {
-                    groupNumber: this.trainModel.groupNumber,
-                    tripNumber: this.formModelNewTrip.slice(6, 9),
-                    serviceNumber: this.formModelNewTrip.slice(3, 6)
-                };
-                const step = {
-                    over: true,
-                    cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN,
-                    operation: OperationEvent.Train.setPlanTrainId.menu.operation,
-                    param: params
-                };
-                this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.changeShowMode(true);
-                    }
-                }).catch((error) => {
-                    console.error(error);
-                    this.$refs.noticeInfo.doShow();
-                });
-            } else {
-                this.$refs.noticeInfo.doShow('请输入正确的车次号');
+            const params = {};
+            const step = {
+                over: true
+            };
+            if (this.trainOperateType === 'update') {
+                params.groupNumber = this.trainModel.groupNumber;
+                params.serviceNumber = '0' + this.formModelNewTrip.slice(3, 5);
+                params.tripNumber = '0' + this.formModelNewTrip.slice(5, 7);
+                step.cmdType = CMD.TrainWindow.CMD_TRAIN_SET_PLAN;
+                step.operation = OperationEvent.Train.setPlanTrainId.menu.operation;
+                step.param = params;
+            } else if (this.trainOperateType === 'create') {
+                params.sectionCode = this.selectedObj.code;
+                params.groupNumber = this.formModelNewGroup;
+                params.dn = this.formModelNewTrip.slice(0, 3);
+                params.sn = '0' + this.formModelNewTrip.slice(3, 5);
+                params.tn = '0' + this.formModelNewTrip.slice(5, 7);
+                step.cmdType = CMD.TrainWindow.CMD_TRAIN_ADD_TRAIN_TRACE;
+                step.operation = OperationEvent.Train.addTrainId.menu.operation;
+                step.param = params;
+            } else if (this.trainOperateType === 'delete') {
+                params.groupNumber = this.trainModel.groupNumber;
+                step.cmdType = CMD.TrainWindow.CMD_TRAIN_REMOVE_TRAIN_TRACE;
+                step.operation = OperationEvent.Train.delTrainId.menu.operation;
+                step.param = params;
             }
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.changeShowMode(true);
+                }
+            }).catch((error) => {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
         },
         initMenus() {
             this.basicParamList = this.$store.state.training.prdType === '01' ? [
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue
new file mode 100644
index 000000000..9f1c44d2c
--- /dev/null
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue
@@ -0,0 +1,255 @@
+<template>
+  <div
+    ref="jlmapCanvas"
+    class="jlmap-canvas"
+    style="width: 100%;height:960px;"
+  >
+    <div :id="canvasId" class="display_canvas" />
+  </div>
+</template>
+
+<script>
+import Jlmap from '@/jmapNew/map';
+import { parser } from '@/jmapNew/utils/parser';
+import { deepAssign } from '@/utils/index';
+import deviceType from '@/jmapNew/constant/deviceType';
+import { mapGetters } from 'vuex';
+
+export default {
+    name: 'JLocalmapVisual',
+    props: {
+    },
+    data() {
+        return {
+            loading: true,
+            offset: {
+                x: 0,
+                y: 0
+            },
+            map: null,
+            mapDevice: {},
+            routeData: [],
+            mapData: null,
+            autoReentryData: [],
+            width: 1920,
+            height: 960
+        };
+    },
+    computed: {
+        canvasId() {
+            return ['map', Math.random().toFixed(5) * 100000].join('_');
+        },
+        ...mapGetters('map', [
+            'bigScreenConfig'
+        ])
+    },
+    watch: {
+        '$store.state.config.canvasSizeCount': function (val) {
+            this.resetSize();
+        },
+        '$store.state.map.mapViewLoadedCount':function() {
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            this.map.off('zoom');
+            this.handleUpdateScreen();
+        }
+    },
+    created() {
+        this.mapData = JSON.parse(JSON.stringify(this.$store.state.map.map));
+    },
+    mounted() {
+        this.init();
+    },
+    beforeDestroy() {
+        if (this.map) {
+            this.map.dispose();
+            this.map = null;
+        }
+    },
+    methods: {
+        init() {
+            document.getElementById(this.canvasId).oncontextmenu = function (e) {
+                return false;
+            };
+
+            if (!this.map) {
+                this.map = new Jlmap({
+                    dom: document.getElementById(this.canvasId),
+                    config: {
+                        renderer: 'canvas',
+                        width: this.width,
+                        height: this.height
+                    },
+                    options: {
+                        scaleRate: 1,
+                        offsetX: 0,
+                        offsetY: 0,
+                        zoomOnMouseWheel: false
+                    },
+                    showConfig: {
+                        prdType: '02',
+                        previewOrMapDraw: true,
+                        showMode: '02'
+                    },
+                    methods: {}
+                });
+            }
+
+            window.document.oncontextmenu = function () {
+                return false;
+            };
+
+            if (this.mapData.skinVO) {
+                this.mapDevice = parser(this.mapData, this.mapData.skinVO.code, this.map.getShowConfig());
+            }
+        },
+        loadData() {
+            try {
+                this.setMap(this.mapData, this.mapDevice);
+            } catch (error) {
+                console.log('[ERROR] ', error);
+            }
+        },
+        // 设置地图
+        setMap(data, mapDevice) {
+            if (data.skinVO) {
+                this.routeData = this.$store.state.map.routeData;
+                this.autoReentryData = this.$store.state.map.autoReentryData;
+                this.map.setMap(data, mapDevice, {
+                    routeData: this.routeData,
+                    autoReentryData: this.autoReentryData
+                });
+                setTimeout(() => {
+                    this.handleUpdateScreen();
+                }, 2000);
+            } else {
+                this.mapDevice = {};
+                this.map.clear();
+            }
+        },
+        handleUpdateScreen() {
+            this.maskOpen = false;
+            console.log(this.bigScreenConfig, '--0000');
+            if (this.bigScreenConfig.bigScreenSplitConfig && this.bigScreenConfig.bigScreenSplitConfig.length) {
+                const offsetList = this.bigScreenConfig.offsetList;
+                const width = this.bigScreenConfig.width;
+                const height = this.bigScreenConfig.height;
+                if (this.widthLeft) {
+                    const size = {
+                        width: (this.$store.state.app.width - (this.widthLeft || 450) - 2) * width,
+                        height: this.height * height,
+                        list: this.bigScreenConfig.bigScreenSplitConfig.map(ele => ele.position),
+                        offsetList: offsetList
+                    };
+                    console.log(size, '=----1');
+                    this.map.setUpdateScreen(size);
+                } else {
+                    const size = {
+                        width: (this.$store.state.app.width - 2) * width,
+                        height: this.$store.state.app.height * height,
+                        list: this.bigScreenConfig.bigScreenSplitConfig.map(ele => ele.position),
+                        offsetList: offsetList
+                    };
+                    console.log(size, '=----');
+                    this.map.setUpdateScreen(size);
+                }
+            } else {
+                this.maskOpen = true;
+                // this.$messageBox('该线路没有大屏切割位置信息, 请前往地图绘制编辑');
+            }
+        },
+        // 重置jlmap宽高
+        resetSize() {
+            this.$nextTick(() => {
+                this.map && this.map.resize({ width: 1920, height: 960 });
+            });
+        },
+        // 设置显示图层
+        setLevelVisible(levels) {
+            this.map && this.map.setLevelVisible(levels);
+        },
+        setMapFree() {
+            const list = [];
+            Object.values(this.mapDevice).forEach((elem) => {
+                const code = elem.code;
+                const type = elem._type;
+                // 列车不需要设置默认状态
+                type != deviceType.Train &&
+          list.push({ code, _type: type, _free: true });
+            });
+
+            this.map.update(list, false);
+        },
+        // 设置中心偏移
+        setCenterWithOffset(code, dx, y) {
+            this.map.setCenterWithOffset(code, dx, y - this.height / 2);
+        },
+        // 更新地图数据
+        updateMapDevice(elems) {
+            const list = [];
+            elems.forEach((elem) => {
+                if (elem.code) {
+                    list.push(deepAssign(this.mapDevice[elem.code], elem));
+                }
+            });
+
+            this.map.update(list, false);
+        },
+        getDeviceByCode(code) {
+            return this.mapDevice[code];
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.mask {
+  opacity: 0;
+  background: #000;
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 9;
+}
+.jlmap-canvas {
+  position: relative;
+  -moz-user-select: none;
+  -o-user-select: none;
+  -khtml-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  background: #000;
+  float: left;
+}
+.title {
+  text-align: right;
+  font-size: 14px;
+  color: #606266;
+  line-height: 32px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  font-weight: 700;
+}
+
+.zoom-view {
+  position: absolute;
+  bottom: 0;
+  background: #fff;
+  padding-top: 5px;
+  height: 42px;
+  border-bottom: 1px #f3f3f3 solid;
+  border-right: 1px #f3f3f3 solid;
+}
+
+/deep/ {
+  .el-form.el-form--inline {
+    height: 28px !important;
+    line-height: 28px !important;
+  }
+
+  .el-loading-mask {
+    background-color: rgba(0, 0, 0, 0.3);
+  }
+}
+</style>
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue
new file mode 100644
index 000000000..a3d4b8efd
--- /dev/null
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue
@@ -0,0 +1,95 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="haerbin-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    :fullscreen="true"
+    :before-close="doClose"
+    :z-index="2000"
+  >
+    <map-visual ref="map" style="width: 100%;height: 100%;" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { EventBus } from '@/scripts/event-bus';
+import MapVisual from './mapVisual';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'TrainMove',
+    components: {
+        MapVisual
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                tripNumber: '',
+                trainSource: '',
+                stationStandSource: '',
+                trainGoal: '',
+                stationStandGoal: ''
+            },
+
+            rules: {
+                tripNumber: [
+                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
+                ],
+                trainSource: [
+                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
+                ],
+                stationStandSource: [
+                    { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
+                ],
+                trainGoal: [
+                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
+                ],
+                stationStandGoal: [
+                    { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
+                ]
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            return '背投系统';
+        }
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$refs.map.loadData(this.mapData);
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+        }
+    }
+};
+</script>
+<style scoped>
+	.haerbin-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/nanjing_02/menus/menuBar.vue b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue
index ca79345ce..e16619f31 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue
@@ -62,8 +62,8 @@
         </el-col>
       </el-row>
       <el-row v-else-if="$store.state.training.prdType === '02'" style="padding: 3px;">
-        <el-col :span="16">
-          <div style="width: calc(100% - 10px);border: 2px solid #DDD9CA;border-radius: 1px;">
+        <el-col :span="20">
+          <div style="width: calc(100% - 10px);border: 2px solid #DDD9CA;border-radius: 1px;height: 132px;">
             <el-row style="padding: 4px;">
               <div class="tip-content-box">
                 <div v-if="tipContent[0]">{{ `${tipContent[0].level}` }}</div>
@@ -81,53 +81,86 @@
                 <div v-if="tipContent[2]">{{ `${tipContent[2].confirm ? '确认': '未确认'}` }}</div>
               </div>
             </el-row>
-            <el-row class="button-row">
-              <div class="div-simulate-button" @click="undeveloped">系统</div>
-              <div class="div-simulate-button" @click="undeveloped">联锁</div>
-              <div class="div-simulate-button" @click="trainControlShow">列监</div>
-              <div class="div-simulate-button" @click="undeveloped">站控</div>
-              <div class="div-simulate-button" @click="undeveloped">车场</div>
-              <div class="div-simulate-button" @click="undeveloped">编表</div>
-              <div class="div-simulate-button" @click="undeveloped">车辆段</div>
-            </el-row>
-            <el-row class="button-row" style="margin: 10px 0;">
-              <div class="div-simulate-button" @click="undeveloped">轨道</div>
-              <div class="div-simulate-button" @click="undeveloped">调度</div>
-              <div class="div-simulate-button" @click="undeveloped">录放</div>
-              <div class="div-simulate-button" @click="undeveloped">管理</div>
-              <div class="div-simulate-button" @click="undeveloped">列车信息</div>
-              <div class="div-simulate-button" @click="undeveloped">职权</div>
-              <div style="width: 80px;" />
-            </el-row>
+            <div style="padding: 5px;height:20px;line-height: 20px;border-top: 2px solid #DDD9CA;display: flex;justify-content: space-between;">
+              <!--<div class="div-simulate-button" @click="undeveloped">系统</div>-->
+              <!--<div class="div-simulate-button" @click="undeveloped">联锁</div>-->
+              <!--<div class="div-simulate-button" @click="trainControlShow">列监</div>-->
+              <!--<div class="div-simulate-button" @click="undeveloped">站控</div>-->
+              <!--<div class="div-simulate-button" @click="undeveloped">车场</div>-->
+              <!--<div class="div-simulate-button" @click="undeveloped">编表</div>-->
+              <!--<div class="div-simulate-button" @click="undeveloped">车辆段</div>-->
+              <div>
+                <div class="div-simulate-button" style="width: 40px;" @click="rpsClick">背投</div>
+                <div class="div-simulate-button" style="width: 40px;">车场</div>
+                <div class="div-simulate-button" style="width: 40px;">轨道</div>
+                <div class="div-simulate-button" style="width: 40px;">系统</div>
+                <div class="div-simulate-button" style="width: 40px;">列车</div>
+              </div>
+              <div>
+                <div class="div-simulate-button" style="width: 40px;">联锁</div>
+                <div class="div-simulate-button" style="width: 40px;">列监</div>
+                <div class="div-simulate-button" style="width: 40px;">运图</div>
+                <div class="div-simulate-button" style="width: 55px;">时刻表</div>
+                <div class="div-simulate-button" style="width: 40px;">编表</div>
+                <div class="div-simulate-button" style="width: 40px;">调度</div>
+                <div class="div-simulate-button" style="width: 40px;">站控</div>
+                <div class="div-simulate-button" style="width: 40px;">计划</div>
+              </div>
+              <div>
+                <div class="div-simulate-button" style="width: 40px;">SDM</div>
+              </div>
+              <div>
+                <div class="div-simulate-button" style="width: 55px;">管理员</div>
+                <div class="div-simulate-button" style="width: 40px;">职权</div>
+              </div>
+              <div>
+                <div class="div-simulate-button" style="width: 40px;">拷屏</div>
+                <div class="div-simulate-button" style="width: 40px;">录放</div>
+                <div class="div-simulate-button" style="width: 40px;">布局</div>
+              </div>
+            </div>
+            <!--<el-row class="button-row" style="margin: 10px 0;">-->
+            <!--<div class="div-simulate-button" @click="undeveloped">轨道</div>-->
+            <!--<div class="div-simulate-button" @click="undeveloped">调度</div>-->
+            <!--<div class="div-simulate-button" @click="undeveloped">录放</div>-->
+            <!--<div class="div-simulate-button" @click="undeveloped">管理</div>-->
+            <!--<div class="div-simulate-button" @click="undeveloped">列车信息</div>-->
+            <!--<div class="div-simulate-button" @click="undeveloped">职权</div>-->
+            <!--<div style="width: 80px;" />-->
+            <!--</el-row>-->
           </div>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="2">
           <div style="width: calc(100% - 10px);border: 2px solid #DDD9CA;border-radius: 1px;">
-            <el-row style="height: 68px;display: flex; justify-content: space-between;align-items: center;">
-              <div style="width: 40px;" class="div-simulate-button" :style="{background:isNoRecoverLevelA || isNoConfirmLevelA?'#F00':'#DDD' }" :class="{'headerBox' :isNoConfirmLevelA}" @click="showHimAlarm('A')">A</div>
-              <div style="width: 40px;" class="div-simulate-button" :style="{background:isNoRecoverLevelB || isNoConfirmLevelB?'#F00':'#DDD' }" :class="{'headerBox' :isNoConfirmLevelB}" @click="showHimAlarm('B')">B</div>
-              <div style="width: 40px;" class="div-simulate-button" :style="{background:isNoRecoverLevelC?'#F00':'#DDD' }" @click="showHimAlarm('C')">C</div>
-              <img :src="voiceIcon" style="width: 40px;height: 40px;" @click="controlAudio(false)">
-            </el-row>
-            <el-row class="button-row">
-              <div style="width: 80px;" class="div-simulate-button" @click="showHimAlarm">报警</div>
-              <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">运图</div>
+            <el-row style="margin-top: 20px;margin-bottom: 18px;">
+              <el-col :span="16">
+                <el-row class="button-row">
+                  <div style="width: 25px;" class="div-simulate-button" :style="{background:isNoRecoverLevelA || isNoConfirmLevelA?'#F00':'#DDD' }" :class="{'headerBox' :isNoConfirmLevelA}" @click="showHimAlarm('A')">A</div>
+                  <div style="width: 25px;" class="div-simulate-button" :style="{background:isNoRecoverLevelB || isNoConfirmLevelB?'#F00':'#DDD' }" :class="{'headerBox' :isNoConfirmLevelB}" @click="showHimAlarm('B')">B</div>
+                  <div style="width: 25px;" class="div-simulate-button" :style="{background:isNoRecoverLevelC?'#F00':'#DDD' }" @click="showHimAlarm('C')">C</div>
+                  <!--<img :src="voiceIcon" style="width: 40px;height: 40px;" @click="controlAudio(false)">-->
+                </el-row>
+                <el-row class="button-row" style="margin-top: 20px;">
+                  <div style="width: 40px;" class="div-simulate-button" @click="showHimAlarm">报警</div>
+                  <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">运图</div>
+                </el-row>
+              </el-col>
+              <el-col :span="8">
+                <div style="width: 40px;height: 60px;line-height: 60px;" class="div-simulate-button" @click="controlAudio(false)">静音</div>
+              </el-col>
             </el-row>
             <el-row class="button-row" style="margin: 10px 0;">
-              <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">报表</div>
-              <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">时刻表</div>
+              <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">档案</div>
+              <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">归档</div>
+              <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">统计</div>
             </el-row>
           </div>
         </el-col>
-        <el-col :span="4" style="border: 2px solid #DDD9CA;border-radius: 1px;">
-          <el-row style="height: 68px;" />
-          <el-row class="button-row">
-            <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">考评</div>
-            <div style="width: 80px;" class="div-simulate-button" @click="showLogDetail">日志</div>
-          </el-row>
+        <el-col :span="2" style="border: 2px solid #DDD9CA;border-radius: 1px;">
+          <el-row style="height: 88px;" />
           <el-row class="button-row" style="margin: 10px 0;">
-            <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">锁屏</div>
-            <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">退出</div>
+            <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">锁屏</div>
+            <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">退出</div>
           </el-row>
         </el-col>
       </el-row>
@@ -136,6 +169,7 @@
     <alarm-table-hmi ref="alarmTableHmi" />
     <train-control ref="trainControl" :offset="10" />
     <log-detail ref="logDetail" />
+    <rps-dialog ref="rpsDialog" />
     <audio id="buzzer" controls loop="loop" style="width: 0;height: 0">
       <source :src="buzzerAudio" type="audio/mpeg">
     </audio>
@@ -151,6 +185,7 @@ import BuzzerAudio from '@/assets/buzzer.mp3';
 import AlarmTableHmi from './menuDialog/alarmTableHmi';
 import AlarmTableLow from './menuDialog/alarmTableLow';
 import TrainControl from './dialog/trainControl';
+import RpsDialog from './dialog/rps';
 import LogDetail from './menuDialog/logDetail';
 
 export default {
@@ -159,7 +194,8 @@ export default {
         AlarmTableLow,
         AlarmTableHmi,
         TrainControl,
-        LogDetail
+        LogDetail,
+        RpsDialog
     },
     props: {
         selected: {
@@ -443,6 +479,9 @@ export default {
         trainControlShow() {
             this.$refs.trainControl.doShow();
         },
+        rpsClick() {
+        	this.$refs.rpsDialog.doShow();
+        },
         controlAudio(val) {
             const audio = document.getElementById('buzzer');
             this.sound = val;
@@ -665,9 +704,9 @@ export default {
 		width: 80px;
 	}
 	.tip-content-box{
-		height: 20px;
+		height: 30px;
 		width: 100%;
-		line-height: 20px;
+		line-height: 30px;
 		background: #001528;
 		color: #C20F29;
 		font-size: 14px;
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
index 5830075d5..591cd191e 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@@ -49,7 +49,7 @@
                 <el-button class="fr" style="line-height: 18px; margin-top: 4px;" plain :class="{'disabled': !isLogin}" :disabled="!isLogin" @click="interceptLogin(cancle)()">取消</el-button>
               </div>
               <div class="el-print">
-                <div v-for="(el,i) in tempData" :key="i" class="selected-row" :class="{'active' : route&&el.code===route.code}" @click="interceptLogin(selectRouteParam)(el.code)">
+                <div v-for="(el,i) in tempData" :key="i" class="selected-row" :class="{'active' : route&&el.code===route.code || overlap&&el.code===overlap.code}" @click="interceptLogin(selectRouteParam)(el.code)">
                   {{ el.commandTip || el.name }}
                 </div>
               </div>
@@ -59,9 +59,9 @@
             <div class="nav-border" style="padding: 5px;">
               <el-row style="height: 25px;">
                 <div style="display: flex;justify-content: space-between">
-                  <el-button size="mini" plain>车次号修改</el-button>
-                  <el-button size="mini" plain :disabled="true">车次号删除</el-button>
-                  <el-button size="mini" plain :disabled="true">车次号创建</el-button>
+                  <el-button size="mini" plain :disabled="trainOperateType==='update'" @click="handleTrainOperate('update')">车次号修改</el-button>
+                  <el-button size="mini" plain :disabled="trainOperateType==='delete'" @click="handleTrainOperate('delete')">车次号删除</el-button>
+                  <el-button size="mini" plain :disabled="trainOperateType==='create'" @click="handleTrainOperate('create')">车次号创建</el-button>
                   <el-button size="mini" plain :disabled="true">车次号步进</el-button>
                 </div>
               </el-row>
@@ -83,22 +83,29 @@
             <div class="nav-border" style="padding: 5px;">
               <el-row style="display: flex;align-items: center;">
                 <el-col :span="7" style="height: 25px;line-height: 25px;">车次号</el-col>
-                <el-col :span="17"><el-input v-model="formModelTripNum" size="mini" style="height: 20px;" :disabled="true" /></el-col>
+                <el-col :span="17">
+                  <el-input v-if="trainOperateType!=='create'" v-model="formModelTripNum" size="mini" style="height: 20px;" :disabled="true" />
+                  <el-input v-if="trainOperateType==='create'" v-model="formModelNewTrip" size="mini" style="height: 20px;" />
+                </el-col>
               </el-row>
               <el-row style="display: flex;align-items: center;">
                 <el-col :span="7" style="height: 25px;line-height: 25px;">轨道号</el-col>
                 <el-col :span="17"><el-input v-model="formModelSectionName" size="mini" style="height: 20px;" :disabled="true" /></el-col>
               </el-row>
-              <el-row style="display: flex;align-items: center;">
+              <el-row v-if="trainOperateType ==='update'" style="display: flex;align-items: center;">
                 <el-col :span="7" style="height: 25px;line-height: 25px;">新车次号</el-col>
                 <el-col :span="17"><el-input v-model="formModelNewTrip" size="mini" style="height: 20px;" /></el-col>
               </el-row>
+              <el-row v-if="trainOperateType ==='create'" style="display: flex;align-items: center;">
+                <el-col :span="7" style="height: 25px;line-height: 25px;">新车组号</el-col>
+                <el-col :span="17"><el-input v-model="formModelNewGroup" size="mini" style="height: 20px;" /></el-col>
+              </el-row>
             </div>
           </el-col>
           <el-col v-if="trainOperationShow" :span="6" style="padding: 1px;">
             <div class="nav-border">
               <div style="display: flex;justify-content: space-around;width: 100%;height: 45px;align-items: center;border-bottom: 2px solid #FBFBFA;">
-                <el-button style="line-height: 18px; width: 100px; margin: 0;" plain :disabled="!trainModel.groupNumber" @click="trainCommit">执 行</el-button>
+                <el-button style="line-height: 18px; width: 100px; margin: 0;" plain :disabled="!trainCommitDisabled" @click="trainCommit">执 行</el-button>
                 <el-button style="line-height: 18px; width: 100px; margin: 0;" plain @click="doClose">取 消</el-button>
               </div>
             </div>
@@ -267,6 +274,7 @@ export default {
             selectedObj: null,
             oldClickObj: null, // 上一次点击对象
             route: null, // 进路对象
+            overlap: null, // 延续保护
             selectRouteList: [],
             menuCmdList: new Array(15).fill({}),
             ciStationParamList: [],
@@ -290,6 +298,8 @@ export default {
             formModelTripNum: '',
             formModelSectionName: '',
             formModelNewTrip: '',
+            formModelNewGroup: '',
+            trainOperateType: '',
             dialogVisible: false,
             tipList: [],
             modeMatch: false,
@@ -312,7 +322,9 @@ export default {
         ...mapGetters('map', [
             'routeList',
             'stationList',
-            'routeData'
+            'routeData',
+            'overlapList',
+            'overlapData'
         ]),
         commandId() {
             return OperationEvent.Command.commandHaerbin.confirm.domId;
@@ -349,6 +361,10 @@ export default {
         },
         menuPosition() {
             return this.$store.state.menuOperation.menuPosition;
+        },
+        trainCommitDisabled() {
+            return (this.trainOperateType === 'create' && this.formModelNewTrip && this.formModelNewTrip.length === 7 && this.formModelNewGroup && this.formModelNewGroup.length === 6) ||
+				(this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete');
         }
     },
     watch: {
@@ -449,6 +465,9 @@ export default {
                 }
             }
         },
+        handleTrainOperate(type) {
+            this.trainOperateType = type;
+        },
         initCentralizedStationList(list) {
             const stationContorl = this.stationContorl;
             this.menuCmdList = new Array(15).fill({});
@@ -577,13 +596,25 @@ export default {
             return control;
         },
         selectRouteParam(code) {
-            this.route = this.routeData[code];
-            if (this.route) {
-                this.param = {
-                    routeCode: this.route.code
-                };
+            if (this.cmdType === CMD.Signal.CMD_SIGNAL_SET_OVERLAP) {
+                this.overlap = this.overlapData[code];
+                if (this.overlap) {
+                    this.param = {
+                        signalCode: this.selectedObj.code,
+                        overlapCode: this.overlap.code
+                    };
+                    this.canCommand = false;
+                }
+            } else {
+                this.route = this.routeData[code];
+                if (this.route) {
+                    this.param = {
+                        routeCode: this.route.code
+                    };
+                }
+                this.initCentralizedStationList(this.routeParamList);
             }
-            this.initCentralizedStationList(this.routeParamList);
+
         },
         handleSwicthMenu() { // 转换底部道岔菜单栏
             // 获取道岔相关区段显示高亮
@@ -783,11 +814,20 @@ export default {
             if (row.commandTip) {
                 EventBus.$emit('sendMsg', {message: row.commandTip});
             }
+            if (row.cmdType === CMD.Signal.CMD_SIGNAL_SET_OVERLAP) {
+                const overlapList = [];
+                this.overlapList.forEach(item => {
+                    if (item.signalCode === this.selectedObj.code) {
+                        overlapList.push(item);
+                    }
+                });
+                this.tempData = [...overlapList];
+            }
 
             if (this.tempData.length) {
                 this.operate = row.operate.operation;
                 this.cmdType = row.cmdType;
-                this.canCommand = false;
+                this.canCommand = row.cmdType === CMD.Signal.CMD_SIGNAL_SET_OVERLAP;
                 step.operation = this.operate;
 
                 if (row.next) {
@@ -921,6 +961,7 @@ export default {
             this.securityCommand = '';
             this.speedLimitValue = '';
             this.secondConfirm = false;
+            this.overlap = null;
             this.cr1Confrim = false;
             if (this.oldClickObj) {
                 this.deviceHighLight(this.oldClickObj, false);
@@ -948,14 +989,15 @@ export default {
         handleTrainParam() {
             if (this.selectedObj.type === '01') {
                 this.formModelSectionName = this.selectedObj.name;
-                // this.$store.state.map.activeTrainList.forEach(trainCode => {
-                //     const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode);
-                //     if (trainModel && trainModel.physicalCode === this.selectedObj.code) {
-                //         this.formModelTripNum = trainModel.serviceNumber + trainModel.destinationCode + (trainModel.tripNumber.substring(1));
-                //         this.trainModel = trainModel;
-                //         this.formModelNewTrip = '';
-                //     }
-                // });
+                this.trainOperateType = '';
+                this.$store.state.map.activeTrainList.forEach(trainCode => {
+                    const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode);
+                    if (trainModel && trainModel.sectionCode === this.selectedObj.code) {
+                        this.formModelTripNum = trainModel.destinationCode + (trainModel.serviceNumber.substring(1)) + (trainModel.tripNumber.substring(1));
+                        this.trainModel = trainModel;
+                        this.formModelNewTrip = '';
+                    }
+                });
             }
         },
         pushTempData(list) {
@@ -970,38 +1012,50 @@ export default {
                 this.formModelTripNum = '';
                 this.formModelSectionName = '';
                 this.formModelNewTrip = '';
+                this.formModelNewGroup = '';
+                this.trainOperateType = '';
                 this.trainOperationShow = flag;
             }
         },
         trainCommit() {
-            if (this.formModelNewTrip && this.formModelNewTrip.length === 9) {
-                const params = {
-                    groupNumber: this.trainModel.groupNumber,
-                    tripNumber: this.formModelNewTrip.slice(6, 9),
-                    serviceNumber: this.formModelNewTrip.slice(3, 6)
-                };
-                const step = {
-                    over: true,
-                    cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN,
-                    operation: OperationEvent.Train.setPlanTrainId.menu.operation,
-                    param: params
-                };
-                this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.changeShowMode(true);
-                    }
-                }).catch((error) => {
-                    console.error(error);
-                    if (error && error.code == '10017') {
-                        EventBus.$emit('sendMsg', {message: error.message});
-                    } else {
-                        EventBus.$emit('sendMsg', {message: '命令执行失败！'});
-                    }
-                });
-            } else {
-                EventBus.$emit('sendMsg', {message: '请输入正确的车次号'});
+            const params = {};
+            const step = {
+                over: true
+            };
+            if (this.trainOperateType === 'update') {
+                params.groupNumber = this.trainModel.groupNumber;
+                params.serviceNumber = '0' + this.formModelNewTrip.slice(3, 5);
+                params.tripNumber = '0' + this.formModelNewTrip.slice(5, 7);
+                step.cmdType = CMD.TrainWindow.CMD_TRAIN_SET_PLAN;
+                step.operation = OperationEvent.Train.setPlanTrainId.menu.operation;
+                step.param = params;
+            } else if (this.trainOperateType === 'create') {
+                params.sectionCode = this.selectedObj.code;
+                params.groupNumber = this.formModelNewGroup;
+                params.dn = this.formModelNewTrip.slice(0, 3);
+                params.sn = '0' + this.formModelNewTrip.slice(3, 5);
+                params.tn = '0' + this.formModelNewTrip.slice(5, 7);
+                step.cmdType = CMD.TrainWindow.CMD_TRAIN_ADD_TRAIN_TRACE;
+                step.operation = OperationEvent.Train.addTrainId.menu.operation;
+                step.param = params;
+            } else if (this.trainOperateType === 'delete') {
+                params.groupNumber = this.trainModel.groupNumber;
+                step.cmdType = CMD.TrainWindow.CMD_TRAIN_REMOVE_TRAIN_TRACE;
+                step.operation = OperationEvent.Train.delTrainId.menu.operation;
+                step.param = params;
             }
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.changeShowMode(true);
+                }
+            }).catch((error) => {
+                if (error && error.code == '10017') {
+                    EventBus.$emit('sendMsg', {message: error.message});
+                } else {
+                    EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+                }
+            });
         },
         stationToCommand() {
             const step = {
@@ -1067,7 +1121,7 @@ export default {
             this.basicParamList = this.$store.state.training.prdType === '01' ? [
                 { name: '自排全开', commandTip: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
                 { name: '自排全关', commandTip: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
-                { name: '释放指令', commandTip: '释放指令', cmdType: '', operate: '', fillStationCode: true, disabledCb: (stationControl) => true },
+                { name: '释放指令', commandTip: '释放指令', cmdType: CMD.Station.CMD_STATION_RELEASE, operate: OperationEvent.Station.stationRelease.menuButton, securityCommand: true, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
                 { name: '重启令解', commandTip: '重启令解', cmdType: CMD.Station.CMD_STATION_RESTART, operate: OperationEvent.Station.stationRestart.menuButton, securityCommand: true, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
                 { name: '追踪全开', commandTip: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
                 { name: '追踪全关', commandTip: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
@@ -1144,7 +1198,7 @@ export default {
                 { name: '车队单开', commandTip: '对单架信号机开启车队模式，主要是信号机不关闭的情况下排列所有进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.setAutoInterlock.menuButton, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '车队单关', commandTip: '对单架信号机关闭车队模式', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.cancelAutoInterlock.menuButton, disabledCb: (stationControl) => !this.modeMatch },
 
-                { name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
+                { name: '设置保护', commandTip: '设置保护', cmdType: CMD.Signal.CMD_SIGNAL_SET_OVERLAP, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
             ] : [
                 { name: '关闭信号', commandTip: '设置信号机为关闭状态', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (stationControl) => !this.modeMatch },
@@ -1160,7 +1214,7 @@ export default {
                 { name: '开放引导', commandTip: '开放引导信号', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.guide.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '车队单开', commandTip: '对单架信号机开启车队模式，主要是信号机不关闭的情况下排列所有进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '车队单关', commandTip: '对单架信号机关闭车队模式', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
-                { name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
+                { name: '设置保护', commandTip: '设置保护', cmdType: CMD.Signal.CMD_SIGNAL_SET_OVERLAP, operate: OperationEvent.Signal.setOverlap.menuButton, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
             ];
             this.stationParamList = this.$store.state.training.prdType === '01' ? [
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index 7b9b1f3ff..ddcb79fa9 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -124,7 +124,9 @@ export default {
         /** 取消自动折返 */
         CMD_SIGNAL_CANCEL_AUTO_TURN_BACK: {value: 'Signal_Cancel_Auto_Turn_Back', label: '取消自动折返'},
         /** 信号机总取消 */
-        CMD_SIGNAL_TOTAL_CANCLE:{value:'Signal_Total_Cancel', label: '信号机总取消'}
+        CMD_SIGNAL_TOTAL_CANCLE:{value:'Signal_Total_Cancel', label: '信号机总取消'},
+        /** 设置保护 */
+        CMD_SIGNAL_SET_OVERLAP : {value: 'Signal_Set_Overlap', label: '设置保护'}
     },
 
     // 物理区段操作
@@ -263,7 +265,9 @@ export default {
         /** 取消计轴预复位 */
         CMD_STATION_CANCEL_PRE_RESET: {value: 'Station_Cancel_Pre_Reset', label: '取消计轴预复位'},
         /** 重启联锁机 */
-        CMD_STATION_RESTART_INTERLOCK_MACHINE: {value: 'Station_Restart_Interlock_Machine', label: '重启联锁机'}
+        CMD_STATION_RESTART_INTERLOCK_MACHINE: {value: 'Station_Restart_Interlock_Machine', label: '重启联锁机'},
+        /** 释放指令 */
+        CMD_STATION_RELEASE : {value:'Station_Release', label: '释放指令' }
     },
 
     // 列车
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index f90e03a79..ef179e472 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -1697,6 +1697,12 @@ export const OperationEvent = {
                 operation: '3201',
                 domId: '_Tips-Signal-cancelinterlock-Menu{BOTTOM}'
             }
+        },
+        setOverlap: {
+            menuButton: {
+                operation: '3211',
+                domId: '_Tips-Signal-setOverlap-Menu{BOTTOM}'
+            }
         }
     },
 
@@ -2761,6 +2767,12 @@ export const OperationEvent = {
                 operation: '619',
                 domId: '_Tips-Station-restartInterlockMachine-Menu'
             }
+        },
+        stationRelease: {
+            menuButton: {
+                operation: '620',
+                domId: '_Tips-Station-stationRelease'
+            }
         }
     },
 
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index 0d10ac1a8..2f9956cc3 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -261,6 +261,9 @@ const map = {
         routeData: (state) => {
             return state.routeData;
         },
+        overlapList: (state) => {
+            return state.overlapList;
+        },
         overlapData: (state) => {
             return state.overlapData;
         },
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 11702c286..aa7bf7e1b 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.8.107:9000'; // 袁琪
-        // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
+        BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
         // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
         // BASE_API = 'http://192.168.3.120:9000'; // 张赛
         // BASE_API = 'http://192.168.8.140:9000'; // 杜康
diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue
index aa54917f4..2e66ecdf4 100644
--- a/src/views/newMap/mapsystemNew/common/index.vue
+++ b/src/views/newMap/mapsystemNew/common/index.vue
@@ -136,8 +136,8 @@ export default {
                 menu = getDeviceMenuByDeviceType('StationControl');
                 this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
                 this.$store.dispatch('training/emitTipFresh');
-				device = this.getDeviceByEm(em);
-				this.selected = { ...device, _event: MouseEvent.Right};
+                device = this.getDeviceByEm(em);
+                this.selected = { ...device, _event: MouseEvent.Right};
                 return;
             } else if (em.subType == 'light' && em.deviceType == 'Station') { // 宁波一号线右键显示强制点灯
                 const equipment = this.getDeviceByEm(em);
@@ -145,8 +145,8 @@ export default {
                 menu = getDeviceMenuByDeviceType('StationLight');
                 this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
                 this.$store.dispatch('training/emitTipFresh');
-				device = this.getDeviceByEm(em);
-				this.selected = { ...device, _event: MouseEvent.Right};
+                device = this.getDeviceByEm(em);
+                this.selected = { ...device, _event: MouseEvent.Right};
                 return;
             } else if (em.subType == 'preReset' && em.deviceType == 'Station') { // 宁波一号线右键显示计轴复位
                 const equipment = this.getDeviceByEm(em);
@@ -154,19 +154,19 @@ export default {
                 menu = getDeviceMenuByDeviceType('StationPreReset');
                 this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
                 this.$store.dispatch('training/emitTipFresh');
-				device = this.getDeviceByEm(em);
-				this.selected = { ...device, _event: MouseEvent.Right};
+                device = this.getDeviceByEm(em);
+                this.selected = { ...device, _event: MouseEvent.Right};
                 return;
             } else if (em.subType == 'enabled' && em.deviceType == 'Switch') {
                 menu = getDeviceMenuByDeviceType('Enabled');
-				this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
+                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
                 this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
                 device = this.getDeviceByEm(em);
                 this.selected = { ...device, _event: MouseEvent.Right};
                 return;
             } else if (em.subType === 'enabled' && em.deviceType === 'Signal') {
                 menu = getDeviceMenuByDeviceType('Enabled');
-				this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
+                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
                 this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu});
                 device = this.getDeviceByEm(em);
                 this.selected = { ...device, _event: MouseEvent.Right};

From 69c65265160cbca9987f12e13927523c5d9c326b Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 14 May 2021 15:59:04 +0800
Subject: [PATCH 09/32] =?UTF-8?q?Bug260=20=E3=80=81Bug261=E3=80=81?=
 =?UTF-8?q?=E9=83=91=E5=B7=9E=E5=85=B1=E8=B5=A2=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

---
 .../theme/haerbin_01/menus/menuButton.vue     | 22 +++++++++----------
 .../theme/nanjing_02/menus/menuButton.vue     | 22 +++++++++----------
 src/scripts/ProjectConfig.js                  | 18 ++++++++++++---
 src/views/drts/scene/trainingResult.vue       |  7 +-----
 .../newMap/mapsystemNew/common/index.vue      |  2 ++
 5 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
index 38b15bb1f..a8a0d65cf 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
@@ -751,18 +751,16 @@ export default {
             this.clearAllMenuShow();
         },
         handleTrainParam() {
-            if (this.selectedObj.type === '01') {
-                this.formModelSectionName = this.selectedObj.name;
-                this.trainOperateType = '';
-                this.$store.state.map.activeTrainList.forEach(trainCode => {
-                    const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode);
-                    if (trainModel && trainModel.sectionCode === this.selectedObj.code) {
-                        this.formModelTripNum = trainModel.destinationCode + (trainModel.serviceNumber.substring(1)) + (trainModel.tripNumber.substring(1));
-                        this.trainModel = trainModel;
-                        this.formModelNewTrip = '';
-                    }
-                });
-            }
+            this.formModelSectionName = this.selectedObj.name;
+            this.trainOperateType = '';
+            this.$store.state.map.activeTrainList.forEach(trainCode => {
+                const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode);
+                if (trainModel && trainModel.sectionCode === this.selectedObj.code) {
+                    this.formModelTripNum = trainModel.destinationCode + (trainModel.serviceNumber.substring(1)) + (trainModel.tripNumber.substring(1));
+                    this.trainModel = trainModel;
+                    this.formModelNewTrip = '';
+                }
+            });
         },
         setSpeedLimitValue(val) {
             this.speedLimitValue = val;
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
index 591cd191e..4b04009c2 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@@ -987,18 +987,16 @@ export default {
             this.allowDetain = true;
         },
         handleTrainParam() {
-            if (this.selectedObj.type === '01') {
-                this.formModelSectionName = this.selectedObj.name;
-                this.trainOperateType = '';
-                this.$store.state.map.activeTrainList.forEach(trainCode => {
-                    const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode);
-                    if (trainModel && trainModel.sectionCode === this.selectedObj.code) {
-                        this.formModelTripNum = trainModel.destinationCode + (trainModel.serviceNumber.substring(1)) + (trainModel.tripNumber.substring(1));
-                        this.trainModel = trainModel;
-                        this.formModelNewTrip = '';
-                    }
-                });
-            }
+            this.formModelSectionName = this.selectedObj.name;
+            this.trainOperateType = '';
+            this.$store.state.map.activeTrainList.forEach(trainCode => {
+                const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode);
+                if (trainModel && trainModel.sectionCode === this.selectedObj.code) {
+                    this.formModelTripNum = trainModel.destinationCode + (trainModel.serviceNumber.substring(1)) + (trainModel.tripNumber.substring(1));
+                    this.trainModel = trainModel;
+                    this.formModelNewTrip = '';
+                }
+            });
         },
         pushTempData(list) {
             this.tempData = [];
diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index aef4dfb15..12f846df8 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -33,6 +33,15 @@ export const loginInfo = {
         navigationMarginLeft: '60px',
         systemType: '013'
     },
+    zzww: {
+        title: '共赢列车仿真驾驶系统',
+        loginPath: '/login?project=zzww',
+        loginParam: 'ZZWW',
+        titleDistance: '-150px',
+        navigationLogoWidth: '40px',
+        navigationMarginLeft: '60px',
+        systemType: '011'
+    },
     bjd: {
         title: '城市轨道交通列车运行智慧辅助系统',
         loginPath: '/login?project=bjd',
@@ -419,6 +428,7 @@ export const loginInfo = {
 
 export const ProjectIcon = {
     xty: FaviconXty,
+    zzww: FaviconXty,
     login: Favicon,
     design: Favicon,
     designxty: FaviconXty,
@@ -462,6 +472,7 @@ export const ProjectCode = {
     design: 'DEFAULT',
     xty: 'XTY',
     designxty: 'XTY',
+    zzww: 'ZZWW',
     gzb: 'GZB',
     designgzb: 'GZB',
     heb: 'HEB',
@@ -485,12 +496,12 @@ export const ProjectCode = {
     designcgy: 'CGY'
 };
 export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 底部栏仅展示公司信息不展示备案号
-export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy']; // 实训设计平台通过项目code获取地图列表的项目
+export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww']; // 实训设计平台通过项目code获取地图列表的项目
 export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy']; // 案例展示隐藏的项目
 export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角版本开发基于不展示
 export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角主体不展示
 export const ProjectLoginStyleList = ['gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc',
-    'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'cgy', 'designcgy']; // 登录页样式
+    'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww']; // 登录页样式
 export const NoQrcodeList = ['heb', 'designheb', 'cgy', 'designcgy', 'ntyl', 'designntyl'];
 export const NoSimulationQrCodeList = ['heb', 'bjd'];
 export const RegisterCodeList = ['cgy', 'designcgy'];
@@ -543,7 +554,8 @@ export const ProjectList = [
     {value: 'urtss', label: '陪标项目'},
     {value: 'sdy', label: '苏电院'},
     {value: 'cgy', label: '成都工业'},
-    {value: 'wjls', label: '微机联锁'}
+    {value: 'wjls', label: '微机联锁'},
+    {value: 'zzww', label: '郑州共赢'}
 ];
 export const localPackageProject = {
     localdesign: 'designheb',
diff --git a/src/views/drts/scene/trainingResult.vue b/src/views/drts/scene/trainingResult.vue
index e9cdf59a3..4289d7431 100644
--- a/src/views/drts/scene/trainingResult.vue
+++ b/src/views/drts/scene/trainingResult.vue
@@ -4,7 +4,7 @@
       <el-row>
         <div class="title-text">场景语音训练结果</div>
       </el-row>
-      <el-row>
+      <el-row v-loading="loading">
         <el-col :span="6" :offset="1">
           <span>用户：</span>
           <el-select v-model="userId" size="mini" filterable placeholder="请选择">
@@ -108,13 +108,8 @@ export default {
     },
     methods: {
         async initFunction() {
-            this.loading = true;
             const userListData = await getHavaAudoUserList(this.$route.query.sceneId);
             this.userList = userListData.data;
-            if (this.userList.length) {
-                this.userId = this.userList[0].id;
-                this.queryData();
-            }
             const scriptData = await getScriptByIdNew(this.$route.query.scriptId);
             const dispatcher = scriptData.data.memberList.find(member => member.type === 'DISPATCHER');
             this.actionList = scriptData.data.actionList.filter(action => {
diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue
index 2e66ecdf4..3a2d5dc0f 100644
--- a/src/views/newMap/mapsystemNew/common/index.vue
+++ b/src/views/newMap/mapsystemNew/common/index.vue
@@ -159,6 +159,7 @@ export default {
                 return;
             } else if (em.subType == 'enabled' && em.deviceType == 'Switch') {
                 menu = getDeviceMenuByDeviceType('Enabled');
+                const equipment = this.getDeviceByEm(em);
                 this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
                 this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
                 device = this.getDeviceByEm(em);
@@ -166,6 +167,7 @@ export default {
                 return;
             } else if (em.subType === 'enabled' && em.deviceType === 'Signal') {
                 menu = getDeviceMenuByDeviceType('Enabled');
+                const equipment = this.getDeviceByEm(em);
                 this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
                 this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu});
                 device = this.getDeviceByEm(em);

From 666e85dec6467dadda20a039d8133ca2d91a2d3c Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 14 May 2021 16:49:27 +0800
Subject: [PATCH 10/32] =?UTF-8?q?=E8=BD=A6=E6=AC=A1=E5=8F=B7=E6=AD=A5?=
 =?UTF-8?q?=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/haerbin_01/menus/menuButton.vue     | 12 ++++++--
 .../theme/nanjing_02/menus/dialog/rps.vue     |  3 --
 .../theme/nanjing_02/menus/menuButton.vue     | 29 +++++++++++++++++--
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
index a8a0d65cf..e18bbe945 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
@@ -209,7 +209,8 @@ export default {
             formModelNewTrip: '',
             formModelNewGroup: '',
             speedShowCon: false,
-            trainOperateType: ''
+            trainOperateType: '',
+            formModelNewSection: ''
         };
     },
     computed: {
@@ -237,7 +238,8 @@ export default {
         },
         trainCommitDisabled() {
             return (this.trainOperateType === 'create' && this.formModelNewTrip && this.formModelNewTrip.length === 7 && this.formModelNewGroup && this.formModelNewGroup.length === 6) ||
-				(this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete');
+				(this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete') ||
+				(this.trainOperateType === 'move' && this.formModelNewSection);
         }
     },
     watch: {
@@ -802,6 +804,12 @@ export default {
                 step.cmdType = CMD.TrainWindow.CMD_TRAIN_REMOVE_TRAIN_TRACE;
                 step.operation = OperationEvent.Train.delTrainId.menu.operation;
                 step.param = params;
+            } else if (this.trainOperateType === 'move') {
+                params.groupNumber = this.trainModel.groupNumber;
+                params.sectionCode = this.formModelNewSection;
+                step.cmdType = CMD.TrainWindow.CMD_TRAIN_MOVE_TRAIN_TRACE;
+                step.operation = OperationEvent.Train.moveTrainId.menu.operation;
+                step.param = params;
             }
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue
index a3d4b8efd..61900f6da 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue
@@ -14,10 +14,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import { EventBus } from '@/scripts/event-bus';
 import MapVisual from './mapVisual';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'TrainMove',
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
index 4b04009c2..ff18c3448 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@@ -62,7 +62,7 @@
                   <el-button size="mini" plain :disabled="trainOperateType==='update'" @click="handleTrainOperate('update')">车次号修改</el-button>
                   <el-button size="mini" plain :disabled="trainOperateType==='delete'" @click="handleTrainOperate('delete')">车次号删除</el-button>
                   <el-button size="mini" plain :disabled="trainOperateType==='create'" @click="handleTrainOperate('create')">车次号创建</el-button>
-                  <el-button size="mini" plain :disabled="true">车次号步进</el-button>
+                  <el-button size="mini" plain :disabled="trainOperateType==='move'" @click="handleTrainOperate('move')">车次号步进</el-button>
                 </div>
               </el-row>
               <el-row style="height: 25px;line-height: 25px;border-top: 2px solid #7E8076;border-left: 2px solid #6A6B64;border-right: 2px solid #FBFBFA;">
@@ -100,6 +100,19 @@
                 <el-col :span="7" style="height: 25px;line-height: 25px;">新车组号</el-col>
                 <el-col :span="17"><el-input v-model="formModelNewGroup" size="mini" style="height: 20px;" /></el-col>
               </el-row>
+              <el-row v-if="trainOperateType === 'move'" style="display: flex;align-items: center;">
+                <el-col :span="7" style="height: 25px;line-height: 25px;">新轨道号</el-col>
+                <el-col :span="17">
+                  <el-select v-model="formModelNewSection" filterable size="mini" style="height: 20px;" placeholder="请选择">
+                    <el-option
+                      v-for="item in sectionList"
+                      :key="item.code"
+                      :label="item.name"
+                      :value="item.code"
+                    />
+                  </el-select>
+                </el-col>
+              </el-row>
             </div>
           </el-col>
           <el-col v-if="trainOperationShow" :span="6" style="padding: 1px;">
@@ -300,6 +313,7 @@ export default {
             formModelNewTrip: '',
             formModelNewGroup: '',
             trainOperateType: '',
+            formModelNewSection: '',
             dialogVisible: false,
             tipList: [],
             modeMatch: false,
@@ -324,7 +338,8 @@ export default {
             'stationList',
             'routeData',
             'overlapList',
-            'overlapData'
+            'overlapData',
+            'sectionList'
         ]),
         commandId() {
             return OperationEvent.Command.commandHaerbin.confirm.domId;
@@ -364,7 +379,8 @@ export default {
         },
         trainCommitDisabled() {
             return (this.trainOperateType === 'create' && this.formModelNewTrip && this.formModelNewTrip.length === 7 && this.formModelNewGroup && this.formModelNewGroup.length === 6) ||
-				(this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete');
+				(this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete') ||
+				(this.trainOperateType === 'move' && this.formModelNewSection);
         }
     },
     watch: {
@@ -1013,6 +1029,7 @@ export default {
                 this.formModelNewGroup = '';
                 this.trainOperateType = '';
                 this.trainOperationShow = flag;
+                this.formModelNewSection = '';
             }
         },
         trainCommit() {
@@ -1041,6 +1058,12 @@ export default {
                 step.cmdType = CMD.TrainWindow.CMD_TRAIN_REMOVE_TRAIN_TRACE;
                 step.operation = OperationEvent.Train.delTrainId.menu.operation;
                 step.param = params;
+            } else if (this.trainOperateType === 'move') {
+                params.groupNumber = this.trainModel.groupNumber;
+                params.sectionCode = this.formModelNewSection;
+                step.cmdType = CMD.TrainWindow.CMD_TRAIN_MOVE_TRAIN_TRACE;
+                step.operation = OperationEvent.Train.moveTrainId.menu.operation;
+                step.param = params;
             }
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {

From 01fdc0ef22d696e2f97d9272d138688f133f97d3 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 14 May 2021 18:08:12 +0800
Subject: [PATCH 11/32] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=97=B6=E5=88=BB?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/nanjing_02/menus/menuButton.vue     | 90 +++++++++++++++----
 1 file changed, 75 insertions(+), 15 deletions(-)

diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
index ff18c3448..aebb9bdeb 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@@ -3,7 +3,7 @@
     <div v-if="isLocal" id="menuButton">
       <div class="__menuButton">
         <el-row>
-          <el-col v-if="!trainOperationShow" :span="11">
+          <el-col v-if="operationType === 'cmd'" :span="11">
             <div v-if="secondConfirm" class="nav-border">
               <el-row>
                 <div class="nav-border-top">
@@ -42,7 +42,7 @@
               </el-row>
             </div>
           </el-col>
-          <el-col v-if="!trainOperationShow" :span="10">
+          <el-col v-if="operationType === 'cmd'" :span="10">
             <div class="nav-border">
               <div class="nav-border-top">
                 <el-button :id="commandId" class="fl" :class="{'disabled': !isLogin||canCommand||secondConfirm}" style="line-height: 18px; margin-top: 4px;" plain :disabled="!isLogin||canCommand||secondConfirm" @click="interceptLogin(command)()">执行</el-button>
@@ -55,7 +55,7 @@
               </div>
             </div>
           </el-col>
-          <el-col v-if="trainOperationShow" :span="10" style="padding: 1px;">
+          <el-col v-if="operationType === 'train'" :span="10" style="padding: 1px;">
             <div class="nav-border" style="padding: 5px;">
               <el-row style="height: 25px;">
                 <div style="display: flex;justify-content: space-between">
@@ -79,7 +79,7 @@
               </el-row>
             </div>
           </el-col>
-          <el-col v-if="trainOperationShow" :span="5" style="padding: 1px;">
+          <el-col v-if="operationType === 'train'" :span="5" style="padding: 1px;">
             <div class="nav-border" style="padding: 5px;">
               <el-row style="display: flex;align-items: center;">
                 <el-col :span="7" style="height: 25px;line-height: 25px;">车次号</el-col>
@@ -115,7 +115,7 @@
               </el-row>
             </div>
           </el-col>
-          <el-col v-if="trainOperationShow" :span="6" style="padding: 1px;">
+          <el-col v-if="operationType === 'train'" :span="6" style="padding: 1px;">
             <div class="nav-border">
               <div style="display: flex;justify-content: space-around;width: 100%;height: 45px;align-items: center;border-bottom: 2px solid #FBFBFA;">
                 <el-button style="line-height: 18px; width: 100px; margin: 0;" plain :disabled="!trainCommitDisabled" @click="trainCommit">执 行</el-button>
@@ -123,11 +123,41 @@
               </div>
             </div>
           </el-col>
+          <el-col v-if="operationType === 'run'" :span="15" style="padding: 1px;">
+            <div class="nav-border" style="font-size: 14px;">
+              <div style="display: flex;justify-content: space-between;">
+                <div style="border: 1px solid #c0c0c0;margin: 10px;padding: 0 10px 5px 10px;">
+                  <div style="position: relative;top: -8px;left: -5px;background: #fff;width: 81px;">所有时刻表</div>
+                  <el-select v-model="newRunPlanId" style="width: 140px;" placeholder="请选择" size="mini">
+                    <el-option
+                      v-for="item in runPlanList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    />
+                  </el-select>
+                </div>
+                <div style="border: 1px solid #c0c0c0;margin: 10px;padding: 0 10px 5px 10px;">
+                  <div style="position: relative;top: -8px;left: -5px;background: #fff;width: 81px;">当前时刻表</div>
+                  <div class="moni_input" style="width: 140px;">{{ runPlanName }}</div>
+                </div>
+              </div>
+              <div style="display: flex;justify-content: space-between;">
+                <el-button style="line-height: 18px; width: 100px; margin-left: 20px;" plain :disabled="!newRunPlanId" @click="handleClickLoadRunPlan">加载</el-button>
+                <el-button style="line-height: 18px; width: 100px; margin-right: 20px;" plain @click="changeShowMode('cmd')">退出</el-button>
+              </div>
+            </div>
+          </el-col>
+          <el-col v-if="operationType === 'run'" :span="6" style="padding: 1px;">
+            <div class="nav-border" style="padding-top: 10px;">
+              <span style="font-size: 14px;color: #000;">{{ `TIP端加载时刻表，内部号为${runPlanName}` }}</span>
+            </div>
+          </el-col>
           <el-col :span="3">
             <div class="nav-border flex-box">
-              <el-button style="line-height: 18px; width: 100px; margin: 0;" plain :disabled="!isLogin" @click="interceptLogin(changeShowMode)(false)">联锁操作</el-button>
-              <el-button style="line-height: 18px; width: 100px; margin: 0;" plain :disabled="!isLogin">时刻表操作</el-button>
-              <el-button style="line-height: 18px; width: 100px; margin: 0;" plain :disabled="!isLogin" @click="interceptLogin(changeShowMode)(true)">ATS操作</el-button>
+              <el-button style="line-height: 18px; width: 100px; margin: 0;" plain :disabled="!isLogin" @click="interceptLogin(changeShowMode)('cmd')">联锁操作</el-button>
+              <el-button style="line-height: 18px; width: 100px; margin: 0;" plain :disabled="!isLogin" @click="interceptLogin(changeShowMode)('run')">时刻表操作</el-button>
+              <el-button style="line-height: 18px; width: 100px; margin: 0;" plain :disabled="!isLogin" @click="interceptLogin(changeShowMode)('train')">ATS操作</el-button>
             </div>
           </el-col>
         </el-row>
@@ -248,6 +278,8 @@ import { EventBus } from '@/scripts/event-bus';
 import * as adapter from '@/jmapNew/utils/adapter';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import BanIcon from '@/assets/ban-heb.png';
+import { queryRunPlanList } from '@/api/runplan';
+import { simulationLoadRunPlan } from '@/api/simulation';
 
 export default {
     props: {
@@ -278,6 +310,8 @@ export default {
             oldDevice: null, // 上一次点击元素
             canCommand: true,
             cr1Confrim: false,
+            runPlanList: [],
+            newRunPlanId: '',
             operate: '',
             cmdType: '',
             securityCommand: '',
@@ -306,7 +340,7 @@ export default {
             commandInfo: {},
             banIcon: BanIcon,
             timer: null,
-            trainOperationShow: false,
+            operationType: 'cmd',
             trainModel: {},
             formModelTripNum: '',
             formModelSectionName: '',
@@ -377,6 +411,9 @@ export default {
         menuPosition() {
             return this.$store.state.menuOperation.menuPosition;
         },
+        runPlanName() {
+            return this.$store.state.runPlan.runPlanInfo.name;
+        },
         trainCommitDisabled() {
             return (this.trainOperateType === 'create' && this.formModelNewTrip && this.formModelNewTrip.length === 7 && this.formModelNewGroup && this.formModelNewGroup.length === 6) ||
 				(this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete') ||
@@ -385,7 +422,7 @@ export default {
     },
     watch: {
         '$store.state.training.prdType': function (val) {
-            this.trainOperationShow = false;
+            this.operationType = 'cmd';
             this.initMenus();
         },
         '$store.state.training.started':function (val) {
@@ -467,6 +504,15 @@ export default {
         this.param = {};
         this.initMenus();
         this.handleBasicMenu();
+        queryRunPlanList(this.$route.query.mapId).then(resp =>{
+            if (resp.data && resp.data.length) {
+                resp.data.forEach(item => {
+                    this.runPlanList.push(item);
+                });
+            }
+        }).catch(() => {
+            this.$message.error('获取地图模板运行图列表失败！');
+        });
         EventBus.$on('sendMsg', ({message = ''}) => {
             this.tempData = [{name: message}];
         });
@@ -543,7 +589,7 @@ export default {
                     }
                     break;
                 case 'Section':
-                    if (this.trainOperationShow) {
+                    if (this.operationType === 'train') {
                         this.handleTrainParam();
                     } else {
                         this.handleSectionMenu();
@@ -561,6 +607,13 @@ export default {
                 }
             }
         },
+        handleClickLoadRunPlan(row) {
+            simulationLoadRunPlan(this.$route.query.group, this.newRunPlanId).then(response => {
+                this.$message.success('仿真加载指定运行计划成功！');
+            }).catch(() => {
+                this.$message.error('仿真加载指定运行计划失败！');
+            });
+        },
         handleIbpShow() {
             if (this.selectedObj._type == 'StationStand' && this.$store.state.menuOperation.subType == 'StationPlatform') {
                 if (!(this.selectedObj.assignSkip || this.selectedObj.allSkip || this.selectedObj.centerHoldTrain || this.selectedObj.stationHoldTrain)) {
@@ -971,7 +1024,7 @@ export default {
         },
         doClose() {
             this.deviceHighLight(this.oldDevice, false); // 当前选中
-            this.changeShowMode(false);
+            this.changeShowMode('cmd');
             this.operate = ''; // 清空指令
             this.cmdType = '';
             this.securityCommand = '';
@@ -1020,7 +1073,7 @@ export default {
                 this.tempData.push(el);
             });
         },
-        changeShowMode(flag) {
+        changeShowMode(type) {
             if (this.$store.state.training.prdType === '01') {
                 this.trainModel = {};
                 this.formModelTripNum = '';
@@ -1028,7 +1081,7 @@ export default {
                 this.formModelNewTrip = '';
                 this.formModelNewGroup = '';
                 this.trainOperateType = '';
-                this.trainOperationShow = flag;
+                this.operationType = type;
                 this.formModelNewSection = '';
             }
         },
@@ -1068,7 +1121,7 @@ export default {
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.changeShowMode(true);
+                    this.changeShowMode('train');
                 }
             }).catch((error) => {
                 if (error && error.code == '10017') {
@@ -1533,6 +1586,13 @@ export default {
     .station_close{
         float: right;
     }
+	.moni_input{
+		border-top: 2px solid #585858;
+		border-left: 2px solid #585858;
+		border-right: 2px solid #F9F9F9;
+		border-bottom: 2px solid #F9F9F9;
+		background: #D4D0C8;
+	}
     .stationButton{
         font-size: 12px;
         width: 100px;

From 883c70bd3064b1601e7fd23e779b73c3c23030c5 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Fri, 14 May 2021 18:09:18 +0800
Subject: [PATCH 12/32] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=89=E7=BB=B4?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=A7=92=E8=89=B2=E9=80=89=E6=8B=A9=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=89=E7=BB=B4=E8=AF=BE=E7=A8=8B=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA=E8=B7=B3=E8=BD=AC=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jlmap3d/lesson3d/lesson3dplayer.js        |   20 +-
 .../lesson3d/manager/animatemanager.js        |    3 -
 .../lesson3d/manager/assetmodelmanager.js     |    2 -
 .../lesson3d/manager/controlmanager.js        |   12 +-
 src/jlmap3d/lesson3dedit/model/lessondata.js  |    8 +
 .../lesson3dedit/component/property.vue       |   21 +
 .../jlmap3d/lesson3dedit/lesson3dedit.vue     |   77 +-
 .../lesson3dedit/tools/explainpane.vue        |   24 +-
 .../jlmap3d/lesson3dplayer/lesson3dplayer.vue |   78 +-
 .../lesson3dplayer/tools/explainpane.vue      |   28 +-
 .../jlmap3d/lesson3dplayer/tools/jobpane.vue  |    5 +-
 static/lesson3d/PZ427.obj                     | 3672 +++++++++--------
 static/lesson3d/mst.png                       |  Bin 0 -> 11160 bytes
 static/lesson3d/nextbutton.png                |  Bin 0 -> 6003 bytes
 static/lesson3d/选项.png                      |  Bin 4138 -> 0 bytes
 15 files changed, 2256 insertions(+), 1694 deletions(-)
 create mode 100644 static/lesson3d/mst.png
 create mode 100644 static/lesson3d/nextbutton.png
 delete mode 100644 static/lesson3d/选项.png

diff --git a/src/jlmap3d/lesson3d/lesson3dplayer.js b/src/jlmap3d/lesson3d/lesson3dplayer.js
index 3f9f98815..64fce7345 100644
--- a/src/jlmap3d/lesson3d/lesson3dplayer.js
+++ b/src/jlmap3d/lesson3d/lesson3dplayer.js
@@ -30,8 +30,8 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) {
 	let scope = this;
   this.dom = dom;
 
-	//定义相机
-
+	//定义当前课程角色
+	let nowRole = "";
 
 	//定义场景(渲染容器)
 	scene = new THREE.Scene();
@@ -53,7 +53,6 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) {
 		animateManager.initAnimation(assetModelManager);
 		controlManager.init(animateManager.actions);
 
-		console.log(lessonData.lessonProgress[lessonIndex]);
 		if(lessonData.lessonProgress[lessonIndex].action.length>0){
 			controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,assetModelManager.lessonTriggerList);
 		}
@@ -75,12 +74,27 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) {
 	this.changeIndex = function(nowIndex){
 		lessonIndex = nowIndex;
 		controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action);
+	
+		if(lessonData.lessonProgress[lessonIndex].roleName == nowRole){
+			controlManager.initRoleMode(true);
+		}else{
+			controlManager.initRoleMode(false);
+		}
+
 	}
 
 	this.changeCameraPos = function(pos){
 		controlManager.updatePos(pos);
 	}
 
+	this.initNowRole = function(role){
+		nowRole = role;
+		if(lessonData.lessonProgress[lessonIndex].roleName == nowRole){
+			controlManager.initRoleMode(true);
+		}else{
+			controlManager.initRoleMode(false);
+		}
+	};
 	//循环渲染函数
 	function animate() {
 
diff --git a/src/jlmap3d/lesson3d/manager/animatemanager.js b/src/jlmap3d/lesson3d/manager/animatemanager.js
index 405129832..1f933a610 100644
--- a/src/jlmap3d/lesson3d/manager/animatemanager.js
+++ b/src/jlmap3d/lesson3d/manager/animatemanager.js
@@ -13,12 +13,10 @@ export function AnimateManager() {
 
     for(let k in assetModelManager.staticAsset){
       if(assetModelManager.staticAsset[k].mesh.animations.length > 0){
-        console.log(assetModelManager.staticAsset[k].mesh.name);
         let animations = assetModelManager.staticAsset[k].mesh.animations;
     		let mixer = new THREE.AnimationMixer( assetModelManager.staticAsset[k].mesh );
         let actionName = assetModelManager.staticAsset[k].mesh.name;
 
-        console.log(actionName);
         scope.actions[actionName] = {
           status:"01",
           action:mixer.clipAction( assetModelManager.staticAsset[k].mesh.animations[ 0 ])
@@ -38,7 +36,6 @@ export function AnimateManager() {
 
     for(let i=mixers.length-1;i>=0;i--){
       if(mixers[i]._actions[0].isRunning()){
-        // console.log(scope.mixers[i]._actions[0].isRunning());
         mixers[i].update( mixerUpdateDelta );
       }
     }
diff --git a/src/jlmap3d/lesson3d/manager/assetmodelmanager.js b/src/jlmap3d/lesson3d/manager/assetmodelmanager.js
index 948c9e5b2..0e46ad277 100644
--- a/src/jlmap3d/lesson3d/manager/assetmodelmanager.js
+++ b/src/jlmap3d/lesson3d/manager/assetmodelmanager.js
@@ -198,7 +198,6 @@ export function AssetModelManager(scene) {
   function fbxpromise(asset){
     return new Promise(function(resolve, reject){
       var loader = new THREE.FBXLoader();
-      console.log(asset);
       if(asset.assetType == "static"){
         loader.load( asset.url, function ( object ) {
           object.name = asset.modelId;
@@ -210,7 +209,6 @@ export function AssetModelManager(scene) {
         loader.load( BASE_ASSET_API+asset.url, function ( object ) {
           asset.mesh = object;
           if(asset.assetType == "default"){
-            console.log(object);
             // scene.add(object);
           }else if(asset.assetType == 'loadModel'){
 
diff --git a/src/jlmap3d/lesson3d/manager/controlmanager.js b/src/jlmap3d/lesson3d/manager/controlmanager.js
index accb75ef6..fbbaa29a0 100644
--- a/src/jlmap3d/lesson3d/manager/controlmanager.js
+++ b/src/jlmap3d/lesson3d/manager/controlmanager.js
@@ -14,6 +14,7 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) {
   this.nowCamera = null;
   this.eventHitMode = false;
 
+  let roleMode = false;
   let eventBoxs = [];
   let raycasterBoxs = [];
   let actionList = [];
@@ -110,6 +111,9 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) {
 
     }
   );
+  this.initRoleMode = function(rMode){
+    roleMode = rMode;
+  };
 
   const worldOctree = new Octree();
 
@@ -138,6 +142,7 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) {
 	const keyStates = {};
   let clock = new THREE.Clock();
 
+
   this.updateOrbitControl = function(){
     oribitControl.update();
   };
@@ -151,7 +156,7 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) {
 
 		updateSpheres( deltaTime );
 
-    if(scope.eventHitMode == true){
+    if(scope.eventHitMode == true && roleMode){
       if(eventBoxs.length>0){
         attachBox.position.copy(fpsCamera.position);
         for(let i=0;i<eventBoxs.length;i++){
@@ -231,7 +236,7 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) {
     fpsMouseStatus = true;
 		// document.body.requestPointerLock();
 
-    if(raycasterBoxs.length>0){
+    if(raycasterBoxs.length>0 && roleMode){
       var mouse = new THREE.Vector2();
 
       var raycaster = new THREE.Raycaster();
@@ -479,7 +484,6 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) {
           if(actions[i].actionMode == "play"){
             for(let j=0;j<eventTrigger.length;j++){
               if(eventTrigger[j].label == actions[i].actionModel){
-                console.log(actionList);
 
                 if(actionList[eventTrigger[j].actionName].status == "01"){
                   actionList[eventTrigger[j].actionName].status = "02";
@@ -494,8 +498,6 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) {
 
           for(let j=0;j<eventTrigger.length;j++){
             if(eventTrigger[j].label == actions[i].actionModel){
-
-
               let eventTestBox = new THREE.Box3(new THREE.Vector3(), new THREE.Vector3());
 
               eventTestBox.setFromObject(eventTrigger[j]);
diff --git a/src/jlmap3d/lesson3dedit/model/lessondata.js b/src/jlmap3d/lesson3dedit/model/lessondata.js
index cd4360f07..f5eedf5cc 100644
--- a/src/jlmap3d/lesson3dedit/model/lessondata.js
+++ b/src/jlmap3d/lesson3dedit/model/lessondata.js
@@ -9,6 +9,10 @@ export function LessonData() {
 	this.lessonData = {
 		//资源列表
     assetList:[],
+    setup:{
+      examMode:"",
+      checkedRole:"",
+    },
     //场景交互物体列表
     modelList:[],
 		//课程组件启用状态
@@ -61,6 +65,8 @@ export function LessonData() {
         tittle:"标题",
         picurl:"url",
         text:"内容",
+        explainPaneType:"null",
+        nextNode:"",
       },
       action:[],
     };
@@ -141,6 +147,8 @@ export function LessonData() {
         tittle:"标题",
         picurl:"url",
         text:"内容",
+        explainPaneType:"null",
+        nextNode:"",
       },
       action:[
 
diff --git a/src/views/jlmap3d/lesson3dedit/component/property.vue b/src/views/jlmap3d/lesson3dedit/component/property.vue
index f08b408aa..4e0e576f5 100644
--- a/src/views/jlmap3d/lesson3dedit/component/property.vue
+++ b/src/views/jlmap3d/lesson3dedit/component/property.vue
@@ -169,6 +169,17 @@
               <el-input v-model="selected.text" ></el-input>
           </el-form-item>
 
+          <el-form-item label="提示功能:"  v-if="selected.explainPaneType">
+            <el-select v-model="selected.explainPaneType" placeholder="请选择">
+              <el-option
+                v-for="explainType in explainPaneTypes"
+                :key="explainType.value"
+                :label="explainType.name"
+                :value="explainType.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
           <el-form-item label="说明画面:"  v-if="selected.picurl">
               <el-input v-model="selected.picurl" ></el-input>
           </el-form-item>
@@ -295,6 +306,16 @@
         ],
         jobDataList:[],
         value:'',
+        explainPaneTypes:[
+          {
+            name:"无",
+            value:"null",
+          },
+          {
+            name:"跳转",
+            value:"jump",
+          }
+        ],
       }
     },
     computed: {
diff --git a/src/views/jlmap3d/lesson3dedit/lesson3dedit.vue b/src/views/jlmap3d/lesson3dedit/lesson3dedit.vue
index a589785f5..2fb5f8526 100644
--- a/src/views/jlmap3d/lesson3dedit/lesson3dedit.vue
+++ b/src/views/jlmap3d/lesson3dedit/lesson3dedit.vue
@@ -7,6 +7,34 @@
     :lessonTools='lessonTools'
     ></LessonTools-Manager>
 
+    <div id="" class="lessonsetupdiv"  v-show="showSetup">
+      <div style="text-align:center;top:10%;font-size:30px">课程内容设置</div>
+      <el-form ref="form" label-width="80px">
+        <el-form-item label="考试模式">
+          <el-switch
+            v-model="examMode"
+            active-text="开启考试模式"
+            inactive-text="关闭考试模式">
+          </el-switch>
+        </el-form-item>
+
+        <el-form-item label="可用角色">
+          <el-checkbox-group v-model="checkedRole">
+            <el-checkbox v-for="role in jobPaneData.dataList" :label="role.name" :key="role.name">{{role.name}}</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+
+        <!-- <el-form-item label="课程简介">
+          <el-input type="textarea" v-model="form.desc"></el-input>
+        </el-form-item> -->
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit">修改完成</el-button>
+          <el-button @click="unSubmit" >关闭</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+
+
     <div class="lesson3dedit">
       <Step-Tips
         :lessonData='lessonData'
@@ -50,7 +78,6 @@
     </Lesson-Progress>
 
     <div class="lessonsetup" >
-
       <el-row>
         当前课程信息
       </el-row>
@@ -118,6 +145,9 @@
     data() {
       return {
         jl3d: null,
+        showSetup:false,
+        examMode:false,
+        checkedRole:[],
         netData:{
           name:'',
           type:'',
@@ -186,9 +216,10 @@
           if(data.data.data){
             loadData = JSON.parse(data.data.data);
 
-
+            console.log(loadData);
+            this.checkedRole = loadData.setup.checkedRole;
+            this.examMode = loadData.setup.examMode;
             this.jobPaneData.dataList = loadData.toolJobPane;
-            console.log(this.jobPaneData.dataList);
             this.$refs.jobpane.initJobList(this.jobPaneData.dataList);
 
             this.lessonTools = loadData.lessonTools;
@@ -197,8 +228,7 @@
             this.lessonData.initLessonProgress();
             this.$refs.jobpane.initJobList(this.jobPaneData.dataList);
           }
-          console.log("loaddata----------------");
-          console.log(loadData);
+
           this.jl3d = new Lesson3dEditor(dom,loadData);
         }).catch(() => {
         });
@@ -212,13 +242,15 @@
         let assetModelData = this.jl3d.saveAssetModel();
         saveData.assetList = assetModelData.assetList;
         saveData.modelList = assetModelData.modelList;
-
+        saveData.setup.examMode = this.examMode;
+        saveData.setup.checkedRole = this.checkedRole;
         this.netData.data = JSON.stringify(saveData);
         // console.log();
         updateLesson3dData(this.$route.query.lessonId,this.netData).then(data => {
-          console.log(data);
-        }).catch(() => {
 
+          this.$message('保存成功');
+        }).catch(() => {
+          this.$message('保存失败');
         });
       },
       addProgress(){
@@ -245,6 +277,7 @@
       },
       setupclick(){
 
+        this.showSetup = true;
       },
       createModel(assetData,mousePos){
         this.jl3d.createModelTrigger(assetData,mousePos);
@@ -258,6 +291,13 @@
         this.$router.push({ path: '/design/jlmap3d/lesson3dplayer', query: {lessonId: this.$route.query.lessonId} });
 
       },
+
+      onSubmit() {
+        this.showSetup = false;
+      },
+      unSubmit(){
+        this.showSetup = false;
+      },
     },
 
   }
@@ -318,4 +358,25 @@
   .el-tabs__content{
     position: absolute;
   }
+
+  .lessonsetupdiv {
+    position: absolute;
+    width: 30%;
+    height: 40%;
+    top:30%;
+    left:35%;
+    background-color: #fff;
+    border-radius: 18px;
+    border:solid 2px #000;
+    z-index: 5;
+  }
+
+  .nextbuttondiv{
+    width:30px;
+    height:30px;
+    background-size: 100%;
+    position: absolute;
+    right:0;
+    bottom:0;
+  }
 </style>
diff --git a/src/views/jlmap3d/lesson3dedit/tools/explainpane.vue b/src/views/jlmap3d/lesson3dedit/tools/explainpane.vue
index e24bb0413..db4fd16b4 100644
--- a/src/views/jlmap3d/lesson3dedit/tools/explainpane.vue
+++ b/src/views/jlmap3d/lesson3dedit/tools/explainpane.vue
@@ -9,6 +9,11 @@
     <div class="explainpanetext" >
       {{lessonData.lessonData.lessonProgress[lessonEditIndex].explainPane.text}}
     </div>
+
+    <div class="nextbuttondiv"
+    :style="{'background-image': 'url('+staticImg+'/lesson3d/nextbutton.png)'}"
+    v-if="lessonData.lessonData.lessonProgress[lessonEditIndex].explainPane.explainPaneType=='jump'"></div>
+
   </div>
 </template>
 <script>
@@ -26,6 +31,7 @@
     data() {
       return {
         localStatic:BASE_ASSET_API,
+        staticImg:JL3D_LOCAL_STATIC,
       }
     },
     computed: {
@@ -61,6 +67,7 @@
     border-radius:10px;
     border:solid 2px #000;
     background-color: #fff;
+    color:#000;
     z-index:1;
   }
   .explainpanetittle{
@@ -70,15 +77,28 @@
   }
 
   .explainpanepic{
-    height:65%;
+    position:relative;
+    width:90%;
+    left:5%;
+    height:45%;
     border:solid 2px #000;
     background-size: 100%;
   }
 
   .explainpanetext{
+    position:relative;
+    left:5%;
+    width:90%;
     font-size: 14px;
     // height:20%;
   }
 
-
+  .nextbuttondiv{
+    width:30px;
+    height:30px;
+    background-size: 100%;
+    position: absolute;
+    right:0;
+    bottom:0;
+  }
 </style>
diff --git a/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue b/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue
index 07d4e5aa4..7ce2a56fd 100644
--- a/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue
+++ b/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue
@@ -2,6 +2,21 @@
 
   <div id="lesson3ddiv" class="lesson3ddiv">
 
+    <div class="selectjobdiv"
+    :style="{'background-image': 'url('+staticImg+'/texture/bg.jpg)'}"
+    v-if="showSelectJob">
+      <div class="selectjobbuttondiv">
+        <div
+        class="selectjobimg"
+        v-for="(job,index) in selectJobList"
+        @click="selectJob(job)"
+        :style="{'background-image': 'url('+staticImg+'/lesson3d/mst.png)'}">
+          <!-- <div>{{job}}</div> -->
+          <div style="width:100%;position:absolute;bottom:0;font-size:30px;textAlign:center;">{{job}}</div>
+        </div>
+      </div>
+    </div>
+
     <div class="lesson3dplayer">
       <Step-Tips
         :lessonData='lessonData'
@@ -19,13 +34,16 @@
       <Explain-Pane
         :lessonData='lessonData'
         :lessonPlayIndex='lessonPlayIndex'
-        v-show="lessonTools[2].isShow && lessonData.lessonData.lessonProgress[lessonPlayIndex].progressScene == 'standstation'">
+        :nowRole ='nowRole'
+        v-show="lessonTools[2].isShow && lessonData.lessonData.lessonProgress[lessonPlayIndex].progressScene == 'standstation'"
+        @jumpEvent="jumpEvent">
       </Explain-Pane>
 
       <Job-Pane
         :jobPaneData='jobPaneData'
         :lessonData='lessonData'
         :lessonPlayIndex='lessonPlayIndex'
+        :nowRole='nowRole'
         ref="jobpane"
         v-show="lessonTools[3].isShow && lessonData.lessonData.lessonProgress[lessonPlayIndex].progressScene == 'standstation'">
       </Job-Pane>
@@ -62,6 +80,9 @@
   import { JobPaneData } from '@/jlmap3d/lesson3d/toolsmodel/jobpanedata.js';
 
   import { getLesson3dData,updateLesson3dData } from '@/api/jmap/lesson3d';
+
+	import { JL3D_LOCAL_STATIC,BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js';
+
   export default {
     name: 'Lesson3dPlayer',
     components: {
@@ -76,6 +97,10 @@
     },
     data() {
       return {
+        staticImg:JL3D_LOCAL_STATIC,
+        showSelectJob:true,
+        selectJobList:[],
+        nowRole:"",
         jl3d: null,
         netData:{
           name:'',
@@ -146,7 +171,7 @@
           let loadData;
           if(data.data.data){
             loadData = JSON.parse(data.data.data);
-
+            this.selectJobList = loadData.setup.checkedRole;
             this.jobPaneData.dataList = loadData.toolJobPane;
             this.$refs.jobpane.initJobList(this.jobPaneData.dataList);
 
@@ -163,6 +188,17 @@
         }).catch(() => {
         });
       },
+      selectJob(job){
+        this.showSelectJob = false;
+        for(let i=0;i<this.jobPaneData.dataList.length;i++){
+          if(job == this.jobPaneData.dataList[i].name){
+            this.nowRole = this.jobPaneData.dataList[i].value;
+              console.log(this.nowRole);
+            this.jl3d.initNowRole(this.nowRole);
+          }
+        }
+
+      },
       startLesson(){
         this.$refs.processlog.startLog();
       },
@@ -190,6 +226,9 @@
         if(type == "tools"){
           this.lessonPlayIndex = action.nextNode;
         }
+        if(type == "jump"){
+          this.lessonPlayIndex = action.nextNode;
+        }
         console.log(type);
         console.log(action);
         this.jl3d.changeIndex(this.lessonPlayIndex);
@@ -219,6 +258,40 @@
     touch-action: none;
   }
 
+  .selectjobdiv{
+    width:100%;
+    height:100%;
+    position: absolute;
+    z-index: 5;
+    background-size: 100%;
+  }
+
+  .selectjobimg{
+    width:250px;
+    height:250px;
+    background-size: 100%;
+    // float:left;
+    display: inline-block;
+    position:relative;
+  }
+
+  .selectjobbuttondiv{
+    position:absolute;
+    width:80%;
+    height:30%;
+    left:10%;
+    top:35%;
+    overflow-x:scroll;
+    overflow-y:hidden;
+    text-align: center;
+  }
+
+  .selectjobbackdiv{
+
+  }
+
+
+
   .lesson3ddiv {
 
     width: 100%;
@@ -266,4 +339,5 @@
   .el-tabs__content{
     position: absolute;
   }
+
 </style>
diff --git a/src/views/jlmap3d/lesson3dplayer/tools/explainpane.vue b/src/views/jlmap3d/lesson3dplayer/tools/explainpane.vue
index 16a517781..2e2e28161 100644
--- a/src/views/jlmap3d/lesson3dplayer/tools/explainpane.vue
+++ b/src/views/jlmap3d/lesson3dplayer/tools/explainpane.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="explainpanediv"
     v-if="lessonData.lessonData.lessonProgress[lessonPlayIndex]"
-    @click="selectTool"
+
     :style="{'background-image': 'url('+lessonbg+')'}">
     <div class="explainpanetittle" >
       {{lessonData.lessonData.lessonProgress[lessonPlayIndex].explainPane.tittle}}
@@ -12,6 +12,10 @@
     <div class="explainpanetext" >
       {{lessonData.lessonData.lessonProgress[lessonPlayIndex].explainPane.text}}
     </div>
+    <div class="nextbuttondiv"
+    :style="{'background-image': 'url('+staticImg+'/lesson3d/nextbutton.png)'}"
+    v-if="lessonData.lessonData.lessonProgress[lessonPlayIndex].explainPane.explainPaneType=='jump' "
+    @click="explainJump"></div>
   </div>
 </template>
 <script>
@@ -22,13 +26,14 @@
 
   export default {
     name: 'ExplainPane',
-    props:['lessonData','lessonPlayIndex'],
+    props:['lessonData','lessonPlayIndex','nowRole'],
     components: {
 
     },
     data() {
       return {
         localStatic:BASE_ASSET_API,
+        staticImg:JL3D_LOCAL_STATIC,
         lessonbg:JL3D_LOCAL_STATIC+"/lesson3d/lessonbg.png",
       }
     },
@@ -45,8 +50,13 @@
 
     },
     methods: {
-      selectTool(){
-        lesson3dSelect('toolproperty','explainpane');
+      // selectTool(){
+      //   lesson3dSelect('toolproperty','explainpane');
+      // },
+      explainJump(){
+        if(this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex].explainPane.explainPaneType == "jump"){
+          this.$emit('jumpEvent','jump',this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex].explainPane);
+        }
       },
     },
 
@@ -77,7 +87,7 @@
     position:relative;
     width:90%;
     left:5%;
-    height:65%;
+    height:45%;
     border:solid 2px #000;
     background-size: 100%;
   }
@@ -90,5 +100,13 @@
     // height:20%;
   }
 
+  .nextbuttondiv{
+    width:30px;
+    height:30px;
+    background-size: 100%;
+    position: absolute;
+    right:0;
+    bottom:0;
+  }
 
 </style>
diff --git a/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue b/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue
index 8af46bc81..36e50eb08 100644
--- a/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue
+++ b/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue
@@ -48,7 +48,7 @@
   //岗位
   export default {
     name: 'JobPane',
-    props:['jobPaneData','lessonData','lessonPlayIndex'],
+    props:['jobPaneData','lessonData','lessonPlayIndex','nowRole'],
 
     components: {
 
@@ -98,7 +98,8 @@
         console.log(selectTool);
         let nowProgress = this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex];
         console.log(nowProgress.id);
-        if(selectTool.sceneId == nowProgress.id){
+        console.log(this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex]);
+        if(selectTool.sceneId == nowProgress.id && this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex].roleName == this.nowRole){
           jumpEvent("tools",selectTool);
         }
         // console.log(this.lessonData.lessonProgress[this.lessonPlayIndex]);
diff --git a/static/lesson3d/PZ427.obj b/static/lesson3d/PZ427.obj
index 6b77cb948..b823dadd8 100644
--- a/static/lesson3d/PZ427.obj
+++ b/static/lesson3d/PZ427.obj
@@ -1,7 +1,7 @@
 # 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
-# File Created: 27.04.2021 09:36:30
+# File Created: 12.05.2021 15:08:33
 
-mtllib PZ427.mtl
+mtllib PZ512.mtl
 
 #
 # object PENGZHUANG1
@@ -508,18 +508,18 @@ v  37.1622 9.8821 -2.0328
 v  43.7431 9.8821 -2.0029
 v  43.6775 9.8821 -2.8926
 v  37.1647 9.8821 -2.9297
-v  48.3430 9.8821 4.6371
+v  48.3430 9.8821 4.3421
 v  47.3288 9.8821 6.8384
-v  48.3430 9.8821 6.8384
+v  48.3430 9.8821 6.0851
 v  48.3430 9.8821 2.4222
 v  47.3288 9.8821 8.9918
 v  47.3288 9.8821 11.0851
 v  48.3430 9.8821 11.0851
 v  48.3430 9.8821 8.9918
-v  48.3688 9.8821 -12.6122
-v  47.3288 9.8821 -12.6122
-v  47.3288 9.8821 -8.2828
-v  48.3688 9.8821 -7.9599
+v  48.3688 9.8821 -11.4037
+v  47.3288 9.8821 -11.4876
+v  47.3288 9.8821 -9.4074
+v  48.3688 9.8821 -9.1684
 v  37.1820 9.8821 -7.9518
 v  37.1782 9.8821 -7.2643
 v  43.4821 9.8821 -7.1549
@@ -528,8 +528,6 @@ v  48.3688 9.8821 -7.4320
 v  47.3288 9.8821 -7.6254
 v  47.3288 9.8821 -7.0306
 v  48.3688 9.8821 -6.9041
-v  56.2065 9.8821 -12.6122
-v  56.2066 9.8821 -7.9599
 v  62.8817 9.8821 53.7739
 v  64.5686 9.8821 53.4676
 v  64.5686 9.8821 50.3756
@@ -961,6 +959,7 @@ v  -9.7168 1.6707 0.3513
 v  -9.3356 1.6706 -10.9492
 v  63.5767 1.6707 18.5690
 v  30.8514 9.8821 -8.6506
+v  47.3288 9.8821 -12.6122
 v  47.3288 9.8821 15.9695
 v  37.2299 9.8821 9.0238
 v  47.3288 9.8821 -1.9691
@@ -984,6 +983,8 @@ v  29.7214 9.8821 -8.6507
 v  43.4147 9.8821 -6.4512
 v  47.3288 9.8821 -6.3762
 v  48.3688 9.8821 -6.3762
+v  48.3688 9.8821 -7.9599
+v  47.3288 9.8821 -8.2828
 v  43.4804 9.8821 -5.5615
 v  37.1695 9.8821 -4.7235
 v  43.5461 9.8821 -4.6719
@@ -1835,17 +1836,16 @@ v  47.3288 13.9662 2.4222
 v  47.3288 13.9662 -0.2062
 v  48.3431 13.9662 18.1228
 v  47.3288 13.9662 18.1228
+v  48.3688 9.8821 -12.6122
 v  48.3688 13.9662 -12.6122
 v  48.3431 13.9662 2.4222
 v  48.3688 13.9662 -6.3762
 v  47.3288 13.9662 -6.3762
-v  48.3431 13.9662 4.6371
-v  48.3431 13.9662 6.8384
+v  48.3431 13.9662 4.3421
 v  48.3431 13.9662 15.9695
 v  48.3689 13.9662 -6.9041
+v  56.2065 9.8821 -12.6122
 v  56.2066 13.9662 -12.6122
-v  56.2066 13.9662 -7.9599
-v  48.3689 13.9662 -7.9599
 v  64.5686 13.9662 53.4676
 v  64.5686 13.9662 54.0802
 v  64.5686 13.9662 49.6570
@@ -2135,8 +2135,10 @@ v  -12.5277 5.7547 -11.3275
 v  -9.3356 5.7547 -10.9492
 v  -19.1355 5.7547 -11.2163
 v  48.3431 13.9662 11.0851
+v  48.3431 13.9662 6.0851
 v  48.3431 13.9662 8.9918
 v  48.3689 13.9662 -7.4320
+v  48.3689 13.9662 -7.9599
 v  47.3288 13.9662 -1.0876
 v  47.3288 13.9662 -1.9691
 v  47.3288 13.9662 -2.8505
@@ -2212,7 +2214,225 @@ v  -84.4547 23.2422 41.1174
 v  -84.4547 23.2422 42.6200
 v  -84.4547 23.2422 43.1691
 v  -84.4547 23.2422 44.7728
-# 2205 vertices
+v  56.6903 13.9662 6.0851
+v  56.6902 9.8821 6.0851
+v  56.6903 9.8821 4.3421
+v  56.6904 13.9662 4.3421
+v  56.2065 9.8821 -11.4472
+v  56.2066 13.9662 -11.4472
+v  56.2066 9.8821 -7.9599
+v  56.2066 13.9662 -7.9599
+v  56.2066 13.9662 -9.1433
+v  56.2066 9.8821 -9.1433
+v  56.7238 9.8821 -11.4472
+v  56.7239 13.9662 -11.4472
+v  56.7239 13.9662 -9.1433
+v  56.7239 9.8821 -9.1433
+v  53.3884 9.8821 -7.9599
+v  53.3884 13.9662 -7.9599
+v  49.2951 13.9662 -7.9599
+v  49.2950 9.8821 -7.9599
+v  51.8101 13.9662 -7.9599
+v  51.8101 9.8821 -7.9599
+v  50.8720 9.8821 -7.9599
+v  50.8720 13.9662 -7.9599
+v  53.3884 9.8821 -7.4009
+v  53.3884 13.9662 -7.4009
+v  51.8101 13.9662 -7.4009
+v  51.8101 9.8821 -7.4009
+v  49.2951 13.9662 -7.4606
+v  49.2950 9.8821 -7.4606
+v  50.8720 9.8821 -7.4606
+v  50.8720 13.9662 -7.4606
+v  56.7238 9.8821 -12.7427
+v  56.7239 13.9662 -12.7427
+v  56.7239 13.9662 -7.7640
+v  56.7239 9.8821 -7.7640
+v  104.3360 9.8821 -12.7427
+v  104.3361 13.9662 -12.7427
+v  83.0539 13.9662 -7.7640
+v  83.0539 9.8821 -7.7640
+v  104.3360 9.8821 -7.7661
+v  104.3361 13.9662 -7.7661
+v  87.0071 9.8821 -7.7661
+v  87.0072 13.9662 -7.7661
+v  87.0071 9.8821 -7.4596
+v  87.0072 13.9662 -7.4596
+v  91.4366 9.8821 -7.4596
+v  91.4367 13.9662 -7.4596
+v  91.4366 9.8821 -1.3112
+v  91.4367 13.9662 -1.3112
+v  85.1513 9.8821 -1.3112
+v  85.1514 13.9662 -1.3112
+v  85.1513 9.8821 -7.4849
+v  85.1514 13.9662 -7.4849
+v  85.4188 9.8821 -7.4849
+v  85.4188 13.9662 -7.4849
+v  85.4188 9.8821 -7.7542
+v  85.4188 13.9662 -7.7542
+v  84.9048 9.8821 -7.7542
+v  84.9049 13.9662 -7.7542
+v  84.9048 9.8821 4.2534
+v  84.9049 13.9662 4.2534
+v  104.3603 9.8821 4.2534
+v  104.3603 13.9662 4.2534
+v  104.3603 9.8821 6.2133
+v  104.3603 13.9662 6.2133
+v  70.6746 9.8821 6.2133
+v  70.6747 13.9662 6.2133
+v  83.0539 13.9662 4.2568
+v  83.0539 9.8821 4.2568
+v  65.6026 13.9662 4.2568
+v  65.6026 9.8821 4.2568
+v  65.6026 13.9662 3.9717
+v  65.6026 9.8821 3.9717
+v  56.6903 9.8821 -7.4741
+v  56.6904 13.9662 -7.4741
+v  65.9097 9.8821 -7.4741
+v  65.9098 13.9662 -7.4741
+v  65.9097 9.8821 3.9717
+v  65.9098 13.9662 3.9717
+v  58.3597 9.8821 4.2568
+v  58.3597 13.9662 4.2568
+v  58.3597 13.9662 3.9717
+v  58.3597 9.8821 3.9717
+v  63.9251 9.8821 4.2568
+v  63.9251 13.9662 4.2568
+v  63.9251 13.9662 3.9717
+v  63.9251 9.8821 3.9717
+v  48.9080 13.9662 -7.4606
+v  48.9079 9.8821 -7.4606
+v  51.3350 9.8821 -7.4606
+v  51.3351 13.9662 -7.4606
+v  48.9080 13.9662 3.9695
+v  48.9079 9.8821 3.9695
+v  51.3350 9.8821 3.9695
+v  51.3351 13.9662 3.9695
+v  53.6784 9.8821 -7.4009
+v  53.6784 13.9662 -7.4009
+v  53.6784 9.8821 -6.8737
+v  53.6784 13.9662 -6.8737
+v  55.2941 9.8821 -6.8737
+v  55.2941 13.9662 -6.8737
+v  55.2941 9.8821 -0.6499
+v  55.2941 13.9662 -0.6499
+v  53.4152 9.8821 -0.6499
+v  53.4152 13.9662 -0.6499
+v  51.8101 13.9662 -0.3573
+v  51.8101 9.8821 -0.3573
+v  51.6374 13.9662 -0.3573
+v  51.6373 9.8821 -0.3573
+v  51.6374 13.9662 1.6664
+v  51.6373 9.8821 1.6664
+v  52.4633 13.9662 1.6664
+v  52.4633 9.8821 1.6664
+v  52.4633 13.9662 3.9003
+v  52.4633 9.8821 3.9003
+v  53.6746 13.9662 3.9003
+v  53.6746 9.8821 3.9003
+v  53.6746 13.9662 2.3941
+v  53.6746 9.8821 2.3941
+v  55.0723 13.9662 1.2721
+v  55.0723 9.8821 1.2721
+v  55.0723 13.9662 -0.3425
+v  55.0723 9.8821 -0.3425
+v  53.4209 13.9662 -0.3425
+v  53.4208 9.8821 -0.3425
+v  56.6903 13.9662 11.8367
+v  56.6902 9.8821 11.8367
+v  56.3673 13.9662 11.8367
+v  56.3672 9.8821 11.8367
+v  56.3673 13.9662 8.4286
+v  56.3672 9.8821 8.4286
+v  54.7138 13.9662 8.4286
+v  54.7137 9.8821 8.4286
+v  54.7138 13.9662 10.3738
+v  54.7137 9.8821 10.3738
+v  52.4217 13.9662 10.4657
+v  52.4216 9.8821 10.4657
+v  52.4217 13.9662 11.5583
+v  52.4216 9.8821 11.5583
+v  50.0730 13.9662 11.5583
+v  50.0729 9.8821 11.5583
+v  50.0729 9.8821 17.2190
+v  50.0730 13.9662 17.2190
+v  55.4496 13.9662 17.2190
+v  55.4495 9.8821 17.2190
+v  55.4496 13.9662 14.3578
+v  55.4495 9.8821 14.3578
+v  56.3798 13.9662 14.3578
+v  56.3797 9.8821 14.3578
+v  56.3798 13.9662 14.0916
+v  56.3797 9.8821 14.0916
+v  56.6673 13.9662 14.0916
+v  56.6672 9.8821 14.0916
+v  56.6673 13.9662 14.8705
+v  56.6672 9.8821 14.8705
+v  58.5001 13.9662 14.8705
+v  58.5000 9.8821 14.8705
+v  58.5001 13.9662 14.1304
+v  58.5000 9.8821 14.1304
+v  58.7643 13.9662 14.1304
+v  58.7642 9.8821 14.1304
+v  58.7643 13.9662 14.8805
+v  58.7642 9.8821 14.8805
+v  60.9968 13.9662 14.8805
+v  60.9967 9.8821 14.8805
+v  60.9968 13.9662 12.0723
+v  60.9967 9.8821 12.0723
+v  60.4499 13.9662 12.0723
+v  60.4498 9.8821 12.0723
+v  60.4499 13.9662 10.2388
+v  60.4498 9.8821 10.2388
+v  60.8157 13.9662 10.2388
+v  60.8156 9.8821 10.2388
+v  60.8157 13.9662 9.3494
+v  60.8156 9.8821 9.3494
+v  58.7657 13.9662 8.2388
+v  58.7655 9.8821 8.2388
+v  58.7657 13.9662 12.4719
+v  58.7655 9.8821 12.4719
+v  58.4660 13.9662 12.4719
+v  58.4659 9.8821 12.4719
+v  58.4660 13.9662 6.2075
+v  58.4659 9.8821 6.2075
+v  62.5785 13.9662 6.2075
+v  62.5784 9.8821 6.2075
+v  62.5785 13.9662 6.4629
+v  62.5784 9.8821 6.4629
+v  62.1630 13.9662 6.4629
+v  62.1629 9.8821 6.4629
+v  62.1630 13.9662 16.3380
+v  62.1629 9.8821 16.3380
+v  50.0729 9.8821 13.7357
+v  50.0730 13.9662 13.7357
+v  50.0730 13.9662 12.5693
+v  50.0729 9.8821 12.5693
+v  51.2160 9.8821 13.7357
+v  51.2160 13.9662 13.7357
+v  51.2160 9.8821 12.5693
+v  51.2160 13.9662 12.5693
+v  64.2102 9.8821 6.4911
+v  64.2102 13.9662 6.4911
+v  64.2102 13.9662 6.2060
+v  64.2102 9.8821 6.2060
+v  69.0289 9.8821 6.4911
+v  69.0289 13.9662 6.4911
+v  69.0289 13.9662 6.2060
+v  69.0289 9.8821 6.2060
+v  70.6746 9.8821 6.4753
+v  70.6747 13.9662 6.4753
+v  74.5519 9.8821 6.4753
+v  74.5519 13.9662 6.4753
+v  74.5519 9.8821 18.3374
+v  74.5519 13.9662 18.3374
+v  62.1628 9.8821 18.3374
+v  62.1629 13.9662 18.3374
+v  104.2450 9.8821 -12.7456
+v  48.3666 9.8821 -12.7456
+v  48.3666 9.8821 18.1811
+v  104.2450 9.8821 18.1811
+# 2425 vertices
 
 vn 0.0000 1.0000 -0.0000
 vn -0.0003 1.0000 -0.0001
@@ -2455,7 +2675,17 @@ vn 0.9818 0.0000 0.1900
 vn 0.9981 0.0000 0.0618
 vn -0.9930 0.0000 -0.1182
 vn -0.9849 0.0000 -0.1729
-# 241 vertex normals
+vn -1.0000 0.0000 0.0000
+vn 1.0000 -0.0000 -0.0000
+vn 0.0000 -0.0000 -1.0000
+vn 0.0000 -1.0000 -0.0000
+vn -0.6260 0.0000 -0.7798
+vn -0.9998 0.0000 0.0184
+vn 0.0401 -0.0000 0.9992
+vn -0.4763 0.0000 0.8793
+vn 0.0000 -0.0000 1.0000
+vn 1.0000 -0.0000 0.0000
+# 251 vertex normals
 
 vt 0.3051 0.8015 0.0000
 vt 0.3051 0.7943 0.0000
@@ -2908,9 +3138,10 @@ vt 0.3716 0.4401 0.0000
 vt 0.3066 0.3665 0.0000
 vt 0.2910 0.3665 0.0000
 vt 0.2758 0.3665 0.0000
-vt 0.4424 0.3657 0.0000
-vt 0.4096 0.3645 0.0000
-vt 0.4092 0.3644 0.0000
+vt 0.4338 0.3654 0.0000
+vt 0.4339 0.3654 0.0000
+vt 0.4181 0.3648 0.0000
+vt 0.4178 0.3647 0.0000
 vt 0.4035 0.4429 0.0000
 vt 0.4016 0.4428 0.0000
 vt 0.4016 0.4060 0.0000
@@ -3035,6 +3266,7 @@ vt 0.0242 0.6357 0.0000
 vt 0.0242 0.0698 0.0000
 vt 0.2125 0.9941 0.0000
 vt 0.4024 0.5023 0.0000
+vt 0.4424 0.3657 0.0000
 vt 0.2403 0.3665 0.0000
 vt 0.2910 0.4025 0.0000
 vt 0.3639 0.3627 0.0000
@@ -3057,6 +3289,8 @@ vt 0.4424 0.5023 0.0000
 vt 0.4224 0.5023 0.0000
 vt 0.3987 0.4059 0.0000
 vt 0.3978 0.3640 0.0000
+vt 0.4092 0.3644 0.0000
+vt 0.4096 0.3645 0.0000
 vt 0.3919 0.4054 0.0000
 vt 0.3856 0.4414 0.0000
 vt 0.3850 0.4049 0.0000
@@ -3602,7 +3836,7 @@ vt 0.7288 0.8111 0.0000
 vt 0.7288 0.9089 0.0000
 vt 0.7362 0.9089 0.0000
 vt 0.7362 0.8111 0.0000
-# 1145 texture coords
+# 1149 texture coords
 
 g PENGZHUANG1
 usemtl 20___Default
@@ -3822,1728 +4056,1724 @@ s off
 f 502/424/1 479/424/1 503/449/1 504/449/1 
 f 505/425/1 480/425/1 479/424/1 502/424/1 
 f 506/450/1 507/451/1 508/451/1 509/450/1 
-f 510/452/1 511/452/1 512/453/1 513/454/1 
+f 510/452/1 511/453/1 512/454/1 513/455/1 
 s 1
-f 514/455/1 515/456/1 516/457/1 517/458/1 
+f 514/456/1 515/457/1 516/458/1 517/459/1 
 s off
-f 518/459/1 519/460/1 520/461/1 521/462/1 
-f 522/452/1 510/452/1 513/454/1 523/454/1 
+f 518/460/1 519/461/1 520/462/1 521/463/1 
 s 1
-f 524/463/1 525/464/1 526/465/1 527/466/1 
-f 528/467/1 529/468/1 70/70/1 69/69/1 
-f 530/469/1 528/467/1 69/69/1 527/466/1 
-f 526/465/1 530/469/1 527/466/1 
-f 531/470/1 532/471/1 533/472/1 534/473/1 
-f 535/474/1 524/463/1 531/470/1 534/473/1 
-f 524/463/1 535/474/1 525/464/1 
+f 522/464/1 523/465/1 524/466/1 525/467/1 
+f 526/468/1 527/469/1 70/70/1 69/69/1 
+f 528/470/1 526/468/1 69/69/1 525/467/1 
+f 524/466/1 528/470/1 525/467/1 
+f 529/471/1 530/472/1 531/473/1 532/474/1 
+f 533/475/1 522/464/1 529/471/1 532/474/1 
+f 522/464/1 533/475/1 523/465/1 
 s off
-f 536/474/1 535/474/1 534/473/1 537/473/1 
-f 538/465/1 526/465/1 525/464/1 539/464/1 
-f 540/467/1 528/467/1 530/469/1 541/469/1 
-f 542/467/32 540/467/32 541/469/32 543/469/32 
-f 544/474/33 536/474/33 537/473/33 545/473/33 
-f 546/465/34 538/465/34 539/464/34 547/464/34 
+f 534/475/1 533/475/1 532/474/1 535/474/1 
+f 536/466/1 524/466/1 523/465/1 537/465/1 
+f 538/468/1 526/468/1 528/470/1 539/470/1 
+f 540/468/32 538/468/32 539/470/32 541/470/32 
+f 542/475/33 534/475/33 535/474/33 543/474/33 
+f 544/466/34 536/466/34 537/465/34 545/465/34 
 s 1
-f 548/475/1 549/476/1 550/477/1 551/478/1 
-f 552/479/35 553/480/36 554/481/37 555/482/38 
+f 546/476/1 547/477/1 548/478/1 549/479/1 
+f 550/480/35 551/481/36 552/482/37 553/483/38 
 s off
-f 554/467/1 542/467/1 543/469/1 555/469/1 
-f 548/474/39 544/474/39 545/473/39 549/473/39 
-f 556/71/40 557/72/40 72/72/40 71/71/40 
-f 105/465/41 546/465/41 547/464/41 106/464/41 
-f 558/104/42 104/104/42 103/103/42 559/103/42 
-f 556/104/43 558/104/43 559/103/43 557/103/43 
+f 552/468/1 540/468/1 541/470/1 553/470/1 
+f 546/475/39 542/475/39 543/474/39 547/474/39 
+f 554/71/40 555/72/40 72/72/40 71/71/40 
+f 105/466/41 544/466/41 545/465/41 106/465/41 
+f 556/104/42 104/104/42 103/103/42 557/103/42 
+f 554/104/43 556/104/43 557/103/43 555/103/43 
 s 1
-f 560/483/1 64/64/1 63/63/1 561/484/1 
-f 562/485/1 563/486/1 564/487/1 565/488/1 
-f 561/484/1 63/63/1 566/489/1 567/490/1 
-f 568/491/1 569/492/1 563/486/1 562/485/1 
-f 52/52/1 560/483/1 561/484/1 53/53/1 
-f 54/54/1 570/493/1 571/494/1 51/51/1 
-f 53/53/1 561/484/1 567/490/1 59/59/1 
-f 60/60/1 572/495/1 570/493/1 54/54/1 
-f 563/486/1 573/496/1 574/497/1 564/487/1 
-f 565/488/1 571/494/1 570/493/1 562/485/1 
-f 569/492/1 575/498/1 573/496/1 563/486/1 
-f 562/485/1 570/493/1 572/495/1 568/491/1 
+f 558/484/1 64/64/1 63/63/1 559/485/1 
+f 560/486/1 561/487/1 562/488/1 563/489/1 
+f 559/485/1 63/63/1 564/490/1 565/491/1 
+f 566/492/1 567/493/1 561/487/1 560/486/1 
+f 52/52/1 558/484/1 559/485/1 53/53/1 
+f 54/54/1 568/494/1 569/495/1 51/51/1 
+f 53/53/1 559/485/1 565/491/1 59/59/1 
+f 60/60/1 570/496/1 568/494/1 54/54/1 
+f 561/487/1 571/497/1 572/498/1 562/488/1 
+f 563/489/1 569/495/1 568/494/1 560/486/1 
+f 567/493/1 573/499/1 571/497/1 561/487/1 
+f 560/486/1 568/494/1 570/496/1 566/492/1 
 s off
-f 576/490/1 567/490/1 566/489/1 577/489/1 
-f 578/60/1 60/60/1 59/59/1 579/59/1 
-f 580/492/1 569/492/1 568/491/1 581/491/1 
-f 582/60/44 578/60/44 579/59/44 583/59/44 
-f 584/492/44 580/492/44 581/491/44 585/491/44 
-f 586/60/45 582/60/45 583/59/45 587/59/45 
-f 588/492/46 584/492/46 585/491/46 589/491/46 
-f 55/60/1 586/60/1 587/59/1 56/59/1 
-f 590/492/1 588/492/1 589/491/1 591/491/1 
-f 592/490/34 576/490/34 577/489/34 593/489/34 
-f 97/490/47 592/490/47 593/489/47 98/489/47 
-f 594/96/48 96/96/48 95/95/48 595/95/48 
-f 596/96/1 594/96/1 595/95/1 597/95/1 
-f 598/91/49 91/91/49 94/94/49 599/94/49 
-f 410/91/50 598/91/50 599/94/50 409/94/50 
+f 574/491/1 565/491/1 564/490/1 575/490/1 
+f 576/60/1 60/60/1 59/59/1 577/59/1 
+f 578/493/1 567/493/1 566/492/1 579/492/1 
+f 580/60/44 576/60/44 577/59/44 581/59/44 
+f 582/493/44 578/493/44 579/492/44 583/492/44 
+f 584/60/45 580/60/45 581/59/45 585/59/45 
+f 586/493/46 582/493/46 583/492/46 587/492/46 
+f 55/60/1 584/60/1 585/59/1 56/59/1 
+f 588/493/1 586/493/1 587/492/1 589/492/1 
+f 590/491/34 574/491/34 575/490/34 591/490/34 
+f 97/491/47 590/491/47 591/490/47 98/490/47 
+f 592/96/48 96/96/48 95/95/48 593/95/48 
+f 594/96/1 592/96/1 593/95/1 595/95/1 
+f 596/91/49 91/91/49 94/94/49 597/94/49 
+f 410/91/50 596/91/50 597/94/50 409/94/50 
 s 1
-f 600/499/1 601/500/1 602/501/1 
+f 598/500/1 599/501/1 600/502/1 
 f 439/382/1 438/381/1 436/379/1 437/380/1 
-f 602/501/1 603/502/1 604/503/1 
+f 600/502/1 601/503/1 602/504/1 
 s off
-f 605/92/1 92/92/1 91/91/1 606/91/1 
-f 607/94/1 94/94/1 93/93/1 608/93/1 
-f 609/92/51 605/92/51 606/91/51 610/91/51 
-f 611/92/34 609/92/34 610/91/34 612/91/34 
-f 613/92/1 611/92/1 612/91/1 614/91/1 
-f 615/92/52 613/92/52 614/91/52 616/91/52 
-f 617/94/53 607/94/53 608/93/53 618/93/53 
-f 619/94/54 617/94/54 618/93/54 620/93/54 
-f 621/94/1 619/94/1 620/93/1 622/93/1 
-f 623/94/55 621/94/55 622/93/55 624/93/55 
+f 603/92/1 92/92/1 91/91/1 604/91/1 
+f 605/94/1 94/94/1 93/93/1 606/93/1 
+f 607/92/51 603/92/51 604/91/51 608/91/51 
+f 609/92/34 607/92/34 608/91/34 610/91/34 
+f 611/92/1 609/92/1 610/91/1 612/91/1 
+f 613/92/52 611/92/52 612/91/52 614/91/52 
+f 615/94/53 605/94/53 606/93/53 616/93/53 
+f 617/94/54 615/94/54 616/93/54 618/93/54 
+f 619/94/1 617/94/1 618/93/1 620/93/1 
+f 621/94/55 619/94/55 620/93/55 622/93/55 
 s 1
-f 211/169/1 210/168/1 625/504/1 626/505/1 
-f 627/506/1 626/505/1 625/504/1 628/507/1 
-f 629/508/1 630/509/1 631/510/1 632/511/1 
-f 633/512/1 634/513/1 635/514/1 636/515/1 
-f 637/516/1 638/517/1 639/518/1 640/519/1 
-f 641/520/1 637/516/1 640/519/1 642/521/1 
+f 211/169/1 210/168/1 623/505/1 624/506/1 
+f 625/507/1 624/506/1 623/505/1 626/508/1 
+f 627/509/1 628/510/1 629/511/1 630/512/1 
+f 631/513/1 632/514/1 633/515/1 634/516/1 
+f 635/517/1 636/518/1 637/519/1 638/520/1 
+f 639/521/1 635/517/1 638/520/1 640/522/1 
 s off
-f 643/92/56 615/92/56 616/91/56 644/91/56 
-f 643/92/1 644/91/1 645/91/1 646/92/1 
-f 645/91/1 647/91/1 648/92/1 646/92/1 
+f 641/92/56 613/92/56 614/91/56 642/91/56 
+f 641/92/1 642/91/1 643/91/1 644/92/1 
+f 643/91/1 645/91/1 646/92/1 644/92/1 
 s 1
-f 634/513/1 649/522/1 650/523/1 635/514/1 
-f 651/524/1 652/525/1 653/526/1 654/527/1 
+f 632/514/1 647/523/1 648/524/1 633/515/1 
+f 649/525/1 650/526/1 651/527/1 652/528/1 
 s off
-f 634/92/1 646/92/1 648/92/1 649/92/1 
-f 655/94/54 623/94/54 624/93/54 656/93/54 
-f 657/94/1 655/94/1 656/93/1 658/93/1 
-f 659/93/1 660/93/1 661/94/1 662/94/1 
-f 660/93/1 659/93/1 215/93/1 214/93/1 
+f 632/92/1 644/92/1 646/92/1 647/92/1 
+f 653/94/54 621/94/54 622/93/54 654/93/54 
+f 655/94/1 653/94/1 654/93/1 656/93/1 
+f 657/93/1 658/93/1 659/94/1 660/94/1 
+f 658/93/1 657/93/1 215/93/1 214/93/1 
 s 1
-f 663/528/1 664/529/1 665/530/1 666/531/1 
+f 661/529/1 662/530/1 663/531/1 664/532/1 
 s off
-f 667/532/57 640/519/1 639/518/1 668/533/1 
-f 669/369/58 424/369/58 427/370/58 670/370/58 
-f 671/369/1 669/369/1 670/370/1 667/370/1 
-f 671/369/1 667/370/1 672/370/1 673/369/1 
-f 668/533/59 672/533/59 667/532/59 
+f 665/533/57 638/520/1 637/519/1 666/534/1 
+f 667/369/58 424/369/58 427/370/58 668/370/58 
+f 669/369/1 667/369/1 668/370/1 665/370/1 
+f 669/369/1 665/370/1 670/370/1 671/369/1 
+f 666/534/59 670/534/59 665/533/59 
 s 1
-f 674/534/1 639/518/1 638/517/1 675/535/1 
+f 672/535/1 637/519/1 636/518/1 673/536/1 
 s off
-f 668/533/1 639/518/1 674/534/1 676/536/1 
-f 672/370/1 677/370/1 678/369/1 673/369/1 
-f 668/533/1 676/536/1 677/536/1 672/533/1 
+f 666/534/1 637/519/1 672/535/1 674/537/1 
+f 670/370/1 675/370/1 676/369/1 671/369/1 
+f 666/534/1 674/537/1 675/537/1 670/534/1 
 s 1
-f 675/535/1 679/537/1 680/538/1 674/534/1 
+f 673/536/1 677/538/1 678/539/1 672/535/1 
 s off
-f 681/539/1 676/536/1 674/534/1 680/538/1 
-f 678/369/1 677/370/1 682/370/1 683/369/1 
-f 676/536/1 681/539/1 682/539/1 677/536/1 
+f 679/540/1 674/537/1 672/535/1 678/539/1 
+f 676/369/1 675/370/1 680/370/1 681/369/1 
+f 674/537/1 679/540/1 680/540/1 675/537/1 
 s 1
-f 679/537/1 684/540/1 685/541/1 680/538/1 
+f 677/538/1 682/541/1 683/542/1 678/539/1 
 s off
-f 686/542/1 681/539/1 680/538/1 685/541/1 
-f 683/369/1 682/370/1 687/370/1 688/369/1 
-f 681/539/1 686/542/1 687/542/1 682/539/1 
-f 689/367/60 422/367/60 421/366/60 690/366/60 
+f 684/543/1 679/540/1 678/539/1 683/542/1 
+f 681/369/1 680/370/1 685/370/1 686/369/1 
+f 679/540/1 684/543/1 685/543/1 680/540/1 
+f 687/367/60 422/367/60 421/366/60 688/366/60 
+f 689/367/1 687/367/1 688/366/1 690/366/1 
 f 691/367/1 689/367/1 690/366/1 692/366/1 
-f 693/367/1 691/367/1 692/366/1 694/366/1 
-f 695/366/1 696/367/1 693/367/1 694/366/1 
-f 692/369/1 671/369/1 673/369/1 694/369/1 
-f 697/91/1 698/91/1 699/92/1 700/92/1 
+f 693/366/1 694/367/1 691/367/1 692/366/1 
+f 690/369/1 669/369/1 671/369/1 692/369/1 
+f 695/91/1 696/91/1 697/92/1 698/92/1 
 s 1
-f 701/543/1 652/525/1 651/524/1 702/544/1 
+f 699/544/1 650/526/1 649/525/1 700/545/1 
 s off
-f 700/92/1 699/92/1 652/92/1 701/92/1 
-f 647/91/1 697/91/1 700/92/1 648/92/1 
+f 698/92/1 697/92/1 650/92/1 699/92/1 
+f 645/91/1 695/91/1 698/92/1 646/92/1 
 s 1
-f 649/522/1 701/543/1 702/544/1 650/523/1 
+f 647/523/1 699/544/1 700/545/1 648/524/1 
 s off
-f 649/92/1 648/92/1 700/92/1 701/92/1 
-f 703/91/1 704/91/1 647/91/1 645/91/1 
-f 705/91/1 698/91/1 697/91/1 706/91/1 
+f 647/92/1 646/92/1 698/92/1 699/92/1 
+f 701/91/1 702/91/1 645/91/1 643/91/1 
+f 703/91/1 696/91/1 695/91/1 704/91/1 
 s 1
-f 215/173/1 633/512/1 636/515/1 216/174/1 
-f 217/175/1 641/520/1 642/521/1 214/172/1 
+f 215/173/1 631/513/1 634/516/1 216/174/1 
+f 217/175/1 639/521/1 640/522/1 214/172/1 
 s off
-f 660/93/1 707/93/1 708/94/1 661/94/1 
-f 662/94/1 657/94/1 658/93/1 659/93/1 
-f 659/93/1 658/93/1 633/93/1 215/93/1 
-f 214/93/1 642/93/1 707/93/1 660/93/1 
-f 709/94/1 661/94/1 708/94/1 710/94/1 
-f 711/94/1 657/94/1 662/94/1 712/94/1 
-f 713/367/1 714/367/1 691/367/1 693/367/1 
-f 713/367/1 693/367/1 696/367/1 715/367/1 
-f 716/369/1 695/369/1 678/369/1 683/369/1 
+f 658/93/1 705/93/1 706/94/1 659/94/1 
+f 660/94/1 655/94/1 656/93/1 657/93/1 
+f 657/93/1 656/93/1 631/93/1 215/93/1 
+f 214/93/1 640/93/1 705/93/1 658/93/1 
+f 707/94/1 659/94/1 706/94/1 708/94/1 
+f 709/94/1 655/94/1 660/94/1 710/94/1 
+f 711/367/1 712/367/1 689/367/1 691/367/1 
+f 711/367/1 691/367/1 694/367/1 713/367/1 
+f 714/369/1 693/369/1 676/369/1 681/369/1 
 s 1
-f 717/545/1 718/546/1 719/547/1 720/548/1 
+f 715/546/1 716/547/1 717/548/1 718/549/1 
 s off
-f 721/549/1 722/550/1 720/548/1 719/547/1 
-f 723/370/1 724/370/1 725/369/1 726/369/1 
-f 722/550/1 721/549/1 724/549/1 723/550/1 
+f 719/550/1 720/551/1 718/549/1 717/548/1 
+f 721/370/1 722/370/1 723/369/1 724/369/1 
+f 720/551/1 719/550/1 722/550/1 721/551/1 
 s 1
-f 684/540/1 717/545/1 720/548/1 685/541/1 
+f 682/541/1 715/546/1 718/549/1 683/542/1 
 s off
-f 722/550/1 686/542/1 685/541/1 720/548/1 
-f 687/370/1 723/370/1 726/369/1 688/369/1 
-f 686/542/1 722/550/1 723/550/1 687/542/1 
-f 727/369/1 688/369/1 726/369/1 728/369/1 
+f 720/551/1 684/543/1 683/542/1 718/549/1 
+f 685/370/1 721/370/1 724/369/1 686/369/1 
+f 684/543/1 720/551/1 721/551/1 685/543/1 
+f 725/369/1 686/369/1 724/369/1 726/369/1 
 s 1
-f 719/547/1 718/546/1 729/551/1 730/552/1 
+f 717/548/1 716/547/1 727/552/1 728/553/1 
 s off
-f 731/553/1 721/549/1 719/547/1 730/552/1 
-f 724/370/1 732/370/1 733/369/1 725/369/1 
-f 721/549/1 731/553/1 732/553/1 724/549/1 
+f 729/554/1 719/550/1 717/548/1 728/553/1 
+f 722/370/1 730/370/1 731/369/1 723/369/1 
+f 719/550/1 729/554/1 730/554/1 722/550/1 
 s 1
-f 734/554/1 735/555/1 664/529/1 663/528/1 
+f 732/555/1 733/556/1 662/530/1 661/529/1 
 s off
-f 736/556/1 737/557/1 734/554/1 663/528/1 
-f 738/370/1 739/370/1 740/369/1 741/369/1 
-f 737/557/1 736/556/1 739/556/1 738/557/1 
+f 734/557/1 735/558/1 732/555/1 661/529/1 
+f 736/370/1 737/370/1 738/369/1 739/369/1 
+f 735/558/1 734/557/1 737/557/1 736/558/1 
 s 1
-f 729/551/1 735/555/1 734/554/1 730/552/1 
+f 727/552/1 733/556/1 732/555/1 728/553/1 
 s off
-f 737/557/1 731/553/1 730/552/1 734/554/1 
-f 732/370/1 738/370/1 741/369/1 733/369/1 
-f 731/553/1 737/557/1 738/557/1 732/553/1 
-f 742/369/1 743/369/1 744/369/1 745/369/1 
-f 746/369/1 747/369/1 748/369/1 749/369/1 
-f 742/369/1 745/369/1 741/369/1 740/369/1 
-f 746/369/1 725/369/1 733/369/1 747/369/1 
-f 745/369/1 747/369/1 733/369/1 741/369/1 
-f 750/369/1 742/369/1 740/369/1 751/369/1 
-f 752/369/1 743/369/1 742/369/1 750/369/1 
-f 753/531/1 666/531/1 665/530/1 754/530/1 
-f 630/509/1 629/508/1 755/508/1 756/509/1 
-f 626/505/1 627/506/1 757/506/1 758/505/1 
+f 735/558/1 729/554/1 728/553/1 732/555/1 
+f 730/370/1 736/370/1 739/369/1 731/369/1 
+f 729/554/1 735/558/1 736/558/1 730/554/1 
+f 740/369/1 741/369/1 742/369/1 743/369/1 
+f 744/369/1 745/369/1 746/369/1 747/369/1 
+f 740/369/1 743/369/1 739/369/1 738/369/1 
+f 744/369/1 723/369/1 731/369/1 745/369/1 
+f 743/369/1 745/369/1 731/369/1 739/369/1 
+f 748/369/1 740/369/1 738/369/1 749/369/1 
+f 750/369/1 741/369/1 740/369/1 748/369/1 
+f 751/532/1 664/532/1 663/531/1 752/531/1 
+f 628/510/1 627/509/1 753/509/1 754/510/1 
+f 624/506/1 625/507/1 755/507/1 756/506/1 
 s 1
-f 759/558/1 627/506/1 628/507/1 760/559/1 
-f 761/560/1 759/558/1 760/559/1 762/561/1 
-f 763/562/1 761/560/1 762/561/1 764/563/1 
-f 765/564/1 763/562/1 764/563/1 766/565/1 
-f 630/509/1 765/564/1 766/565/1 631/510/1 
-f 767/566/1 654/527/1 653/526/1 768/567/1 
-f 769/568/1 767/566/1 768/567/1 770/569/1 
-f 771/570/1 769/568/1 770/569/1 772/571/1 
-f 773/572/1 771/570/1 772/571/1 774/573/1 
-f 632/511/1 773/572/1 774/573/1 629/508/1 
+f 757/559/1 625/507/1 626/508/1 758/560/1 
+f 759/561/1 757/559/1 758/560/1 760/562/1 
+f 761/563/1 759/561/1 760/562/1 762/564/1 
+f 763/565/1 761/563/1 762/564/1 764/566/1 
+f 628/510/1 763/565/1 764/566/1 629/511/1 
+f 765/567/1 652/528/1 651/527/1 766/568/1 
+f 767/569/1 765/567/1 766/568/1 768/570/1 
+f 769/571/1 767/569/1 768/570/1 770/572/1 
+f 771/573/1 769/571/1 770/572/1 772/574/1 
+f 630/512/1 771/573/1 772/574/1 627/509/1 
 s off
-f 768/567/1 653/526/1 775/526/1 776/567/1 
-f 770/569/1 768/567/1 776/567/1 777/569/1 
-f 772/571/1 770/569/1 777/569/1 778/571/1 
-f 774/573/1 772/571/1 778/571/1 779/573/1 
-f 629/508/1 774/573/1 779/573/1 755/508/1 
-f 780/558/1 781/506/1 757/506/1 782/558/1 
-f 783/560/1 780/558/1 782/558/1 784/560/1 
-f 785/562/1 783/560/1 784/560/1 786/562/1 
-f 786/562/1 787/564/1 788/574/1 785/562/1 
-f 789/509/1 788/574/1 787/564/1 756/509/1 
-f 790/1/61 329/1/61 328/4/61 791/4/61 
-f 775/1/1 790/1/1 791/4/1 792/4/1 
-f 755/508/1 793/508/1 789/509/1 756/509/1 
-f 758/505/1 757/506/1 781/506/1 794/505/1 
-f 775/526/1 792/526/1 795/567/1 776/567/1 
-f 776/567/1 795/567/1 796/569/1 777/569/1 
-f 777/569/1 796/569/1 797/571/1 778/571/1 
-f 778/571/1 797/571/1 798/573/1 779/573/1 
-f 779/573/1 798/573/1 793/508/1 755/508/1 
-f 757/506/1 627/506/1 759/558/1 782/558/1 
-f 782/558/1 759/558/1 761/560/1 784/560/1 
-f 784/560/1 761/560/1 763/562/1 786/562/1 
-f 786/562/1 763/562/1 765/564/1 787/564/1 
-f 787/564/1 765/564/1 630/509/1 756/509/1 
-f 799/573/1 800/508/1 793/508/1 798/573/1 
-f 801/509/1 789/509/1 793/508/1 800/508/1 
-f 802/571/1 797/571/1 796/569/1 803/569/1 
-f 788/574/1 804/575/1 785/562/1 
-f 805/560/1 783/560/1 785/562/1 806/562/1 
-f 807/558/1 780/558/1 783/560/1 805/560/1 
-f 808/506/1 781/506/1 780/558/1 807/558/1 
-f 809/560/1 805/560/1 806/562/1 810/562/1 
-f 811/506/1 808/506/1 807/558/1 812/558/1 
-f 813/286/62 330/286/62 333/287/62 814/287/62 
+f 766/568/1 651/527/1 773/527/1 774/568/1 
+f 768/570/1 766/568/1 774/568/1 775/570/1 
+f 770/572/1 768/570/1 775/570/1 776/572/1 
+f 772/574/1 770/572/1 776/572/1 777/574/1 
+f 627/509/1 772/574/1 777/574/1 753/509/1 
+f 778/559/1 779/507/1 755/507/1 780/559/1 
+f 781/561/1 778/559/1 780/559/1 782/561/1 
+f 783/563/1 781/561/1 782/561/1 784/563/1 
+f 784/563/1 785/565/1 786/575/1 783/563/1 
+f 787/510/1 786/575/1 785/565/1 754/510/1 
+f 788/1/61 329/1/61 328/4/61 789/4/61 
+f 773/1/1 788/1/1 789/4/1 790/4/1 
+f 753/509/1 791/509/1 787/510/1 754/510/1 
+f 756/506/1 755/507/1 779/507/1 792/506/1 
+f 773/527/1 790/527/1 793/568/1 774/568/1 
+f 774/568/1 793/568/1 794/570/1 775/570/1 
+f 775/570/1 794/570/1 795/572/1 776/572/1 
+f 776/572/1 795/572/1 796/574/1 777/574/1 
+f 777/574/1 796/574/1 791/509/1 753/509/1 
+f 755/507/1 625/507/1 757/559/1 780/559/1 
+f 780/559/1 757/559/1 759/561/1 782/561/1 
+f 782/561/1 759/561/1 761/563/1 784/563/1 
+f 784/563/1 761/563/1 763/565/1 785/565/1 
+f 785/565/1 763/565/1 628/510/1 754/510/1 
+f 797/574/1 798/509/1 791/509/1 796/574/1 
+f 799/510/1 787/510/1 791/509/1 798/509/1 
+f 800/572/1 795/572/1 794/570/1 801/570/1 
+f 786/575/1 802/576/1 783/563/1 
+f 803/561/1 781/561/1 783/563/1 804/563/1 
+f 805/559/1 778/559/1 781/561/1 803/561/1 
+f 806/507/1 779/507/1 778/559/1 805/559/1 
+f 807/561/1 803/561/1 804/563/1 808/563/1 
+f 809/507/1 806/507/1 805/559/1 810/559/1 
+f 811/286/62 330/286/62 333/287/62 812/287/62 
+f 813/286/1 811/286/1 812/287/1 814/287/1 
 f 815/286/1 813/286/1 814/287/1 816/287/1 
-f 817/286/1 815/286/1 816/287/1 818/287/1 
-f 815/526/1 817/567/1 795/567/1 792/526/1 
-f 803/286/1 817/286/1 818/287/1 819/287/1 
-f 820/571/1 802/571/1 803/569/1 819/569/1 
-f 799/571/1 802/571/1 820/571/1 821/571/1 
-f 821/573/1 822/508/1 800/508/1 799/573/1 
-f 823/509/1 801/509/1 800/508/1 822/508/1 
-f 810/509/1 801/509/1 823/509/1 824/509/1 
-f 825/560/1 809/560/1 810/562/1 824/562/1 
-f 812/560/1 809/560/1 825/560/1 826/560/1 
-f 827/506/1 811/506/1 812/558/1 826/558/1 
-f 828/506/1 811/506/1 827/506/1 829/506/1 
-f 830/505/1 758/505/1 794/505/1 831/505/1 
-f 832/506/1 828/506/1 829/506/1 833/506/1 
-f 828/505/1 832/505/1 831/505/1 794/505/1 
-f 834/287/1 818/287/1 816/287/1 835/287/1 
-f 836/287/1 819/287/1 818/287/1 834/287/1 
-f 837/571/1 820/571/1 819/569/1 836/569/1 
-f 838/571/1 821/571/1 820/571/1 837/571/1 
-f 839/508/1 822/508/1 821/573/1 838/573/1 
-f 840/509/1 823/509/1 822/508/1 839/508/1 
-f 841/509/1 824/509/1 823/509/1 840/509/1 
-f 842/560/1 825/560/1 824/562/1 841/562/1 
-f 843/560/1 826/560/1 825/560/1 842/560/1 
-f 844/506/1 827/506/1 826/558/1 843/558/1 
-f 844/506/1 845/506/1 829/506/1 827/506/1 
-f 846/506/1 833/506/1 829/506/1 845/506/1 
-f 847/287/1 834/287/1 835/287/1 848/287/1 
-f 849/287/1 836/287/1 834/287/1 847/287/1 
-f 850/571/1 837/571/1 836/569/1 849/569/1 
-f 851/571/1 838/571/1 837/571/1 850/571/1 
-f 852/508/1 839/508/1 838/573/1 851/573/1 
-f 853/509/1 840/509/1 839/508/1 852/508/1 
-f 854/509/1 841/509/1 840/509/1 853/509/1 
-f 855/560/1 842/560/1 841/562/1 854/562/1 
-f 856/560/1 843/560/1 842/560/1 855/560/1 
-f 857/506/1 844/506/1 843/558/1 856/558/1 
-f 857/506/1 858/506/1 845/506/1 844/506/1 
-f 846/506/1 845/506/1 859/506/1 
-f 860/506/1 846/506/1 859/506/1 861/506/1 
-f 861/506/1 859/506/1 862/506/1 863/506/1 
-f 864/506/1 860/506/1 861/506/1 865/506/1 
-f 866/170/1 212/170/1 867/576/1 868/576/1 
+f 813/527/1 815/568/1 793/568/1 790/527/1 
+f 801/286/1 815/286/1 816/287/1 817/287/1 
+f 818/572/1 800/572/1 801/570/1 817/570/1 
+f 797/572/1 800/572/1 818/572/1 819/572/1 
+f 819/574/1 820/509/1 798/509/1 797/574/1 
+f 821/510/1 799/510/1 798/509/1 820/509/1 
+f 808/510/1 799/510/1 821/510/1 822/510/1 
+f 823/561/1 807/561/1 808/563/1 822/563/1 
+f 810/561/1 807/561/1 823/561/1 824/561/1 
+f 825/507/1 809/507/1 810/559/1 824/559/1 
+f 826/507/1 809/507/1 825/507/1 827/507/1 
+f 828/506/1 756/506/1 792/506/1 829/506/1 
+f 830/507/1 826/507/1 827/507/1 831/507/1 
+f 826/506/1 830/506/1 829/506/1 792/506/1 
+f 832/287/1 816/287/1 814/287/1 833/287/1 
+f 834/287/1 817/287/1 816/287/1 832/287/1 
+f 835/572/1 818/572/1 817/570/1 834/570/1 
+f 836/572/1 819/572/1 818/572/1 835/572/1 
+f 837/509/1 820/509/1 819/574/1 836/574/1 
+f 838/510/1 821/510/1 820/509/1 837/509/1 
+f 839/510/1 822/510/1 821/510/1 838/510/1 
+f 840/561/1 823/561/1 822/563/1 839/563/1 
+f 841/561/1 824/561/1 823/561/1 840/561/1 
+f 842/507/1 825/507/1 824/559/1 841/559/1 
+f 842/507/1 843/507/1 827/507/1 825/507/1 
+f 844/507/1 831/507/1 827/507/1 843/507/1 
+f 845/287/1 832/287/1 833/287/1 846/287/1 
+f 847/287/1 834/287/1 832/287/1 845/287/1 
+f 848/572/1 835/572/1 834/570/1 847/570/1 
+f 849/572/1 836/572/1 835/572/1 848/572/1 
+f 850/509/1 837/509/1 836/574/1 849/574/1 
+f 851/510/1 838/510/1 837/509/1 850/509/1 
+f 852/510/1 839/510/1 838/510/1 851/510/1 
+f 853/561/1 840/561/1 839/563/1 852/563/1 
+f 854/561/1 841/561/1 840/561/1 853/561/1 
+f 855/507/1 842/507/1 841/559/1 854/559/1 
+f 855/507/1 856/507/1 843/507/1 842/507/1 
+f 844/507/1 843/507/1 857/507/1 
+f 858/507/1 844/507/1 857/507/1 859/507/1 
+f 859/507/1 857/507/1 860/507/1 861/507/1 
+f 862/507/1 858/507/1 859/507/1 863/507/1 
+f 864/170/1 212/170/1 865/577/1 866/577/1 
 s 1
-f 211/169/1 867/576/1 212/170/1 
+f 211/169/1 865/577/1 212/170/1 
 s off
-f 859/506/1 845/506/1 858/506/1 862/506/1 
-f 869/287/1 848/287/1 835/287/1 870/287/1 
-f 871/91/1 872/91/1 704/91/1 703/91/1 
-f 705/91/1 706/91/1 873/91/1 874/91/1 
-f 875/287/1 876/287/1 877/287/1 878/287/1 
-f 879/91/1 880/91/1 881/91/1 882/91/1 
-f 882/91/1 881/91/1 883/91/1 884/91/1 
-f 885/91/1 883/91/1 881/91/1 886/91/1 
-f 873/91/1 876/91/1 870/91/1 874/91/1 
-f 873/91/1 706/91/1 704/91/1 872/91/1 
-f 887/91/1 871/91/1 703/91/1 888/91/1 
-f 886/91/1 889/91/1 890/91/1 885/91/1 
-f 880/91/1 887/91/1 886/91/1 881/91/1 
-f 891/91/1 884/91/1 883/91/1 892/91/1 
-f 893/91/1 894/91/1 891/91/1 892/91/1 
-f 895/91/1 893/91/1 892/91/1 896/91/1 
-f 897/94/1 709/94/1 710/94/1 898/94/1 
-f 899/94/1 900/94/1 711/94/1 712/94/1 
-f 712/94/1 709/94/1 897/94/1 899/94/1 
-f 901/94/1 897/94/1 898/94/1 902/94/1 
-f 903/94/1 899/94/1 897/94/1 901/94/1 
-f 899/94/1 903/94/1 900/94/1 
-f 904/91/1 894/91/1 893/91/1 900/91/1 
-f 711/91/1 900/91/1 893/91/1 895/91/1 
-f 905/91/1 904/91/1 900/91/1 903/91/1 
-f 906/91/1 905/91/1 903/91/1 901/91/1 
-f 907/91/1 906/91/1 901/91/1 902/91/1 
-f 714/94/1 908/94/1 902/94/1 898/94/1 
-f 909/91/1 907/91/1 902/91/1 908/91/1 
-f 713/94/1 910/94/1 908/94/1 714/94/1 
+f 857/507/1 843/507/1 856/507/1 860/507/1 
+f 867/287/1 846/287/1 833/287/1 868/287/1 
+f 869/91/1 870/91/1 702/91/1 701/91/1 
+f 703/91/1 704/91/1 871/91/1 872/91/1 
+f 873/287/1 874/287/1 875/287/1 876/287/1 
+f 877/91/1 878/91/1 879/91/1 880/91/1 
+f 880/91/1 879/91/1 881/91/1 882/91/1 
+f 883/91/1 881/91/1 879/91/1 884/91/1 
+f 871/91/1 874/91/1 868/91/1 872/91/1 
+f 871/91/1 704/91/1 702/91/1 870/91/1 
+f 885/91/1 869/91/1 701/91/1 886/91/1 
+f 884/91/1 887/91/1 888/91/1 883/91/1 
+f 878/91/1 885/91/1 884/91/1 879/91/1 
+f 889/91/1 882/91/1 881/91/1 890/91/1 
+f 891/91/1 892/91/1 889/91/1 890/91/1 
+f 893/91/1 891/91/1 890/91/1 894/91/1 
+f 895/94/1 707/94/1 708/94/1 896/94/1 
+f 897/94/1 898/94/1 709/94/1 710/94/1 
+f 710/94/1 707/94/1 895/94/1 897/94/1 
+f 899/94/1 895/94/1 896/94/1 900/94/1 
+f 901/94/1 897/94/1 895/94/1 899/94/1 
+f 897/94/1 901/94/1 898/94/1 
+f 902/91/1 892/91/1 891/91/1 898/91/1 
+f 709/91/1 898/91/1 891/91/1 893/91/1 
+f 903/91/1 902/91/1 898/91/1 901/91/1 
+f 904/91/1 903/91/1 901/91/1 899/91/1 
+f 905/91/1 904/91/1 899/91/1 900/91/1 
+f 712/94/1 906/94/1 900/94/1 896/94/1 
+f 907/91/1 905/91/1 900/91/1 906/91/1 
+f 711/94/1 908/94/1 906/94/1 712/94/1 
+f 909/91/1 907/91/1 906/91/1 908/91/1 
+f 910/94/1 908/94/1 711/94/1 713/94/1 
 f 911/91/1 909/91/1 908/91/1 910/91/1 
-f 912/94/1 910/94/1 713/94/1 715/94/1 
-f 913/91/1 911/91/1 910/91/1 912/91/1 
-f 914/367/1 696/367/1 695/366/1 716/366/1 
-f 915/367/1 715/367/1 696/367/1 914/367/1 
-f 916/94/1 912/94/1 715/94/1 915/94/1 
-f 917/91/1 913/91/1 912/91/1 916/91/1 
-f 918/367/1 914/367/1 716/366/1 727/366/1 
-f 919/367/1 915/367/1 914/367/1 918/367/1 
-f 920/94/1 916/94/1 915/94/1 919/94/1 
-f 921/91/1 917/91/1 916/91/1 920/91/1 
-f 728/369/1 922/369/1 918/369/1 727/369/1 
-f 923/367/1 919/367/1 918/367/1 922/367/1 
-f 924/94/1 920/94/1 919/94/1 923/94/1 
-f 925/91/1 921/91/1 920/91/1 924/91/1 
-f 749/369/1 926/369/1 922/369/1 728/369/1 
-f 927/367/1 923/367/1 922/367/1 926/367/1 
-f 928/94/1 924/94/1 923/94/1 927/94/1 
-f 929/91/1 925/91/1 924/91/1 928/91/1 
-f 930/367/1 931/367/1 927/367/1 926/367/1 
-f 931/94/1 932/94/1 928/94/1 927/94/1 
-f 933/91/1 929/91/1 928/91/1 932/91/1 
-f 934/369/1 744/369/1 743/369/1 935/369/1 
-f 935/369/1 743/369/1 752/369/1 936/369/1 
-f 937/369/1 934/369/1 935/369/1 938/369/1 
-f 939/369/1 938/369/1 935/369/1 936/369/1 
-f 940/369/1 937/369/1 938/369/1 941/369/1 
+f 912/367/1 694/367/1 693/366/1 714/366/1 
+f 913/367/1 713/367/1 694/367/1 912/367/1 
+f 914/94/1 910/94/1 713/94/1 913/94/1 
+f 915/91/1 911/91/1 910/91/1 914/91/1 
+f 916/367/1 912/367/1 714/366/1 725/366/1 
+f 917/367/1 913/367/1 912/367/1 916/367/1 
+f 918/94/1 914/94/1 913/94/1 917/94/1 
+f 919/91/1 915/91/1 914/91/1 918/91/1 
+f 726/369/1 920/369/1 916/369/1 725/369/1 
+f 921/367/1 917/367/1 916/367/1 920/367/1 
+f 922/94/1 918/94/1 917/94/1 921/94/1 
+f 923/91/1 919/91/1 918/91/1 922/91/1 
+f 747/369/1 924/369/1 920/369/1 726/369/1 
+f 925/367/1 921/367/1 920/367/1 924/367/1 
+f 926/94/1 922/94/1 921/94/1 925/94/1 
+f 927/91/1 923/91/1 922/91/1 926/91/1 
+f 928/367/1 929/367/1 925/367/1 924/367/1 
+f 929/94/1 930/94/1 926/94/1 925/94/1 
+f 931/91/1 927/91/1 926/91/1 930/91/1 
+f 932/369/1 742/369/1 741/369/1 933/369/1 
+f 933/369/1 741/369/1 750/369/1 934/369/1 
+f 935/369/1 932/369/1 933/369/1 936/369/1 
+f 937/369/1 936/369/1 933/369/1 934/369/1 
+f 938/369/1 935/369/1 936/369/1 939/369/1 
+f 939/369/1 936/369/1 937/369/1 940/369/1 
 f 941/369/1 938/369/1 939/369/1 942/369/1 
-f 943/369/1 940/369/1 941/369/1 944/369/1 
-f 944/369/1 941/369/1 942/369/1 945/369/1 
-f 748/369/1 744/369/1 934/369/1 930/369/1 
-f 930/369/1 934/369/1 937/369/1 931/369/1 
-f 931/369/1 937/369/1 940/369/1 932/369/1 
-f 932/369/1 940/369/1 943/369/1 933/369/1 
-f 749/369/1 748/369/1 930/369/1 926/369/1 
-f 946/369/1 947/369/1 942/369/1 939/369/1 
-f 947/369/1 948/369/1 945/369/1 942/369/1 
-f 949/369/1 947/369/1 946/369/1 950/369/1 
-f 872/287/1 877/287/1 876/287/1 873/287/1 
-f 872/91/1 871/91/1 951/91/1 877/91/1 
-f 952/91/1 878/91/1 877/91/1 951/91/1 
-f 951/91/1 871/91/1 887/91/1 880/91/1 
-f 952/91/1 951/91/1 880/91/1 879/91/1 
-f 869/91/1 870/91/1 876/91/1 875/91/1 
+f 942/369/1 939/369/1 940/369/1 943/369/1 
+f 746/369/1 742/369/1 932/369/1 928/369/1 
+f 928/369/1 932/369/1 935/369/1 929/369/1 
+f 929/369/1 935/369/1 938/369/1 930/369/1 
+f 930/369/1 938/369/1 941/369/1 931/369/1 
+f 747/369/1 746/369/1 928/369/1 924/369/1 
+f 944/369/1 945/369/1 940/369/1 937/369/1 
+f 945/369/1 946/369/1 943/369/1 940/369/1 
+f 947/369/1 945/369/1 944/369/1 948/369/1 
+f 870/287/1 875/287/1 874/287/1 871/287/1 
+f 870/91/1 869/91/1 949/91/1 875/91/1 
+f 950/91/1 876/91/1 875/91/1 949/91/1 
+f 949/91/1 869/91/1 885/91/1 878/91/1 
+f 950/91/1 949/91/1 878/91/1 877/91/1 
+f 867/91/1 868/91/1 874/91/1 873/91/1 
 s 1
-f 664/529/1 953/577/1 665/530/1 
-f 61/418/1 954/578/1 472/415/1 
-f 511/452/1 62/417/1 473/416/1 512/453/1 
-f 495/442/1 955/579/1 507/451/1 496/443/1 
-f 13/13/1 956/580/1 476/421/1 14/14/1 
-f 499/446/1 957/581/1 958/582/1 500/447/1 
-f 465/408/1 959/583/1 960/584/1 466/409/1 
-f 516/457/1 520/461/1 519/460/1 517/458/1 
-f 514/455/1 472/415/1 954/578/1 456/399/1 
+f 662/530/1 951/578/1 663/531/1 
+f 61/418/1 952/579/1 472/415/1 
+f 473/416/1 511/453/1 953/580/1 62/417/1 
+f 495/442/1 954/581/1 507/451/1 496/443/1 
+f 13/13/1 955/582/1 476/421/1 14/14/1 
+f 499/446/1 956/583/1 957/584/1 500/447/1 
+f 465/408/1 958/585/1 959/586/1 466/409/1 
+f 516/458/1 520/462/1 519/461/1 517/459/1 
+f 514/456/1 472/415/1 952/579/1 456/399/1 
 f 467/410/1 475/420/1 469/412/1 471/414/1 
-f 961/585/1 470/413/1 469/412/1 478/423/1 
-f 961/585/1 478/423/1 480/425/1 962/586/1 
+f 960/587/1 470/413/1 469/412/1 478/423/1 
+f 960/587/1 478/423/1 480/425/1 961/588/1 
 f 477/422/1 503/449/1 479/424/1 474/419/1 
 f 476/421/1 475/420/1 467/410/1 14/14/1 
-f 963/587/1 477/422/1 476/421/1 956/580/1 
-f 494/441/1 76/588/1 75/589/1 495/442/1 
+f 962/589/1 477/422/1 476/421/1 955/582/1 
+f 494/441/1 76/590/1 75/591/1 495/442/1 
 s off
-f 955/579/1 964/590/1 965/590/1 966/579/1 
+f 954/581/1 963/592/1 964/592/1 965/581/1 
 f 509/450/1 504/449/1 503/449/1 506/450/1 
 s 1
-f 963/587/1 506/450/1 503/449/1 477/422/1 
-f 955/579/1 495/442/1 75/589/1 964/590/1 
-f 496/443/1 963/587/1 956/580/1 497/444/1 
+f 962/589/1 506/450/1 503/449/1 477/422/1 
+f 954/581/1 495/442/1 75/591/1 963/592/1 
+f 496/443/1 962/589/1 955/582/1 497/444/1 
 s off
-f 507/451/1 955/579/1 966/579/1 508/451/1 
+f 507/451/1 954/581/1 965/581/1 508/451/1 
 s 1
-f 496/443/1 507/451/1 506/450/1 963/587/1 
-f 193/147/1 192/146/1 76/588/1 494/441/1 491/437/1 
-f 956/580/1 13/13/1 490/436/1 497/444/1 
+f 496/443/1 507/451/1 506/450/1 962/589/1 
+f 193/147/1 192/146/1 76/590/1 494/441/1 491/437/1 
+f 955/582/1 13/13/1 490/436/1 497/444/1 
 f 497/444/1 490/436/1 491/437/1 494/441/1 
-f 471/414/1 470/413/1 19/19/1 967/591/1 
+f 471/414/1 470/413/1 19/19/1 966/593/1 
 f 20/20/1 19/19/1 470/413/1 
-f 968/592/1 24/24/1 23/23/1 452/395/1 
-f 969/593/1 970/594/1 971/595/1 972/596/1 
-f 954/578/1 61/418/1 973/597/1 974/598/1 
-f 514/455/1 517/458/1 473/416/1 472/415/1 
-f 975/599/1 516/457/1 515/456/1 960/584/1 
+f 967/594/1 24/24/1 23/23/1 452/395/1 
+f 968/595/1 969/596/1 970/597/1 971/598/1 
+f 952/579/1 61/418/1 972/599/1 973/600/1 
+f 514/456/1 517/459/1 473/416/1 472/415/1 
+f 974/601/1 516/458/1 515/457/1 959/586/1 
 s off
-f 521/462/1 520/461/1 976/600/1 977/600/1 
-f 519/460/1 518/459/1 513/454/1 512/453/1 
+f 521/463/1 520/462/1 975/602/1 976/602/1 
+f 519/461/1 518/460/1 977/603/1 978/604/1 
 s 1
-f 519/460/1 512/453/1 473/416/1 517/458/1 
-f 976/600/1 520/461/1 516/457/1 975/599/1 
-f 455/398/1 466/409/1 960/584/1 515/456/1 
-f 456/399/1 455/398/1 515/456/1 514/455/1 
-f 959/583/1 978/601/1 975/599/1 960/584/1 
-f 979/602/1 980/603/1 978/601/1 959/583/1 
-f 981/604/1 982/605/1 980/603/1 979/602/1 
-f 501/448/1 500/447/1 982/605/1 981/604/1 
-f 983/606/1 984/607/1 470/413/1 961/585/1 
-f 985/608/1 986/609/1 984/607/1 983/606/1 
-f 499/446/1 498/445/1 986/609/1 985/608/1 
-f 978/601/1 987/610/1 976/600/1 975/599/1 
-f 980/603/1 988/611/1 987/610/1 978/601/1 
-f 982/605/1 989/612/1 988/611/1 980/603/1 
-f 500/447/1 958/582/1 989/612/1 982/605/1 
-f 990/613/1 983/606/1 961/585/1 962/586/1 
-f 991/614/1 985/608/1 983/606/1 990/613/1 
-f 957/581/1 499/446/1 985/608/1 991/614/1 
-f 959/583/1 465/408/1 462/405/1 979/602/1 
-f 979/602/1 462/405/1 461/404/1 981/604/1 
-f 981/604/1 461/404/1 450/393/1 501/448/1 
+f 519/461/1 978/604/1 473/416/1 517/459/1 
+f 975/602/1 520/462/1 516/458/1 974/601/1 
+f 455/398/1 466/409/1 959/586/1 515/457/1 
+f 456/399/1 455/398/1 515/457/1 514/456/1 
+f 958/585/1 979/605/1 974/601/1 959/586/1 
+f 980/606/1 981/607/1 979/605/1 958/585/1 
+f 982/608/1 983/609/1 981/607/1 980/606/1 
+f 501/448/1 500/447/1 983/609/1 982/608/1 
+f 984/610/1 985/611/1 470/413/1 960/587/1 
+f 986/612/1 987/613/1 985/611/1 984/610/1 
+f 499/446/1 498/445/1 987/613/1 986/612/1 
+f 979/605/1 988/614/1 975/602/1 974/601/1 
+f 981/607/1 989/615/1 988/614/1 979/605/1 
+f 983/609/1 990/616/1 989/615/1 981/607/1 
+f 500/447/1 957/584/1 990/616/1 983/609/1 
+f 991/617/1 984/610/1 960/587/1 961/588/1 
+f 992/618/1 986/612/1 984/610/1 991/617/1 
+f 956/583/1 499/446/1 986/612/1 992/618/1 
+f 958/585/1 465/408/1 462/405/1 980/606/1 
+f 980/606/1 462/405/1 461/404/1 982/608/1 
+f 982/608/1 461/404/1 450/393/1 501/448/1 
 f 501/448/1 450/393/1 449/392/1 498/445/1 
-f 498/445/1 449/392/1 454/397/1 986/609/1 
-f 986/609/1 454/397/1 453/396/1 984/607/1 
-f 984/607/1 453/396/1 20/20/1 470/413/1 
-f 992/615/1 993/616/1 431/374/1 430/373/1 
-f 994/617/1 995/618/1 993/616/1 992/615/1 
-f 996/619/1 997/620/1 995/618/1 994/617/1 
-f 998/621/1 999/622/1 997/620/1 996/619/1 
-f 102/102/1 101/101/1 999/622/1 998/621/1 
-f 1000/623/1 1001/624/1 1002/625/1 1003/626/1 
-f 1004/627/1 1005/628/1 1001/624/1 1000/623/1 
-f 1006/629/1 1007/630/1 1005/628/1 1004/627/1 
-f 1008/631/1 1009/632/1 1007/630/1 1006/629/1 
-f 100/100/1 99/99/1 1009/632/1 1008/631/1 
-f 1010/633/1 1011/634/1 440/383/1 29/29/1 
-f 1012/635/1 1013/636/1 1011/634/1 1010/633/1 
-f 1014/637/1 1015/638/1 1013/636/1 1012/635/1 
-f 1016/639/1 1017/640/1 1015/638/1 1014/637/1 
-f 407/355/1 406/354/1 1017/640/1 1016/639/1 
-f 1018/641/1 1019/642/1 1020/643/1 1021/644/1 
-f 1022/645/1 1023/646/1 1019/642/1 1018/641/1 
-f 1024/647/1 1025/648/1 1023/646/1 1022/645/1 
-f 1026/649/1 1027/650/1 1025/648/1 1024/647/1 
-f 405/353/1 404/352/1 1027/650/1 1026/649/1 
-f 1028/651/1 1029/652/1 395/343/1 442/385/1 
-f 1030/653/1 1031/654/1 1029/652/1 1028/651/1 
-f 1032/655/1 1033/656/1 1031/654/1 1030/653/1 
-f 1034/657/1 1035/658/1 1033/656/1 1032/655/1 
-f 416/361/1 415/360/1 1035/658/1 1034/657/1 
-f 1036/659/1 1037/660/1 1038/661/1 1039/662/1 
-f 1040/663/1 1036/659/1 1039/662/1 1041/664/1 
-f 1042/665/1 1043/666/1 1040/663/1 1041/664/1 
-f 1044/667/1 1045/668/1 1043/666/1 1042/665/1 
-f 414/359/1 413/358/1 1045/668/1 1044/667/1 
-f 1046/669/1 604/503/1 1020/643/1 1019/642/1 
-f 1047/670/1 1046/669/1 1019/642/1 1023/646/1 
-f 1048/671/1 1047/670/1 1023/646/1 1025/648/1 
-f 1049/672/1 1048/671/1 1025/648/1 1027/650/1 
-f 429/372/1 1049/672/1 1027/650/1 404/352/1 
-f 1010/633/1 29/29/1 32/32/1 1050/673/1 
-f 1012/635/1 1010/633/1 1050/673/1 1051/674/1 
-f 1014/637/1 1012/635/1 1051/674/1 1052/675/1 
-f 1016/639/1 1014/637/1 1052/675/1 1053/676/1 
-f 407/355/1 1016/639/1 1053/676/1 428/371/1 
-f 1054/677/1 1055/678/1 1056/679/1 1057/680/1 
-f 1058/681/1 1054/677/1 1057/680/1 1059/682/1 
-f 1060/683/1 1058/681/1 1059/682/1 1061/684/1 
-f 1062/685/1 1060/683/1 1061/684/1 1063/686/1 
-f 433/376/1 1062/685/1 1063/686/1 434/377/1 
-f 1064/687/1 341/293/1 340/292/1 1065/688/1 
-f 1066/689/1 1064/687/1 1065/688/1 1067/690/1 
-f 1068/691/1 1066/689/1 1067/690/1 1069/692/1 
-f 1070/693/1 1068/691/1 1069/692/1 1071/694/1 
-f 435/378/1 1070/693/1 1071/694/1 432/375/1 
-f 1039/662/1 1038/661/1 600/499/1 1072/695/1 
-f 1073/696/1 1041/664/1 1039/662/1 1072/695/1 
-f 1074/697/1 1042/665/1 1041/664/1 1073/696/1 
-f 1075/698/1 1044/667/1 1042/665/1 1074/697/1 
-f 437/380/1 414/359/1 1044/667/1 1075/698/1 
-f 1029/652/1 1076/699/1 396/344/1 395/343/1 
-f 1031/654/1 1077/700/1 1076/699/1 1029/652/1 
-f 1033/656/1 1078/701/1 1077/700/1 1031/654/1 
-f 1035/658/1 1079/702/1 1078/701/1 1033/656/1 
-f 415/360/1 436/379/1 1079/702/1 1035/658/1 
-f 604/503/1 1046/669/1 1080/703/1 602/501/1 
-f 1046/669/1 1047/670/1 1081/704/1 1080/703/1 
-f 1047/670/1 1048/671/1 1082/705/1 1081/704/1 
-f 1048/671/1 1049/672/1 1083/706/1 1082/705/1 
-f 1049/672/1 429/372/1 439/382/1 1083/706/1 
-f 403/351/1 1084/707/1 1050/673/1 32/32/1 
-f 1084/707/1 1085/708/1 1051/674/1 1050/673/1 
-f 1085/708/1 1086/709/1 1052/675/1 1051/674/1 
-f 1086/709/1 1087/710/1 1053/676/1 1052/675/1 
-f 1087/710/1 438/381/1 428/371/1 1053/676/1 
-f 1088/711/1 972/712/1 1089/713/1 1090/714/1 
-f 1091/715/1 1088/711/1 1090/714/1 1092/716/1 
-f 1093/717/1 1091/715/1 1092/716/1 1094/718/1 
-f 1095/719/1 1096/720/1 1093/717/1 1094/718/1 
-f 446/389/1 445/388/1 1096/720/1 1095/719/1 
-f 968/721/1 1097/722/1 1098/723/1 24/724/1 
-f 1099/725/1 1100/726/1 1097/722/1 968/721/1 
-f 1101/727/1 1102/728/1 1100/726/1 1099/725/1 
-f 1103/729/1 1104/730/1 1102/728/1 1101/727/1 
-f 444/387/1 443/386/1 1104/730/1 1103/729/1 
-f 602/501/1 1080/703/1 1072/695/1 600/499/1 
-f 1080/703/1 1081/704/1 1073/696/1 1072/695/1 
-f 1081/704/1 1082/705/1 1074/697/1 1073/696/1 
-f 1082/705/1 1083/706/1 1075/698/1 1074/697/1 
-f 1083/706/1 439/382/1 437/380/1 1075/698/1 
-f 396/344/1 1076/699/1 1084/707/1 403/351/1 
-f 1076/699/1 1077/700/1 1085/708/1 1084/707/1 
-f 1077/700/1 1078/701/1 1086/709/1 1085/708/1 
-f 1078/701/1 1079/702/1 1087/710/1 1086/709/1 
-f 1079/702/1 436/379/1 438/381/1 1087/710/1 
-f 1099/731/1 968/592/1 452/395/1 451/394/1 
-f 1101/732/1 1099/731/1 451/394/1 448/391/1 
-f 448/391/1 447/390/1 1103/733/1 1101/732/1 
-f 1103/733/1 447/390/1 460/403/1 444/734/1 
-f 444/734/1 460/403/1 459/402/1 445/735/1 
-f 445/735/1 459/402/1 464/407/1 1096/736/1 
-f 1096/736/1 464/407/1 463/406/1 1093/737/1 
-f 1093/737/1 463/406/1 458/401/1 1091/738/1 
-f 1091/738/1 458/401/1 457/400/1 1088/739/1 
-f 1088/739/1 457/400/1 969/593/1 972/596/1 
+f 498/445/1 449/392/1 454/397/1 987/613/1 
+f 987/613/1 454/397/1 453/396/1 985/611/1 
+f 985/611/1 453/396/1 20/20/1 470/413/1 
+f 993/619/1 994/620/1 431/374/1 430/373/1 
+f 995/621/1 996/622/1 994/620/1 993/619/1 
+f 997/623/1 998/624/1 996/622/1 995/621/1 
+f 999/625/1 1000/626/1 998/624/1 997/623/1 
+f 102/102/1 101/101/1 1000/626/1 999/625/1 
+f 1001/627/1 1002/628/1 1003/629/1 1004/630/1 
+f 1005/631/1 1006/632/1 1002/628/1 1001/627/1 
+f 1007/633/1 1008/634/1 1006/632/1 1005/631/1 
+f 1009/635/1 1010/636/1 1008/634/1 1007/633/1 
+f 100/100/1 99/99/1 1010/636/1 1009/635/1 
+f 1011/637/1 1012/638/1 440/383/1 29/29/1 
+f 1013/639/1 1014/640/1 1012/638/1 1011/637/1 
+f 1015/641/1 1016/642/1 1014/640/1 1013/639/1 
+f 1017/643/1 1018/644/1 1016/642/1 1015/641/1 
+f 407/355/1 406/354/1 1018/644/1 1017/643/1 
+f 1019/645/1 1020/646/1 1021/647/1 1022/648/1 
+f 1023/649/1 1024/650/1 1020/646/1 1019/645/1 
+f 1025/651/1 1026/652/1 1024/650/1 1023/649/1 
+f 1027/653/1 1028/654/1 1026/652/1 1025/651/1 
+f 405/353/1 404/352/1 1028/654/1 1027/653/1 
+f 1029/655/1 1030/656/1 395/343/1 442/385/1 
+f 1031/657/1 1032/658/1 1030/656/1 1029/655/1 
+f 1033/659/1 1034/660/1 1032/658/1 1031/657/1 
+f 1035/661/1 1036/662/1 1034/660/1 1033/659/1 
+f 416/361/1 415/360/1 1036/662/1 1035/661/1 
+f 1037/663/1 1038/664/1 1039/665/1 1040/666/1 
+f 1041/667/1 1037/663/1 1040/666/1 1042/668/1 
+f 1043/669/1 1044/670/1 1041/667/1 1042/668/1 
+f 1045/671/1 1046/672/1 1044/670/1 1043/669/1 
+f 414/359/1 413/358/1 1046/672/1 1045/671/1 
+f 1047/673/1 602/504/1 1021/647/1 1020/646/1 
+f 1048/674/1 1047/673/1 1020/646/1 1024/650/1 
+f 1049/675/1 1048/674/1 1024/650/1 1026/652/1 
+f 1050/676/1 1049/675/1 1026/652/1 1028/654/1 
+f 429/372/1 1050/676/1 1028/654/1 404/352/1 
+f 1011/637/1 29/29/1 32/32/1 1051/677/1 
+f 1013/639/1 1011/637/1 1051/677/1 1052/678/1 
+f 1015/641/1 1013/639/1 1052/678/1 1053/679/1 
+f 1017/643/1 1015/641/1 1053/679/1 1054/680/1 
+f 407/355/1 1017/643/1 1054/680/1 428/371/1 
+f 1055/681/1 1056/682/1 1057/683/1 1058/684/1 
+f 1059/685/1 1055/681/1 1058/684/1 1060/686/1 
+f 1061/687/1 1059/685/1 1060/686/1 1062/688/1 
+f 1063/689/1 1061/687/1 1062/688/1 1064/690/1 
+f 433/376/1 1063/689/1 1064/690/1 434/377/1 
+f 1065/691/1 341/293/1 340/292/1 1066/692/1 
+f 1067/693/1 1065/691/1 1066/692/1 1068/694/1 
+f 1069/695/1 1067/693/1 1068/694/1 1070/696/1 
+f 1071/697/1 1069/695/1 1070/696/1 1072/698/1 
+f 435/378/1 1071/697/1 1072/698/1 432/375/1 
+f 1040/666/1 1039/665/1 598/500/1 1073/699/1 
+f 1074/700/1 1042/668/1 1040/666/1 1073/699/1 
+f 1075/701/1 1043/669/1 1042/668/1 1074/700/1 
+f 1076/702/1 1045/671/1 1043/669/1 1075/701/1 
+f 437/380/1 414/359/1 1045/671/1 1076/702/1 
+f 1030/656/1 1077/703/1 396/344/1 395/343/1 
+f 1032/658/1 1078/704/1 1077/703/1 1030/656/1 
+f 1034/660/1 1079/705/1 1078/704/1 1032/658/1 
+f 1036/662/1 1080/706/1 1079/705/1 1034/660/1 
+f 415/360/1 436/379/1 1080/706/1 1036/662/1 
+f 602/504/1 1047/673/1 1081/707/1 600/502/1 
+f 1047/673/1 1048/674/1 1082/708/1 1081/707/1 
+f 1048/674/1 1049/675/1 1083/709/1 1082/708/1 
+f 1049/675/1 1050/676/1 1084/710/1 1083/709/1 
+f 1050/676/1 429/372/1 439/382/1 1084/710/1 
+f 403/351/1 1085/711/1 1051/677/1 32/32/1 
+f 1085/711/1 1086/712/1 1052/678/1 1051/677/1 
+f 1086/712/1 1087/713/1 1053/679/1 1052/678/1 
+f 1087/713/1 1088/714/1 1054/680/1 1053/679/1 
+f 1088/714/1 438/381/1 428/371/1 1054/680/1 
+f 1089/715/1 971/716/1 1090/717/1 1091/718/1 
+f 1092/719/1 1089/715/1 1091/718/1 1093/720/1 
+f 1094/721/1 1092/719/1 1093/720/1 1095/722/1 
+f 1096/723/1 1097/724/1 1094/721/1 1095/722/1 
+f 446/389/1 445/388/1 1097/724/1 1096/723/1 
+f 967/725/1 1098/726/1 1099/727/1 24/728/1 
+f 1100/729/1 1101/730/1 1098/726/1 967/725/1 
+f 1102/731/1 1103/732/1 1101/730/1 1100/729/1 
+f 1104/733/1 1105/734/1 1103/732/1 1102/731/1 
+f 444/387/1 443/386/1 1105/734/1 1104/733/1 
+f 600/502/1 1081/707/1 1073/699/1 598/500/1 
+f 1081/707/1 1082/708/1 1074/700/1 1073/699/1 
+f 1082/708/1 1083/709/1 1075/701/1 1074/700/1 
+f 1083/709/1 1084/710/1 1076/702/1 1075/701/1 
+f 1084/710/1 439/382/1 437/380/1 1076/702/1 
+f 396/344/1 1077/703/1 1085/711/1 403/351/1 
+f 1077/703/1 1078/704/1 1086/712/1 1085/711/1 
+f 1078/704/1 1079/705/1 1087/713/1 1086/712/1 
+f 1079/705/1 1080/706/1 1088/714/1 1087/713/1 
+f 1080/706/1 436/379/1 438/381/1 1088/714/1 
+f 1100/735/1 967/594/1 452/395/1 451/394/1 
+f 1102/736/1 1100/735/1 451/394/1 448/391/1 
+f 448/391/1 447/390/1 1104/737/1 1102/736/1 
+f 1104/737/1 447/390/1 460/403/1 444/738/1 
+f 444/738/1 460/403/1 459/402/1 445/739/1 
+f 445/739/1 459/402/1 464/407/1 1097/740/1 
+f 1097/740/1 464/407/1 463/406/1 1094/741/1 
+f 1094/741/1 463/406/1 458/401/1 1092/742/1 
+f 1092/742/1 458/401/1 457/400/1 1089/743/1 
+f 1089/743/1 457/400/1 968/595/1 971/598/1 
 f 10/10/1 9/9/1 370/320/1 423/368/1 
-f 423/368/1 370/320/1 369/319/1 1105/740/1 
-f 446/389/1 1106/741/1 1107/742/1 443/386/1 
-f 1106/741/1 1108/743/1 1109/744/1 1107/742/1 
-f 1108/743/1 1110/745/1 1111/746/1 1109/744/1 
-f 1110/745/1 1112/747/1 1113/748/1 1111/746/1 
-f 1112/747/1 99/99/1 102/102/1 1113/748/1 
-f 416/361/1 1114/749/1 1115/750/1 413/358/1 
-f 1114/749/1 1116/751/1 1117/752/1 1115/750/1 
-f 1116/751/1 1118/753/1 1119/754/1 1117/752/1 
-f 1118/753/1 1120/755/1 1121/756/1 1119/754/1 
-f 1120/755/1 101/101/1 100/100/1 1121/756/1 
-f 1122/757/1 1123/758/1 418/363/1 417/362/1 
-f 1124/759/1 1125/760/1 1123/758/1 1122/757/1 
-f 1126/761/1 1127/762/1 1125/760/1 1124/759/1 
-f 1128/763/1 1129/764/1 1127/762/1 1126/761/1 
-f 394/342/1 393/341/1 1129/764/1 1128/763/1 
-f 1130/765/1 1131/766/1 420/365/1 419/364/1 
-f 1132/767/1 1133/768/1 1131/766/1 1130/765/1 
-f 1134/769/1 1135/770/1 1133/768/1 1132/767/1 
-f 1136/771/1 1137/772/1 1135/770/1 1134/769/1 
-f 392/340/1 391/339/1 1137/772/1 1136/771/1 
-f 1131/766/1 1138/773/1 425/369/1 420/365/1 
-f 1131/766/1 1133/768/1 1139/774/1 1138/773/1 
-f 1133/768/1 1135/770/1 1140/775/1 1139/774/1 
-f 1135/770/1 1137/772/1 1141/776/1 1140/775/1 
-f 1137/772/1 391/339/1 412/357/1 1141/776/1 
-f 423/368/1 1105/740/1 1122/757/1 417/362/1 
-f 1105/740/1 1142/777/1 1124/759/1 1122/757/1 
-f 1142/777/1 1143/778/1 1126/761/1 1124/759/1 
-f 1143/778/1 1144/779/1 1128/763/1 1126/761/1 
-f 1144/779/1 411/356/1 394/342/1 1128/763/1 
-f 1145/780/1 1130/765/1 419/364/1 1098/723/1 
-f 1145/780/1 1146/781/1 1132/767/1 1130/765/1 
-f 1146/781/1 1147/782/1 1134/769/1 1132/767/1 
-f 1147/782/1 1148/783/1 1136/771/1 1134/769/1 
-f 1148/783/1 430/373/1 392/340/1 1136/771/1 
-f 418/363/1 1123/758/1 1149/784/1 442/385/1 
-f 1123/758/1 1125/760/1 1150/785/1 1149/784/1 
-f 1125/760/1 1127/762/1 1151/786/1 1150/785/1 
-f 1127/762/1 1129/764/1 1152/787/1 1151/786/1 
-f 1129/764/1 393/341/1 431/374/1 1152/787/1 
-f 1097/722/1 1153/788/1 1145/780/1 1098/723/1 
-f 1153/788/1 1154/789/1 1146/781/1 1145/780/1 
-f 1154/789/1 1155/790/1 1147/782/1 1146/781/1 
-f 1155/790/1 1156/791/1 1148/783/1 1147/782/1 
-f 1156/791/1 992/615/1 430/373/1 1148/783/1 
-f 442/385/1 1149/784/1 1157/792/1 1028/651/1 
-f 1149/784/1 1150/785/1 1158/793/1 1157/792/1 
-f 1150/785/1 1151/786/1 1159/794/1 1158/793/1 
-f 1151/786/1 1152/787/1 1160/795/1 1159/794/1 
-f 1152/787/1 431/374/1 993/616/1 1160/795/1 
-f 1100/726/1 1161/796/1 1153/788/1 1097/722/1 
-f 1161/796/1 1162/797/1 1154/789/1 1153/788/1 
-f 1162/797/1 1163/798/1 1155/790/1 1154/789/1 
-f 1163/798/1 1164/799/1 1156/791/1 1155/790/1 
-f 1164/799/1 994/617/1 992/615/1 1156/791/1 
-f 1028/651/1 1157/792/1 1165/800/1 1030/653/1 
-f 1157/792/1 1158/793/1 1166/801/1 1165/800/1 
-f 1158/793/1 1159/794/1 1167/802/1 1166/801/1 
-f 1159/794/1 1160/795/1 1168/803/1 1167/802/1 
-f 1160/795/1 993/616/1 995/618/1 1168/803/1 
-f 1102/728/1 1169/804/1 1161/796/1 1100/726/1 
-f 1169/804/1 1170/805/1 1162/797/1 1161/796/1 
-f 1170/805/1 1171/806/1 1163/798/1 1162/797/1 
-f 1171/806/1 1172/807/1 1164/799/1 1163/798/1 
-f 1172/807/1 996/619/1 994/617/1 1164/799/1 
-f 1030/653/1 1165/800/1 1173/808/1 1032/655/1 
-f 1165/800/1 1166/801/1 1174/809/1 1173/808/1 
-f 1166/801/1 1167/802/1 1175/810/1 1174/809/1 
-f 1167/802/1 1168/803/1 1176/811/1 1175/810/1 
-f 1168/803/1 995/618/1 997/620/1 1176/811/1 
-f 1104/730/1 1177/812/1 1169/804/1 1102/728/1 
-f 1177/812/1 1178/813/1 1170/805/1 1169/804/1 
-f 1178/813/1 1179/814/1 1171/806/1 1170/805/1 
-f 1179/814/1 1180/815/1 1172/807/1 1171/806/1 
-f 1180/815/1 998/621/1 996/619/1 1172/807/1 
-f 1032/655/1 1173/808/1 1181/816/1 1034/657/1 
-f 1173/808/1 1174/809/1 1182/817/1 1181/816/1 
-f 1174/809/1 1175/810/1 1183/818/1 1182/817/1 
-f 1175/810/1 1176/811/1 1184/819/1 1183/818/1 
-f 1176/811/1 997/620/1 999/622/1 1184/819/1 
-f 443/386/1 1107/742/1 1177/812/1 1104/730/1 
-f 1107/742/1 1109/744/1 1178/813/1 1177/812/1 
-f 1109/744/1 1111/746/1 1179/814/1 1178/813/1 
-f 1111/746/1 1113/748/1 1180/815/1 1179/814/1 
-f 1113/748/1 102/102/1 998/621/1 1180/815/1 
-f 1034/657/1 1181/816/1 1114/749/1 416/361/1 
-f 1181/816/1 1182/817/1 1116/751/1 1114/749/1 
-f 1182/817/1 1183/818/1 1118/753/1 1116/751/1 
-f 1183/818/1 1184/819/1 1120/755/1 1118/753/1 
-f 1184/819/1 999/622/1 101/101/1 1120/755/1 
-f 1036/659/1 1185/820/1 1186/821/1 1037/660/1 
-f 1185/820/1 1187/822/1 1188/823/1 1186/821/1 
-f 1187/822/1 1189/824/1 1190/825/1 1188/823/1 
-f 1189/824/1 1191/826/1 1192/827/1 1190/825/1 
-f 1191/826/1 1000/623/1 1003/626/1 1192/827/1 
-f 1089/713/1 1193/828/1 1194/829/1 1090/714/1 
-f 1193/828/1 1195/830/1 1196/831/1 1194/829/1 
-f 1195/830/1 1197/832/1 1198/833/1 1196/831/1 
-f 1197/832/1 1199/834/1 1200/835/1 1198/833/1 
-f 1199/834/1 1002/625/1 1001/624/1 1200/835/1 
-f 1040/663/1 1201/836/1 1185/820/1 1036/659/1 
-f 1201/836/1 1202/837/1 1187/822/1 1185/820/1 
-f 1202/837/1 1203/838/1 1189/824/1 1187/822/1 
-f 1203/838/1 1204/839/1 1191/826/1 1189/824/1 
-f 1204/839/1 1004/627/1 1000/623/1 1191/826/1 
-f 1090/714/1 1194/829/1 1205/840/1 1092/716/1 
-f 1194/829/1 1196/831/1 1206/841/1 1205/840/1 
-f 1196/831/1 1198/833/1 1207/842/1 1206/841/1 
-f 1198/833/1 1200/835/1 1208/843/1 1207/842/1 
-f 1200/835/1 1001/624/1 1005/628/1 1208/843/1 
-f 1043/666/1 1209/844/1 1201/836/1 1040/663/1 
-f 1209/844/1 1210/845/1 1202/837/1 1201/836/1 
-f 1210/845/1 1211/846/1 1203/838/1 1202/837/1 
-f 1211/846/1 1212/847/1 1204/839/1 1203/838/1 
-f 1212/847/1 1006/629/1 1004/627/1 1204/839/1 
-f 1092/716/1 1205/840/1 1213/848/1 1094/718/1 
-f 1205/840/1 1206/841/1 1214/849/1 1213/848/1 
-f 1206/841/1 1207/842/1 1215/850/1 1214/849/1 
-f 1207/842/1 1208/843/1 1216/851/1 1215/850/1 
-f 1208/843/1 1005/628/1 1007/630/1 1216/851/1 
-f 1045/668/1 1217/852/1 1209/844/1 1043/666/1 
-f 1217/852/1 1218/853/1 1210/845/1 1209/844/1 
-f 1218/853/1 1219/854/1 1211/846/1 1210/845/1 
-f 1219/854/1 1220/855/1 1212/847/1 1211/846/1 
-f 1220/855/1 1008/631/1 1006/629/1 1212/847/1 
-f 1094/718/1 1213/848/1 1221/856/1 1095/719/1 
-f 1213/848/1 1214/849/1 1222/857/1 1221/856/1 
-f 1214/849/1 1215/850/1 1223/858/1 1222/857/1 
-f 1215/850/1 1216/851/1 1224/859/1 1223/858/1 
-f 1216/851/1 1007/630/1 1009/632/1 1224/859/1 
-f 413/358/1 1115/750/1 1217/852/1 1045/668/1 
-f 1115/750/1 1117/752/1 1218/853/1 1217/852/1 
-f 1117/752/1 1119/754/1 1219/854/1 1218/853/1 
-f 1119/754/1 1121/756/1 1220/855/1 1219/854/1 
-f 1121/756/1 100/100/1 1008/631/1 1220/855/1 
-f 1095/719/1 1221/856/1 1106/741/1 446/389/1 
-f 1221/856/1 1222/857/1 1108/743/1 1106/741/1 
-f 1222/857/1 1223/858/1 1110/745/1 1108/743/1 
-f 1223/858/1 1224/859/1 1112/747/1 1110/745/1 
-f 1224/859/1 1009/632/1 99/99/1 1112/747/1 
-f 1105/740/1 369/319/1 372/322/1 1142/777/1 
-f 1142/777/1 372/322/1 371/321/1 1143/778/1 
-f 1143/778/1 371/321/1 374/324/1 1144/779/1 
-f 1144/779/1 374/324/1 373/323/1 411/356/1 
+f 423/368/1 370/320/1 369/319/1 1106/744/1 
+f 446/389/1 1107/745/1 1108/746/1 443/386/1 
+f 1107/745/1 1109/747/1 1110/748/1 1108/746/1 
+f 1109/747/1 1111/749/1 1112/750/1 1110/748/1 
+f 1111/749/1 1113/751/1 1114/752/1 1112/750/1 
+f 1113/751/1 99/99/1 102/102/1 1114/752/1 
+f 416/361/1 1115/753/1 1116/754/1 413/358/1 
+f 1115/753/1 1117/755/1 1118/756/1 1116/754/1 
+f 1117/755/1 1119/757/1 1120/758/1 1118/756/1 
+f 1119/757/1 1121/759/1 1122/760/1 1120/758/1 
+f 1121/759/1 101/101/1 100/100/1 1122/760/1 
+f 1123/761/1 1124/762/1 418/363/1 417/362/1 
+f 1125/763/1 1126/764/1 1124/762/1 1123/761/1 
+f 1127/765/1 1128/766/1 1126/764/1 1125/763/1 
+f 1129/767/1 1130/768/1 1128/766/1 1127/765/1 
+f 394/342/1 393/341/1 1130/768/1 1129/767/1 
+f 1131/769/1 1132/770/1 420/365/1 419/364/1 
+f 1133/771/1 1134/772/1 1132/770/1 1131/769/1 
+f 1135/773/1 1136/774/1 1134/772/1 1133/771/1 
+f 1137/775/1 1138/776/1 1136/774/1 1135/773/1 
+f 392/340/1 391/339/1 1138/776/1 1137/775/1 
+f 1132/770/1 1139/777/1 425/369/1 420/365/1 
+f 1132/770/1 1134/772/1 1140/778/1 1139/777/1 
+f 1134/772/1 1136/774/1 1141/779/1 1140/778/1 
+f 1136/774/1 1138/776/1 1142/780/1 1141/779/1 
+f 1138/776/1 391/339/1 412/357/1 1142/780/1 
+f 423/368/1 1106/744/1 1123/761/1 417/362/1 
+f 1106/744/1 1143/781/1 1125/763/1 1123/761/1 
+f 1143/781/1 1144/782/1 1127/765/1 1125/763/1 
+f 1144/782/1 1145/783/1 1129/767/1 1127/765/1 
+f 1145/783/1 411/356/1 394/342/1 1129/767/1 
+f 1146/784/1 1131/769/1 419/364/1 1099/727/1 
+f 1146/784/1 1147/785/1 1133/771/1 1131/769/1 
+f 1147/785/1 1148/786/1 1135/773/1 1133/771/1 
+f 1148/786/1 1149/787/1 1137/775/1 1135/773/1 
+f 1149/787/1 430/373/1 392/340/1 1137/775/1 
+f 418/363/1 1124/762/1 1150/788/1 442/385/1 
+f 1124/762/1 1126/764/1 1151/789/1 1150/788/1 
+f 1126/764/1 1128/766/1 1152/790/1 1151/789/1 
+f 1128/766/1 1130/768/1 1153/791/1 1152/790/1 
+f 1130/768/1 393/341/1 431/374/1 1153/791/1 
+f 1098/726/1 1154/792/1 1146/784/1 1099/727/1 
+f 1154/792/1 1155/793/1 1147/785/1 1146/784/1 
+f 1155/793/1 1156/794/1 1148/786/1 1147/785/1 
+f 1156/794/1 1157/795/1 1149/787/1 1148/786/1 
+f 1157/795/1 993/619/1 430/373/1 1149/787/1 
+f 442/385/1 1150/788/1 1158/796/1 1029/655/1 
+f 1150/788/1 1151/789/1 1159/797/1 1158/796/1 
+f 1151/789/1 1152/790/1 1160/798/1 1159/797/1 
+f 1152/790/1 1153/791/1 1161/799/1 1160/798/1 
+f 1153/791/1 431/374/1 994/620/1 1161/799/1 
+f 1101/730/1 1162/800/1 1154/792/1 1098/726/1 
+f 1162/800/1 1163/801/1 1155/793/1 1154/792/1 
+f 1163/801/1 1164/802/1 1156/794/1 1155/793/1 
+f 1164/802/1 1165/803/1 1157/795/1 1156/794/1 
+f 1165/803/1 995/621/1 993/619/1 1157/795/1 
+f 1029/655/1 1158/796/1 1166/804/1 1031/657/1 
+f 1158/796/1 1159/797/1 1167/805/1 1166/804/1 
+f 1159/797/1 1160/798/1 1168/806/1 1167/805/1 
+f 1160/798/1 1161/799/1 1169/807/1 1168/806/1 
+f 1161/799/1 994/620/1 996/622/1 1169/807/1 
+f 1103/732/1 1170/808/1 1162/800/1 1101/730/1 
+f 1170/808/1 1171/809/1 1163/801/1 1162/800/1 
+f 1171/809/1 1172/810/1 1164/802/1 1163/801/1 
+f 1172/810/1 1173/811/1 1165/803/1 1164/802/1 
+f 1173/811/1 997/623/1 995/621/1 1165/803/1 
+f 1031/657/1 1166/804/1 1174/812/1 1033/659/1 
+f 1166/804/1 1167/805/1 1175/813/1 1174/812/1 
+f 1167/805/1 1168/806/1 1176/814/1 1175/813/1 
+f 1168/806/1 1169/807/1 1177/815/1 1176/814/1 
+f 1169/807/1 996/622/1 998/624/1 1177/815/1 
+f 1105/734/1 1178/816/1 1170/808/1 1103/732/1 
+f 1178/816/1 1179/817/1 1171/809/1 1170/808/1 
+f 1179/817/1 1180/818/1 1172/810/1 1171/809/1 
+f 1180/818/1 1181/819/1 1173/811/1 1172/810/1 
+f 1181/819/1 999/625/1 997/623/1 1173/811/1 
+f 1033/659/1 1174/812/1 1182/820/1 1035/661/1 
+f 1174/812/1 1175/813/1 1183/821/1 1182/820/1 
+f 1175/813/1 1176/814/1 1184/822/1 1183/821/1 
+f 1176/814/1 1177/815/1 1185/823/1 1184/822/1 
+f 1177/815/1 998/624/1 1000/626/1 1185/823/1 
+f 443/386/1 1108/746/1 1178/816/1 1105/734/1 
+f 1108/746/1 1110/748/1 1179/817/1 1178/816/1 
+f 1110/748/1 1112/750/1 1180/818/1 1179/817/1 
+f 1112/750/1 1114/752/1 1181/819/1 1180/818/1 
+f 1114/752/1 102/102/1 999/625/1 1181/819/1 
+f 1035/661/1 1182/820/1 1115/753/1 416/361/1 
+f 1182/820/1 1183/821/1 1117/755/1 1115/753/1 
+f 1183/821/1 1184/822/1 1119/757/1 1117/755/1 
+f 1184/822/1 1185/823/1 1121/759/1 1119/757/1 
+f 1185/823/1 1000/626/1 101/101/1 1121/759/1 
+f 1037/663/1 1186/824/1 1187/825/1 1038/664/1 
+f 1186/824/1 1188/826/1 1189/827/1 1187/825/1 
+f 1188/826/1 1190/828/1 1191/829/1 1189/827/1 
+f 1190/828/1 1192/830/1 1193/831/1 1191/829/1 
+f 1192/830/1 1001/627/1 1004/630/1 1193/831/1 
+f 1090/717/1 1194/832/1 1195/833/1 1091/718/1 
+f 1194/832/1 1196/834/1 1197/835/1 1195/833/1 
+f 1196/834/1 1198/836/1 1199/837/1 1197/835/1 
+f 1198/836/1 1200/838/1 1201/839/1 1199/837/1 
+f 1200/838/1 1003/629/1 1002/628/1 1201/839/1 
+f 1041/667/1 1202/840/1 1186/824/1 1037/663/1 
+f 1202/840/1 1203/841/1 1188/826/1 1186/824/1 
+f 1203/841/1 1204/842/1 1190/828/1 1188/826/1 
+f 1204/842/1 1205/843/1 1192/830/1 1190/828/1 
+f 1205/843/1 1005/631/1 1001/627/1 1192/830/1 
+f 1091/718/1 1195/833/1 1206/844/1 1093/720/1 
+f 1195/833/1 1197/835/1 1207/845/1 1206/844/1 
+f 1197/835/1 1199/837/1 1208/846/1 1207/845/1 
+f 1199/837/1 1201/839/1 1209/847/1 1208/846/1 
+f 1201/839/1 1002/628/1 1006/632/1 1209/847/1 
+f 1044/670/1 1210/848/1 1202/840/1 1041/667/1 
+f 1210/848/1 1211/849/1 1203/841/1 1202/840/1 
+f 1211/849/1 1212/850/1 1204/842/1 1203/841/1 
+f 1212/850/1 1213/851/1 1205/843/1 1204/842/1 
+f 1213/851/1 1007/633/1 1005/631/1 1205/843/1 
+f 1093/720/1 1206/844/1 1214/852/1 1095/722/1 
+f 1206/844/1 1207/845/1 1215/853/1 1214/852/1 
+f 1207/845/1 1208/846/1 1216/854/1 1215/853/1 
+f 1208/846/1 1209/847/1 1217/855/1 1216/854/1 
+f 1209/847/1 1006/632/1 1008/634/1 1217/855/1 
+f 1046/672/1 1218/856/1 1210/848/1 1044/670/1 
+f 1218/856/1 1219/857/1 1211/849/1 1210/848/1 
+f 1219/857/1 1220/858/1 1212/850/1 1211/849/1 
+f 1220/858/1 1221/859/1 1213/851/1 1212/850/1 
+f 1221/859/1 1009/635/1 1007/633/1 1213/851/1 
+f 1095/722/1 1214/852/1 1222/860/1 1096/723/1 
+f 1214/852/1 1215/853/1 1223/861/1 1222/860/1 
+f 1215/853/1 1216/854/1 1224/862/1 1223/861/1 
+f 1216/854/1 1217/855/1 1225/863/1 1224/862/1 
+f 1217/855/1 1008/634/1 1010/636/1 1225/863/1 
+f 413/358/1 1116/754/1 1218/856/1 1046/672/1 
+f 1116/754/1 1118/756/1 1219/857/1 1218/856/1 
+f 1118/756/1 1120/758/1 1220/858/1 1219/857/1 
+f 1120/758/1 1122/760/1 1221/859/1 1220/858/1 
+f 1122/760/1 100/100/1 1009/635/1 1221/859/1 
+f 1096/723/1 1222/860/1 1107/745/1 446/389/1 
+f 1222/860/1 1223/861/1 1109/747/1 1107/745/1 
+f 1223/861/1 1224/862/1 1111/749/1 1109/747/1 
+f 1224/862/1 1225/863/1 1113/751/1 1111/749/1 
+f 1225/863/1 1010/636/1 99/99/1 1113/751/1 
+f 1106/744/1 369/319/1 372/322/1 1143/781/1 
+f 1143/781/1 372/322/1 371/321/1 1144/782/1 
+f 1144/782/1 371/321/1 374/324/1 1145/783/1 
+f 1145/783/1 374/324/1 373/323/1 411/356/1 
 f 411/356/1 373/323/1 386/336/1 412/357/1 
-f 412/357/1 386/336/1 385/335/1 1141/776/1 
-f 1141/776/1 385/335/1 384/334/1 1140/775/1 
-f 1140/775/1 384/334/1 382/332/1 1139/774/1 
-f 1139/774/1 382/332/1 380/330/1 1138/773/1 
-f 1138/773/1 380/330/1 426/370/1 425/369/1 
-f 1225/860/1 1226/861/1 205/163/1 204/162/1 
-f 1227/862/1 1228/863/1 1226/861/1 1225/860/1 
-f 1229/864/1 1230/865/1 1228/863/1 1227/862/1 
-f 1231/866/1 1232/867/1 1230/865/1 1229/864/1 
-f 1233/868/1 1234/869/1 364/314/1 388/338/1 
-f 1235/870/1 1236/871/1 1237/872/1 1238/873/1 
-f 221/179/1 220/178/1 1236/871/1 1235/870/1 
+f 412/357/1 386/336/1 385/335/1 1142/780/1 
+f 1142/780/1 385/335/1 384/334/1 1141/779/1 
+f 1141/779/1 384/334/1 382/332/1 1140/778/1 
+f 1140/778/1 382/332/1 380/330/1 1139/777/1 
+f 1139/777/1 380/330/1 426/370/1 425/369/1 
+f 1226/864/1 1227/865/1 205/163/1 204/162/1 
+f 1228/866/1 1229/867/1 1227/865/1 1226/864/1 
+f 1230/868/1 1231/869/1 1229/867/1 1228/866/1 
+f 1232/870/1 1233/871/1 1231/869/1 1230/868/1 
+f 1234/872/1 1235/873/1 364/314/1 388/338/1 
+f 1236/874/1 1237/875/1 1238/876/1 1239/877/1 
+f 221/179/1 220/178/1 1237/875/1 1236/874/1 
 f 221/179/1 359/309/1 356/306/1 222/180/1 
-f 1226/861/1 347/297/1 283/240/1 205/163/1 
-f 348/298/1 1228/863/1 351/301/1 
-f 1230/865/1 352/302/1 351/301/1 1228/863/1 
-f 1232/867/1 355/305/1 352/302/1 1230/865/1 
-f 223/181/1 222/180/1 1232/867/1 1231/866/1 
-f 222/180/1 356/306/1 355/305/1 1232/867/1 
-f 1235/870/1 360/310/1 359/309/1 221/179/1 
-f 1238/873/1 365/315/1 360/310/1 1235/870/1 
-f 388/338/1 387/337/1 1239/874/1 1233/868/1 
-f 387/337/1 1238/873/1 1237/872/1 1239/874/1 
-f 387/337/1 366/316/1 365/315/1 1238/873/1 
+f 1227/865/1 347/297/1 283/240/1 205/163/1 
+f 348/298/1 1229/867/1 351/301/1 
+f 1231/869/1 352/302/1 351/301/1 1229/867/1 
+f 1233/871/1 355/305/1 352/302/1 1231/869/1 
+f 223/181/1 222/180/1 1233/871/1 1232/870/1 
+f 222/180/1 356/306/1 355/305/1 1233/871/1 
+f 1236/874/1 360/310/1 359/309/1 221/179/1 
+f 1239/877/1 365/315/1 360/310/1 1236/874/1 
+f 388/338/1 387/337/1 1240/878/1 1234/872/1 
+f 387/337/1 1239/877/1 1238/876/1 1240/878/1 
+f 387/337/1 366/316/1 365/315/1 1239/877/1 
 f 363/313/1 388/338/1 364/314/1 
-f 493/439/1 492/438/1 364/440/1 1234/875/1 
-f 486/432/1 485/431/1 1240/876/1 1241/877/1 
-f 597/878/1 1242/879/1 1243/880/1 1244/881/1 
-f 596/882/1 597/878/1 1244/881/1 1245/883/1 
-f 56/56/1 596/882/1 1245/883/1 57/57/1 
-f 1246/884/1 1247/885/1 1248/886/1 590/887/1 
-f 1249/888/1 1246/884/1 590/887/1 591/889/1 
-f 58/58/1 1249/888/1 591/889/1 55/55/1 
-f 67/67/1 527/466/1 69/69/1 
-f 66/66/1 531/470/1 524/463/1 
-f 524/463/1 527/466/1 67/67/1 66/66/1 
-f 66/66/1 532/471/1 531/470/1 
-f 553/480/36 1250/890/63 1251/891/64 554/481/37 
-f 555/482/38 71/71/6 74/74/1 552/479/35 
-f 549/476/1 1252/892/1 1253/893/1 550/477/1 
-f 551/478/1 73/73/1 72/72/1 548/475/1 
-f 8/8/1 7/7/1 1254/894/1 441/384/1 
-f 275/233/1 1255/895/1 1256/896/1 276/234/1 
-f 1255/895/1 1257/897/1 1258/898/1 1256/896/1 
+f 493/439/1 492/438/1 364/440/1 1235/879/1 
+f 486/432/1 485/431/1 1241/880/1 1242/881/1 
+f 595/882/1 1243/883/1 1244/884/1 1245/885/1 
+f 594/886/1 595/882/1 1245/885/1 1246/887/1 
+f 56/56/1 594/886/1 1246/887/1 57/57/1 
+f 1247/888/1 1248/889/1 1249/890/1 588/891/1 
+f 1250/892/1 1247/888/1 588/891/1 589/893/1 
+f 58/58/1 1250/892/1 589/893/1 55/55/1 
+f 67/67/1 525/467/1 69/69/1 
+f 66/66/1 529/471/1 522/464/1 
+f 522/464/1 525/467/1 67/67/1 66/66/1 
+f 66/66/1 530/472/1 529/471/1 
+f 551/481/36 1251/894/63 1252/895/64 552/482/37 
+f 553/483/38 71/71/6 74/74/1 550/480/35 
+f 547/477/1 1253/896/1 1254/897/1 548/478/1 
+f 549/479/1 73/73/1 72/72/1 546/476/1 
+f 8/8/1 7/7/1 1255/898/1 441/384/1 
+f 275/233/1 1256/899/1 1257/900/1 276/234/1 
+f 1256/899/1 1258/901/1 1259/902/1 1257/900/1 
 f 340/292/1 8/8/1 441/384/1 440/383/1 
-f 1259/899/1 1260/900/1 1261/901/1 1262/902/1 
+f 1260/903/1 1261/904/1 1262/905/1 1263/906/1 
 f 433/376/1 432/375/1 406/354/1 405/353/1 
-f 1263/903/1 1264/904/1 1265/905/1 1266/906/1 
-f 1055/678/1 1054/677/1 1018/641/1 1021/644/1 
-f 1267/907/1 1263/903/1 1266/906/1 1268/908/1 
-f 1054/677/1 1058/681/1 1022/645/1 1018/641/1 
-f 1269/909/1 1267/907/1 1268/908/1 1270/910/1 
-f 1058/681/1 1060/683/1 1024/647/1 1022/645/1 
-f 1271/911/1 1269/909/1 1270/910/1 1272/912/1 
-f 1060/683/1 1062/685/1 1026/649/1 1024/647/1 
-f 1260/900/1 1271/911/1 1272/912/1 1261/901/1 
-f 1062/685/1 433/376/1 405/353/1 1026/649/1 
-f 1065/688/1 340/292/1 440/383/1 1011/634/1 
-f 1257/897/1 1273/913/1 1274/914/1 1258/898/1 
-f 1067/690/1 1065/688/1 1011/634/1 1013/636/1 
-f 1273/913/1 1275/915/1 1276/916/1 1274/914/1 
-f 1069/692/1 1067/690/1 1013/636/1 1015/638/1 
-f 1275/915/1 1277/917/1 1278/918/1 1276/916/1 
-f 1071/694/1 1069/692/1 1015/638/1 1017/640/1 
-f 1277/917/1 1279/919/1 1280/920/1 1278/918/1 
-f 432/375/1 1071/694/1 1017/640/1 406/354/1 
-f 1279/919/1 1259/899/1 1262/902/1 1280/920/1 
-f 7/7/1 338/291/1 337/290/1 1254/894/1 
-f 6/6/1 1281/921/1 338/291/1 7/7/1 
-f 326/284/1 1282/922/1 1283/923/1 1284/924/1 327/285/1 
-f 1285/925/1 1286/926/1 1281/921/1 6/6/1 
-f 1287/927/1 1288/928/1 1286/926/1 1285/925/1 
-f 1289/929/1 1290/930/1 1288/928/1 1287/927/1 
-f 278/236/1 1290/930/1 1289/929/1 275/233/1 
-f 331/286/1 1291/931/1 1292/932/1 332/287/1 
-f 1291/931/1 1293/933/1 1294/934/1 1292/932/1 
-f 1293/933/1 1295/935/1 1296/936/1 1294/934/1 
-f 1295/935/1 277/235/1 276/234/1 1296/936/1 
-f 3/3/1 1291/931/1 331/286/1 4/4/1 
-f 1293/933/1 1291/931/1 3/3/1 1297/937/1 
-f 1295/935/1 1293/933/1 1297/937/1 1298/938/1 
-f 277/235/1 1295/935/1 1298/938/1 334/288/1 
-f 1299/939/1 1284/924/1 1281/921/1 1286/926/1 
-f 1300/940/1 1299/939/1 1286/926/1 1288/928/1 
-f 1301/941/1 1300/940/1 1288/928/1 1290/930/1 
-f 335/289/1 1301/941/1 1290/930/1 278/236/1 
-f 1292/932/1 1302/942/1 231/943/1 332/287/1 
-f 1294/934/1 1303/944/1 1302/942/1 1292/932/1 
-f 1296/936/1 1304/945/1 1303/944/1 1294/934/1 
-f 276/234/1 1256/896/1 1304/945/1 1296/936/1 
-f 1305/946/1 1285/925/1 6/6/1 5/5/1 
-f 1306/947/1 1287/927/1 1285/925/1 1305/946/1 
-f 1307/948/1 1289/929/1 1287/927/1 1306/947/1 
-f 1255/895/1 275/233/1 1289/929/1 1307/948/1 
-f 1302/942/1 1308/949/1 228/950/1 231/943/1 
-f 1303/944/1 1309/951/1 1308/949/1 1302/942/1 
-f 1304/945/1 1310/952/1 1309/951/1 1303/944/1 
-f 1256/896/1 1258/898/1 1310/952/1 1304/945/1 
-f 1311/953/1 1305/946/1 5/5/1 341/293/1 
-f 1312/954/1 1306/947/1 1305/946/1 1311/953/1 
-f 1313/955/1 1307/948/1 1306/947/1 1312/954/1 
-f 1257/897/1 1255/895/1 1307/948/1 1313/955/1 
-f 1314/956/1 1315/957/1 1316/958/1 1317/959/1 
-f 1318/960/1 1319/961/1 1315/957/1 1314/956/1 
-f 1320/962/1 1321/963/1 1319/961/1 1318/960/1 
-f 1262/902/1 1261/901/1 1321/963/1 1320/962/1 
-f 1322/964/1 1323/965/1 435/378/1 434/377/1 
-f 1324/966/1 1325/967/1 1323/965/1 1322/964/1 
-f 1326/968/1 1327/969/1 1325/967/1 1324/966/1 
-f 1260/900/1 1259/899/1 1327/969/1 1326/968/1 
-f 1328/970/1 1329/971/1 1330/972/1 1331/973/1 
-f 1332/974/1 1333/975/1 1329/971/1 1328/970/1 
-f 1334/976/1 1335/977/1 1333/975/1 1332/974/1 
-f 1266/906/1 1265/905/1 1335/977/1 1334/976/1 
-f 1336/978/1 1337/979/1 1057/680/1 1056/679/1 
-f 1338/980/1 1339/981/1 1337/979/1 1336/978/1 
-f 1340/982/1 1341/983/1 1339/981/1 1338/980/1 
-f 1264/904/1 1263/903/1 1341/983/1 1340/982/1 
-f 1342/984/1 1328/970/1 1331/973/1 1343/985/1 
-f 1344/986/1 1332/974/1 1328/970/1 1342/984/1 
-f 1345/987/1 1334/976/1 1332/974/1 1344/986/1 
-f 1268/908/1 1266/906/1 1334/976/1 1345/987/1 
-f 1337/979/1 1346/988/1 1059/682/1 1057/680/1 
-f 1339/981/1 1347/989/1 1346/988/1 1337/979/1 
-f 1341/983/1 1348/990/1 1347/989/1 1339/981/1 
-f 1263/903/1 1267/907/1 1348/990/1 1341/983/1 
-f 1349/991/1 1342/984/1 1343/985/1 1350/992/1 
-f 1351/993/1 1344/986/1 1342/984/1 1349/991/1 
-f 1352/994/1 1345/987/1 1344/986/1 1351/993/1 
-f 1270/910/1 1268/908/1 1345/987/1 1352/994/1 
-f 1346/988/1 1353/995/1 1061/684/1 1059/682/1 
-f 1347/989/1 1354/996/1 1353/995/1 1346/988/1 
-f 1348/990/1 1355/997/1 1354/996/1 1347/989/1 
-f 1267/907/1 1269/909/1 1355/997/1 1348/990/1 
-f 1356/998/1 1349/991/1 1350/992/1 1357/999/1 
-f 1358/1000/1 1351/993/1 1349/991/1 1356/998/1 
-f 1359/1001/1 1352/994/1 1351/993/1 1358/1000/1 
-f 1272/912/1 1270/910/1 1352/994/1 1359/1001/1 
-f 1353/995/1 1360/1002/1 1063/686/1 1061/684/1 
-f 1354/996/1 1361/1003/1 1360/1002/1 1353/995/1 
-f 1355/997/1 1362/1004/1 1361/1003/1 1354/996/1 
-f 1269/909/1 1271/911/1 1362/1004/1 1355/997/1 
-f 1315/957/1 1356/998/1 1357/999/1 1316/958/1 
-f 1319/961/1 1358/1000/1 1356/998/1 1315/957/1 
-f 1321/963/1 1359/1001/1 1358/1000/1 1319/961/1 
-f 1261/901/1 1272/912/1 1359/1001/1 1321/963/1 
-f 1360/1002/1 1322/964/1 434/377/1 1063/686/1 
-f 1361/1003/1 1324/966/1 1322/964/1 1360/1002/1 
-f 1362/1004/1 1326/968/1 1324/966/1 1361/1003/1 
-f 1271/911/1 1260/900/1 1326/968/1 1362/1004/1 
-f 1308/949/1 1363/1005/1 1364/1006/1 228/950/1 
-f 1309/951/1 1365/1007/1 1363/1005/1 1308/949/1 
-f 1310/952/1 1366/1008/1 1365/1007/1 1309/951/1 
-f 1258/898/1 1274/914/1 1366/1008/1 1310/952/1 
-f 1367/1009/1 1311/953/1 341/293/1 1064/687/1 
-f 1368/1010/1 1312/954/1 1311/953/1 1367/1009/1 
-f 1369/1011/1 1313/955/1 1312/954/1 1368/1010/1 
-f 1273/913/1 1257/897/1 1313/955/1 1369/1011/1 
-f 1363/1005/1 1370/1012/1 1371/1013/1 1364/1006/1 
-f 1365/1007/1 1372/1014/1 1370/1012/1 1363/1005/1 
-f 1366/1008/1 1373/1015/1 1372/1014/1 1365/1007/1 
-f 1274/914/1 1276/916/1 1373/1015/1 1366/1008/1 
-f 1374/1016/1 1367/1009/1 1064/687/1 1066/689/1 
-f 1375/1017/1 1368/1010/1 1367/1009/1 1374/1016/1 
-f 1376/1018/1 1369/1011/1 1368/1010/1 1375/1017/1 
-f 1275/915/1 1273/913/1 1369/1011/1 1376/1018/1 
-f 1370/1012/1 1377/1019/1 1378/1020/1 1371/1013/1 
-f 1372/1014/1 1379/1021/1 1377/1019/1 1370/1012/1 
-f 1373/1015/1 1380/1022/1 1379/1021/1 1372/1014/1 
-f 1276/916/1 1278/918/1 1380/1022/1 1373/1015/1 
-f 1381/1023/1 1374/1016/1 1066/689/1 1068/691/1 
-f 1382/1024/1 1375/1017/1 1374/1016/1 1381/1023/1 
-f 1383/1025/1 1376/1018/1 1375/1017/1 1382/1024/1 
-f 1277/917/1 1275/915/1 1376/1018/1 1383/1025/1 
-f 1377/1019/1 1384/1026/1 1385/1027/1 1378/1020/1 
-f 1379/1021/1 1386/1028/1 1384/1026/1 1377/1019/1 
-f 1380/1022/1 1387/1029/1 1386/1028/1 1379/1021/1 
-f 1278/918/1 1280/920/1 1387/1029/1 1380/1022/1 
-f 1388/1030/1 1381/1023/1 1068/691/1 1070/693/1 
-f 1389/1031/1 1382/1024/1 1381/1023/1 1388/1030/1 
-f 1390/1032/1 1383/1025/1 1382/1024/1 1389/1031/1 
-f 1279/919/1 1277/917/1 1383/1025/1 1390/1032/1 
-f 1384/1026/1 1314/956/1 1317/959/1 1385/1027/1 
-f 1386/1028/1 1318/960/1 1314/956/1 1384/1026/1 
-f 1387/1029/1 1320/962/1 1318/960/1 1386/1028/1 
-f 1280/920/1 1262/902/1 1320/962/1 1387/1029/1 
-f 1323/965/1 1388/1030/1 1070/693/1 435/378/1 
-f 1325/967/1 1389/1031/1 1388/1030/1 1323/965/1 
-f 1327/969/1 1390/1032/1 1389/1031/1 1325/967/1 
-f 1259/899/1 1279/919/1 1390/1032/1 1327/969/1 
-f 1284/924/1 1299/939/1 317/275/1 327/285/1 
-f 1299/939/1 1300/940/1 316/274/1 317/275/1 
-f 1300/940/1 1301/941/1 319/277/1 316/274/1 
-f 1301/941/1 335/289/1 318/276/1 319/277/1 
+f 1264/907/1 1265/908/1 1266/909/1 1267/910/1 
+f 1056/682/1 1055/681/1 1019/645/1 1022/648/1 
+f 1268/911/1 1264/907/1 1267/910/1 1269/912/1 
+f 1055/681/1 1059/685/1 1023/649/1 1019/645/1 
+f 1270/913/1 1268/911/1 1269/912/1 1271/914/1 
+f 1059/685/1 1061/687/1 1025/651/1 1023/649/1 
+f 1272/915/1 1270/913/1 1271/914/1 1273/916/1 
+f 1061/687/1 1063/689/1 1027/653/1 1025/651/1 
+f 1261/904/1 1272/915/1 1273/916/1 1262/905/1 
+f 1063/689/1 433/376/1 405/353/1 1027/653/1 
+f 1066/692/1 340/292/1 440/383/1 1012/638/1 
+f 1258/901/1 1274/917/1 1275/918/1 1259/902/1 
+f 1068/694/1 1066/692/1 1012/638/1 1014/640/1 
+f 1274/917/1 1276/919/1 1277/920/1 1275/918/1 
+f 1070/696/1 1068/694/1 1014/640/1 1016/642/1 
+f 1276/919/1 1278/921/1 1279/922/1 1277/920/1 
+f 1072/698/1 1070/696/1 1016/642/1 1018/644/1 
+f 1278/921/1 1280/923/1 1281/924/1 1279/922/1 
+f 432/375/1 1072/698/1 1018/644/1 406/354/1 
+f 1280/923/1 1260/903/1 1263/906/1 1281/924/1 
+f 7/7/1 338/291/1 337/290/1 1255/898/1 
+f 6/6/1 1282/925/1 338/291/1 7/7/1 
+f 326/284/1 1283/926/1 1284/927/1 1285/928/1 327/285/1 
+f 1286/929/1 1287/930/1 1282/925/1 6/6/1 
+f 1288/931/1 1289/932/1 1287/930/1 1286/929/1 
+f 1290/933/1 1291/934/1 1289/932/1 1288/931/1 
+f 278/236/1 1291/934/1 1290/933/1 275/233/1 
+f 331/286/1 1292/935/1 1293/936/1 332/287/1 
+f 1292/935/1 1294/937/1 1295/938/1 1293/936/1 
+f 1294/937/1 1296/939/1 1297/940/1 1295/938/1 
+f 1296/939/1 277/235/1 276/234/1 1297/940/1 
+f 3/3/1 1292/935/1 331/286/1 4/4/1 
+f 1294/937/1 1292/935/1 3/3/1 1298/941/1 
+f 1296/939/1 1294/937/1 1298/941/1 1299/942/1 
+f 277/235/1 1296/939/1 1299/942/1 334/288/1 
+f 1300/943/1 1285/928/1 1282/925/1 1287/930/1 
+f 1301/944/1 1300/943/1 1287/930/1 1289/932/1 
+f 1302/945/1 1301/944/1 1289/932/1 1291/934/1 
+f 335/289/1 1302/945/1 1291/934/1 278/236/1 
+f 1293/936/1 1303/946/1 231/947/1 332/287/1 
+f 1295/938/1 1304/948/1 1303/946/1 1293/936/1 
+f 1297/940/1 1305/949/1 1304/948/1 1295/938/1 
+f 276/234/1 1257/900/1 1305/949/1 1297/940/1 
+f 1306/950/1 1286/929/1 6/6/1 5/5/1 
+f 1307/951/1 1288/931/1 1286/929/1 1306/950/1 
+f 1308/952/1 1290/933/1 1288/931/1 1307/951/1 
+f 1256/899/1 275/233/1 1290/933/1 1308/952/1 
+f 1303/946/1 1309/953/1 228/954/1 231/947/1 
+f 1304/948/1 1310/955/1 1309/953/1 1303/946/1 
+f 1305/949/1 1311/956/1 1310/955/1 1304/948/1 
+f 1257/900/1 1259/902/1 1311/956/1 1305/949/1 
+f 1312/957/1 1306/950/1 5/5/1 341/293/1 
+f 1313/958/1 1307/951/1 1306/950/1 1312/957/1 
+f 1314/959/1 1308/952/1 1307/951/1 1313/958/1 
+f 1258/901/1 1256/899/1 1308/952/1 1314/959/1 
+f 1315/960/1 1316/961/1 1317/962/1 1318/963/1 
+f 1319/964/1 1320/965/1 1316/961/1 1315/960/1 
+f 1321/966/1 1322/967/1 1320/965/1 1319/964/1 
+f 1263/906/1 1262/905/1 1322/967/1 1321/966/1 
+f 1323/968/1 1324/969/1 435/378/1 434/377/1 
+f 1325/970/1 1326/971/1 1324/969/1 1323/968/1 
+f 1327/972/1 1328/973/1 1326/971/1 1325/970/1 
+f 1261/904/1 1260/903/1 1328/973/1 1327/972/1 
+f 1329/974/1 1330/975/1 1331/976/1 1332/977/1 
+f 1333/978/1 1334/979/1 1330/975/1 1329/974/1 
+f 1335/980/1 1336/981/1 1334/979/1 1333/978/1 
+f 1267/910/1 1266/909/1 1336/981/1 1335/980/1 
+f 1337/982/1 1338/983/1 1058/684/1 1057/683/1 
+f 1339/984/1 1340/985/1 1338/983/1 1337/982/1 
+f 1341/986/1 1342/987/1 1340/985/1 1339/984/1 
+f 1265/908/1 1264/907/1 1342/987/1 1341/986/1 
+f 1343/988/1 1329/974/1 1332/977/1 1344/989/1 
+f 1345/990/1 1333/978/1 1329/974/1 1343/988/1 
+f 1346/991/1 1335/980/1 1333/978/1 1345/990/1 
+f 1269/912/1 1267/910/1 1335/980/1 1346/991/1 
+f 1338/983/1 1347/992/1 1060/686/1 1058/684/1 
+f 1340/985/1 1348/993/1 1347/992/1 1338/983/1 
+f 1342/987/1 1349/994/1 1348/993/1 1340/985/1 
+f 1264/907/1 1268/911/1 1349/994/1 1342/987/1 
+f 1350/995/1 1343/988/1 1344/989/1 1351/996/1 
+f 1352/997/1 1345/990/1 1343/988/1 1350/995/1 
+f 1353/998/1 1346/991/1 1345/990/1 1352/997/1 
+f 1271/914/1 1269/912/1 1346/991/1 1353/998/1 
+f 1347/992/1 1354/999/1 1062/688/1 1060/686/1 
+f 1348/993/1 1355/1000/1 1354/999/1 1347/992/1 
+f 1349/994/1 1356/1001/1 1355/1000/1 1348/993/1 
+f 1268/911/1 1270/913/1 1356/1001/1 1349/994/1 
+f 1357/1002/1 1350/995/1 1351/996/1 1358/1003/1 
+f 1359/1004/1 1352/997/1 1350/995/1 1357/1002/1 
+f 1360/1005/1 1353/998/1 1352/997/1 1359/1004/1 
+f 1273/916/1 1271/914/1 1353/998/1 1360/1005/1 
+f 1354/999/1 1361/1006/1 1064/690/1 1062/688/1 
+f 1355/1000/1 1362/1007/1 1361/1006/1 1354/999/1 
+f 1356/1001/1 1363/1008/1 1362/1007/1 1355/1000/1 
+f 1270/913/1 1272/915/1 1363/1008/1 1356/1001/1 
+f 1316/961/1 1357/1002/1 1358/1003/1 1317/962/1 
+f 1320/965/1 1359/1004/1 1357/1002/1 1316/961/1 
+f 1322/967/1 1360/1005/1 1359/1004/1 1320/965/1 
+f 1262/905/1 1273/916/1 1360/1005/1 1322/967/1 
+f 1361/1006/1 1323/968/1 434/377/1 1064/690/1 
+f 1362/1007/1 1325/970/1 1323/968/1 1361/1006/1 
+f 1363/1008/1 1327/972/1 1325/970/1 1362/1007/1 
+f 1272/915/1 1261/904/1 1327/972/1 1363/1008/1 
+f 1309/953/1 1364/1009/1 1365/1010/1 228/954/1 
+f 1310/955/1 1366/1011/1 1364/1009/1 1309/953/1 
+f 1311/956/1 1367/1012/1 1366/1011/1 1310/955/1 
+f 1259/902/1 1275/918/1 1367/1012/1 1311/956/1 
+f 1368/1013/1 1312/957/1 341/293/1 1065/691/1 
+f 1369/1014/1 1313/958/1 1312/957/1 1368/1013/1 
+f 1370/1015/1 1314/959/1 1313/958/1 1369/1014/1 
+f 1274/917/1 1258/901/1 1314/959/1 1370/1015/1 
+f 1364/1009/1 1371/1016/1 1372/1017/1 1365/1010/1 
+f 1366/1011/1 1373/1018/1 1371/1016/1 1364/1009/1 
+f 1367/1012/1 1374/1019/1 1373/1018/1 1366/1011/1 
+f 1275/918/1 1277/920/1 1374/1019/1 1367/1012/1 
+f 1375/1020/1 1368/1013/1 1065/691/1 1067/693/1 
+f 1376/1021/1 1369/1014/1 1368/1013/1 1375/1020/1 
+f 1377/1022/1 1370/1015/1 1369/1014/1 1376/1021/1 
+f 1276/919/1 1274/917/1 1370/1015/1 1377/1022/1 
+f 1371/1016/1 1378/1023/1 1379/1024/1 1372/1017/1 
+f 1373/1018/1 1380/1025/1 1378/1023/1 1371/1016/1 
+f 1374/1019/1 1381/1026/1 1380/1025/1 1373/1018/1 
+f 1277/920/1 1279/922/1 1381/1026/1 1374/1019/1 
+f 1382/1027/1 1375/1020/1 1067/693/1 1069/695/1 
+f 1383/1028/1 1376/1021/1 1375/1020/1 1382/1027/1 
+f 1384/1029/1 1377/1022/1 1376/1021/1 1383/1028/1 
+f 1278/921/1 1276/919/1 1377/1022/1 1384/1029/1 
+f 1378/1023/1 1385/1030/1 1386/1031/1 1379/1024/1 
+f 1380/1025/1 1387/1032/1 1385/1030/1 1378/1023/1 
+f 1381/1026/1 1388/1033/1 1387/1032/1 1380/1025/1 
+f 1279/922/1 1281/924/1 1388/1033/1 1381/1026/1 
+f 1389/1034/1 1382/1027/1 1069/695/1 1071/697/1 
+f 1390/1035/1 1383/1028/1 1382/1027/1 1389/1034/1 
+f 1391/1036/1 1384/1029/1 1383/1028/1 1390/1035/1 
+f 1280/923/1 1278/921/1 1384/1029/1 1391/1036/1 
+f 1385/1030/1 1315/960/1 1318/963/1 1386/1031/1 
+f 1387/1032/1 1319/964/1 1315/960/1 1385/1030/1 
+f 1388/1033/1 1321/966/1 1319/964/1 1387/1032/1 
+f 1281/924/1 1263/906/1 1321/966/1 1388/1033/1 
+f 1324/969/1 1389/1034/1 1071/697/1 435/378/1 
+f 1326/971/1 1390/1035/1 1389/1034/1 1324/969/1 
+f 1328/973/1 1391/1036/1 1390/1035/1 1326/971/1 
+f 1260/903/1 1280/923/1 1391/1036/1 1328/973/1 
+f 1285/928/1 1300/943/1 317/275/1 327/285/1 
+f 1300/943/1 1301/944/1 316/274/1 317/275/1 
+f 1301/944/1 1302/945/1 319/277/1 316/274/1 
+f 1302/945/1 335/289/1 318/276/1 319/277/1 
 f 335/289/1 334/288/1 314/272/1 318/276/1 
-f 334/288/1 1298/938/1 315/273/1 314/272/1 
-f 1298/938/1 1297/937/1 312/270/1 315/273/1 
-f 1297/937/1 3/3/1 313/271/1 312/270/1 
+f 334/288/1 1299/942/1 315/273/1 314/272/1 
+f 1299/942/1 1298/941/1 312/270/1 315/273/1 
+f 1298/941/1 3/3/1 313/271/1 312/270/1 
 f 2/2/1 313/271/1 3/3/1 
-f 310/268/1 309/267/1 1391/1033/1 1392/1034/1 
-f 1393/1035/1 284/241/1 281/244/1 280/1036/1 
-f 1394/1037/1 290/248/1 284/241/1 1393/1035/1 
-f 1395/1038/1 287/245/1 290/248/1 1394/1037/1 
-f 1396/1039/1 294/252/1 287/245/1 1395/1038/1 
-f 1397/1040/1 291/249/1 294/252/1 1396/1039/1 
-f 201/155/1 200/154/1 291/249/1 1397/1040/1 
-f 199/153/1 198/152/1 1398/1041/1 296/254/1 
-f 296/254/1 1398/1041/1 1399/1042/1 297/255/1 
-f 1399/1042/1 1400/1043/1 323/281/1 297/255/1 
-f 320/278/1 323/281/1 1400/1043/1 1401/1044/1 
-f 344/294/1 320/278/1 1401/1044/1 1402/1045/1 
-f 1402/1045/1 218/176/1 219/177/1 344/294/1 
-f 274/232/1 273/231/1 1403/1046/1 1404/1047/1 
-f 169/123/1 1405/1048/1 253/211/1 1406/1049/1 
-f 169/123/1 168/122/1 265/223/1 1405/1048/1 
-f 1407/1050/1 1403/1046/1 168/122/1 171/125/1 
-f 1408/1051/1 1406/1049/1 253/211/1 252/210/1 
-f 229/187/1 228/186/1 1364/1052/1 234/192/1 
-f 234/192/1 1364/1052/1 1371/1053/1 235/193/1 
-f 235/193/1 1371/1053/1 1378/1054/1 242/200/1 
-f 243/201/1 242/200/1 1378/1054/1 1385/1055/1 
-f 238/196/1 243/201/1 1385/1055/1 1317/1056/1 
-f 239/197/1 238/196/1 1317/1056/1 1316/1057/1 
-f 244/202/1 239/197/1 1316/1057/1 1357/1058/1 
-f 245/203/1 244/202/1 1357/1058/1 1350/1059/1 
-f 27/27/1 245/203/1 1350/1059/1 1343/1060/1 
-f 28/28/1 27/27/1 1343/1060/1 1331/1061/1 
-f 260/218/1 28/28/1 1331/1061/1 1330/1062/1 
-f 1330/1062/1 261/219/1 260/218/1 
-f 176/130/1 1409/1063/1 1410/1064/1 184/138/1 
-f 1408/1051/1 1411/1065/1 1412/1066/1 1413/1067/1 
-f 1411/1065/1 1414/1068/1 1415/1069/1 1412/1066/1 
-f 1414/1068/1 1416/1070/1 1417/1071/1 1415/1069/1 
-f 1416/1070/1 1418/1072/1 1419/1073/1 1417/1071/1 
-f 1418/1072/1 33/33/1 36/36/1 1419/1073/1 
-f 1420/1074/1 1421/1075/1 46/1076/1 45/1077/1 
-f 1422/1078/1 1423/1079/1 1421/1075/1 1420/1074/1 
-f 1424/1080/1 1425/1081/1 1423/1079/1 1422/1078/1 
-f 1426/1082/1 1427/1083/1 1425/1081/1 1424/1080/1 
-f 1426/1082/1 1428/1084/1 1429/1085/1 1427/1083/1 
-f 1428/1084/1 35/35/1 34/34/1 1429/1085/1 
-f 1409/1063/1 1430/1086/1 1431/1087/1 1410/1064/1 
-f 1430/1086/1 1432/1088/1 1433/1089/1 1431/1087/1 
-f 1432/1088/1 1434/1090/1 1435/1091/1 1433/1089/1 
-f 1434/1090/1 1436/1092/1 1437/1093/1 1435/1091/1 
-f 1436/1092/1 180/134/1 183/137/1 1437/1093/1 
-f 1438/1094/1 1439/1095/1 1440/1096/1 1441/1097/1 
-f 1442/1098/1 1438/1094/1 1441/1097/1 1443/1099/1 
-f 1444/1100/1 1442/1098/1 1443/1099/1 1445/1101/1 
-f 1446/1102/1 1444/1100/1 1445/1101/1 1447/1103/1 
-f 181/135/1 1446/1102/1 1447/1103/1 182/136/1 
-f 252/210/1 233/191/1 1411/1065/1 1408/1051/1 
-f 233/191/1 232/190/1 1414/1068/1 1411/1065/1 
-f 232/190/1 241/199/1 1416/1070/1 1414/1068/1 
-f 241/199/1 240/198/1 1418/1072/1 1416/1070/1 
-f 240/198/1 237/195/1 33/33/1 1418/1072/1 
+f 310/268/1 309/267/1 1392/1037/1 1393/1038/1 
+f 1394/1039/1 284/241/1 281/244/1 280/1040/1 
+f 1395/1041/1 290/248/1 284/241/1 1394/1039/1 
+f 1396/1042/1 287/245/1 290/248/1 1395/1041/1 
+f 1397/1043/1 294/252/1 287/245/1 1396/1042/1 
+f 1398/1044/1 291/249/1 294/252/1 1397/1043/1 
+f 201/155/1 200/154/1 291/249/1 1398/1044/1 
+f 199/153/1 198/152/1 1399/1045/1 296/254/1 
+f 296/254/1 1399/1045/1 1400/1046/1 297/255/1 
+f 1400/1046/1 1401/1047/1 323/281/1 297/255/1 
+f 320/278/1 323/281/1 1401/1047/1 1402/1048/1 
+f 344/294/1 320/278/1 1402/1048/1 1403/1049/1 
+f 1403/1049/1 218/176/1 219/177/1 344/294/1 
+f 274/232/1 273/231/1 1404/1050/1 1405/1051/1 
+f 169/123/1 1406/1052/1 253/211/1 1407/1053/1 
+f 169/123/1 168/122/1 265/223/1 1406/1052/1 
+f 1408/1054/1 1404/1050/1 168/122/1 171/125/1 
+f 1409/1055/1 1407/1053/1 253/211/1 252/210/1 
+f 229/187/1 228/186/1 1365/1056/1 234/192/1 
+f 234/192/1 1365/1056/1 1372/1057/1 235/193/1 
+f 235/193/1 1372/1057/1 1379/1058/1 242/200/1 
+f 243/201/1 242/200/1 1379/1058/1 1386/1059/1 
+f 238/196/1 243/201/1 1386/1059/1 1318/1060/1 
+f 239/197/1 238/196/1 1318/1060/1 1317/1061/1 
+f 244/202/1 239/197/1 1317/1061/1 1358/1062/1 
+f 245/203/1 244/202/1 1358/1062/1 1351/1063/1 
+f 27/27/1 245/203/1 1351/1063/1 1344/1064/1 
+f 28/28/1 27/27/1 1344/1064/1 1332/1065/1 
+f 260/218/1 28/28/1 1332/1065/1 1331/1066/1 
+f 1331/1066/1 261/219/1 260/218/1 
+f 176/130/1 1410/1067/1 1411/1068/1 184/138/1 
+f 1409/1055/1 1412/1069/1 1413/1070/1 1414/1071/1 
+f 1412/1069/1 1415/1072/1 1416/1073/1 1413/1070/1 
+f 1415/1072/1 1417/1074/1 1418/1075/1 1416/1073/1 
+f 1417/1074/1 1419/1076/1 1420/1077/1 1418/1075/1 
+f 1419/1076/1 33/33/1 36/36/1 1420/1077/1 
+f 1421/1078/1 1422/1079/1 46/1080/1 45/1081/1 
+f 1423/1082/1 1424/1083/1 1422/1079/1 1421/1078/1 
+f 1425/1084/1 1426/1085/1 1424/1083/1 1423/1082/1 
+f 1427/1086/1 1428/1087/1 1426/1085/1 1425/1084/1 
+f 1427/1086/1 1429/1088/1 1430/1089/1 1428/1087/1 
+f 1429/1088/1 35/35/1 34/34/1 1430/1089/1 
+f 1410/1067/1 1431/1090/1 1432/1091/1 1411/1068/1 
+f 1431/1090/1 1433/1092/1 1434/1093/1 1432/1091/1 
+f 1433/1092/1 1435/1094/1 1436/1095/1 1434/1093/1 
+f 1435/1094/1 1437/1096/1 1438/1097/1 1436/1095/1 
+f 1437/1096/1 180/134/1 183/137/1 1438/1097/1 
+f 1439/1098/1 1440/1099/1 1441/1100/1 1442/1101/1 
+f 1443/1102/1 1439/1098/1 1442/1101/1 1444/1103/1 
+f 1445/1104/1 1443/1102/1 1444/1103/1 1446/1105/1 
+f 1447/1106/1 1445/1104/1 1446/1105/1 1448/1107/1 
+f 181/135/1 1447/1106/1 1448/1107/1 182/136/1 
+f 252/210/1 233/191/1 1412/1069/1 1409/1055/1 
+f 233/191/1 232/190/1 1415/1072/1 1412/1069/1 
+f 232/190/1 241/199/1 1417/1074/1 1415/1072/1 
+f 241/199/1 240/198/1 1419/1076/1 1417/1074/1 
+f 240/198/1 237/195/1 33/33/1 1419/1076/1 
 f 237/195/1 236/194/1 34/34/1 33/33/1 
-f 236/194/1 247/205/1 1429/1085/1 34/34/1 
-f 247/205/1 246/204/1 1427/1083/1 1429/1085/1 
-f 246/204/1 26/26/1 1425/1081/1 1427/1083/1 
-f 26/26/1 25/25/1 1423/1079/1 1425/1081/1 
-f 1423/1079/1 25/25/1 254/212/1 1421/1075/1 
-f 1421/1075/1 254/212/1 257/215/1 46/1076/1 
-f 186/140/1 209/167/1 1448/1104/1 1449/1105/1 
-f 274/232/1 1404/1047/1 1450/1106/1 194/148/1 
-f 1451/1107/1 1452/1108/1 179/133/1 178/132/1 
-f 1453/1109/1 1407/1050/1 171/125/1 173/127/1 
-f 1454/1110/1 1449/1105/1 1451/1107/1 1455/1111/1 
-f 187/141/1 186/140/1 1449/1105/1 1454/1110/1 
-f 1453/1109/1 226/184/1 225/183/1 1407/1050/1 
-f 1452/1108/1 1451/1107/1 1449/1105/1 1448/1104/1 
-f 1403/1046/1 273/231/1 262/220/1 168/122/1 
+f 236/194/1 247/205/1 1430/1089/1 34/34/1 
+f 247/205/1 246/204/1 1428/1087/1 1430/1089/1 
+f 246/204/1 26/26/1 1426/1085/1 1428/1087/1 
+f 26/26/1 25/25/1 1424/1083/1 1426/1085/1 
+f 1424/1083/1 25/25/1 254/212/1 1422/1079/1 
+f 1422/1079/1 254/212/1 257/215/1 46/1080/1 
+f 186/140/1 209/167/1 1449/1108/1 1450/1109/1 
+f 274/232/1 1405/1051/1 1451/1110/1 194/148/1 
+f 1452/1111/1 1453/1112/1 179/133/1 178/132/1 
+f 1454/1113/1 1408/1054/1 171/125/1 173/127/1 
+f 1455/1114/1 1450/1109/1 1452/1111/1 1456/1115/1 
+f 187/141/1 186/140/1 1450/1109/1 1455/1114/1 
+f 1454/1113/1 226/184/1 225/183/1 1408/1054/1 
+f 1453/1112/1 1452/1111/1 1450/1109/1 1449/1108/1 
+f 1404/1050/1 273/231/1 262/220/1 168/122/1 
 f 262/220/1 265/223/1 168/122/1 
-f 1456/1112/1 1457/1113/1 1440/1096/1 1439/1095/1 
-f 81/81/1 77/77/1 80/80/1 208/1114/1 
-f 1458/1115/1 79/79/1 78/78/1 1459/1116/1 
+f 1457/1116/1 1458/1117/1 1441/1100/1 1440/1099/1 
+f 81/81/1 77/77/1 80/80/1 208/1118/1 
+f 1459/1119/1 79/79/1 78/78/1 1460/1120/1 
 f 78/78/1 77/77/1 83/83/1 85/85/1 
-f 1459/1116/1 78/78/1 85/85/1 141/119/1 
-f 224/182/1 227/185/1 80/1117/1 79/1118/1 
-f 1450/1106/1 1458/1119/1 195/149/1 194/148/1 
-f 1403/1046/1 1407/1050/1 225/183/1 1404/1047/1 
-f 224/182/1 1450/1106/1 1404/1047/1 225/183/1 
-f 79/1118/1 1458/1119/1 1450/1106/1 224/182/1 
-f 227/185/1 209/167/1 208/166/1 80/1117/1 
-f 1448/1104/1 209/167/1 227/185/1 226/184/1 
-f 1452/1108/1 1448/1104/1 226/184/1 1453/1109/1 
-f 173/127/1 179/133/1 1452/1108/1 1453/1109/1 
+f 1460/1120/1 78/78/1 85/85/1 141/119/1 
+f 224/182/1 227/185/1 80/1121/1 79/1122/1 
+f 1451/1110/1 1459/1123/1 195/149/1 194/148/1 
+f 1404/1050/1 1408/1054/1 225/183/1 1405/1051/1 
+f 224/182/1 1451/1110/1 1405/1051/1 225/183/1 
+f 79/1122/1 1459/1123/1 1451/1110/1 224/182/1 
+f 227/185/1 209/167/1 208/166/1 80/1121/1 
+f 1449/1108/1 209/167/1 227/185/1 226/184/1 
+f 1453/1112/1 1449/1108/1 226/184/1 1454/1113/1 
+f 173/127/1 179/133/1 1453/1112/1 1454/1113/1 
 f 172/126/1 174/128/1 179/133/1 173/127/1 
-f 1408/1051/1 1413/1067/1 175/129/1 1406/1049/1 
-f 1409/1063/1 176/130/1 175/129/1 1413/1067/1 
-f 1430/1086/1 1409/1063/1 1413/1067/1 1412/1066/1 
-f 1432/1088/1 1430/1086/1 1412/1066/1 1415/1069/1 
-f 1434/1090/1 1432/1088/1 1415/1069/1 1417/1071/1 
-f 1436/1092/1 1434/1090/1 1417/1071/1 1419/1073/1 
-f 180/134/1 1436/1092/1 1419/1073/1 36/36/1 
+f 1409/1055/1 1414/1071/1 175/129/1 1407/1053/1 
+f 1410/1067/1 176/130/1 175/129/1 1414/1071/1 
+f 1431/1090/1 1410/1067/1 1414/1071/1 1413/1070/1 
+f 1433/1092/1 1431/1090/1 1413/1070/1 1416/1073/1 
+f 1435/1094/1 1433/1092/1 1416/1073/1 1418/1075/1 
+f 1437/1096/1 1435/1094/1 1418/1075/1 1420/1077/1 
+f 180/134/1 1437/1096/1 1420/1077/1 36/36/1 
 f 181/135/1 180/134/1 36/36/1 35/35/1 
-f 1446/1102/1 181/135/1 35/35/1 1428/1084/1 
-f 1444/1100/1 1446/1102/1 1428/1084/1 1426/1082/1 
-f 1442/1098/1 1444/1100/1 1426/1082/1 1424/1080/1 
-f 1438/1094/1 1442/1098/1 1424/1080/1 1422/1078/1 
-f 1439/1095/1 1438/1094/1 1422/1078/1 1420/1074/1 
-f 1460/1120/1 1406/1049/1 175/129/1 1461/1121/1 
-f 169/123/1 1406/1049/1 1460/1120/1 170/124/1 
-f 174/128/1 172/126/1 1461/1121/1 175/129/1 
+f 1447/1106/1 181/135/1 35/35/1 1429/1088/1 
+f 1445/1104/1 1447/1106/1 1429/1088/1 1427/1086/1 
+f 1443/1102/1 1445/1104/1 1427/1086/1 1425/1084/1 
+f 1439/1098/1 1443/1102/1 1425/1084/1 1423/1082/1 
+f 1440/1099/1 1439/1098/1 1423/1082/1 1421/1078/1 
+f 1461/1124/1 1407/1053/1 175/129/1 1462/1125/1 
+f 169/123/1 1407/1053/1 1461/1124/1 170/124/1 
+f 174/128/1 172/126/1 1462/1125/1 175/129/1 
 s 3
 f 42/42/1 112/112/1 39/39/1 
 f 38/38/1 108/108/1 41/41/1 
 s 1
-f 1462/1122/1 1463/1123/1 1464/1124/1 134/1125/1 
-f 136/1126/65 1465/1127/7 1466/1128/66 1467/1129/67 
-f 1468/1130/68 1462/1122/69 134/1125/1 133/1131/1 
-f 48/48/70 1468/1130/65 133/1131/67 49/49/71 
-f 135/1132/3 136/1126/70 1467/1129/71 1469/1133/4 
-f 50/50/72 135/1132/68 1469/1133/1 47/47/65 
-f 1470/1134/5 1471/1135/72 1472/1136/65 159/1137/2 
-f 1473/1138/65 1470/1134/1 159/1137/73 158/1139/74 
-f 88/88/1 1473/1138/65 158/1139/74 89/89/75 
-f 1474/1140/1 1475/1141/75 1476/1142/8 157/1143/1 
-f 156/1144/76 157/1143/77 1476/1142/1 1477/1145/78 
-f 90/90/79 156/1144/76 1477/1145/78 87/87/80 
+f 1463/1126/1 1464/1127/1 1465/1128/1 134/1129/1 
+f 136/1130/65 1466/1131/7 1467/1132/66 1468/1133/67 
+f 1469/1134/68 1463/1126/69 134/1129/1 133/1135/1 
+f 48/48/70 1469/1134/65 133/1135/67 49/49/71 
+f 135/1136/3 136/1130/70 1468/1133/71 1470/1137/4 
+f 50/50/72 135/1136/68 1470/1137/1 47/47/65 
+f 1471/1138/5 1472/1139/72 1473/1140/65 159/1141/2 
+f 1474/1142/65 1471/1138/1 159/1141/73 158/1143/74 
+f 88/88/1 1474/1142/65 158/1143/74 89/89/75 
+f 1475/1144/1 1476/1145/75 1477/1146/8 157/1147/1 
+f 156/1148/76 157/1147/77 1477/1146/1 1478/1149/78 
+f 90/90/79 156/1148/76 1478/1149/78 87/87/80 
 s off
-f 1478/923/9 1283/923/79 1282/922/80 1479/922/7 
-f 1480/924/34 1284/924/34 1283/923/34 1478/923/34 
-f 1481/678/81 1055/678/81 1021/644/81 1482/644/81 
-f 1483/12/81 12/12/81 11/11/81 1484/11/81 
-f 1485/15/54 15/15/54 468/411/54 1486/411/54 
-f 1487/588/54 76/588/54 192/146/54 1488/146/54 
-f 1489/598/82 974/598/82 973/597/82 1490/597/82 
-f 1491/434/54 488/434/54 15/15/54 1485/15/54 
-f 1492/430/81 361/430/81 487/433/81 1493/433/81 
-f 1488/146/54 192/146/54 191/145/54 1494/145/54 
-f 1495/596/82 972/596/82 971/595/82 1496/595/82 
-f 1497/21/81 21/21/81 24/24/81 1498/24/81 
-f 1499/150/82 196/150/82 195/149/82 1500/149/82 
-f 1501/224/82 266/224/82 269/227/82 1502/227/82 
-f 1503/208/81 250/208/81 253/211/81 1504/211/81 
-f 1505/219/82 261/219/82 1330/1062/82 1506/1062/82 
-f 1507/30/81 30/30/81 441/384/81 1508/384/81 
-f 1494/159/82 191/159/82 196/158/82 1499/158/82 
-f 1509/267/82 309/267/82 1/1/82 1510/1/82 
-f 1511/1048/83 1405/1048/83 265/223/83 1512/223/83 
-f 1513/143/34 189/143/34 188/142/34 1514/142/34 
-f 1504/211/82 253/211/82 1405/1048/82 1511/1048/82 
-f 1515/139/84 185/139/84 184/138/84 1516/138/84 
-f 1517/1076/54 46/1076/54 257/215/54 1518/215/54 
-f 1519/1096/81 1440/1096/81 1457/1113/81 1520/1113/81 
-f 1521/38/54 38/38/54 37/37/54 1522/37/54 
-f 1523/40/85 40/40/85 39/39/85 1524/39/85 
-f 1525/108/86 108/108/86 38/38/86 1521/38/86 
-f 1524/39/87 39/39/87 112/112/87 1526/112/87 
-f 1527/113/88 113/113/88 108/108/88 1525/108/88 
-f 1528/109/89 109/109/89 113/113/89 1527/113/89 
-f 1526/112/90 112/112/90 114/114/90 1529/114/90 
-f 1530/45/91 45/45/91 40/40/91 1523/40/91 
-f 1522/37/92 37/37/92 46/46/92 1517/46/92 
-f 1531/1128/93 1466/1128/93 1465/1127/93 1532/1127/93 
-f 1533/1129/94 1467/1129/94 1466/1128/94 1531/1128/94 
-f 1534/1124/95 1464/1124/95 1463/1123/95 1535/1123/95 
-f 1536/1125/96 134/1125/96 1464/1124/96 1534/1124/96 
-f 1537/576/97 867/576/97 211/169/97 1538/169/97 
-f 1539/168/81 210/168/81 213/171/81 1540/171/81 
-f 1540/171/82 213/171/82 212/170/82 1541/170/82 
-f 1542/530/54 665/530/54 953/577/54 1543/577/54 
-f 1544/507/34 628/507/34 625/504/34 1545/504/34 
-f 1546/497/82 574/497/82 573/496/82 1547/496/82 
-f 1548/487/81 564/487/81 574/497/81 1546/497/81 
-f 1549/886/54 1248/886/54 1247/885/54 1550/885/54 
-f 1551/887/81 590/887/81 1248/886/81 1549/886/81 
-f 1552/880/98 1243/880/98 1242/879/98 1553/879/98 
-f 1554/881/82 1244/881/82 1243/880/82 1552/880/82 
-f 1547/496/44 573/496/44 575/498/44 1555/498/44 
-f 1556/489/81 566/489/81 63/63/81 1557/63/81 
-f 1558/61/82 61/61/82 64/64/82 1559/64/82 
-f 1557/63/54 63/63/54 62/62/54 1560/62/54 
-f 1561/66/34 66/66/34 65/65/34 1562/65/34 
-f 1563/68/99 68/68/99 67/67/99 1564/67/99 
-f 1565/471/100 532/471/100 66/66/100 1561/66/100 
-f 1566/473/82 534/473/82 533/472/82 1567/472/82 
-f 1568/70/101 70/70/101 529/468/101 1569/468/101 
-f 1570/481/81 554/481/81 1251/891/81 1571/891/81 
-f 1572/893/54 1253/893/54 1252/892/54 1573/892/54 
-f 1574/477/82 550/477/82 1253/893/82 1572/893/82 
-f 1571/891/34 1251/891/34 1250/890/34 1575/890/34 
-f 1576/75/81 75/75/81 68/68/81 1563/68/81 
-f 1562/65/34 65/65/34 76/76/34 1487/76/34 
-f 1577/81/54 81/81/54 208/1114/54 1578/1114/54 
-f 1579/1115/102 1458/1115/102 1459/1116/102 1580/1116/102 
-f 1581/82/103 82/82/103 81/81/103 1577/81/103 
-f 1580/1116/104 1459/1116/104 141/119/104 1582/119/104 
-f 1583/120/105 142/120/105 82/82/105 1581/82/105 
-f 1584/115/106 137/115/106 142/120/106 1583/120/106 
-f 1582/119/107 141/119/107 143/121/107 1585/121/107 
-f 1586/1141/108 1475/1141/108 1474/1140/108 1587/1140/108 
-f 1588/1142/109 1476/1142/109 1475/1141/109 1586/1141/109 
-f 1589/1136/54 1472/1136/54 1471/1135/54 1590/1135/54 
-f 1591/1137/110 159/1137/110 1472/1136/110 1589/1136/110 
-f 1592/93/34 93/93/34 92/92/34 1593/92/34 
-f 1594/95/82 95/95/82 98/98/82 1595/98/82 
-f 1596/97/111 97/97/111 96/96/111 1597/96/111 
-f 1598/894/112 1254/894/112 337/290/112 1599/290/112 
-f 1600/713/34 1089/713/34 972/712/34 1495/712/34 
-f 1601/106/81 1602/103/81 103/103/81 106/106/81 
-f 1603/105/113 105/105/113 104/104/113 1604/104/113 
-f 1605/110/114 110/110/114 43/43/114 1606/43/114 
-f 1607/44/115 44/44/115 107/107/115 1608/107/115 
-f 1529/114/116 114/114/116 111/111/116 1609/111/116 
-f 1610/110/117 116/110/117 110/110/117 1605/110/117 
-f 1609/111/118 111/111/118 115/111/118 1611/111/118 
-f 1612/44/119 118/44/119 44/44/119 1607/44/119 
-f 1606/43/120 43/43/120 117/43/120 1613/43/120 
-f 1614/109/121 120/109/121 109/109/121 1528/109/121 
-f 1608/107/122 107/107/122 119/107/122 1615/107/122 
-f 1610/110/123 1616/110/123 122/110/123 116/110/123 
-f 1611/111/124 115/111/124 121/111/124 1617/111/124 
-f 1612/44/125 1618/44/125 123/44/125 118/44/125 
-f 1619/43/126 129/43/126 132/43/126 1620/43/126 
-f 1614/109/127 1621/109/127 126/109/127 120/109/127 
-f 1615/107/128 119/107/128 125/107/128 1622/107/128 
-f 1623/44/129 1624/44/129 128/44/129 127/44/129 
-f 1613/43/130 117/43/130 124/43/130 1625/43/130 
-f 1623/44/131 127/44/131 123/44/131 1618/44/131 
-f 1625/43/132 124/43/132 130/43/132 1626/43/132 
-f 1626/43/133 130/43/133 129/43/133 1619/43/133 
-f 1624/44/134 1627/44/134 131/44/134 128/44/134 
-f 1627/44/135 1628/44/135 50/44/135 131/44/135 
-f 1620/43/136 132/43/136 49/43/136 1629/43/136 
-f 1616/110/137 1630/110/137 133/110/137 122/110/137 
-f 1617/111/138 121/111/138 134/111/138 1536/111/138 
-f 1621/109/139 1631/109/139 136/109/139 126/109/139 
-f 1622/107/140 125/107/140 135/107/140 1632/107/140 
-f 1633/86/141 86/86/141 138/116/141 1634/116/141 
-f 1635/117/142 139/117/142 84/84/142 1636/84/142 
-f 1585/121/143 143/121/143 140/118/143 1637/118/143 
-f 1634/116/144 138/116/144 145/116/144 1638/116/144 
-f 1639/115/145 144/115/145 137/115/145 1584/115/145 
-f 1640/86/146 146/86/146 86/86/146 1633/86/146 
-f 1636/84/147 84/84/147 147/84/147 1641/84/147 
-f 1642/117/148 148/117/148 139/117/148 1635/117/148 
-f 1637/118/81 140/118/81 149/118/81 1643/118/81 
-f 1638/116/82 145/116/82 150/116/82 1644/116/82 
-f 1639/115/149 1645/115/149 151/115/149 144/115/149 
-f 1640/86/150 1646/86/150 153/86/150 146/86/150 
-f 1641/84/81 147/84/81 152/84/81 1647/84/81 
-f 1642/117/82 1648/117/82 155/117/82 148/117/82 
-f 1643/118/150 149/118/150 154/118/150 1649/118/150 
-f 1650/116/149 1644/116/149 150/116/149 156/116/149 
-f 1651/115/151 157/115/151 151/115/151 1645/115/151 
-f 1652/117/152 158/117/152 155/117/152 1648/117/152 
-f 1591/118/153 1649/118/153 154/118/153 159/118/153 
-f 1646/86/154 1653/86/154 161/86/154 153/86/154 
-f 1647/84/155 152/84/155 160/84/155 1654/84/155 
-f 1653/86/156 1655/86/156 163/86/156 161/86/156 
-f 1654/84/109 160/84/109 162/84/109 1656/84/109 
-f 1655/86/157 1657/86/157 165/86/157 163/86/157 
-f 1656/84/81 162/84/81 164/84/81 1658/84/81 
-f 1657/86/82 1659/86/82 166/86/82 165/86/82 
-f 1660/84/158 167/84/158 89/84/158 1661/84/158 
-f 1662/86/159 90/86/159 166/86/159 1659/86/159 
-f 1658/84/160 164/84/160 167/84/160 1660/84/160 
-f 1663/124/161 170/124/161 1460/1120/161 1664/1120/161 
-f 1664/1120/54 1460/1120/54 1461/1121/54 1665/1121/54 
-f 1665/1121/162 1461/1121/162 172/126/162 1666/126/162 
-f 1666/126/34 172/126/34 170/124/34 1663/124/34 
-f 1578/166/163 208/166/163 189/143/163 1513/143/163 
-f 1667/131/82 177/131/82 185/139/82 1515/139/82 
-f 1668/132/82 178/132/82 177/131/82 1667/131/82 
-f 1669/1107/54 1451/1107/54 178/132/54 1668/132/54 
-f 1670/1074/164 1420/1074/164 45/1077/164 1530/1077/164 
-f 1671/1110/54 1454/1110/54 1455/1111/54 1672/1111/54 
-f 1672/1111/54 1455/1111/54 1451/1107/54 1669/1107/54 
-f 1673/147/165 193/147/165 491/437/165 1674/437/165 
-f 1675/439/54 493/439/54 1234/875/54 1676/875/54 
-f 1677/144/82 190/144/82 193/147/82 1673/147/82 
-f 1678/148/166 194/148/166 197/151/166 1679/151/166 
-f 1680/1035/167 1393/1035/167 280/1036/82 1681/1036/82 
-f 1682/162/82 204/162/82 203/161/82 1683/161/82 
-f 1683/161/82 203/161/82 207/165/82 1684/165/82 
-f 1685/229/82 271/229/82 274/232/82 1686/232/82 
-f 1684/165/82 207/165/82 218/176/82 1687/176/82 
-f 1688/860/82 1225/860/82 204/162/82 1682/162/82 
-f 1679/157/82 197/157/82 190/156/82 1677/156/82 
-f 1686/232/168 274/232/168 194/148/168 1678/148/168 
-f 1689/189/169 231/189/169 230/188/169 1690/188/169 
-f 1691/216/82 258/216/82 261/219/82 1505/219/82 
-f 1692/212/81 254/212/81 25/25/81 1693/25/81 
-f 1694/28/170 28/28/170 260/218/170 1695/218/170 
-f 1696/213/171 255/213/171 254/212/171 1692/212/171 
-f 1693/25/82 25/25/82 28/28/82 1694/28/82 
-f 1697/187/81 229/187/81 234/192/81 1698/192/81 
-f 1699/206/172 248/206/172 229/187/172 1697/187/172 
-f 1700/191/81 233/191/81 252/210/81 1701/210/81 
-f 1698/192/173 234/192/173 233/191/173 1700/191/173 
-f 1690/188/82 230/188/82 249/207/82 1702/207/82 
-f 1701/210/82 252/210/82 251/209/82 1703/209/82 
-f 1702/207/81 249/207/81 248/206/81 1699/206/81 
-f 1703/209/174 251/209/174 250/208/174 1503/208/174 
-f 1518/215/175 257/215/175 256/214/175 1704/214/175 
-f 1695/218/81 260/218/81 259/217/81 1705/217/81 
-f 1704/214/82 256/214/82 255/213/82 1696/213/82 
-f 1705/217/34 259/217/34 258/216/34 1691/216/34 
-f 1512/223/54 265/223/54 264/222/54 1706/222/54 
-f 1707/230/81 272/230/81 271/229/81 1685/229/81 
-f 1708/237/82 279/237/82 272/230/82 1707/230/82 
-f 1706/222/82 264/222/82 263/221/82 1709/221/82 
-f 1710/225/176 267/225/176 266/224/176 1501/224/176 
-f 1711/228/177 270/228/177 267/225/177 1710/225/177 
-f 1712/231/81 273/231/81 270/228/81 1711/228/81 
-f 1713/220/81 262/220/81 273/231/81 1712/231/81 
-f 1709/221/178 263/221/178 262/220/178 1713/220/178 
-f 1508/384/82 441/384/82 1254/894/82 1598/894/82 
-f 1502/227/34 269/227/34 268/226/34 1714/226/34 
-f 1681/237/34 280/237/34 279/237/34 1708/237/34 
-f 1714/226/82 268/226/82 286/226/82 1715/226/82 
-f 1716/164/54 206/164/54 202/160/54 1717/160/54 
-f 1718/177/81 219/177/81 206/164/81 1716/164/81 
-f 1719/271/54 313/271/54 2/2/54 1720/2/54 
-f 1721/241/81 284/241/81 290/248/81 1722/248/81 
-f 1715/243/81 286/243/81 285/242/81 1723/242/81 
-f 1724/268/81 310/268/81 1392/1034/81 1725/1034/81 
-f 1723/242/82 285/242/82 284/241/82 1721/241/82 
-f 1722/248/34 290/248/34 289/247/34 1726/247/34 
-f 1726/247/54 289/247/54 302/260/54 1727/260/54 
-f 1720/2/54 2/2/54 311/269/54 1728/269/54 
-f 1727/260/34 302/260/34 313/271/34 1719/271/34 
-f 1729/278/54 320/278/54 344/294/54 1730/294/54 
-f 1479/922/81 1282/922/81 326/284/81 1731/284/81 
-f 1732/279/82 321/279/82 320/278/82 1729/278/82 
-f 1733/282/34 324/282/34 321/279/34 1732/279/34 
-f 1731/284/34 326/284/34 324/282/34 1733/282/34 
-f 1734/4/34 4/4/34 331/286/34 1735/286/34 
-f 1736/291/54 338/291/54 1281/921/54 1737/921/54 
-f 1738/4/82 328/4/82 4/4/82 1734/4/82 
-f 1510/1/81 1/1/81 329/1/81 1739/1/81 
-f 1740/287/82 333/287/82 332/287/82 1741/287/82 
-f 1735/286/81 331/286/81 330/286/81 1742/286/81 
-f 1725/1034/179 1392/1034/179 1391/1033/179 1743/1033/179 
-f 1743/1033/54 1391/1033/54 309/267/54 1509/267/54 
-f 1737/921/180 1281/921/180 1284/924/180 1480/924/180 
-f 1599/290/34 337/290/34 336/290/34 1744/290/34 
-f 1745/291/34 339/291/34 338/291/34 1736/291/34 
-f 1744/290/54 336/290/54 339/291/54 1745/291/54 
-f 1741/287/82 332/287/82 231/943/82 1689/943/82 
-f 1717/160/83 202/160/83 282/239/83 1746/239/83 
-f 1747/177/181 342/177/181 219/177/181 1718/177/181 
-f 1730/294/34 344/294/34 343/294/34 1748/294/34 
-f 1748/294/54 343/294/54 342/177/54 1747/177/54 
-f 1749/296/81 346/296/81 12/12/81 1483/12/81 
-f 1750/328/54 378/328/54 377/327/54 1751/327/54 
-f 1752/312/34 362/312/34 361/311/34 1492/311/34 
-f 1753/334/81 384/334/81 385/335/81 1754/335/81 
-f 1755/325/82 375/325/82 378/328/82 1750/328/82 
-f 1756/316/81 366/316/81 363/313/81 1757/313/81 
-f 1757/313/81 363/313/81 362/312/81 1752/312/81 
-f 1758/317/54 367/317/54 366/316/54 1756/316/54 
-f 1759/333/34 383/333/34 384/334/34 1753/334/34 
-f 1754/335/54 385/335/54 367/317/54 1758/317/54 
-f 1760/297/34 347/297/34 346/296/34 1749/296/34 
-f 1761/240/54 283/240/54 347/297/54 1760/297/54 
-f 1746/239/81 282/239/81 389/239/81 1762/239/81 
-f 1763/240/54 390/240/54 283/240/54 1761/240/54 
-f 1762/239/34 389/239/34 390/240/34 1763/240/34 
-f 1764/499/81 600/499/81 1038/661/81 1765/661/81 
-f 1484/11/81 11/11/81 10/10/81 1766/10/81 
-f 1766/10/81 10/10/81 399/347/81 1767/347/81 
-f 1768/500/54 601/500/54 600/499/54 1764/499/54 
-f 1767/347/81 399/347/81 401/349/81 1769/349/81 
-f 1770/350/82 402/350/82 31/31/82 1771/31/82 
-f 1772/643/82 1020/643/82 604/503/82 1773/503/82 
-f 1482/644/81 1021/644/81 1020/643/81 1772/643/81 
-f 1774/350/34 408/350/34 402/350/34 1770/350/34 
-f 1775/345/54 400/345/54 408/350/54 1774/350/54 
-f 1769/349/82 401/349/82 400/348/82 1775/348/82 
-f 1776/30/54 410/30/54 30/30/54 1507/30/54 
-f 1771/31/182 31/31/182 409/31/182 1777/31/182 
-f 1751/327/183 377/327/183 376/326/183 1778/326/183 
-f 1778/326/82 376/326/82 379/329/82 1779/329/82 
-f 1779/329/82 379/329/82 381/331/82 1780/331/82 
-f 1780/331/82 381/331/82 383/333/82 1759/333/82 
-f 1781/828/82 1193/828/82 1089/713/82 1600/713/82 
-f 1765/661/81 1038/661/81 1037/660/81 1782/660/81 
-f 1783/364/81 419/364/81 422/367/81 1784/367/81 
-f 1785/366/184 421/366/184 420/365/184 1786/365/184 
-f 1787/723/82 1098/723/82 419/364/82 1783/364/82 
-f 1786/365/34 420/365/34 425/369/34 1788/369/34 
-f 1789/370/34 427/370/34 426/370/34 1790/370/34 
-f 1788/369/82 425/369/82 424/369/82 1791/369/82 
-f 1790/370/81 426/370/81 375/325/81 1755/325/81 
-f 1498/724/34 24/724/34 1098/723/34 1787/723/34 
-f 1496/595/185 971/595/185 970/594/185 1792/594/185 
-f 1793/20/34 20/20/34 453/396/34 1794/396/34 
-f 1795/18/54 18/18/54 17/17/54 1796/17/54 
-f 1797/395/54 452/395/54 23/23/54 1798/23/54 
-f 1799/22/34 22/22/34 21/21/34 1497/21/34 
-f 1794/396/34 453/396/34 452/395/34 1797/395/34 
-f 1800/399/157 456/399/157 954/578/157 1801/578/157 
-f 1802/593/54 969/593/54 457/400/54 1803/400/54 
-f 1803/400/34 457/400/34 456/399/34 1800/399/34 
-f 1796/17/81 17/17/81 20/20/81 1793/20/81 
-f 1798/23/186 23/23/186 22/22/186 1799/22/186 
-f 1801/578/187 954/578/187 974/598/187 1489/598/187 
-f 1792/594/157 970/594/157 969/593/157 1802/593/157 
-f 1486/411/82 468/411/82 467/410/82 1804/410/82 
-f 1805/414/81 471/414/81 967/591/81 1806/591/81 
-f 1804/410/82 467/410/82 471/414/82 1805/414/82 
-f 1807/19/54 19/19/54 18/18/54 1795/18/54 
-f 1806/591/188 967/591/188 19/19/188 1807/19/188 
-f 1808/420/54 475/420/54 474/419/54 1809/419/54 
-f 1810/423/81 478/423/81 469/412/81 1811/412/81 
-f 1811/412/82 469/412/82 475/420/82 1808/420/82 
-f 1809/419/34 474/419/34 478/423/34 1810/423/34 
-f 1812/432/54 486/432/54 1241/877/54 1813/877/54 
-f 1814/429/81 484/429/81 483/428/81 1815/428/81 
-f 1674/437/82 491/437/82 484/429/82 1814/429/82 
-f 1816/876/82 1240/876/82 485/431/82 1817/431/82 
-f 1818/427/82 482/427/82 481/426/82 1819/426/82 
-f 1813/877/81 1241/877/81 1240/876/81 1816/876/81 
-f 1820/435/34 489/435/34 488/434/34 1491/434/34 
-f 1821/438/189 492/438/189 482/427/189 1818/427/189 
-f 1817/431/81 485/431/81 492/438/81 1821/438/81 
-f 1822/16/190 16/16/190 489/435/190 1820/435/190 
-f 1819/426/82 481/426/82 16/16/82 1822/16/82 
-f 1560/417/54 62/417/54 511/452/54 1823/452/54 
-f 1824/586/81 962/586/81 480/425/81 1825/425/81 
-f 1826/613/34 990/613/34 962/586/34 1824/586/34 
-f 1827/590/34 965/590/34 964/590/34 1828/590/34 
-f 1823/452/82 511/452/82 510/452/82 1829/452/82 
-f 1825/425/81 480/425/81 505/425/81 1830/425/81 
-f 1831/600/81 977/600/81 976/600/81 1832/600/81 
-f 1833/424/82 502/424/82 504/449/82 1834/449/82 
-f 1830/425/34 505/425/34 502/424/34 1833/424/34 
-f 1835/579/34 966/579/34 965/590/34 1827/590/34 
-f 1836/462/34 521/462/34 977/600/34 1831/600/34 
-f 1829/452/34 510/452/34 522/452/34 1837/452/34 
-f 1838/454/81 523/454/81 513/454/81 1839/454/81 
-f 1837/452/82 522/452/82 523/454/82 1838/454/82 
-f 1567/472/34 533/472/34 532/471/34 1565/471/34 
-f 1564/67/82 67/67/82 70/70/82 1568/70/82 
-f 1840/464/81 525/464/81 535/474/81 1841/474/81 
-f 1842/469/34 530/469/34 526/465/34 1843/465/34 
-f 1569/468/34 529/468/34 528/467/34 1844/467/34 
-f 1845/473/34 537/473/34 534/473/34 1566/473/34 
-f 1841/474/82 535/474/82 536/474/82 1846/474/82 
-f 1847/464/81 539/464/81 525/464/81 1840/464/81 
-f 1843/465/82 526/465/82 538/465/82 1848/465/82 
-f 1849/469/81 541/469/81 530/469/81 1842/469/81 
-f 1844/467/82 528/467/82 540/467/82 1850/467/82 
-f 1849/469/81 1851/469/81 543/469/81 541/469/81 
-f 1850/467/82 540/467/82 542/467/82 1852/467/82 
-f 1845/473/81 1853/473/81 545/473/81 537/473/81 
-f 1846/474/82 536/474/82 544/474/82 1854/474/82 
-f 547/464/81 539/464/81 1847/464/81 1855/464/81 
-f 538/465/191 546/465/191 1856/465/191 1848/465/191 
-f 1857/475/192 548/475/192 72/72/192 1858/72/192 
+f 1479/927/9 1284/927/79 1283/926/80 1480/926/7 
+f 1481/928/34 1285/928/34 1284/927/34 1479/927/34 
+f 1482/682/81 1056/682/81 1022/648/81 1483/648/81 
+f 1484/12/81 12/12/81 11/11/81 1485/11/81 
+f 1486/15/54 15/15/54 468/411/54 1487/411/54 
+f 1488/590/54 76/590/54 192/146/54 1489/146/54 
+f 1490/600/82 973/600/82 972/599/82 1491/599/82 
+f 1492/434/54 488/434/54 15/15/54 1486/15/54 
+f 1493/430/81 361/430/81 487/433/81 1494/433/81 
+f 1489/146/54 192/146/54 191/145/54 1495/145/54 
+f 1496/598/82 971/598/82 970/597/82 1497/597/82 
+f 1498/21/81 21/21/81 24/24/81 1499/24/81 
+f 1500/150/82 196/150/82 195/149/82 1501/149/82 
+f 1502/224/82 266/224/82 269/227/82 1503/227/82 
+f 1504/208/81 250/208/81 253/211/81 1505/211/81 
+f 1506/219/82 261/219/82 1331/1066/82 1507/1066/82 
+f 1508/30/81 30/30/81 441/384/81 1509/384/81 
+f 1495/159/82 191/159/82 196/158/82 1500/158/82 
+f 1510/267/82 309/267/82 1/1/82 1511/1/82 
+f 1512/1052/83 1406/1052/83 265/223/83 1513/223/83 
+f 1514/143/34 189/143/34 188/142/34 1515/142/34 
+f 1505/211/82 253/211/82 1406/1052/82 1512/1052/82 
+f 1516/139/84 185/139/84 184/138/84 1517/138/84 
+f 1518/1080/54 46/1080/54 257/215/54 1519/215/54 
+f 1520/1100/81 1441/1100/81 1458/1117/81 1521/1117/81 
+f 1522/38/54 38/38/54 37/37/54 1523/37/54 
+f 1524/40/85 40/40/85 39/39/85 1525/39/85 
+f 1526/108/86 108/108/86 38/38/86 1522/38/86 
+f 1525/39/87 39/39/87 112/112/87 1527/112/87 
+f 1528/113/88 113/113/88 108/108/88 1526/108/88 
+f 1529/109/89 109/109/89 113/113/89 1528/113/89 
+f 1527/112/90 112/112/90 114/114/90 1530/114/90 
+f 1531/45/91 45/45/91 40/40/91 1524/40/91 
+f 1523/37/92 37/37/92 46/46/92 1518/46/92 
+f 1532/1132/93 1467/1132/93 1466/1131/93 1533/1131/93 
+f 1534/1133/94 1468/1133/94 1467/1132/94 1532/1132/94 
+f 1535/1128/95 1465/1128/95 1464/1127/95 1536/1127/95 
+f 1537/1129/96 134/1129/96 1465/1128/96 1535/1128/96 
+f 1538/577/97 865/577/97 211/169/97 1539/169/97 
+f 1540/168/81 210/168/81 213/171/81 1541/171/81 
+f 1541/171/82 213/171/82 212/170/82 1542/170/82 
+f 1543/531/54 663/531/54 951/578/54 1544/578/54 
+f 1545/508/34 626/508/34 623/505/34 1546/505/34 
+f 1547/498/82 572/498/82 571/497/82 1548/497/82 
+f 1549/488/81 562/488/81 572/498/81 1547/498/81 
+f 1550/890/54 1249/890/54 1248/889/54 1551/889/54 
+f 1552/891/81 588/891/81 1249/890/81 1550/890/81 
+f 1553/884/98 1244/884/98 1243/883/98 1554/883/98 
+f 1555/885/82 1245/885/82 1244/884/82 1553/884/82 
+f 1548/497/44 571/497/44 573/499/44 1556/499/44 
+f 1557/490/81 564/490/81 63/63/81 1558/63/81 
+f 1559/61/82 61/61/82 64/64/82 1560/64/82 
+f 1558/63/54 63/63/54 62/62/54 1561/62/54 
+f 1562/66/34 66/66/34 65/65/34 1563/65/34 
+f 1564/68/99 68/68/99 67/67/99 1565/67/99 
+f 1566/472/100 530/472/100 66/66/100 1562/66/100 
+f 1567/474/82 532/474/82 531/473/82 1568/473/82 
+f 1569/70/101 70/70/101 527/469/101 1570/469/101 
+f 1571/482/81 552/482/81 1252/895/81 1572/895/81 
+f 1573/897/54 1254/897/54 1253/896/54 1574/896/54 
+f 1575/478/82 548/478/82 1254/897/82 1573/897/82 
+f 1572/895/34 1252/895/34 1251/894/34 1576/894/34 
+f 1577/75/81 75/75/81 68/68/81 1564/68/81 
+f 1563/65/34 65/65/34 76/76/34 1488/76/34 
+f 1578/81/54 81/81/54 208/1118/54 1579/1118/54 
+f 1580/1119/102 1459/1119/102 1460/1120/102 1581/1120/102 
+f 1582/82/103 82/82/103 81/81/103 1578/81/103 
+f 1581/1120/104 1460/1120/104 141/119/104 1583/119/104 
+f 1584/120/105 142/120/105 82/82/105 1582/82/105 
+f 1585/115/106 137/115/106 142/120/106 1584/120/106 
+f 1583/119/107 141/119/107 143/121/107 1586/121/107 
+f 1587/1145/108 1476/1145/108 1475/1144/108 1588/1144/108 
+f 1589/1146/109 1477/1146/109 1476/1145/109 1587/1145/109 
+f 1590/1140/54 1473/1140/54 1472/1139/54 1591/1139/54 
+f 1592/1141/110 159/1141/110 1473/1140/110 1590/1140/110 
+f 1593/93/34 93/93/34 92/92/34 1594/92/34 
+f 1595/95/82 95/95/82 98/98/82 1596/98/82 
+f 1597/97/111 97/97/111 96/96/111 1598/96/111 
+f 1599/898/112 1255/898/112 337/290/112 1600/290/112 
+f 1601/717/34 1090/717/34 971/716/34 1496/716/34 
+f 1602/106/81 1603/103/81 103/103/81 106/106/81 
+f 1604/105/113 105/105/113 104/104/113 1605/104/113 
+f 1606/110/114 110/110/114 43/43/114 1607/43/114 
+f 1608/44/115 44/44/115 107/107/115 1609/107/115 
+f 1530/114/116 114/114/116 111/111/116 1610/111/116 
+f 1611/110/117 116/110/117 110/110/117 1606/110/117 
+f 1610/111/118 111/111/118 115/111/118 1612/111/118 
+f 1613/44/119 118/44/119 44/44/119 1608/44/119 
+f 1607/43/120 43/43/120 117/43/120 1614/43/120 
+f 1615/109/121 120/109/121 109/109/121 1529/109/121 
+f 1609/107/122 107/107/122 119/107/122 1616/107/122 
+f 1611/110/123 1617/110/123 122/110/123 116/110/123 
+f 1612/111/124 115/111/124 121/111/124 1618/111/124 
+f 1613/44/125 1619/44/125 123/44/125 118/44/125 
+f 1620/43/126 129/43/126 132/43/126 1621/43/126 
+f 1615/109/127 1622/109/127 126/109/127 120/109/127 
+f 1616/107/128 119/107/128 125/107/128 1623/107/128 
+f 1624/44/129 1625/44/129 128/44/129 127/44/129 
+f 1614/43/130 117/43/130 124/43/130 1626/43/130 
+f 1624/44/131 127/44/131 123/44/131 1619/44/131 
+f 1626/43/132 124/43/132 130/43/132 1627/43/132 
+f 1627/43/133 130/43/133 129/43/133 1620/43/133 
+f 1625/44/134 1628/44/134 131/44/134 128/44/134 
+f 1628/44/135 1629/44/135 50/44/135 131/44/135 
+f 1621/43/136 132/43/136 49/43/136 1630/43/136 
+f 1617/110/137 1631/110/137 133/110/137 122/110/137 
+f 1618/111/138 121/111/138 134/111/138 1537/111/138 
+f 1622/109/139 1632/109/139 136/109/139 126/109/139 
+f 1623/107/140 125/107/140 135/107/140 1633/107/140 
+f 1634/86/141 86/86/141 138/116/141 1635/116/141 
+f 1636/117/142 139/117/142 84/84/142 1637/84/142 
+f 1586/121/143 143/121/143 140/118/143 1638/118/143 
+f 1635/116/144 138/116/144 145/116/144 1639/116/144 
+f 1640/115/145 144/115/145 137/115/145 1585/115/145 
+f 1641/86/146 146/86/146 86/86/146 1634/86/146 
+f 1637/84/147 84/84/147 147/84/147 1642/84/147 
+f 1643/117/148 148/117/148 139/117/148 1636/117/148 
+f 1638/118/81 140/118/81 149/118/81 1644/118/81 
+f 1639/116/82 145/116/82 150/116/82 1645/116/82 
+f 1640/115/149 1646/115/149 151/115/149 144/115/149 
+f 1641/86/150 1647/86/150 153/86/150 146/86/150 
+f 1642/84/81 147/84/81 152/84/81 1648/84/81 
+f 1643/117/82 1649/117/82 155/117/82 148/117/82 
+f 1644/118/150 149/118/150 154/118/150 1650/118/150 
+f 1651/116/149 1645/116/149 150/116/149 156/116/149 
+f 1652/115/151 157/115/151 151/115/151 1646/115/151 
+f 1653/117/152 158/117/152 155/117/152 1649/117/152 
+f 1592/118/153 1650/118/153 154/118/153 159/118/153 
+f 1647/86/154 1654/86/154 161/86/154 153/86/154 
+f 1648/84/155 152/84/155 160/84/155 1655/84/155 
+f 1654/86/156 1656/86/156 163/86/156 161/86/156 
+f 1655/84/109 160/84/109 162/84/109 1657/84/109 
+f 1656/86/157 1658/86/157 165/86/157 163/86/157 
+f 1657/84/81 162/84/81 164/84/81 1659/84/81 
+f 1658/86/82 1660/86/82 166/86/82 165/86/82 
+f 1661/84/158 167/84/158 89/84/158 1662/84/158 
+f 1663/86/159 90/86/159 166/86/159 1660/86/159 
+f 1659/84/160 164/84/160 167/84/160 1661/84/160 
+f 1664/124/161 170/124/161 1461/1124/161 1665/1124/161 
+f 1665/1124/54 1461/1124/54 1462/1125/54 1666/1125/54 
+f 1666/1125/162 1462/1125/162 172/126/162 1667/126/162 
+f 1667/126/34 172/126/34 170/124/34 1664/124/34 
+f 1579/166/163 208/166/163 189/143/163 1514/143/163 
+f 1668/131/82 177/131/82 185/139/82 1516/139/82 
+f 1669/132/82 178/132/82 177/131/82 1668/131/82 
+f 1670/1111/54 1452/1111/54 178/132/54 1669/132/54 
+f 1671/1078/164 1421/1078/164 45/1081/164 1531/1081/164 
+f 1672/1114/54 1455/1114/54 1456/1115/54 1673/1115/54 
+f 1673/1115/54 1456/1115/54 1452/1111/54 1670/1111/54 
+f 1674/147/165 193/147/165 491/437/165 1675/437/165 
+f 1676/439/54 493/439/54 1235/879/54 1677/879/54 
+f 1678/144/82 190/144/82 193/147/82 1674/147/82 
+f 1679/148/166 194/148/166 197/151/166 1680/151/166 
+f 1681/1039/167 1394/1039/167 280/1040/82 1682/1040/82 
+f 1683/162/82 204/162/82 203/161/82 1684/161/82 
+f 1684/161/82 203/161/82 207/165/82 1685/165/82 
+f 1686/229/82 271/229/82 274/232/82 1687/232/82 
+f 1685/165/82 207/165/82 218/176/82 1688/176/82 
+f 1689/864/82 1226/864/82 204/162/82 1683/162/82 
+f 1680/157/82 197/157/82 190/156/82 1678/156/82 
+f 1687/232/168 274/232/168 194/148/168 1679/148/168 
+f 1690/189/169 231/189/169 230/188/169 1691/188/169 
+f 1692/216/82 258/216/82 261/219/82 1506/219/82 
+f 1693/212/81 254/212/81 25/25/81 1694/25/81 
+f 1695/28/170 28/28/170 260/218/170 1696/218/170 
+f 1697/213/171 255/213/171 254/212/171 1693/212/171 
+f 1694/25/82 25/25/82 28/28/82 1695/28/82 
+f 1698/187/81 229/187/81 234/192/81 1699/192/81 
+f 1700/206/172 248/206/172 229/187/172 1698/187/172 
+f 1701/191/81 233/191/81 252/210/81 1702/210/81 
+f 1699/192/173 234/192/173 233/191/173 1701/191/173 
+f 1691/188/82 230/188/82 249/207/82 1703/207/82 
+f 1702/210/82 252/210/82 251/209/82 1704/209/82 
+f 1703/207/81 249/207/81 248/206/81 1700/206/81 
+f 1704/209/174 251/209/174 250/208/174 1504/208/174 
+f 1519/215/175 257/215/175 256/214/175 1705/214/175 
+f 1696/218/81 260/218/81 259/217/81 1706/217/81 
+f 1705/214/82 256/214/82 255/213/82 1697/213/82 
+f 1706/217/34 259/217/34 258/216/34 1692/216/34 
+f 1513/223/54 265/223/54 264/222/54 1707/222/54 
+f 1708/230/81 272/230/81 271/229/81 1686/229/81 
+f 1709/237/82 279/237/82 272/230/82 1708/230/82 
+f 1707/222/82 264/222/82 263/221/82 1710/221/82 
+f 1711/225/176 267/225/176 266/224/176 1502/224/176 
+f 1712/228/177 270/228/177 267/225/177 1711/225/177 
+f 1713/231/81 273/231/81 270/228/81 1712/228/81 
+f 1714/220/81 262/220/81 273/231/81 1713/231/81 
+f 1710/221/178 263/221/178 262/220/178 1714/220/178 
+f 1509/384/82 441/384/82 1255/898/82 1599/898/82 
+f 1503/227/34 269/227/34 268/226/34 1715/226/34 
+f 1682/237/34 280/237/34 279/237/34 1709/237/34 
+f 1715/226/82 268/226/82 286/226/82 1716/226/82 
+f 1717/164/54 206/164/54 202/160/54 1718/160/54 
+f 1719/177/81 219/177/81 206/164/81 1717/164/81 
+f 1720/271/54 313/271/54 2/2/54 1721/2/54 
+f 1722/241/81 284/241/81 290/248/81 1723/248/81 
+f 1716/243/81 286/243/81 285/242/81 1724/242/81 
+f 1725/268/81 310/268/81 1393/1038/81 1726/1038/81 
+f 1724/242/82 285/242/82 284/241/82 1722/241/82 
+f 1723/248/34 290/248/34 289/247/34 1727/247/34 
+f 1727/247/54 289/247/54 302/260/54 1728/260/54 
+f 1721/2/54 2/2/54 311/269/54 1729/269/54 
+f 1728/260/34 302/260/34 313/271/34 1720/271/34 
+f 1730/278/54 320/278/54 344/294/54 1731/294/54 
+f 1480/926/81 1283/926/81 326/284/81 1732/284/81 
+f 1733/279/82 321/279/82 320/278/82 1730/278/82 
+f 1734/282/34 324/282/34 321/279/34 1733/279/34 
+f 1732/284/34 326/284/34 324/282/34 1734/282/34 
+f 1735/4/34 4/4/34 331/286/34 1736/286/34 
+f 1737/291/54 338/291/54 1282/925/54 1738/925/54 
+f 1739/4/82 328/4/82 4/4/82 1735/4/82 
+f 1511/1/81 1/1/81 329/1/81 1740/1/81 
+f 1741/287/82 333/287/82 332/287/82 1742/287/82 
+f 1736/286/81 331/286/81 330/286/81 1743/286/81 
+f 1726/1038/179 1393/1038/179 1392/1037/179 1744/1037/179 
+f 1744/1037/54 1392/1037/54 309/267/54 1510/267/54 
+f 1738/925/180 1282/925/180 1285/928/180 1481/928/180 
+f 1600/290/34 337/290/34 336/290/34 1745/290/34 
+f 1746/291/34 339/291/34 338/291/34 1737/291/34 
+f 1745/290/54 336/290/54 339/291/54 1746/291/54 
+f 1742/287/82 332/287/82 231/947/82 1690/947/82 
+f 1718/160/83 202/160/83 282/239/83 1747/239/83 
+f 1748/177/181 342/177/181 219/177/181 1719/177/181 
+f 1731/294/34 344/294/34 343/294/34 1749/294/34 
+f 1749/294/54 343/294/54 342/177/54 1748/177/54 
+f 1750/296/81 346/296/81 12/12/81 1484/12/81 
+f 1751/328/54 378/328/54 377/327/54 1752/327/54 
+f 1753/312/34 362/312/34 361/311/34 1493/311/34 
+f 1754/334/81 384/334/81 385/335/81 1755/335/81 
+f 1756/325/82 375/325/82 378/328/82 1751/328/82 
+f 1757/316/81 366/316/81 363/313/81 1758/313/81 
+f 1758/313/81 363/313/81 362/312/81 1753/312/81 
+f 1759/317/54 367/317/54 366/316/54 1757/316/54 
+f 1760/333/34 383/333/34 384/334/34 1754/334/34 
+f 1755/335/54 385/335/54 367/317/54 1759/317/54 
+f 1761/297/34 347/297/34 346/296/34 1750/296/34 
+f 1762/240/54 283/240/54 347/297/54 1761/297/54 
+f 1747/239/81 282/239/81 389/239/81 1763/239/81 
+f 1764/240/54 390/240/54 283/240/54 1762/240/54 
+f 1763/239/34 389/239/34 390/240/34 1764/240/34 
+f 1765/500/81 598/500/81 1039/665/81 1766/665/81 
+f 1485/11/81 11/11/81 10/10/81 1767/10/81 
+f 1767/10/81 10/10/81 399/347/81 1768/347/81 
+f 1769/501/54 599/501/54 598/500/54 1765/500/54 
+f 1768/347/81 399/347/81 401/349/81 1770/349/81 
+f 1771/350/82 402/350/82 31/31/82 1772/31/82 
+f 1773/647/82 1021/647/82 602/504/82 1774/504/82 
+f 1483/648/81 1022/648/81 1021/647/81 1773/647/81 
+f 1775/350/34 408/350/34 402/350/34 1771/350/34 
+f 1776/345/54 400/345/54 408/350/54 1775/350/54 
+f 1770/349/82 401/349/82 400/348/82 1776/348/82 
+f 1777/30/54 410/30/54 30/30/54 1508/30/54 
+f 1772/31/182 31/31/182 409/31/182 1778/31/182 
+f 1752/327/183 377/327/183 376/326/183 1779/326/183 
+f 1779/326/82 376/326/82 379/329/82 1780/329/82 
+f 1780/329/82 379/329/82 381/331/82 1781/331/82 
+f 1781/331/82 381/331/82 383/333/82 1760/333/82 
+f 1782/832/82 1194/832/82 1090/717/82 1601/717/82 
+f 1766/665/81 1039/665/81 1038/664/81 1783/664/81 
+f 1784/364/81 419/364/81 422/367/81 1785/367/81 
+f 1786/366/184 421/366/184 420/365/184 1787/365/184 
+f 1788/727/82 1099/727/82 419/364/82 1784/364/82 
+f 1787/365/34 420/365/34 425/369/34 1789/369/34 
+f 1790/370/34 427/370/34 426/370/34 1791/370/34 
+f 1789/369/82 425/369/82 424/369/82 1792/369/82 
+f 1791/370/81 426/370/81 375/325/81 1756/325/81 
+f 1499/728/34 24/728/34 1099/727/34 1788/727/34 
+f 1497/597/185 970/597/185 969/596/185 1793/596/185 
+f 1794/20/34 20/20/34 453/396/34 1795/396/34 
+f 1796/18/54 18/18/54 17/17/54 1797/17/54 
+f 1798/395/54 452/395/54 23/23/54 1799/23/54 
+f 1800/22/34 22/22/34 21/21/34 1498/21/34 
+f 1795/396/34 453/396/34 452/395/34 1798/395/34 
+f 1801/399/157 456/399/157 952/579/157 1802/579/157 
+f 1803/595/54 968/595/54 457/400/54 1804/400/54 
+f 1804/400/34 457/400/34 456/399/34 1801/399/34 
+f 1797/17/81 17/17/81 20/20/81 1794/20/81 
+f 1799/23/186 23/23/186 22/22/186 1800/22/186 
+f 1802/579/187 952/579/187 973/600/187 1490/600/187 
+f 1793/596/157 969/596/157 968/595/157 1803/595/157 
+f 1487/411/82 468/411/82 467/410/82 1805/410/82 
+f 1806/414/81 471/414/81 966/593/81 1807/593/81 
+f 1805/410/82 467/410/82 471/414/82 1806/414/82 
+f 1808/19/54 19/19/54 18/18/54 1796/18/54 
+f 1807/593/188 966/593/188 19/19/188 1808/19/188 
+f 1809/420/54 475/420/54 474/419/54 1810/419/54 
+f 1811/423/81 478/423/81 469/412/81 1812/412/81 
+f 1812/412/82 469/412/82 475/420/82 1809/420/82 
+f 1810/419/34 474/419/34 478/423/34 1811/423/34 
+f 1813/432/54 486/432/54 1242/881/54 1814/881/54 
+f 1815/429/81 484/429/81 483/428/81 1816/428/81 
+f 1675/437/82 491/437/82 484/429/82 1815/429/82 
+f 1817/880/82 1241/880/82 485/431/82 1818/431/82 
+f 1819/427/82 482/427/82 481/426/82 1820/426/82 
+f 1814/881/81 1242/881/81 1241/880/81 1817/880/81 
+f 1821/435/34 489/435/34 488/434/34 1492/434/34 
+f 1822/438/189 492/438/189 482/427/189 1819/427/189 
+f 1818/431/81 485/431/81 492/438/81 1822/438/81 
+f 1823/16/190 16/16/190 489/435/190 1821/435/190 
+f 1820/426/82 481/426/82 16/16/82 1823/16/82 
+f 1561/417/54 62/417/54 953/580/54 1824/580/54 
+f 1825/588/81 961/588/81 480/425/81 1826/425/81 
+f 1827/617/34 991/617/34 961/588/34 1825/588/34 
+f 1828/592/34 964/592/34 963/592/34 1829/592/34 
+f 1824/580/82 953/580/82 1830/580/82 1831/580/82 
+f 1826/425/81 480/425/81 505/425/81 1832/425/81 
+f 1833/602/81 976/602/81 975/602/81 1834/602/81 
+f 1832/425/34 505/425/34 502/424/34 1835/424/34 
+f 1836/581/34 965/581/34 964/592/34 1828/592/34 
+f 1837/463/34 521/463/34 976/602/34 1833/602/34 
+f 1831/580/34 1830/580/34 1838/580/34 1839/580/34 
+f 1568/473/34 531/473/34 530/472/34 1566/472/34 
+f 1565/67/82 67/67/82 70/70/82 1569/70/82 
+f 1840/465/81 523/465/81 533/475/81 1841/475/81 
+f 1842/470/34 528/470/34 524/466/34 1843/466/34 
+f 1570/469/34 527/469/34 526/468/34 1844/468/34 
+f 1845/474/34 535/474/34 532/474/34 1567/474/34 
+f 1841/475/82 533/475/82 534/475/82 1846/475/82 
+f 1847/465/81 537/465/81 523/465/81 1840/465/81 
+f 1843/466/82 524/466/82 536/466/82 1848/466/82 
+f 1849/470/81 539/470/81 528/470/81 1842/470/81 
+f 1844/468/82 526/468/82 538/468/82 1850/468/82 
+f 1849/470/81 1851/470/81 541/470/81 539/470/81 
+f 1850/468/82 538/468/82 540/468/82 1852/468/82 
+f 1845/474/81 1853/474/81 543/474/81 535/474/81 
+f 1846/475/82 534/475/82 542/475/82 1854/475/82 
+f 545/465/81 537/465/81 1847/465/81 1855/465/81 
+f 536/466/191 544/466/191 1856/466/191 1848/466/191 
+f 1857/476/192 546/476/192 72/72/192 1858/72/192 
 f 1859/74/54 74/74/54 73/73/54 1860/73/54 
-f 1861/479/34 552/479/34 74/74/34 1859/74/34 
-f 1862/469/34 555/469/34 543/469/34 1851/469/34 
-f 1852/467/82 542/467/82 554/467/82 1570/467/82 
-f 1853/473/81 1863/473/81 549/473/81 545/473/81 
-f 1854/474/82 544/474/82 548/474/82 1857/474/82 
-f 1864/71/155 1865/71/155 556/71/155 71/71/155 
-f 1858/72/193 72/72/193 557/72/193 1866/72/193 
-f 1855/464/194 1601/464/194 106/464/194 547/464/194 
-f 1856/465/195 546/465/195 105/465/195 1603/465/195 
-f 559/103/196 103/103/196 1602/103/196 1867/103/196 
-f 104/104/191 558/104/191 1868/104/191 1604/104/191 
-f 1867/103/81 1866/103/81 557/103/81 559/103/81 
-f 1868/104/82 558/104/82 556/104/82 1865/104/82 
-f 1869/51/81 51/51/81 571/494/81 1870/494/81 
-f 1559/64/54 64/64/54 560/483/54 1871/483/54 
-f 1872/59/54 59/59/54 567/490/54 1873/490/54 
-f 1874/491/34 568/491/34 572/495/34 1875/495/34 
+f 1861/480/34 550/480/34 74/74/34 1859/74/34 
+f 1862/470/34 553/470/34 541/470/34 1851/470/34 
+f 1852/468/82 540/468/82 552/468/82 1571/468/82 
+f 1853/474/81 1863/474/81 547/474/81 543/474/81 
+f 1854/475/82 542/475/82 546/475/82 1857/475/82 
+f 1864/71/155 1865/71/155 554/71/155 71/71/155 
+f 1858/72/193 72/72/193 555/72/193 1866/72/193 
+f 1855/465/194 1602/465/194 106/465/194 545/465/194 
+f 1856/466/195 544/466/195 105/466/195 1604/466/195 
+f 557/103/196 103/103/196 1603/103/196 1867/103/196 
+f 104/104/191 556/104/191 1868/104/191 1605/104/191 
+f 1867/103/81 1866/103/81 555/103/81 557/103/81 
+f 1868/104/82 556/104/82 554/104/82 1865/104/82 
+f 1869/51/81 51/51/81 569/495/81 1870/495/81 
+f 1560/64/54 64/64/54 558/484/54 1871/484/54 
+f 1872/59/54 59/59/54 565/491/54 1873/491/54 
+f 1874/492/34 566/492/34 570/496/34 1875/496/34 
 f 1876/52/34 52/52/34 51/51/34 1869/51/34 
-f 1871/483/54 560/483/54 52/52/54 1876/52/54 
-f 1875/495/54 572/495/54 60/60/54 1877/60/54 
-f 1878/488/34 565/488/34 564/487/34 1548/487/34 
-f 1870/494/54 571/494/54 565/488/54 1878/488/54 
-f 1555/498/54 575/498/54 569/492/54 1879/492/54 
-f 1880/489/34 577/489/34 566/489/34 1556/489/34 
-f 1873/490/82 567/490/82 576/490/82 1881/490/82 
-f 1882/59/81 579/59/81 59/59/81 1872/59/81 
-f 1877/60/82 60/60/82 578/60/82 1883/60/82 
-f 1884/491/81 581/491/81 568/491/81 1874/491/81 
-f 1879/492/82 569/492/82 580/492/82 1885/492/82 
-f 583/59/81 579/59/81 1882/59/81 1886/59/81 
-f 578/60/197 582/60/197 1887/60/197 1883/60/197 
-f 585/491/198 581/491/198 1884/491/198 1888/491/198 
-f 580/492/197 584/492/197 1889/492/197 1885/492/197 
-f 1886/59/199 1890/59/199 587/59/199 583/59/199 
-f 1887/60/82 582/60/82 586/60/82 1891/60/82 
-f 1888/491/81 1892/491/81 589/491/81 585/491/81 
-f 1889/492/82 584/492/82 588/492/82 1893/492/82 
-f 1894/59/81 56/59/81 587/59/81 1890/59/81 
-f 1891/60/82 586/60/82 55/60/82 1895/60/82 
-f 1896/491/81 591/491/81 589/491/81 1892/491/81 
-f 1893/492/82 588/492/82 590/492/82 1551/492/82 
-f 593/489/81 577/489/81 1880/489/81 1897/489/81 
-f 576/490/200 592/490/200 1898/490/200 1881/490/200 
-f 1897/489/199 1595/489/199 98/489/199 593/489/199 
-f 1898/490/82 592/490/82 97/490/82 1596/490/82 
-f 1594/95/81 1899/95/81 595/95/81 95/95/81 
-f 1597/96/82 96/96/82 594/96/82 1900/96/82 
-f 1901/95/81 597/95/81 595/95/81 1899/95/81 
-f 1900/96/82 594/96/82 596/96/82 1902/96/82 
-f 1903/91/81 91/91/81 598/91/81 1904/91/81 
-f 1905/94/54 1906/94/54 599/94/54 94/94/54 
-f 1904/91/34 598/91/34 410/91/34 1776/91/34 
-f 1906/94/83 1777/94/83 409/94/83 599/94/83 
-f 1773/503/201 604/503/201 603/502/201 1907/502/201 
-f 1908/501/54 602/501/54 601/500/54 1768/500/54 
-f 1907/502/54 603/502/54 602/501/54 1908/501/54 
-f 1909/91/81 606/91/81 91/91/81 1903/91/81 
-f 1593/92/81 92/92/81 605/92/81 1910/92/81 
-f 1911/93/82 608/93/82 93/93/82 1592/93/82 
-f 1905/94/82 94/94/82 607/94/82 1912/94/82 
-f 1913/91/81 610/91/81 606/91/81 1909/91/81 
-f 1914/92/81 1910/92/81 605/92/81 609/92/81 
-f 612/91/82 610/91/82 1913/91/82 1915/91/82 
-f 609/92/202 611/92/202 1916/92/202 1914/92/202 
-f 1917/91/203 614/91/203 612/91/203 1915/91/203 
-f 1916/92/81 611/92/81 613/92/81 1918/92/81 
-f 1919/91/82 616/91/82 614/91/82 1917/91/82 
-f 1920/92/81 1918/92/81 613/92/81 615/92/81 
-f 1921/93/82 618/93/82 608/93/82 1911/93/82 
-f 1922/94/82 1912/94/82 607/94/82 617/94/82 
-f 620/93/81 618/93/81 1921/93/81 1923/93/81 
-f 617/94/204 619/94/204 1924/94/204 1922/94/204 
-f 1925/93/205 622/93/205 620/93/205 1923/93/205 
-f 1924/94/82 619/94/82 621/94/82 1926/94/82 
-f 1927/93/81 624/93/81 622/93/81 1925/93/81 
-f 1928/94/82 1926/94/82 621/94/82 623/94/82 
-f 1538/169/81 211/169/81 626/505/81 1929/505/81 
-f 1545/504/206 625/504/206 210/168/206 1539/168/206 
-f 1930/521/82 642/521/82 640/519/82 1931/519/82 
-f 1932/513/81 634/513/81 633/512/81 1933/512/81 
-f 1934/559/81 760/559/81 628/507/81 1544/507/81 
-f 1935/524/82 651/524/82 654/527/82 1936/527/82 
-f 1937/174/82 216/174/82 636/515/82 1938/515/82 
-f 1939/516/82 637/516/82 641/520/82 1940/520/82 
-f 1941/517/82 638/517/82 637/516/82 1939/516/82 
-f 1942/91/82 644/91/82 616/91/82 1919/91/82 
-f 1943/92/81 1920/92/81 615/92/81 643/92/81 
-f 1944/91/82 645/91/82 644/91/82 1942/91/82 
-f 1945/92/81 699/92/81 698/91/81 1946/91/81 
-f 1943/92/54 643/92/54 646/92/54 1947/92/54 
-f 1938/515/82 636/515/82 635/514/82 1948/514/82 
-f 1949/544/82 702/544/82 651/524/82 1935/524/82 
-f 1950/526/82 653/526/82 652/525/82 1951/525/82 
-f 1951/92/81 652/92/81 699/92/81 1945/92/81 
-f 1947/92/207 646/92/207 634/92/207 1932/92/207 
-f 656/93/208 624/93/208 1927/93/208 1952/93/208 
-f 623/94/209 655/94/209 1953/94/209 1928/94/209 
-f 1954/93/210 658/93/210 656/93/210 1952/93/210 
-f 1953/94/82 655/94/82 657/94/82 1955/94/82 
-f 1956/94/81 708/94/81 707/93/81 1957/93/81 
-f 1933/93/42 633/93/42 658/93/42 1954/93/42 
-f 1957/93/83 707/93/83 642/93/83 1930/93/83 
-f 1543/577/211 953/577/211 664/529/211 1958/529/211 
-f 1959/528/82 663/528/82 666/531/82 1960/531/82 
-f 1931/519/212 640/519/212 667/532/54 1961/532/54 
-f 1962/556/54 736/556/54 663/528/54 1959/528/54 
-f 1963/370/213 670/370/213 427/370/213 1789/370/213 
-f 1964/369/82 1791/369/82 424/369/82 669/369/82 
-f 1961/370/81 667/370/81 670/370/81 1963/370/81 
-f 1964/369/214 669/369/214 671/369/214 1965/369/214 
-f 1966/369/215 740/369/215 739/370/215 1967/370/215 
-f 1967/556/216 739/556/216 736/556/216 1962/556/216 
-f 1968/535/34 675/535/34 638/517/34 1941/517/34 
-f 1969/369/82 673/369/82 678/369/82 1970/369/82 
-f 1971/537/81 679/537/81 675/535/81 1968/535/81 
-f 1972/540/82 684/540/82 679/537/82 1971/537/82 
-f 1973/367/82 1784/367/82 422/367/82 689/367/82 
-f 1974/366/81 690/366/81 421/366/81 1785/366/81 
-f 1973/367/82 689/367/82 691/367/82 1975/367/82 
-f 1976/366/81 692/366/81 690/366/81 1974/366/81 
-f 1977/366/82 695/366/82 694/366/82 1978/366/82 
-f 1965/369/82 671/369/82 692/369/82 1976/369/82 
-f 1978/369/54 694/369/54 673/369/54 1969/369/54 
-f 1979/523/34 650/523/34 702/544/34 1949/544/34 
-f 1980/91/82 697/91/82 647/91/82 1981/91/82 
-f 1948/514/81 635/514/81 650/523/81 1979/523/81 
-f 1946/91/82 698/91/82 705/91/82 1982/91/82 
-f 1983/91/54 703/91/54 645/91/54 1944/91/54 
-f 1984/91/34 706/91/34 697/91/34 1980/91/34 
-f 1981/91/34 647/91/34 704/91/34 1985/91/34 
+f 1871/484/54 558/484/54 52/52/54 1876/52/54 
+f 1875/496/54 570/496/54 60/60/54 1877/60/54 
+f 1878/489/34 563/489/34 562/488/34 1549/488/34 
+f 1870/495/54 569/495/54 563/489/54 1878/489/54 
+f 1556/499/54 573/499/54 567/493/54 1879/493/54 
+f 1880/490/34 575/490/34 564/490/34 1557/490/34 
+f 1873/491/82 565/491/82 574/491/82 1881/491/82 
+f 1882/59/81 577/59/81 59/59/81 1872/59/81 
+f 1877/60/82 60/60/82 576/60/82 1883/60/82 
+f 1884/492/81 579/492/81 566/492/81 1874/492/81 
+f 1879/493/82 567/493/82 578/493/82 1885/493/82 
+f 581/59/81 577/59/81 1882/59/81 1886/59/81 
+f 576/60/197 580/60/197 1887/60/197 1883/60/197 
+f 583/492/198 579/492/198 1884/492/198 1888/492/198 
+f 578/493/197 582/493/197 1889/493/197 1885/493/197 
+f 1886/59/199 1890/59/199 585/59/199 581/59/199 
+f 1887/60/82 580/60/82 584/60/82 1891/60/82 
+f 1888/492/81 1892/492/81 587/492/81 583/492/81 
+f 1889/493/82 582/493/82 586/493/82 1893/493/82 
+f 1894/59/81 56/59/81 585/59/81 1890/59/81 
+f 1891/60/82 584/60/82 55/60/82 1895/60/82 
+f 1896/492/81 589/492/81 587/492/81 1892/492/81 
+f 1893/493/82 586/493/82 588/493/82 1552/493/82 
+f 591/490/81 575/490/81 1880/490/81 1897/490/81 
+f 574/491/200 590/491/200 1898/491/200 1881/491/200 
+f 1897/490/199 1596/490/199 98/490/199 591/490/199 
+f 1898/491/82 590/491/82 97/491/82 1597/491/82 
+f 1595/95/81 1899/95/81 593/95/81 95/95/81 
+f 1598/96/82 96/96/82 592/96/82 1900/96/82 
+f 1901/95/81 595/95/81 593/95/81 1899/95/81 
+f 1900/96/82 592/96/82 594/96/82 1902/96/82 
+f 1903/91/81 91/91/81 596/91/81 1904/91/81 
+f 1905/94/54 1906/94/54 597/94/54 94/94/54 
+f 1904/91/34 596/91/34 410/91/34 1777/91/34 
+f 1906/94/83 1778/94/83 409/94/83 597/94/83 
+f 1774/504/201 602/504/201 601/503/201 1907/503/201 
+f 1908/502/54 600/502/54 599/501/54 1769/501/54 
+f 1907/503/54 601/503/54 600/502/54 1908/502/54 
+f 1909/91/81 604/91/81 91/91/81 1903/91/81 
+f 1594/92/81 92/92/81 603/92/81 1910/92/81 
+f 1911/93/82 606/93/82 93/93/82 1593/93/82 
+f 1905/94/82 94/94/82 605/94/82 1912/94/82 
+f 1913/91/81 608/91/81 604/91/81 1909/91/81 
+f 1914/92/81 1910/92/81 603/92/81 607/92/81 
+f 610/91/82 608/91/82 1913/91/82 1915/91/82 
+f 607/92/202 609/92/202 1916/92/202 1914/92/202 
+f 1917/91/203 612/91/203 610/91/203 1915/91/203 
+f 1916/92/81 609/92/81 611/92/81 1918/92/81 
+f 1919/91/82 614/91/82 612/91/82 1917/91/82 
+f 1920/92/81 1918/92/81 611/92/81 613/92/81 
+f 1921/93/82 616/93/82 606/93/82 1911/93/82 
+f 1922/94/82 1912/94/82 605/94/82 615/94/82 
+f 618/93/81 616/93/81 1921/93/81 1923/93/81 
+f 615/94/204 617/94/204 1924/94/204 1922/94/204 
+f 1925/93/205 620/93/205 618/93/205 1923/93/205 
+f 1924/94/82 617/94/82 619/94/82 1926/94/82 
+f 1927/93/81 622/93/81 620/93/81 1925/93/81 
+f 1928/94/82 1926/94/82 619/94/82 621/94/82 
+f 1539/169/81 211/169/81 624/506/81 1929/506/81 
+f 1546/505/206 623/505/206 210/168/206 1540/168/206 
+f 1930/522/82 640/522/82 638/520/82 1931/520/82 
+f 1932/514/81 632/514/81 631/513/81 1933/513/81 
+f 1934/560/81 758/560/81 626/508/81 1545/508/81 
+f 1935/525/82 649/525/82 652/528/82 1936/528/82 
+f 1937/174/82 216/174/82 634/516/82 1938/516/82 
+f 1939/517/82 635/517/82 639/521/82 1940/521/82 
+f 1941/518/82 636/518/82 635/517/82 1939/517/82 
+f 1942/91/82 642/91/82 614/91/82 1919/91/82 
+f 1943/92/81 1920/92/81 613/92/81 641/92/81 
+f 1944/91/82 643/91/82 642/91/82 1942/91/82 
+f 1945/92/81 697/92/81 696/91/81 1946/91/81 
+f 1943/92/54 641/92/54 644/92/54 1947/92/54 
+f 1938/516/82 634/516/82 633/515/82 1948/515/82 
+f 1949/545/82 700/545/82 649/525/82 1935/525/82 
+f 1950/527/82 651/527/82 650/526/82 1951/526/82 
+f 1951/92/81 650/92/81 697/92/81 1945/92/81 
+f 1947/92/207 644/92/207 632/92/207 1932/92/207 
+f 654/93/208 622/93/208 1927/93/208 1952/93/208 
+f 621/94/209 653/94/209 1953/94/209 1928/94/209 
+f 1954/93/210 656/93/210 654/93/210 1952/93/210 
+f 1953/94/82 653/94/82 655/94/82 1955/94/82 
+f 1956/94/81 706/94/81 705/93/81 1957/93/81 
+f 1933/93/42 631/93/42 656/93/42 1954/93/42 
+f 1957/93/83 705/93/83 640/93/83 1930/93/83 
+f 1544/578/211 951/578/211 662/530/211 1958/530/211 
+f 1959/529/82 661/529/82 664/532/82 1960/532/82 
+f 1931/520/212 638/520/212 665/533/54 1961/533/54 
+f 1962/557/54 734/557/54 661/529/54 1959/529/54 
+f 1963/370/213 668/370/213 427/370/213 1790/370/213 
+f 1964/369/82 1792/369/82 424/369/82 667/369/82 
+f 1961/370/81 665/370/81 668/370/81 1963/370/81 
+f 1964/369/214 667/369/214 669/369/214 1965/369/214 
+f 1966/369/215 738/369/215 737/370/215 1967/370/215 
+f 1967/557/216 737/557/216 734/557/216 1962/557/216 
+f 1968/536/34 673/536/34 636/518/34 1941/518/34 
+f 1969/369/82 671/369/82 676/369/82 1970/369/82 
+f 1971/538/81 677/538/81 673/536/81 1968/536/81 
+f 1972/541/82 682/541/82 677/538/82 1971/538/82 
+f 1973/367/82 1785/367/82 422/367/82 687/367/82 
+f 1974/366/81 688/366/81 421/366/81 1786/366/81 
+f 1973/367/82 687/367/82 689/367/82 1975/367/82 
+f 1976/366/81 690/366/81 688/366/81 1974/366/81 
+f 1977/366/82 693/366/82 692/366/82 1978/366/82 
+f 1965/369/82 669/369/82 690/369/82 1976/369/82 
+f 1978/369/54 692/369/54 671/369/54 1969/369/54 
+f 1979/524/34 648/524/34 700/545/34 1949/545/34 
+f 1980/91/82 695/91/82 645/91/82 1981/91/82 
+f 1948/515/81 633/515/81 648/524/81 1979/524/81 
+f 1946/91/82 696/91/82 703/91/82 1982/91/82 
+f 1983/91/54 701/91/54 643/91/54 1944/91/54 
+f 1984/91/34 704/91/34 695/91/34 1980/91/34 
+f 1981/91/34 645/91/34 702/91/34 1985/91/34 
 f 1986/175/54 217/175/54 216/174/54 1937/174/54 
-f 1940/520/82 641/520/82 217/175/82 1986/175/82 
-f 1987/94/82 662/94/82 661/94/82 1988/94/82 
-f 1955/94/81 657/94/81 711/94/81 1989/94/81 
-f 1990/94/54 710/94/54 708/94/54 1956/94/54 
-f 1988/94/34 661/94/34 709/94/34 1991/94/34 
-f 1992/94/54 712/94/54 662/94/54 1987/94/54 
-f 1975/367/34 691/367/34 714/367/34 1993/367/34 
-f 1970/369/217 678/369/217 695/369/217 1977/369/217 
-f 1994/369/218 716/369/218 683/369/218 1995/369/218 
-f 1996/546/175 718/546/175 717/545/175 1997/545/175 
-f 1997/545/82 717/545/82 684/540/82 1972/540/82 
-f 1995/369/82 683/369/82 688/369/82 1998/369/82 
-f 1999/369/81 728/369/81 726/369/81 2000/369/81 
-f 2000/369/34 726/369/34 725/369/34 2001/369/34 
-f 2002/551/81 729/551/81 718/546/81 1996/546/81 
-f 1958/529/82 664/529/82 735/555/82 2003/555/82 
-f 2003/555/82 735/555/82 729/551/82 2002/551/82 
-f 2004/369/82 745/369/82 744/369/82 2005/369/82 
-f 2001/369/54 725/369/54 746/369/54 2006/369/54 
-f 2007/369/54 748/369/54 747/369/54 2008/369/54 
-f 2008/369/219 747/369/219 745/369/219 2004/369/219 
-f 2009/369/81 751/369/81 740/369/81 1966/369/81 
-f 2010/369/82 750/369/82 751/369/82 2009/369/82 
-f 2011/369/34 752/369/34 750/369/34 2010/369/34 
-f 1960/531/34 666/531/34 753/531/34 2012/531/34 
-f 2013/530/81 754/530/81 665/530/81 1542/530/81 
-f 2012/531/82 753/531/82 754/530/82 2013/530/82 
-f 2014/526/34 775/526/34 653/526/34 1950/526/34 
-f 2015/505/34 794/505/34 781/506/34 2016/506/34 
-f 2017/561/81 762/561/81 760/559/81 1934/559/81 
-f 2018/563/82 764/563/82 762/561/82 2017/561/82 
-f 2019/565/82 766/565/82 764/563/82 2018/563/82 
-f 2020/510/82 631/510/82 766/565/82 2019/565/82 
-f 2021/511/82 632/511/82 631/510/82 2020/510/82 
-f 2022/572/82 773/572/82 632/511/82 2021/511/82 
-f 2023/570/82 771/570/82 773/572/82 2022/572/82 
-f 2024/568/82 769/568/82 771/570/82 2023/570/82 
-f 2025/566/82 767/566/82 769/568/82 2024/568/82 
-f 1936/527/82 654/527/82 767/566/82 2025/566/82 
-f 2026/569/82 796/569/82 795/567/82 2027/567/82 
-f 2028/573/81 798/573/81 797/571/81 2029/571/81 
-f 2030/574/81 788/574/81 789/509/81 2031/509/81 
-f 2032/575/220 804/575/220 788/574/220 2030/574/220 
-f 2033/562/221 785/562/221 804/575/221 2032/575/221 
-f 2034/4/81 791/4/81 328/4/81 1738/4/81 
-f 2035/1/81 1739/1/81 329/1/81 790/1/81 
-f 2036/4/82 792/4/82 791/4/82 2034/4/82 
-f 2035/1/81 790/1/81 775/1/81 2014/1/81 
-f 1929/505/82 626/505/82 758/505/82 2037/505/82 
-f 2038/573/222 799/573/222 798/573/222 2028/573/222 
-f 2031/509/34 789/509/34 801/509/34 2039/509/34 
-f 2040/569/54 803/569/54 796/569/54 2026/569/54 
-f 2029/571/223 797/571/223 802/571/223 2041/571/223 
-f 2016/506/54 781/506/54 808/506/54 2042/506/54 
-f 2043/562/54 806/562/54 785/562/54 2033/562/54 
-f 2044/558/34 807/558/34 805/560/34 2045/560/34 
-f 2042/506/81 808/506/81 811/506/81 2046/506/81 
-f 2047/562/54 810/562/54 806/562/54 2043/562/54 
-f 2045/560/34 805/560/34 809/560/34 2048/560/34 
-f 2049/558/54 812/558/54 807/558/54 2044/558/54 
-f 2050/287/34 814/287/34 333/287/34 1740/287/34 
-f 2051/286/81 1742/286/81 330/286/81 813/286/81 
-f 2052/287/82 816/287/82 814/287/82 2050/287/82 
-f 2051/286/81 813/286/81 815/286/81 2053/286/81 
-f 2053/526/82 815/526/82 792/526/82 2036/526/82 
-f 2027/567/34 795/567/34 817/567/34 2054/567/34 
-f 2054/286/54 817/286/54 803/286/54 2040/286/54 
-f 2041/571/82 802/571/82 799/571/82 2038/571/82 
-f 2039/509/82 801/509/82 810/509/82 2047/509/82 
-f 2048/560/82 809/560/82 812/560/82 2049/560/82 
-f 2046/506/82 811/506/82 828/506/82 2055/506/82 
-f 2037/505/82 758/505/82 830/505/82 2056/505/82 
-f 2056/505/82 830/505/82 831/505/82 2057/505/82 
-f 2058/506/54 832/506/54 833/506/54 2059/506/54 
-f 2055/505/54 828/505/54 794/505/54 2015/505/54 
-f 2057/505/34 831/505/34 832/505/34 2058/505/34 
-f 2060/287/54 835/287/54 816/287/54 2052/287/54 
-f 2059/506/34 833/506/34 846/506/34 2061/506/34 
-f 2062/287/54 847/287/54 848/287/54 2063/287/54 
-f 2064/287/81 849/287/81 847/287/81 2062/287/81 
-f 2065/571/81 850/571/81 849/569/81 2064/569/81 
-f 2066/571/81 851/571/81 850/571/81 2065/571/81 
-f 2067/508/81 852/508/81 851/573/81 2066/573/81 
-f 2068/509/81 853/509/81 852/508/81 2067/508/81 
-f 2069/509/81 854/509/81 853/509/81 2068/509/81 
-f 2070/560/81 855/560/81 854/562/81 2069/562/81 
-f 2071/560/81 856/560/81 855/560/81 2070/560/81 
-f 2072/506/81 857/506/81 856/558/81 2071/558/81 
-f 2073/506/81 858/506/81 857/506/81 2072/506/81 
-f 2074/506/81 862/506/81 858/506/81 2073/506/81 
-f 2061/506/81 846/506/81 860/506/81 2075/506/81 
-f 2076/506/82 863/506/82 862/506/82 2074/506/82 
-f 2077/506/81 861/506/81 863/506/81 2076/506/81 
-f 2075/506/54 860/506/54 864/506/54 2078/506/54 
-f 2079/506/82 865/506/82 861/506/82 2077/506/82 
-f 2078/506/81 864/506/81 865/506/81 2079/506/81 
-f 1541/170/54 212/170/54 866/170/54 2080/170/54 
-f 2081/576/82 868/576/82 867/576/82 1537/576/82 
-f 2080/170/81 866/170/81 868/576/81 2081/576/81 
-f 2082/287/54 870/287/54 835/287/54 2060/287/54 
-f 2083/91/82 874/91/82 870/91/82 2082/91/82 
-f 1985/91/54 704/91/54 706/91/54 1984/91/54 
-f 2084/91/82 888/91/82 703/91/82 1983/91/82 
-f 2085/91/82 887/91/82 888/91/82 2084/91/82 
-f 2086/91/34 882/91/34 884/91/34 2087/91/34 
-f 2088/91/81 879/91/81 882/91/81 2086/91/81 
-f 2089/91/81 885/91/81 890/91/81 2090/91/81 
-f 2090/91/34 890/91/34 889/91/34 2091/91/34 
-f 1982/91/82 705/91/82 874/91/82 2083/91/82 
-f 2092/91/54 883/91/54 885/91/54 2089/91/54 
-f 2091/91/34 889/91/34 886/91/34 2093/91/34 
-f 2093/91/54 886/91/54 887/91/54 2085/91/54 
-f 2094/91/82 892/91/82 883/91/82 2092/91/82 
-f 2087/91/82 884/91/82 891/91/82 2095/91/82 
-f 2095/91/81 891/91/81 894/91/81 2096/91/81 
-f 2097/91/81 896/91/81 892/91/81 2094/91/81 
-f 2098/91/54 895/91/54 896/91/54 2097/91/54 
-f 2099/94/82 898/94/82 710/94/82 1990/94/82 
-f 1991/94/34 709/94/34 712/94/34 1992/94/34 
-f 2096/91/82 894/91/82 904/91/82 2100/91/82 
-f 1989/91/81 711/91/81 895/91/81 2098/91/81 
-f 2100/91/224 904/91/224 905/91/224 2101/91/224 
-f 2101/91/81 905/91/81 906/91/81 2102/91/81 
-f 2102/91/81 906/91/81 907/91/81 2103/91/81 
-f 1993/94/81 714/94/81 898/94/81 2099/94/81 
-f 2103/91/82 907/91/82 909/91/82 2104/91/82 
-f 2104/91/81 909/91/81 911/91/81 2105/91/81 
-f 2105/91/81 911/91/81 913/91/81 2106/91/81 
-f 2106/91/81 913/91/81 917/91/81 2107/91/81 
-f 2108/366/81 727/366/81 716/366/81 1994/366/81 
-f 2107/91/225 917/91/225 921/91/225 2109/91/225 
-f 1998/369/81 688/369/81 727/369/81 2108/369/81 
-f 2109/91/54 921/91/54 925/91/54 2110/91/54 
-f 2111/369/81 749/369/81 728/369/81 1999/369/81 
-f 2110/91/226 925/91/226 929/91/226 2112/91/226 
-f 2006/369/81 746/369/81 749/369/81 2111/369/81 
-f 2112/91/227 929/91/227 933/91/227 2113/91/227 
-f 2114/369/81 936/369/81 752/369/81 2011/369/81 
-f 2115/369/34 939/369/34 936/369/34 2114/369/34 
-f 2116/369/34 943/369/34 944/369/34 2117/369/34 
-f 2117/369/81 944/369/81 945/369/81 2118/369/81 
-f 2005/369/81 744/369/81 748/369/81 2007/369/81 
-f 2113/369/82 933/369/82 943/369/82 2116/369/82 
-f 2119/369/81 946/369/81 939/369/81 2115/369/81 
-f 2118/369/82 945/369/82 948/369/82 2120/369/82 
-f 2120/369/81 948/369/81 947/369/81 2121/369/81 
-f 2122/369/34 950/369/34 946/369/34 2119/369/34 
-f 2121/369/82 947/369/82 949/369/82 2123/369/82 
-f 2123/369/81 949/369/81 950/369/81 2122/369/81 
-f 2124/287/34 875/287/34 878/287/34 2125/287/34 
-f 2126/91/228 952/91/228 879/91/228 2088/91/228 
-f 2125/91/81 878/91/81 952/91/81 2126/91/81 
-f 2063/287/229 848/287/229 869/287/229 2127/287/229 
-f 2127/91/230 869/91/230 875/91/230 2124/91/230 
-f 1828/590/81 964/590/81 75/589/81 1576/589/81 
-f 1490/597/82 973/597/82 61/418/82 1558/418/82 
-f 2128/451/81 508/451/81 966/579/81 1835/579/81 
-f 1834/449/34 504/449/34 509/450/34 2129/450/34 
-f 2129/450/34 509/450/34 508/451/34 2128/451/34 
-f 2130/459/34 518/459/34 521/462/34 1836/462/34 
-f 1839/454/34 513/454/34 518/459/34 2130/459/34 
-f 2131/614/34 991/614/34 990/613/34 1826/613/34 
-f 2132/581/34 957/581/34 991/614/34 2131/614/34 
-f 2133/582/34 958/582/34 957/581/34 2132/581/34 
-f 2134/612/34 989/612/34 958/582/34 2133/582/34 
-f 2135/611/34 988/611/34 989/612/34 2134/612/34 
-f 2136/610/34 987/610/34 988/611/34 2135/611/34 
-f 1832/600/34 976/600/34 987/610/34 2136/610/34 
-f 2137/830/34 1195/830/34 1193/828/34 1781/828/34 
-f 2138/832/81 1197/832/81 1195/830/81 2137/830/81 
-f 2139/834/81 1199/834/81 1197/832/81 2138/832/81 
-f 2140/625/81 1002/625/81 1199/834/81 2139/834/81 
-f 2141/626/81 1003/626/81 1002/625/81 2140/625/81 
-f 2142/827/81 1192/827/81 1003/626/81 2141/626/81 
-f 2143/825/81 1190/825/81 1192/827/81 2142/827/81 
-f 2144/823/81 1188/823/81 1190/825/81 2143/825/81 
-f 2145/821/81 1186/821/81 1188/823/81 2144/823/81 
-f 1782/660/81 1037/660/81 1186/821/81 2145/821/81 
-f 2146/862/81 1227/862/81 1225/860/81 1688/860/81 
-f 2147/864/82 1229/864/82 1227/862/82 2146/862/82 
-f 2148/866/82 1231/866/82 1229/864/82 2147/864/82 
-f 2149/181/82 223/181/82 1231/866/82 2148/866/82 
-f 2150/871/82 1236/871/82 220/178/82 2151/178/82 
-f 2152/872/82 1237/872/82 1236/871/82 2150/871/82 
-f 2153/874/82 1239/874/82 1237/872/82 2152/872/82 
-f 2151/178/82 220/178/82 223/181/82 2149/181/82 
-f 1676/869/82 1234/869/82 1233/868/82 2154/868/82 
-f 2154/868/82 1233/868/82 1239/874/82 2153/874/82 
-f 1815/428/82 483/428/82 493/439/82 1675/439/82 
-f 1493/433/82 487/433/82 486/432/82 1812/432/82 
-f 1895/55/81 55/55/81 591/889/81 1896/889/81 
-f 1902/882/54 596/882/54 56/56/54 1894/56/54 
-f 1553/879/231 1242/879/231 597/878/231 1901/878/231 
-f 2155/883/232 1245/883/232 1244/881/232 1554/881/232 
-f 2156/57/44 57/57/44 1245/883/44 2155/883/44 
-f 2157/58/44 58/58/44 57/57/44 2156/57/44 
-f 2158/888/44 1249/888/44 58/58/44 2157/58/44 
-f 2159/884/44 1246/884/44 1249/888/44 2158/888/44 
-f 1550/885/44 1247/885/44 1246/884/44 2159/884/44 
-f 1862/482/44 1864/71/44 71/71/44 555/482/44 
-f 2160/480/54 553/480/54 552/479/54 1861/479/54 
-f 1575/890/34 1250/890/34 553/480/34 2160/480/34 
-f 2161/478/34 551/478/34 550/477/34 1574/477/34 
-f 1860/73/34 73/73/34 551/478/34 2161/478/34 
-f 1573/892/34 1252/892/34 549/476/34 1863/476/34 
-f 2162/679/54 1056/679/54 1055/678/54 1481/678/54 
-f 2163/978/81 1336/978/81 1056/679/81 2162/679/81 
-f 2164/980/81 1338/980/81 1336/978/81 2163/978/81 
-f 2165/982/81 1340/982/81 1338/980/81 2164/980/81 
-f 2166/904/81 1264/904/81 1340/982/81 2165/982/81 
-f 2167/905/81 1265/905/81 1264/904/81 2166/904/81 
-f 2168/977/81 1335/977/81 1265/905/81 2167/905/81 
-f 2169/975/81 1333/975/81 1335/977/81 2168/977/81 
-f 2170/971/81 1329/971/81 1333/975/81 2169/975/81 
-f 1506/972/81 1330/972/81 1329/971/81 2170/971/81 
-f 1728/269/81 311/269/81 310/268/81 1724/268/81 
-f 2171/1037/82 1394/1037/82 1393/1035/82 1680/1035/82 
-f 2172/1038/82 1395/1038/82 1394/1037/82 2171/1037/82 
-f 2173/1039/82 1396/1039/82 1395/1038/82 2172/1038/82 
-f 2174/1040/82 1397/1040/82 1396/1039/82 2173/1039/82 
-f 2175/155/82 201/155/82 1397/1040/82 2174/1040/82 
-f 2176/152/82 198/152/82 201/155/82 2175/155/82 
-f 2177/1041/82 1398/1041/82 198/152/82 2176/152/82 
-f 2178/1042/82 1399/1042/82 1398/1041/82 2177/1041/82 
-f 2179/1043/82 1400/1043/82 1399/1042/82 2178/1042/82 
-f 2180/1044/82 1401/1044/82 1400/1043/82 2179/1043/82 
-f 2181/1045/82 1402/1045/82 1401/1044/82 2180/1044/82 
-f 1687/176/82 218/176/82 1402/1045/82 2181/1045/82 
-f 2182/1097/82 1441/1097/82 1440/1096/82 1519/1096/82 
-f 2183/1099/54 1443/1099/54 1441/1097/54 2182/1097/54 
-f 2184/1101/54 1445/1101/54 1443/1099/54 2183/1099/54 
-f 2185/1103/54 1447/1103/54 1445/1101/54 2184/1101/54 
-f 2186/136/54 182/136/54 1447/1103/54 2185/1103/54 
-f 2187/137/54 183/137/54 182/136/54 2186/136/54 
-f 2188/1093/54 1437/1093/54 183/137/54 2187/137/54 
-f 2189/1091/54 1435/1091/54 1437/1093/54 2188/1093/54 
-f 2190/1089/54 1433/1089/54 1435/1091/54 2189/1091/54 
-f 2191/1087/54 1431/1087/54 1433/1089/54 2190/1089/54 
-f 2192/1064/54 1410/1064/54 1431/1087/54 2191/1087/54 
-f 1516/138/54 184/138/54 1410/1064/54 2192/1064/54 
-f 2193/1095/54 1439/1095/54 1420/1074/54 1670/1074/54 
-f 1500/149/233 195/149/233 1458/1119/233 1579/1119/233 
-f 2194/141/82 187/141/82 1454/1110/82 1671/1110/82 
-f 1514/142/54 188/142/54 187/141/54 2194/141/54 
-f 1520/1113/54 1457/1113/54 1456/1112/54 2195/1112/54 
-f 2195/1112/81 1456/1112/81 1439/1095/81 2193/1095/81 
-f 2196/1133/34 1469/1133/34 1467/1129/34 1533/1129/34 
-f 1535/1123/234 1463/1123/234 1462/1122/234 2197/1122/234 
-f 1532/1127/95 1465/1127/95 136/1126/95 1631/1126/95 
-f 2198/47/235 47/47/235 1469/1133/235 2196/1133/235 
-f 2199/48/236 48/48/236 47/47/236 2198/47/236 
-f 2200/1130/237 1468/1130/237 48/48/237 2199/48/237 
-f 2197/1122/238 1462/1122/238 1468/1130/238 2200/1130/238 
-f 1630/1131/239 1629/49/239 49/49/239 133/1131/239 
-f 1632/1132/240 135/1132/240 50/50/240 1628/50/240 
-f 2201/1145/241 1477/1145/241 1476/1142/241 1588/1142/241 
-f 2202/87/54 87/87/54 1477/1145/54 2201/1145/54 
-f 2203/88/54 88/88/54 87/87/54 2202/87/54 
-f 2204/1138/54 1473/1138/54 88/88/54 2203/88/54 
-f 2205/1134/54 1470/1134/54 1473/1138/54 2204/1138/54 
-f 1590/1135/54 1471/1135/54 1470/1134/54 2205/1134/54 
-f 1661/89/54 89/89/54 158/1139/54 1652/1139/54 
-f 1650/1144/34 156/1144/34 90/90/34 1662/90/34 
-f 1587/1140/34 1474/1140/34 157/1143/34 1651/1143/34 
+f 1940/521/82 639/521/82 217/175/82 1986/175/82 
+f 1987/94/82 660/94/82 659/94/82 1988/94/82 
+f 1955/94/81 655/94/81 709/94/81 1989/94/81 
+f 1990/94/54 708/94/54 706/94/54 1956/94/54 
+f 1988/94/34 659/94/34 707/94/34 1991/94/34 
+f 1992/94/54 710/94/54 660/94/54 1987/94/54 
+f 1975/367/34 689/367/34 712/367/34 1993/367/34 
+f 1970/369/217 676/369/217 693/369/217 1977/369/217 
+f 1994/369/218 714/369/218 681/369/218 1995/369/218 
+f 1996/547/175 716/547/175 715/546/175 1997/546/175 
+f 1997/546/82 715/546/82 682/541/82 1972/541/82 
+f 1995/369/82 681/369/82 686/369/82 1998/369/82 
+f 1999/369/81 726/369/81 724/369/81 2000/369/81 
+f 2000/369/34 724/369/34 723/369/34 2001/369/34 
+f 2002/552/81 727/552/81 716/547/81 1996/547/81 
+f 1958/530/82 662/530/82 733/556/82 2003/556/82 
+f 2003/556/82 733/556/82 727/552/82 2002/552/82 
+f 2004/369/82 743/369/82 742/369/82 2005/369/82 
+f 2001/369/54 723/369/54 744/369/54 2006/369/54 
+f 2007/369/54 746/369/54 745/369/54 2008/369/54 
+f 2008/369/219 745/369/219 743/369/219 2004/369/219 
+f 2009/369/81 749/369/81 738/369/81 1966/369/81 
+f 2010/369/82 748/369/82 749/369/82 2009/369/82 
+f 2011/369/34 750/369/34 748/369/34 2010/369/34 
+f 1960/532/34 664/532/34 751/532/34 2012/532/34 
+f 2013/531/81 752/531/81 663/531/81 1543/531/81 
+f 2012/532/82 751/532/82 752/531/82 2013/531/82 
+f 2014/527/34 773/527/34 651/527/34 1950/527/34 
+f 2015/506/34 792/506/34 779/507/34 2016/507/34 
+f 2017/562/81 760/562/81 758/560/81 1934/560/81 
+f 2018/564/82 762/564/82 760/562/82 2017/562/82 
+f 2019/566/82 764/566/82 762/564/82 2018/564/82 
+f 2020/511/82 629/511/82 764/566/82 2019/566/82 
+f 2021/512/82 630/512/82 629/511/82 2020/511/82 
+f 2022/573/82 771/573/82 630/512/82 2021/512/82 
+f 2023/571/82 769/571/82 771/573/82 2022/573/82 
+f 2024/569/82 767/569/82 769/571/82 2023/571/82 
+f 2025/567/82 765/567/82 767/569/82 2024/569/82 
+f 1936/528/82 652/528/82 765/567/82 2025/567/82 
+f 2026/570/82 794/570/82 793/568/82 2027/568/82 
+f 2028/574/81 796/574/81 795/572/81 2029/572/81 
+f 2030/575/81 786/575/81 787/510/81 2031/510/81 
+f 2032/576/220 802/576/220 786/575/220 2030/575/220 
+f 2033/563/221 783/563/221 802/576/221 2032/576/221 
+f 2034/4/81 789/4/81 328/4/81 1739/4/81 
+f 2035/1/81 1740/1/81 329/1/81 788/1/81 
+f 2036/4/82 790/4/82 789/4/82 2034/4/82 
+f 2035/1/81 788/1/81 773/1/81 2014/1/81 
+f 1929/506/82 624/506/82 756/506/82 2037/506/82 
+f 2038/574/222 797/574/222 796/574/222 2028/574/222 
+f 2031/510/34 787/510/34 799/510/34 2039/510/34 
+f 2040/570/54 801/570/54 794/570/54 2026/570/54 
+f 2029/572/223 795/572/223 800/572/223 2041/572/223 
+f 2016/507/54 779/507/54 806/507/54 2042/507/54 
+f 2043/563/54 804/563/54 783/563/54 2033/563/54 
+f 2044/559/34 805/559/34 803/561/34 2045/561/34 
+f 2042/507/81 806/507/81 809/507/81 2046/507/81 
+f 2047/563/54 808/563/54 804/563/54 2043/563/54 
+f 2045/561/34 803/561/34 807/561/34 2048/561/34 
+f 2049/559/54 810/559/54 805/559/54 2044/559/54 
+f 2050/287/34 812/287/34 333/287/34 1741/287/34 
+f 2051/286/81 1743/286/81 330/286/81 811/286/81 
+f 2052/287/82 814/287/82 812/287/82 2050/287/82 
+f 2051/286/81 811/286/81 813/286/81 2053/286/81 
+f 2053/527/82 813/527/82 790/527/82 2036/527/82 
+f 2027/568/34 793/568/34 815/568/34 2054/568/34 
+f 2054/286/54 815/286/54 801/286/54 2040/286/54 
+f 2041/572/82 800/572/82 797/572/82 2038/572/82 
+f 2039/510/82 799/510/82 808/510/82 2047/510/82 
+f 2048/561/82 807/561/82 810/561/82 2049/561/82 
+f 2046/507/82 809/507/82 826/507/82 2055/507/82 
+f 2037/506/82 756/506/82 828/506/82 2056/506/82 
+f 2056/506/82 828/506/82 829/506/82 2057/506/82 
+f 2058/507/54 830/507/54 831/507/54 2059/507/54 
+f 2055/506/54 826/506/54 792/506/54 2015/506/54 
+f 2057/506/34 829/506/34 830/506/34 2058/506/34 
+f 2060/287/54 833/287/54 814/287/54 2052/287/54 
+f 2059/507/34 831/507/34 844/507/34 2061/507/34 
+f 2062/287/54 845/287/54 846/287/54 2063/287/54 
+f 2064/287/81 847/287/81 845/287/81 2062/287/81 
+f 2065/572/81 848/572/81 847/570/81 2064/570/81 
+f 2066/572/81 849/572/81 848/572/81 2065/572/81 
+f 2067/509/81 850/509/81 849/574/81 2066/574/81 
+f 2068/510/81 851/510/81 850/509/81 2067/509/81 
+f 2069/510/81 852/510/81 851/510/81 2068/510/81 
+f 2070/561/81 853/561/81 852/563/81 2069/563/81 
+f 2071/561/81 854/561/81 853/561/81 2070/561/81 
+f 2072/507/81 855/507/81 854/559/81 2071/559/81 
+f 2073/507/81 856/507/81 855/507/81 2072/507/81 
+f 2074/507/81 860/507/81 856/507/81 2073/507/81 
+f 2061/507/81 844/507/81 858/507/81 2075/507/81 
+f 2076/507/82 861/507/82 860/507/82 2074/507/82 
+f 2077/507/81 859/507/81 861/507/81 2076/507/81 
+f 2075/507/54 858/507/54 862/507/54 2078/507/54 
+f 2079/507/82 863/507/82 859/507/82 2077/507/82 
+f 2078/507/81 862/507/81 863/507/81 2079/507/81 
+f 1542/170/54 212/170/54 864/170/54 2080/170/54 
+f 2081/577/82 866/577/82 865/577/82 1538/577/82 
+f 2080/170/81 864/170/81 866/577/81 2081/577/81 
+f 2082/287/54 868/287/54 833/287/54 2060/287/54 
+f 2083/91/82 872/91/82 868/91/82 2082/91/82 
+f 1985/91/54 702/91/54 704/91/54 1984/91/54 
+f 2084/91/82 886/91/82 701/91/82 1983/91/82 
+f 2085/91/82 885/91/82 886/91/82 2084/91/82 
+f 2086/91/34 880/91/34 882/91/34 2087/91/34 
+f 2088/91/81 877/91/81 880/91/81 2086/91/81 
+f 2089/91/81 883/91/81 888/91/81 2090/91/81 
+f 2090/91/34 888/91/34 887/91/34 2091/91/34 
+f 1982/91/82 703/91/82 872/91/82 2083/91/82 
+f 2092/91/54 881/91/54 883/91/54 2089/91/54 
+f 2091/91/34 887/91/34 884/91/34 2093/91/34 
+f 2093/91/54 884/91/54 885/91/54 2085/91/54 
+f 2094/91/82 890/91/82 881/91/82 2092/91/82 
+f 2087/91/82 882/91/82 889/91/82 2095/91/82 
+f 2095/91/81 889/91/81 892/91/81 2096/91/81 
+f 2097/91/81 894/91/81 890/91/81 2094/91/81 
+f 2098/91/54 893/91/54 894/91/54 2097/91/54 
+f 2099/94/82 896/94/82 708/94/82 1990/94/82 
+f 1991/94/34 707/94/34 710/94/34 1992/94/34 
+f 2096/91/82 892/91/82 902/91/82 2100/91/82 
+f 1989/91/81 709/91/81 893/91/81 2098/91/81 
+f 2100/91/224 902/91/224 903/91/224 2101/91/224 
+f 2101/91/81 903/91/81 904/91/81 2102/91/81 
+f 2102/91/81 904/91/81 905/91/81 2103/91/81 
+f 1993/94/81 712/94/81 896/94/81 2099/94/81 
+f 2103/91/82 905/91/82 907/91/82 2104/91/82 
+f 2104/91/81 907/91/81 909/91/81 2105/91/81 
+f 2105/91/81 909/91/81 911/91/81 2106/91/81 
+f 2106/91/81 911/91/81 915/91/81 2107/91/81 
+f 2108/366/81 725/366/81 714/366/81 1994/366/81 
+f 2107/91/225 915/91/225 919/91/225 2109/91/225 
+f 1998/369/81 686/369/81 725/369/81 2108/369/81 
+f 2109/91/54 919/91/54 923/91/54 2110/91/54 
+f 2111/369/81 747/369/81 726/369/81 1999/369/81 
+f 2110/91/226 923/91/226 927/91/226 2112/91/226 
+f 2006/369/81 744/369/81 747/369/81 2111/369/81 
+f 2112/91/227 927/91/227 931/91/227 2113/91/227 
+f 2114/369/81 934/369/81 750/369/81 2011/369/81 
+f 2115/369/34 937/369/34 934/369/34 2114/369/34 
+f 2116/369/34 941/369/34 942/369/34 2117/369/34 
+f 2117/369/81 942/369/81 943/369/81 2118/369/81 
+f 2005/369/81 742/369/81 746/369/81 2007/369/81 
+f 2113/369/82 931/369/82 941/369/82 2116/369/82 
+f 2119/369/81 944/369/81 937/369/81 2115/369/81 
+f 2118/369/82 943/369/82 946/369/82 2120/369/82 
+f 2120/369/81 946/369/81 945/369/81 2121/369/81 
+f 2122/369/34 948/369/34 944/369/34 2119/369/34 
+f 2121/369/82 945/369/82 947/369/82 2123/369/82 
+f 2123/369/81 947/369/81 948/369/81 2122/369/81 
+f 2124/287/34 873/287/34 876/287/34 2125/287/34 
+f 2126/91/228 950/91/228 877/91/228 2088/91/228 
+f 2125/91/81 876/91/81 950/91/81 2126/91/81 
+f 2063/287/229 846/287/229 867/287/229 2127/287/229 
+f 2127/91/230 867/91/230 873/91/230 2124/91/230 
+f 1829/592/81 963/592/81 75/591/81 1577/591/81 
+f 1491/599/82 972/599/82 61/418/82 1559/418/82 
+f 2128/451/81 508/451/81 965/581/81 1836/581/81 
+f 2129/449/34 504/449/34 509/450/34 2130/450/34 
+f 2130/450/34 509/450/34 508/451/34 2128/451/34 
+f 2131/460/34 518/460/34 521/463/34 1837/463/34 
+f 2132/603/34 977/603/34 518/460/34 2131/460/34 
+f 2133/618/34 992/618/34 991/617/34 1827/617/34 
+f 2134/583/34 956/583/34 992/618/34 2133/618/34 
+f 2135/584/34 957/584/34 956/583/34 2134/583/34 
+f 2136/616/34 990/616/34 957/584/34 2135/584/34 
+f 2137/615/34 989/615/34 990/616/34 2136/616/34 
+f 2138/614/34 988/614/34 989/615/34 2137/615/34 
+f 1834/602/34 975/602/34 988/614/34 2138/614/34 
+f 2139/834/34 1196/834/34 1194/832/34 1782/832/34 
+f 2140/836/81 1198/836/81 1196/834/81 2139/834/81 
+f 2141/838/81 1200/838/81 1198/836/81 2140/836/81 
+f 2142/629/81 1003/629/81 1200/838/81 2141/838/81 
+f 2143/630/81 1004/630/81 1003/629/81 2142/629/81 
+f 2144/831/81 1193/831/81 1004/630/81 2143/630/81 
+f 2145/829/81 1191/829/81 1193/831/81 2144/831/81 
+f 2146/827/81 1189/827/81 1191/829/81 2145/829/81 
+f 2147/825/81 1187/825/81 1189/827/81 2146/827/81 
+f 1783/664/81 1038/664/81 1187/825/81 2147/825/81 
+f 2148/866/81 1228/866/81 1226/864/81 1689/864/81 
+f 2149/868/82 1230/868/82 1228/866/82 2148/866/82 
+f 2150/870/82 1232/870/82 1230/868/82 2149/868/82 
+f 2151/181/82 223/181/82 1232/870/82 2150/870/82 
+f 2152/875/82 1237/875/82 220/178/82 2153/178/82 
+f 2154/876/82 1238/876/82 1237/875/82 2152/875/82 
+f 2155/878/82 1240/878/82 1238/876/82 2154/876/82 
+f 2153/178/82 220/178/82 223/181/82 2151/181/82 
+f 1677/873/82 1235/873/82 1234/872/82 2156/872/82 
+f 2156/872/82 1234/872/82 1240/878/82 2155/878/82 
+f 1816/428/82 483/428/82 493/439/82 1676/439/82 
+f 1494/433/82 487/433/82 486/432/82 1813/432/82 
+f 1895/55/81 55/55/81 589/893/81 1896/893/81 
+f 1902/886/54 594/886/54 56/56/54 1894/56/54 
+f 1554/883/231 1243/883/231 595/882/231 1901/882/231 
+f 2157/887/232 1246/887/232 1245/885/232 1555/885/232 
+f 2158/57/44 57/57/44 1246/887/44 2157/887/44 
+f 2159/58/44 58/58/44 57/57/44 2158/57/44 
+f 2160/892/44 1250/892/44 58/58/44 2159/58/44 
+f 2161/888/44 1247/888/44 1250/892/44 2160/892/44 
+f 1551/889/44 1248/889/44 1247/888/44 2161/888/44 
+f 1862/483/44 1864/71/44 71/71/44 553/483/44 
+f 2162/481/54 551/481/54 550/480/54 1861/480/54 
+f 1576/894/34 1251/894/34 551/481/34 2162/481/34 
+f 2163/479/34 549/479/34 548/478/34 1575/478/34 
+f 1860/73/34 73/73/34 549/479/34 2163/479/34 
+f 1574/896/34 1253/896/34 547/477/34 1863/477/34 
+f 2164/683/54 1057/683/54 1056/682/54 1482/682/54 
+f 2165/982/81 1337/982/81 1057/683/81 2164/683/81 
+f 2166/984/81 1339/984/81 1337/982/81 2165/982/81 
+f 2167/986/81 1341/986/81 1339/984/81 2166/984/81 
+f 2168/908/81 1265/908/81 1341/986/81 2167/986/81 
+f 2169/909/81 1266/909/81 1265/908/81 2168/908/81 
+f 2170/981/81 1336/981/81 1266/909/81 2169/909/81 
+f 2171/979/81 1334/979/81 1336/981/81 2170/981/81 
+f 2172/975/81 1330/975/81 1334/979/81 2171/979/81 
+f 1507/976/81 1331/976/81 1330/975/81 2172/975/81 
+f 1729/269/81 311/269/81 310/268/81 1725/268/81 
+f 2173/1041/82 1395/1041/82 1394/1039/82 1681/1039/82 
+f 2174/1042/82 1396/1042/82 1395/1041/82 2173/1041/82 
+f 2175/1043/82 1397/1043/82 1396/1042/82 2174/1042/82 
+f 2176/1044/82 1398/1044/82 1397/1043/82 2175/1043/82 
+f 2177/155/82 201/155/82 1398/1044/82 2176/1044/82 
+f 2178/152/82 198/152/82 201/155/82 2177/155/82 
+f 2179/1045/82 1399/1045/82 198/152/82 2178/152/82 
+f 2180/1046/82 1400/1046/82 1399/1045/82 2179/1045/82 
+f 2181/1047/82 1401/1047/82 1400/1046/82 2180/1046/82 
+f 2182/1048/82 1402/1048/82 1401/1047/82 2181/1047/82 
+f 2183/1049/82 1403/1049/82 1402/1048/82 2182/1048/82 
+f 1688/176/82 218/176/82 1403/1049/82 2183/1049/82 
+f 2184/1101/82 1442/1101/82 1441/1100/82 1520/1100/82 
+f 2185/1103/54 1444/1103/54 1442/1101/54 2184/1101/54 
+f 2186/1105/54 1446/1105/54 1444/1103/54 2185/1103/54 
+f 2187/1107/54 1448/1107/54 1446/1105/54 2186/1105/54 
+f 2188/136/54 182/136/54 1448/1107/54 2187/1107/54 
+f 2189/137/54 183/137/54 182/136/54 2188/136/54 
+f 2190/1097/54 1438/1097/54 183/137/54 2189/137/54 
+f 2191/1095/54 1436/1095/54 1438/1097/54 2190/1097/54 
+f 2192/1093/54 1434/1093/54 1436/1095/54 2191/1095/54 
+f 2193/1091/54 1432/1091/54 1434/1093/54 2192/1093/54 
+f 2194/1068/54 1411/1068/54 1432/1091/54 2193/1091/54 
+f 1517/138/54 184/138/54 1411/1068/54 2194/1068/54 
+f 2195/1099/54 1440/1099/54 1421/1078/54 1671/1078/54 
+f 1501/149/233 195/149/233 1459/1123/233 1580/1123/233 
+f 2196/141/82 187/141/82 1455/1114/82 1672/1114/82 
+f 1515/142/54 188/142/54 187/141/54 2196/141/54 
+f 1521/1117/54 1458/1117/54 1457/1116/54 2197/1116/54 
+f 2197/1116/81 1457/1116/81 1440/1099/81 2195/1099/81 
+f 2198/1137/34 1470/1137/34 1468/1133/34 1534/1133/34 
+f 1536/1127/234 1464/1127/234 1463/1126/234 2199/1126/234 
+f 1533/1131/95 1466/1131/95 136/1130/95 1632/1130/95 
+f 2200/47/235 47/47/235 1470/1137/235 2198/1137/235 
+f 2201/48/236 48/48/236 47/47/236 2200/47/236 
+f 2202/1134/237 1469/1134/237 48/48/237 2201/48/237 
+f 2199/1126/238 1463/1126/238 1469/1134/238 2202/1134/238 
+f 1631/1135/239 1630/49/239 49/49/239 133/1135/239 
+f 1633/1136/240 135/1136/240 50/50/240 1629/50/240 
+f 2203/1149/241 1478/1149/241 1477/1146/241 1589/1146/241 
+f 2204/87/54 87/87/54 1478/1149/54 2203/1149/54 
+f 2205/88/54 88/88/54 87/87/54 2204/87/54 
+f 2206/1142/54 1474/1142/54 88/88/54 2205/88/54 
+f 2207/1138/54 1471/1138/54 1474/1142/54 2206/1142/54 
+f 1591/1139/54 1472/1139/54 1471/1138/54 2207/1138/54 
+f 1662/89/54 89/89/54 158/1143/54 1653/1143/54 
+f 1651/1148/34 156/1148/34 90/90/34 1663/90/34 
+f 1588/1144/34 1475/1144/34 157/1147/34 1652/1147/34 
 f 461/404/34 460/403/34 447/390/34 450/393/34 
 f 449/392/1 448/391/1 451/394/1 454/397/1 
 f 455/398/1 458/401/1 463/406/1 466/409/1 
@@ -5569,8 +5799,126 @@ f 304/262/1 301/259/1 288/246/1 293/251/1
 f 307/265/1 303/261/1 292/250/1 299/257/1 
 f 318/276/1 314/272/1 303/261/1 307/265/1 
 s 1
-f 348/298/1 347/297/1 1226/861/1 1228/863/1 
+f 348/298/1 347/297/1 1227/865/1 1229/867/1 
 s off
 f 281/238/1 286/226/1 268/226/1 
-# 1850 polygons - 36 triangles
+f 504/449/82 2129/449/82 2208/449/82 2209/449/82 
+f 1835/424/81 502/424/81 2210/424/81 2211/424/81 
+f 1830/580/1 953/580/1 511/453/1 510/452/1 
+f 978/604/1 977/603/1 513/455/1 512/454/1 
+s 1
+f 473/416/1 512/454/1 511/453/1 
+f 473/416/1 978/604/1 512/454/1 
+s off
+f 1839/580/242 1838/580/242 2212/580/242 2213/580/242 
+f 2214/603/242 2215/603/242 2216/603/242 2217/603/242 
+f 2213/580/81 2212/580/81 2218/580/81 2219/580/81 
+f 2217/603/82 2216/603/82 2220/603/82 2221/603/82 
+f 2215/603/82 2214/603/82 2222/603/82 2223/603/82 
+f 977/603/82 2132/603/82 2224/603/82 2225/603/82 
+f 2226/603/82 2227/603/82 2228/603/82 2229/603/82 
+f 2223/603/34 2222/603/34 2230/603/34 2231/603/34 
+f 2227/603/243 2226/603/243 2232/603/243 2233/603/243 
+f 2225/603/243 2224/603/243 2234/603/243 2235/603/243 
+f 2229/603/34 2228/603/34 2236/603/34 2237/603/34 
+f 2219/580/243 2218/580/243 2238/580/243 2239/580/243 
+f 2221/603/243 2220/603/243 2240/603/243 2241/603/243 
+f 2239/580/81 2238/580/81 2242/580/81 2243/580/81 
+f 2241/603/82 2240/603/82 2244/603/82 2245/603/82 
+f 2243/580/34 2242/580/34 2246/580/34 2247/580/34 
+f 2247/580/244 2246/580/244 2248/580/244 2249/580/244 
+f 2249/580/34 2248/580/34 2250/580/34 2251/580/34 
+f 2251/580/81 2250/580/81 2252/580/81 2253/580/81 
+f 2253/580/34 2252/580/34 2254/580/34 2255/580/34 
+f 2255/580/244 2254/580/244 2256/580/244 2257/580/244 
+f 2257/580/243 2256/580/243 2258/580/243 2259/580/243 
+f 2259/580/81 2258/580/81 2260/580/81 2261/580/81 
+f 2261/580/243 2260/580/243 2262/580/243 2263/580/243 
+f 2263/580/244 2262/580/244 2264/580/244 2265/580/244 
+f 2265/580/34 2264/580/34 2266/580/34 2267/580/34 
+f 2267/580/81 2266/580/81 2268/580/81 2269/580/81 
+f 2269/580/34 2268/580/34 2270/580/34 2271/580/34 
+f 2271/580/244 2270/580/244 2272/580/244 2273/580/244 
+f 2245/603/54 2244/603/54 2274/603/54 2275/603/54 
+f 2275/603/81 2274/603/81 2276/603/81 2277/603/81 
+f 2277/603/34 2276/603/34 2278/603/34 2279/603/34 
+f 2211/424/243 2210/424/243 2280/424/243 2281/424/243 
+f 2281/424/81 2280/424/81 2282/424/81 2283/424/81 
+f 2283/424/34 2282/424/34 2284/424/34 2285/424/34 
+f 2285/424/244 2284/424/244 2279/424/244 2278/424/244 
+f 2286/603/34 2287/603/34 2288/603/34 2289/603/34 
+f 2287/603/81 2286/603/81 2290/603/81 2291/603/81 
+f 2289/603/82 2288/603/82 2292/603/82 2293/603/82 
+f 2286/603/245 2289/603/245 2293/603/245 2290/603/245 
+f 2293/603/54 2292/603/54 2291/603/54 2290/603/54 
+f 2235/603/81 2234/603/81 2294/603/81 2295/603/81 
+f 2237/603/81 2236/603/81 2296/603/81 2297/603/81 
+f 2295/603/243 2294/603/243 2298/603/243 2299/603/243 
+f 2297/603/34 2296/603/34 2300/603/34 2301/603/34 
+f 2299/603/82 2298/603/82 2301/603/82 2300/603/82 
+f 2231/603/81 2230/603/81 2302/603/81 2303/603/81 
+f 2303/603/34 2302/603/34 2304/603/34 2305/603/34 
+f 2305/603/81 2304/603/81 2306/603/81 2307/603/81 
+f 2307/603/34 2306/603/34 2308/603/34 2309/603/34 
+f 2309/603/82 2308/603/82 2310/603/82 2311/603/82 
+f 2233/603/243 2232/603/243 2312/603/243 2313/603/243 
+f 2313/603/81 2312/603/81 2314/603/81 2315/603/81 
+f 2315/603/243 2314/603/243 2316/603/243 2317/603/243 
+f 2317/603/82 2316/603/82 2318/603/82 2319/603/82 
+f 2319/603/243 2318/603/243 2320/603/243 2321/603/243 
+f 2321/603/82 2320/603/82 2322/603/82 2323/603/82 
+f 2323/603/34 2322/603/34 2324/603/34 2325/603/34 
+f 2325/603/246 2324/603/246 2326/603/246 2327/603/246 
+f 2327/603/34 2326/603/34 2328/603/34 2329/603/34 
+f 2329/603/81 2328/603/81 2330/603/81 2331/603/81 
+f 2331/603/247 2330/603/247 2311/603/247 2310/603/247 
+f 2209/449/243 2208/449/243 2332/449/243 2333/449/243 
+f 2333/449/81 2332/449/81 2334/449/81 2335/449/81 
+f 2335/449/34 2334/449/34 2336/449/34 2337/449/34 
+f 2337/449/81 2336/449/81 2338/449/81 2339/449/81 
+f 2339/449/243 2338/449/243 2340/449/243 2341/449/243 
+f 2341/449/248 2340/449/248 2342/449/248 2343/449/248 
+f 2343/449/243 2342/449/243 2344/449/243 2345/449/243 
+f 2345/449/81 2344/449/81 2346/449/81 2347/449/81 
+f 2348/449/82 2349/449/82 2350/449/82 2351/449/82 
+f 2351/449/34 2350/449/34 2352/449/34 2353/449/34 
+f 2353/449/82 2352/449/82 2354/449/82 2355/449/82 
+f 2355/449/34 2354/449/34 2356/449/34 2357/449/34 
+f 2357/449/82 2356/449/82 2358/449/82 2359/449/82 
+f 2359/449/243 2358/449/243 2360/449/243 2361/449/243 
+f 2361/449/82 2360/449/82 2362/449/82 2363/449/82 
+f 2363/449/34 2362/449/34 2364/449/34 2365/449/34 
+f 2365/449/82 2364/449/82 2366/449/82 2367/449/82 
+f 2367/449/243 2366/449/243 2368/449/243 2369/449/243 
+f 2369/449/82 2368/449/82 2370/449/82 2371/449/82 
+f 2371/449/34 2370/449/34 2372/449/34 2373/449/34 
+f 2373/449/81 2372/449/81 2374/449/81 2375/449/81 
+f 2375/449/34 2374/449/34 2376/449/34 2377/449/34 
+f 2377/449/82 2376/449/82 2378/449/82 2379/449/82 
+f 2379/449/34 2378/449/34 2380/449/34 2381/449/34 
+f 2381/449/249 2380/449/249 2382/449/249 2383/449/249 
+f 2383/449/243 2382/449/243 2384/449/243 2385/449/243 
+f 2385/449/81 2384/449/81 2386/449/81 2387/449/81 
+f 2387/449/34 2386/449/34 2388/449/34 2389/449/34 
+f 2389/449/82 2388/449/82 2390/449/82 2391/449/82 
+f 2391/449/243 2390/449/243 2392/449/243 2393/449/243 
+f 2393/449/81 2392/449/81 2394/449/81 2395/449/81 
+f 2395/449/243 2394/449/243 2396/449/243 2397/449/243 
+f 2349/449/243 2348/449/243 2398/449/243 2399/449/243 
+f 2347/449/243 2346/449/243 2400/449/243 2401/449/243 
+f 2399/449/250 2398/449/250 2402/449/250 2403/449/250 
+f 2403/449/54 2402/449/54 2404/449/54 2405/449/54 
+f 2401/449/82 2400/449/82 2405/449/82 2404/449/82 
+f 2406/603/34 2407/603/34 2408/603/34 2409/603/34 
+f 2407/603/81 2406/603/81 2410/603/81 2411/603/81 
+f 2409/603/82 2408/603/82 2412/603/82 2413/603/82 
+f 2406/603/245 2409/603/245 2413/603/245 2410/603/245 
+f 2413/603/54 2412/603/54 2411/603/54 2410/603/54 
+f 2273/580/34 2272/580/34 2414/580/34 2415/580/34 
+f 2415/580/81 2414/580/81 2416/580/81 2417/580/81 
+f 2417/580/34 2416/580/34 2418/580/34 2419/580/34 
+f 2419/580/82 2418/580/82 2420/580/82 2421/580/82 
+f 2421/580/251 2420/580/251 2397/580/251 2396/580/251 
+f 2422/424/1 2423/424/1 2424/424/1 2425/424/1 
+# 1960 polygons - 38 triangles
 
diff --git a/static/lesson3d/mst.png b/static/lesson3d/mst.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3abeb1cf9b0f6ac58629599ced77197b5984baa
GIT binary patch
literal 11160
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

literal 0
HcmV?d00001

diff --git a/static/lesson3d/nextbutton.png b/static/lesson3d/nextbutton.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef90489ba405ddcf166b1c6318914131ec5e2469
GIT binary patch
literal 6003
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

literal 0
HcmV?d00001

diff --git a/static/lesson3d/选项.png b/static/lesson3d/选项.png
deleted file mode 100644
index d1c25886380dc6258b2108a2ed7d814150ddb5b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4138
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
Qpnc7!CTG|VB^Ipx4^+gd;s5{u


From 54295fe452e13ec185a3a7aa3360b0ea6ceb8b17 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 14 May 2021 18:31:46 +0800
Subject: [PATCH 13/32] =?UTF-8?q?=E5=A2=9E=E5=8A=A0pdf=20=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pdf.js                              |  32 +++
 src/api/upload.js                           |   4 +-
 src/components/QueryListPage/DataForm.vue   |  32 +++
 src/components/UploadFiles/picture-card.vue | 136 ++++++++++
 src/i18n/langs/zh/router.js                 |   1 +
 src/router/index.js                         |  19 ++
 src/utils/baseUrl.js                        |   4 +-
 src/views/uploadPdf/edit.vue                | 260 ++++++++++++++++++++
 src/views/uploadPdf/list.vue                | 136 ++++++++++
 9 files changed, 620 insertions(+), 4 deletions(-)
 create mode 100644 src/api/pdf.js
 create mode 100644 src/components/UploadFiles/picture-card.vue
 create mode 100644 src/views/uploadPdf/edit.vue
 create mode 100644 src/views/uploadPdf/list.vue

diff --git a/src/api/pdf.js b/src/api/pdf.js
new file mode 100644
index 000000000..e41e1c3d0
--- /dev/null
+++ b/src/api/pdf.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request';
+
+/** 创建分组 */
+export function postUploadFile(data) {
+    return request({
+        url: `/api/file`,
+        method: 'post',
+        data
+    });
+}
+// 查询
+export function getUploadFile() {
+    return request({
+        url: `/api/file`,
+        method: 'get'
+    });
+}
+// 修改
+export function putUploadFile(data) {
+    return request({
+        url: `/api/file`,
+        method: 'put',
+        data
+    });
+}
+// 删除
+export function deleteUploadFile(data) {
+    return request({
+        url: `/api/file`,
+        method: 'delete'
+    });
+}
diff --git a/src/api/upload.js b/src/api/upload.js
index 806bb8d7e..c2ea6b1de 100644
--- a/src/api/upload.js
+++ b/src/api/upload.js
@@ -3,10 +3,10 @@ import request from '@/utils/request';
 export const productIdentify = '00001&appSecret=joylink00001';
 
 export const pictureUrl = `/api/upload/PICTURE?appId=${productIdentify}`;
-// export const modelUrl = `/api/upload/model?appId=${productIdentify}`;
+// export const modelUrl = `/api/file?appId=${productIdentify}`;
 
 // export const attachmentUrl = `/api/upload/attachment?appId=${productIdentify}`;
-// export const meansUrl = `/api/upload/means?appId=${productIdentify}`;
+export const meansUrl = `/api/upload/MEANS?appId=${productIdentify}`;
 // export const regulationUrl = `/api/upload/regulation?appId=${productIdentify}`;
 
 export function getUrl(relatedUrl) {
diff --git a/src/components/QueryListPage/DataForm.vue b/src/components/QueryListPage/DataForm.vue
index 524eb2834..e7ec545db 100644
--- a/src/components/QueryListPage/DataForm.vue
+++ b/src/components/QueryListPage/DataForm.vue
@@ -353,13 +353,45 @@
         </el-form-item>
       </template>
 
+      <template v-else-if="checkFieldType(item, 'uploadPicture')">
+        <el-form-item v-show="item.show" :key="item.prop" :prop="item.prop" :label="item.label" :required="item.required">
+          <el-upload
+            class="upload-demo"
+            :action="item.action"
+            :on-success="item.onSuccess"
+            :http-request="item.uploadFile"
+            :on-change="item.onChange"
+            :limit="1"
+            :file-list="item.fileList"
+          >
+            <el-button size="small" type="primary">点击上传</el-button>
+            <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
+          </el-upload>
+        </el-form-item>
+        <!-- <el-form-item prop="imageUrl" /> -->
+        <!-- <picture-card
+          ref="upload"
+          v-model="fileList"
+          :action="action"
+          scope="file"
+          @disabled="onDisabled"
+        >
+          <div slot class="tips">请上传文件</div>
+        </picture-card> -->
+      </template>
+
     </template>
   </el-form>
 </template>
 
 <script>
+// import PictureCard from '@/components/UploadFiles/picture-card';
+
 export default {
     name: 'DataForm',
+    components: {
+        // PictureCard
+    },
     props: {
         form: {
             type: Object,
diff --git a/src/components/UploadFiles/picture-card.vue b/src/components/UploadFiles/picture-card.vue
new file mode 100644
index 000000000..2c5ad5d7b
--- /dev/null
+++ b/src/components/UploadFiles/picture-card.vue
@@ -0,0 +1,136 @@
+<template>
+  <div>
+    <el-upload
+      ref="upload"
+      list-type="picture-card"
+      :action="action"
+      :file-list="fileList"
+      :multiple="multiple"
+      :auto-upload="auto"
+      :limit="limit"
+      :http-request="uploadFile"
+      :on-change="onChange"
+      :on-remove="onRemove"
+      :on-exceed="onExceed"
+      :on-preview="pictureCardPreview"
+    >
+      <i class="el-icon-plus" />
+      <slot name="trigger" />
+    </el-upload>
+    <slot />
+    <el-dialog :visible.sync="dialogVisible" :modal="false">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+export default {
+    props: {
+        auto: {
+            type: Boolean,
+            default: false
+        },
+        multiple: {
+            type: Boolean,
+            default: false
+        },
+        action: {
+            type: String,
+            required: true
+        },
+        value: {
+            type: Array,
+            required: true
+        },
+        limit: {
+            type: Number,
+            default: 1
+        },
+        scope: {
+            type: String,
+            default: 'files'
+        },
+        extra: {
+            type: Object,
+            default() {
+                return {};
+            }
+        }
+    },
+    data() {
+        return {
+            fileList: [],
+            formData: '',
+            dialogVisible: false,
+            dialogImageUrl: ''
+        };
+    },
+    watch: {
+        value(val) {
+            this.fileList = val;
+        }
+    },
+    methods: {
+        onChange(file, fileList) {
+            this.fileList = fileList;
+            this.$emit('value', [...this.fileList]);
+            this.$emit('disabled', fileList.every(el => el.status == 'success'));
+        },
+        onRemove(file, fileList) {
+            this.fileList = fileList;
+            this.$emit('value', [...this.fileList]);
+            this.$emit('disabled', fileList.every(el => el.status == 'success'));
+        },
+        clearFiles() {
+            this.$refs.upload.clearFiles();
+            this.fileList = [];
+            this.$emit('value', [...this.fileList]);
+            this.$emit('disabled', true);
+        },
+        onExceed(files, fileLis) {
+            this.$message.info(`超出文件上传限制，限制${this.limit}个。`);
+        },
+        pictureCardPreview(file) {
+            this.dialogImageUrl = file.url;
+            this.dialogVisible = true;
+        },
+        uploadFile(file) {
+            this.formData.append(this.scope, file.file);
+        },
+        submit(upload) {
+            return new Promise((resolve, reject) => {
+                if (this.fileList.length) {
+                    var isUpload = this.fileList.every(file => file.status == 'ready');
+                    var isLt100M = this.fileList.every(file => file.size / 1024 / 1024 < 100);
+
+                    if (!isUpload) {
+                        reject({message: '没有需要上传的文件'});
+                    } else if (!isLt100M) {
+                        reject({message: '请检查，上传文件大小不能超过100MB!'});
+                    } else {
+                        this.formData = new FormData();
+                        this.$refs.upload.submit();
+                        Object.keys(this.extra).forEach(key => { this.formData.append(key, this.extra[key]); });
+
+                        upload(this.action, this.formData)
+                            .then(resp => { resolve(resp); })
+                            .catch(error => { reject(error); });
+                    }
+                } else {
+                    resolve();
+                }
+            });
+        }
+    }
+};
+</script>
+
+<style  lang="scss" scoped>
+	/deep/ {
+		.el-upload-list--picture-card .el-upload-list__item {
+			margin: 0 6px 0 0 !important;
+		}
+	}
+</style>
diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js
index 06c69bbe2..ab77c2c56 100644
--- a/src/i18n/langs/zh/router.js
+++ b/src/i18n/langs/zh/router.js
@@ -7,6 +7,7 @@ export default {
     newDesignEditor: '编辑器',
     newDesignEditorList: '图文列表',
     newDesignDraftEditorList: '文章草稿',
+    uploadPdf: 'PDF上传',
 
     mapManage: '地图管理',
     skinManage: '皮肤管理',
diff --git a/src/router/index.js b/src/router/index.js
index 653d756ae..e77017738 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -177,6 +177,8 @@ const Ueditor = () => import('@/views/editor/index');
 const UeditorList = () => import('@/views/editor/list');
 const UeditorDraftList = () => import('@/views/editor/listDraft');
 
+const UploadPdfList = () => import('@/views/uploadPdf/list');
+
 // import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
 // import { getSessionStorage } from '@/utils/auth';
 
@@ -1176,6 +1178,23 @@ export const asyncRouter = [
             }
         ]
     },
+    {
+        path: '/uploading',
+        component: Layout,
+        meta: {
+            i18n: 'router.uploadPdf',
+            roles: [admin, user]
+        },
+        children: [
+            {
+                path: 'list',
+                component: UploadPdfList,
+                meta: {
+                    i18n: 'router.uploadPdf'
+                }
+            }
+        ]
+    },
     { // 新个人地图
         path: '/design',
         component: Layout,
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index f4a99c662..8d2800298 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,10 +3,10 @@ export function getBaseUrl() {
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
         // BASE_API = 'https://test.joylink.club/jlcloud';
-        BASE_API = 'http://192.168.3.119:9000'; // 袁琪
+        // BASE_API = 'http://192.168.3.119:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
         // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
-        // BASE_API = 'http://192.168.3.120:9000'; // 张赛
+        BASE_API = 'http://192.168.3.120:9000'; // 张赛
         // BASE_API = 'http://192.168.8.140:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
diff --git a/src/views/uploadPdf/edit.vue b/src/views/uploadPdf/edit.vue
new file mode 100644
index 000000000..30a633f2a
--- /dev/null
+++ b/src/views/uploadPdf/edit.vue
@@ -0,0 +1,260 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center class="uploadDialog">
+    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { postUploadFile, putUploadFile } from '@/api/pdf';
+import { getPublishMapList, getPublishMapDetailById, getPublishMapVersionById } from '@/api/jmap/map';
+import { dbReadData, dbAddData, dbUpdateData } from '@/utils/indexedDb';
+// uploadFile
+import { meansUrl } from '@/api/upload';
+
+export default {
+    name: 'TrainingDetailEdit',
+    props: {
+        type: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                // cityCode: '',
+                mapId: '',
+                deviceTypes: '',
+                deviceIds: [],
+                upload: '',
+                filePath: '',
+                fileType: 'DRAWING'
+            },
+            rowData: null,
+            graphDataNew: null,
+            mapList: [],
+
+            fileList: [],
+            formData: '',
+            id: '',
+
+            deviceTypeList: [
+                { label: '区段', value: 'sectionList', code: 'SECTION' },
+                { label: '道岔', value: 'switchList', code: 'SWITCH' },
+                { label: '信号机', value: 'signalList', code: 'SIGNAL' },
+                { label: '车站', value: 'stationList', code: 'STATION' },
+                { label: '站台', value: 'stationStandList', code: 'STAND' },
+                { label: '屏蔽门', value: 'psdList', code: 'PSD' },
+                { label: '列车', value: 'trainList', code: 'TRAIN' }
+            ],
+            deviceCodesList: []
+        };
+    },
+    computed: {
+        action() {
+            return `${process.env.VUE_APP_UPLOAD_API}${meansUrl}`;
+        },
+        form() {
+            const form = {
+                labelWidth: '120px',
+                items: [
+                    { prop: 'mapId', label: '选择线路:', type:'select', options: this.mapList, optionValue:'id', optionLabel:'name', change: true, onChange: this.handleMap },
+                    { prop: 'deviceTypes', label: '选择设备类型:', type:'select', options: this.deviceTypeList, optionValue:'value', optionLabel:'label', change: true, onChange: this.handleDevice },
+                    { prop: 'deviceIds', label: '选择设备:', type:'select', multiple: true, options: this.deviceCodesList, optionValue:'code', optionLabel:'name' },
+                    { prop: 'upload', label: '上传:', type:'uploadPicture', show: this.type == 'ADD', action: this.action, fileList: this.fileList, onChange: this.onChange, onSuccess: this.onSuccess }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                mapId: [
+                    { required: true, message: '请选择线路', trigger: 'change' }
+                ],
+                deviceTypes: [
+                    { required: true, message: '请选择设备类型', trigger: 'change' }
+                ],
+                deviceIds: [
+                    { required: true, message: '请选择设备', trigger: 'change' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            if (this.type === 'ADD') {
+                return '上传PDF';
+            } else {
+                return '更新文章';
+            }
+        }
+    },
+    methods: {
+        async show(data) {
+            this.dialogVisible = true;
+            this.loadInitData();
+            if (this.type != 'ADD') {
+                const obj = this.deviceTypeList.find(el => el.code == data.deviceTypes[0]);
+                this.id = data.id;
+                this.rowData = data;
+                this.rowData.deviceTypes = obj ? obj.value : '';
+                this.formModel = {
+                    mapId: data.mapId,
+                    deviceTypes: obj ? obj.value : '',
+                    deviceIds: data.deviceIds,
+                    upload: '',
+                    filePath: data.filePath
+                };
+                await this.handleMap(data.mapId);
+                obj && await this.handleDevice(obj.value);
+            } else {
+                this.formModel = {
+                    mapId: '',
+                    deviceTypes: '',
+                    deviceIds: [],
+                    upload: '',
+                    filePath: ''
+                };
+            }
+        },
+        loadInitData() {
+            this.mapList = [];
+            const params = {
+                pageSize: 9999,
+                pageNum: 1
+            };
+            getPublishMapList(params).then(res => {
+                this.mapList = res.data.list.filter(el => !el.project );
+            });
+        },
+        async handleMap(mapId) {
+            if (mapId) {
+                if (mapId != this.rowData.mapId) {
+                    this.formModel.deviceIds = [];
+                    this.formModel.deviceTypes = '';
+                }
+                return new Promise(async (resolve, reject) => {
+                    const resp = await getPublishMapVersionById(mapId);
+                    const version = resp.data;
+                    dbReadData('mapData', mapId, version, async (mapData, version) =>{
+                        if (mapData && mapData.version == version) {
+                            this.graphDataNew = mapData.graphDataNew;
+                            resolve();
+                        } else if (mapData) {
+                            const res = await getPublishMapDetailById(mapId);
+                            this.graphDataNew = res.data.graphDataNew;
+                            dbUpdateData('mapData', res.data);
+                            resolve();
+                        } else {
+                            const res = await getPublishMapDetailById(mapId);
+                            this.graphDataNew = res.data.graphDataNew;
+                            dbAddData('mapData', res.data);
+                            resolve();
+                        }
+                    });
+                });
+            } else {
+                this.formModel.deviceIds = [];
+                this.formModel.mapId = '';
+                this.formModel.deviceTypes = '';
+            }
+        },
+        handleDevice(type) {
+            if (type) {
+                if (type != this.rowData.deviceTypes) {
+                    this.formModel.deviceIds = [];
+                }
+                this.deviceCodesList = this.graphDataNew[type].map(el => {
+                    return {
+                        code: el.code,
+                        name: `${el.name}(${el.code})`
+                    };
+                });
+            } else {
+                this.formModel.deviceIds = [];
+            }
+        },
+        // uploadFile(file) {
+        // this.formData.append('file', file.file);
+        // },
+        onSuccess(res, file) {
+            this.formModel.filePath = res.data;
+        },
+        doSave() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                if (self.type == 'ADD') {
+                    self.create();
+                } else {
+                    self.update();
+                }
+            });
+        },
+        create() {
+            const self = this;
+            const obj = this.deviceTypeList.find(el => el.value == this.formModel.deviceTypes);
+            if (obj) {
+                this.formModel.deviceTypes = [obj.code];
+            }
+            const data = {
+                fileType: 'DRAWING',
+                mapId: this.formModel.mapId,
+                deviceTypes: this.formModel.deviceTypes,
+                deviceIds: this.formModel.deviceIds,
+                filePath: this.formModel.filePath
+            };
+            postUploadFile(data).then((res) => {
+                self.$message.success('上传PDF成功!');
+                self.handleClose();
+                self.$emit('reloadTable');
+            }).catch(error => {
+                console.log(error);
+                self.$message.error(`创建文章失败:${error.message}`);
+            });
+        },
+        update() {
+            const self = this;
+            const obj = this.deviceTypeList.find(el => el.value == this.formModel.deviceTypes);
+            if (obj) {
+                this.formModel.deviceTypes = [obj.code];
+            }
+            const data = {
+                id: this.id,
+                fileType: 'DRAWING',
+                mapId: this.formModel.mapId,
+                deviceTypes: this.formModel.deviceTypes,
+                deviceIds: this.formModel.deviceIds,
+                filePath: this.formModel.filePath
+            };
+            putUploadFile(data).then(() => {
+                self.$message.success('更新文章成功!');
+                self.handleClose();
+                self.$emit('reloadTable');
+            }).catch(error => {
+                self.$message.error(`更新文章失败:${error.message}`);
+            });
+        },
+        handleClose() {
+            this.formModel = {
+                title: ''
+            };
+            this.$refs.dataform.resetForm();
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.uploadDialog{
+	/deep/ {
+		.el-select--medium{
+			width: 300px;
+		}
+	}
+}
+</style>
diff --git a/src/views/uploadPdf/list.vue b/src/views/uploadPdf/list.vue
new file mode 100644
index 000000000..a29b7b989
--- /dev/null
+++ b/src/views/uploadPdf/list.vue
@@ -0,0 +1,136 @@
+<template>
+  <div>
+    <!-- <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" /> -->
+    <el-card>
+      <el-form
+        ref="queryForm"
+        :model="formModel"
+        size="small"
+        style="padding: 6px 20px 6px 20px;overflow: hidden;"
+      >
+        <el-form-item label="标题" style="margin-bottom: 0;float: left; width: 300px;">
+          <el-input v-model="formModel.title" style="width: 240px;" />
+        </el-form-item>
+        <el-button style="margin-right: 10px; float: right;" type="primary" size="small" @click="createTitle">创建</el-button>
+        <el-button style="margin-right: 10px; float: right;" type="primary" size="small" @click="query">查询</el-button>
+      </el-form>
+    </el-card>
+    <el-table :data="tableData" border style="width: 100%">
+      <el-table-column label="线路">
+        <template slot-scope="scope">
+          <span>{{ getMapName(scope.row.mapId) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="scope">
+          <span>{{ scope.row.deviceTypes[0] }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备">
+        <template slot-scope="scope">
+          <el-tag v-for="(item, index) in scope.row.deviceIds" :key="index">{{ item }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="路径" prop="filePath" />
+      <el-table-column label="时间" prop="createTime" />
+      <el-table-column label="操作" width="450">
+        <template slot-scope="scope">
+          <!-- <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button> -->
+          <el-button size="mini" @click="handleUpdate(scope.$index, scope.row)">更新</el-button>
+          <!-- <el-button size="mini" @click="handlePublish(scope.$index, scope.row)">发布</el-button> -->
+          <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Edit ref="edits" type="ADD" @reloadTable="reloadTable" />
+    <Edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
+  </div>
+</template>
+
+<script>
+import { getUploadFile, deleteUploadFile } from '@/api/pdf';
+import { getPublishMapList } from '@/api/jmap/map';
+import Edit from './edit';
+
+export default {
+    name: 'CacheControl',
+    components: {
+        Edit
+    },
+    data() {
+        return {
+            tableData: [],
+            formModel: {
+                title: ''
+            },
+            mapList: []
+        };
+    },
+    created() {
+        this.query();
+        const params = {
+            pageSize: 9999,
+            pageNum: 1
+        };
+        getPublishMapList(params).then(res => {
+            this.mapList = res.data.list.filter(el => !el.project );
+        });
+
+    },
+    methods: {
+        query() {
+            this.reloadTable();
+        },
+        getMapName(val) {
+            if (this && this.mapList.length) {
+                const data = this.mapList.find(el => el.id == val);
+                return data.name;
+            }
+            return val;
+        },
+        createTitle() {
+            this.$refs.edits.show();
+        },
+        // // 编辑
+        // handleEdit(row, data) {
+        //     this.$router.push({path : '/editor', query: {docId: data.id, draft: 1}});
+        // },
+        // 更新标题
+        handleUpdate(row, data) {
+            this.$refs.edit.show(data);
+        },
+        // // 草稿发布
+        // handlePublish(row, data) {
+        //     console.log(data);
+        //     putDocDraftByIdPublish(data.id).then(res => {
+        //         this.$message.success('创建文章成功!');
+        //         this.reloadTable();
+        //     }).catch(error => {
+        //         this.$message.error(`发布失败: ${error.data}`);
+        //     });
+        // },
+        handleDelete(row, data) {
+            this.$confirm('是否确认删除？', this.$t('tip.hint'), {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                deleteUploadFile(data.id).then(res => {
+                    this.$message.success('删除文章成功!');
+                    this.reloadTable();
+                }).catch(error => {
+                    this.$message.error(`删除失败: ${error.data}`);
+                });
+            }).catch(() => {});
+        },
+        reloadTable() {
+            this.tableData = [];
+            getUploadFile().then(res => {
+                this.tableData = res.data;
+            }).catch(error => {
+                console.log(error);
+            });
+        }
+    }
+};
+</script>

From 290542ee28f155962201ce629779b18c0c2d8c1a Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 17 May 2021 09:51:06 +0800
Subject: [PATCH 14/32] =?UTF-8?q?pdf=E4=B8=8A=E4=BC=A0=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/uploadPdf/edit.vue | 4 +++-
 src/views/uploadPdf/list.vue | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/uploadPdf/edit.vue b/src/views/uploadPdf/edit.vue
index 30a633f2a..7e2f19e1a 100644
--- a/src/views/uploadPdf/edit.vue
+++ b/src/views/uploadPdf/edit.vue
@@ -112,6 +112,7 @@ export default {
                 await this.handleMap(data.mapId);
                 obj && await this.handleDevice(obj.value);
             } else {
+                this.rowData = {};
                 this.formModel = {
                     mapId: '',
                     deviceTypes: '',
@@ -128,7 +129,8 @@ export default {
                 pageNum: 1
             };
             getPublishMapList(params).then(res => {
-                this.mapList = res.data.list.filter(el => !el.project );
+                // this.mapList = res.data.list.filter(el => !el.project );
+                this.mapList = res.data.list;
             });
         },
         async handleMap(mapId) {
diff --git a/src/views/uploadPdf/list.vue b/src/views/uploadPdf/list.vue
index a29b7b989..c47151ce6 100644
--- a/src/views/uploadPdf/list.vue
+++ b/src/views/uploadPdf/list.vue
@@ -73,9 +73,9 @@ export default {
             pageNum: 1
         };
         getPublishMapList(params).then(res => {
-            this.mapList = res.data.list.filter(el => !el.project );
+            // this.mapList = res.data.list.filter(el => !el.project );
+            this.mapList = res.data.list;
         });
-
     },
     methods: {
         query() {

From 3bbfae4082ef716057721dc4142552bf0957ed22 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 17 May 2021 10:42:13 +0800
Subject: [PATCH 15/32] =?UTF-8?q?pdf=E4=B8=8A=E4=BC=A0=20=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

---
 src/api/pdf.js               |   5 +-
 src/views/uploadPdf/edit.vue |  21 ++-----
 src/views/uploadPdf/list.vue | 115 +++++++++++++++++++++++++++++++----
 3 files changed, 112 insertions(+), 29 deletions(-)

diff --git a/src/api/pdf.js b/src/api/pdf.js
index e41e1c3d0..f1bb463b3 100644
--- a/src/api/pdf.js
+++ b/src/api/pdf.js
@@ -9,10 +9,11 @@ export function postUploadFile(data) {
     });
 }
 // 查询
-export function getUploadFile() {
+export function getUploadFile(params) {
     return request({
         url: `/api/file`,
-        method: 'get'
+        method: 'get',
+        params: params
     });
 }
 // 修改
diff --git a/src/views/uploadPdf/edit.vue b/src/views/uploadPdf/edit.vue
index 7e2f19e1a..482b794a6 100644
--- a/src/views/uploadPdf/edit.vue
+++ b/src/views/uploadPdf/edit.vue
@@ -10,7 +10,7 @@
 
 <script>
 import { postUploadFile, putUploadFile } from '@/api/pdf';
-import { getPublishMapList, getPublishMapDetailById, getPublishMapVersionById } from '@/api/jmap/map';
+import { getPublishMapDetailById, getPublishMapVersionById } from '@/api/jmap/map';
 import { dbReadData, dbAddData, dbUpdateData } from '@/utils/indexedDb';
 // uploadFile
 import { meansUrl } from '@/api/upload';
@@ -21,6 +21,10 @@ export default {
         type: {
             type: String,
             required: true
+        },
+        mapList:{
+            type: Array,
+            required: true
         }
     },
     data() {
@@ -37,12 +41,9 @@ export default {
             },
             rowData: null,
             graphDataNew: null,
-            mapList: [],
-
             fileList: [],
             formData: '',
             id: '',
-
             deviceTypeList: [
                 { label: '区段', value: 'sectionList', code: 'SECTION' },
                 { label: '道岔', value: 'switchList', code: 'SWITCH' },
@@ -96,7 +97,6 @@ export default {
     methods: {
         async show(data) {
             this.dialogVisible = true;
-            this.loadInitData();
             if (this.type != 'ADD') {
                 const obj = this.deviceTypeList.find(el => el.code == data.deviceTypes[0]);
                 this.id = data.id;
@@ -122,17 +122,6 @@ export default {
                 };
             }
         },
-        loadInitData() {
-            this.mapList = [];
-            const params = {
-                pageSize: 9999,
-                pageNum: 1
-            };
-            getPublishMapList(params).then(res => {
-                // this.mapList = res.data.list.filter(el => !el.project );
-                this.mapList = res.data.list;
-            });
-        },
         async handleMap(mapId) {
             if (mapId) {
                 if (mapId != this.rowData.mapId) {
diff --git a/src/views/uploadPdf/list.vue b/src/views/uploadPdf/list.vue
index c47151ce6..0073e1bd7 100644
--- a/src/views/uploadPdf/list.vue
+++ b/src/views/uploadPdf/list.vue
@@ -8,8 +8,35 @@
         size="small"
         style="padding: 6px 20px 6px 20px;overflow: hidden;"
       >
-        <el-form-item label="标题" style="margin-bottom: 0;float: left; width: 300px;">
-          <el-input v-model="formModel.title" style="width: 240px;" />
+        <el-form-item label="地图" style="margin-bottom: 0;float: left; width: 300px;">
+          <el-select v-model="formModel.mapId" placeholder="请选择" filterable style="width: 240px;" @change="handleMap">
+            <el-option
+              v-for="item in mapList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备类型" style="margin-bottom: 0;float: left; width:350px;">
+          <el-select v-model="formModel.deviceType" placeholder="请选择" filterable clearable style="width: 240px;" @change="handleDevice">
+            <el-option
+              v-for="item in deviceTypeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备id" style="margin-bottom: 0;float: left; width: 300px;">
+          <el-select v-model="formModel.deviceId" placeholder="请选择" filterable clearable style="width: 200px;">
+            <el-option
+              v-for="item in deviceIdList"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            />
+          </el-select>
         </el-form-item>
         <el-button style="margin-right: 10px; float: right;" type="primary" size="small" @click="createTitle">创建</el-button>
         <el-button style="margin-right: 10px; float: right;" type="primary" size="small" @click="query">查询</el-button>
@@ -23,12 +50,12 @@
       </el-table-column>
       <el-table-column label="类型">
         <template slot-scope="scope">
-          <span>{{ scope.row.deviceTypes[0] }}</span>
+          <span>{{ scope.row.deviceTypes }}</span>
         </template>
       </el-table-column>
       <el-table-column label="设备">
         <template slot-scope="scope">
-          <el-tag v-for="(item, index) in scope.row.deviceIds" :key="index">{{ item }}</el-tag>
+          <el-tag v-for="(item, index) in scope.row.deviceIds" :key="index" class="deviceIdTag">{{ item }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="路径" prop="filePath" />
@@ -42,14 +69,16 @@
         </template>
       </el-table-column>
     </el-table>
-    <Edit ref="edits" type="ADD" @reloadTable="reloadTable" />
-    <Edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
+    <Edit ref="edits" type="ADD" :map-list="mapList" @reloadTable="reloadTable" />
+    <Edit ref="edit" type="EDIT" :map-list="mapList" @reloadTable="reloadTable" />
   </div>
 </template>
 
 <script>
+import { getPublishMapDetailById, getPublishMapVersionById } from '@/api/jmap/map';
 import { getUploadFile, deleteUploadFile } from '@/api/pdf';
 import { getPublishMapList } from '@/api/jmap/map';
+import { dbReadData, dbAddData, dbUpdateData } from '@/utils/indexedDb';
 import Edit from './edit';
 
 export default {
@@ -61,20 +90,34 @@ export default {
         return {
             tableData: [],
             formModel: {
-                title: ''
+                mapId: '',
+                deviceType:'',
+                deviceId:''
             },
-            mapList: []
+            mapList: [],
+            graphDataNew:null,
+            deviceIdList:[],
+            deviceTypeList: [
+                { label: '区段', value: 'sectionList', code: 'SECTION' },
+                { label: '道岔', value: 'switchList', code: 'SWITCH' },
+                { label: '信号机', value: 'signalList', code: 'SIGNAL' },
+                { label: '车站', value: 'stationList', code: 'STATION' },
+                { label: '站台', value: 'stationStandList', code: 'STAND' },
+                { label: '屏蔽门', value: 'psdList', code: 'PSD' },
+                { label: '列车', value: 'trainList', code: 'TRAIN' }
+            ]
         };
     },
     created() {
-        this.query();
         const params = {
             pageSize: 9999,
             pageNum: 1
         };
         getPublishMapList(params).then(res => {
             // this.mapList = res.data.list.filter(el => !el.project );
-            this.mapList = res.data.list;
+            this.mapList = res.data.list || [];
+            if (this.mapList.length > 0) { this.formModel.mapId = this.mapList[0].id; this.handleMap(this.formModel.mapId); }
+            this.query();
         });
     },
     methods: {
@@ -125,12 +168,62 @@ export default {
         },
         reloadTable() {
             this.tableData = [];
-            getUploadFile().then(res => {
+            getUploadFile(this.formModel).then(res => {
                 this.tableData = res.data;
+                this.tableData.forEach(each=>{
+                    const deviceTypeName = this.deviceTypeList.find(type=>{ return type.code == each.deviceTypes[0]; }) || {label:''};
+                    each.deviceTypes = deviceTypeName.label;
+                });
             }).catch(error => {
                 console.log(error);
             });
+        },
+        handleMap(mapId) {
+            this.deviceIdList = [];
+            this.formModel.deviceId = '';
+            this.formModel.deviceType = '';
+            return new Promise(async (resolve, reject) => {
+                const resp = await getPublishMapVersionById(mapId);
+                const version = resp.data;
+                dbReadData('mapData', mapId, version, async (mapData, version) =>{
+                    if (mapData && mapData.version == version) {
+                        this.graphDataNew = mapData.graphDataNew;
+                        resolve();
+                    } else if (mapData) {
+                        const res = await getPublishMapDetailById(mapId);
+                        this.graphDataNew = res.data.graphDataNew;
+                        dbUpdateData('mapData', res.data);
+                        resolve();
+                    } else {
+                        const res = await getPublishMapDetailById(mapId);
+                        this.graphDataNew = res.data.graphDataNew;
+                        dbAddData('mapData', res.data);
+                        resolve();
+                    }
+                });
+            });
+        },
+        handleDevice(type) {
+            if (type) {
+                const data = this.graphDataNew[type];
+                if (data && data.length > 0) {
+                    this.deviceIdList = this.graphDataNew[type].map(el => {
+                        return {
+                            code: el.code,
+                            name: `${el.name}(${el.code})`
+                        };
+                    });
+                } else {
+                    this.deviceIdList = [];
+                }
+            } else {
+                this.formModel.deviceId = '';
+                this.deviceIdList = [];
+            }
         }
     }
 };
 </script>
+<style lang="scss" scoped>
+.deviceIdTag{margin-right:5px;}
+</style>

From bc2fa1fbaed772631fe8bbddc6c21900bae6b119 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 17 May 2021 13:35:49 +0800
Subject: [PATCH 16/32] =?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

---
 .../theme/components/utils/menuOperate.js     |  5 ++
 .../theme/haerbin_01/menus/menuButton.vue     |  2 +-
 .../haerbin_01/menus/menuStationStand.vue     | 13 ++++
 .../theme/nanjing_02/menus/menuButton.vue     | 27 ++++++--
 src/scripts/cmdPlugin/CommandEnum.js          |  4 +-
 src/scripts/cmdPlugin/CommandHandler.js       |  4 ++
 src/scripts/cmdPlugin/OperationHandler.js     |  7 ++
 src/utils/baseUrl.js                          |  4 +-
 src/views/newMap/newMapdraft/ciConfig.vue     | 67 ++++++++++++-------
 9 files changed, 99 insertions(+), 34 deletions(-)

diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index 846eb90ea..bc377bdf3 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -316,6 +316,11 @@ export const menuOperate = {
             // 站台紧急停车
             operation: OperationEvent.StationStand.emergencyClose.menu.operation,
             cmdType: CMD.Stand.CMD_STAND_EMERGENCY_CLOSE
+        },
+        cancelEmergencyClose: {
+            // 取消站台紧急停车
+            operation: OperationEvent.StationStand.cancelEmergencyClose.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_CANCEL_EMERGENCY_CLOSE
         }
     },
     StationControl:{
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
index e18bbe945..5c6e50cae 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
@@ -66,7 +66,7 @@
               <div style="height: 56px;width: 100%;background: #fff;overflow-y: scroll;text-align: left;">
                 <div class="speed-value-box" :style="{background: speedLimitValue===15? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(15)">15</div>
                 <div class="speed-value-box" :style="{background: speedLimitValue===25? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(25)">25</div>
-                <div class="speed-value-box" :style="{background: speedLimitValue===40? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(45)">45</div>
+                <div class="speed-value-box" :style="{background: speedLimitValue===45? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(45)">45</div>
                 <div class="speed-value-box" :style="{background: speedLimitValue===60? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(60)">60</div>
               </div>
             </div>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue
index 9546c309d..4eabe03db 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue
@@ -56,6 +56,11 @@ export default {
                     handler: this.emergencyClose,
                     cmdType: CMD.Stand.CMD_STAND_EMERGENCY_CLOSE
                 },
+                {
+                    label: '取消站台紧急停车',
+                    handler: this.cancelEmergencyClose,
+                    cmdType: CMD.Stand.CMD_STAND_CANCEL_EMERGENCY_CLOSE
+                },
                 {
                     label: '触发故障管理',
                     handler: this.triggerFaultManagement,
@@ -135,6 +140,14 @@ export default {
                 }
             });
         },
+        // 取消站台紧急停车
+        cancelEmergencyClose() {
+            commitOperate(menuOperate.StationStand.cancelEmergencyClose, { standCode: this.selected.code }, 3).then(({valid, operate}) => {
+            }).catch(error=> {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
         triggerFaultManagement() {
             this.$store.dispatch('training/setTriggerFaultCount', this.selected);
         }
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
index aebb9bdeb..9f3a9ef06 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@@ -105,10 +105,10 @@
                 <el-col :span="17">
                   <el-select v-model="formModelNewSection" filterable size="mini" style="height: 20px;" placeholder="请选择">
                     <el-option
-                      v-for="item in sectionList"
-                      :key="item.code"
-                      :label="item.name"
-                      :value="item.code"
+                      v-for="item in handleSectionList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
                     />
                   </el-select>
                 </el-col>
@@ -418,6 +418,18 @@ export default {
             return (this.trainOperateType === 'create' && this.formModelNewTrip && this.formModelNewTrip.length === 7 && this.formModelNewGroup && this.formModelNewGroup.length === 6) ||
 				(this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete') ||
 				(this.trainOperateType === 'move' && this.formModelNewSection);
+        },
+        handleSectionList() {
+            const list = [];
+            this.sectionList.forEach(item => {
+                if (item.type === '01' || item.type === '04') {
+                    list.push({label: item.name, value: item.code});
+                } else if (item.type === '02') {
+                    const parentSection = this.$store.getters['map/getDeviceByCode'](this.selectedObj.parentCode) || {};
+                    list.push({label: parentSection.name + item.name, value: item.code});
+                }
+            });
+            return list;
         }
     },
     watch: {
@@ -1056,7 +1068,12 @@ export default {
             this.allowDetain = true;
         },
         handleTrainParam() {
-            this.formModelSectionName = this.selectedObj.name;
+            if (this.selectedObj.type === '02') {
+                const parentSection = this.$store.getters['map/getDeviceByCode'](this.selectedObj.parentCode);
+                this.formModelSectionName = parentSection.name + this.selectedObj.name;
+            } else {
+                this.formModelSectionName = this.selectedObj.name;
+            }
             this.trainOperateType = '';
             this.$store.state.map.activeTrainList.forEach(trainCode => {
                 const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode);
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index ddcb79fa9..e851babba 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -216,7 +216,9 @@ export default {
         /** 关闭站台 */
         CMD_STAND_CLOSE: {value: 'Stand_Close', label: '关闭站台'},
         /** 站台紧急停车 */
-        CMD_STAND_EMERGENCY_CLOSE : {value: 'Stand_Emergency_Close', label: '站台紧急停车'}
+        CMD_STAND_EMERGENCY_CLOSE : {value: 'Stand_Emergency_Close', label: '站台紧急停车'},
+        /** 取消站台紧急停车 */
+        CMD_STAND_CANCEL_EMERGENCY_CLOSE : {value: 'Stand_Cancel_Emergency_Close', label: '取消站台紧急停车'}
     },
 
     Station: {
diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js
index 99fb22b9c..fca24daf2 100644
--- a/src/scripts/cmdPlugin/CommandHandler.js
+++ b/src/scripts/cmdPlugin/CommandHandler.js
@@ -56,6 +56,10 @@ class CommandHandle {
                 Stand_Emergency_Close: {
                     operate: 'Stand_Emergency_Close',
                     paramList: [{name: 'standCode'}]
+                },
+                Stand_Cancel_Emergency_Close: {
+                    operate: 'Stand_Cancel_Emergency_Close',
+                    paramList: [{name: 'standCode'}]
                 }
             }
         };
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index ef179e472..987058d07 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -2462,6 +2462,13 @@ export const OperationEvent = {
                 operation: '521',
                 domId: '_Tips-Stand-EmergencyClose-Menu'
             }
+        },
+        // 取消站台紧急停车
+        cancelEmergencyClose: {
+            menu: {
+                operation: '522',
+                domId: '_Tips-Stand-CancelEmergencyClose-Menu'
+            }
         }
     },
 
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index aa7bf7e1b..11702c286 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.8.107:9000'; // 袁琪
-        BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
+        // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
         // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
         // BASE_API = 'http://192.168.3.120:9000'; // 张赛
         // BASE_API = 'http://192.168.8.140:9000'; // 杜康
diff --git a/src/views/newMap/newMapdraft/ciConfig.vue b/src/views/newMap/newMapdraft/ciConfig.vue
index fcfaf7b19..9905544d5 100644
--- a/src/views/newMap/newMapdraft/ciConfig.vue
+++ b/src/views/newMap/newMapdraft/ciConfig.vue
@@ -32,6 +32,21 @@
                     />
                   </el-select>
                 </div>
+                <div v-else-if="scope.row.type === 'multiple'">
+                  <div v-if="!scope.row.focus" style="width: 100%;cursor: pointer;height: 20px;" @click="changeFocus(scope.row, '1')">
+                    <template v-for="(item, i) in scope.row.configValue">
+                      <el-tag :key="i" size="mini">{{ getMultipleName(item, scope.row.options) }}</el-tag>
+                    </template>
+                  </div>
+                  <el-select v-if="scope.row.focus" v-model="scope.row.configValue" size="mini" multiple placeholder="请选择">
+                    <el-option
+                      v-for="item in scope.row.options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </div>
               </template>
             </el-table-column>
             <el-table-column prop="remark" label="描述" />
@@ -48,6 +63,7 @@
 
 <script>
 import { saveMap, generateCI } from '@/api/jmap/mapdraft';
+import { mapGetters } from 'vuex';
 export default {
     name: 'Config',
     components: {
@@ -70,34 +86,15 @@ export default {
             falseValue: false,
             id: '',
             height: 800,
-            // initData: {
-            //     upRight: false,
-            //     signalApproachOnlyOne: false,
-            //     signalApproachOnlyNpSwitch: false,
-            //     routeNameUseEndOppositeSignalName: false,
-            //     generateTbRoute: false,
-            //     tbRouteNameUseEndOppositeSignalName: false,
-            //     routeSignalAlwaysGreen: false,
-            //     routeApartByOverlap: false,
-            //     overlapOnlySwitch: false,
-            //     overlapSwitchNpOnly: false,
-            //     overlapSignalOppositeSwitchNpOnly: false,
-            //     overlapOnlyOneSwitch: false,
-            //     generateCycle: false,
-            //     routeButton: false,
-            //     likeHa1: false,
-            //     getNearlySignal: false,
-            //     overlapSettingByTrigger: false,
-            //     generateFls:false,
-            //     signalApproachNotPassPreSignal:false,
-            //     overlapReleaseTime: 45,
-            //     routeReleaseTime: 60
-            // },
             roadData: [],
             focus: false,
             booleanList: ['upRight', 'lockFirst', 'switchSingleHandle', 'signalApproachOnlyOne', 'signalApproachOnlyNpSwitch',
                 'routeNameUseEndOppositeSignalName', 'generateTbRoute', 'tbRouteNameUseEndOppositeSignalName', 'routeSignalAlwaysGreen',
-                'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly', 'overlapOnlyOneSwitch', 'generateCycle', 'routeButton', 'likeHa1', 'getNearlySignal', 'overlapSettingByTrigger', 'generateFls', 'signalApproachNotPassPreSignal'],
+                'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly', 'overlapOnlyOneSwitch',
+                'generateCycle', 'routeButton', 'likeHa1', 'getNearlySignal', 'overlapSettingByTrigger', 'generateFls', 'signalApproachNotPassPreSignal',
+                'generateDestination'
+            ],
+            multipleList: ['sharingECStations'],
             selectList: [],
             numberList: ['overlapReleaseTime', 'routeReleaseTime'],
             optionsMap: {
@@ -126,14 +123,25 @@ export default {
                 getNearlySignal: '生成进路信号按钮，进路信号按钮是否取最近的一个信号机',
                 overlapSettingByTrigger: '延续保护的建立方式：是-通过触发建立，否-随进路建立',
                 generateFls: '是否生成侧防：是-生成侧防，不要联动道岔，否-不生成侧防，用联动道岔',
-                signalApproachNotPassPreSignal:'信号机接近区段不跨过前方同向信号机'
+                signalApproachNotPassPreSignal:'信号机接近区段不跨过前方同向信号机',
+                generateDestination: '是否生成目的地码定义（泰雷兹）',
+                sharingECStations: '共享紧急关闭效果的车站'
             }
         };
     },
     computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    mounted() {
     },
     methods: {
         async show() {
+            this.optionsMap.sharingECStations = [];
+            this.stationList.forEach(item => {
+                this.optionsMap.sharingECStations.push({ value: item.code, label: item.name });
+            });
             this.dialogVisible = true;
             this.height = document.documentElement.clientHeight - 180;
             const map = this.$store.state.map.map;
@@ -146,6 +154,12 @@ export default {
                 this.$set(row, 'focus', true);
             }
         },
+        getMultipleName(value, options) {
+            const obj = options.find(item => {
+                return item.value === value;
+            });
+            return (obj || {}).label;
+        },
         async getList(data) {
             try {
                 if (data) {
@@ -161,6 +175,9 @@ export default {
                             options = this.optionsMap[key];
                         } else if (this.numberList.indexOf(key) >= 0) {
                             type = 'number';
+                        } else if (this.multipleList.indexOf(key) >= 0) {
+                            type = 'multiple';
+                            options = this.optionsMap[key];
                         } else {
                             type = 'input';
                         }

From dfc5d50fbe42c631d99517b27b0e028e12255367 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 17 May 2021 14:39:16 +0800
Subject: [PATCH 17/32] =?UTF-8?q?ATS=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/theme/nanjing_02/menus/menuButton.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
index 9f3a9ef06..f6809de84 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@@ -422,10 +422,10 @@ export default {
         handleSectionList() {
             const list = [];
             this.sectionList.forEach(item => {
-                if (item.type === '01' || item.type === '04') {
+                if ((item.type === '01' && !item.parentCode) || item.type === '04') {
                     list.push({label: item.name, value: item.code});
                 } else if (item.type === '02') {
-                    const parentSection = this.$store.getters['map/getDeviceByCode'](this.selectedObj.parentCode) || {};
+                    const parentSection = this.$store.getters['map/getDeviceByCode'](item.parentCode) || {};
                     list.push({label: parentSection.name + item.name, value: item.code});
                 }
             });

From 122ca9ec6bfde7e0107008ea539868a13c3b7761 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 17 May 2021 15:13:26 +0800
Subject: [PATCH 18/32] =?UTF-8?q?=E5=88=97=E8=BD=A6=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/haerbin_01/menus/menuButton.vue     | 38 +++++++++++++++++--
 .../theme/nanjing_02/menus/menuBar.vue        |  6 +--
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
index 5c6e50cae..d00286b2d 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
@@ -79,7 +79,7 @@
                 <el-button size="mini" plain :disabled="trainOperateType==='update'" @click="handleTrainOperate('update')">车次号修改</el-button>
                 <el-button size="mini" plain :disabled="trainOperateType==='delete'" @click="handleTrainOperate('delete')">车次号删除</el-button>
                 <el-button size="mini" plain :disabled="trainOperateType==='create'" @click="handleTrainOperate('create')">车次号创建</el-button>
-                <el-button size="mini" plain :disabled="true">车次号步进</el-button>
+                <el-button size="mini" plain :disabled="trainOperateType==='move'" @click="handleTrainOperate('create')">车次号步进</el-button>
               </div>
             </el-row>
             <el-row style="height: 25px;line-height: 25px;border-top: 2px solid #7E8076;border-left: 2px solid #6A6B64;border-right: 2px solid #FBFBFA;">
@@ -117,6 +117,19 @@
               <el-col :span="7" style="height: 25px;line-height: 25px;">新车组号</el-col>
               <el-col :span="17"><el-input v-model="formModelNewGroup" size="mini" style="height: 20px;" /></el-col>
             </el-row>
+            <el-row v-if="trainOperateType === 'move'" style="display: flex;align-items: center;">
+              <el-col :span="7" style="height: 25px;line-height: 25px;">新轨道号</el-col>
+              <el-col :span="17">
+                <el-select v-model="formModelNewSection" filterable size="mini" style="height: 20px;" placeholder="请选择">
+                  <el-option
+                    v-for="item in handleSectionList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-col>
+            </el-row>
           </div>
         </el-col>
         <el-col v-if="trainOperationShow" :span="6" style="padding: 1px;">
@@ -240,6 +253,18 @@ export default {
             return (this.trainOperateType === 'create' && this.formModelNewTrip && this.formModelNewTrip.length === 7 && this.formModelNewGroup && this.formModelNewGroup.length === 6) ||
 				(this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete') ||
 				(this.trainOperateType === 'move' && this.formModelNewSection);
+        },
+        handleSectionList() {
+            const list = [];
+            this.sectionList.forEach(item => {
+                if ((item.type === '01' && !item.parentCode) || item.type === '04') {
+                    list.push({label: item.name, value: item.code});
+                } else if (item.type === '02') {
+                    const parentSection = this.$store.getters['map/getDeviceByCode'](item.parentCode) || {};
+                    list.push({label: parentSection.name + item.name, value: item.code});
+                }
+            });
+            return list;
         }
     },
     watch: {
@@ -248,8 +273,7 @@ export default {
                 '01': 'Local',		// 现地工作站
                 '02': 'Center'		// 中心调度工作站
             };
-
-            if (this.selected._type) {
+            if (this.selected._type && !this.trainOperationShow) {
                 const control = this.getStationControl(this.selected);
                 const type = State2SimulationMap[this.$store.state.training.prdType];
                 if (control.controlMode != type) {
@@ -753,7 +777,12 @@ export default {
             this.clearAllMenuShow();
         },
         handleTrainParam() {
-            this.formModelSectionName = this.selectedObj.name;
+            if (this.selectedObj.type === '02') {
+                const parentSection = this.$store.getters['map/getDeviceByCode'](this.selectedObj.parentCode);
+                this.formModelSectionName = parentSection.name + this.selectedObj.name;
+            } else {
+                this.formModelSectionName = this.selectedObj.name;
+            }
             this.trainOperateType = '';
             this.$store.state.map.activeTrainList.forEach(trainCode => {
                 const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode);
@@ -776,6 +805,7 @@ export default {
                 this.formModelNewGroup = '';
                 this.trainOperateType = '';
                 this.trainOperationShow = flag;
+                this.formModelNewSection = '';
             }
         },
         trainCommit() {
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue
index e16619f31..becddbe01 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue
@@ -8,7 +8,8 @@
               <el-button style="width: 100px;line-height: 19px;" plain @click="login">{{ loginText }}</el-button>
             </el-row>
             <el-row>
-              <input v-model="inputStr" :type="modelType" style="width: 100px;height:20px;" :disabled="isLogin||this.loginText == '登录'" @keyup.enter="validateData">
+              <span v-if="isLogin">{{ inputStr }}</span>
+              <input v-if="!isLogin" v-model="inputStr" :type="modelType" style="width: 100px;height:20px;" :disabled="this.loginText == '登录'" @keyup.enter="validateData">
             </el-row>
           </div>
         </el-col>
@@ -178,7 +179,6 @@
 <script>
 import { mapGetters } from 'vuex';
 import { EventBus } from '@/scripts/event-bus';
-import { TrainingMode } from '@/scripts/ConstDic';
 import voiceOpen from '@/assets/voiceOpen.png';
 import voiceClose from '@/assets/voiceClose.png';
 import BuzzerAudio from '@/assets/buzzer.mp3';
@@ -480,7 +480,7 @@ export default {
             this.$refs.trainControl.doShow();
         },
         rpsClick() {
-        	this.$refs.rpsDialog.doShow();
+            this.$refs.rpsDialog.doShow();
         },
         controlAudio(val) {
             const audio = document.getElementById('buzzer');

From 5c5a1db13dc3fa56d656c06f7261d230f2a3cdf7 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 17 May 2021 15:52:26 +0800
Subject: [PATCH 19/32] =?UTF-8?q?Bug262=20=E7=A6=8F=E5=B7=9E=E4=B8=80?=
 =?UTF-8?q?=EF=BC=9A=E7=B4=A7=E6=80=A5=E5=81=9C=E8=BD=A6=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/fuzhou_01.js      |  6 ++---
 .../StationStand/emergent/EEmergentRhombus.js |  4 +--
 .../fuzhou_01/menus/menuStationStand.vue      | 26 +++++++++++++++++++
 .../haerbin_01/menus/menuStationStand.vue     | 16 ++++++------
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index 571539220..d8b3f3ef2 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -224,8 +224,8 @@ class SkinCode extends defaultStyle {
                 z:1,
                 mergentR: 4,										// 站台紧急关闭半径
                 mergentN: 4, 										// 站台紧急关闭边数
-                insideOffset: { x: 0, y: 25 }, 				// 内站台紧急关闭偏移量
-                outsideOffset: { x: 0, y: -25 }, 			// 外站台紧急关闭偏移量
+                insideOffset: { x: 0, y: 18 }, 				// 内站台紧急关闭偏移量
+                outsideOffset: { x: 0, y: -18 }, 			// 外站台紧急关闭偏移量
                 closeColor: '#F61107' 							// 站台紧急关闭颜色
             },
             // 扣车元素 普通扣车
@@ -733,7 +733,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.FloodGate] = {};
         this[deviceType.DirectionRod] = {};
-		this[deviceType.IndicatorLight] = {};
+        this[deviceType.IndicatorLight] = {};
     }
 }
 
diff --git a/src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js b/src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js
index cb8b4d3ac..c2ef4c8e6 100644
--- a/src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js
+++ b/src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js
@@ -48,9 +48,9 @@ class EEmergentRhombus extends Group {
         this.hideMode();
     }
 
-	setColor(color) {
+    setColor(color) {
         this.emergent && this.emergent.setStyle('stroke', color);
-	}
+    }
 
     setState(model) {
         // 紧急停车
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
index f3289ad84..7b33fd360 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
@@ -149,6 +149,16 @@ export default {
                     handler: this.cancelStoppage,
                     cmdType:CMD.Stand.CMD_STAND_REMOVE_FAULT
                 },
+                {
+                    label: '站台紧急停车',
+                    handler: this.emergencyClose,
+                    cmdType: CMD.Stand.CMD_STAND_EMERGENCY_CLOSE
+                },
+                {
+                    label: '取消站台紧急停车',
+                    handler: this.cancelEmergencyClose,
+                    cmdType: CMD.Stand.CMD_STAND_CANCEL_EMERGENCY_CLOSE
+                },
                 {
                     label: this.$t('menu.menuSection.triggerFaultManagement'),
                     handler: this.triggerFaultManagement,
@@ -306,6 +316,22 @@ export default {
                 }
             });
         },
+        // 站台紧急停车
+        emergencyClose() {
+            commitOperate(menuOperate.StationStand.emergencyClose, { standCode: this.selected.code }, 3).then(({valid, operate}) => {
+            }).catch(error=>{
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        // 取消站台紧急停车
+        cancelEmergencyClose() {
+            commitOperate(menuOperate.StationStand.cancelEmergencyClose, { standCode: this.selected.code }, 3).then(({valid, operate}) => {
+            }).catch(error=> {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
         triggerFaultManagement() {
             this.$store.dispatch('training/setTriggerFaultCount', this.selected);
         }
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue
index 4eabe03db..e37804850 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue
@@ -124,6 +124,14 @@ export default {
                 this.$refs.noticeInfo.doShow();
             });
         },
+        // 取消站台紧急停车
+        cancelEmergencyClose() {
+            commitOperate(menuOperate.StationStand.cancelEmergencyClose, { standCode: this.selected.code }, 3).then(({valid, operate}) => {
+            }).catch(error=> {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
         // 设置故障
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
@@ -140,14 +148,6 @@ export default {
                 }
             });
         },
-        // 取消站台紧急停车
-        cancelEmergencyClose() {
-            commitOperate(menuOperate.StationStand.cancelEmergencyClose, { standCode: this.selected.code }, 3).then(({valid, operate}) => {
-            }).catch(error=> {
-                console.error(error);
-                this.$refs.noticeInfo.doShow();
-            });
-        },
         triggerFaultManagement() {
             this.$store.dispatch('training/setTriggerFaultCount', this.selected);
         }

From 050d5854d1b475d47b03d81e71558f3f6b07c328 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 17 May 2021 15:57:07 +0800
Subject: [PATCH 20/32] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=97=E4=BA=AC?=
 =?UTF-8?q?=E5=8C=BA=E6=AE=B5=E6=93=8D=E4=BD=9C=E6=B5=81=E7=A8=8B=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=9A=82=E6=9C=AA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/nanjing_02/menus/menuBar.vue        |  4 +-
 .../theme/nanjing_02/menus/menuButton.vue     | 19 ++++++-
 src/scripts/cmdPlugin/CommandEnum.js          | 17 +++++-
 src/scripts/cmdPlugin/OperationHandler.js     | 55 +++++++++++++++++++
 4 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue
index e16619f31..037c1e600 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue
@@ -178,7 +178,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { EventBus } from '@/scripts/event-bus';
-import { TrainingMode } from '@/scripts/ConstDic';
+// import { TrainingMode } from '@/scripts/ConstDic';
 import voiceOpen from '@/assets/voiceOpen.png';
 import voiceClose from '@/assets/voiceClose.png';
 import BuzzerAudio from '@/assets/buzzer.mp3';
@@ -480,7 +480,7 @@ export default {
             this.$refs.trainControl.doShow();
         },
         rpsClick() {
-        	this.$refs.rpsDialog.doShow();
+            this.$refs.rpsDialog.doShow();
         },
         controlAudio(val) {
             const audio = document.getElementById('buzzer');
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
index 9f3a9ef06..c7cef6f84 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@@ -545,7 +545,13 @@ export default {
         initCentralizedStationList(list) {
             const stationContorl = this.stationContorl;
             this.menuCmdList = new Array(15).fill({});
-            list.forEach((el, index) => {
+            const lists = list.filter(el => {
+                if (el.isShow && !el.isShow(this.oldClickObj.roadType)) {
+                    return false;
+                }
+                return el;
+            });
+            lists.forEach((el, index) => {
                 if (el.disabledCb && stationContorl) {
                     el.disabled = el.disabledCb(stationContorl);
                 }
@@ -1257,7 +1263,15 @@ export default {
                 { name: '强解区段', commandTip: '解锁进路中的轨道区段', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '预复位', commandTip: '预重置计轴区段', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.axlePreReset.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '封锁区段', commandTip: '禁止通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch },
-                { name: '解封区段', commandTip: '允许通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
+                { name: '解封区段', commandTip: '允许通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
+
+                { name: '折返 DTO', commandTip: '折返 DTO', cmdType: CMD.Section.CMD_SECTION_1, operate: OperationEvent.Section.turnBackDTO.menuButton, disabledCb: (stationControl) => !this.modeMatch },
+                { name: '取消折返', commandTip: '取消折返', cmdType: CMD.Section.CMD_SECTION_2, operate: OperationEvent.Section.CancelTurnBack.menuButton, disabledCb: (stationControl) => !this.modeMatch },
+                { name: '自动折返', commandTip: '自动折返', cmdType: CMD.Section.CMD_SECTION_3, operate: OperationEvent.Section.AutoTurnBack.menuButton, disabledCb: (stationControl) => !this.modeMatch },
+                { name: '换上至下', commandTip: '换上至下', cmdType: CMD.Section.CMD_SECTION_4, operate: OperationEvent.Section.PutUpTheDown.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (type) => type == 'RIGHT' },
+                { name: '换下至上', commandTip: '换下至上', cmdType: CMD.Section.CMD_SECTION_5, operate: OperationEvent.Section.PutDownTheUp.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (type) => type != 'RIGHT' },
+                { name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Section.CMD_SECTION_6, operate: OperationEvent.Section.PutUpStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (type) => type == 'RIGHT' },
+                { name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Section.CMD_SECTION_7, operate: OperationEvent.Section.PutDownStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (type) => type != 'RIGHT' }
             ];
             this.switchParamList = [
                 { name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch},
@@ -1596,7 +1610,6 @@ export default {
         margin-top: 10px;
         padding: 10px;
     }
-    .station_updateStatus{}
     .station_command{
         float: right;
     }
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index e851babba..bd5a9230b 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -160,7 +160,22 @@ export default {
         /** 轨道开放 */
         CMD_SECTION_OPEN: {value: 'Section_Open', label: '轨道开放'},
         /** 轨道关闭 */
-        CMD_SECTION_CLOSE: {value: 'Section_Close', label: '轨道关闭'}
+        CMD_SECTION_CLOSE: {value: 'Section_Close', label: '轨道关闭'},
+
+        /** 折返 DTO */
+        CMD_SECTION_1: {value: 'Section_1', label: '折返 DTO'},
+        /** 取消折返 */
+        CMD_SECTION_2: {value: 'Section_2', label: '取消折返'},
+        /** 自动折返 */
+        CMD_SECTION_3: {value: 'Section_3', label: '自动折返'},
+        /** 换上至下 */
+        CMD_SECTION_4: {value: 'Section_4', label: '换上至下'},
+        /** 换下至上 */
+        CMD_SECTION_5: {value: 'Section_5', label: '换下至上'},
+        /** 上行终止站停 */
+        CMD_SECTION_6: {value: 'Section_6', label: '上行终止站停'},
+        /** 下行终止站停 */
+        CMD_SECTION_7: {value: 'Section_7', label: '下行终止站停'}
     },
 
     // 站台
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 987058d07..59a55f63b 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -2102,6 +2102,61 @@ export const OperationEvent = {
                 operation: '415',
                 domId: '_Tips-Section-Load-Spare-Train'
             }
+        },
+        menuButton: {
+            menuButton: {
+                operation: '416',
+                domId: '_Tips-Section-Load-Spare-Train'
+            }
+        },
+        // 折返 DTO
+        turnBackDTO: {
+            menuButton: {
+                operation: '417',
+                domId: '_Tips-Section-turn-Back-DTO-menu-Button'
+            }
+        },
+        // 取消折返
+        CancelTurnBack: {
+            menuButton: {
+                operation: '418',
+                domId: '_Tips-Section-Cancel-Turn-Back-menu-Button'
+            }
+        },
+        // 自动折返
+        AutoTurnBack: {
+            menuButton: {
+                operation: '419',
+                domId: '_Tips-Section-Auto-Turn-Back-menu-Button'
+            }
+        },
+        // 换上至下
+        PutUpTheDown: {
+            menuButton: {
+                operation: '420',
+                domId: '_Tips-Section-Put-Up-The-Down-menu-Button'
+            }
+        },
+        // 换下至上
+        PutDownTheUp: {
+            menuButton: {
+                operation: '421',
+                domId: '_Tips-Section-Put-Down-The-Up-menu-Button'
+            }
+        },
+        // 上行终止站停
+        PutUpStop: {
+            menuButton: {
+                operation: '422',
+                domId: '_Tips-Section-Put-Up-Stop-menu-Button'
+            }
+        },
+        // 下行终止站停
+        PutDownStop: {
+            menuButton: {
+                operation: '423',
+                domId: '_Tips-Section-Put-Down-Stop-menu-Button'
+            }
         }
     },
 

From 02eaa33fecbb19b83ca39e9f13f19a08917d953d Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 17 May 2021 16:14:00 +0800
Subject: [PATCH 21/32] =?UTF-8?q?=E8=83=8C=E6=8A=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/nanjing_02/menus/dialog/mapVisual.vue  | 12 ++++++++----
 .../theme/nanjing_02/menus/dialog/rps.vue        | 16 ++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue
index 9f1c44d2c..60df9049b 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue
@@ -30,9 +30,7 @@ export default {
             mapDevice: {},
             routeData: [],
             mapData: null,
-            autoReentryData: [],
-            width: 1920,
-            height: 960
+            autoReentryData: []
         };
     },
     computed: {
@@ -41,7 +39,13 @@ export default {
         },
         ...mapGetters('map', [
             'bigScreenConfig'
-        ])
+        ]),
+        width() {
+            return this.$store.state.app.width - 40;
+        },
+        height() {
+            return this.$store.state.app.height - 60;
+        }
     },
     watch: {
         '$store.state.config.canvasSizeCount': function (val) {
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue
index 61900f6da..254762d07 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue
@@ -1,14 +1,14 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="haerbin-01__systerm stand-stop-time"
+    class="haerbin-01__systerm"
     :title="title"
     :visible.sync="show"
     :fullscreen="true"
     :before-close="doClose"
     :z-index="2000"
   >
-    <map-visual ref="map" style="width: 100%;height: 100%;" />
+    <map-visual ref="map" />
   </el-dialog>
 </template>
 
@@ -81,12 +81,12 @@ export default {
 };
 </script>
 <style scoped>
-	.haerbin-01__systerm .el-dialog .base-label {
-		background: rgba(0, 0, 0, x);
+	/deep/ .el-dialog {
+		background: rgba(100, 100, 100, 1);
 		position: relative;
-		left: -5px;
-		top: -18px;
-		padding: 0 5px;
-		background-color: #F0F0F0;
+		border: 2px solid rgb(144, 144, 144, 0.8);
+		border-radius: 6px;
+		color: #000;
+		font-size: 14px;
 	}
 </style>

From 0a9c8665ff0a6d15b86a1c5d3faceabe62a323dc Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 17 May 2021 16:37:56 +0800
Subject: [PATCH 22/32] =?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/assets/icon/favicon_zzww.png              | Bin 0 -> 13874 bytes
 .../datie_01/menus/dialog/drawSelect.vue      |  86 ++++++++++++++++++
 .../theme/datie_01/menus/menuSection.vue      |  10 +-
 src/scripts/ProjectConfig.js                  |  10 +-
 src/views/newMap/displayCity/menuDemon.vue    |   2 +-
 5 files changed, 102 insertions(+), 6 deletions(-)
 create mode 100644 src/assets/icon/favicon_zzww.png
 create mode 100644 src/jmapNew/theme/datie_01/menus/dialog/drawSelect.vue

diff --git a/src/assets/icon/favicon_zzww.png b/src/assets/icon/favicon_zzww.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ab5df6e23a5d10258b91184fae60cd7232692fb
GIT binary patch
literal 13874
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
P)g>dTAW{C-!2f>%jbe}<

literal 0
HcmV?d00001

diff --git a/src/jmapNew/theme/datie_01/menus/dialog/drawSelect.vue b/src/jmapNew/theme/datie_01/menus/dialog/drawSelect.vue
new file mode 100644
index 000000000..a0252b4cd
--- /dev/null
+++ b/src/jmapNew/theme/datie_01/menus/dialog/drawSelect.vue
@@ -0,0 +1,86 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="640px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div>
+
+	</div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CancelMouseState from '@/mixin/CancelMouseState';
+
+export default {
+    name: 'TrainMove',
+    mixins: [
+        CancelMouseState
+    ],
+    data() {
+        return {
+            selected: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            return '图纸检索';
+        }
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            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);
+        },
+        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>
+	.chengdou-03__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/datie_01/menus/menuSection.vue b/src/jmapNew/theme/datie_01/menus/menuSection.vue
index 4668fa699..e7a829fbd 100644
--- a/src/jmapNew/theme/datie_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuSection.vue
@@ -49,6 +49,10 @@ export default {
             menu: [],
             menuNormal: {
                 Local: [
+                    {
+                        label: '图纸调用',
+                        handler: this.drawingCall
+                    }
                 ],
                 Center: [
                     // {
@@ -119,7 +123,8 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
+                // this.menu = MenuContextHandler.covert(this.menuNormal);
+                this.menu = this.menuNormal.Local;
             } else {
                 this.menu = [];
             }
@@ -127,6 +132,9 @@ export default {
             if (this.operatemode === OperateMode.FAULT && this.selected.type != '04') {
                 this.menu = this.menuForce;
             }
+        },
+        drawingCall() {
+
         },
         doShow(point) {
             this.initMenu();
diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index 12f846df8..080120e0f 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -15,6 +15,7 @@ import FaviconNty from '@/assets/icon/favicon_nty.png';
 import FaviconBjd from '@/assets/icon/favicon_bjd.png';
 import FaviconSdy from '@/assets/icon/favicon_jdy.png';
 import FaviconCgy from '@/assets/icon/favicon_cgy.png';
+import FaviconZzww from '@/assets/icon/favicon_zzww.png';
 import Link_Bxkc from '@/assets/icon/link_bxkc.png';
 import Link_Crsc from '@/assets/icon/link_crsc.png';
 import Link_Hls from '@/assets/icon/link_hls.png';
@@ -37,9 +38,10 @@ export const loginInfo = {
         title: '共赢列车仿真驾驶系统',
         loginPath: '/login?project=zzww',
         loginParam: 'ZZWW',
-        titleDistance: '-150px',
-        navigationLogoWidth: '40px',
-        navigationMarginLeft: '60px',
+        loginTitle: '空串',
+        logoWidth: '140px',
+        navigationLogoWidth: '120px',
+        navigationMarginLeft: '140px',
         systemType: '011'
     },
     bjd: {
@@ -428,7 +430,7 @@ export const loginInfo = {
 
 export const ProjectIcon = {
     xty: FaviconXty,
-    zzww: FaviconXty,
+    zzww: FaviconZzww,
     login: Favicon,
     design: Favicon,
     designxty: FaviconXty,
diff --git a/src/views/newMap/displayCity/menuDemon.vue b/src/views/newMap/displayCity/menuDemon.vue
index 7f35d8f99..c6e0837da 100644
--- a/src/views/newMap/displayCity/menuDemon.vue
+++ b/src/views/newMap/displayCity/menuDemon.vue
@@ -210,7 +210,7 @@ export default {
                     });
                     this.$jlmap.updateShowStation(list, deviceId);
                 }
-                // 'Station83189';
+                this.$jlmap.setCenter(deviceId);
                 if (this.try != '0') {
                     this.loadInitData();
                 }

From 57feb88e6cc65c2bf85aee4c74d725f6a151f517 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 17 May 2021 17:20:26 +0800
Subject: [PATCH 23/32] =?UTF-8?q?pdf=20=E4=B8=8A=E4=BC=A0=20=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

---
 src/api/pdf.js                  |  31 ++++-
 src/views/uploadPdf/bindMap.vue |  87 +++++++++++++
 src/views/uploadPdf/edit.vue    | 217 +++++++++++++++-----------------
 src/views/uploadPdf/list.vue    | 210 ++++++++++++++++---------------
 4 files changed, 320 insertions(+), 225 deletions(-)
 create mode 100644 src/views/uploadPdf/bindMap.vue

diff --git a/src/api/pdf.js b/src/api/pdf.js
index f1bb463b3..dbedb2109 100644
--- a/src/api/pdf.js
+++ b/src/api/pdf.js
@@ -1,13 +1,22 @@
 import request from '@/utils/request';
 
-/** 创建分组 */
+/** 创建 */
 export function postUploadFile(data) {
     return request({
-        url: `/api/file`,
+        url: `/api/file/basic`,
         method: 'post',
         data
     });
 }
+
+// /** 复制一条文件基础信息 */
+// export function copyUploadFile(id) {
+//     return request({
+//         url: `/api/file/basic/copy/${id}`,
+//         method: 'post'
+//     });
+// }
+
 // 查询
 export function getUploadFile(params) {
     return request({
@@ -19,15 +28,27 @@ export function getUploadFile(params) {
 // 修改
 export function putUploadFile(data) {
     return request({
-        url: `/api/file`,
+        url: `/api/file/basic`,
         method: 'put',
         data
     });
 }
 // 删除
-export function deleteUploadFile(data) {
+export function deleteUploadFile(id) {
     return request({
-        url: `/api/file`,
+        url: `/api/file/${id}`,
         method: 'delete'
     });
 }
+
+// 查询文件绑定信息
+export function getFileBindInfo(fileId, mapId) {
+    return request({
+        url: `/api/file/binding/${fileId}/${mapId}`,
+        method: 'get'
+    });
+}
+
+/**  */
+// @GetMapping("")
+
diff --git a/src/views/uploadPdf/bindMap.vue b/src/views/uploadPdf/bindMap.vue
new file mode 100644
index 000000000..544806543
--- /dev/null
+++ b/src/views/uploadPdf/bindMap.vue
@@ -0,0 +1,87 @@
+<template>
+  <el-dialog v-dialogDrag title="绑定地图数据" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center class="uploadDialog">
+    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { getPublishMapList } from '@/api/jmap/map';
+import { getFileBindInfo } from '@/api/pdf';
+export default {
+    name:'BindMap',
+    data() {
+        return {
+            mapList:[],
+            fileId:'',
+            dialogVisible: false,
+            formModel: {
+                mapId:''
+            }
+        };
+    },
+    computed:{
+        form() {
+            const form = {
+                labelWidth: '120px',
+                items: [
+                    { prop: 'mapId', label: '选择线路:', type:'select', options: this.mapList, optionValue:'id', optionLabel:'name' }
+                    // change: true, onChange: this.handleMap
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                mapId: [
+                    { required: true, message: ' 地图不能为空', trigger: 'blur'},
+                    { required: true, message: ' 地图不能为空', trigger: 'change'}
+                ]
+            };
+            return crules;
+        }
+
+    },
+    created() {
+        const params = {
+            pageSize: 9999,
+            pageNum: 1
+        };
+        getPublishMapList(params).then(res => {
+            this.mapList = res.data.list || [];
+        });
+    },
+    methods:{
+        doShow(data) {
+            this.fileId = data.id;
+            this.dialogVisible = true;
+        },
+        handleClose() {
+            this.formModel = {
+                mapId: ''
+            };
+            this.$refs.dataform.resetForm();
+            this.dialogVisible = false;
+        },
+        doSave() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                if (self.fileId) {
+                    getFileBindInfo(self.fileId, self.formModel.mapId).then((res) => {
+                        let data = null;
+                        if (res.data) {
+                            data = res.data;
+                        }
+                        this.$refs.bindMapInfo.doShow(data);
+                    }).catch(error => {
+                        console.log(error);
+                        // self.$message.error(`上传PDF失败:${error.message}`);
+                    });
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/views/uploadPdf/edit.vue b/src/views/uploadPdf/edit.vue
index 482b794a6..74ff697e3 100644
--- a/src/views/uploadPdf/edit.vue
+++ b/src/views/uploadPdf/edit.vue
@@ -1,6 +1,7 @@
 <template>
   <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center class="uploadDialog">
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <div class="fileError">{{ message }}</div>
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
       <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
@@ -10,8 +11,8 @@
 
 <script>
 import { postUploadFile, putUploadFile } from '@/api/pdf';
-import { getPublishMapDetailById, getPublishMapVersionById } from '@/api/jmap/map';
-import { dbReadData, dbAddData, dbUpdateData } from '@/utils/indexedDb';
+// import { getPublishMapDetailById, getPublishMapVersionById } from '@/api/jmap/map';
+// import { dbReadData, dbAddData, dbUpdateData } from '@/utils/indexedDb';
 // uploadFile
 import { meansUrl } from '@/api/upload';
 
@@ -21,39 +22,30 @@ export default {
         type: {
             type: String,
             required: true
-        },
-        mapList:{
-            type: Array,
-            required: true
         }
     },
     data() {
         return {
             dialogVisible: false,
             formModel: {
-                // cityCode: '',
-                mapId: '',
-                deviceTypes: '',
-                deviceIds: [],
                 upload: '',
                 filePath: '',
-                fileType: 'DRAWING'
+                fileType: 'DRAWING',
+                fileName:''
             },
-            rowData: null,
-            graphDataNew: null,
             fileList: [],
             formData: '',
             id: '',
-            deviceTypeList: [
-                { label: '区段', value: 'sectionList', code: 'SECTION' },
-                { label: '道岔', value: 'switchList', code: 'SWITCH' },
-                { label: '信号机', value: 'signalList', code: 'SIGNAL' },
-                { label: '车站', value: 'stationList', code: 'STATION' },
-                { label: '站台', value: 'stationStandList', code: 'STAND' },
-                { label: '屏蔽门', value: 'psdList', code: 'PSD' },
-                { label: '列车', value: 'trainList', code: 'TRAIN' }
-            ],
-            deviceCodesList: []
+            message:''
+            // deviceTypeList: [
+            //     { label: '区段', value: 'sectionList', code: 'SECTION' },
+            //     { label: '道岔', value: 'switchList', code: 'SWITCH' },
+            //     { label: '信号机', value: 'signalList', code: 'SIGNAL' },
+            //     { label: '车站', value: 'stationList', code: 'STATION' },
+            //     { label: '站台', value: 'stationStandList', code: 'STAND' },
+            //     { label: '屏蔽门', value: 'psdList', code: 'PSD' },
+            //     { label: '列车', value: 'trainList', code: 'TRAIN' }
+            // ],
         };
     },
     computed: {
@@ -64,25 +56,23 @@ export default {
             const form = {
                 labelWidth: '120px',
                 items: [
-                    { prop: 'mapId', label: '选择线路:', type:'select', options: this.mapList, optionValue:'id', optionLabel:'name', change: true, onChange: this.handleMap },
-                    { prop: 'deviceTypes', label: '选择设备类型:', type:'select', options: this.deviceTypeList, optionValue:'value', optionLabel:'label', change: true, onChange: this.handleDevice },
-                    { prop: 'deviceIds', label: '选择设备:', type:'select', multiple: true, options: this.deviceCodesList, optionValue:'code', optionLabel:'name' },
-                    { prop: 'upload', label: '上传:', type:'uploadPicture', show: this.type == 'ADD', action: this.action, fileList: this.fileList, onChange: this.onChange, onSuccess: this.onSuccess }
+                    // { prop: 'mapId', label: '选择线路:', type:'select', options: this.mapList, optionValue:'id', optionLabel:'name', change: true, onChange: this.handleMap },
+                    // { prop: 'deviceTypes', label: '选择设备类型:', type:'select', options: this.deviceTypeList, optionValue:'value', optionLabel:'label', change: true, onChange: this.handleDevice },
+                    // { prop: 'deviceIds', label: '选择设备:', type:'select', multiple: true, options: this.deviceCodesList, optionValue:'code', optionLabel:'name' },
+                    { prop: 'fileName', label: '文件名:', type:'text', show:true, rightWidth:true, required:true },
+                    { prop: 'upload', label: '上传:', type:'uploadPicture', fileList: this.fileList, show: this.type == 'ADD', action: this.action, onChange: this.onChange, onSuccess: this.onSuccess }
                 ]
             };
             return form;
         },
         rules() {
             const crules = {
-                mapId: [
-                    { required: true, message: '请选择线路', trigger: 'change' }
-                ],
-                deviceTypes: [
-                    { required: true, message: '请选择设备类型', trigger: 'change' }
-                ],
-                deviceIds: [
-                    { required: true, message: '请选择设备', trigger: 'change' }
+                fileName: [
+                    { required: true, message: '文件名不能为空', trigger: 'blur'}
                 ]
+                // upload: [
+                //     { required: true, message: '请上传文件', trigger: 'onChange' }
+                // ]
             };
             return crules;
         },
@@ -90,7 +80,7 @@ export default {
             if (this.type === 'ADD') {
                 return '上传PDF';
             } else {
-                return '更新文章';
+                return '更新PDF';
             }
         }
     },
@@ -98,88 +88,84 @@ export default {
         async show(data) {
             this.dialogVisible = true;
             if (this.type != 'ADD') {
-                const obj = this.deviceTypeList.find(el => el.code == data.deviceTypes[0]);
                 this.id = data.id;
-                this.rowData = data;
-                this.rowData.deviceTypes = obj ? obj.value : '';
                 this.formModel = {
-                    mapId: data.mapId,
-                    deviceTypes: obj ? obj.value : '',
-                    deviceIds: data.deviceIds,
                     upload: '',
+                    fileName:data.fileName,
                     filePath: data.filePath
                 };
-                await this.handleMap(data.mapId);
-                obj && await this.handleDevice(obj.value);
             } else {
-                this.rowData = {};
                 this.formModel = {
-                    mapId: '',
-                    deviceTypes: '',
-                    deviceIds: [],
                     upload: '',
-                    filePath: ''
+                    filePath: '',
+                    fileName:''
                 };
             }
         },
-        async handleMap(mapId) {
-            if (mapId) {
-                if (mapId != this.rowData.mapId) {
-                    this.formModel.deviceIds = [];
-                    this.formModel.deviceTypes = '';
-                }
-                return new Promise(async (resolve, reject) => {
-                    const resp = await getPublishMapVersionById(mapId);
-                    const version = resp.data;
-                    dbReadData('mapData', mapId, version, async (mapData, version) =>{
-                        if (mapData && mapData.version == version) {
-                            this.graphDataNew = mapData.graphDataNew;
-                            resolve();
-                        } else if (mapData) {
-                            const res = await getPublishMapDetailById(mapId);
-                            this.graphDataNew = res.data.graphDataNew;
-                            dbUpdateData('mapData', res.data);
-                            resolve();
-                        } else {
-                            const res = await getPublishMapDetailById(mapId);
-                            this.graphDataNew = res.data.graphDataNew;
-                            dbAddData('mapData', res.data);
-                            resolve();
-                        }
-                    });
-                });
-            } else {
-                this.formModel.deviceIds = [];
-                this.formModel.mapId = '';
-                this.formModel.deviceTypes = '';
-            }
-        },
-        handleDevice(type) {
-            if (type) {
-                if (type != this.rowData.deviceTypes) {
-                    this.formModel.deviceIds = [];
-                }
-                this.deviceCodesList = this.graphDataNew[type].map(el => {
-                    return {
-                        code: el.code,
-                        name: `${el.name}(${el.code})`
-                    };
-                });
-            } else {
-                this.formModel.deviceIds = [];
-            }
-        },
+        // async handleMap(mapId) {
+        //     if (mapId) {
+        //         if (mapId != this.rowData.mapId) {
+        //             this.formModel.deviceIds = [];
+        //             this.formModel.deviceTypes = '';
+        //         }
+        //         return new Promise(async (resolve, reject) => {
+        //             const resp = await getPublishMapVersionById(mapId);
+        //             const version = resp.data;
+        //             dbReadData('mapData', mapId, version, async (mapData, version) =>{
+        //                 if (mapData && mapData.version == version) {
+        //                     this.graphDataNew = mapData.graphDataNew;
+        //                     resolve();
+        //                 } else if (mapData) {
+        //                     const res = await getPublishMapDetailById(mapId);
+        //                     this.graphDataNew = res.data.graphDataNew;
+        //                     dbUpdateData('mapData', res.data);
+        //                     resolve();
+        //                 } else {
+        //                     const res = await getPublishMapDetailById(mapId);
+        //                     this.graphDataNew = res.data.graphDataNew;
+        //                     dbAddData('mapData', res.data);
+        //                     resolve();
+        //                 }
+        //             });
+        //         });
+        //     } else {
+        //         this.formModel.deviceIds = [];
+        //         this.formModel.mapId = '';
+        //         this.formModel.deviceTypes = '';
+        //     }
+        // },
+        // handleDevice(type) {
+        //     if (type) {
+        //         if (type != this.rowData.deviceTypes) {
+        //             this.formModel.deviceIds = [];
+        //         }
+        //         this.deviceCodesList = this.graphDataNew[type].map(el => {
+        //             return {
+        //                 code: el.code,
+        //                 name: `${el.name}(${el.code})`
+        //             };
+        //         });
+        //     } else {
+        //         this.formModel.deviceIds = [];
+        //     }
+        // },
         // uploadFile(file) {
         // this.formData.append('file', file.file);
         // },
         onSuccess(res, file) {
             this.formModel.filePath = res.data;
+            this.message = '';
         },
         doSave() {
             const self = this;
             this.$refs.dataform.validateForm(() => {
                 if (self.type == 'ADD') {
-                    self.create();
+                    if (this.formModel.filePath) {
+                        self.create();
+                    } else {
+                        this.message = '请上传文件';
+                        return false;
+                    }
                 } else {
                     self.update();
                 }
@@ -187,16 +173,10 @@ export default {
         },
         create() {
             const self = this;
-            const obj = this.deviceTypeList.find(el => el.value == this.formModel.deviceTypes);
-            if (obj) {
-                this.formModel.deviceTypes = [obj.code];
-            }
             const data = {
                 fileType: 'DRAWING',
-                mapId: this.formModel.mapId,
-                deviceTypes: this.formModel.deviceTypes,
-                deviceIds: this.formModel.deviceIds,
-                filePath: this.formModel.filePath
+                filePath: this.formModel.filePath,
+                fileName:this.formModel.fileName
             };
             postUploadFile(data).then((res) => {
                 self.$message.success('上传PDF成功!');
@@ -204,34 +184,31 @@ export default {
                 self.$emit('reloadTable');
             }).catch(error => {
                 console.log(error);
-                self.$message.error(`创建文章失败:${error.message}`);
+                self.$message.error(`上传PDF失败:${error.message}`);
             });
         },
         update() {
             const self = this;
-            const obj = this.deviceTypeList.find(el => el.value == this.formModel.deviceTypes);
-            if (obj) {
-                this.formModel.deviceTypes = [obj.code];
-            }
             const data = {
                 id: this.id,
                 fileType: 'DRAWING',
-                mapId: this.formModel.mapId,
-                deviceTypes: this.formModel.deviceTypes,
-                deviceIds: this.formModel.deviceIds,
+                fileName:this.formModel.fileName,
                 filePath: this.formModel.filePath
             };
             putUploadFile(data).then(() => {
-                self.$message.success('更新文章成功!');
+                self.$message.success('更新PDF成功!');
                 self.handleClose();
                 self.$emit('reloadTable');
             }).catch(error => {
-                self.$message.error(`更新文章失败:${error.message}`);
+                self.$message.error(`更新PDF失败:${error.message}`);
             });
         },
         handleClose() {
+            this.message = '';
             this.formModel = {
-                title: ''
+                upload: '',
+                filePath: '',
+                fileName:''
             };
             this.$refs.dataform.resetForm();
             this.dialogVisible = false;
@@ -248,4 +225,12 @@ export default {
 		}
 	}
 }
+.fileError{
+    color: red;
+    font-size: 13px;
+    margin-left: 122px;
+    vertical-align: top;
+    display: inline-block;
+    margin-top: -10px;
+}
 </style>
diff --git a/src/views/uploadPdf/list.vue b/src/views/uploadPdf/list.vue
index 0073e1bd7..a8ef71de4 100644
--- a/src/views/uploadPdf/list.vue
+++ b/src/views/uploadPdf/list.vue
@@ -4,12 +4,11 @@
     <el-card>
       <el-form
         ref="queryForm"
-        :model="formModel"
         size="small"
         style="padding: 6px 20px 6px 20px;overflow: hidden;"
       >
-        <el-form-item label="地图" style="margin-bottom: 0;float: left; width: 300px;">
-          <el-select v-model="formModel.mapId" placeholder="请选择" filterable style="width: 240px;" @change="handleMap">
+        <!-- <el-form-item label="地图" style="margin-bottom: 0;float: left; width: 300px;">
+          <el-select v-model="formModel.mapId" placeholder="请选择" clearable filterable style="width: 240px;" @change="handleMap">
             <el-option
               v-for="item in mapList"
               :key="item.id"
@@ -17,8 +16,8 @@
               :value="item.id"
             />
           </el-select>
-        </el-form-item>
-        <el-form-item label="设备类型" style="margin-bottom: 0;float: left; width:350px;">
+        </el-form-item> -->
+        <!-- <el-form-item label="设备类型" style="margin-bottom: 0;float: left; width:350px;">
           <el-select v-model="formModel.deviceType" placeholder="请选择" filterable clearable style="width: 240px;" @change="handleDevice">
             <el-option
               v-for="item in deviceTypeList"
@@ -27,8 +26,8 @@
               :value="item.value"
             />
           </el-select>
-        </el-form-item>
-        <el-form-item label="设备id" style="margin-bottom: 0;float: left; width: 300px;">
+        </el-form-item> -->
+        <!-- <el-form-item label="设备id" style="margin-bottom: 0;float: left; width: 300px;">
           <el-select v-model="formModel.deviceId" placeholder="请选择" filterable clearable style="width: 200px;">
             <el-option
               v-for="item in deviceIdList"
@@ -37,18 +36,18 @@
               :value="item.code"
             />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-button style="margin-right: 10px; float: right;" type="primary" size="small" @click="createTitle">创建</el-button>
         <el-button style="margin-right: 10px; float: right;" type="primary" size="small" @click="query">查询</el-button>
       </el-form>
     </el-card>
     <el-table :data="tableData" border style="width: 100%">
-      <el-table-column label="线路">
+      <!-- <el-table-column label="线路">
         <template slot-scope="scope">
           <span>{{ getMapName(scope.row.mapId) }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="类型">
+      </el-table-column> -->
+      <!-- <el-table-column label="类型">
         <template slot-scope="scope">
           <span>{{ scope.row.deviceTypes }}</span>
         </template>
@@ -57,80 +56,80 @@
         <template slot-scope="scope">
           <el-tag v-for="(item, index) in scope.row.deviceIds" :key="index" class="deviceIdTag">{{ item }}</el-tag>
         </template>
-      </el-table-column>
+      </el-table-column> -->
+      <el-table-column label="pdf名称" prop="fileName" />
       <el-table-column label="路径" prop="filePath" />
       <el-table-column label="时间" prop="createTime" />
       <el-table-column label="操作" width="450">
         <template slot-scope="scope">
           <!-- <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button> -->
-          <el-button size="mini" @click="handleUpdate(scope.$index, scope.row)">更新</el-button>
+          <el-button size="mini" type="primary" @click="handleBind(scope.$index, scope.row)">绑定</el-button>
+          <el-button size="mini" type="success" @click="handleUpdate(scope.$index, scope.row)">更新</el-button>
           <!-- <el-button size="mini" @click="handlePublish(scope.$index, scope.row)">发布</el-button> -->
           <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    <Edit ref="edits" type="ADD" :map-list="mapList" @reloadTable="reloadTable" />
-    <Edit ref="edit" type="EDIT" :map-list="mapList" @reloadTable="reloadTable" />
+    <Edit ref="edits" type="ADD" @reloadTable="reloadTable" />
+    <Edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
+    <Bind-Map ref="bindMap" />
   </div>
 </template>
 
 <script>
-import { getPublishMapDetailById, getPublishMapVersionById } from '@/api/jmap/map';
+// import { getPublishMapDetailById, getPublishMapVersionById } from '@/api/jmap/map';
 import { getUploadFile, deleteUploadFile } from '@/api/pdf';
-import { getPublishMapList } from '@/api/jmap/map';
-import { dbReadData, dbAddData, dbUpdateData } from '@/utils/indexedDb';
+// import { dbReadData, dbAddData, dbUpdateData } from '@/utils/indexedDb';
 import Edit from './edit';
+import BindMap from './bindMap';
 
 export default {
     name: 'CacheControl',
     components: {
-        Edit
+        Edit,
+        BindMap
     },
     data() {
         return {
             tableData: [],
-            formModel: {
-                mapId: '',
-                deviceType:'',
-                deviceId:''
-            },
-            mapList: [],
-            graphDataNew:null,
-            deviceIdList:[],
-            deviceTypeList: [
-                { label: '区段', value: 'sectionList', code: 'SECTION' },
-                { label: '道岔', value: 'switchList', code: 'SWITCH' },
-                { label: '信号机', value: 'signalList', code: 'SIGNAL' },
-                { label: '车站', value: 'stationList', code: 'STATION' },
-                { label: '站台', value: 'stationStandList', code: 'STAND' },
-                { label: '屏蔽门', value: 'psdList', code: 'PSD' },
-                { label: '列车', value: 'trainList', code: 'TRAIN' }
-            ]
+            // formModel: {
+            //     mapId: '',
+            //     deviceType:'',
+            //     deviceId:''
+            // },
+            // mapList: [],
+            // graphDataNew:null,
+            deviceIdList:[]
+            // deviceTypeList: [
+            //     { label: '区段', value: 'sectionList', code: 'SECTION' },
+            //     { label: '道岔', value: 'switchList', code: 'SWITCH' },
+            //     { label: '信号机', value: 'signalList', code: 'SIGNAL' },
+            //     { label: '车站', value: 'stationList', code: 'STATION' },
+            //     { label: '站台', value: 'stationStandList', code: 'STAND' },
+            //     { label: '屏蔽门', value: 'psdList', code: 'PSD' },
+            //     { label: '列车', value: 'trainList', code: 'TRAIN' }
+            // ]
         };
     },
     created() {
-        const params = {
-            pageSize: 9999,
-            pageNum: 1
-        };
-        getPublishMapList(params).then(res => {
-            // this.mapList = res.data.list.filter(el => !el.project );
-            this.mapList = res.data.list || [];
-            if (this.mapList.length > 0) { this.formModel.mapId = this.mapList[0].id; this.handleMap(this.formModel.mapId); }
-            this.query();
-        });
+        this.query();
+        // getPublishMapList(params).then(res => {
+        //     // this.mapList = res.data.list.filter(el => !el.project );
+        //     this.mapList = res.data.list || [];
+        //     // if (this.mapList.length > 0) { this.formModel.mapId = this.mapList[0].id; this.handleMap(this.formModel.mapId); }
+        // });
     },
     methods: {
         query() {
             this.reloadTable();
         },
-        getMapName(val) {
-            if (this && this.mapList.length) {
-                const data = this.mapList.find(el => el.id == val);
-                return data.name;
-            }
-            return val;
-        },
+        // getMapName(val) {
+        //     if (this && this.mapList.length) {
+        //         const data = this.mapList.find(el => el.id == val);
+        //         return data.name;
+        //     }
+        //     return val;
+        // },
         createTitle() {
             this.$refs.edits.show();
         },
@@ -139,7 +138,7 @@ export default {
         //     this.$router.push({path : '/editor', query: {docId: data.id, draft: 1}});
         // },
         // 更新标题
-        handleUpdate(row, data) {
+        handleUpdate(index, data) {
             this.$refs.edit.show(data);
         },
         // // 草稿发布
@@ -152,14 +151,17 @@ export default {
         //         this.$message.error(`发布失败: ${error.data}`);
         //     });
         // },
-        handleDelete(row, data) {
+        handleBind(index, data) {
+            this.$refs.bindMap.doShow(data);
+        },
+        handleDelete(index, data) {
             this.$confirm('是否确认删除？', this.$t('tip.hint'), {
                 confirmButtonText: '确认',
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
                 deleteUploadFile(data.id).then(res => {
-                    this.$message.success('删除文章成功!');
+                    this.$message.success('删除pdf成功!');
                     this.reloadTable();
                 }).catch(error => {
                     this.$message.error(`删除失败: ${error.data}`);
@@ -168,59 +170,59 @@ export default {
         },
         reloadTable() {
             this.tableData = [];
-            getUploadFile(this.formModel).then(res => {
+            getUploadFile({}).then(res => {
                 this.tableData = res.data;
-                this.tableData.forEach(each=>{
-                    const deviceTypeName = this.deviceTypeList.find(type=>{ return type.code == each.deviceTypes[0]; }) || {label:''};
-                    each.deviceTypes = deviceTypeName.label;
-                });
+                // this.tableData.forEach(each=>{
+                //     const deviceTypeName = this.deviceTypeList.find(type=>{ return type.code == each.deviceTypes[0]; }) || {label:''};
+                //     each.deviceTypes = deviceTypeName.label;
+                // });
             }).catch(error => {
                 console.log(error);
             });
-        },
-        handleMap(mapId) {
-            this.deviceIdList = [];
-            this.formModel.deviceId = '';
-            this.formModel.deviceType = '';
-            return new Promise(async (resolve, reject) => {
-                const resp = await getPublishMapVersionById(mapId);
-                const version = resp.data;
-                dbReadData('mapData', mapId, version, async (mapData, version) =>{
-                    if (mapData && mapData.version == version) {
-                        this.graphDataNew = mapData.graphDataNew;
-                        resolve();
-                    } else if (mapData) {
-                        const res = await getPublishMapDetailById(mapId);
-                        this.graphDataNew = res.data.graphDataNew;
-                        dbUpdateData('mapData', res.data);
-                        resolve();
-                    } else {
-                        const res = await getPublishMapDetailById(mapId);
-                        this.graphDataNew = res.data.graphDataNew;
-                        dbAddData('mapData', res.data);
-                        resolve();
-                    }
-                });
-            });
-        },
-        handleDevice(type) {
-            if (type) {
-                const data = this.graphDataNew[type];
-                if (data && data.length > 0) {
-                    this.deviceIdList = this.graphDataNew[type].map(el => {
-                        return {
-                            code: el.code,
-                            name: `${el.name}(${el.code})`
-                        };
-                    });
-                } else {
-                    this.deviceIdList = [];
-                }
-            } else {
-                this.formModel.deviceId = '';
-                this.deviceIdList = [];
-            }
         }
+        // handleMap(mapId) {
+        //     this.deviceIdList = [];
+        //     this.formModel.deviceId = '';
+        //     this.formModel.deviceType = '';
+        //     return new Promise(async (resolve, reject) => {
+        //         const resp = await getPublishMapVersionById(mapId);
+        //         const version = resp.data;
+        //         dbReadData('mapData', mapId, version, async (mapData, version) =>{
+        //             if (mapData && mapData.version == version) {
+        //                 this.graphDataNew = mapData.graphDataNew;
+        //                 resolve();
+        //             } else if (mapData) {
+        //                 const res = await getPublishMapDetailById(mapId);
+        //                 this.graphDataNew = res.data.graphDataNew;
+        //                 dbUpdateData('mapData', res.data);
+        //                 resolve();
+        //             } else {
+        //                 const res = await getPublishMapDetailById(mapId);
+        //                 this.graphDataNew = res.data.graphDataNew;
+        //                 dbAddData('mapData', res.data);
+        //                 resolve();
+        //             }
+        //         });
+        //     });
+        // },
+        // handleDevice(type) {
+        //     if (type) {
+        //         const data = this.graphDataNew[type];
+        //         if (data && data.length > 0) {
+        //             this.deviceIdList = this.graphDataNew[type].map(el => {
+        //                 return {
+        //                     code: el.code,
+        //                     name: `${el.name}(${el.code})`
+        //                 };
+        //             });
+        //         } else {
+        //             this.deviceIdList = [];
+        //         }
+        //     } else {
+        //         this.formModel.deviceId = '';
+        //         this.deviceIdList = [];
+        //     }
+        // }
     }
 };
 </script>

From d00f74e190474732c680948238509df721d8f025 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 17 May 2021 17:29:33 +0800
Subject: [PATCH 24/32] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF?=
 =?UTF-8?q?=E5=9B=BE=E7=BA=B8=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datie_01/menus/dialog/drawSelect.vue      | 102 ++++++++++++++----
 .../theme/datie_01/menus/menuSection.vue      |   8 +-
 .../theme/datie_01/menus/menuSignal.vue       |  16 ++-
 .../theme/datie_01/menus/menuStation.vue      |  29 ++---
 .../theme/datie_01/menus/menuSwitch.vue       |  19 +++-
 src/utils/baseUrl.js                          |   4 +-
 6 files changed, 126 insertions(+), 52 deletions(-)

diff --git a/src/jmapNew/theme/datie_01/menus/dialog/drawSelect.vue b/src/jmapNew/theme/datie_01/menus/dialog/drawSelect.vue
index a0252b4cd..b7daa3883 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/drawSelect.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/drawSelect.vue
@@ -4,22 +4,57 @@
     class="chengdou-03__systerm stand-stop-time"
     :title="title"
     :visible.sync="show"
-    width="640px"
+    width="600px"
     :before-close="doClose"
     :z-index="2000"
     :modal="false"
     :close-on-click-modal="false"
   >
     <div>
-
-	</div>
+      <el-form :inline="true" :model="form" class="demo-form-inline">
+        <el-form-item label="设备类型:">
+          <el-select v-model="form.deviceType" :disabled="true" style="width: 150px;">
+            <el-option
+              v-for="item in deviceTypeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备名称:">
+          <el-input v-model="form.deviceName" :disabled="true" style="width: 150px;" />
+        </el-form-item>
+      </el-form>
+      <el-card>
+        <el-table
+          v-loading="loading"
+          :data="tableData"
+          style="width: 100%"
+        >
+          <el-table-column
+            prop="fileName"
+            label="文件"
+            width="400"
+          />
+          <el-table-column
+            prop="name"
+            label="操作"
+          >
+            <template slot-scope="scope">
+              <div class="text-button" @click="openPdf(scope.row)">打开</div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </div>
   </el-dialog>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import CancelMouseState from '@/mixin/CancelMouseState';
+import { getUploadFile } from '@/api/pdf';
 
 export default {
     name: 'TrainMove',
@@ -30,7 +65,21 @@ export default {
         return {
             selected: null,
             dialogShow: false,
-            loading: false
+            loading: false,
+            tableData: [],
+            deviceTypeList: [
+                { label: '区段', value: 'Section' },
+                { label: '信号机', value: 'Signal' },
+                { label: '道岔', value: 'Switch' },
+                { label: '车站', value: 'Station' }
+            ],
+            deviceIdList: [],
+            form: {
+                mapId: '',
+                deviceId: '',
+                deviceCode: '',
+                deviceName: ''
+            }
         };
     },
     computed: {
@@ -45,31 +94,32 @@ export default {
         }
     },
     methods: {
-        doShow(operate, selected) {
+        doShow(selected) {
             this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
+            this.form.deviceName = selected.name;
+            this.form.deviceType = selected._type;
+            const params = { mapId: this.$route.query.mapId, deviceType: selected._type.toUpperCase(), deviceId: selected.code };
+            this.loading = true;
+            getUploadFile(params).then(resp => {
+                this.tableData = resp.data;
+                this.loading = false;
+            }).catch(error => {
+                this.loading = false;
+                this.$message.error('图纸检索失败！');
+            });
             this.dialogShow = true;
             this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
+        openPdf(row) {
+            const url = `https://joylink.club/oss/joylink/${row.filePath}`;
+            window.open(url, '_blank');
+        },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', 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(); });
         }
     }
 };
@@ -83,4 +133,16 @@ export default {
 		padding: 0 5px;
 		background-color: #F0F0F0;
 	}
+	.text-button{
+		color: #148ad0;
+		cursor:pointer;
+	}
+	.text-button:active{
+		color: #b938e1;
+		text-decoration: underline;
+	}
+	.text-button:hover{
+		color: #b938e1;
+		text-decoration: underline;
+	}
 </style>
diff --git a/src/jmapNew/theme/datie_01/menus/menuSection.vue b/src/jmapNew/theme/datie_01/menus/menuSection.vue
index e7a829fbd..3b3ea698a 100644
--- a/src/jmapNew/theme/datie_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuSection.vue
@@ -7,6 +7,7 @@
     <train-add-plan ref="trainAddPlan" pop-class="chengdou-03__systerm" />
     <set-fault ref="setFault" pop-class="chengdou-03__systerm" />
     <load-spare-train ref="loadSpareTrain" pop-class="chengdou-03__systerm" />
+    <draw-select ref="drawSelect" />
   </div>
 </template>
 
@@ -21,9 +22,9 @@ import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
+import DrawSelect from './dialog/drawSelect';
 
 export default {
     name: 'SectionMenu',
@@ -34,7 +35,8 @@ export default {
         NoticeInfo,
         TrainAddPlan,
         SetFault,
-        LoadSpareTrain
+        LoadSpareTrain,
+        DrawSelect
     },
     props: {
         selected: {
@@ -134,7 +136,7 @@ export default {
             }
         },
         drawingCall() {
-
+            this.$refs.drawSelect.doShow(this.selected);
         },
         doShow(point) {
             this.initMenu();
diff --git a/src/jmapNew/theme/datie_01/menus/menuSignal.vue b/src/jmapNew/theme/datie_01/menus/menuSignal.vue
index 1a979a97c..3aca00977 100644
--- a/src/jmapNew/theme/datie_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuSignal.vue
@@ -8,6 +8,7 @@
     <route-hand-control ref="routeHandControl" />
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
     <password-box ref="passwordBox" pop-class="chengdou-03__systerm" @checkOver="passWordCommit" />
+    <draw-select ref="drawSelect" />
     <set-fault ref="setFault" pop-class="chengdou-03__systerm" />
   </div>
 </template>
@@ -28,6 +29,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordInputBox';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import DrawSelect from './dialog/drawSelect';
 
 export default {
     name: 'SignalMenu',
@@ -40,7 +42,8 @@ export default {
         RouteGuide,
         NoticeInfo,
         PasswordBox,
-        SetFault
+        SetFault,
+        DrawSelect
     },
     props: {
         selected: {
@@ -55,6 +58,10 @@ export default {
             menu: [],
             menuNormal: {
                 Local: [
+                    {
+                        label: '图纸调用',
+                        handler: this.drawingCall
+                    }
                     // {
                     //     label: '办理进路',
                     //     handler: this.arrangementRoute,
@@ -190,13 +197,16 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = this.menuNormal.Local;
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
             }
         },
+        drawingCall() {
+            this.$refs.drawSelect.doShow(this.selected);
+        },
         doShow(point) {
             this.initMenu();
             if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
diff --git a/src/jmapNew/theme/datie_01/menus/menuStation.vue b/src/jmapNew/theme/datie_01/menus/menuStation.vue
index 1224a3895..b84a424e4 100644
--- a/src/jmapNew/theme/datie_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuStation.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
+    <draw-select ref="drawSelect" />
     <set-fault ref="setFault" pop-class="chengdou-03__systerm" />
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
   </div>
@@ -8,7 +9,7 @@
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import DrawSelect from './dialog/drawSelect';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import { mapGetters } from 'vuex';
@@ -22,7 +23,8 @@ export default {
     components: {
         PopMenu,
         SetFault,
-        NoticeInfo
+        NoticeInfo,
+        DrawSelect
     },
     mixins: [
         CancelMouseState
@@ -41,24 +43,8 @@ export default {
             menuNormal: {
                 Local: [
                     {
-                        label: '系统结构图一前置图',
-                        file: '01-系统结构图一前视图.pdf',
-                        handler: this.handlerOpenPdf
-                    },
-                    {
-                        label: '系统结构图二后视图',
-                        file: '02-系统结构图二后视图.pdf',
-                        handler: this.handlerOpenPdf
-                    },
-                    {
-                        label: '系统供电示意图',
-                        file: '03-系统供电示意图.pdf',
-                        handler: this.handlerOpenPdf
-                    },
-                    {
-                        label: '车站布线图',
-                        file: '04-车站布线图.pdf',
-                        handler: this.handlerOpenPdf
+                        label: '图纸调用',
+                        handler: this.drawingCall
                     }
                 ],
                 Center: [
@@ -114,6 +100,9 @@ export default {
                 this.menu = this.menuForce;
             }
         },
+        drawingCall() {
+            this.$refs.drawSelect.doShow(this.selected);
+        },
         doShow(point) {
             this.initMenu();
             if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
diff --git a/src/jmapNew/theme/datie_01/menus/menuSwitch.vue b/src/jmapNew/theme/datie_01/menus/menuSwitch.vue
index 8b64ed0eb..4dfe5e3dc 100644
--- a/src/jmapNew/theme/datie_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuSwitch.vue
@@ -6,11 +6,13 @@
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
     <switch-hook-lock ref="switchHookLock" pop-class="chengdou-03__systerm" />
     <set-fault ref="setFault" pop-class="chengdou-03__systerm" />
+    <draw-select ref="drawSelect" />
   </div>
 </template>
 
 <script>
 import PopMenu from '@/components/PopMenu';
+import DrawSelect from './dialog/drawSelect';
 import SectionControl from '@/jmapNew/theme/components/menus/dialog/sectionControl';
 import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFaultNew';
@@ -31,7 +33,8 @@ export default {
         SwitchControl,
         NoticeInfo,
         SetFault,
-        SwitchHookLock
+        SwitchHookLock,
+        DrawSelect
     },
     mixins: [
         CancelMouseState
@@ -48,7 +51,12 @@ export default {
         return {
             menu: [],
             menuNormal: {
-                Local: [],
+                Local: [
+                    {
+                        label: '图纸调用',
+                        handler: this.drawingCall
+                    }
+                ],
                 Center: [
                     // {
                     //     label: '单操到定位',
@@ -131,8 +139,8 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = this.menuNormal.Local;
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet) {
@@ -147,6 +155,9 @@ export default {
             }
 
         },
+        drawingCall() {
+            this.$refs.drawSelect.doShow(this.selected);
+        },
         doShow(point) {
             this.initMenu();
             if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 11702c286..648fd20ce 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.8.107:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
         // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
-        // BASE_API = 'http://192.168.3.120:9000'; // 张赛
+        BASE_API = 'http://192.168.3.120:9000'; // 张赛
         // BASE_API = 'http://192.168.8.140:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康

From 4384e36314a999467ee2793098155f6c0e7dbbc5 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 17 May 2021 18:03:44 +0800
Subject: [PATCH 25/32] =?UTF-8?q?BUG266=20=E5=8D=97=E4=BA=AC11=E7=AB=99?=
 =?UTF-8?q?=EF=BC=9A=E5=BB=BA=E8=AE=AE=E4=BF=AE=E6=94=B9=E8=BD=A6=E6=AC=A1?=
 =?UTF-8?q?=E5=8F=B7=E8=BE=93=E5=85=A5=E6=A1=86=E5=8F=AA=E8=83=BD=E8=BE=93?=
 =?UTF-8?q?=E5=85=A57=E4=B8=AA=E6=95=B0=E5=AD=97=EF=BC=8C=E8=BD=A6?=
 =?UTF-8?q?=E7=BB=84=E5=8F=B76=E4=B8=AA=E6=95=B0=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/haerbin_01/menus/menuButton.vue | 6 +++---
 src/jmapNew/theme/nanjing_02/menus/menuButton.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
index d00286b2d..3d8412a75 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
@@ -101,8 +101,8 @@
             <el-row style="display: flex;align-items: center;">
               <el-col :span="7" style="height: 25px;line-height: 25px;">车次号</el-col>
               <el-col :span="17">
-                <el-input v-if="trainOperateType!=='create'" v-model="formModelTripNum" size="mini" style="height: 20px;" :disabled="true" />
-                <el-input v-if="trainOperateType==='create'" v-model="formModelNewTrip" size="mini" style="height: 20px;" />
+                <el-input v-if="trainOperateType!=='create'" v-model="formModelTripNum" :maxlength="7" size="mini" style="height: 20px;" :disabled="true" />
+                <el-input v-if="trainOperateType==='create'" v-model="formModelNewTrip" :maxlength="7" size="mini" style="height: 20px;" />
               </el-col>
             </el-row>
             <el-row style="display: flex;align-items: center;">
@@ -115,7 +115,7 @@
             </el-row>
             <el-row v-if="trainOperateType ==='create'" style="display: flex;align-items: center;">
               <el-col :span="7" style="height: 25px;line-height: 25px;">新车组号</el-col>
-              <el-col :span="17"><el-input v-model="formModelNewGroup" size="mini" style="height: 20px;" /></el-col>
+              <el-col :span="17"><el-input v-model="formModelNewGroup" :maxlength="6" size="mini" style="height: 20px;" /></el-col>
             </el-row>
             <el-row v-if="trainOperateType === 'move'" style="display: flex;align-items: center;">
               <el-col :span="7" style="height: 25px;line-height: 25px;">新轨道号</el-col>
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
index 7741244e9..46f8b224d 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@@ -84,8 +84,8 @@
               <el-row style="display: flex;align-items: center;">
                 <el-col :span="7" style="height: 25px;line-height: 25px;">车次号</el-col>
                 <el-col :span="17">
-                  <el-input v-if="trainOperateType!=='create'" v-model="formModelTripNum" size="mini" style="height: 20px;" :disabled="true" />
-                  <el-input v-if="trainOperateType==='create'" v-model="formModelNewTrip" size="mini" style="height: 20px;" />
+                  <el-input v-if="trainOperateType!=='create'" v-model="formModelTripNum" :maxlength="7" size="mini" style="height: 20px;" :disabled="true" />
+                  <el-input v-if="trainOperateType==='create'" v-model="formModelNewTrip" :maxlength="7" size="mini" style="height: 20px;" />
                 </el-col>
               </el-row>
               <el-row style="display: flex;align-items: center;">
@@ -98,7 +98,7 @@
               </el-row>
               <el-row v-if="trainOperateType ==='create'" style="display: flex;align-items: center;">
                 <el-col :span="7" style="height: 25px;line-height: 25px;">新车组号</el-col>
-                <el-col :span="17"><el-input v-model="formModelNewGroup" size="mini" style="height: 20px;" /></el-col>
+                <el-col :span="17"><el-input v-model="formModelNewGroup" :maxlength="6" size="mini" style="height: 20px;" /></el-col>
               </el-row>
               <el-row v-if="trainOperateType === 'move'" style="display: flex;align-items: center;">
                 <el-col :span="7" style="height: 25px;line-height: 25px;">新轨道号</el-col>

From 9a2785f12606e03cd809e7965e0159d941dda6d3 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 17 May 2021 18:16:22 +0800
Subject: [PATCH 26/32] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=97=E4=BA=AC?=
 =?UTF-8?q?=E4=BA=8C=E5=8F=B7=E7=BA=BF=20=E8=A1=8C=E8=B0=83=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C--->=20ibp=E5=B1=80=E9=83=A8=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E7=9B=98=E3=80=81=E8=BD=A6=E7=AB=99=E3=80=81=E8=BD=A8=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/nanjing_02/menus/menuButton.vue     | 84 ++++++++++++++-----
 src/scripts/cmdPlugin/CommandEnum.js          |  4 +
 src/scripts/cmdPlugin/OperationHandler.js     | 47 +++++++++++
 3 files changed, 116 insertions(+), 19 deletions(-)

diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
index 7741244e9..0c7fd6da2 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@@ -239,6 +239,8 @@
           <div class="station_buttonGroupL">
             <div v-if="allowDetain" :id="setDetainTrainId" class="stationButton" @click="stationDetainTrain">此站扣车</div>
             <div v-else class="stationButton disabled">此站扣车</div>
+            <div v-if="allowJump" :id="setJumpStopId" class="stationButton station_jumpTrain" @click="stationAllJumpTrain">连续扣车</div>
+            <div v-else class="stationButton station_jumpTrain disabled">连续扣车</div>
           </div>
           <div class="station_buttonGroupR">
             <div v-if="allowCancle" :id="cancelTrainId" class="stationButton" @click="stationCancleTrain">取消设置</div>
@@ -360,7 +362,13 @@ export default {
             State2SimulationMap: {
                 '01': 'Local',		// 现地工作站
                 '02': 'Center'		// 中心调度工作站
-            }
+            },
+            strategyList: [ // 折返策略
+                { value: '01', label: '不折返' },
+                { value: '02', label: '缺省折返' },
+                { value: '03', label: '换端' },
+                { value: '04', label: '自动折返' }
+            ]
         };
     },
     computed: {
@@ -370,6 +378,7 @@ export default {
         ...mapGetters('map', [
             'routeList',
             'stationList',
+            'stationStandList',
             'routeData',
             'overlapList',
             'overlapData',
@@ -546,7 +555,9 @@ export default {
             const stationContorl = this.stationContorl;
             this.menuCmdList = new Array(15).fill({});
             const lists = list.filter(el => {
-                if (el.isShow && !el.isShow(this.oldClickObj.roadType)) {
+                if (el.isShow && this.selectedObj._type == 'Section' && !el.isShow(this.oldClickObj)) {
+                    return false; // standTrack 站台轨
+                } else if (el.isShow && this.selectedObj._type == 'Station' && el.isShow(this.selectedObj.ciStation)) {
                     return false;
                 }
                 return el;
@@ -831,7 +842,7 @@ export default {
                 this.handleSingalMenu();
             }
         },
-        checkConfirmParam() {
+        checkConfirmParam(row) {
             this.param = {};
             if (this.operate == OperationEvent.Signal.cancelTrainRoute.menuButton.operation || this.operate == OperationEvent.Signal.humanTrainRoute.menuButton.operation) {
                 this.param = {
@@ -888,6 +899,12 @@ export default {
                     };
                 });
             }
+
+            if (this.cmdType == CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY) {
+                this.param = {
+                    val: row.params ? row.params.val : ''
+                };
+            }
         },
         clickCommand(row) {
             const step = {};
@@ -933,7 +950,7 @@ export default {
                 step.param = this.param;
                 this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                     if (valid) {
-                        this.checkConfirmParam();
+                        this.checkConfirmParam(row);
                         this.securityCommand = row.securityCommand || row.next;
                     } else if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -1179,7 +1196,7 @@ export default {
             this.operate = row.operation;
             step.operation = this.operate;
             step.start = true;
-            step.param = {'standCode':this.selectedObj.code};
+            step.param = row.param || {'standCode':this.selectedObj.code};
             this.cmdType = row.cmdType;
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
@@ -1188,7 +1205,6 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
             }).catch((error) => {
-                console.error(error);
                 if (error && error.code == '10017') {
                     EventBus.$emit('sendMsg', {message: error.message});
                 } else {
@@ -1214,6 +1230,19 @@ export default {
             row.cmdType = CMD.Stand.CMD_STAND_SET_JUMP_STOP;
             this.stationCommand(row);
         },
+        stationAllJumpTrain() {
+            const list = this.stationStandList.filter(el => el.right == this.selectedObj.right);
+            const index = list.findIndex(el => el.code == this.selectedObj.code);
+            let lists = list.slice(0, index);
+            if (this.selectedObj.right) {
+                lists = list.slice(index + 1, 9999);
+            }
+            const row = {};
+            row.operation = OperationEvent.StationStand.setBulkBuckleTrain.menuButton.operation;
+            row.cmdType = CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL;
+            row.param = { 'standCodes': lists.map(el => el.code) };
+            this.stationCommand(row);
+        },
         initMenus() {
             this.basicParamList = this.$store.state.training.prdType === '01' ? [
                 { name: '自排全开', commandTip: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
@@ -1257,21 +1286,31 @@ export default {
                 { name: '解封岔芯', commandTip: '解封岔芯', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '强解岔芯', commandTip: '强解岔芯', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
             ] : [
-                { name: '轨区设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
-                { name: '轨区消限', commandTip: '取消对轨道区段的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
-                { name: '强行消限', commandTip: '强行取消对轨道区段的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
-                { name: '强解区段', commandTip: '解锁进路中的轨道区段', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
-                { name: '预复位', commandTip: '预重置计轴区段', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.axlePreReset.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
+                { name: '轨区设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
+                { name: '轨区消限', commandTip: '取消对轨道区段的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
+                { name: '强行消限', commandTip: '强行取消对轨道区段的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
+                { name: '强解区段', commandTip: '解锁进路中的轨道区段', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
+                { name: '预复位', commandTip: '预重置计轴区段', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.axlePreReset.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
                 { name: '封锁区段', commandTip: '禁止通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch },
-                { name: '解封区段', commandTip: '允许通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
+                { name: '解封区段', commandTip: '允许通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
 
-                { name: '折返 DTO', commandTip: '折返 DTO', cmdType: CMD.Section.CMD_SECTION_1, operate: OperationEvent.Section.turnBackDTO.menuButton, disabledCb: (stationControl) => !this.modeMatch },
-                { name: '取消折返', commandTip: '取消折返', cmdType: CMD.Section.CMD_SECTION_2, operate: OperationEvent.Section.CancelTurnBack.menuButton, disabledCb: (stationControl) => !this.modeMatch },
-                { name: '自动折返', commandTip: '自动折返', cmdType: CMD.Section.CMD_SECTION_3, operate: OperationEvent.Section.AutoTurnBack.menuButton, disabledCb: (stationControl) => !this.modeMatch },
-                { name: '换上至下', commandTip: '换上至下', cmdType: CMD.Section.CMD_SECTION_4, operate: OperationEvent.Section.PutUpTheDown.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (type) => type == 'RIGHT' },
-                { name: '换下至上', commandTip: '换下至上', cmdType: CMD.Section.CMD_SECTION_5, operate: OperationEvent.Section.PutDownTheUp.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (type) => type != 'RIGHT' },
-                { name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Section.CMD_SECTION_6, operate: OperationEvent.Section.PutUpStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (type) => type == 'RIGHT' },
-                { name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Section.CMD_SECTION_7, operate: OperationEvent.Section.PutDownStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (type) => type != 'RIGHT' }
+                { name: '上行不折返', commandTip: '上行不折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp01, params: {val: '01'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
+                { name: '下行不折返', commandTip: '下行不折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown01, params: {val: '01'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
+                { name: '上行缺省折返', commandTip: '上行缺省折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp02, params: {val: '02'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
+                { name: '下行缺省折返', commandTip: '下行缺省折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown02, params: {val: '02'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
+                { name: '上行换端', commandTip: '上行换端', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp03, params: {val: '03'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
+                { name: '下行换端', commandTip: '下行换端', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown03, params: {val: '03'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
+                { name: '上行自动折返', commandTip: '上行自动折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp04, params: {val: '04'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
+                { name: '下行自动折返', commandTip: '下行自动折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown04, params: {val: '04'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
+                { name: '车站发车', commandTip: '车站发车', cmdType: CMD.Section.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.earlyDeparture.menuBtn, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.standTrack && this.$store.state.training.prdType == '02' },
+
+                { name: '折返 DTO', commandTip: '折返 DTO', cmdType: CMD.Section.CMD_SECTION_1, operate: OperationEvent.Section.turnBackDTO.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
+                { name: '取消折返', commandTip: '取消折返', cmdType: CMD.Section.CMD_SECTION_2, operate: OperationEvent.Section.CancelTurnBack.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
+                { name: '自动折返', commandTip: '自动折返', cmdType: CMD.Section.CMD_SECTION_3, operate: OperationEvent.Section.AutoTurnBack.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
+                { name: '换上至下', commandTip: '换上至下', cmdType: CMD.Section.CMD_SECTION_4, operate: OperationEvent.Section.PutUpTheDown.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && this.$store.state.training.prdType == '01' },
+                { name: '换下至上', commandTip: '换下至上', cmdType: CMD.Section.CMD_SECTION_5, operate: OperationEvent.Section.PutDownTheUp.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && this.$store.state.training.prdType == '01' },
+                { name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Section.CMD_SECTION_6, operate: OperationEvent.Section.PutUpStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && this.$store.state.training.prdType == '01' },
+                { name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Section.CMD_SECTION_7, operate: OperationEvent.Section.PutDownStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && this.$store.state.training.prdType == '01' }
             ];
             this.switchParamList = [
                 { name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch},
@@ -1326,6 +1365,13 @@ export default {
                 { name: '关站信号', commandTip: '封锁车站所有信号机', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch || !['Local'].includes(stationControl.controlMode) }
             ] : [
                 { name: '关站信号', commandTip: '封锁车站所有信号机', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch || !['Center'].includes(stationControl.controlMode) },
+
+                { name: '关区信号', commandTip: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch || !['Center'].includes(stationControl.controlMode), isShow: (ciStation) => !ciStation },
+                { name: '自排全开', commandTip: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menuButton, disabledCb: (stationControl) => !this.modeMatch || !['Center'].includes(stationControl.controlMode), isShow: (ciStation) => !ciStation },
+                { name: '自排全关', commandTip: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menuButton, disabledCb: (stationControl) => !this.modeMatch || !['Center'].includes(stationControl.controlMode), isShow: (ciStation) => !ciStation },
+                { name: '追踪全开', commandTip: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menuButton, disabledCb: (stationControl) => !this.modeMatch || !['Center'].includes(stationControl.controlMode), isShow: (ciStation) => !ciStation },
+                { name: '追踪全关', commandTip: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menuButton, disabledCb: (stationControl) => !this.modeMatch || !['Center'].includes(stationControl.controlMode), isShow: (ciStation) => !ciStation },
+
                 { name: '接收控制', commandTip: '接收控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menuButton, disabledCb: (stationControl) => ['Center'].includes(stationControl.controlMode) },
                 { name: '交出控制', commandTip: '交出控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menuButton, disabledCb: (stationControl) => ['Local', 'None'].includes(stationControl.controlMode) }
             ];
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index bd5a9230b..507304c37 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -161,6 +161,10 @@ export default {
         CMD_SECTION_OPEN: {value: 'Section_Open', label: '轨道开放'},
         /** 轨道关闭 */
         CMD_SECTION_CLOSE: {value: 'Section_Close', label: '轨道关闭'},
+        /** 设置折返策略 */
+        CMD_STAND_SET_REENTRY_STRATEGY: {value:'Stand_Set_Reentry_Strategy', label: '设置折返策略'},
+        /** 提前发车 */
+        CMD_STAND_EARLY_DEPART: {value:'Stand_Early_Depart', label: '提前发车'},
 
         /** 折返 DTO */
         CMD_SECTION_1: {value: 'Section_1', label: '折返 DTO'},
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 59a55f63b..90756f12f 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -2157,6 +2157,49 @@ export const OperationEvent = {
                 operation: '423',
                 domId: '_Tips-Section-Put-Down-Stop-menu-Button'
             }
+        },
+        // 设置折返策略
+        setBackStrategy: {
+            // (南京二号线) 01 不折返 02 缺省折返 03 换端 04 自动折返
+            menuBtnUp01: {
+                operation: '4241',
+                domId: '_Tips-Section-set-Back-Strategy-Up-menu-01'
+            },
+            menuBtnDown01: {
+                operation: '4242',
+                domId: '_Tips-Section-set-Back-Strategy-Down-menu-01'
+            },
+            menuBtnUp02: {
+                operation: '4243',
+                domId: '_Tips-Section-set-Back-Strategy-Up-menu-02'
+            },
+            menuBtnDown02: {
+                operation: '4244',
+                domId: '_Tips-Section-set-Back-Strategy-Down-menu-02'
+            },
+            menuBtnUp03: {
+                operation: '4245',
+                domId: '_Tips-Section-set-Back-Strategy-Up-menu-03'
+            },
+            menuBtnDown03: {
+                operation: '4246',
+                domId: '_Tips-Section-set-Back-Strategy-Down-menu-03'
+            },
+            menuBtnUp04: {
+                operation: '4247',
+                domId: '_Tips-Section-set-Back-Strategy-Up-menu-04'
+            },
+            menuBtnDown04: {
+                operation: '4248',
+                domId: '_Tips-Section-set-Back-Strategy-Down-menu-04'
+            }
+        },
+        // (南京二号线) 站台轨提前发车
+        earlyDeparture: {
+            menuBtn: {
+                operation: '425',
+                domId: '_Tips-Section-EarlyDeparture-menuBtn'
+            }
         }
     },
 
@@ -2470,6 +2513,10 @@ export const OperationEvent = {
             choose: {
                 operation: '5151',
                 domId: '_Tips-Stand-setBulkBuckleTrain-Choose'
+            },
+            menuButton: {
+                operation: '5152',
+                domId: '_Tips-Stand-setBulkBuckleTrain-menuButton'
             }
         },
         // 批量取消扣车

From ada429fcde58ce4f5e5df6f80d62e6c171e0daae Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 17 May 2021 18:41:58 +0800
Subject: [PATCH 27/32] =?UTF-8?q?pdf=E4=B8=8A=E4=BC=A0=20=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

---
 src/api/pdf.js                      |  10 +-
 src/utils/baseUrl.js                |   4 +-
 src/views/uploadPdf/bindMap.vue     |  23 ++--
 src/views/uploadPdf/bindMapInfo.vue | 206 ++++++++++++++++++++++++++++
 src/views/uploadPdf/list.vue        |   9 --
 5 files changed, 231 insertions(+), 21 deletions(-)
 create mode 100644 src/views/uploadPdf/bindMapInfo.vue

diff --git a/src/api/pdf.js b/src/api/pdf.js
index dbedb2109..737cd2d82 100644
--- a/src/api/pdf.js
+++ b/src/api/pdf.js
@@ -49,6 +49,12 @@ export function getFileBindInfo(fileId, mapId) {
     });
 }
 
-/**  */
-// @GetMapping("")
+/** 创建 */
+export function bindUploadFile(data) {
+    return request({
+        url: `/api/file/binding`,
+        method: 'post',
+        data
+    });
+}
 
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 11702c286..648fd20ce 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.8.107:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
         // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
-        // BASE_API = 'http://192.168.3.120:9000'; // 张赛
+        BASE_API = 'http://192.168.3.120:9000'; // 张赛
         // BASE_API = 'http://192.168.8.140:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
diff --git a/src/views/uploadPdf/bindMap.vue b/src/views/uploadPdf/bindMap.vue
index 544806543..2a1ce6682 100644
--- a/src/views/uploadPdf/bindMap.vue
+++ b/src/views/uploadPdf/bindMap.vue
@@ -1,17 +1,24 @@
 <template>
-  <el-dialog v-dialogDrag title="绑定地图数据" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center class="uploadDialog">
-    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
-    <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
-    </span>
-  </el-dialog>
+  <div>
+    <el-dialog v-dialogDrag title="绑定地图数据" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center class="uploadDialog">
+      <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+        <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+      </span>
+    </el-dialog>
+    <bind-map-info ref="bindMapInfo" :map-list="mapList" />
+  </div>
 </template>
 <script>
 import { getPublishMapList } from '@/api/jmap/map';
 import { getFileBindInfo } from '@/api/pdf';
+import BindMapInfo from './bindMapInfo';
 export default {
     name:'BindMap',
+    components:{
+        BindMapInfo
+    },
     data() {
         return {
             mapList:[],
@@ -74,7 +81,7 @@ export default {
                         if (res.data) {
                             data = res.data;
                         }
-                        this.$refs.bindMapInfo.doShow(data);
+                        this.$refs.bindMapInfo.doShow(self.formModel.mapId, this.fileId, data);
                     }).catch(error => {
                         console.log(error);
                         // self.$message.error(`上传PDF失败:${error.message}`);
diff --git a/src/views/uploadPdf/bindMapInfo.vue b/src/views/uploadPdf/bindMapInfo.vue
new file mode 100644
index 000000000..3d3712375
--- /dev/null
+++ b/src/views/uploadPdf/bindMapInfo.vue
@@ -0,0 +1,206 @@
+<template>
+  <el-dialog
+    title="绑定地图数据"
+    :visible.sync="dialogShow"
+    custom-class="content-route"
+    width="100%"
+    :fullscreen="true"
+    top="0px"
+    :before-close="close"
+    :append-to-body="true"
+  >
+    <jlmap-visual ref="jlmapVisual" v-loading="loadingMap" @onMenu="onContextmenu" @onSelect="clickEvent" />
+    <div>
+      <el-form
+        ref="dataForm"
+        size="small"
+        style="padding: 6px 20px 6px 20px;overflow: hidden;"
+        label-width="130px"
+      >
+        <el-form-item label="地图名称" style="margin-bottom: 0;float: left; width: 300px;">
+          <el-select v-model="formModel.mapId" placeholder="请选择" clearable filterable style="width: 240px;" disabled>
+            <el-option
+              v-for="item in mapList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备类型" style="margin-bottom: 0;float: left; width:350px;margin-top:20px">
+          <el-select v-model="formModel.deviceTypes" placeholder="请选择" filterable clearable multiple style="width: 240px;">
+            <el-option
+              v-for="item in deviceTypeList"
+              :key="item.code"
+              :label="item.label"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备id" style="margin-bottom: 0;float: left; width:350px;margin-top:20px">
+          <el-tag
+            v-for="tag in formModel.deviceIds"
+            :key="tag"
+            closable
+            :disable-transitions="false"
+            @close="handleClose(tag)"
+          >
+            {{ getDeviceName(tag) }}
+          </el-tag>
+          <el-button
+            :type=" field === 'selectDevice' ? 'danger' : 'primary'"
+            @click="hover('selectDevice')"
+          >{{ $t('map.activate') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-button style="margin-left: 190px;margin-top: 30px; " type="primary" size="medium" @click="create">创建</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { loadMapDataById } from '@/utils/loaddata';
+import { bindUploadFile } from '@/api/pdf';
+import JlmapVisual from '@/views/newMap/jlmapNew/index';
+export default {
+    name:'BindMapInfo',
+    components: {
+        JlmapVisual
+    },
+    props:{
+        mapList:{
+            type:Array,
+            required:true
+        }
+    },
+    data() {
+        return {
+            dialogShow:false,
+            mapId:null,
+            loadingMap:false,
+            field:'',
+            formModel:{
+                fileId:'',
+                mapId:'',
+                deviceTypes:[],
+                deviceIds:[]
+            },
+            deviceTypeList: [
+                { label: '区段', value: 'sectionList', code: 'SECTION' },
+                { label: '道岔', value: 'switchList', code: 'SWITCH' },
+                { label: '信号机', value: 'signalList', code: 'SIGNAL' },
+                { label: '车站', value: 'stationList', code: 'STATION' },
+                { label: '站台', value: 'stationStandList', code: 'STAND' },
+                { label: '屏蔽门', value: 'psdList', code: 'PSD' },
+                { label: '列车', value: 'trainList', code: 'TRAIN' }
+            ]
+        };
+    },
+    watch: {
+        '$store.state.app.width': function(val) {
+            this.setWindowSize();
+        },
+        '$store.state.app.windowSizeCount': function() {
+            this.setWindowSize();
+        }
+    },
+    methods:{
+        doShow(mapId, fileId, data) {
+            if (data) {
+                this.formModel.deviceTypes = data.deviceTypes;
+                this.formModel.deviceIds = data.deviceIds || [];
+            }
+            this.formModel.mapId = mapId;
+            this.fileId = fileId;
+            this.setWindowSize();
+            this.mapId = mapId;
+            this.dialogShow = true;
+            this.loadInitPage();
+        },
+        close() {
+            this.formModel = {
+                fileId:'',
+                mapId:'',
+                deviceTypes:[],
+                deviceIds:[]
+            };
+            this.dialogShow = false;
+        },
+        onContextmenu() {
+
+        },
+        handleClose(tag) {
+            this.formModel.deviceIds.splice(this.formModel.deviceIds.indexOf(tag), 1);
+        },
+        hover(field) {
+            this.field = field === this.field ? '' : field;
+        },
+        clickEvent(em) {
+            if (this.field.toUpperCase() === 'selectDevice'.toUpperCase()) {
+                const device = this.getDeviceByEm(em);
+                this.formModel.deviceIds.push(device.code);
+            }
+        },
+        // 获取设备数据
+        getDeviceByEm(em) {
+            var	device = this.$store.getters['map/getDeviceByCode'](em.deviceCode) || null;
+            if (device) {
+                device._viewVal = em.val;
+            }
+            return device;
+        },
+        getDeviceName(code) {
+            const device = this.$store.getters['map/getDeviceByCode'](code);
+            return device ? device.name + '(' + device.code + ')' : '';
+        },
+        loadInitPage() {
+            this.mapId && loadMapDataById(this.mapId, 'preview');
+        },
+        setWindowSize() {
+            this.$nextTick(() => {
+                let width;
+                if (this.type == 'generateRouting') {
+                    width = this.$store.state.app.width - 500;
+                } else {
+                    width = this.$store.state.app.width * 0.7;
+
+                }
+                const height = this.$store.state.app.height - 49;
+                this.$store.dispatch('config/resize', { width, height });
+            });
+        },
+        create() {
+            this.$refs.dataForm.validate((valid) => {
+                if (valid) {
+                    const data = {
+                        fileId:this.formModel.fileId,
+                        mapId:this.formModel.mapId,
+                        deviceTypes:this.formModel.deviceTypes,
+                        deviceIds:this.formModel.deviceIds
+                    };
+                    bindUploadFile(data).then((res) => {
+                        self.$message.success('上传PDF成功!');
+                        self.handleClose();
+                        self.$emit('reloadTable');
+                    }).catch(error => {
+                        console.log(error);
+                        self.$message.error(`上传PDF失败:${error.message}`);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        }
+    }
+};
+</script>
+<style lang="scss">
+.content-route .el-dialog__body {
+    padding: 0 !important;
+    overflow: hidden !important;
+    height:100%
+}
+.el-dialog.is-fullscreen.content-route{
+    display: flex;
+    flex-direction: column;
+}
+</style>
diff --git a/src/views/uploadPdf/list.vue b/src/views/uploadPdf/list.vue
index a8ef71de4..38767be06 100644
--- a/src/views/uploadPdf/list.vue
+++ b/src/views/uploadPdf/list.vue
@@ -100,15 +100,6 @@ export default {
             // mapList: [],
             // graphDataNew:null,
             deviceIdList:[]
-            // deviceTypeList: [
-            //     { label: '区段', value: 'sectionList', code: 'SECTION' },
-            //     { label: '道岔', value: 'switchList', code: 'SWITCH' },
-            //     { label: '信号机', value: 'signalList', code: 'SIGNAL' },
-            //     { label: '车站', value: 'stationList', code: 'STATION' },
-            //     { label: '站台', value: 'stationStandList', code: 'STAND' },
-            //     { label: '屏蔽门', value: 'psdList', code: 'PSD' },
-            //     { label: '列车', value: 'trainList', code: 'TRAIN' }
-            // ]
         };
     },
     created() {

From fee03bbb41514000d5c9a50674a329b294c9bea8 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 17 May 2021 18:42:50 +0800
Subject: [PATCH 28/32] =?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/utils/baseUrl.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 648fd20ce..11702c286 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.8.107:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
         // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
-        BASE_API = 'http://192.168.3.120:9000'; // 张赛
+        // BASE_API = 'http://192.168.3.120:9000'; // 张赛
         // BASE_API = 'http://192.168.8.140:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康

From c0d2b1958915abf0f300d898c3833ceb4e582741 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 17 May 2021 18:57:20 +0800
Subject: [PATCH 29/32] =?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/uploadPdf/bindMap.vue     |  6 ++++--
 src/views/uploadPdf/bindMapInfo.vue | 11 +++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/uploadPdf/bindMap.vue b/src/views/uploadPdf/bindMap.vue
index 2a1ce6682..1ff09d5bf 100644
--- a/src/views/uploadPdf/bindMap.vue
+++ b/src/views/uploadPdf/bindMap.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog v-dialogDrag title="绑定地图数据" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center class="uploadDialog">
+    <el-dialog v-dialogDrag :title="'['+fileName+'] 绑定地图数据'" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center class="uploadDialog">
       <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
@@ -23,6 +23,7 @@ export default {
         return {
             mapList:[],
             fileId:'',
+            fileName:'',
             dialogVisible: false,
             formModel: {
                 mapId:''
@@ -63,6 +64,7 @@ export default {
     methods:{
         doShow(data) {
             this.fileId = data.id;
+            this.fileName = data.fileName;
             this.dialogVisible = true;
         },
         handleClose() {
@@ -81,7 +83,7 @@ export default {
                         if (res.data) {
                             data = res.data;
                         }
-                        this.$refs.bindMapInfo.doShow(self.formModel.mapId, this.fileId, data);
+                        this.$refs.bindMapInfo.doShow(self.formModel.mapId, self.fileId, data);
                     }).catch(error => {
                         console.log(error);
                         // self.$message.error(`上传PDF失败:${error.message}`);
diff --git a/src/views/uploadPdf/bindMapInfo.vue b/src/views/uploadPdf/bindMapInfo.vue
index 3d3712375..518c3c223 100644
--- a/src/views/uploadPdf/bindMapInfo.vue
+++ b/src/views/uploadPdf/bindMapInfo.vue
@@ -13,6 +13,7 @@
     <div>
       <el-form
         ref="dataForm"
+        :model="formModel"
         size="small"
         style="padding: 6px 20px 6px 20px;overflow: hidden;"
         label-width="130px"
@@ -43,6 +44,7 @@
             :key="tag"
             closable
             :disable-transitions="false"
+            class="eachTag"
             @close="handleClose(tag)"
           >
             {{ getDeviceName(tag) }}
@@ -110,7 +112,7 @@ export default {
                 this.formModel.deviceIds = data.deviceIds || [];
             }
             this.formModel.mapId = mapId;
-            this.fileId = fileId;
+            this.formModel.fileId = fileId;
             this.setWindowSize();
             this.mapId = mapId;
             this.dialogShow = true;
@@ -178,12 +180,12 @@ export default {
                         deviceIds:this.formModel.deviceIds
                     };
                     bindUploadFile(data).then((res) => {
-                        self.$message.success('上传PDF成功!');
-                        self.handleClose();
+                        self.$message.success('绑定成功');
+                        self.close();
                         self.$emit('reloadTable');
                     }).catch(error => {
                         console.log(error);
-                        self.$message.error(`上传PDF失败:${error.message}`);
+                        self.$message.error(`绑定失败:${error.message}`);
                     });
                 } else {
                     return false;
@@ -203,4 +205,5 @@ export default {
     display: flex;
     flex-direction: column;
 }
+.eachTag{margin-left:10px;margin-top:10px}
 </style>

From 5a6fcc48eb0897fc6adc9deab6e82997a4034168 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 17 May 2021 19:00:27 +0800
Subject: [PATCH 30/32] =?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/uploadPdf/bindMap.vue | 6 +++++-
 src/views/uploadPdf/list.vue    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/uploadPdf/bindMap.vue b/src/views/uploadPdf/bindMap.vue
index 1ff09d5bf..b78e5927f 100644
--- a/src/views/uploadPdf/bindMap.vue
+++ b/src/views/uploadPdf/bindMap.vue
@@ -7,7 +7,7 @@
         <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
       </span>
     </el-dialog>
-    <bind-map-info ref="bindMapInfo" :map-list="mapList" />
+    <bind-map-info ref="bindMapInfo" :map-list="mapList" @reloadTable="reloadTable" />
   </div>
 </template>
 <script>
@@ -90,6 +90,10 @@ export default {
                     });
                 }
             });
+        },
+        reloadTable() {
+            this.handleClose();
+            this.$emit('reloadTable');
         }
     }
 };
diff --git a/src/views/uploadPdf/list.vue b/src/views/uploadPdf/list.vue
index 38767be06..6fe92c69c 100644
--- a/src/views/uploadPdf/list.vue
+++ b/src/views/uploadPdf/list.vue
@@ -72,7 +72,7 @@
     </el-table>
     <Edit ref="edits" type="ADD" @reloadTable="reloadTable" />
     <Edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
-    <Bind-Map ref="bindMap" />
+    <Bind-Map ref="bindMap" @reloadTable="reloadTable" />
   </div>
 </template>
 

From 6a07a8123375a5188f13501d5d2fad3194f4bf35 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 17 May 2021 19:06:00 +0800
Subject: [PATCH 31/32] =?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/uploadPdf/bindMap.vue     | 2 +-
 src/views/uploadPdf/bindMapInfo.vue | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/uploadPdf/bindMap.vue b/src/views/uploadPdf/bindMap.vue
index b78e5927f..704705b37 100644
--- a/src/views/uploadPdf/bindMap.vue
+++ b/src/views/uploadPdf/bindMap.vue
@@ -83,7 +83,7 @@ export default {
                         if (res.data) {
                             data = res.data;
                         }
-                        this.$refs.bindMapInfo.doShow(self.formModel.mapId, self.fileId, data);
+                        this.$refs.bindMapInfo.doShow(self.formModel.mapId, self.fileId, data, self.fileName);
                     }).catch(error => {
                         console.log(error);
                         // self.$message.error(`上传PDF失败:${error.message}`);
diff --git a/src/views/uploadPdf/bindMapInfo.vue b/src/views/uploadPdf/bindMapInfo.vue
index 518c3c223..eb4469153 100644
--- a/src/views/uploadPdf/bindMapInfo.vue
+++ b/src/views/uploadPdf/bindMapInfo.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="绑定地图数据"
+    :title="'['+fileName+'] 绑定地图数据'"
     :visible.sync="dialogShow"
     custom-class="content-route"
     width="100%"
@@ -78,6 +78,7 @@ export default {
         return {
             dialogShow:false,
             mapId:null,
+            fileName:'',
             loadingMap:false,
             field:'',
             formModel:{
@@ -106,11 +107,12 @@ export default {
         }
     },
     methods:{
-        doShow(mapId, fileId, data) {
+        doShow(mapId, fileId, data, fileName) {
             if (data) {
                 this.formModel.deviceTypes = data.deviceTypes;
                 this.formModel.deviceIds = data.deviceIds || [];
             }
+            this.fileName = fileName;
             this.formModel.mapId = mapId;
             this.formModel.fileId = fileId;
             this.setWindowSize();

From 1ca70a08b82bdf693856d8e86aeca127b1243c33 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 17 May 2021 19:07:24 +0800
Subject: [PATCH 32/32] =?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/uploadPdf/bindMapInfo.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/uploadPdf/bindMapInfo.vue b/src/views/uploadPdf/bindMapInfo.vue
index eb4469153..78579bb14 100644
--- a/src/views/uploadPdf/bindMapInfo.vue
+++ b/src/views/uploadPdf/bindMapInfo.vue
@@ -182,12 +182,12 @@ export default {
                         deviceIds:this.formModel.deviceIds
                     };
                     bindUploadFile(data).then((res) => {
-                        self.$message.success('绑定成功');
-                        self.close();
-                        self.$emit('reloadTable');
+                        this.$message.success('绑定成功');
+                        this.close();
+                        this.$emit('reloadTable');
                     }).catch(error => {
                         console.log(error);
-                        self.$message.error(`绑定失败:${error.message}`);
+                        this.$message.error(`绑定失败:${error.message}`);
                     });
                 } else {
                     return false;