From d85f8ea5a883211af4c44413d00d149db3981e78 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Thu, 27 Feb 2020 16:30:48 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/displayNew/demon/runPlanView.vue   | 638 +++++++++---------
 1 file changed, 319 insertions(+), 319 deletions(-)

diff --git a/src/views/newMap/displayNew/demon/runPlanView.vue b/src/views/newMap/displayNew/demon/runPlanView.vue
index cc2927c5e..f4cddd08f 100644
--- a/src/views/newMap/displayNew/demon/runPlanView.vue
+++ b/src/views/newMap/displayNew/demon/runPlanView.vue
@@ -1,79 +1,110 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    v-dialogLoading="dialogLoading"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="100%"
-    :before-close="doClose"
-    :close-on-click-modal="false"
-    :modal="false"
-    fullscreen
-  >
-    <div :id="runPlanId" v-loading="loading" />
-  </el-dialog>
+    <el-dialog
+        v-dialogDrag
+        v-dialogLoading="dialogLoading"
+        :title="title"
+        :visible.sync="dialogShow"
+        width="100%"
+        :before-close="doClose"
+        :close-on-click-modal="false"
+        :modal="false"
+        fullscreen
+    >
+        <div :id="runPlanId" v-loading="loading" />
+    </el-dialog>
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
-import { runDiagramGetTime } from '@/api/simulation';
-import { getPublishMapInfo } from '@/api/jmap/map';
-import { timeFormat } from '@/utils/date';
-import echarts from 'echarts';
+    import { mapGetters } from 'vuex';
+    import { getPublishMapInfo } from '@/api/jmap/map';
+    import { timeFormat } from '@/utils/date';
+    import echarts from 'echarts';
+    import {toTimeStamp, formatDuring} from '@/utils/date';
 
-// 运行图预览
-export default {
-    name: 'RunPlanView',
-    props: {
-        group: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: true,
-            runPlanId: 'run-plan-view',
-            myChart: null,
-            PlanConvert: {},
-            series: [],
-            option: {
-                title: {
-                    text: '',
-                    left: 'center'
-                },
-                grid: {
-                    top: '30px',
-                    left: '120px',
-                    right: '40px',
-                    bottom: '80px',
-                    containLabel: true,
-                    backgroundColor: 'floralwhite'
-                },
-                toolbox: {
-                    // right: '20px',
-                    // feature: {
-                    //     dataZoom: {
-                    //         yAxisIndex: 'none'
-                    //     },
-                    //     restore: {},
-                    //     saveAsImage: {}
-                    // }
-                },
-                tooltip: {
-                    axisPointer: {
-                        trigger: 'item',
-                        type: 'cross'
+    // 运行图预览
+    export default {
+        name: 'RunPlanView',
+        props: {
+            group: {
+                type: String,
+                required: true
+            }
+        },
+        data() {
+            return {
+                dialogShow: false,
+                loading: true,
+                runPlanId: 'run-plan-view',
+                myChart: null,
+                PlanConvert: {},
+                series: [],
+                option: {
+                    title: {
+                        text: '',
+                        left: 'center'
                     },
-                    formatter: this.axisTooltip,
-                    borderWidth: 1
-                },
-                xAxis: [
-                    {
-                        type: 'category',
-                        boundaryGap: false,
-                        data: [],
+                    grid: {
+                        top: '30px',
+                        left: '120px',
+                        right: '40px',
+                        bottom: '80px',
+                        containLabel: true,
+                        backgroundColor: 'floralwhite'
+                    },
+                    toolbox: {
+                        // right: '20px',
+                        // feature: {
+                        //     dataZoom: {
+                        //         yAxisIndex: 'none'
+                        //     },
+                        //     restore: {},
+                        //     saveAsImage: {}
+                        // }
+                    },
+                    tooltip: {
+                        axisPointer: {
+                            trigger: 'item',
+                            type: 'cross'
+                        },
+                        formatter: this.axisTooltip,
+                        borderWidth: 1
+                    },
+                    xAxis: [
+                        {
+                            type: 'category',
+                            boundaryGap: false,
+                            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',
+                        splitLine: {
+                            show: false
+                        },
+                        axisTick: {
+                            show: false
+                        },
                         axisLine: {
                             onZero: false,
                             lineStyle: {
@@ -82,275 +113,244 @@ export default {
                             }
                         },
                         axisLabel: {
-                            formatter: this.xAxisLableFormat,
-                            textStyle: {
-                                color: '#333'
-                            }
+                            interval: 'auto',
+                            formatter: this.yAxisLableFormat
                         },
                         axisPointer: {
-                            snap: true,
+                            xAxisIndex: 'all',
                             label: {
-                                formatter: this.xAxisPointFormat,
-                                backgroundColor: 'rgb(255,0,0,0.5)',
+                                formatter: this.yAxisPointFormat,
+                                backgroundColor: 'rgb(0,100,0,0.5)',
                                 color: 'white'
                             }
-                        }
-                    }
-                ],
-                yAxis: {
-                    type: 'value',
-                    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'
-                        }
-                    },
-                    min: 0,
-                    max: 0
-                },
-                // graphic: {
-                // 	type: 'line',
-                // 	progressive: true
-                // },
-                series: [],
-                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: '25px'
-                    }
-                ]
-            },
-            absoluteTime: 2 * 3600,
-            indexKmRangeMap: {},
-            runPlanData: {},
-            dialogLoading: false
-        };
-    },
-    computed: {
-        ...mapGetters('runPlan', [
-            'stations'
-        ]),
-        title() {
-            return this.$t('display.runPlan.previewRunDiagram');
-        }
-    },
-    watch: {
-        '$store.state.runPlan.planLoadedCount': async function () {
-            try {
-                await this.loadChartPage();
-                if (this.dialogShow) {
-                    await this.loadInitData(this.series);
-                }
-            } catch (e) {
-                console.error(e);
-            } finally {
-                this.loading = false;
+                        min: 0,
+                        max: 0
+                    },
+                    // graphic: {
+                    // 	type: 'line',
+                    // 	progressive: true
+                    // },
+                    series: [],
+                    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: '25px'
+                        }
+                    ]
+                },
+                absoluteTime: 2 * 3600,
+                indexKmRangeMap: {},
+                runPlanData: {},
+                dialogLoading: false
+            };
+        },
+        computed: {
+            ...mapGetters('runPlan', [
+                'stations'
+            ]),
+            title() {
+                return this.$t('display.runPlan.previewRunDiagram');
             }
         },
-        '$store.state.runPlan.planUpdateCount': function () {
-            this.updateRunPlanData(this.$store.state.runPlan.updateData);
-        },
-        '$store.state.app.windowSizeCount': function() {
-            this.reSize({ width: this.$store.state.app.width, height: this.$store.state.app.height - 55 });
-        }
-    },
-    mounted() {
-        getPublishMapInfo(this.$route.query.mapId).then(res=>{
-            this.PlanConvert = this.$theme.loadPlanConvert(res.data.lineCode);
-            this.loadChartPage();
-        });
-    },
-    beforeDestroy() {
-        if (this.myChart && this.myChart.isDisposed) {
-            this.myChart.dispose();
-            this.myChart = null;
-        }
-    },
-    methods: {
-        async  doShow() {
-            try {
-                this.dialogLoading = true;
-                this.dialogShow = true;
-                this.loadInitData(this.series);
-            } catch (e) {
-                console.error(e);
-            } finally {
-                this.dialogLoading = false;
-            }
-        },
-        async doClose() {
-            this.dialogShow = false;
-        },
-        async loadChartPage() {
-            const stations = this.$store.state.runPlan.stations;
-            const planData = this.$store.state.runPlan.planData;
-            this.series = [];
-            this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
-            this.pushModels(this.series, [this.PlanConvert.initializeYaxis(stations)]);
-            this.pushModels(this.series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { width: 1, color: '#000' }));
-        },
-        async loadInitData(series) {
-            this.myChart && this.myChart.showLoading();
-            await this.xAxisInit();
-            await this.yAxisInit();
-            await this.loadInitChart(series);
-            this.myChart && this.myChart.hideLoading();
-        },
-        loadInitChart(series) {
-            return new Promise((resolve, reject) => {
+        watch: {
+            '$store.state.runPlan.planLoadedCount': async function () {
                 try {
-                    if (this.myChart && this.myChart.isDisposed) {
-                        this.myChart.clear();
+                    await this.loadChartPage();
+                    if (this.dialogShow) {
+                        await this.loadInitData(this.series);
                     }
-
-                    let startValue = 3600 + this.PlanConvert.TranslationTime;
-                    const offsetTime = 3600;
-                    // runDiagramGetTime(this.group).then(resp => {
-                    //     startValue = resp.data - this.PlanConvert.TranslationTime;
-                    //     this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-                    //     this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-                    //     this.option.series = series;
-                    //     this.myChart = echarts.init(document.getElementById(this.runPlanId));
-                    //     if (this.myChart) {
-                    //         this.myChart.setOption(this.option);
-                    //         this.reSize({ width: document.documentElement.clientWidth, height: document.documentElement.clientHeight - 55 });
-                    //     }
-                    // });
-                    resolve(true);
-                } catch (error) {
-                    reject(error);
+                } catch (e) {
+                    console.error(e);
+                } finally {
+                    this.loading = false;
                 }
+            },
+            '$store.state.runPlan.planUpdateCount': function () {
+                this.updateRunPlanData(this.$store.state.runPlan.updateData);
+            },
+            '$store.state.app.windowSizeCount': function() {
+                this.reSize({ width: this.$store.state.app.width, height: this.$store.state.app.height - 55 });
+            }
+        },
+        mounted() {
+            getPublishMapInfo(this.$route.query.mapId).then(res=>{
+                this.PlanConvert = this.$theme.loadPlanConvert(res.data.lineCode);
+                this.loadChartPage();
             });
+        },
+        beforeDestroy() {
+            if (this.myChart && this.myChart.isDisposed) {
+                this.myChart.dispose();
+                this.myChart = null;
+            }
+        },
+        methods: {
+            async  doShow() {
+                try {
+                    this.dialogLoading = true;
+                    this.dialogShow = true;
+                    this.loadInitData(this.series);
+                } catch (e) {
+                    console.error(e);
+                } finally {
+                    this.dialogLoading = false;
+                }
+            },
+            async doClose() {
+                this.dialogShow = false;
+            },
+            async loadChartPage() {
+                const stations = this.$store.state.runPlan.stations;
+                const planData = this.$store.state.runPlan.planData;
+                this.series = [];
+                this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
+                this.pushModels(this.series, [this.PlanConvert.initializeYaxis(stations)]);
+                this.pushModels(this.series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { width: 1, color: '#000' }));
+            },
+            async loadInitData(series) {
+                this.myChart && this.myChart.showLoading();
+                await this.xAxisInit();
+                await this.yAxisInit();
+                await this.loadInitChart(series);
+                this.myChart && this.myChart.hideLoading();
+            },
+            loadInitChart(series) {
+                return new Promise((resolve, reject) => {
+                    try {
+                        if (this.myChart && this.myChart.isDisposed) {
+                            this.myChart.clear();
+                        }
 
-        },
-        updateRunPlanData(data) {
-            const stations = this.$store.state.runPlan.stations;
-            const planData = this.$store.state.runPlan.planData;
-            this.series = this.PlanConvert.updateDataToModels(data, stations, this.kmRangeCoordMap,
-                planData, this.series, { color: '#FF00DE', width: 0.5 }
-            );
-            this.myChart && this.myChart.setOption({ series: this.series });
-        },
-        pushModels(series, models) {
-            if (models && models.length) {
-                models.forEach(elem => {
-                    if (elem) {
-                        series.push(elem);
+                        let startValue = 3600 + this.PlanConvert.TranslationTime;
+                        const offsetTime = 3600;
+                        const initTime = toTimeStamp(formatDuring(this.$store.state.training.initTime));
+                        startValue = initTime - this.PlanConvert.TranslationTime;
+                        this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
+                        this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
+                        this.option.series = series;
+                        this.myChart = echarts.init(document.getElementById(this.runPlanId));
+                        if (this.myChart) {
+                            this.myChart.setOption(this.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);
                     }
                 });
-            }
 
-            return series;
-        },
-        popModels(series, models) {
-            if (models && models.length) {
-                models.forEach(elem => {
-                    const index = series.indexOf(elem);
-                    if (index >= 0) {
-                        series.split(index, 1);
-                    }
+            },
+            updateRunPlanData(data) {
+                const stations = this.$store.state.runPlan.stations;
+                const planData = this.$store.state.runPlan.planData;
+                this.series = this.PlanConvert.updateDataToModels(data, stations, this.kmRangeCoordMap,
+                    planData, this.series, { color: '#FF00DE', width: 0.5 }
+                );
+                this.myChart && this.myChart.setOption({ series: this.series });
+            },
+            pushModels(series, models) {
+                if (models && models.length) {
+                    models.forEach(elem => {
+                        if (elem) {
+                            series.push(elem);
+                        }
+                    });
+                }
+
+                return series;
+            },
+            popModels(series, models) {
+                if (models && models.length) {
+                    models.forEach(elem => {
+                        const index = series.indexOf(elem);
+                        if (index >= 0) {
+                            series.split(index, 1);
+                        }
+                    });
+                }
+
+                return series;
+            },
+            xAxisPointFormat(params) {
+                return timeFormat(params.value);
+            },
+            yAxisPointFormat(params) {
+                return this.PlanConvert.computedFormatYAxis(this.stations, params);
+            },
+            xAxisLableFormat(value, index) {
+                if (value % 60 === 0) {
+                    return timeFormat(value);
+                }
+            },
+            yAxisLableFormat(value, index) {
+                return '';
+            },
+            xAxisInit() {
+                const list = [];
+                for (var time = this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
+                    list.push(time);
+                }
+                this.option.xAxis[0].data = list;
+            },
+            yAxisInit() {
+                if (Object.keys(this.PlanConvert).length) {
+                    this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
+                    this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
+                }
+            },
+            axisTooltip(param) {
+                const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
+                return [
+                    `Point Data <hr size=1 style="margin: 3px 0">`,
+                    `${this.$t('display.runPlan.stationName')}: ${station.name}<br>`,
+                    `${this.$t('display.runPlan.stationMark')}: ${station.kmRange} km <br>`,
+                    `${this.$t('display.runPlan.arrivalTime')}: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
+                ].join('');
+            },
+            settingExac(data) {
+                this.absoluteTime = Math.abs(parseInt(data.endValue) - parseInt(data.startValue)) / 1000;
+                this.myChart && this.myChart.setOption({
+                    xAxis: this.option.xAxis,
+                    yAxis: this.option.yAxis
                 });
-            }
 
-            return series;
-        },
-        xAxisPointFormat(params) {
-            return timeFormat(params.value);
-        },
-        yAxisPointFormat(params) {
-            return this.PlanConvert.computedFormatYAxis(this.stations, params);
-        },
-        xAxisLableFormat(value, index) {
-            if (value % 60 === 0) {
-                return timeFormat(value);
-            }
-        },
-        yAxisLableFormat(value, index) {
-            return '';
-        },
-        xAxisInit() {
-            const list = [];
-            for (var time = this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
-                list.push(time);
-            }
-            this.option.xAxis[0].data = list;
-        },
-        yAxisInit() {
-            if (Object.keys(this.PlanConvert).length) {
-                this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
-                this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
-            }
-        },
-        axisTooltip(param) {
-            const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
-            return [
-                `Point Data <hr size=1 style="margin: 3px 0">`,
-                `${this.$t('display.runPlan.stationName')}: ${station.name}<br>`,
-                `${this.$t('display.runPlan.stationMark')}: ${station.kmRange} km <br>`,
-                `${this.$t('display.runPlan.arrivalTime')}: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
-            ].join('');
-        },
-        settingExac(data) {
-            this.absoluteTime = Math.abs(parseInt(data.endValue) - parseInt(data.startValue)) / 1000;
-            this.myChart && this.myChart.setOption({
-                xAxis: this.option.xAxis,
-                yAxis: this.option.yAxis
-            });
-
-            this.myChart && this.myChart.dispatchAction({
-                type: 'dataZoom',
-                dataZoomIndex: [0, 1],
-                startValue: parseInt(data.startValue / 1000),
-                endValue: parseInt(data.endValue / 1000)
-            });
-        },
-        run(start) {
-            this.myChart && this.myChart.dispatchAction({
-                type: 'dataZoom',
-                dataZoomIndex: [0, 1],
-                startValue: parseInt(start - this.absoluteTime / 2),
-                endValue: parseInt(start + this.absoluteTime / 2)
-            });
-            this.loadInitData(this.series);
-        },
-        reSize(opt) {
-            if (this.myChart) {
-                this.myChart.resize({ width: opt.width, height: opt.height, silent: false });
+                this.myChart && this.myChart.dispatchAction({
+                    type: 'dataZoom',
+                    dataZoomIndex: [0, 1],
+                    startValue: parseInt(data.startValue / 1000),
+                    endValue: parseInt(data.endValue / 1000)
+                });
+            },
+            run(start) {
+                this.myChart && this.myChart.dispatchAction({
+                    type: 'dataZoom',
+                    dataZoomIndex: [0, 1],
+                    startValue: parseInt(start - this.absoluteTime / 2),
+                    endValue: parseInt(start + this.absoluteTime / 2)
+                });
+                this.loadInitData(this.series);
+            },
+            reSize(opt) {
+                if (this.myChart) {
+                    this.myChart.resize({ width: opt.width, height: opt.height, silent: false });
+                }
             }
         }
-    }
-};
+    };
 </script>
 <style scoped rel="stylesheet/scss" lang="scss">
     /deep/ {

From 040636e2cea99a49e372e33b33c8488d19cd9bde Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Thu, 27 Feb 2020 16:52:48 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E5=9B=BE=E9=A2=84=E8=A7=88=E5=B0=BA=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/demon/runPlanView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/newMap/displayNew/demon/runPlanView.vue b/src/views/newMap/displayNew/demon/runPlanView.vue
index f4cddd08f..513587c1f 100644
--- a/src/views/newMap/displayNew/demon/runPlanView.vue
+++ b/src/views/newMap/displayNew/demon/runPlanView.vue
@@ -244,7 +244,7 @@
                         this.myChart = echarts.init(document.getElementById(this.runPlanId));
                         if (this.myChart) {
                             this.myChart.setOption(this.option);
-                            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+                            this.reSize({ width: document.documentElement.clientWidth, height: document.documentElement.clientHeight - 55 });
                             this.myChart.on('click', this.mouseClick);
                         }
                         resolve(true);

From 40c8ee9c0ce52e0cd3ef2e693ddcc4567763630f Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Thu, 27 Feb 2020 16:57:51 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E5=9B=BE=E9=A2=84=E8=A7=88=E5=B0=BA=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/demon/runPlanView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/newMap/displayNew/demon/runPlanView.vue b/src/views/newMap/displayNew/demon/runPlanView.vue
index 513587c1f..9f7437404 100644
--- a/src/views/newMap/displayNew/demon/runPlanView.vue
+++ b/src/views/newMap/displayNew/demon/runPlanView.vue
@@ -244,7 +244,7 @@
                         this.myChart = echarts.init(document.getElementById(this.runPlanId));
                         if (this.myChart) {
                             this.myChart.setOption(this.option);
-                            this.reSize({ width: document.documentElement.clientWidth, height: document.documentElement.clientHeight - 55 });
+                            this.reSize({ width: document.documentElement.clientWidth -10, height: document.documentElement.clientHeight - 55 });
                             this.myChart.on('click', this.mouseClick);
                         }
                         resolve(true);

From 4dab35a61ece41faa75681b5f6168cf1b3e36740 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 27 Feb 2020 17:31:29 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=93=88=E5=B0=94=E6=BB=A8=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF=20=E5=8F=B3=E9=94=AE=E6=93=8D=E4=BD=9C=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

---
 .../theme/chengdu_01/menus/menuSignal.vue     |  1 -
 .../theme/haerbin_01/menus/menuSignal.vue     | 42 ++++++++++++-------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
index db1b9233a..9160b5430 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
@@ -452,7 +452,6 @@ export default {
                 this.$refs.noticeInfo.doShow({}, ['所选的进路没有一个是自动的']);
                 return false;
             }
-            debugger;
             const step = {
                 start: true,
                 over:true,
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue
index 958cd69f1..34a9dcc31 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue
@@ -109,45 +109,55 @@ export default {
                     }
                 ],
                 Center: [
+                    // {
+                    //     label: this.$t('menu.menuSignal.routeSelect'),
+                    //     handler: this.arrangementRoute,
+                    //     cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+                    // },
+                    // {
+                    //     label: this.$t('menu.menuSignal.routeCancel'),
+                    //     handler: this.cancelTrainRoute,
+                    //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+                    // },
                     {
-                        label: this.$t('menu.menuSignal.routeSelect'),
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.routeCancel'),
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalBlock'),
+                        label: '封锁信号',
                         handler: this.lock,
                         cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
                     },
                     {
-                        label: this.$t('menu.menuSignal.signalDeblock'),
+                        label: '解封信号',
                         handler: this.unlock,
                         cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
                     },
                     {
-                        label: this.$t('menu.menuSignal.signalOff'),
+                        label: '关单信号',
                         handler: this.signalClose,
                         cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
                     },
                     {
-                        label: this.$t('menu.menuSignal.signalReopen'),
+                        label: '重复开放',
                         handler: this.reopenSignal,
                         cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
                     },
                     {
-                        label: this.$t('menu.menuSignal.humanControl'),
+                        label: '自排单关',
                         handler: this.humanControl,
                         cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
                     },
                     {
-                        label: this.$t('menu.menuSignal.atsAutoControl'),
+                        label: '自排单开',
                         handler: this.atsAutoControl,
                         cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+                    },
+                    {
+                        label: '追踪单开',
+                        handler: this.setAutoTrigger,
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER
+                    },
+                    {
+                        label: '追踪单关',
+                        handler: this.cancelAutoTrigger,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
                     }
                 ]
             },