-
-
-
-
+
+
+
+ {{ covertName(chatContent.memberId) }}
- {{ chatContent.time }}
+ {{ covertTime(chatContent.time) }}
@@ -23,6 +23,7 @@
-
-
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
new file mode 100644
index 000000000..af83cd309
--- /dev/null
+++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue
new file mode 100644
index 000000000..7c8bd8271
--- /dev/null
+++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue
@@ -0,0 +1,134 @@
+
+
+
+
+
+
+
+
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index 8634bb6d2..925ba029a 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -141,6 +141,7 @@ function handle(state, data) {
break;
case 'Simulation_Alarm':
state.simulationAlarmInfo = msg;
+ state.simulationAlarmInfoList.push(msg);
break;
}
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 1628a46bf..e459aa552 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,8 +2,8 @@ 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 = 'http://192.168.8.107:9000'; // 袁琪
+ // BASE_API = 'https://test.joylink.club/jlcloud';
+ BASE_API = 'http://192.168.8.107:9000'; // 袁琪
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
// BASE_API = 'http://192.168.8.144:9000'; // 旭强
// BASE_API = 'http://192.168.3.175:9000'; // 张赛
From 2eaba04ccda0cd82108fe93a2e627bce7387dc60 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 29 Oct 2020 15:21:20 +0800
Subject: [PATCH 64/97] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E8=BD=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../race_01/menus/dialog/trainSetPlan.vue | 33 +++++++++++++++----
1 file changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue
index e84443d00..f12c75f4a 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue
@@ -19,18 +19,18 @@
- 服务号
- 序列号
+ 序列号
+ 服务号
-
-
+
+
@@ -50,6 +50,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
+import {getTrainDetailBytripNumber} from '@/api/simulation';
export default {
name: 'TrainSetPlan',
@@ -99,6 +100,17 @@ export default {
if (this.dialogShow) {
this.commit();
}
+ },
+ 'addModel.tripNumber': function(val) {
+ if (val.length == 4) {
+ this.trainNoChange(val);
+ } else {
+ this.addModel = {
+ groupNumber: '',
+ tripNumber: val,
+ serviceNumber: ''
+ };
+ }
}
},
mounted() {
@@ -127,6 +139,15 @@ export default {
this.$store.dispatch('map/setTrainWindowShow', false);
mouseCancelState(this.selected);
},
+ trainNoChange(tripNumber) {
+ getTrainDetailBytripNumber(this.$route.query.group, {tripNumber:tripNumber}).then(resp => {
+ if (resp.data) {
+ this.addModel.serviceNumber = resp.data.serviceNumber;
+ }
+ }).catch(() => {
+ this.$message.error('获取列车信息失败！');
+ });
+ },
commit() {
if (!this.addModel.serviceNumber) {
this.messageTip1 = '请输入服务号';
From 21096413657c4cd38736b6887d3045305bda24d4 Mon Sep 17 00:00:00 2001
From: lVAL
Date: Thu, 29 Oct 2020 15:49:01 +0800
Subject: [PATCH 65/97] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8B=96=E5=8A=A8?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../planMonitor/editToolAUS/tool/index.vue | 2 -
.../planMonitor/editToolAUS/tool/monitor.js | 66 ++++++++++---------
.../planMonitor/editToolAUS/tool/schedule.vue | 11 ++--
3 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/src/views/planMonitor/editToolAUS/tool/index.vue b/src/views/planMonitor/editToolAUS/tool/index.vue
index 22a0b6dcd..4baf22b05 100644
--- a/src/views/planMonitor/editToolAUS/tool/index.vue
+++ b/src/views/planMonitor/editToolAUS/tool/index.vue
@@ -353,8 +353,6 @@ export default {
if (this.model.action != 'Add') {
this.$refs.schedule.clearGraphic();
}
-
- this.$refs.schedule.setAreaClipPath();
},
onRemove(){
switch(this.model.choice) {
diff --git a/src/views/planMonitor/editToolAUS/tool/monitor.js b/src/views/planMonitor/editToolAUS/tool/monitor.js
index 2fedb6a2a..b5c4e4ce1 100644
--- a/src/views/planMonitor/editToolAUS/tool/monitor.js
+++ b/src/views/planMonitor/editToolAUS/tool/monitor.js
@@ -111,7 +111,6 @@ export default {
})
this.myChart.setOption({graphic});
- setTimeout(_=>{ this.setAreaClipPath(); }, 0);
this.$emit('clear');
},
onZrMouseOver(e) {
@@ -201,35 +200,42 @@ export default {
});
},
onRendered(e) {
- // const mw = this.myChart.getWidth()-100;
- // const mh = this.myChart.getHeight()-80;
+ const mw = this.myChart.getWidth()-100;
- // const view = this.myChart.getViewOfComponentModel({__viewId: "_ec_shape_graphic"});
- // if (view.group) {
- // view.group.eachChild(el => {
- // if (['area'].includes(el.subType)) {
- // const w = Math.abs(el.point2[0]-el.point1[0]);
- // const h = Math.abs(el.point2[1]-el.point1[1]);
- // const x = el.position[0] < 160
- // ? 160 - el.position[0]
- // : 0;
- // const y = el.position[1] < 60
- // ? 60 - el.position[1]
- // : 0;
- // const dw = el.position[0]+w > mw
- // ? el.position[0]+w-mw
- // : x;
- // const dh = el.position[1]+h > mh
- // ? el.position[1]+h-mh
- // : y;
- // el.shape.x = x;
- // el.shape.y = y;
- // el.shape.width = Math.abs(w-dw);
- // el.shape.height = Math.abs(h-dh);
- // el.dirty();
- // }
- // })
- // }
+ const view = this.myChart.getViewOfComponentModel({__viewId: "_ec_shape_graphic"});
+ if (view.group) {
+ view.group.eachChild(el => {
+ if (['area'].includes(el.subType)) {
+ const position1 = this.myChart.convertToPixel('grid', el.point1);
+ const position2 = this.myChart.convertToPixel('grid', el.point2);
+ const oldWidth = Math.abs(position2[0]-position1[0]);
+ const x = el.position[0] < 160
+ ? 160 - el.position[0]
+ : 0;
+ const dw = el.position[0] + oldWidth > mw
+ ? el.position[0] + oldWidth - mw
+ : x;
+
+ const width = oldWidth-dw;
+
+ if (width < 0 || x > mw) {
+ el.hide();
+ } else {
+ el.setShape({x,width})
+ el.show();
+ }
+ el.dirty();
+ } else if (['drag'].includes(el.subType)) {
+ if (el.position[0]-el.shape.r < 160 ||
+ el.position[0]+el.shape.r > mw) {
+ el.hide();
+ } else {
+ el.show();
+ }
+ el.dirty();
+ }
+ })
+ }
},
onShapeMouseOver(e) {
if (this.selected) {
@@ -627,7 +633,7 @@ export default {
break;
}
- this.planUtil.limitAreaModel(model);
+ this.planUtil.limitAreaTime(model);
if (this.planUtil.limitAreaKmRange(this.stations, model)) {
this.onZrMouseUp(e);
}
diff --git a/src/views/planMonitor/editToolAUS/tool/schedule.vue b/src/views/planMonitor/editToolAUS/tool/schedule.vue
index 5b4c83a3c..52ac05389 100644
--- a/src/views/planMonitor/editToolAUS/tool/schedule.vue
+++ b/src/views/planMonitor/editToolAUS/tool/schedule.vue
@@ -293,7 +293,6 @@ export default {
}
this.myChart.setOption(option, true);
- this.setAreaClipPath();
if (this.model.choice == 'Plan') {
this.setLineLight();
@@ -452,12 +451,14 @@ export default {
},
calcHornList(elemList, elem) {
const p = elem.position;
+ const x = elem.shape.x;
+ const y = elem.shape.y;
const w = elem.shape.width;
const h = elem.shape.height;
- const point1 = [p[0], p[1]];
- const point2 = [p[0]+w, p[1]];
- const point3 = [p[0]+w, p[1]+h];
- const point4 = [p[0], p[1]+h];
+ const point1 = [p[0]+x, p[1]+y];
+ const point2 = [p[0]+x+w, p[1]+y];
+ const point3 = [p[0]+x+w, p[1]+y+h];
+ const point4 = [p[0]+x, p[1]+y+h];
elemList.push(utils.buildHornDataObj(point1, this.myChart.convertFromPixel('grid', point1), this, 'horn-1'));
elemList.push(utils.buildHornDataObj(point2, this.myChart.convertFromPixel('grid', point2), this, 'horn-2'));
From a6fab35450f1684af6add1273a83ddd30ad77a6e Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 29 Oct 2020 16:22:19 +0800
Subject: [PATCH 66/97] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E8=BD=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/simulation.js | 8 +++
.../theme/haerbin_01/menus/menuBar.vue | 2 +-
.../menus/menuDialog/alarmTableHmi.vue | 40 ++++-------
.../menus/menuDialog/alarmTableLow.vue | 66 +++++++------------
.../race_01/menus/dialog/trainSetPlan.vue | 8 +--
src/store/modules/socket.js | 5 +-
6 files changed, 46 insertions(+), 83 deletions(-)
diff --git a/src/api/simulation.js b/src/api/simulation.js
index df8606af0..f9864130e 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -380,3 +380,11 @@ export function getIbpInitialState (group, stationCode) {
method: 'get'
});
}
+// 获取报警列表
+export function getAlarmList(group, params) {
+ return request({
+ url: `/simulation/${group}/alarm`,
+ method: 'get',
+ params:params
+ });
+}
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue
index 43c807521..eb88a1cef 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue
@@ -113,7 +113,7 @@
![]()
-
+
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
index af83cd309..a1ea67cb6 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
@@ -42,13 +42,13 @@
- 消息确认
+ 消息确认
- 消息打印
+ 消息打印
- 删除备注
+ 删除备注
@@ -87,6 +87,7 @@
+
+
+ 消息确认
+
+
+ 消息打印
+
+
+ 删除备注
+
+
+
+
+
+
+
+
+ {{ scope.row.confirmed? 'Y':'N' }}
+
+
+
+
+ {{ scope.row.recover? 'Y':'N' }}
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+ 撤销查询
+
+
+
+ 开始时间:
+ 结束时间:
+ 设备编号:
+ 元素编号:
+ 筛选条件查询
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 开始时间:
+ 结束时间:
+ {{ messageTip1 }}
- {{ messageTip2 }}
{{ messageTip1 }}
+ 筛选条件查询