+
+
+
+ {{ $t('display.demon.drivingByPlan') }}
+ {{ $t('display.demon.initialize') }}
+
+
+ {{ projectDevice?'退出':$t('display.demon.back') }}
+
+
+
+
+
+
+ 是
+ 否
+
+
向右
@@ -164,6 +170,7 @@ export default {
code: '',
name: '',
right: '',
+ setInCbtc: false,
mapId: '',
unlockSectionCode:'',
unlockTime: 0,
@@ -219,7 +226,6 @@ export default {
}
},
protectData(val, old) {
- console.log(val, 'val');
if (val) {
this.addModel = val;
this.addModel.pathList && this.addModel.pathList.forEach(item => {
diff --git a/src/views/newMap/newMapdraft/dataRelation/continueProtectOperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/continueProtectOperate/route.vue
index b15e120d9..f13ce7f26 100644
--- a/src/views/newMap/newMapdraft/dataRelation/continueProtectOperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/continueProtectOperate/route.vue
@@ -12,6 +12,8 @@
@@ -48,7 +48,8 @@ export default {
deviceCode: '',
buttonDbup: ButtonDbupIcon,
buttonRight: ButtonRightIcon,
- buttonLeft: ButtonLeftIcon
+ buttonLeft: ButtonLeftIcon,
+ enter: false
};
},
computed: {
@@ -84,8 +85,12 @@ export default {
});
Vue.prototype.$jlmap.updateShowMode(list, '02');
this.$store.dispatch('training/updateMapState', trainList);
- this.$refs.mapCanvas.setCenter(this.deviceCode);
+ this.$refs.mapCanvas && this.$refs.mapCanvas.setCenter(this.deviceCode);
+ this.$refs.mapCanvas && this.$refs.mapCanvas.mapViewLoaded(false);
}
+ },
+ '$store.state.app.windowSizeCount': function() { // 窗口缩放
+ this.$store.dispatch('config/resize', { width:this.width, height: this.height });
}
},
methods: {
@@ -93,9 +98,15 @@ export default {
this.dialogShow = true;
this.$store.dispatch('config/resize', { width:this.width, height: this.height });
this.deviceCode = deviceCode;
+ if (this.enter) {
+ this.$refs.mapCanvas && this.$refs.mapCanvas.setCenter(this.deviceCode);
+ }
+
this.$nextTick(function() {
- // this.$store.state.map.map = Object.assign({}, this.$store.state.map.map);
- //
+ if (!this.enter) {
+ this.$refs.mapCanvas.setMap(this.$store.state.map.map);
+ this.enter = true;
+ }
});
},
back() {},
@@ -115,7 +126,7 @@ export default {
});
if (station) {
this.deviceCode = station.code;
- this.$refs.mapCanvas.setCenter(this.deviceCode);
+ this.$refs.mapCanvas && this.$refs.mapCanvas.setCenter(this.deviceCode);
}
}
}
@@ -132,6 +143,7 @@ export default {
/deep/ .el-dialog .el-dialog__body{
background: rgba(100, 100, 100, 1);
border: 0;
+ padding: 0;
}
/deep/ .el-dialog .el-dialog__header {
padding: 5px;
@@ -158,4 +170,15 @@ export default {
background-size: 45px 30px;
background-repeat: no-repeat;
}
+ .button-box{
+ width: 150px;
+ height: 35px;
+ display: flex;
+ position: absolute;
+ bottom: 60px;
+ left: calc(50% - 75px);
+ z-index: 9999;
+ justify-content: space-between;
+ justify-items: center;
+ }
From 7412e01b32a8c56e3fa48c7fb2fdbc9e2f0a8385 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 26 May 2021 17:18:20 +0800
Subject: [PATCH 13/38] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/shape/graph/Switch/index.js | 1 -
src/views/newMap/displayBaSiDi/index.vue | 3 ++
src/views/newMap/displayBaSiDi/rps.vue | 26 ++++++++++++---
src/views/newMap/displayBaSiDi/tro.vue | 18 ++++++++++
src/views/newMap/displayBaSiDi/troDetail.vue | 35 ++++++++++++--------
5 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/src/jmapNew/shape/graph/Switch/index.js b/src/jmapNew/shape/graph/Switch/index.js
index a2798e699..f5f2bce1c 100644
--- a/src/jmapNew/shape/graph/Switch/index.js
+++ b/src/jmapNew/shape/graph/Switch/index.js
@@ -676,7 +676,6 @@ export default class Switch extends Group {
setState(model) {
if (!this.isShowShape || model.showMode === '05') return;
this.recover();
-
// 只响应前端自定义类型的状态变化
if (model._free) {
if (model.normalPosition) {
diff --git a/src/views/newMap/displayBaSiDi/index.vue b/src/views/newMap/displayBaSiDi/index.vue
index 7441f6604..d8cc7de56 100644
--- a/src/views/newMap/displayBaSiDi/index.vue
+++ b/src/views/newMap/displayBaSiDi/index.vue
@@ -155,6 +155,9 @@ export default {
this.clearSubscribeNew();
clearSimulation(this.group);
this.$store.dispatch('training/reset');
+ // this.$refs.rpsDialog.destroy();
+ // this.$refs.troDialog.destroy();
+ // this.$refs.troDetail.destroy();
},
async mounted() {
const _that = this;
diff --git a/src/views/newMap/displayBaSiDi/rps.vue b/src/views/newMap/displayBaSiDi/rps.vue
index 89f0b4500..1ea84e4ef 100644
--- a/src/views/newMap/displayBaSiDi/rps.vue
+++ b/src/views/newMap/displayBaSiDi/rps.vue
@@ -14,6 +14,7 @@
+
+
diff --git a/src/views/jlmap3d/railwaydrive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/railwaydrive/drivecontrol/drivecontrol.vue
new file mode 100644
index 000000000..00f3ed686
--- /dev/null
+++ b/src/views/jlmap3d/railwaydrive/drivecontrol/drivecontrol.vue
@@ -0,0 +1,457 @@
+
+
{{ jl3dmodel }}
+
+ 司机视角
经典案例分析
规范学习
@@ -15,11 +17,14 @@
:panel-show="deviceShow"
@closedevice3dview="jumpjlmap3dmodel"
/>
+
From 1b5da46e8048d863a36899ea168ed6197b19e3d0 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 28 May 2021 10:10:54 +0800
Subject: [PATCH 15/38] =?UTF-8?q?=E8=83=8C=E6=8A=95=E8=BD=A8=E9=81=93?=
=?UTF-8?q?=E6=80=BB=E8=A7=88=E8=AF=A6=E8=A7=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/map.js | 5 +++
src/jmapNew/painter.js | 2 -
src/views/newMap/displayBaSiDi/rps.vue | 22 +++++++---
src/views/newMap/displayBaSiDi/tro.vue | 44 ++++++++++++--------
src/views/newMap/displayBaSiDi/troDetail.vue | 15 +++----
5 files changed, 55 insertions(+), 33 deletions(-)
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index dd6ab80df..d4a5f908c 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -653,6 +653,11 @@ class Jlmap {
this.$painter.clear();
}
+ clearView() {
+ // this.mapDevice = {};
+ this.$painter.clear();
+ }
+
dispose() {
this.off(this.events.Pan, this.optionsHandler);
this.off(this.events.Zoom, this.optionsHandler);
diff --git a/src/jmapNew/painter.js b/src/jmapNew/painter.js
index 5e65739c2..e036d9ddc 100644
--- a/src/jmapNew/painter.js
+++ b/src/jmapNew/painter.js
@@ -146,8 +146,6 @@ class Painter {
const overlapTrainList = this.checkTrainOverlap(device);
overlapTrainList.forEach((item, index) => {
const trainDevice = this.$jmap.getDeviceByCode(item);
- trainDevice._type = deviceRender['Train']._type;
- trainDevice.zlevel = deviceRender['Train'].zlevel;
trainDevice.overLapIndex = index;
trainDevice.instance && this.mapInstanceLevel[deviceType.Train].remove(trainDevice.instance);
this.add(trainDevice);
diff --git a/src/views/newMap/displayBaSiDi/rps.vue b/src/views/newMap/displayBaSiDi/rps.vue
index 1ea84e4ef..ad5c2d7f6 100644
--- a/src/views/newMap/displayBaSiDi/rps.vue
+++ b/src/views/newMap/displayBaSiDi/rps.vue
@@ -7,7 +7,7 @@
:before-close="doClose"
:z-index="2003"
>
-
+
+
+
+
+
+
+
+
diff --git a/src/views/jlmap3d/railwaydrive/drivecontrol/leftpane.vue b/src/views/jlmap3d/railwaydrive/drivecontrol/leftpane.vue
new file mode 100644
index 000000000..b2b31c3eb
--- /dev/null
+++ b/src/views/jlmap3d/railwaydrive/drivecontrol/leftpane.vue
@@ -0,0 +1,442 @@
+
+ {{ tuoguanbuttonmsg }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jlmap3d/railwaydrive/drivecontrol/rightpane.vue b/src/views/jlmap3d/railwaydrive/drivecontrol/rightpane.vue
new file mode 100644
index 000000000..9dbf2127a
--- /dev/null
+++ b/src/views/jlmap3d/railwaydrive/drivecontrol/rightpane.vue
@@ -0,0 +1,338 @@
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jlmap3d/railwaydrive/drivecontrol/toprightpane.vue b/src/views/jlmap3d/railwaydrive/drivecontrol/toprightpane.vue
new file mode 100644
index 000000000..bd553f0c5
--- /dev/null
+++ b/src/views/jlmap3d/railwaydrive/drivecontrol/toprightpane.vue
@@ -0,0 +1,537 @@
+
+
+ ![]()
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jlmap3d/railwaydrive/jl3drailwaydrive.vue b/src/views/jlmap3d/railwaydrive/jl3drailwaydrive.vue
new file mode 100644
index 000000000..d074bf307
--- /dev/null
+++ b/src/views/jlmap3d/railwaydrive/jl3drailwaydrive.vue
@@ -0,0 +1,459 @@
+
+
+
+ ![]()
+
+
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+
+
+ ![]()
+
+
+
+
+
+ ![]()
+
+
+
+ ![]()
+
+
+
+ ![]()
+
+
+
+ ![]()
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jlmap3d/railwaydrive/sceneview/mmi.css b/src/views/jlmap3d/railwaydrive/sceneview/mmi.css
new file mode 100644
index 000000000..f0532b361
--- /dev/null
+++ b/src/views/jlmap3d/railwaydrive/sceneview/mmi.css
@@ -0,0 +1,78 @@
+/* N区 跳停扣车显示 */
+.narea{
+ left:0px;top:0;
+}
+
+/* D区 信息设置按钮 */
+.darea{
+ right:0px;top:0;
+}
+
+/* M1区 当前驾驶模式显示 */
+.m1area{
+ left:0px;top:12%;
+}
+
+/* M2区 当前运行等级显示 */
+.m2area{
+ right:0px;top:12%;
+}
+
+/* M3区 折返状态显示 */
+.m3area{
+ left:0px;top:24%;
+}
+
+/* M4区 列车进入停车窗显示 */
+.m4area{
+ right:0px;top:24%;
+}
+
+/* M5区 车门状态及门允许侧显示 */
+.m5area{
+ left:0px;top:36%;
+}
+
+/* M6区 发车信息显示 */
+.m6area{
+ right:0px;top:36%;
+}
+
+/* M7区 客室门控制模式显示 */
+.m7area{
+ left:0px;top:48%;
+}
+
+/* M8区 屏蔽门状态显示 */
+.m8area{
+ right:0px;top:48%;
+}
+
+/* M9区 设备故障显示 */
+.m9area{
+ left:0px;top:60%;
+}
+
+/* M10区 停车场/车辆段的转换区显示 */
+.m10area{
+ right:0px;top:60%;
+}
+
+/* C1区 ATO牵引制动状态显示 */
+.c1area{
+}
+
+/* C2区 最高预设驾驶模式显示 */
+.c2area{
+ left:70px;
+}
+
+/* C3区 列车完整性状态显示 */
+.c3area{
+ left:140px;
+}
+
+/* C5区 列车头尾设备状态显示 */
+.c5area{
+ right:0;
+}
diff --git a/src/views/jlmap3d/railwaydrive/sceneview/mmi.js b/src/views/jlmap3d/railwaydrive/sceneview/mmi.js
new file mode 100644
index 000000000..40ae35e58
--- /dev/null
+++ b/src/views/jlmap3d/railwaydrive/sceneview/mmi.js
@@ -0,0 +1,127 @@
+import Vue from 'vue';
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+
+export function mmirender(dom) {
+ let scope = this;
+
+ let scene = new THREE.Scene();
+ scene.add( new THREE.AmbientLight( 0xffffff ) );
+ // camera
+
+ let camera = new THREE.PerspectiveCamera( 30, 360 / 200, 1, 100 );
+ camera.position.set( 0, 0, 80 );
+
+ let renderer = new THREE.WebGLRenderer( );
+ // renderer.setPixelRatio( window.devicePixelRatio );
+ renderer.setSize( 360, 200 );
+
+ var geometry = new THREE.PlaneBufferGeometry( 80, 80, 2 );
+ var material = new THREE.MeshBasicMaterial( {color: 0x000000, side: THREE.DoubleSide} );
+ var plane = new THREE.Mesh( geometry, material );
+ scene.add( plane );
+
+
+ var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/jl3d/biao.png' );
+ var geometry = new THREE.PlaneBufferGeometry( 60, 60, 2 );
+ var material = new THREE.MeshBasicMaterial( {map: texture, side: THREE.DoubleSide} );
+ var kd = new THREE.Mesh( geometry, material );
+ kd.position.x = -5;
+ scene.add( kd );
+
+ var geometry = new THREE.PlaneBufferGeometry( 2, 2, 2 );
+ var material = new THREE.MeshBasicMaterial( {color: 0x000000, side: THREE.DoubleSide} );
+ var zc = new THREE.Mesh( geometry, material );
+ zc.position.x = 2.48;
+ zc.position.y = -0.34;
+ zc.position.z = 1;
+ //zc.rotation.y = Math.PI;
+ //0刻度-Math.PI*65.8/100
+ //110刻度-Math.PI*234.8/100
+ zc.rotation.z = -Math.PI*65.8/100;
+ scene.add( zc );
+
+ var geometry = new THREE.PlaneBufferGeometry( 14, 0.8, 2 );
+ var material = new THREE.MeshBasicMaterial( {color: 0xffffff, side: THREE.DoubleSide} );
+ var zz = new THREE.Mesh( geometry, material );
+ zz.position.z = 1;
+ zz.position.x = 11;
+ zc.add( zz );
+
+ var geometry = new THREE.PlaneBufferGeometry( 2, 2, 2 );
+ var material = new THREE.MeshBasicMaterial( {color: 0x000000, side: THREE.DoubleSide} );
+ var atp = new THREE.Mesh( geometry, material );
+ atp.position.x = 2.48;
+ atp.position.y = -0.34;
+ atp.position.z = 1;
+ //zc.rotation.y = Math.PI;
+ //0刻度-Math.PI*65.8/100
+ //110刻度-Math.PI*234.8/100
+ atp.rotation.z = -Math.PI*65.8/100;
+ scene.add( atp );
+
+ var geometry = new THREE.CircleBufferGeometry(1.5, 1 );
+ var material = new THREE.MeshBasicMaterial( {color: 0xea0000, side: THREE.DoubleSide} );
+ var atpmark = new THREE.Mesh( geometry, material );
+ atpmark.position.z = 1;
+ atpmark.position.x = 21;
+ atpmark.rotation.y = Math.PI;
+ atp.add( atpmark );
+
+ var geometry = new THREE.PlaneBufferGeometry( 2, 2, 2 );
+ var material = new THREE.MeshBasicMaterial( {color: 0x000000, side: THREE.DoubleSide} );
+ var ato = new THREE.Mesh( geometry, material );
+ ato.position.x = 2.48;
+ ato.position.y = -0.34;
+ ato.position.z = 1;
+ //zc.rotation.y = Math.PI;
+ //0刻度-Math.PI*65.8/100
+ //110刻度-Math.PI*234.8/100
+ ato.rotation.z = -Math.PI*65.8/100;
+ scene.add( ato );
+
+ var geometry = new THREE.CircleBufferGeometry(1.5, 1 );
+ var material = new THREE.MeshBasicMaterial( {color: 0xEEEE00, side: THREE.DoubleSide} );
+ var atomark = new THREE.Mesh( geometry, material );
+ atomark.position.z = 1;
+ atomark.position.x = 21;
+ atomark.rotation.y = Math.PI;
+ ato.add( atomark );
+
+
+
+ dom.appendChild( renderer.domElement);
+ renderer.render( scene, camera );
+ // animate();
+
+ function animate() {
+ //zc.rotation.z -= 0.01;
+ // requestAnimationFrame(animate);
+ }
+
+ this.updatezz = function(speed){
+ zc.rotation.z = -Math.PI*(65.8+169*speed/110)/100;
+
+ renderer.render( scene, camera );
+ }
+ this.updateatp = function(atpspeed){
+ if(atpspeed<0){
+ atp.position.x = 10000;
+ }else{
+ atp.position.x = 2.48;
+ atp.rotation.z = -Math.PI*(65.8+169*atpspeed/110)/100;
+ }
+
+ // renderer.render( scene, camera );
+ }
+
+ this.updateato = function(atospeed){
+ if(atospeed<0){
+ ato.position.x = 10000;
+ }else{
+ ato.position.x = 2.48;
+ ato.rotation.z = -Math.PI*(65.8+169*atospeed/110)/100;
+ }
+
+ // renderer.render( scene, camera );
+ }
+}
diff --git a/src/views/jlmap3d/railwaydrive/sceneview/mmiimage.js b/src/views/jlmap3d/railwaydrive/sceneview/mmiimage.js
new file mode 100644
index 000000000..038c7313e
--- /dev/null
+++ b/src/views/jlmap3d/railwaydrive/sceneview/mmiimage.js
@@ -0,0 +1,98 @@
+import Vue from 'vue';
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+
+export function mmiimage() {
+ let scope = this;
+
+ //n
+ this.n = [];
+ this.n['tiaoting'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/n-tiaoting.png';
+ this.n['kouche'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/n-kouche.png';
+ this.n['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
+
+ //d
+ this.d = []
+ this.d['info'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/d-info.png';
+
+ this.m1 = [];
+ this.m1['start'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
+ this.m1['am'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m1-am.png';
+ this.m1['cm'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m1-cm.png';
+ this.m1['rm'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m1-rm.png';
+
+ this.m2 = [];
+ this.m2['start'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
+ this.m2['il'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m2-il.png';
+ this.m2['itc'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m2-itc.png';
+ this.m2['cbtc'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m2-cbtc.png';
+
+ this.m3 = [];
+ this.m3['zhefan'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m3-zhefan.png';
+ this.m3['zhefanzhong'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m3-zhefanzhong.png';
+ this.m3['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
+
+ this.m4 = [];
+ this.m4['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
+ this.m4['out'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m4-out.png';
+ this.m4['in'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m4-in.png';
+
+ this.m5 = [];
+ this.m5['state15'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m5-15.png';
+ this.m5['rightdoor'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m5-rightdoor.png';
+ this.m5['leftdoor'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m5-leftdoor.png';
+ this.m5['noalloffdoor'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m5-noalloffdoor.png';
+ this.m5['noallondoor'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m5-noallondoor.png';
+
+ this.m6 = [];
+ this.m6['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
+ this.m6['fache'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m6-fache.png';
+ this.m6['closedoor'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m6-closedoor.png';
+
+ this.m7 = [];
+ this.m7['momc'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m7-momc.png';
+ this.m7['aomc'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m7-aomc.png';
+ this.m7['aoac'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m7-aoac.png';
+ this.m7['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
+
+ this.m8 = [];
+ this.m8['dahua'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m8-dahua.png';
+ this.m8['jinjizhidong'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m8-jinjizhidong.png';
+ this.m8['doornotclose'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m8-doornotclose.png';
+ this.m8['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
+
+ this.m9 = [];
+ this.m9['rad'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m9-rad.png';
+ this.m9['atp'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m9-atp.png';
+ this.m9['ato'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m9-ato.png';
+ this.m9['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
+
+ this.m10 = [];
+ this.m10['jinduan'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m10-jinduan.png';
+ this.m10['shiwei'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m10-shiwei.png';
+ this.m10['querenxinhao'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m10-querenxinhao.png';
+ this.m10['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
+
+ this.c1 = [];
+ this.c1['qianyin'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c1-qianyin.png';
+ this.c1['duoxing'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c1-duoxing.png';
+ this.c1['zhidong'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c1-zhidong.png';
+ this.c1['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
+
+
+ this.c2 = [];
+ this.c2['rm'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m1-rm.png';
+ this.c2['cmi'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c2-cm-i.png';
+ this.c2['cmc'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c2-cm-c.png';
+ this.c2['ami'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c2-am-i.png';
+ this.c2['amc'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c2-am-c.png';
+ this.c2['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
+
+ this.c3 = [];
+ this.c3['normal'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c3-normal.png';
+ this.c3['lose'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c3-lose.png';
+
+ this.c5 = [];
+ this.c5['normal'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c5-normal.png';
+ this.c5['lose'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c5-lose.png';
+
+}
diff --git a/src/views/jlmap3d/railwaydrive/sceneview/mmiview.vue b/src/views/jlmap3d/railwaydrive/sceneview/mmiview.vue
new file mode 100644
index 000000000..d622f7456
--- /dev/null
+++ b/src/views/jlmap3d/railwaydrive/sceneview/mmiview.vue
@@ -0,0 +1,647 @@
+
+
+
+
+
+ {{ cctvbuttonmsg }}
+ {{ showbuttonmsg }}
+ {{backmsg}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{controlmsg}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jlmap3d/railwaydrive/sceneview/tmscomponent/tmsfault.vue b/src/views/jlmap3d/railwaydrive/sceneview/tmscomponent/tmsfault.vue
new file mode 100644
index 000000000..cce1a2b75
--- /dev/null
+++ b/src/views/jlmap3d/railwaydrive/sceneview/tmscomponent/tmsfault.vue
@@ -0,0 +1,95 @@
+
+
+
+
+ {{nowspeed}}
+
+
+
+
+
+
+
+
+ {{$t('jlmap3d.terminal')}}{{endstation}}
+
+
+
+ {{$t('jlmap3d.nextStation')}}{{nextstation}}
+
+
+
+ T0002
+
+
+
+ C00001
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$t('jlmap3d.confirmSignalOpen')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$t('jlmap3d.faultInformation')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jlmap3d/railwaydrive/sceneview/tmsview.vue b/src/views/jlmap3d/railwaydrive/sceneview/tmsview.vue
new file mode 100644
index 000000000..cc3b0e810
--- /dev/null
+++ b/src/views/jlmap3d/railwaydrive/sceneview/tmsview.vue
@@ -0,0 +1,57 @@
+
+ {{voltage}}
+ {{current}}
+ {{level}}
+ {{speed}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/newMap/displayCity/demonMenu.vue b/src/views/newMap/displayCity/demonMenu.vue
index 9edac0f87..3c1ec28f3 100644
--- a/src/views/newMap/displayCity/demonMenu.vue
+++ b/src/views/newMap/displayCity/demonMenu.vue
@@ -4,6 +4,8 @@
菜单
-
-
-
-
-
-
@@ -60,7 +113,11 @@ export default {
dialogShow: false,
loading: false,
selected: null,
- tableData: []
+ tableData: [],
+ sectionName: '',
+ trainCode: '',
+ operationType: 'create',
+ autoArrange: false
};
},
computed: {
@@ -96,6 +153,16 @@ export default {
handleSelect(tab) {
this.activeIndex = tab;
},
+ trainFind() {
+ const train = this.$store.getters['map/getDeviceByCode'](this.trainCode);
+ this.tableData = [train];
+ },
+ resetTrainCode() {
+ this.trainCode = '';
+ },
+ changeOperationType(type) {
+ this.operationType = type;
+ },
commit() {
// const operate = {
// send: true,
diff --git a/src/views/newMap/newMapdraft/ciConfig.vue b/src/views/newMap/newMapdraft/ciConfig.vue
index 6f5ba4ed4..979d94761 100644
--- a/src/views/newMap/newMapdraft/ciConfig.vue
+++ b/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'
+ 'generateDestination', 'ctcOverlapOnlyTurnBackStationLock'
],
multipleList: ['sharingECStations'],
selectList: [],
@@ -126,7 +126,8 @@ export default {
generateFls: '是否生成侧防：是-生成侧防，不要联动道岔，否-不生成侧防，用联动道岔',
signalApproachNotPassPreSignal:'信号机接近区段不跨过前方同向信号机',
generateDestination: '是否生成目的地码定义（泰雷兹）',
- sharingECStations: '共享紧急关闭效果的车站'
+ sharingECStations: '共享紧急关闭效果的车站',
+ ctcOverlapOnlyTurnBackStationLock: 'CTC列车进路延续保护仅折返站处锁闭'
}
};
},
From d86566be126ffcf5680a8ba9080ec6a0b2e85219 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 28 May 2021 17:20:16 +0800
Subject: [PATCH 21/38] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BB=B6=E7=BB=AD?=
=?UTF-8?q?=E4=BF=9D=E6=8A=A4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dataRelation/continueProtectOperate/detail.vue | 2 ++
.../dataRelation/continueProtectOperate/protect.vue | 8 +++++++-
.../dataRelation/continueProtectOperate/route.vue | 3 +++
.../newMapdraft/dataRelation/routeoperate/detail.vue | 9 +--------
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/views/newMap/newMapdraft/dataRelation/continueProtectOperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/continueProtectOperate/detail.vue
index 6d9468e32..ecb0ac54a 100644
--- a/src/views/newMap/newMapdraft/dataRelation/continueProtectOperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/continueProtectOperate/detail.vue
@@ -15,6 +15,7 @@
// import { mapGetters } from 'vuex';
// import { listMap } from '@/api/jmap/mapdraft';
import { getContinueProtectList, delContinueProtect, putContinueProtect } from '@/api/jmap/mapdraft';
+import { EventBus } from '@/scripts/event-bus';
export default {
name: 'RouteDetail',
@@ -147,6 +148,7 @@ export default {
handleUpload(index, row) {
putContinueProtect(this.$route.params.mapId, row).then(res => {
this.$message.success('更新成功');
+ EventBus.$emit('successCI');
}).catch(() => {
this.$messageBox('操作异常');
});
diff --git a/src/views/newMap/newMapdraft/dataRelation/continueProtectOperate/protect.vue b/src/views/newMap/newMapdraft/dataRelation/continueProtectOperate/protect.vue
index 8851ffbef..59c7f6abc 100644
--- a/src/views/newMap/newMapdraft/dataRelation/continueProtectOperate/protect.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/continueProtectOperate/protect.vue
@@ -4,6 +4,12 @@
-
+
@@ -287,6 +287,12 @@ export default {
troClick() {
this.$emit('troClick');
},
+ traClick() {
+ this.$emit('traClick');
+ },
+ ttlClick() {
+ this.$emit('ttlClick');
+ },
// 车场
handleCarPark() {
this.$emit('handleCarPark');
diff --git a/src/views/newMap/displayBaSiDi/index.vue b/src/views/newMap/displayBaSiDi/index.vue
index d8cc7de56..83fb60921 100644
--- a/src/views/newMap/displayBaSiDi/index.vue
+++ b/src/views/newMap/displayBaSiDi/index.vue
@@ -6,6 +6,8 @@
:data-error="dataError"
@rpsClick="rpsClick"
@troClick="troClick"
+ @traClick="traClick"
+ @ttlClick="ttlClick"
@handleCarPark="handleCarPark"
@end="end"
@back="back"
@@ -15,6 +17,8 @@
@@ -36,18 +40,21 @@ import RpsDialog from './rps';
import TroDialog from './tro';
import CarPack from './carPack';
import TroDetail from './troDetail';
+import TraDialog from './tra';
+import TtlDialog from './ttl';
import parseStatus from '@/utils/parseStatus';
export default {
name: 'DisplayDraft',
components: {
- // MapSystemDraft
BaSiDi,
SetTime,
RpsDialog,
CarPack,
TroDialog,
- TroDetail
+ TroDetail,
+ TraDialog,
+ TtlDialog
},
data() {
return {
@@ -179,24 +186,12 @@ export default {
},
// 仿真错误时，被动退出时调用
async back() {
- // if (this.isExam) {
- // await this.$refs.menuExam.back();
- // } else if (this.isLesson) {
- // await this.$refs.lessonMenu.back();
- // } else if (this.isDemon) {
- // await this.$refs.menuDemon.back();
- // } else if (this.isScript) {
- // await this.$refs.menuScript.back();
- // } else if (this.isContest) {
- // await this.$refs.menuDispatherContest.back();
- // }
this.$router.go(-1);
},
async statusMessage(list) {
if (this.$jlmap) {
await this.$store.dispatch('training/updateMapState', list);
} else {
- // await this.$store.dispatch('map/updateMapDevices', list);
this.$store.commit('map/updateMapDevice', list);
}
await this.$store.dispatch('socket/setEquipmentStatus');
@@ -320,34 +315,6 @@ export default {
this.dataError = resp.data.dataError;
}
},
- // 通过showMode切换显示效果
- switchModeInner(swch) {
- let showMode = '03';
- if (swch == '01') {
- showMode = '03';
- } else if (swch == '02') {
- showMode = '02';
- }
-
- const nameList = Object.keys(this.$store.state.map.map || {});
- let list = [];
- nameList.forEach(item => {
- if (item !== 'skinVO') {
- const data = this.$store.state.map.map[item];
- if (data && data.constructor === Array) {
- list = [...list, ...data];
- }
- }
- });
-
- if (swch == '01') {
- this.$jlmap.updateShowStation(list, this.$store.state.training.centerStationCode); // 显示全部元素
- } else {
- this.$jlmap.updateShowStation(list, ''); // 显示全部元素
- }
-
- this.$jlmap.updateShowMode(list, showMode); // 二次过滤
- },
selectBeginTime() {
this.$refs.setTime.doShow();
},
@@ -429,6 +396,12 @@ export default {
troClick() {
this.$refs.troDialog.doShow();
},
+ ttlClick() {
+ this.$refs.ttlDialog.doShow();
+ },
+ traClick() {
+ this.$refs.traDialog.doShow();
+ },
handleCarPark() {
this.$refs.carPack.doShow();
}
@@ -438,7 +411,7 @@ export default {
From ee6dfa9df2f96e0e6fd00ba84fe1c839b1bbfb04 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 28 May 2021 15:22:23 +0800
Subject: [PATCH 19/38] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=88=97?=
=?UTF-8?q?=E7=9B=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/baseUrl.js | 4 +--
src/views/newMap/displayBaSiDi/index.vue | 2 +-
src/views/newMap/displayBaSiDi/tmt.vue | 38 +++++++++++++++---------
3 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index aa7bf7e1b..11702c286 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,9 +2,9 @@ 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.3.83:9000'; // 旭强 有线
+ // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
// BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
// BASE_API = 'http://192.168.3.120:9000'; // 张赛
// BASE_API = 'http://192.168.8.140:9000'; // 杜康
diff --git a/src/views/newMap/displayBaSiDi/index.vue b/src/views/newMap/displayBaSiDi/index.vue
index 4b0a3bab1..25f3ab8c6 100644
--- a/src/views/newMap/displayBaSiDi/index.vue
+++ b/src/views/newMap/displayBaSiDi/index.vue
@@ -390,7 +390,7 @@ export default {
this.$refs.troDialog.doShow();
},
handleDialogShow(type) {
- this.$refs[type].doShow;
+ this.$refs[type].doShow();
}
}
};
diff --git a/src/views/newMap/displayBaSiDi/tmt.vue b/src/views/newMap/displayBaSiDi/tmt.vue
index 6709b76f5..8be9a7043 100644
--- a/src/views/newMap/displayBaSiDi/tmt.vue
+++ b/src/views/newMap/displayBaSiDi/tmt.vue
@@ -7,7 +7,7 @@
width="900px"
label-position="top"
:before-close="doClose"
- :z-index="2002"
+ :z-index="2009"
:modal="false"
:close-on-click-modal="false"
>
@@ -21,17 +21,28 @@
- 显示列车信息
- 修改列车资料
- 创建列车号
- 删除列车号
- 步进列车号
- 重排列车号
+
+
@@ -48,12 +59,12 @@ export default {
return {
dialogShow: false,
loading: false,
- selected: null
+ selected: null,
+ tableData: []
};
},
computed: {
...mapGetters('map', [
- 'map',
'stationList'
]),
show() {
@@ -65,20 +76,19 @@ export default {
},
methods: {
loadInitData(map) {
- console.log(map, 11111);
+ // console.log(map, 11111);
},
doShow(operate, selected) {
this.dialogShow = true;
this.selected = selected;
- this.loadInitData(this.map);
+ this.loadInitData();
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
-
this.loading = false;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
From d11b0c6d47d67e63efaf7bdac10d1da11b7688a8 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 28 May 2021 17:18:51 +0800
Subject: [PATCH 20/38] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=97=E8=BD=A6?=
=?UTF-8?q?=E6=95=85=E9=9A=9C=E6=93=8D=E4=BD=9C-=E6=8D=A2=E7=AB=AF&?=
=?UTF-8?q?=E8=81=94=E9=94=81=E9=85=8D=E7=BD=AE=E9=A1=B9-CTC=E5=88=97?=
=?UTF-8?q?=E8=BD=A6=E8=BF=9B=E8=B7=AF=E5=BB=B6=E7=BB=AD=E4=BF=9D=E6=8A=A4?=
=?UTF-8?q?=E4=BB=85=E6=8A=98=E8=BF=94=E7=AB=99=E5=A4=84=E9=94=81=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../theme/ningbo_01/menus/menuTrain.vue | 18 +++
src/jmapNew/theme/xian_01/menus/menuTrain.vue | 18 +++
src/scripts/cmdPlugin/CommandEnum.js | 4 +-
src/views/newMap/displayBaSiDi/tmt.vue | 103 +++++++++++++++---
src/views/newMap/newMapdraft/ciConfig.vue | 5 +-
5 files changed, 127 insertions(+), 21 deletions(-)
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
index 5fb05d72d..094ee0cf4 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
@@ -237,6 +237,10 @@ export default {
{
label: '开/关门',
handler: this.handleOpenCloseDoor
+ },
+ {
+ label: '换端',
+ handler: this.handlerTurnDirection
}
],
menuSpeed: [
@@ -396,6 +400,20 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
+ // 列车换端
+ handlerTurnDirection() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Turn_Direction',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
// 限速行驶
limitSpeed() {
const operate = {
diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
index 1c7acdc91..0ac0937e9 100644
--- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
@@ -132,6 +132,10 @@ export default {
{
label: '越红灯行驶',
handler: this.handleOverEedLight
+ },
+ {
+ label: '换端',
+ handler: this.handlerTurnDirection
}
],
menuSpeed: [
@@ -328,6 +332,20 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
+ // 列车换端
+ handlerTurnDirection() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Turn_Direction',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
routeBlockRun() {
// 处理显示车站列表
// const list = [];
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index 507304c37..adcc00007 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -324,7 +324,9 @@ export default {
/** 列车在指定站台跳停 */
CMD_TRAIN_SKIP_STOP : { value: 'Train_Skip_Stop', label: '指定站台跳停' },
/** 列车取消指定站台的跳停 */
- CMD_TRAIN_CANCEL_SKIP_STOP : { value: 'Train_Cancel_Skip_Stop', label: '取消指定站台跳停' }
+ CMD_TRAIN_CANCEL_SKIP_STOP : { value: 'Train_Cancel_Skip_Stop', label: '取消指定站台跳停' },
+ /** 换端 */
+ CMD_TRAIN_TURN_DIRECTION: { value: 'Turn_Direction', label: '换端' }
},
TrainWindow: {
/** 修改列车识别号 */
diff --git a/src/views/newMap/displayBaSiDi/tmt.vue b/src/views/newMap/displayBaSiDi/tmt.vue
index 8be9a7043..f50e80785 100644
--- a/src/views/newMap/displayBaSiDi/tmt.vue
+++ b/src/views/newMap/displayBaSiDi/tmt.vue
@@ -18,31 +18,84 @@
+ 显示列车信息
+ 修改列车资料
+ 创建列车号
+
+ 删除列车号
+ 步进列车号
+ 重排列车号
+
+
- 显示列车信息
- 修改列车资料
- 创建列车号
+ 显示列车信息
+ 修改列车资料
+ 创建列车号
- 删除列车号
- 步进列车号
- 重排列车号
+ 删除列车号
+ 步进列车号
+ 重排列车号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 位置：
+
+
+ 新列车号：
+
+
+ 设置该列车为自动排列：
+ 开启
+ 关闭
+
+
+ 车组号：
+
+ <>
+
+
+
+
+ 插入位置（之前）：
+
+
-
+
+
+
+
+
所选列车号：
+