Merge remote-tracking branch 'origin/test' into master1

src/api/jmap/mapdraft.js

@@ -660,3 +660,17 @@ export function checkConfig(mapId, data) {
     });
 }
 // { check: true/false } （body体）
+// 进路数据处理删除扣车
+export function deleteDetain(mapId) {
+    return request({
+        url: `/api/draftMap/${mapId}/route/handle/standHoldList/delete`,
+        method: 'put'
+    });
+}
+// 进路数据处理不办延续保护
+export function noOverlap(mapId) {
+    return request({
+        url: `/api/draftMap/${mapId}/route/handle/setOverlapInCtc/false`,
+        method: 'put'
+    });
+}

src/jmapNew/theme/xian_01/menus/menuSignal.vue

@@ -245,6 +245,14 @@ export default {
         initMenu() {
             this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
+            const menuItem = this.menu.find( item => item.cmdType === CMD.Signal.CMD_SIGNAL_SET_CI_AUTO);
+            const menuItemDisabled = menuItem.disabled;
+            menuItem.disabled = true;
+            this.routeList.forEach(route => {
+                if (route.startSignalCode === this.selected.code && route.flt) {
+                    menuItem.disabled = menuItemDisabled;
+                }
+            });
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
             }

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.8.107:9000'; // 袁琪
         // BASE_API = 'http://192.168.2.175:9000'; // 旭强 有线
         // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
-        // BASE_API = 'http://192.168.2.183:9000'; // 张赛
+        BASE_API = 'http://192.168.2.183:9000'; // 张赛
         // BASE_API = 'http://192.168.8.140:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康

src/views/newMap/newMapdraft/ciConfig.vue

@@ -93,7 +93,7 @@ export default {
                 'routeNameUseEndOppositeSignalName', 'generateTbRoute', 'tbRouteNameUseEndOppositeSignalName', 'routeSignalAlwaysGreen',
                 'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly',
                 'generateCycle', 'routeButton', 'likeHa1', 'getNearlySignal', 'overlapSettingByTrigger', 'generateFls', 'signalApproachNotPassPreSignal',
-                'generateDestination', 'ctcOverlapOnlyTurnBackStationLock'
+                'generateDestination', 'ctcOverlapOnlyTurnBackStationLock', 'routeInterlockDoNotIncludeStandHoldTrain'
             ],
             multipleList: ['sharingECStations'],
             selectList: [],
@@ -127,7 +127,8 @@ export default {
                 signalApproachNotPassPreSignal:'信号机接近区段不跨过前方同向信号机',
                 generateDestination: '是否生成目的地码定义（泰雷兹）',
                 sharingECStations: '共享紧急关闭效果的车站',
-                ctcOverlapOnlyTurnBackStationLock: 'CTC列车进路延续保护仅折返站处锁闭'
+                ctcOverlapOnlyTurnBackStationLock: 'CTC列车进路延续保护仅折返站处锁闭',
+                routeInterlockDoNotIncludeStandHoldTrain: '进路联锁不包含站台扣车'
             }
         };
     },

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

@@ -1,6 +1,6 @@
 <template>
   <div v-show="show">
-    <el-dialog v-dialogDrag :title="$t('map.routePreview')" :visible.sync="show" width="95%" top="1vh" class="dialog_content_box" :before-do-close="doClose" append-to-body>
+    <el-dialog v-dialogDrag v-loading="loading" :title="$t('map.routePreview')" :visible.sync="show" width="95%" top="1vh" class="dialog_content_box" :before-do-close="doClose" append-to-body>
       <div>
         <QueryListPage
           ref="queryListPage"
@@ -18,7 +18,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { listMap, getRouteNewList, delRouteNew, putRouteNew, putSetDraftMapRouteById } from '@/api/jmap/mapdraft';
+import { listMap, getRouteNewList, delRouteNew, putRouteNew, putSetDraftMapRouteById, deleteDetain, noOverlap } from '@/api/jmap/mapdraft';
 // import ProtectDetail from './protectDetail';
 import PreViewField from './preview';
 import Related from './related';
@@ -48,6 +48,7 @@ export default {
     data() {
         return {
             show: false,
+            loading: false,
             showType: '',
             codeType: '',
             mapList: [],
@@ -151,6 +152,12 @@ export default {
                         type: 'tag',
                         prop: 'flt'
                     },
+                    {
+                        title: 'ctc级别下需要办理延续保护',
+                        edit: true,
+                        type: 'tag',
+                        prop: 'setOverlapInCtc'
+                    },
                     {
                         title: this.$t('map.accessType'),
                         prop: 'turnBack',
@@ -223,6 +230,10 @@ export default {
                             }
                         ]
                     }
+                ],
+                actions: [
+                    { text: '删除扣车', handler: this.handleDeleteDetain },
+                    { text: '不办延续保护', handler: this.handleNoOverlap }
                 ]
             };
         }
@@ -344,6 +355,42 @@ export default {
         selectedObj(index, row) {
             this.$emit('setRouteCode', row, this.codeType);
             this.show = false;
+        },
+        handleDeleteDetain() {
+            this.$confirm('是否确认批量删除扣车？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.loading = true;
+                deleteDetain(this.$route.params.mapId).then(response => {
+                    this.$message.success('批量删除扣车成功');
+                }).catch(() => {
+                    this.$messageBox('批量删除扣车失败');
+                }).finally(() => {
+                    this.loading = false;
+                });
+            }).catch(() => {
+                this.$message.info('已取消批量删除扣车');
+            });
+        },
+        handleNoOverlap() {
+            this.$confirm('是否确认批量设置不办延续保护？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.loading = true;
+                noOverlap(this.$route.params.mapId).then(response => {
+                    this.$message.success('批量批量设置不办延续保护成功');
+                }).catch(() => {
+                    this.$messageBox('批量批量设置不办延续保护失败');
+                }).finally(() => {
+                    this.loading = false;
+                });
+            }).catch(() => {
+                this.$message.info('已取消批量批量设置不办延续保护');
+            });
         }
         // showConflictingSignalList(data) {
         //     const nameList = [];