Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/api/jmap/mapdraft.js

@@ -299,10 +299,10 @@ export function updateRoutingData(data) {
     });
 }
 
-/** 根据地图起始-终点车站站台区段生成站间运行等级(新版)*/
+/** 根据地图交路区段生成站间运行等级(新版)*/
 export function generateStationRunData(routingId) {
     return request({
-        url: `/api/draftMap/runLevel/generate/${routingId}`,
+        url: `/api/draftMap/runLevel/generate/routing/${routingId}`,
         method: 'post'
     });
 }

src/api/runplan.js

@@ -388,6 +388,14 @@ export function postGenerateLevel(data) {
     });
 }
 
+/** 根据地图交路一键生成生成所有站间运行等级 (新版)*/
+export function generateAllStationRunData(mapId) {
+    return request({
+        url: `/api/draftMap/runLevel/generate/routing?mapId=${mapId}`,
+        method: 'post'
+    });
+}
+
 // 新建站间运行等级
 export function postSaveLevel(data) {
     return request({

src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue

@@ -259,7 +259,7 @@ export default {
         },
         generateData(index, row) {
             if (this.mapInfo && this.mapInfo.id && row) {
-                // 根据地图起始-终点车站站台区段生成站间运行等级
+                // 根据地图交路区段生成站间运行等级
                 generateStationRunData(row.id).then(response => {
                     this.$message.success(this.$t('map.generateStationRunDataSuccess'));
                     //  站间运行数据生成成功

src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue

@@ -99,7 +99,8 @@
                   <span>{{ formatName(scope.row.sectionCode) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column fixed="right" :label="$t('map.operation')" width="50">
+              <!-- fixed="right"  -->
+              <el-table-column :label="$t('map.operation')" width="50">
                 <template slot-scope="scope">
                   <el-button
                     v-show="scope.$index!=0&&scope.$index!=addModel.parkSectionCodeList.length-1"
@@ -498,7 +499,11 @@ export default {
             }
         },
         deleteSection(list, index) {
-            list.splice(index, 1);
+            const data = list.splice(index, 1);
+            if (data.length > 0) {
+                const section = this.$store.getters['map/getDeviceByCode'](data[0].sectionCode);
+                section.instance.drawBatchSelected(section, '');
+            }
         },
         buildModel(code) {
             const model = Object.assign({}, this.addModel);
@@ -566,4 +571,17 @@ export default {
 	/deep/ .el-radio {
 		margin-right: 10px;
 	}
+  /deep/ .el-parkSectionCode-table table tbody tr{
+    td{
+      cursor: pointer;
+    }
+  }
+
+  /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td {
+    background-color: rgba(0, 0, 0, 0) !important;
+  }
+
+  /deep/ table tbody tr.sortable-chosen{
+    background: #f5faf7 !important;
+  }
 </style>

src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue

@@ -14,7 +14,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { listMap } from '@/api/jmap/mapdraft';
-import { getRunLevelList, deleteRunLevel, getRunLevelDetail } from '@/api/runplan';
+import { getRunLevelList, deleteRunLevel, getRunLevelDetail, generateAllStationRunData} from '@/api/runplan';
 
 export default {
     name: 'RouteDetail',
@@ -145,6 +145,9 @@ export default {
                             // }
                         ]
                     }
+                ],
+                actions: [
+                    { text: '一键生成', handler: this.createAll }
                 ]
             }
         };
@@ -220,6 +223,17 @@ export default {
             }
             return data;
         },
+        createAll() {
+            // 根据地图交路一键生成生成所有站间运行等级
+            if (this.mapInfo && this.mapInfo.id) {
+                generateAllStationRunData(this.mapInfo.id).then(response => {
+                    this.$message.success('一键生成站间运行等级成功');
+                    this.reloadTable();
+                }).catch((error) => {
+                    this.$messageBox('一键生成站间运行等级失败: ' + error.message);
+                });
+            }
+        },
         editObj(index, row) {
             getRunLevelDetail(row.id).then(response => { // 根据等级id 获取详情
                 const data = response.data;

src/views/newMap/newMapdraft/index.vue

@@ -11,6 +11,7 @@
         </div>
         <div class="operation_box back_box">
           <el-button size="small" @click="backRoute">返回</el-button>
+          <el-button size="small" @click="updateObjAxis">更新坐标</el-button>
         </div>
         <jlmap-visual ref="jlmapVisual" @onSelect="clickEvent" @onMenu="onContextmenu" />
       </div>
@@ -84,6 +85,14 @@ export default {
             size: {
                 width: document.documentElement.clientWidth - 521,
                 height: document.documentElement.clientHeight - 90
+            },
+            updtModel: {
+                code: '',
+                scaling: '',
+                origin: {
+                    x: '',
+                    y: ''
+                }
             }
         };
     },
@@ -129,6 +138,44 @@ export default {
         }
     },
     methods: {
+        getMapOrigin() {
+            const dataZoom = this.$store.state.map.dataZoom;
+            if (dataZoom && dataZoom.offsetX) {
+                this.updtModel.origin.x = Number.parseInt(dataZoom.offsetX);
+                this.updtModel.origin.y = Number.parseInt(dataZoom.offsetY);
+                this.updtModel.scaling = dataZoom.scaleRate;
+            }
+        },
+        updateObjAxis() {
+            this.getMapOrigin();
+            this.$confirm('您确认按当前绘图位置更新坐标及缩放比例？', this.$t('tip.hint'), {
+                confirmButtonText: this.$t('tip.confirm'),
+                cancelButtonText: this.$t('tip.cancel'),
+                type: 'warning'
+            }).then(() => {
+                const map = this.$store.state.map.map;
+                console.log(map, '======');
+                this.$store.dispatch('map/saveMapDeviceDefaultRelations').then(() => {
+                    const param = {
+                        mapId: this.$route.params.mapId,
+                        skinVO: {
+                            code: this.$store.state.map.map.skinVO.code,
+                            name: this.$store.state.map.map.skinVO.name,
+                            origin: {
+                                x: this.updtModel.origin.x,
+                                y: this.updtModel.origin.y
+                            },
+                            scaling: this.updtModel.scaling
+                        }
+                    };
+                    saveMap(Object.assign(map, param)).then(response => {
+                        this.$message.success(this.$t('map.updateSuccessfully'));
+                    }).catch(() => {
+                        this.$messageBox(this.$t('map.updateFailed'));
+                    });
+                });
+            }).catch(() => { });
+        },
         setWindowSize() {
             this.$nextTick(() => {
                 const width = this.$store.state.app.width - 521;
@@ -549,7 +596,7 @@ export default {
 	.back_box{
 		left: 150px;
         display: inline-block;
-        width: 57px;
+		width: 180px;
 	}
 
 	.map-draft{

src/views/newMap/newMapdraft/mapoperate/switch/createAxle.vue

@@ -3,7 +3,7 @@
   <div style="height: 100%;">
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <el-form ref="oprt1" :model="fromData" label-width="130px" size="mini" :rules="mergeRules">
-        <el-form-item label="关联区段" prop="relevanceSwitchList">
+        <el-form-item label="关联道岔:" prop="relevanceSwitchList">
           <el-select v-model="fromData.relevanceSwitchList" filterable multiple :placeholder="$t('rules.pleaseSelect')">
             <el-option
               v-for="item in switchList"
@@ -145,7 +145,9 @@ export default {
             });
         },
         pushData(data) {
-            this.fromData.relevanceSwitchList.push(data);
+            if (!this.fromData.relevanceSwitchList.includes(data)) {
+                this.fromData.relevanceSwitchList.push(data);
+            }
         }
     }
 };