From d1895135014c920f449a9a2ae533a83d0722ecaf Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 30 Apr 2020 17:30:10 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=96=B0=E7=89=88=E7=BB=98=E5=9B=BE=20?=
=?UTF-8?q?=E4=BA=A4=E8=B7=AF=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
---
.../dataRelation/routingoperate/route.vue | 22 +++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
index 8cab1f29f..a761e0100 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
@@ -99,7 +99,8 @@
{{ formatName(scope.row.sectionCode) }}
-
+
+
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;
+ }
From 276620a25ef8a16dbf4a98163b8b2cfbac69dd5c Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 30 Apr 2020 17:40:25 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=BA=8C=E4=BF=A1?=
=?UTF-8?q?=E5=8F=B7=E6=9C=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/config/skinCode/chengdu_03.js | 2 +-
src/jmapNew/config/skinCode/foshan_01.js | 2 +-
src/jmapNew/config/skinCode/haerbin_01.js | 2 +-
src/jmapNew/config/skinCode/ningbo_01.js | 2 +-
src/jmapNew/config/skinCode/xian_02.js | 6 +--
src/jmapNew/shape/Signal/ESigLamp.js | 12 +++++
src/jmapNew/shape/Signal/index.js | 47 +++++++++++--------
.../theme/xian_02/menus/menuCancel.vue | 8 +++-
.../theme/xian_02/menus/menuRequest.vue | 13 ++++-
.../theme/xian_02/menus/menuSignal.vue | 3 ++
src/jmapNew/theme/xian_02/model.js | 4 +-
src/utils/baseUrl.js | 4 +-
12 files changed, 74 insertions(+), 31 deletions(-)
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index 753f745bf..6c7e90c45 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -148,7 +148,7 @@ class SkinCode extends defaultStyle {
},
lamp: {
bgShow: false, // 是否被选中
- guidName: 'chengdu_03', // 成都三号线引导类型
+ guidName: 'singleRY', // 成都三号线引导类型
borderVariable: true, // 信号灯边框可变
stopWidth: 2, // 禁止线宽度
borderWidth: 2, // 信号灯边框线宽度
diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js
index 94cf12772..bc9d0b13b 100644
--- a/src/jmapNew/config/skinCode/foshan_01.js
+++ b/src/jmapNew/config/skinCode/foshan_01.js
@@ -139,7 +139,7 @@ class SkinCode extends defaultStyle {
},
lamp: {
bgShow: false, // 是否被选中
- guidName: 'ningbo_01', // 默认引导类型
+ guidName: 'double', // 默认引导类型
stopWidth: 2, // 禁止线宽度
borderWidth: 1, // 信号灯边框线宽度
borderColor: '#3149C3', // 信号灯边框线颜色
diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js
index fd1ab0029..e70790ae5 100644
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@@ -144,7 +144,7 @@ class SkinCode extends defaultStyle {
lamp: {
bgShow: true, // 是否被选中
logicDisplayNone: true, // 逻辑点灯斜线不显示
- guidName: 'haerbin_01', // 默认引导类型
+ guidName: 'doubleAndBase', // 默认引导类型
stopWidth: 2, // 禁止线宽度
borderWidth: 0, // 信号灯边框线宽度
borderColor: '#FF0000', // 信号灯边框线颜色 (虚拟信号机)
diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 94ae08874..2926891b8 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -146,7 +146,7 @@ class SkinCode extends defaultStyle {
},
lamp: {
bgShow: false, // 是否被选中
- guidName: 'ningbo_01', // 默认引导类型
+ guidName: 'double', // 默认引导类型
borderVariable: true, // 信号灯边框可变
stopWidth: 2, // 禁止线宽度
borderWidth: 2, // 信号灯边框线宽度
diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js
index 423135776..5a9664adc 100644
--- a/src/jmapNew/config/skinCode/xian_02.js
+++ b/src/jmapNew/config/skinCode/xian_02.js
@@ -152,18 +152,18 @@ class SkinCode extends defaultStyle {
fontSize: 11, // 信号机名称字体大小
fontWeight: 'bold', // 信号机名称字体粗细
defaultColor: 'white', // 信号灯字体默认色
- blockColor: '#EF0C08', // 信号灯字体锁定颜色
+ blockColor: '#FFFFFF', // 信号灯字体锁定颜色
checkColor: '#00FF00' // 信号保护区段检查颜色
},
lamp: {
bgShow: false, // 是否被选中
- guidName: 'defult', // 默认引导类型
+ guidName: 'singleRY', // 默认引导类型
borderVariable: true, // 信号灯边框可变
stopWidth: 2, // 禁止线宽度
borderWidth: 2, // 信号灯边框线宽度
borderColor: '#3149C3', // 信号灯边框线颜色
radiusR: 5, // 信号灯半径
- blockColor: '#C0C0C0', // 信号灯锁闭
+ blockColor: '#EF0C08', // 信号灯锁闭
grayColor: '#C0C0C0', // 信号灯灰色
redColor: 'red', // 信号灯红色
greenColor: 'green', // 信号灯绿色
diff --git a/src/jmapNew/shape/Signal/ESigLamp.js b/src/jmapNew/shape/Signal/ESigLamp.js
index c8b85f4b4..060ba8950 100644
--- a/src/jmapNew/shape/Signal/ESigLamp.js
+++ b/src/jmapNew/shape/Signal/ESigLamp.js
@@ -108,6 +108,18 @@ class ESigLamp extends Group {
getBoundingRect() {
return this.lamp.getBoundingRect();
}
+
+ setAnimationStart(color) {
+ this.lamp && this.lamp.animateStyle(true)
+ .when(0, { fill: this.model.style.backgroundColor })
+ .when(1000, { fill: color })
+ .when(2000, { fill: this.model.style.backgroundColor })
+ .when(3000, { fill: color })
+ .start();
+ }
+ setAnimationEnd() {
+ this.lamp && this.lamp.stopAnimation(false);
+ }
}
export default ESigLamp;
diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js
index d50941d52..2c9557d63 100644
--- a/src/jmapNew/shape/Signal/index.js
+++ b/src/jmapNew/shape/Signal/index.js
@@ -89,7 +89,7 @@ class Signal extends Group {
// 信号灯
const endPoint = this.sigPost.getLampPosition(model.lampPostType);
this.lamps = [];
- if ((style.Signal.lamp.guidName == 'ningbo_01' || style.Signal.lamp.guidName == 'haerbin_01') && this.count == 1) {
+ if ((style.Signal.lamp.guidName === 'double' || style.Signal.lamp.guidName === 'doubleAndBase') && this.count == 1) {
this.count = 2;
}
for (let i = 0; i < this.count; i++) {
@@ -331,7 +331,7 @@ class Signal extends Group {
this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.greenColor);
this.lamps[1] && this.lamps[1].setColor(this.style.backgroundColor); // 设置黑色
this.virtualSignal && this.virtualSignal.setColor(this.style.Signal.lamp.greenColor);
- if (this.style.Signal.lamp.guidName == 'haerbin_01') { // 设置底座颜色
+ if (this.style.Signal.lamp.guidName === 'doubleAndBase') { // 设置底座颜色
this.sigPost.setColor('#00FF00');
if (this.model.logicLight) {
this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.blueColor);
@@ -342,7 +342,7 @@ class Signal extends Group {
openLateral() {
this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.yellowColor);
this.lamps[1] && this.lamps[1].setColor(this.style.backgroundColor);
- if (this.style.Signal.lamp.guidName == 'haerbin_01') { // 设置底座颜色
+ if (this.style.Signal.lamp.guidName === 'doubleAndBase') { // 设置底座颜色
this.sigPost.setColor('#00FF00');
if (this.model.logicLight) { // 设置哈尔滨逻辑点灯 颜色
this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.blueColor);
@@ -361,16 +361,17 @@ class Signal extends Group {
// 引导
guid() {
- if (this.style.Signal.lamp.guidName == 'ningbo_01' || this.style.Signal.lamp.guidName == 'haerbin_01') {
+ if (this.style.Signal.lamp.guidName === 'double') {
this.lamps[1].show();
}
- if (this.style.Signal.lamp.guidName == 'haerbin_01') { // 设置底座颜色
+ if (this.style.Signal.lamp.guidName === 'doubleAndBase') { // 设置底座颜色
+ this.lamps[1].show();
this.sigPost.setColor('#00FF00');
}
- if (this.style.Signal.lamp.guidName != 'chengdu_03') { // 双灯 允许引导信号
+ if (this.style.Signal.lamp.guidName !== 'singleRY') { // 双灯 允许引导信号
this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.redColor);
this.lamps[1] && this.lamps[1].setColor(this.style.Signal.lamp.yellowColor);
- } else if (this.style.Signal.lamp.guidName == 'chengdu_03') {
+ } else if (this.style.Signal.lamp.guidName === 'singleRY') {
this.lamps[0].setStyle({ fill: this.style.Signal.lamp.yellowColor, stroke: this.style.Signal.lamp.redColor, lineWidth: 2.5 });
}
}
@@ -378,7 +379,7 @@ class Signal extends Group {
// 封锁
block() {
this.lamps[0].setColor(this.style.Signal.lamp.redColor);
- if (this.style.Signal.lamp.guidName == 'haerbin_01') { // 设置底座颜色
+ if (this.style.Signal.lamp.guidName === 'doubleAndBase') { // 设置底座颜色
this.sigPost.setColor('#000080');
}
this.sigName.setColor(this.style.Signal.text.blockColor);
@@ -408,7 +409,7 @@ class Signal extends Group {
// 逻辑点灯
logicalLight() {
- if (this.style.Signal.lamp.guidName != 'haerbin_01') { // 哈尔滨不显示 X状态的逻辑点灯
+ if (this.style.Signal.lamp.guidName !== 'doubleAndBase') { // 哈尔滨不显示 X状态的逻辑点灯
this.lamps.forEach(lamp => { lamp.setStop(true); });
}
}
@@ -424,7 +425,7 @@ class Signal extends Group {
this.sigRoute.show();
this.sigRoute.setStyle({ fill: this.style.Signal.auto.manualControl });
}
- if (this.style.Signal.lamp.guidName == 'haerbin_01') {
+ if (this.style.Signal.lamp.guidName === 'doubleAndBase') {
this.sigName.setColor(this.style.Signal.text.ArtificialRouteColor);
}
if (this.style.Signal.auto.lampstandard) {
@@ -441,7 +442,7 @@ class Signal extends Group {
this.sigAuto.setColor(this.style.Signal.auto.autoRoute);
this.sigAuto.show();
}
- if (this.style.Signal.lamp.guidName == 'haerbin_01') {
+ if (this.style.Signal.lamp.guidName === 'doubleAndBase') {
this.sigName.setColor(this.style.Signal.text.AutoRouteColor);
this.setAutoClose();
}
@@ -480,12 +481,6 @@ class Signal extends Group {
.when(1000, { textFill: this.style.Signal.ciConfirm.textColor })
.when(2000, { textFill: this.style.backgroundColor })
.start();
- this.sigBack && this.sigBack.animateStyle(true)
- .when(0, { fill: this.style.backgroundColor })
- .when(1000, { fill: this.style.Signal.sigBack.color })
- .when(2000, { fill: this.style.backgroundColor })
- .when(3000, { fill: this.style.Signal.sigBack.color })
- .start();
}
}
@@ -500,10 +495,10 @@ class Signal extends Group {
this.sigBack && this.sigBack.hide();
this.sigName.setColor(this.style.Signal.text.defaultColor);
this.sigPost.setColor(this.style.Signal.post.standardColor); // 设置底座默认颜色
- if (this.style.Signal.lamp.guidName == 'chengdu_03') {
+ if (this.style.Signal.lamp.guidName === 'singleRY') {
this.lamps[0].setStyle({ lineWidth: this.style.Signal.lamp.borderWidth });
}
- if (this.style.Signal.lamp.guidName == 'ningbo_01' || this.style.Signal.lamp.guidName == 'haerbin_01') {
+ if (this.style.Signal.lamp.guidName === 'double' || this.style.Signal.lamp.guidName === 'doubleAndBase') {
this.lamps[1].hide();
}
this.insideTriangle && this.insideTriangle.hide();
@@ -511,6 +506,8 @@ class Signal extends Group {
this.ciConfirm && this.ciConfirm.stopAnimation(false);
this.ciConfirm && this.ciConfirm.hide();
this.sigBack && this.sigBack.hide();
+ this.sigBack && this.sigBack.stopAnimation(false);
+ this.lamps && this.lamps[0].setAnimationEnd();
}
setState(model) {
@@ -557,6 +554,18 @@ class Signal extends Group {
if (model.isCiConfirm) {
this.setCiConfirm();
}
+ if (model.isRequestLock) {
+ this.sigBack && this.sigBack.show();
+ this.sigBack && this.sigBack.animateStyle(true)
+ .when(0, { fill: this.style.backgroundColor })
+ .when(1000, { fill: this.style.Signal.sigBack.color })
+ .when(2000, { fill: this.style.backgroundColor })
+ .when(3000, { fill: this.style.Signal.sigBack.color })
+ .start();
+ }
+ if (model.isRequestGuide) {
+ this.lamps && this.lamps[0] && this.lamps[0].setAnimationStart(this.style.Signal.lamp.yellowColor);
+ }
}
getBoundingRect() {
diff --git a/src/jmapNew/theme/xian_02/menus/menuCancel.vue b/src/jmapNew/theme/xian_02/menus/menuCancel.vue
index c1eb082d8..8b7bdf74a 100644
--- a/src/jmapNew/theme/xian_02/menus/menuCancel.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuCancel.vue
@@ -8,6 +8,7 @@
import PopMenu from '@/components/PopMenu/popTip';
import { mapGetters } from 'vuex';
import { DeviceMenu } from '@/scripts/ConstDic';
+import deviceType from '@/jmapNew/constant/deviceType';
export default {
name: 'CancelMenu',
@@ -223,7 +224,12 @@ export default {
cmdType: eachCmd.cmdType,
param: eachCmd.param // 请求栈中参数配置
};
- this.$store.dispatch('training/updateMapState', [{code: eachCmd.device.code, _type: eachCmd.device._type, isCiConfirm: 0}]);
+ const deviceStatus = {code: eachCmd.device.code, _type: eachCmd.device._type, isCiConfirm: 0};
+ if (eachCmd.device._type === deviceType.Signal) {
+ deviceStatus.isRequestLock = 0;
+ deviceStatus.isRequestGuide = 0;
+ }
+ this.$store.dispatch('training/updateMapState', [deviceStatus]);
}
this.$store.dispatch('menuOperation/spliceRequestList', {deviceCode:eachCmd.device.code, operateCode:eachCmd.operation.code});
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
diff --git a/src/jmapNew/theme/xian_02/menus/menuRequest.vue b/src/jmapNew/theme/xian_02/menus/menuRequest.vue
index 3adb8ced1..7e7344d85 100644
--- a/src/jmapNew/theme/xian_02/menus/menuRequest.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuRequest.vue
@@ -34,6 +34,7 @@