From 1e4b7bbfd980e8be4ed7bbd929ad6702c9cac589 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 9 Apr 2020 18:54:22 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/QueryListPage/QueryForm.vue | 25 +++++++++++++++++++---
 src/views/publish/publishMap/index.vue     |  7 +++---
 src/views/publish/publishMap/localMap.vue  |  4 ++--
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/components/QueryListPage/QueryForm.vue b/src/components/QueryListPage/QueryForm.vue
index 15d669c52..905054e87 100644
--- a/src/components/QueryListPage/QueryForm.vue
+++ b/src/components/QueryListPage/QueryForm.vue
@@ -148,7 +148,7 @@
             <el-button v-if="queryForm.reset" type="primary" size="small" :disabled="!canQuery" @click="doClean">{{ $t('global.reset') }}</el-button>
             <el-button v-if="exportFlag" type="primary" size="small" :disabled="!canQuery" @click="doExport">{{ $t('global.export') }}</el-button>
             <template v-for="(button, index) in queryList.actions">
-              <el-button v-if="button.fileType==='file'" :key="index" :type="button.type ? button.type: 'primary'" size="small" class="button_style" :disabled="button.disabled" :loading="button.disabled">
+              <el-button v-if="button.fileType==='file' && (button.hasOwnProperty('show') ? button.show: true)" :key="index" :type="button.type ? button.type: 'primary'" size="small" class="button_style uploadDemo" :disabled="button.disabled" :loading="button.disabled">
                 <input ref="files" type="file" class="file_box" accept=".json, application/json" @change="button.handler">
                 {{ $t('map.importMap') }}
               </el-button>
@@ -523,13 +523,32 @@ export default {
         margin-left: 0;
         margin-bottom: 10px;
     }
+	.uploadDemo {
+		position: relative;
+		overflow: hidden;
+		margin-right: 3px;
+		cursor: pointer;
+		/*width: 60px;*/
+		padding: 0 15px;
+		height: 32px;
+	/*input {*/
+		/*width: 100%;*/
+		/*height: 100%;*/
+		/*position: relative;*/
+		/*left: 0;*/
+		/*top: 0;*/
+		/*opacity: 0;*/
+		/*cursor: pointer;*/
+	/*}*/
+	}
 	.file_box {
-		width: 50px;
-		height: 30px;
+		width: 100%;
+		height: 100%;
 		position: absolute;
 		left: 0;
 		top: 0;
 		opacity: 0;
 		cursor: pointer;
+		z-index: 100;
 	}
 </style>
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index 2f2bae0f1..38049e68c 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -18,6 +18,7 @@ import UpdateOperate from './draft.vue';
 import SetProject from './project';
 import CopyMap from './copy';
 import LocalMap from './localMap';
+import { superAdmin } from '@/router/index_APP_TARGET';
 
 export default {
     name: 'PublishMap',
@@ -139,8 +140,8 @@ export default {
                 ],
                 actions: [
                     { text: '地图排序', handler: this.mapSort },
-                    { text: '导出', handler: this.localExport},
-                    { text: '导入', handler: this.localImport, fileType: 'file'}
+                    { text: '导出', handler: this.localExport, show: () => { return this.$store.state.user.roles.indexOf(superAdmin) > 0; }},
+                    { text: '导入', handler: this.localImport, fileType: 'file', show: () => { return this.$store.state.user.roles.indexOf(superAdmin) > 0; }}
                 ]
             },
 
@@ -363,7 +364,7 @@ export default {
             this.$router.push({ path: `/publish/mapSort`});
         },
         localExport() {
-        	this.$refs['localMap'].doShow();
+            this.$refs['localMap'].doShow();
         },
         localImport() {
             const loading = this.$loading({
diff --git a/src/views/publish/publishMap/localMap.vue b/src/views/publish/publishMap/localMap.vue
index 4aaa847db..81ffdf9b6 100644
--- a/src/views/publish/publishMap/localMap.vue
+++ b/src/views/publish/publishMap/localMap.vue
@@ -1,6 +1,6 @@
 <template>
-  <el-dialog v-dialogDrag title="导出地图" :visible.sync="dialogVisible" width="30%" center>
-    <el-select v-model="selectMapList" multiple placeholder="请选择" style="text-align: center">
+  <el-dialog v-dialogDrag title="导出地图" :visible.sync="dialogVisible" width="20%" center>
+    <el-select v-model="selectMapList" multiple placeholder="请选择地图" style="width: 60%; position: relative; left: 20%;">
       <el-option
         v-for="item in publishMapList"
         :key="item.id"

From 5c55261f5578b4e38c413b7635f958a4c3006c69 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 10 Apr 2020 09:09:06 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=AF=BC=E5=85=A5?=
 =?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/components/QueryListPage/QueryForm.vue | 2 +-
 src/views/publish/publishMap/index.vue     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/QueryListPage/QueryForm.vue b/src/components/QueryListPage/QueryForm.vue
index 905054e87..1bea530dd 100644
--- a/src/components/QueryListPage/QueryForm.vue
+++ b/src/components/QueryListPage/QueryForm.vue
@@ -149,7 +149,7 @@
             <el-button v-if="exportFlag" type="primary" size="small" :disabled="!canQuery" @click="doExport">{{ $t('global.export') }}</el-button>
             <template v-for="(button, index) in queryList.actions">
               <el-button v-if="button.fileType==='file' && (button.hasOwnProperty('show') ? button.show: true)" :key="index" :type="button.type ? button.type: 'primary'" size="small" class="button_style uploadDemo" :disabled="button.disabled" :loading="button.disabled">
-                <input ref="files" type="file" class="file_box" accept=".json, application/json" @change="button.handler">
+                <input id="queryFormFilesInput" type="file" class="file_box" accept=".json, application/json" @change="button.handler">
                 {{ $t('map.importMap') }}
               </el-button>
               <el-button
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index 38049e68c..1b232a9f1 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -374,7 +374,7 @@ export default {
                 background: 'rgba(0, 0, 0, 0.7)'
             });
             setTimeout(() => {
-                const obj = this.$refs.files;
+                const obj = document.getElementById('queryFormFilesInput');
                 if (!obj.files) return;
                 const f = obj.files[0];
                 const reader = new FileReader();
@@ -385,7 +385,6 @@ export default {
                     localImportMap(JSON.parse(data)).then(res => {
                         loading.close();
                         that.$message.success('导入成功！');
-                        that.loadInitData();
                         loading.close();
                     }).catch(error => {
                         loading.close();

From e6ad58082450318dc854ef72b6e8a5b02a4a5d81 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 10 Apr 2020 09:24:21 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=E5=8F=B7?=
 =?UTF-8?q?=E7=BA=BF=EF=BC=9A=20=E6=9F=A5=E7=9C=8B=E7=AB=99=E5=8F=B0?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=3D=E3=80=8B=E7=AB=99=E5=8F=B0=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=E4=BF=A1=E6=81=AF=EF=BC=8C=E9=81=93=E5=B2=94=E5=8D=95?=
 =?UTF-8?q?=E8=A7=A3/=E8=A7=A3=E5=B0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/ningbo_01/operationConfig.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js
index 886e3bd11..5f52f4c9d 100644
--- a/src/jmapNew/theme/ningbo_01/operationConfig.js
+++ b/src/jmapNew/theme/ningbo_01/operationConfig.js
@@ -213,11 +213,11 @@ export default {
             operateType: 'Stand_View_Status',
             skinCode: '06',
             trainingName: '查看站台信息({10}-{12}站台)',
-            trainingRemark: '查看站台信息功能',
+            trainingRemark: '站台详细信息功能',
             trainingType: 'Stand',
             productTypes: ['01', '02'],
             stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【查看站台信息】' },
+                { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【站台详细信息】' },
                 { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
@@ -453,7 +453,7 @@ export default {
             trainingType: 'Switch',
             productTypes: ['01'],
             stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【区段解封】' },
+                { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔单解】' },
                 { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' },
                 { deviceType: '03', orderNum: 3, operateCode: '1046', tip: '鼠标左键选择({7})区段', val: '{17}' },
                 { deviceType: '03', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】按钮' },
@@ -484,7 +484,7 @@ export default {
             trainingType: 'Switch',
             productTypes: ['01'],
             stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【区段解封】' },
+                { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔解封】' },
                 { deviceType: '03', orderNum: 2, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' },
                 { deviceType: '03', orderNum: 3, operateCode: '1066', tip: '鼠标左键选择({7})区段', val: '{17}' },
                 { deviceType: '03', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确定】按钮' },

From db7acfd6c7bb85e29a828da8753bf1f743c87152 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 10 Apr 2020 10:10:44 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=BA=E6=AE=B5?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E9=9A=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/newMapdraft/mapoperate/section/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
index bc61699a7..2c7810435 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
@@ -196,7 +196,7 @@ export default {
                         name: this.$t('map.mapData'),
                         item: [
                             { prop: 'stationCode', label: this.$t('map.equipmentStation') + ':', type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', disabled: this.isStationCodeDisabled, options: this.centralizedStationList, isHidden: this.isStationCodeDisabled},
-                            { prop: 'lengthFact', label: this.$t('map.actualLength') + ':', type: 'number', min: 0, placeholder: this.$t('map.meter'), isHidden: !this.hasAssociatedSection },
+                            { prop: 'lengthFact', label: this.$t('map.actualLength') + ':', type: 'number', min: 0, placeholder: this.$t('map.meter'), isHidden: !this.isSwitchSectionType },
                             { prop: 'leftStopPointOffset', label: this.$t('map.leftStopPointOffset'), type: 'number', min: 0, disabled: true, isHidden: !this.isStopPointOffset },
                             { prop: 'rightStopPointOffset', label: this.$t('map.rightStopPointOffset'), type: 'number', min: 0, disabled: true, isHidden: !this.isStopPointOffset },
                             { prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList, isHidden: !this.sectionColonShow },

From 162bd4c9f217c3d238af3d9a4502dbfb07c10882 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 10 Apr 2020 10:16:58 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=E5=8F=B7?=
 =?UTF-8?q?=E7=BA=BF:=E5=AE=9E=E8=AE=AD=E9=97=AE=E9=A2=98=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningbo_01/menus/dialog/routeSelection.vue |   2 +-
 .../ningbo_01/menus/dialog/standRunLevel.vue  |   4 +-
 src/jmapNew/theme/ningbo_01/menus/index.vue   |  16 +-
 .../ningbo_01/menus/passiveDialog/alarm.vue   | 382 +++++++++---------
 .../ningbo_01/menus/passiveDialog/timeout.vue | 200 ++++-----
 .../theme/ningbo_01/operationConfig.js        |   4 +-
 6 files changed, 311 insertions(+), 297 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
index 6073486a3..1a9387fde 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
@@ -18,7 +18,7 @@
         <!-- <el-button class="expand" @click="expandPath">展开进路预览</el-button> -->
       </el-col>
     </el-row>
-    <el-table ref="table" :data="tempData" border :cell-style="tableStyle" style="width: 100%; margin-top:10px" size="mini" height="120" highlight-current-row :show-header="false" @row-click="clickEvent">
+    <el-table ref="table" :data="tempData" border :cell-style="tableStyle" style="width: 100%; height: 120px; margin-top:10px" size="mini" highlight-current-row :show-header="false" @row-click="clickEvent">
       <el-table-column :id="domIdChoose" prop="name" style="margin-left:30px" />
     </el-table>
     <el-row justify="center" class="button-group">
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standRunLevel.vue
index 1fe8519b6..96c5b546f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/standRunLevel.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standRunLevel.vue
@@ -293,10 +293,10 @@ export default {
                     if (valid) {
                         this.doClose();
                     }
-                }).catch((error) => {
+                }).catch(() => {
                     this.loading = false;
                     this.doClose();
-                    this.$refs.noticeInfo.doShow({}, error.message);
+                    // this.$refs.noticeInfo.doShow({}, error.message);
                 });
             } else {
                 this.doClose();
diff --git a/src/jmapNew/theme/ningbo_01/menus/index.vue b/src/jmapNew/theme/ningbo_01/menus/index.vue
index 42ebb5c39..b2fec6082 100644
--- a/src/jmapNew/theme/ningbo_01/menus/index.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/index.vue
@@ -13,9 +13,9 @@
       <menu-train ref="menuTrain" :selected="selected" />
       <menu-station ref="menuStation" :selected="selected" />
       <menu-limit ref="menuLimit" :selected="selected" />
-      <passive-alarm ref="passiveAlarm" />
+      <!--<passive-alarm ref="passiveAlarm" />-->
       <passive-contorl ref="passiveControl" />
-      <passive-Timeout ref="passiveTimeout" />
+      <!--<passive-Timeout ref="passiveTimeout" />-->
     </template>
   </div>
 </template>
@@ -34,9 +34,9 @@ import MenuTrain from './menuTrain';
 import MenuStation from './menuStation';
 import MenuBar from './menuBar';
 import MenuLimit from './menuLimit';
-import PassiveAlarm from './passiveDialog/alarm';
+// import PassiveAlarm from './passiveDialog/alarm';
 import PassiveContorl from './passiveDialog/control';
-import PassiveTimeout from './passiveDialog/timeout';
+// import PassiveTimeout from './passiveDialog/timeout';
 
 export default {
     name: 'Menus',
@@ -53,9 +53,9 @@ export default {
         MenuStation,
         MenuTrain,
         MenuLimit,
-        PassiveAlarm,
-        PassiveContorl,
-        PassiveTimeout
+        // PassiveAlarm,
+        PassiveContorl
+        // PassiveTimeout
     },
     props: {
         selected: {
@@ -113,7 +113,7 @@ export default {
 
     .ningbo-01__systerm .el-dialog {
         background: rgba(100, 100, 100, 0.3);
-        border: 2px solid rgb(144, 144, 144, 0.8);
+        border: 2px solid rgba(144, 144, 144, 0.8);
         border-radius: 6px;
         color: #000;
         font-size: 14px;
diff --git a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue
index 3fb293056..2e98c6476 100644
--- a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue
@@ -1,207 +1,213 @@
 <template>
-    <el-dialog class="ningbo-01__systerm alarm-detail" :title="level+'级告警详细信息'" :visible.sync="show" width="760px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form label-width="80px" size="mini">
-            <el-row>
-                <el-col :span="8">
-                    <el-form-item label="线路名称">
-                        <el-input v-model="model.lineName" disabled></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label="单位名称">
-                        <el-input v-model="model.unitName" disabled></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label="模块名称">
-                        <el-input v-model="model.moduleName" disabled></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="9">
-                    <el-form-item label="报警时间">
-                        <el-date-picker v-model="model.alarmDate" type="datetime" placeholder="选择日期时间" disabled>
-                        </el-date-picker>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="7">
-                    <el-form-item>
-                        <span slot="label">等&emsp;级</span>
-                        <el-input v-model="model.level" disabled></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label="确认状态">
-                        <el-input v-model="model.confirm" disabled></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="9" class="alarm-type">
-                    <el-form-item>
-                        <span slot="label">类&emsp;&emsp;型</span>
-                        <el-input v-model="model.type" disabled></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="15" class="alarm-child-type">
-                    <el-form-item label="子类型">
-                        <el-input v-model="model.childType" disabled></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-form-item label="时间摘要">
-                <el-input v-model="model.timeSummary" disabled></el-input>
-            </el-form-item>
-            <el-form-item label="推荐操作">
-                <el-input v-model="model.recommendedOperation" disabled></el-input>
-            </el-form-item>
-            <div class="alarm-detail-description">
-                <span> 报警详细描述</span><br>
-                <el-input type="textarea" :rows="5" placeholder="请输入内容" v-model="model.alarmDetail" disabled>
-                </el-input>
-            </div>
-        </el-form>
-        <el-row class="button-group">
-            <el-col :span="3" :offset="9">
-                <el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">确 定</el-button>
-            </el-col>
-            <el-col :span="10">
-                <span style="line-height:26px">未确认{{level}}级报警数目：1</span>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm alarm-detail"
+    :title="level+'级告警详细信息'"
+    :visible.sync="show"
+    width="760px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form label-width="80px" size="mini">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="线路名称">
+            <el-input v-model="model.lineName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="单位名称">
+            <el-input v-model="model.unitName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="模块名称">
+            <el-input v-model="model.moduleName" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="9">
+          <el-form-item label="报警时间">
+            <el-date-picker v-model="model.alarmDate" type="datetime" placeholder="选择日期时间" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item>
+            <span slot="label">等&emsp;级</span>
+            <el-input v-model="model.level" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="确认状态">
+            <el-input v-model="model.confirm" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="9" class="alarm-type">
+          <el-form-item>
+            <span slot="label">类&emsp;&emsp;型</span>
+            <el-input v-model="model.type" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="15" class="alarm-child-type">
+          <el-form-item label="子类型">
+            <el-input v-model="model.childType" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="时间摘要">
+        <el-input v-model="model.timeSummary" disabled />
+      </el-form-item>
+      <el-form-item label="推荐操作">
+        <el-input v-model="model.recommendedOperation" disabled />
+      </el-form-item>
+      <div class="alarm-detail-description">
+        <span> 报警详细描述</span><br>
+        <el-input v-model="model.alarmDetail" type="textarea" :rows="5" placeholder="请输入内容" disabled />
+      </div>
+    </el-form>
+    <el-row class="button-group">
+      <el-col :span="3" :offset="9">
+        <el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">确 定</el-button>
+      </el-col>
+      <el-col :span="10">
+        <span style="line-height:26px">未确认{{ level }}级报警数目：1</span>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/ConstDic';
 
-    export default {
-        name: 'AlarmDetail',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                level: 0,
-                operate: null,
-                controlProps: {
-                    '01': '中控',
-                    '02': '站控'
-                },
-                model: {
-                    lineName: '',
-                    unitName: '',
-                    moduleName: '',
-                    level: '',
-                    confirm: '',
-                    alarmDate: '',
-                    type: '',
-                    childType: '',
-                    timeSummary: '',
-                    recommendedOperation: '',
-                    alarmDetail: ''
-                }
+export default {
+    name: 'AlarmDetail',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            level: 0,
+            operate: null,
+            controlProps: {
+                '01': '中控',
+                '02': '站控'
+            },
+            model: {
+                lineName: '',
+                unitName: '',
+                moduleName: '',
+                level: '',
+                confirm: '',
+                alarmDate: '',
+                type: '',
+                childType: '',
+                timeSummary: '',
+                recommendedOperation: '',
+                alarmDetail: ''
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'name'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            ...mapGetters('map', [
-                'name',
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
-            },
-        },
-        watch: {
-            '$store.state.socket.msgHead': function (elem) {
-                if (elem && elem.hasOwnProperty('success')) {
-                    if (elem.success) {
-                        let operate = this.$store.state.training.operate;
-                        let control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                        let station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
-                        let newOperate = {
-                            type: operate.type,
-                            name: station.name,
-                        }
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
+        }
+    },
+    watch: {
+        '$store.state.socket.msgHead': function (elem) {
+            if (elem && elem.hasOwnProperty('success')) {
+                if (elem.success) {
+                    const operate = this.$store.state.training.operate;
+                    const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
+                    const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                    const newOperate = {
+                        type: operate.type,
+                        name: station.name
+                    };
 
-                        this.doShow(newOperate);
-                    }
+                    this.doShow(newOperate);
                 }
-            },
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate) {
-                this.operate = operate || {};
-                this.model = {
-                    lineName: this.name,
-                    unitName: this.operate.name,
-                    moduleName: 'CMM控制模式转换模式',
-                    level: '0级告警',
-                    confirm: '确认状态',
-                    alarmDate: new Date(),
-                    type: '系统事件',
-                    childType: '依据信号设备操作命令设置控制模式',
-                    timeSummary: '控制模式摘要',
-                    recommendedOperation: '',
-                    alarmDetail: `控制模式转换：${this.operate.name}由中控转为站控模式！`
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                if (this.dialogShow) {
-                    this.$store.dispatch('socket/shiftMsgQueue');
-                }
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.alarm.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (valid) {
-                        this.doClose();
-                    }
-                })
-            },
-            commit() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.alarm.operation,
-                }
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (valid) {
-                        this.doClose();
-                    }
-                })
-            },
-            isClose() {
-                return this.dialogShow;
             }
         }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.model = {
+                lineName: this.name,
+                unitName: this.operate.name,
+                moduleName: 'CMM控制模式转换模式',
+                level: '0级告警',
+                confirm: '确认状态',
+                alarmDate: new Date(),
+                type: '系统事件',
+                childType: '依据信号设备操作命令设置控制模式',
+                timeSummary: '控制模式摘要',
+                recommendedOperation: '',
+                alarmDetail: `控制模式转换：${this.operate.name}由中控转为站控模式！`
+            };
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            if (this.dialogShow) {
+                this.$store.dispatch('socket/shiftMsgQueue');
+            }
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.alarm.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.alarm.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        isClose() {
+            return this.dialogShow;
+        }
     }
+};
 
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
-
     .alarm-type .el-input {
         width: 220px;
     }
@@ -210,4 +216,4 @@
         padding-left: 12px;
         text-align: left;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue
index 448e6b232..40a2936a9 100644
--- a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue
@@ -1,106 +1,114 @@
 <template>
-    <el-dialog class="ningbo-01__systerm cmd-notice" title="操作命令提示" :visible.sync="show" width="400px" :before-close="doClose"
-        :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <span>{{name}}，{{msg}}!</span>
-        <el-row class="button-group">
-            <el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">确认</el-button>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm cmd-notice"
+    title="操作命令提示"
+    :visible.sync="show"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <span>{{ name }}，{{ msg }}!</span>
+    <el-row class="button-group">
+      <el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">确认</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    export default {
-        name: 'CmdNotice',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                operate: null,
-                name: '',
-                msg: ''
-            }
+import { OperationEvent } from '@/scripts/ConstDic';
+export default {
+    name: 'CmdNotice',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operate: null,
+            name: '',
+            msg: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
-            },
-        },
-        watch: {
-            '$store.state.socket.msgHead': function (elem) {
-                if (elem && (elem.hasOwnProperty('success') || elem.hasOwnProperty('timeout'))) {
-                    let operate = this.$store.state.training.operate;
-                    let control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                    let station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
-                    let newOperate = {
-                        type: operate.type,
-                        name: station.name,
-                    }
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
+        }
+    },
+    watch: {
+        '$store.state.socket.msgHead': function (elem) {
+            if (elem && (elem.hasOwnProperty('success') || elem.hasOwnProperty('timeout'))) {
+                const operate = this.$store.state.training.operate;
+                const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
+                const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                const newOperate = {
+                    type: operate.type,
+                    name: station.name
+                };
 
-                    if (elem.timeout) {
-                        newOperate['msg'] = '请求超时';
-                        this.doShow(newOperate);
-                    } else if (!elem.success) {
-                        newOperate['msg'] = '请求拒绝';
-                        this.doShow(newOperate);
-                    }
+                if (elem.timeout) {
+                    newOperate['msg'] = '请求超时';
+                    this.doShow(newOperate);
+                } else if (!elem.success) {
+                    newOperate['msg'] = '请求拒绝';
+                    this.doShow(newOperate);
                 }
-            },
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate) {
-                this.operate = operate || {};
-                this.name = this.operate.name || '';
-                this.msg = this.operate.msg || '';
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                if (this.dialogShow) {
-                    this.$store.dispatch('socket/shiftMsgQueue');
-                }
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            cancel() {
-                let operate = {
-                    operation: this.operate.type,
-                    operation: OperationEvent.Command.close.notice.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (valid) {
-                        this.doClose();
-                    }
-                })
-            },
-            commit() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.notice.operation,
-                }
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (valid) {
-                        this.doClose();
-                    }
-                })
-            },
-            isClose() {
-                return this.dialogShow;
             }
         }
-    }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.name = this.operate.name || '';
+            this.msg = this.operate.msg || '';
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            if (this.dialogShow) {
+                this.$store.dispatch('socket/shiftMsgQueue');
+            }
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.close.notice.operation
+            };
 
-</script>
\ No newline at end of file
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.notice.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        isClose() {
+            return this.dialogShow;
+        }
+    }
+};
+
+</script>
diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js
index 5f52f4c9d..a4fb6942d 100644
--- a/src/jmapNew/theme/ningbo_01/operationConfig.js
+++ b/src/jmapNew/theme/ningbo_01/operationConfig.js
@@ -292,12 +292,12 @@ export default {
             operateType: 'Section_Set_Limit_Speed',
             skinCode: '06',
             trainingName: '设置临时限速({8}{9})',
-            trainingRemark: '设置临时限速功能（限速值：自动）',
+            trainingRemark: '设置临时限速功能（限速值：不限速）',
             trainingType: 'Section',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' },
-                { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值自动】', val: '0' },
+                { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【不限速】', val: '0' },
                 { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
                 { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
                 { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },

From 76851cdff29839b2c3608ac401234e13d3404f4e Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 10 Apr 2020 10:17:34 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=BA=E6=AE=B5?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E9=9A=90=E6=8E=A7=E5=88=B6=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baseUrl.js                                      | 6 +++---
 src/views/newMap/newMapdraft/mapoperate/section/index.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 212d0e50e..e9046878d 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,11 +2,11 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-        BASE_API = 'http://192.168.3.6:9000'; // 旭强
+        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
index bc61699a7..70cac2aa9 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
@@ -196,11 +196,11 @@ export default {
                         name: this.$t('map.mapData'),
                         item: [
                             { prop: 'stationCode', label: this.$t('map.equipmentStation') + ':', type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', disabled: this.isStationCodeDisabled, options: this.centralizedStationList, isHidden: this.isStationCodeDisabled},
-                            { prop: 'lengthFact', label: this.$t('map.actualLength') + ':', type: 'number', min: 0, placeholder: this.$t('map.meter'), isHidden: !this.hasAssociatedSection },
+                            { prop: 'lengthFact', label: this.$t('map.actualLength') + ':', type: 'number', min: 0, placeholder: this.$t('map.meter'), isHidden: !this.isSwitchSectionType },
                             { prop: 'leftStopPointOffset', label: this.$t('map.leftStopPointOffset'), type: 'number', min: 0, disabled: true, isHidden: !this.isStopPointOffset },
                             { prop: 'rightStopPointOffset', label: this.$t('map.rightStopPointOffset'), type: 'number', min: 0, disabled: true, isHidden: !this.isStopPointOffset },
                             { prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList, isHidden: !this.sectionColonShow },
-                            { prop: 'trainWindowCode', label: '关联车次窗', type: 'input', disabled: true},
+                            { prop: 'trainWindowCode', label: '关联车次窗', type: 'input', disabled: true, isHidden: this.hasAssociatedSection },
                             { prop: 'kmRangeLeft', label: this.$t('map.leftKilometerMark'), type: 'number', min: 0, placeholder: this.$t('map.meter') },
                             { prop: 'kmRangeRight', label: this.$t('map.rightKilometerMark'), type: 'number', min: 0, placeholder: this.$t('map.meter') }
                         ]