From f6dd06843fb8785d100064211d3c3e07f97a8516 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 28 Apr 2020 16:59:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/configLine/config.vue | 163 ++++++++++++++-----------
 1 file changed, 94 insertions(+), 69 deletions(-)

diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
index 7634931ef..ffc1a23fa 100644
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@@ -1,72 +1,76 @@
 <template>
   <div v-show="dialogVisible">
-    <el-dialog v-dialogDrag title="配置项" :visible.sync="dialogVisible" width="550px" :before-close="handleClose" center :close-on-click-modal="false" :z-index="2000">
-      <el-card>
-        <div slot="header" style="font-weight: bold;text-align: center;">
-          <span>通用配置项</span>
-        </div>
-        <el-table :data="generalData" style="width: 100%;" height="200">
-          <el-table-column prop="configKey" label="key" width="300px" />
-          <el-table-column prop="configValue" label="value">
-            <template slot-scope="scope">
-              <div v-if="scope.row.type === 'input'">
-                <div v-if="!scope.row.focus" style="width: 100%;cursor: pointer;" @click="changeFocus(scope.row, '1')">{{ scope.row.configValue }}</div>
-                <el-input v-if="scope.row.focus" v-model="scope.row.configValue" size="mini" style="width: 100%" @blur="changeFocus(scope.row, '0')" />
-              </div>
-              <div v-else-if="scope.row.type === 'number'">
-                <div v-if="!scope.row.focus" style="width: 100%;cursor: pointer" @click="changeFocus(scope.row, '1')">{{ scope.row.configValue }}</div>
-                <el-input-number v-if="scope.row.focus" v-model="scope.row.configValue" size="mini" style="width: 100px;" :min="0" controls-position="right" @blur="changeFocus(scope.row, '0')" />
-              </div>
-              <div v-else-if="scope.row.type === 'boolean'">
-                <el-checkbox v-model="scope.row.configValue">{{ scope.row.configValue }}</el-checkbox>
-              </div>
-              <div v-else-if="scope.row.type === 'select'">
-                <el-select v-model="scope.row.configValue" size="mini" style="width: 80px;">
-                  <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>
-      </el-card>
-      <el-card style="margin-top: 10px">
-        <div slot="header" style="font-weight: bold;text-align: center;">
-          <span>联锁配置项</span>
-        </div>
-        <el-table :data="roadData" style="width: 100%;" height="200">
-          <el-table-column prop="configKey" label="key" width="300px" />
-          <el-table-column prop="configValue" label="value">
-            <template slot-scope="scope">
-              <div v-if="scope.row.type === 'input'">
-                <div v-if="!scope.row.focus" style="width: 100%;cursor: pointer;" @click="changeFocus(scope.row, '1')">{{ scope.row.configValue }}</div>
-                <el-input v-if="scope.row.focus" v-model="scope.row.configValue" size="mini" style="width: 100%" @blur="changeFocus(scope.row, '0')" />
-              </div>
-              <div v-else-if="scope.row.type === 'number'">
-                <div v-if="!scope.row.focus" style="width: 100%;cursor: pointer" @click="changeFocus(scope.row, '1')">{{ scope.row.configValue }}</div>
-                <el-input-number v-if="scope.row.focus" v-model="scope.row.configValue" size="mini" style="width: 100px;" :min="0" controls-position="right" @blur="changeFocus(scope.row, '0')" />
-              </div>
-              <div v-else-if="scope.row.type === 'boolean'">
-                <el-checkbox v-model="scope.row.configValue">{{ scope.row.configValue }}</el-checkbox>
-              </div>
-              <div v-else-if="scope.row.type === 'select'">
-                <el-select v-model="scope.row.configValue" size="mini" style="width: 80px;">
-                  <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>
-      </el-card>
+    <el-dialog v-dialogDrag title="配置项" :visible.sync="dialogVisible" fullscreen :before-close="handleClose" center :close-on-click-modal="false" :z-index="2000">
+      <div style="overflow-y: scroll;" :style="{height: height+ 'px'}">
+        <el-card>
+          <div slot="header" style="font-weight: bold;text-align: center;">
+            <span>通用配置项</span>
+          </div>
+          <el-table :data="generalData" style="width: 100%;">
+            <el-table-column prop="configKey" label="key" />
+            <el-table-column prop="configValue" label="value">
+              <template slot-scope="scope">
+                <div v-if="scope.row.type === 'input'">
+                  <div v-if="!scope.row.focus" style="width: 100%;cursor: pointer;" @click="changeFocus(scope.row, '1')">{{ scope.row.configValue }}</div>
+                  <el-input v-if="scope.row.focus" v-model="scope.row.configValue" size="mini" style="width: 100%" @blur="changeFocus(scope.row, '0')" />
+                </div>
+                <div v-else-if="scope.row.type === 'number'">
+                  <div v-if="!scope.row.focus" style="width: 100%;cursor: pointer" @click="changeFocus(scope.row, '1')">{{ scope.row.configValue }}</div>
+                  <el-input-number v-if="scope.row.focus" v-model="scope.row.configValue" size="mini" style="width: 100px;" :min="0" controls-position="right" @blur="changeFocus(scope.row, '0')" />
+                </div>
+                <div v-else-if="scope.row.type === 'boolean'">
+                  <el-checkbox v-model="scope.row.configValue">{{ scope.row.configValue }}</el-checkbox>
+                </div>
+                <div v-else-if="scope.row.type === 'select'">
+                  <el-select v-model="scope.row.configValue" size="mini" style="width: 80px;">
+                    <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="描述" />
+          </el-table>
+        </el-card>
+        <el-card style="margin-top: 10px">
+          <div slot="header" style="font-weight: bold;text-align: center;">
+            <span>联锁配置项</span>
+          </div>
+          <el-table :data="roadData" style="width: 100%;">
+            <el-table-column prop="configKey" label="key" />
+            <el-table-column prop="configValue" label="value">
+              <template slot-scope="scope">
+                <div v-if="scope.row.type === 'input'">
+                  <div v-if="!scope.row.focus" style="width: 100%;cursor: pointer;" @click="changeFocus(scope.row, '1')">{{ scope.row.configValue }}</div>
+                  <el-input v-if="scope.row.focus" v-model="scope.row.configValue" size="mini" style="width: 100%" @blur="changeFocus(scope.row, '0')" />
+                </div>
+                <div v-else-if="scope.row.type === 'number'">
+                  <div v-if="!scope.row.focus" style="width: 100%;cursor: pointer" @click="changeFocus(scope.row, '1')">{{ scope.row.configValue }}</div>
+                  <el-input-number v-if="scope.row.focus" v-model="scope.row.configValue" size="mini" style="width: 100px;" :min="0" controls-position="right" @blur="changeFocus(scope.row, '0')" />
+                </div>
+                <div v-else-if="scope.row.type === 'boolean'">
+                  <el-checkbox v-model="scope.row.configValue">{{ scope.row.configValue }}</el-checkbox>
+                </div>
+                <div v-else-if="scope.row.type === 'select'">
+                  <el-select v-model="scope.row.configValue" size="mini" style="width: 80px;">
+                    <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="描述" />
+          </el-table>
+        </el-card>
+      </div>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="save">{{ $t('global.confirm') }}</el-button>
         <el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
@@ -107,11 +111,31 @@ export default {
             numberList: ['overlapReleaseTime', 'routeReleaseTime'],
             optionsMap: {
                 upDirection: [{label: 'right', value: 'right'}, {label: 'left', value: 'left'}]
+            },
+            remarkMap: {
+                lockFirst: '是否先锁闭——办理过程直接先锁闭区段',
+                upDirection: '上行方向',
+                switchSingleHandle: '道岔区段状态改变按单个道岔处理',
+                signalApproachOnlyOne: '信号机接近区段是否只取最近的一个',
+                signalApproachOnlyNpSwitch: ' 信号机接近区段是否仅考虑定位道岔',
+                routeNameUseEndOppositeSignalName: '进路名称是否使用终端信号机同区段反向信号机名称命名，否则使用终端信号机命名',
+                generateTbRoute: '是否生成折返进路',
+                tbRouteNameUseEndOppositeSignalName: '折返进路名称是否使用终端信号机反向信号机名称',
+                routeSignalAlwaysGreen: '进路始端防护信号机是否总是绿灯,否则根据进路中有无反位道岔生成绿灯或黄灯',
+                routeApartByOverlap: '多个延续保护路径生成多条进路,否则生成一条进路',
+                overlapOnlySwitch:'延续保护是否只构建道岔',
+                overlapOnlyOneSwitch: '延续保护构建是否只考虑一个道岔计轴',
+                overlapSwitchNpOnly: '延续保护道岔是否只构建定位道岔',
+                overlapSignalOppositeSwitchNpOnly: '延续保护道岔在防护信号机与所属区段方向相反时，是否只构建定位道岔',
+                overlapReleaseTime: '默认延续保护解锁时间',
+                routeReleaseTime: '默认进路解锁时间'
             }
         };
     },
     computed: {
-
+        height() {
+            return 	document.documentElement.clientHeight - 180;
+        }
     },
     methods: {
         async show(row) {
@@ -153,7 +177,8 @@ export default {
                             configKey: key,
                             configValue: res.data[key],
                             type: type,
-                            options: options
+                            options: options,
+                            remark: this.remarkMap[key]
                         };
                         if (this.generalConfig.includes(key)) {
                             this.generalData.push(param);

From e10e0368e6c1107561dedc11a11adc74abe583f8 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 28 Apr 2020 17:03:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/configLine/config.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
index ffc1a23fa..387c2da7d 100644
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@@ -101,6 +101,7 @@ export default {
             index: 0,
             id: '',
             generalData: [],
+            height: 800,
             roadData: [],
             focus: false,
             booleanList: ['lockFirst', 'switchSingleHandle', 'signalApproachOnlyOne', 'signalApproachOnlyNpSwitch',
@@ -133,13 +134,11 @@ export default {
         };
     },
     computed: {
-        height() {
-            return 	document.documentElement.clientHeight - 180;
-        }
     },
     methods: {
         async show(row) {
             this.dialogVisible = true;
+            this.height = document.documentElement.clientHeight - 180;
             if (row && row.id) {
                 this.id = row.id;
                 this.getList();

From 66cdf061c6318319f86f77c639170762014ab21c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 28 Apr 2020 18:16:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E7=89=88=E5=9C=B0=E5=9B=BE=20?=
 =?UTF-8?q?=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/theme/xian_02/menus/menuTrain.vue              | 7 ++++++-
 src/views/newMap/jlmapNew/index.vue                        | 2 +-
 .../newMap/newMapdraft/dataRelation/routeoperate/route.vue | 4 ++--
 src/views/newMap/newMapdraft/index.vue                     | 2 ++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
index cb8517521..871aa277e 100644
--- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
@@ -241,7 +241,12 @@ export default {
                     },
                     {
                         label: '列车报警确认',
-                        handler: this.undeveloped
+                        children: [
+                            {
+                                label: '完整性报警确认',
+                                handler: this.undeveloped
+                            }
+                        ]
                     },
                     {
                         label: '更新列车计划',
diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue
index d15c1d25c..d8e81decc 100644
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@@ -410,7 +410,7 @@ export default {
         setShowMode(showMode) {
             if (this.showMode !== showMode) {
                 this.setShowStation('');
-                this.$refs.switchStation.inintShowStation();
+                this.localStationShow && this.$refs.switchStation.inintShowStation();
             }
             this.showMode = showMode;
             const nameList = Object.keys(this.$store.state.map.map || {});
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index 9ec827105..250694c41 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -118,8 +118,8 @@
         <el-form-item label="侧防列表:">
           <el-select v-model="addModel.flankProtectionList" clearable multiple filterable :placeholder="$t('map.pleaseSelect')">
             <el-option
-              v-for="item in flankProtectList"
-              :key="item.code"
+              v-for="(item,index) in flankProtectList"
+              :key="index"
               :label="`${item.number}-${item.name}`"
               :value="item.code"
             />
diff --git a/src/views/newMap/newMapdraft/index.vue b/src/views/newMap/newMapdraft/index.vue
index feebbb789..519435469 100644
--- a/src/views/newMap/newMapdraft/index.vue
+++ b/src/views/newMap/newMapdraft/index.vue
@@ -502,6 +502,8 @@ export default {
     }
 	.back_box{
 		left: 150px;
+        display: inline-block;
+        width: 57px;
 	}
 
 	.map-draft{