diff --git a/src/router/index.js b/src/router/index.js
index ed9cb433b..3cae3f850 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -140,6 +140,7 @@ const MessageBoard = () => import('@/views/messageBoard/index');
 const BoardManage = () => import('@/views/messageBoard/manage');
 const DraftLessonManage = () => import('@/views/teach/draftLessonManage');
 const OrganizationManage = () => import('@/views/organization/index');
+const RunPlanViewWindow = () => import('@/views/newMap/displayNew/demon/runPlanViewWindow');
 
 // import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
 // import { getSessionStorage } from '@/utils/auth';
@@ -232,6 +233,11 @@ export const constantRoutes = [
         component: PlanMonitorEditAUSTool,
         hidden: true
     },
+    {
+        path: '/runPlanViewWindow',
+        component: RunPlanViewWindow,
+        hidden: true
+    },
     {
         path: '/jlmap3d/sandbox',
         component: Jlmap3dSandbox,
diff --git a/src/views/newMap/displayNew/demon/runPlanViewWindow.vue b/src/views/newMap/displayNew/demon/runPlanViewWindow.vue
new file mode 100644
index 000000000..6b7139952
--- /dev/null
+++ b/src/views/newMap/displayNew/demon/runPlanViewWindow.vue
@@ -0,0 +1,564 @@
+<template>
+  <div v-loading="dialogLoading" style="width: 100%;height: 100%;">
+    <div style="text-align: center;font-size: 20px;padding-top: 10px;">{{ title }}</div>
+    <div id="PlanSchedule" :style="{top: top+'px', height: height+'px'}">
+      <div class="left">
+        <div :id="runPlanId" />
+      </div>
+      <div class="right">
+        <data-table
+          ref="serviceTable1"
+          :height="height/2 - 15"
+          :config="serviceNumberConfig"
+          :style="{top: top-height/2+'px'}"
+          @touch="scheduleTouch"
+        />
+        <data-table
+          ref="tripTable1"
+          :height="height/2 -15"
+          :config="tripNumberConfig"
+          :style="{top: top-height/2+'px'}"
+          @touch="trainNumTouch"
+        />
+        <div style="width: 100%;height: 30px;">
+          <el-button style="float: right;" type="primary" size="mini" @click="quit">退出</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { timeFormat } from '@/utils/date';
+import DataTable from '@/views/planSchedule/menusPlan/components/dataTable';
+import echarts from 'echarts';
+import {toTimeStamp, formatDuring} from '@/utils/date';
+import { deepAssign } from '@/utils/index';
+import { EventBus } from '@/scripts/event-bus';
+import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
+import { getToken } from '@/utils/auth';
+import { getByGroupStationList } from '@/api/jmap/map';
+import { loadRunPlanData } from '@/utils/loaddata';
+import { getSimulationInfoNew } from '@/api/simulation';
+
+export default {
+    name: 'PlanSchedule',
+    components: {
+        DataTable
+    },
+    data() {
+        return {
+            top: 0,
+            height: 0,
+            inter:null,
+            runPlanId: 'run-plan-view',
+            myChart: null,
+            PlanConvert: {},
+            dialogLoading: false,
+            serviceNumberConfig: {
+                data: [],
+                highlightCurrentRow: true,
+                handleChange: this.serviceNumberChange,
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'serviceNumber',
+                        label: '表号'
+                    },
+                    {
+                        width: 40
+                    }
+                ]
+            },
+            tripNumberConfig: {
+                data: [],
+                highlightCurrentRow: true,
+                handleChange: this.tripNumberChange,
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'tripNumber',
+                        label: '车次号'
+                    },
+                    {
+                        width: 40
+                    }
+                ]
+            },
+            realData: {},
+            kmRangeCoordMap: {},
+            absoluteTime: 2 * 3600,
+            indexKmRangeMap: {},
+            seriesMap: {},
+            staticSeries: [],
+            runSeries: [],
+            selectSeries: [],
+            runPlanData: {}
+        };
+    },
+    computed: {
+        ...mapGetters('runPlan', [
+            'stations'
+        ]),
+        group() {
+            return this.$route.query.group;
+        },
+        maxWidth() {
+            return this.$store.state.app.width > 1920 ? 1920 : this.$store.state.app.width;
+        },
+        maxHeight() {
+            return this.$store.state.app.height > 1080 ? 1080 : this.$store.state.app.height;
+        },
+        title() {
+            return this.$t('display.runPlan.previewRunDiagram');
+        }
+    },
+    watch: {
+        maxWidth() {
+            this.setPosition();
+        },
+        maxHeight() {
+            this.setPosition();
+        },
+        '$store.state.runPlan.planLoadedCount': async function () {
+            try {
+                await this.loadChartPage();
+                this.selectSeries = []; this.runSeries = []; this.runPlanData = {};
+                await this.loadInitData();
+            } catch (e) {
+                console.error(e);
+            } finally {
+                this.loading = false;
+            }
+        },
+        '$store.state.socket.simulationReset': function (val) {
+            this.selectSeries = []; this.runSeries = []; this.runPlanData = {};
+            this.loadInitData();
+        },
+        '$store.state.runPlan.planSizeCount': function () {
+            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+        },
+        '$store.state.socket.trainStationList': function (val) {
+            if (val.length) {
+                this.updateRunPlanData(val);
+            }
+        }
+    },
+    mounted() {
+        this.dialogLoading = true;
+        getSimulationInfoNew(this.group).then(res => {
+            this.$store.dispatch('runPlan/setRunPlanInfo', res.data.runPlan);
+            getByGroupStationList(this.group).then(response => {
+                this.$store.dispatch('runPlan/setStations', response.data).then(() => {
+                    loadRunPlanData(this.group, this.dataError);
+                    this.staticSeries = []; this.selectSeries = []; this.runSeries = []; this.runPlanData = {};
+                    this.PlanConvert = this.$theme.loadPlanConvert(this.$route.query.lineCode);
+                    this.loadChartPage();
+                    EventBus.$on('clearRunSeries', () => {
+                        this.runSeries = [];
+                    });
+                    this.doShow();
+                });
+            }).catch(() => {
+                this.$messageBox(this.$t('display.schema.getStationListFail'));
+            });
+        });
+    },
+    beforeDestroy() {
+        this.$store.dispatch('runPlan/setSelected', null);
+        this.destroy();
+        this.clearSubscribe();
+    },
+    methods: {
+        async doShow() {
+            try {
+                await this.setPosition();
+                await this.loadInitData();
+                this.inter && clearInterval(this.inter);
+                await this.subscribe();
+            } catch (e) {
+                console.error(e);
+            } finally {
+                this.dialogLoading = false;
+            }
+        },
+        async doClose() {
+            this.inter && clearInterval(this.inter);
+        },
+        serviceNumberChange(row) {
+            if (row) {
+                this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
+                this.renderTripNumber({ serviceNumber: row.serviceNumber, tripNumber: null });
+                const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
+                if (serviceObj) {
+                    this.analyticalTripNumber(serviceObj.trainMap);
+                }
+            }
+        },
+        tripNumberChange(row) {
+            if (row) {
+                this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
+                this.renderTripNumber({ serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
+            }
+        },
+        async analyticalServiceNumber(data) {
+            this.serviceNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return parseInt(data[a].serviceNumber) - parseInt(data[b].serviceNumber); })
+                .map(serviceNumber => { return { serviceNumber }; });
+        },
+        async analyticalTripNumber(data) {
+            this.tripNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return data[a].tripNumber - data[b].tripNumber; })
+                .map(tripNumber => { return { tripNumber }; });
+        },
+        async setPosition() {
+            this.$nextTick(() => {
+                const top = 54;
+                const width = this.maxWidth * 0.85;
+                let height = this.maxHeight;
+
+                height = height - top;
+                this.$store.dispatch('runPlan/resize', { width, height });
+
+                if (this.top != top) {
+                    this.top = top;
+                }
+
+                if (this.height != height) {
+                    this.height = height - top;
+                }
+            });
+        },
+        updateRunPlanData(data) {
+            const stations = this.$store.state.runPlan.stations;
+            const initialPlanData = this.$store.state.runPlan.initialPlanData;
+            data.forEach(item => {
+                if (item && initialPlanData[item.serviceNumber]) {
+                    Object.keys(initialPlanData[item.serviceNumber].trainMap).forEach(ele => {
+                        if (initialPlanData[item.serviceNumber].trainMap[ele + ''].tripNumber == item.tripNumber) {
+                            item.directionCode = initialPlanData[item.serviceNumber].trainMap[ele + ''].directionCode;
+                        }
+                    });
+                    item.secondTime = item.second;
+                }
+            });
+            this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
+            this.runSeries = this.PlanConvert.updateDataToModels(data, stations, this.kmRangeCoordMap,
+                this.runPlanData, this.runSeries, { color: '#FF00DE', width: 2 }
+            );
+            const series = [...this.staticSeries, ...this.runSeries, ... this.selectSeries];
+            this.myChart && this.myChart.setOption({series: series});
+        },
+        async loadChartPage() {
+            try {
+                this.seriesMap = {};
+                this.staticSeries = [];
+                const stations = this.$store.state.runPlan.stations;
+                const planData = this.$store.state.runPlan.planData;
+                this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
+                this.pushModels(this.staticSeries, [this.PlanConvert.initializeYaxis(stations)]);
+                this.staticSeries = this.pushModels(this.staticSeries, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { color: '#000', width: 0.5 }));
+                this.staticSeries.forEach(item => {
+                    this.seriesMap[item.name] = item;
+                });
+                await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
+            } catch (error) {
+                this.$messageBox(`加载运行图数据失败`);
+            }
+        },
+
+        async loadInitData() {
+            this.myChart && this.myChart.showLoading();
+            const option = {
+                tooltip: {
+                    axisPointer: {
+                        trigger: 'item',
+                        type: 'cross'
+                    },
+                    formatter: this.axisTooltip,
+                    borderWidth: 1
+                },
+                grid: {
+                    right: '40px',
+                    left: '120px',
+                    height: '85%'
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        data: [],
+                        axisLine: {
+                            onZero: false,
+                            lineStyle: {
+                                width: 2,
+                                color: '#d14a61'
+                            }
+                        },
+                        axisLabel: {
+                            formatter: this.xAxisLableFormat,
+                            textStyle: {
+                                color: '#333'
+                            }
+                        },
+                        axisPointer: {
+                            snap: true,
+                            label: {
+                                formatter: this.xAxisPointFormat,
+                                backgroundColor: 'rgb(255,0,0,0.5)',
+                                color: 'white'
+                            }
+                        }
+                    }
+                ],
+                yAxis: [
+                    {
+                        type: 'value',
+                        yAxisIndex: 0,
+                        splitLine: {
+                            show: false
+                        },
+                        axisTick: {
+                            show: false
+                        },
+                        axisLine: {
+                            onZero: false,
+                            lineStyle: {
+                                width: 2,
+                                color: '#d14a61'
+                            }
+                        },
+                        axisLabel: {
+                            interval: 'auto',
+                            formatter: this.yAxisLableFormat
+                        },
+                        axisPointer: {
+                            xAxisIndex: 'all',
+                            label: {
+                                formatter: this.yAxisPointFormat,
+                                backgroundColor: 'rgb(0,100,0,0.5)',
+                                color: 'white'
+                            }
+                        }
+                    }
+                ],
+                dataZoom: [{
+                    type: 'inside'
+                },
+                {
+                    fiterMode: 'filter',
+                    handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
+                    handleSize: '80%',
+                    handleStyle: {
+                        color: '#fff',
+                        shadowBlur: 3,
+                        shadowColor: 'rgba(0, 0, 0, 0.6)',
+                        shadowOffsetX: 2,
+                        shadowOffsetY: 2
+                    },
+                    bottom: '20px'
+                }],
+                series: [
+
+                ]
+            };
+            await this.xAxisInit(option);
+            await this.yAxisInit(option);
+            await this.loadInitChart(option);
+            this.myChart && this.myChart.hideLoading();
+        },
+        pushModels(series, models) {
+            if (models && models.length) {
+                models.forEach(elem => {
+                    if (elem) {
+                        series.push(elem);
+                    }
+                });
+            }
+            return series;
+        },
+        loadInitChart(option) {
+            return new Promise((resolve, reject) => {
+                try {
+                    this.destroy();
+                    let startValue = 3600 + this.PlanConvert.TranslationTime;
+                    const offsetTime = 3600;
+                    const initTime = toTimeStamp(formatDuring(parseInt(this.$route.query.initTime)));
+                    startValue = initTime - this.PlanConvert.TranslationTime;
+                    option.dataZoom[0].startValue = option.dataZoom[1].startValue = startValue - offsetTime;
+                    option.dataZoom[0].endValue = option.dataZoom[1].endValue = startValue + offsetTime;
+                    option.series = [...this.staticSeries, ...this.runSeries, ...this.selectSeries];
+                    this.myChart = echarts.init(document.getElementById(this.runPlanId));
+                    if (this.myChart) {
+                        this.myChart.setOption(option);
+                        this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+                        this.myChart.on('click', this.mouseClick);
+                    }
+                    resolve(true);
+                } catch (error) {
+                    reject(error);
+                }
+            });
+        },
+        xAxisPointFormat(params) {
+            return timeFormat(params.value);
+        },
+        yAxisPointFormat(params) {
+            return this.PlanConvert.computedFormatYAxis(this.stations, params);
+        },
+        xAxisLableFormat(value, index) {
+            return timeFormat(value);
+        },
+        yAxisLableFormat(value, index) {
+            return '';
+        },
+        xAxisInit(option) {
+            const list = [];
+            for (var time = 0 + this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
+                list.push(time);
+            }
+            const startValue = 3600 * 6;
+            const offsetTime = 3600 * 1;
+
+            option.xAxis[0].data = list;
+            if (!option.dataZoom[0].startValue) {
+                option.dataZoom[0].startValue = option.dataZoom[1].startValue = startValue - offsetTime;
+            }
+
+            if (!option.dataZoom[0].endValue) {
+                option.dataZoom[0].endValue = option.dataZoom[1].endValue = startValue + offsetTime;
+            }
+        },
+        yAxisInit(option) {
+            if (Object.keys(this.PlanConvert).length) {
+                option.yAxis[0].min = this.PlanConvert.computedYaxisMinValue(this.stations);
+                option.yAxis[0].max = this.PlanConvert.computedYaxisMaxValue(this.stations);
+            }
+        },
+        axisTooltip(param) {
+            const station = (this.$store.getters['map/getDeviceByCode'](param.data[2])) || { name: '', kmRange: '' };
+            return [
+                `Point Data <hr size=1 style=" margin: 3px 0">`,
+                `车站名称: ${station.name}<br>`,
+                `车站公里标: ${station.kmRange} km <br>`,
+                `到站时间: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
+            ].join('');
+        },
+        renderTripNumber(params) {
+            const tripNumber = params.tripNumber; // 车次号
+            const serviceNumber = params.serviceNumber; // 服务号
+            let data, markPoint;
+            if (tripNumber && this.seriesMap[serviceNumber]) {
+                const temp = this.seriesMap[serviceNumber].data.filter(elem => elem[3] == tripNumber);
+                if (temp.length) {
+                    data = temp;
+                    this.seriesMap[serviceNumber].markPoint.data.forEach(each=> {
+                        if (each.name == temp[0][4]) {
+                            markPoint = deepAssign({}, {data:[each]});
+                            markPoint.symbol = 'roundRect';
+                            markPoint.symbolSize = 1;
+                            markPoint.data[0].label.color = '#f00';
+                        }
+                    });
+                }
+            } else if (this.seriesMap[serviceNumber]) {
+                markPoint = deepAssign({}, this.seriesMap[serviceNumber].markPoint);
+                markPoint.data.forEach(each => {
+                    each.label.color = '#f00';
+                });
+                data = this.seriesMap[serviceNumber].data;
+            }
+            this.selectSeries = [{
+                name: 'trainLabel',
+                lineStyle: {
+                    color: '#f00',
+                    width: 2,
+                    type: 'solid'
+                },
+                z: 10,
+                type: 'line',
+                markPoint:markPoint,
+                animation: false,
+                data: data
+            }];
+            const series = [...this.staticSeries, ...this.runSeries, ...this.selectSeries];
+            this.myChart && this.myChart.setOption({series: series});
+        },
+        mouseClick(params) {
+            const model = {
+                serviceNumber: params.seriesName
+            };
+            this.$store.dispatch('runPlan/setSelected', model);
+        },
+        reSize(opt) {
+            if (this.myChart) {
+                this.myChart.resize({
+                    width: opt.width,
+                    height: opt.height,
+                    silent: false
+                });
+            }
+        },
+        destroy() {
+            if (this.myChart && this.myChart.isDisposed) {
+                this.myChart.dispose();
+                this.myChart = null;
+            }
+        },
+        async subscribe() {
+            this.clearSubscribe();
+            const header = { group: this.group || '', 'X-Token': getToken() };
+            creatSubscribe(`${displayTopic}\/${this.group}`, header);
+        },
+        clearSubscribe() {
+            clearSubscribe(`${displayTopic}\/${this.group}`);
+        },
+        quit() {
+            window.close();
+        },
+        scheduleTouch() {
+
+        },
+        trainNumTouch() {
+
+        }
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+	@import "src/styles/mixin.scss";
+
+	#PlanSchedule {
+		z-index: 5;
+		position: absolute;
+		width: 100%;
+
+		.left {
+			height: 100%;
+			width: 85%;
+			float: left;
+		}
+
+		.right {
+			height: 100%;
+			width: 15%;
+			float: right;
+		}
+	}
+
+	/deep/ {
+		.el-dialog {
+			height: 100%;
+			max-height: 1080px;
+		}
+		.el-dialog__body {
+			padding: 0px !important;
+			background-color: floralwhite !important;
+		}
+		.el-dialog__headerbtn .el-dialog__close {
+			font-size: 18px;
+			border: 1px solid #909399;
+			border-radius: 5px;
+		}
+	}
+</style>
diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index a6d4a2607..e1135bceb 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -198,7 +198,21 @@ export default {
             this.$emit('runPlanLoadShow');
         },
         viewRunPlan() {
-            this.$refs.runPlanView.doShow();
+            if (this.$route.query.type === 'CW') {
+                const routeData = this.$router.resolve({
+                    path:`/runPlanViewWindow`,
+                    query:{
+                        lineCode: this.$route.query.lineCode,
+                        mapId:this.$route.query.mapId,
+                        group:this.$route.query.group,
+                        initTime: this.$store.state.training.initTime,
+                        noPreLogout: true
+                    }
+                });
+                window.open(routeData.href, '_blank', 'noopener noreferrer');
+            } else {
+                this.$refs.runPlanView.doShow();
+            }
         },
         // 选择车站
         switchStationMode(stationCode) {
diff --git a/src/views/system/deviceManage/index.vue b/src/views/system/deviceManage/index.vue
index 068756d2c..1b382f309 100644
--- a/src/views/system/deviceManage/index.vue
+++ b/src/views/system/deviceManage/index.vue
@@ -38,7 +38,7 @@ export default {
                 pageIndex: 'pageNum'
             },
             deviceTypeList:ConstConfig.ConstSelect.projectDeviceTypeList,
-            projectList: [{label:'西铁院', value: 'XTY'}, {label: '贵州装备', value:'GZB'}, {label: '哈尔滨', value:'HEB'}],
+            projectList: [{label:'西铁院', value: 'XTY'}, {label: '贵州装备', value:'GZB'}, {label: '哈尔滨', value:'HEB'}, {label: '苏电院', value:'SDY'}],
             projectMap: {
                 designxty: 'XTY',
                 designgzb: 'GZB',