- 返回
+
+
From e3da35b4df2199607bd381522d1ef9dd7332f9ef Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 15 Apr 2022 15:26:12 +0800
Subject: [PATCH 04/98] =?UTF-8?q?=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
---
src/api/management/userexam.js | 9 ++
src/layout/components/Logout.vue | 2 +-
.../examManage/gradeStatistics.vue | 1 +
.../organization/studentStatistics/index.vue | 100 ++++++++++--------
4 files changed, 64 insertions(+), 48 deletions(-)
diff --git a/src/api/management/userexam.js b/src/api/management/userexam.js
index 36908ee4c..b19683b4d 100644
--- a/src/api/management/userexam.js
+++ b/src/api/management/userexam.js
@@ -74,3 +74,12 @@ export function getClassGradeStatistic(orgId, examId) {
method: 'get'
});
}
+
+/** 查询组织学生单次考试成绩曲线 */
+export function getStuGradeStatistic() {
+ return request({
+ url: `/api/userExam/curve/personal`,
+ method: 'get'
+ });
+}
+
diff --git a/src/layout/components/Logout.vue b/src/layout/components/Logout.vue
index 27f5818c2..4e39503e7 100644
--- a/src/layout/components/Logout.vue
+++ b/src/layout/components/Logout.vue
@@ -73,7 +73,7 @@ export default {
this.$router.push({ path: `/info/organization` });
},
handleStatistics(){
- this.$router.push({ path: `/info/gradeStatistics` });
+ this.$router.push({ path: `/info/studentStatistics` });
}
}
};
diff --git a/src/views/organization/examManage/gradeStatistics.vue b/src/views/organization/examManage/gradeStatistics.vue
index c27096a8d..39853811d 100644
--- a/src/views/organization/examManage/gradeStatistics.vue
+++ b/src/views/organization/examManage/gradeStatistics.vue
@@ -45,6 +45,7 @@ export default {
return {
orgId:'',
myChart1:null,
+ myChart2:null,
userNameList:[],
gradeList:[],
classList:[],
diff --git a/src/views/organization/studentStatistics/index.vue b/src/views/organization/studentStatistics/index.vue
index eb3cbfbb4..818324afb 100644
--- a/src/views/organization/studentStatistics/index.vue
+++ b/src/views/organization/studentStatistics/index.vue
@@ -1,41 +1,16 @@
{{ $route.query.name + '成绩统计' }}
+ {{ $route.query.name + ' 成绩统计' }}
+
+
+
-
+
+
From 5793ba270d36315a7c1461976a7449d54dbfae72 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 18 Apr 2022 09:28:37 +0800
Subject: [PATCH 06/98] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=BB=9F=E8=AE=A1?=
=?UTF-8?q?=E4=BF=A1=E6=81=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
---
src/api/management/userexam.js | 26 ++-
src/layout/components/Logout.vue | 1 +
src/router/index.js | 6 +
.../classManage/studentManage/index.vue | 18 +++
.../studentStatistics/examStatistic.vue | 66 ++++++++
.../studentStatistics/gradeStatistic.vue | 151 ++++++++++++++++++
.../organization/studentStatistics/index.vue | 146 +++++++----------
.../studentStatistics/studentGradeStatis.vue | 45 ++++++
8 files changed, 373 insertions(+), 86 deletions(-)
create mode 100644 src/views/organization/studentStatistics/examStatistic.vue
create mode 100644 src/views/organization/studentStatistics/gradeStatistic.vue
create mode 100644 src/views/organization/studentStatistics/studentGradeStatis.vue
diff --git a/src/api/management/userexam.js b/src/api/management/userexam.js
index b19683b4d..7dec56fc6 100644
--- a/src/api/management/userexam.js
+++ b/src/api/management/userexam.js
@@ -76,10 +76,34 @@ export function getClassGradeStatistic(orgId, examId) {
}
/** 查询组织学生单次考试成绩曲线 */
-export function getStuGradeStatistic() {
+export function getStuGradeStatistic(params) {
return request({
url: `/api/userExam/curve/personal`,
+ method: 'get',
+ params
+ });
+}
+
+/** 个人仿真数据统计 */
+export function getSimulationTimeChart(mapId) {
+ return request({
+ url: `/api/stats/simulation/${mapId}/stats`,
method: 'get'
});
}
+// 课程内实训数据统计
+export function getLessonTimeChart(id) {
+ return request({
+ url: `/api/stats/lesson/${id}/stats`,
+ method: 'get'
+ });
+}
+
+// 课程列表
+export function getLessonList() {
+ return request({
+ url: '/api/stats/lesson/list',
+ method: 'get'
+ });
+}
diff --git a/src/layout/components/Logout.vue b/src/layout/components/Logout.vue
index 4e39503e7..d3f4d65b8 100644
--- a/src/layout/components/Logout.vue
+++ b/src/layout/components/Logout.vue
@@ -53,6 +53,7 @@ export default {
},
isCGY() {
return getSessionStorage('project') === 'cgy';
+ // gzb
}
},
mounted() {
diff --git a/src/router/index.js b/src/router/index.js
index 59471c241..f103d84b2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -172,6 +172,7 @@ const StudentManage = () => import('@/views/organization/classManage/studentMana
const DurationView = () => import('@/views/organization/classManage/durationView');
const GradeList = () => import('@/views/organization/examManage/gradeList');
const GradeStatistics = () => import('@/views/organization/examManage/gradeStatistics');
+const StudentGradeStatis = () => import('@/views/organization/studentStatistics/studentGradeStatis');
const StudentStatistics = () => import('@/views/organization/studentStatistics/index');
const CreateRule = () => import('@/views/organization/ruleManage/createRule');
const TotalGrade = () => import('@/views/organization/ruleManage/totalGrade');
@@ -664,6 +665,11 @@ export const publicAsyncRoute = [
component: StudentStatistics,
hidden: true
},
+ {
+ path: 'studentGradeStatis',
+ component: StudentGradeStatis,
+ hidden: true
+ },
{
path: 'createRule',
component: CreateRule,
diff --git a/src/views/organization/classManage/studentManage/index.vue b/src/views/organization/classManage/studentManage/index.vue
index b06a77ef2..4ff635e2c 100644
--- a/src/views/organization/classManage/studentManage/index.vue
+++ b/src/views/organization/classManage/studentManage/index.vue
@@ -70,6 +70,14 @@ export default {
showControl: (row) => {
return this.$route.query.creatorId == this.$store.state.user.id;
}
+ },
+ {
+ name: '成绩曲线',
+ handleClick: this.gradeStatistic,
+ type: 'success',
+ // showControl: (row) => {
+ // return this.$route.query.creatorId == this.$store.state.user.id;
+ // }
}
]
}
@@ -199,6 +207,16 @@ export default {
XLSX.utils.book_append_sheet(wb, ws, 'file');
XLSX.writeFile(wb, '学生信息模板' + '.xlsx');
},
+ gradeStatistic(index,row){
+ this.$router.push({ path: '/info/studentGradeStatis',
+ query: {
+ username: row.name,
+ departmentId: row.departmentId,
+ userId: row.userId,
+ orgRole: row.orgRole
+ }
+ });
+ },
removeStudent(index, row) {
const _that = this;
this.$confirm(`是否确认将${row.name}移出班级？`, this.$t('tip.hint'), {
diff --git a/src/views/organization/studentStatistics/examStatistic.vue b/src/views/organization/studentStatistics/examStatistic.vue
new file mode 100644
index 000000000..baa0dc607
--- /dev/null
+++ b/src/views/organization/studentStatistics/examStatistic.vue
@@ -0,0 +1,66 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/views/organization/studentStatistics/gradeStatistic.vue b/src/views/organization/studentStatistics/gradeStatistic.vue
new file mode 100644
index 000000000..8db1358c2
--- /dev/null
+++ b/src/views/organization/studentStatistics/gradeStatistic.vue
@@ -0,0 +1,151 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/views/organization/studentStatistics/index.vue b/src/views/organization/studentStatistics/index.vue
index 9185abd14..7de972361 100644
--- a/src/views/organization/studentStatistics/index.vue
+++ b/src/views/organization/studentStatistics/index.vue
@@ -1,28 +1,37 @@
{{ '统计信息' }}
+
+
+
+
+
{{ '统计信息' }}
+
-
-
+
+
+
+
+
-
@@ -29,6 +29,8 @@ export default {
data() {
return {
myChart3:null,
+ creatorId:'',
+ orgId:'',
title:{
show:true,
text:'仿真时长统计',
@@ -44,6 +46,12 @@ export default {
async mounted() {
this.initChart()
this.loadData();
+ this.orgId=parseInt(this.$store.state.user.companyId);
+ },
+ computed:{
+ userId(){
+ return parseInt(this.$store.state.user.id);
+ }
},
methods: {
initChart(){
diff --git a/src/views/organization/studentStatistics/studentGradeStatis.vue b/src/views/organization/studentStatistics/studentGradeStatis.vue
index 6d9771333..02fef7ae1 100644
--- a/src/views/organization/studentStatistics/studentGradeStatis.vue
+++ b/src/views/organization/studentStatistics/studentGradeStatis.vue
@@ -1,11 +1,17 @@
-
- 返回
+
+
+
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/confirmControlSpeed.vue
new file mode 100644
index 000000000..d49556383
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/confirmControlSpeed.vue
@@ -0,0 +1,156 @@
+
+ {{ studentName+'统计信息' }}
-
-
-
+ {{ message }}
+
+
+ {{ message }}
+
+
+
+ {{ message }}
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 车站
+
+
+ 始端信号机
+
+
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/routeGuide.vue b/src/jmapNew/theme/datie_02/menus/dialog/routeGuide.vue
new file mode 100644
index 000000000..11cba9131
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dialog/routeGuide.vue
@@ -0,0 +1,278 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ handleRouteName(scope.row.name) }}
+
+
+
+ {{ handleDirection(scope.row.startSignalCode) }}
+
+
+
+ {{ scope.row.turnBack ? '折返': '直通' }}
+
+
+
+ {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
+
+
+
+ 进路列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ handleRouteName(scope.row.name) }}
+
+
+
+ {{ handleDirection(scope.row.startSignalCode) }}
+
+
+
+ {{ scope.row.turnBack ? '折返': '直通' }}
+
+
+
+ {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
+
+
+
+
+
+ 车站
+ 始端信号机
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/routeSelection.vue b/src/jmapNew/theme/datie_02/menus/dialog/routeSelection.vue
new file mode 100644
index 000000000..12014afb3
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dialog/routeSelection.vue
@@ -0,0 +1,325 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ handleRouteName(scope.row.name) }}
+
+
+
+ {{ handleDirection(scope.row.startSignalCode) }}
+
+
+
+ {{ scope.row.turnBack ? '折返': '直通' }}
+
+
+
+ {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
+
+
+
+ 进路列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ handleRouteName(scope.row.name) }}
+
+
+
+ {{ handleDirection(scope.row.startSignalCode) }}
+
+
+
+ {{ scope.row.turnBack ? '折返': '直通' }}
+
+
+
+ {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/standControl.vue b/src/jmapNew/theme/datie_02/menus/dialog/standControl.vue
new file mode 100644
index 000000000..c6c29c830
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dialog/standControl.vue
@@ -0,0 +1,603 @@
+
+
+
+
+ 范围
+
+
+
+ 本站台
+
+ 上行全线
+
+ 下行全线
+
+
+
+
+
+ 功能
+
+
+
+ 扣车
+
+
+
+ 取消扣车
+
+
+
+
+
+
+ 范围
+
+
+
+
+ 站台跳停
+
+
+ 指定列车跳停
+
+
+
+
+
+ 车组号
+
+
+
+
+ 功能
+
+
+
+ 跳停
+
+
+
+ 取消跳停
+
+
+
+
+
+
+ 范围
+
+
+
+
+ 自动
+
+
+ 人工
+
+
+
+
+
+ 运行等级
+
+
+
+
+ 停站时间
+
+ 秒
+
+ 功能
+
+
+ 一次有效
+ 一直有效
+
+
+
+
+
+
+
+
+
+ 车站
+
+
+
+
+ 轨道
+
+
+ 车次窗
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 服务号
+
+
+ 目的地
+
+
+
+
+ 序列号
+
+
+ 服务号
+
+
+
+
+
+
+ 运行模式
+
+
+ 普通
+ 专列
+ 不停站直达
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+ 取 消
+
+
+
+
+
+
+
+
+ 车站
+
+
+
+
+ 车次窗
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 车站
+
+
+
+
+ 车次窗
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 车组号
+
+
+
+
+ 服务类型
+
+
+
+
+
+
+ 服务号
+
+
+
+
+ 序列号
+
+
+
+
+
+
+ 司机号
+
+
+
+
+ 目的地号
+
+
+
+
+
+
+ 车站
+
+
+
+
+ 轨道
+
+
+
+
+
+
+ 下一站
+
+
+
+
+ 目的地
+
+
+
+
+
+
+ 跟踪模式
+
+
+
+
+ 运行状态
+
+
+
+
+
+
+ 出发时刻
+
+
+
+
+ 到达时刻
+
+
+
+
+
+
+ 计划偏离
+
+
+
+
+
+
+
+
+
+
+ 编组号
+
+
+
+
+
+
+ 车头号1
+
+
+
+
+ 车头号2
+
+
+
+
+
+
+
+
+
+
+
+
+ 车载ID
+
+
+
+
+ 运行方向
+
+
+
+
+
+
+ 驾驶模式
+
+
+
+
+ 速度
+
+
+
+
+
+
+ 停准状态
+
+
+
+
+ 车门状态
+
+
+
+
+
+
+ 运行等级
+
+
+
+
+ 停跳状态
+
+
+
+
+
+
+ 车头位置
+
+
+
+
+ 载重率
+
+
+
+
+
+
+
+
+
+
+
+
+ 车站
+
+
+
+
+ 车次窗
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 车站
+
+
+
+
+ 车次窗
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 车站
+
+
+
+
+ 目的车次窗
+
+
+
+
+
+
+
+ {{ message }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{message}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ControlMonitor 1.3.5.0
+ 确定
+
+
+ 版权所有（C）2010-2011 北京玖琏科技有限公司
+
+
+
+
+
+
+
+
+
+
+
+
+ 用户列表
+
+
+
+
+
+ {{scope.row.jobNumber}}
+
+
+
+
+ {{scope.row.userName}}
+
+
+
+
+
+
+
+ 刷新
+
+ 增加
+
+ 修改
+
+ 删除
+
+
+
+
+
+ 请求
+
+ 线路选择
+
+
+
+
+ 限制速度
+
+
+
+
+
+
+ 起始公里标
+
+
+ 结束公里标
+
+
+
+
+ 限速区段长度
+
+
+
+ 查看
+
+
+ 请求
+
+
+
+
+ 执行
+
+ 线路选择
+
+
+
+
+ 限制速度
+
+
+
+
+
+
+ 起始公里标
+
+
+ 结束公里标
+
+
+
+
+ 限速区段长度
+
+
+
+ 查看
+
+
+ 请求
+
+
+
+
+ 操作提示
+
+
+ 设备列表
+
+
+
+
+ 添加位置
+
+
+
+ 终 端:
+
+
+
+
+
+
+
+ 目的
+
+
+
+ 终 端:
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
new file mode 100644
index 000000000..06e046f46
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
@@ -0,0 +1,366 @@
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/datie_02/menus/menuStation.vue b/src/jmapNew/theme/datie_02/menus/menuStation.vue
new file mode 100644
index 000000000..e370afb71
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/menuStation.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/datie_02/menus/menuStationStand.vue b/src/jmapNew/theme/datie_02/menus/menuStationStand.vue
new file mode 100644
index 000000000..252b55010
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/menuStationStand.vue
@@ -0,0 +1,220 @@
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/datie_02/menus/menuSwitch.vue b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue
new file mode 100644
index 000000000..983d64619
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue
@@ -0,0 +1,275 @@
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/datie_02/menus/menuTool.vue b/src/jmapNew/theme/datie_02/menus/menuTool.vue
new file mode 100644
index 000000000..95bc382b2
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/menuTool.vue
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
new file mode 100644
index 000000000..0aa2adfb2
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
@@ -0,0 +1,428 @@
+
+
+ ![]()
+
+
+ ![]()
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/datie_02/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/datie_02/menus/passiveDialog/alarm.vue
new file mode 100644
index 000000000..afbff9ddc
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/passiveDialog/alarm.vue
@@ -0,0 +1,216 @@
+
+
+ 报警详细描述
+
+ +
-
+
@@ -45,11 +45,11 @@ export default {
return {
orgId:'',
myChart1:null,
- myChart2:null,
- userNameList:[],
- gradeList:[],
+ // myChart2:null,
+ // userNameList:[],
+ // gradeList:[],
classList:[],
- durationList:[],
+ // durationList:[],
fullPoint:0,
passingPoint:0,
duration:0,
@@ -63,31 +63,31 @@ export default {
color:'#f00'
}
},
- title1:{
- show:true,
- text:' 答题时长区间人数 ',
- // 各分数区间人数统计
- textAlign:'center',
- left:'50%',
- top:'5px',
- textStyle:{
- color:'#f00'
- }
- },
- yAxis1:{
- position:'left',
- name:'人数',
- nameLocation:'end',
- minInterval:1,
- nameTextStyle:{
- align:'left',
- fontSize:14
- },
- axisLine:{show:true}
- },
+ // title1:{
+ // show:true,
+ // text:' 答题时长区间人数 ',
+ // // 各分数区间人数统计
+ // textAlign:'center',
+ // left:'50%',
+ // top:'5px',
+ // textStyle:{
+ // color:'#f00'
+ // }
+ // },
+ // yAxis1:{
+ // position:'left',
+ // name:'人数',
+ // nameLocation:'end',
+ // minInterval:1,
+ // nameTextStyle:{
+ // align:'left',
+ // fontSize:14
+ // },
+ // axisLine:{show:true}
+ // },
yAxis:{
position:'left',
- name:'分数',
+ name:'人数',
nameLocation:'end',
min:0,
nameTextStyle:{
@@ -96,10 +96,10 @@ export default {
},
axisLine:{show:true}
},
- durationInterval:[]
+ gradeInterval:[]
};
},
- async created() {
+ async mounted() {
const resp = await getClassListUnPage();
resp.data && resp.data.forEach(item => {
this.classList.push({ value: item.id, label: item.name });
@@ -108,22 +108,35 @@ export default {
this.orgId = this.classList[0].value;
const res = await getExamLessonDetail(this.$route.query.examId);
if (res.data) {
- this.yAxis.max = res.data.fullPoint;
+ this.fullPoint = res.data.fullPoint;
this.passingPoint = res.data.passingPoint;
this.duration = res.data.duration;
}
var chartDom1 = document.getElementById('mychart1');
this.myChart1 = echarts.init(chartDom1);
- var chartDom2 = document.getElementById('mychart2');
- this.myChart2 = echarts.init(chartDom2);
- const eachInterval = this.duration / 6;
- this.durationInterval = ['0-' + eachInterval,
- eachInterval + '-' + eachInterval * 2,
- eachInterval * 2 + '-' + eachInterval * 3,
- eachInterval * 3 + '-' + eachInterval * 4,
- eachInterval * 4 + '-' + eachInterval * 5,
- eachInterval * 5 + '-' + eachInterval * 6
- ];
+ // var chartDom2 = document.getElementById('mychart2');
+ // this.myChart2 = echarts.init(chartDom2);
+ const eachInterval = this.fullPoint / 10;
+ this.gradeInterval = [];
+ for(i=0;i<10;i++){
+ this.gradeInterval.push(eachInterval*i+'-'+eachInterval*(i+1));
+ }
+ const option = {
+ title:this.title,
+ xAxis: {
+ type: 'category',
+ name:'分数区间',
+ data: this.gradeInterval
+ },
+ yAxis:this.yAxis,
+ series: [
+ {
+ data:[],
+ type: 'line'
+ }
+ ]
+ };
+ option && this.myChart1 && this.myChart1.setOption(option);
this.getClassGradeStatis();
},
methods: {
@@ -132,64 +145,45 @@ export default {
},
getClassGradeStatis() {
if (this.orgId) {
- this.userNameList = [];
- this.gradeList = [];
+ // this.userNameList = [];
+ // this.gradeList = [];
// this.myChart1.restore();
getClassGradeStatistic(this.orgId, this.$route.query.examId).then(resp=>{
const results = resp.data;
if (results) {
const gradeList = results.results;
- const countList = [0, 0, 0, 0, 0];
+ const countList = [0,0,0,0,0,0,0,0,0,0];
if (gradeList.length > 0) {
gradeList.forEach(each=>{
- this.userNameList.push(each.username || '');
- this.gradeList.push(each.score);
- this.durationList.push(each.duration || 0);
- countList[Math.floor((each.duration || 0) / (this.duration / 6))]++;
+ // this.userNameList.push(each.username || '');
+ // this.gradeList.push(each.score);
+ // this.durationList.push(each.duration || 0);
+ countList[Math.floor((each.score || 0) / (this.fullPoint/ 10))]++;
});
- const option = {
- title:this.title,
- xAxis: {
- type: 'category',
- axisLabel:{
- show :false
- },
- data:this.userNameList
- },
- tooltip:{
- show:true,
- trigger:'item'
- },
- yAxis: this.yAxis,
- series: [
- {
- symbolSize: 10,
- data:this.gradeList,
- type: 'scatter'
- }
- ]
- };
- const option1 = {
- title1:this.title1,
- xAxis: {
- name:'时长区间/s',
- type: 'category',
- data: this.durationInterval
- },
- yAxis: this.yAxis1,
- tooltip:{
- show:true,
- trigger:'axis'
- },
- series: [
- {
- data:countList,
- type: 'bar'
- }
- ]
- };
+ let option=this.myChart1.getOption();
+ // debugger
+ option.series[0].data=countList;
+ // const option1 = {
+ // title1:this.title1,
+ // xAxis: {
+ // name:'时长区间/s',
+ // type: 'category',
+ // data: this.durationInterval
+ // },
+ // yAxis: this.yAxis1,
+ // tooltip:{
+ // show:true,
+ // trigger:'axis'
+ // },
+ // series: [
+ // {
+ // data:countList,
+ // type: 'bar'
+ // }
+ // ]
+ // };
option && this.myChart1 && this.myChart1.setOption(option);
- option1 && this.myChart2 && this.myChart2.setOption(option1);
+ // option1 && this.myChart2 && this.myChart2.setOption(option1);
// debugger;
// id": "92",
// "userId": "92",
@@ -204,38 +198,22 @@ export default {
}
}
}).catch((error) => {
- const option = {
- title:this.title,
- xAxis: {
- type: 'category',
- data:[]
- },
- yAxis:this.yAxis,
- series: [
- {
- symbolSize: 20,
- data:[],
- type: 'scatter'
- }
- ]
- };
- const option1 = {
- title:this.title1,
- xAxis: {
- name:'时长区间/s',
- type: 'category',
- data: this.durationInterval
- },
- yAxis:this.yAxis1,
- series: [
- {
- data:[],
- type: 'bar'
- }
- ]
- };
- option && this.myChart1 && this.myChart1.setOption(option);
- option1 && this.myChart2 && this.myChart2.setOption(option1);
+ // const option1 = {
+ // title:this.title1,
+ // xAxis: {
+ // name:'时长区间/s',
+ // type: 'category',
+ // data: this.durationInterval
+ // },
+ // yAxis:this.yAxis1,
+ // series: [
+ // {
+ // data:[],
+ // type: 'bar'
+ // }
+ // ]
+ // };
+ // option1 && this.myChart2 && this.myChart2.setOption(option1);
this.$message.error(error.message);
});
@@ -267,15 +245,16 @@ export default {
margin-left:5%;
}
.statisticChartLeft{
- width: 50%;
+ width: 100%;
display: inline-block;
- height: 700px;
+ height: 500px;
+ /* margin-left:25%; */
/* border:1px #ccc solid */
}
.statisticChartRight{
width: 50%;
display: inline-block;
- height: 700px;
+ height: 500px;
/* border:1px #ccc solid */
}
From 63ecb61501b08e6167d7d13c778ecbfc5da0111d Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 18 Apr 2022 17:13:54 +0800
Subject: [PATCH 12/98] =?UTF-8?q?=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
---
src/views/organization/examManage/gradeStatistics.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/organization/examManage/gradeStatistics.vue b/src/views/organization/examManage/gradeStatistics.vue
index d270412c5..fb8f580dd 100644
--- a/src/views/organization/examManage/gradeStatistics.vue
+++ b/src/views/organization/examManage/gradeStatistics.vue
@@ -118,7 +118,7 @@ export default {
// this.myChart2 = echarts.init(chartDom2);
const eachInterval = this.fullPoint / 10;
this.gradeInterval = [];
- for(i=0;i<10;i++){
+ for(var i=0;i<10;i++){
this.gradeInterval.push(eachInterval*i+'-'+eachInterval*(i+1));
}
const option = {
From 0312ebd77c6c1dcd6b015fe50e455699a9cb8ae9 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 18 Apr 2022 18:43:39 +0800
Subject: [PATCH 13/98] =?UTF-8?q?=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
---
src/api/management/userexam.js | 5 +-
.../studentStatistics/gradeStatistic.vue | 75 ++++++++++---------
.../organization/studentStatistics/index.vue | 16 ++--
.../studentStatistics/studentGradeStatis.vue | 12 +--
4 files changed, 53 insertions(+), 55 deletions(-)
diff --git a/src/api/management/userexam.js b/src/api/management/userexam.js
index 7dec56fc6..a72980272 100644
--- a/src/api/management/userexam.js
+++ b/src/api/management/userexam.js
@@ -76,11 +76,10 @@ export function getClassGradeStatistic(orgId, examId) {
}
/** 查询组织学生单次考试成绩曲线 */
-export function getStuGradeStatistic(params) {
+export function getStuGradeStatistic(userId) {
return request({
- url: `/api/userExam/curve/personal`,
+ url: `/api/userExam/curve/${userId}`,
method: 'get',
- params
});
}
diff --git a/src/views/organization/studentStatistics/gradeStatistic.vue b/src/views/organization/studentStatistics/gradeStatistic.vue
index d1a8f5ea5..ea3a88c3c 100644
--- a/src/views/organization/studentStatistics/gradeStatistic.vue
+++ b/src/views/organization/studentStatistics/gradeStatistic.vue
@@ -7,21 +7,21 @@ import { getStuGradeStatistic } from '@/api/management/userexam';
export default {
name: 'GradeStatistics',
props:{
- creatorId:{
- type:String,
- require:true
- },
- orgId:{
- type:String,
- require:true
- },
+ // creatorId:{
+ // type:String,
+ // require:true
+ // },
+ // orgId:{
+ // type:String,
+ // require:true
+ // },
userId:{
- type:Number,
+ type:String,
require:true
},
},
watch:{
- 'orgId':function(){
+ 'userId':function(){
this.loadData()
}
},
@@ -50,18 +50,18 @@ export default {
},
axisLine:{show:true}
},
- {
- nameLocation:'end',
- nameTextStyle:{
- align:'left',
- fontSize:14
- },
- axisLine:{show:true},
- name: '时长',
- alignTicks: true,
- type: 'value',
- // inverse: true
- },
+ // {
+ // nameLocation:'end',
+ // nameTextStyle:{
+ // align:'left',
+ // fontSize:14
+ // },
+ // axisLine:{show:true},
+ // name: '时长',
+ // alignTicks: true,
+ // type: 'value',
+ // // inverse: true
+ // },
],
}
},
@@ -76,7 +76,7 @@ export default {
xAxis: {
type: 'category',
axisLabel:{
- show :false
+ show :true
},
data:[]
},
@@ -90,14 +90,14 @@ export default {
{
name: '分数',
data:[],
- type: 'line'
- },
- {
- name:'时长',
- yAxisIndex: 1,
- data:[],
- type: 'line'
+ type: 'bar'
},
+ // {
+ // name:'时长',
+ // yAxisIndex: 1,
+ // data:[],
+ // type: 'line'
+ // },
]
}
option && this.myChart2 && this.myChart2.setOption(option);
@@ -106,12 +106,13 @@ export default {
this.loadData();
},
loadData(){
- let data={creatorId:this.creatorId,orgId:this.orgId,userId:this.userId}
- debugger
- getStuGradeStatistic(data).then(res=>{
+ // creatorId:this.creatorId,orgId:this.orgId,
+ // let data={userId:this.userId}
+ // debugger
+ getStuGradeStatistic(this.userId).then(resp=>{
const results = resp.data;
if (results) {
- const gradeList = results.results;
+ const gradeList = results;
// const gradeList = [
// {
// "id": "92",
@@ -152,16 +153,16 @@ export default {
// ];
let gradeNumList=[];
let exameNameList=[];
- let durationList=[];
+ // let durationList=[];
gradeList.forEach(item=>{
gradeNumList.push(item.score);
exameNameList.push(item.examName);
- durationList.push(item.duration);
+ // durationList.push(item.duration);
})
let option=this.myChart2.getOption();
option.xAxis[0].data=exameNameList;
option.series[0].data=gradeNumList;
- option.series[1].data=durationList;
+ // option.series[1].data=durationList;
option && this.myChart2 && this.myChart2.setOption(option);
}
}).catch(error=>{
diff --git a/src/views/organization/studentStatistics/index.vue b/src/views/organization/studentStatistics/index.vue
index b6bc8dc5e..0fe65471e 100644
--- a/src/views/organization/studentStatistics/index.vue
+++ b/src/views/organization/studentStatistics/index.vue
@@ -8,7 +8,8 @@
-
@@ -29,8 +30,9 @@ export default {
data() {
return {
myChart3:null,
- creatorId:'',
- orgId:'',
+ // creatorId:'',
+ // orgId:'',
+ userId:'',
title:{
show:true,
text:'仿真时长统计',
@@ -46,12 +48,8 @@ export default {
async mounted() {
this.initChart()
this.loadData();
- this.orgId=this.$store.state.user.companyId;
- },
- computed:{
- userId(){
- return parseInt(this.$store.state.user.id);
- }
+ this.userId=this.$store.state.user.id;
+ // this.orgId=this.$store.state.user.companyId;
},
methods: {
initChart(){
diff --git a/src/views/organization/studentStatistics/studentGradeStatis.vue b/src/views/organization/studentStatistics/studentGradeStatis.vue
index 02fef7ae1..506b11543 100644
--- a/src/views/organization/studentStatistics/studentGradeStatis.vue
+++ b/src/views/organization/studentStatistics/studentGradeStatis.vue
@@ -9,7 +9,7 @@
:close-on-click-modal="false"
>
-
@@ -24,19 +24,19 @@ export default {
return {
studentName:'',
show:false,
- creatorId:'',
+ // creatorId:'',
userId:'',
- orgId:'',
+ // orgId:'',
}
},
methods: {
doShow(row){
this.show=true;
this.studentName=row.name;
- this.userId=row.userId;
- this.creatorId=this.$store.state.user.id;
+ // this.creatorId=this.$store.state.user.id;
this.$nextTick(()=>{
- this.orgId=row.companyId;
+ // this.orgId=row.companyId;
+ this.userId=row.userId;
})
// this.$refs.gradeStatic.doShow();
},
From 4b86b7ac03e818c1ea6741304efdcc94ffa1042c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 18 Apr 2022 18:54:21 +0800
Subject: [PATCH 14/98] =?UTF-8?q?=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
---
src/views/organization/studentStatistics/gradeStatistic.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/organization/studentStatistics/gradeStatistic.vue b/src/views/organization/studentStatistics/gradeStatistic.vue
index ea3a88c3c..8270f39c2 100644
--- a/src/views/organization/studentStatistics/gradeStatistic.vue
+++ b/src/views/organization/studentStatistics/gradeStatistic.vue
@@ -43,7 +43,7 @@ export default {
name:'分数',
type: 'value',
// nameLocation:'end',
- // minInterval:1,
+ minInterval:1,
nameTextStyle:{
align:'left',
fontSize:14
From 3b839937ac726d8001f9503c19095a585a9e89c6 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 19 Apr 2022 13:45:00 +0800
Subject: [PATCH 15/98] =?UTF-8?q?=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
---
.../classManage/studentManage/index.vue | 21 +++----
.../studentStatistics/examStatistic.vue | 37 ++++++++++--
.../studentStatistics/gradeStatistic.vue | 1 +
.../organization/studentStatistics/index.vue | 59 ++++++++++++++-----
4 files changed, 88 insertions(+), 30 deletions(-)
diff --git a/src/views/organization/classManage/studentManage/index.vue b/src/views/organization/classManage/studentManage/index.vue
index 2fafdd24e..337c2831d 100644
--- a/src/views/organization/classManage/studentManage/index.vue
+++ b/src/views/organization/classManage/studentManage/index.vue
@@ -11,7 +11,7 @@
style="width:80%;margin: 0 auto;"
/>
'+params.data.name+': '+temp+'
' + } + }, + color:['#358ff8','#91cb74','#f7c757','#ec6566','#73c0de','#4ca273','#ee8250','#9a60b4','#ea7ccc','#59eca9'], + legend: {orient: 'vertical',left: 'left',top:'65px'}, series: [ { data:[], label:{show:false}, radius: '60%', - top:'20px', + top:'60px', + showEmptyCircle:true, type: 'pie' } ] @@ -50,10 +70,19 @@ export default { let timeList=response.data; if(timeList){ let realList=[]; + let allcount=0; timeList.forEach(eachItem=>{ + allcount+=parseInt(eachItem.duration); realList.push({value:eachItem.duration,name:eachItem.statsProjectName}); }) let option=this.myChart1.getOption(); + let hour=0; + let minu=0; + let seconds=0; + hour=Math.floor(allcount/3600); + minu=Math.floor((allcount%3600)/60); + seconds=Math.floor((allcount%3600)%60); + option.title[0].subtext="总时长: "+hour+'时'+minu+"分"+seconds+'秒'; option.series[0].data=realList; option && this.myChart1 && this.myChart1.setOption(option); } diff --git a/src/views/organization/studentStatistics/gradeStatistic.vue b/src/views/organization/studentStatistics/gradeStatistic.vue index 8270f39c2..bd3dbe8a2 100644 --- a/src/views/organization/studentStatistics/gradeStatistic.vue +++ b/src/views/organization/studentStatistics/gradeStatistic.vue @@ -90,6 +90,7 @@ export default { { name: '分数', data:[], + barMaxWidth:'50px', type: 'bar' }, // { diff --git a/src/views/organization/studentStatistics/index.vue b/src/views/organization/studentStatistics/index.vue index 0fe65471e..0457934ee 100644 --- a/src/views/organization/studentStatistics/index.vue +++ b/src/views/organization/studentStatistics/index.vue @@ -7,24 +7,24 @@
+
-
+
+
+
+
diff --git a/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue
index 97e898c24..9994ad01c 100644
--- a/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue
@@ -227,7 +227,7 @@ export default {
},
getBtnCodeList(btnCodeList) {
const nameList = [];
- btnCodeList.forEach(item => {
+ btnCodeList && btnCodeList.forEach(item => {
nameList.push(this.formatName(item));
});
return nameList;
From c0bbf354558f71b997d8bdedd728af988859823c Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 19 Apr 2022 17:55:27 +0800
Subject: [PATCH 19/98] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF?=
=?UTF-8?q?=E8=B0=83=E6=95=B44?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/theme/datie_02/menus/index.vue | 2 +-
src/views/newMap/displayCity/lineBoard.vue | 78 ++++++++++++++--------
src/views/system/configLine/config.vue | 9 ++-
3 files changed, 56 insertions(+), 33 deletions(-)
diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue
index 219be537f..877011e54 100644
--- a/src/jmapNew/theme/datie_02/menus/index.vue
+++ b/src/jmapNew/theme/datie_02/menus/index.vue
@@ -115,7 +115,7 @@ export default {
const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
this.initDate(date);
}
- },// 1668
+ },// 138
mounted() {
this.$nextTick(() => {
this.$store.dispatch('config/updateMenuBar');
diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue
index 0cd4eae8d..eea45e0fa 100644
--- a/src/views/newMap/displayCity/lineBoard.vue
+++ b/src/views/newMap/displayCity/lineBoard.vue
@@ -2,12 +2,14 @@
-
+
+
-
-
+
客
列车未接近
-
+
{{ item.sectionName }}
-
-
- 修改申请
- 只读申请
- 查找列车
-
进路序列模式：/<可修改/>
-
+
+
+ 修改申请
+ 只读申请
+ 查找列车
+
+
+
+
- {{ '进路序列模式：<可修改>' }}
+ 上下行
- 接车口
- 发车口
-
- Px$x=BPqR9HvtlrK!fKp4f}EtG{|m`8xU5yA{85+>H+_#+^!2n^`Wf(E;3FbHl0
z1PsSIF%lG*5yH-bz=I)VjO<7oM#lcMy|!eCRyDcrd*AQg-8+Ilf27azAqAl6ybNH@
z2KtJrH12d`0YKnD;6UKO|8yXAeIFt317|&6GuxN2Tb~&ET+Yu9~{OMvWA}T9Ge?2+pm<8v;wmNm}?50P`q{)dC1v=sG}%3zm#7Ivp&Nl!PLg(fa
z%~TqbwZ2*J>JBuUjaVB0GO_d30k^wu?epY-9{^wUCZ{1tzO9!40000Px(u}MThR9HvNR$XjUWf*?m@3^uo;*BN(f?#0L8gq!@(P418D0U_fVJ2@w{{12AKffXf6J#A5hx
zsNrX?2lE6V97{C`VRtiAx0k|1+-uvSHyZMvb&GcepvMxgfaqGPL9`jn)lNL~t41jBP9+c(0fb|T9wK@p+ndIj#WRLhKU}GxZl*U7
z*`G3VT^0lHiG~6_<#Ngb2%Cw`1p3-(4jPDP{!RHJUBl_S>`Z0_D^(57duw`3_aUe&yGlr(Foh_J@>|X9dtO-L?YYTF|1Mr|EW+WKcUYt7*
zK-W;J&aycT!c}Jbp{RE6IhmxJNjZ@wH&*A~pEWdfjr<)pFRUUG--2N#Tm2vt?fjOG=;7AET_E-uCN^rdpVV4~-vLI1~{r;>~L
z8ZLuy#R#gmxdE62W05VaMg1*}zw74M4#3{`Z&m<^orc!1zhh|hPGKukAWRuS)$xz~
zGoOU<)F7B20j!XrHJY7+qw85wBrm{3J@()DQvMdV;BjIut8g-gEUP)v+IUhoM>Rl+
zf#@3}=x=o+VV3d4FGhoby;Aio%bGKKk5>_jqAZo_7>*})5!3qsW^P7>2_&8b)8_yV
z8=Bgcy@r+4uN<6NRn*O7AAqeOe#!_24py8%dpxmPVLA;W0Tvtc=A)aQR4`wAMh&Go
zf$Za8&M@qCd0{I%0Y|-ZE+`!^67*Wj>tefs;OG3obq-YOSTiCKbthy5v4j3G7TiinGV~W
zX86XW>gAj0W}y>eT{NVgx-J0ORiwI!_&_f448wl5c!$MB9rJdV39_th@+y|4
zs@s*)%?oP*@uA~{gsT7@W1CZ?&^hw4^UcQ@YGR95ksv?7o22te-B$!{FLpmq94HRz
z7#O)jRM+eQV+(-WT|oZPx%nMp)JR9HvtmQ85Wa2Up)q^lb%{cf#Hs-Pms1Z4+5P*50xh^V`Hka=mn*r;H2
zf-t2gEjXB&$k5Bgqo5weQ$dAN4{9A#baP!l*SN8^>+EMDZLQQbZIdRl%l@YXp1kjm
z=Xt~bC9uYaSmXX!2jF#pq9{86gUs=yX__8eU9%2=qNqUt6U~|vBnOUdD?KMo)Awp?
z^8q*j(7Jpcm#4qMV=}|rqsQ%m_wWY|c=~Q9`fvCU|Eh=o`3|urxoDccB?zFaSj3rV
z1Ru0Id{L`mKRSg^K?A(g7VJ9l1ItV|fmW(cqAIr#n=PBc%!fgMaM>K!o6kTMz-;Nku~TOyb1<<8KKkAu9t(*F
zI6iPr5hIZy?dn4Cu-nZ@wIEoC52Fab{}(GV`ja+q5wVEoXgie4(f
zlgT(Za5&#v`Rz&ov&jrEKp>Stx(KM03S8T*mj^&-4pqxn>m@tT8h}G2I19aTBd=64
zK*{pbIbzlRjiA~ooJeCalY>d!UDy1yRV7aZjfPMG7H<~|$g*5rbE~QY4-Zrvk?cU=
z&%kZfbd?L1-apTUq0?4|tkLN+cFF@#+aR0yg`e>#3?|_hkz@y|01HeE9Lqta*0i3>
z8iizlm){rQXOg(Or;_RG$O=ZMmdek%4P+h6QjW!TwGyNI%<@Dq;+;VtufUx?(?0;)
z)Jk3_W>R^101o$`M0z;|jZWHn*j5C+d-sDR6(|-9qVnbwGqJGn%jnSq_aHc~=~CJ@
z5eujN(oplIv{d}@nA^sJGq&A`=R=Y}+IDfM^;#}xQz5n5TJD7u7OGhX_zl4dg)la*
RZe0KX002ovPDHLkV1fnUQ4#Px$j!8s8R9Hvtmn}@gKorN{yGuY2LeK~lf)Nx5452e!kO<61!UP(JX0u2%VkES7
zl57Y@utSjzJ%J`cbN9$KyJlqVxc0WSVrSZ1-h20Z|977V88^&$e8>ktrQJUPfXg|n
zaqGE-CYD>h8X{f;KxfVX4iVL{((aS`@k={34N!g^tow(XU!y=#eKx>4@iBmM>thd*
zxsDf4u#lI4#fE<($590E?s#C
zTi;U$kOcQ!ipDeoo5m1~R~f>2pn$2wc`Cc`AY6BUq*
zIXc*%L#ova53D4EXS->P)Px$_(?=TR9HvtmCtJvK@`Wo-_4{cDA-F8?WOdphk_nznm`mvH$kCiK`2EL{{f-5
zT#KiA5-h}n(7T835(+J5+ENiuDk_Mew4f*3i#5C1S3;VaUz<+#upV}9yEE_2XTI~k
zZ-|HoBi!6wMD6}2%RjZd49ZE)pv
zuS7io(p7ubB1=aB-vK;=Q0sw}Z4+73)xtO-IS@qx=jt(o${Skc>RxAj7eM2#`4+$#
z0Pl3txoom&*qV%IZvae#C~4))od}Te@(TbSf;eCTS1NSg{|i7?rY}g%`UJsQ1ae!a
z+~wAMT?%CU{0j(fk$6&3&V$y)oz)%&)^ta6e$p?LC^AdRQboD-HtYSii?FO4fMiee7zt2jAX_@+
z7W*|a*0b&JW1tM4A5W9ByA#4%2od5s;
M07*qoM6N<$g7#1Upa1{>
literal 0
HcmV?d00001
diff --git a/src/assets/datie/picT3.png b/src/assets/datie/picT3.png
new file mode 100644
index 0000000000000000000000000000000000000000..377ee83e000379b208932b8adc287b2c71d1cd01
GIT binary patch
literal 464
zcmV;>0WbcEP)Px$ib+I4R9Hvt*Re|-K@bM;pMQXrRkRTa5fmhajhzw*5!6a8?3JLUSevv-nxqIM
zjg26v*jS5-pjFC9s*wL6MIeMU2^03gx!`+n-n}#8z%{$KGv9tQ-|TLWhOMXJ_--YD
zUd&*)Vs=gt-xbRlc#Lg~Rvf(LE&xmwedhqy@diuSsTjlyY+@06E#EnSV@y&@ZG_+O
z{}KV_pWOraFBn)s|1|~qITchNW|Mp`@DV?&TruPx&PDw;TR9HvtmP=?8Q51&%GpVgJ6&H#NMX(?WqM009CfQlf}Jc@!{*oAHsM8w=wo4H3OkD4Z#F=Lgwa8|?I
zd(QpNf6lpc2owC!1fLIAfUer;T4D+-P?j^e-U}>&q7w2s6L*D^_4k}?9RVV>@q@%T
z?d4FXy-YY1O6q6It(OJ3Gr512Pw_n*W59Ui35Kw$aK9z3)y>1f5+5Z1z0(G#j-A(PE{JG}CCusSa4PsLe@KCHkW4GX
zDgWqNMy%pUZed_bjV50ckevgVuS1~+MpE~5Aw|?^3!tJkEJe)I3
zGY}=l7zs-vA}nNJM(+D(1z59Q=r5fDaaKUyf<)vWJitpRhshCUfWw};b`$2kRR>;{Nd*fT+Xk}VvuT_k {
this.$store.dispatch('config/updateMenuBar');
diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index 8137af30a..08b016802 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -456,7 +456,7 @@ export default {
operate.over = true;
operate.cmdType = CMD.Signal.CMD_SIGNAL_SET_ROUTE;
operate.code = deviceList[deviceList.length - 1].code;
- operate.param = {routeId: route.code};
+ operate.param = {routeCode: route.code};
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
this.deviceTimeNode = 0;
}).catch(() => {
diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue
index eea45e0fa..b9919eb85 100644
--- a/src/views/newMap/displayCity/lineBoard.vue
+++ b/src/views/newMap/displayCity/lineBoard.vue
@@ -2,12 +2,12 @@
-
-
+
@@ -153,14 +156,25 @@
andDown: 'all',
unknow: '',
unknow1: '',
- tableData: [],
+ tableData: [{},{}],
unknowList1: [{label: '全部机车', value: 'all'}],
unknowList: [{label: 'J101-执行中', value: 'J101'}],
andDownList: [{ label: '全部', value: 'all' }, { label: '上行', value: 'up' }, { label: '下行', value: 'down' }],
sectionStatusList: [
{label: '办理发车进路', value: ''}
],
- infoList : [{ id: 1 }]
+ infoList : [
+ { id: 1 },
+ { id: 2 },
+ { id: 3 },
+ { id: 4 },
+ { id: 5 },
+ { id: 6 },
+ { id: 7 },
+ { id: 8 },
+ { id: 9 },
+ { id: 10 }
+ ]
}
},
computed: {
@@ -180,5 +194,11 @@
diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
index c6a2e40ec..8626f4597 100644
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@@ -115,7 +115,8 @@ export default {
'routeDefaultCheckConflict',
'tripNumberIsUnique',
'standTbStrategyIsInvalid',
- 'updateTripPlanByServiceNumber'
+ 'updateTripPlanByServiceNumber',
+ 'hasCTC'
],
selectList: ['runMode', 'singleApproachLockCancelRoute'],
generalConfig: [
@@ -164,7 +165,8 @@ export default {
'routeDefaultCheckConflict',
'tripNumberIsUnique',
'standTbStrategyIsInvalid',
- 'updateTripPlanByServiceNumber'
+ 'updateTripPlanByServiceNumber',
+ 'hasCTC'
],
rangeList: ['noParkingSM', 'parkingSM'],
speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@@ -219,7 +221,8 @@ export default {
routeDefaultCheckConflict: '进路默认开启冲突检测',
tripNumberIsUnique: '运行图中车次号是否唯一',
standTbStrategyIsInvalid: '站台折返策略不生效',
- updateTripPlanByServiceNumber: '根据服务号更新车次计划'
+ updateTripPlanByServiceNumber: '根据服务号更新车次计划',
+ hasCTC: '有CTC系统（大铁）'
}
};
},
From a7f24b860b4ebc88fe10823b17917c9800395f0c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 19 Apr 2022 19:18:31 +0800
Subject: [PATCH 20/98] =?UTF-8?q?=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
---
src/views/organization/examManage/gradeStatistics.vue | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/views/organization/examManage/gradeStatistics.vue b/src/views/organization/examManage/gradeStatistics.vue
index fb8f580dd..ea3dd6ce6 100644
--- a/src/views/organization/examManage/gradeStatistics.vue
+++ b/src/views/organization/examManage/gradeStatistics.vue
@@ -129,6 +129,10 @@ export default {
data: this.gradeInterval
},
yAxis:this.yAxis,
+ tooltip:{
+ show:true,
+ trigger:'axis'
+ },
series: [
{
data:[],
From a045d2c776a2e7c46ab54cb32db191eaaad49ddc Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 21 Apr 2022 10:02:13 +0800
Subject: [PATCH 21/98] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF?=
=?UTF-8?q?=E8=B0=83=E6=95=B45?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/assist.js | 32 +++
src/assets/datie/arrow.png | Bin 0 -> 512 bytes
src/assets/datie/camera.png | Bin 0 -> 1271 bytes
src/assets/datie/controlPanel.png | Bin 0 -> 735 bytes
src/assets/datie/controlPanel2.png | Bin 0 -> 468 bytes
src/assets/datie/link.png | Bin 0 -> 574 bytes
src/assets/datie/picT3.png | Bin 0 -> 464 bytes
src/assets/datie/train.png | Bin 0 -> 916 bytes
src/jmapNew/theme/datie_02/menus/index.vue | 2 +-
.../theme/datie_02/menus/menuButton.vue | 2 +-
src/views/newMap/displayCity/lineBoard.vue | 89 ++++--
.../newMap/newMapdraft/dataRelation/index.vue | 9 +-
.../indicatorAssociatedInfo/detail.vue | 267 ++++++++++++++++++
.../indicatorAssociatedInfo/index.vue | 97 +++++++
.../indicatorAssociatedInfo/route.vue | 267 ++++++++++++++++++
.../newMapdraft/mapoperate/controlLamp.vue | 7 +-
.../newMap/newMapdraft/mapoperate/models.js | 1 +
.../newMapdraft/mapoperate/signalButton.vue | 14 +-
18 files changed, 754 insertions(+), 33 deletions(-)
create mode 100644 src/api/assist.js
create mode 100644 src/assets/datie/arrow.png
create mode 100644 src/assets/datie/camera.png
create mode 100644 src/assets/datie/controlPanel.png
create mode 100644 src/assets/datie/controlPanel2.png
create mode 100644 src/assets/datie/link.png
create mode 100644 src/assets/datie/picT3.png
create mode 100644 src/assets/datie/train.png
create mode 100644 src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue
create mode 100644 src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue
create mode 100644 src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
diff --git a/src/api/assist.js b/src/api/assist.js
new file mode 100644
index 000000000..77d66e22b
--- /dev/null
+++ b/src/api/assist.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request';
+
+// 查询指示灯关联信息列表
+export function queryAssistListPaged(params, mapId) {
+ return request({
+ url: `/api/assist/indicator/section/list/${mapId}`,
+ method: 'get',
+ params
+ });
+}
+// 根据id查询单个指示灯关联信息
+export function queryAssistById(id){
+ return request({
+ url: `/api/assist/indicator/section/${id}`,
+ method: 'get'
+ })
+}
+// 保存指示灯关联信息
+export function saveAssist(data, mapId) {
+ return request({
+ url: `/api/assist/indicator/section/save${mapId}`,
+ method: 'post',
+ data
+ })
+}
+// 删除指示灯关联关系
+export function deleteAssist(id) {
+ return request({
+ url: `/api/assist/indicator/section/delete/${id}`,
+ method: 'delete'
+ })
+}
diff --git a/src/assets/datie/arrow.png b/src/assets/datie/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d5169ba7fa24e110f48714acad99a4250da83cd
GIT binary patch
literal 512
zcmV+b0{{JqP)
+
@@ -135,7 +138,7 @@
+
进路预览
-
+ 进路预览
+
- 办理进路
- 发送机车
+ 办理进路
+ 发送机车
调机-J101
-
-
+
+
@@ -44,16 +44,25 @@
-
{{item.trainCode}}
- 客
+ 客
列车未接近
{{ item.sectionName }}
+
修改申请
- 只读申请
- 查找列车
-
+ 修改申请
+ 只读申请
+ 查找列车
+
-
+
-
+
-
+
+
@@ -24,6 +25,7 @@ import TrainMoveNumber from './dialog/trainMoveNumber';
import TrainCreateNumber from './dialog/trainCreateNumber';
import TrainDeleteNumber from './dialog/trainDeleteNumber';
import TrainDetailInfo from './dialog/trainDetailInfo';
+import TrainSetPlan from './dialog/trainSetPlan';
import CancelMouseState from '@/mixin/CancelMouseState';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
@@ -41,7 +43,8 @@ export default {
TrainCreateNumber,
TrainDeleteNumber,
TrainDetailInfo,
- SetFault
+ SetFault,
+ TrainSetPlan
},
mixins: [
CancelMouseState
@@ -59,53 +62,58 @@ export default {
menu: [],
menuNormal: {
Local: [
- {
- label: '新建计划列车',
- handler: this.createPlanTrain,
- cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
- }
+ {
+ label: '设置计划车',
+ handler: this.setPlanTrain,
+ cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
+ },
],
Center: [
- {
- label: '新建车组号',
- handler: this.createTrainNo
- },
- {
- label: '移动车组号',
- handler: this.moveTrainNo
- },
- {
- label: '删除车组号',
- handler: this.deleteTrainNo
- },
- {
- label: '修改车组号',
- handler: this.editTrainNo
- },
- {
- label: '设计划车',
- handler: this.setPlanTrainId
- },
- {
- label: '设目的地',
- handler: this.destinationTrainId
- },
- {
- label: '设人工车',
- handler: this.artificialTrainId
- },
- {
- label: '设特殊人工车',
- handler: this.undeveloped
- },
- {
- label: '详细列车信息',
- handler: this.detailTrainInfo
- },
- {
- label: '属性',
- handler: this.undeveloped
- }
+ {
+ label: '设置计划车',
+ handler: this.setPlanTrain,
+ cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
+ }
+ // {
+ // label: '新建车组号',
+ // handler: this.createTrainNo
+ // },
+ // {
+ // label: '移动车组号',
+ // handler: this.moveTrainNo
+ // },
+ // {
+ // label: '删除车组号',
+ // handler: this.deleteTrainNo
+ // },
+ // {
+ // label: '修改车组号',
+ // handler: this.editTrainNo
+ // },
+ // {
+ // label: '设计划车',
+ // handler: this.setPlanTrainId
+ // },
+ // {
+ // label: '设目的地',
+ // handler: this.destinationTrainId
+ // },
+ // {
+ // label: '设人工车',
+ // handler: this.artificialTrainId
+ // },
+ // {
+ // label: '设特殊人工车',
+ // handler: this.undeveloped
+ // },
+ // {
+ // label: '详细列车信息',
+ // handler: this.detailTrainInfo
+ // },
+ // {
+ // label: '属性',
+ // handler: this.undeveloped
+ // }
]
},
menuForce: [
@@ -171,6 +179,7 @@ export default {
initMenu() {
// 编辑模式菜单列表
this.menu = MenuContextHandler.covert(this.menuNormal);
+ console.log(this.menu, '================');
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
if (!this.$store.state.scriptRecord.bgSet) {
@@ -287,6 +296,21 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
+ // 设置计划车
+ setPlanTrain() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ operation: OperationEvent.Train.editTrainId.menu.operation,
+ param: {}
+ };
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainSetPlan.doShow(operate, this.selected);
+ }
+ });
+ },
// 设计划车
setPlanTrainId() {
const operate = {
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index bcfe519ad..934094017 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -28,9 +28,9 @@ export function handlerUrl(data) {
// BASE_API = 'http://114.116.51.125/jlcloud';
// BASE_API = 'http://192.168.8.152:9000'; // 袁琪
// BASE_API = 'http://192.168.8.172:9200'; // 旭强
- // BASE_API = 'http://192.168.8.109:9000'; // 张赛
+ BASE_API = 'http://192.168.3.15:9000'; // 张赛
// BASE_API = 'http://192.168.8.140:9000'; // 杜康
- BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
+ // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
diff --git a/src/views/newMap/displayCity/demonMenu.vue b/src/views/newMap/displayCity/demonMenu.vue
index d14c473a8..a4066fd7f 100644
--- a/src/views/newMap/displayCity/demonMenu.vue
+++ b/src/views/newMap/displayCity/demonMenu.vue
@@ -8,7 +8,7 @@
经典案例分析
规范学习
- 占线板
+ 占线板
派班计划预览
实操练习
理论考试
+ 占线板
留言板
联系方式
@@ -39,6 +40,7 @@
+
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue b/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue
new file mode 100644
index 000000000..237cce621
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue
@@ -0,0 +1,302 @@
+
+
+
+
+
+ 集中站
+ 始端信号机
+
+
+
+
+
+
+
+
+ 进路列表
+
+ {{ expandTitle }}
+
+
+
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue
index da07c8f68..1bb2c6ba3 100644
--- a/src/jmapNew/theme/datie_02/menus/index.vue
+++ b/src/jmapNew/theme/datie_02/menus/index.vue
@@ -1,25 +1,25 @@
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+
+ {{ '进路序列模式：<可修改>' }}
- 上下行
- 上下行
+ 接车口
- 接车口
+ 发车口
- 发车口
+ {{ scope.$index }}
+
+
+
+
+
diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
new file mode 100644
index 000000000..e48dc4493
--- /dev/null
+++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
@@ -0,0 +1,267 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('map.activate') }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('map.activate') }}
+
+
+
+
+ {{ $t('map.activate') }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
index 26670103d..7a55a9660 100644
--- a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
@@ -166,7 +166,7 @@ export default {
{ prop: 'mfNum', label: '报警指示故障数量:', type: 'number', min: 0, isHidden: this.editModel.type !== 'FaultStatusGroup' },
{ prop: 'pfNum', label: '电源故障数量:', type: 'number', min: 0, isHidden: this.editModel.type !== 'FaultStatusGroup'},
{ prop: 'right', label: '朝右：', type: 'checkbox', isHidden: this.editModel.type !== 'PickOrDepartArrow' },
- { prop: 'direction', label: '方向：', type: 'select', optionLabel: 'label', optionValue: 'value', options: this.directionList, isHidden: !this.hasDirectionList.includes(this.editModel.type) },
+ { prop: 'labelEnum', label: '方向：', type: 'select', optionLabel: 'label', optionValue: 'value', options: this.directionList, isHidden: !this.hasDirectionList.includes(this.editModel.type) },
{ prop: 'switchCode', label: '所属道岔:', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.switchList, isHidden: this.editModel.type !== 'SwitchFault', hover: this.hover, buttonType: 'switchSelectCode', buttonShowType: this.isButtonType },
{ prop:'stationCode', label: '所属车站:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList}
]
@@ -191,7 +191,7 @@ export default {
] },
{ prop: 'mfNum', label: '报警指示故障数量:', type: 'number', min: 0, isHidden: this.addModel.type !== 'FaultStatusGroup' },
{ prop: 'pfNum', label: '电源故障数量:', type: 'number', min: 0, isHidden: this.addModel.type !== 'FaultStatusGroup'},
- { prop: 'direction', label: '方向：', type: 'select', optionLabel: 'label', optionValue: 'value', options: this.directionList, isHidden: !this.hasDirectionList.includes(this.addModel.type) },
+ { prop: 'labelEnum', label: '方向：', type: 'select', optionLabel: 'label', optionValue: 'value', options: this.directionList, isHidden: !this.hasDirectionList.includes(this.addModel.type) },
{ prop: 'switchCode', label: '所属道岔:', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.switchList, isHidden: this.addModel.type !== 'SwitchFault', hover: this.hover, buttonType: 'switchSelectCode', buttonShowType: this.isButtonType }
]
}
@@ -222,7 +222,7 @@ export default {
switchCode: [
{ required: true, message: '请选择所属道岔!', trigger: 'change'}
],
- direction: [
+ labelEnum: [
{ required: true, message: '请选择方向！', trigger: 'change'}
]
};
@@ -478,6 +478,7 @@ export default {
this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
},
deviceSelect(selected) {
+ console.log(selected, '======');
if (this.field.toUpperCase() === 'switchSelectCode'.toUpperCase() && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
if (this.activeName === 'first') {
this.editModel.switchCode = selected.code;
diff --git a/src/views/newMap/newMapdraft/mapoperate/models.js b/src/views/newMap/newMapdraft/mapoperate/models.js
index 484846ab5..66afe411e 100644
--- a/src/views/newMap/newMapdraft/mapoperate/models.js
+++ b/src/views/newMap/newMapdraft/mapoperate/models.js
@@ -201,6 +201,7 @@ class Model {
this.mfNum = 0;
this.pfNum = 0;
this.switchCode = '';
+ this.labelEnum = '';
this.right = false;
}
}
diff --git a/src/views/newMap/newMapdraft/mapoperate/signalButton.vue b/src/views/newMap/newMapdraft/mapoperate/signalButton.vue
index 04743c41d..83c565fb4 100644
--- a/src/views/newMap/newMapdraft/mapoperate/signalButton.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/signalButton.vue
@@ -56,7 +56,7 @@ export default {
signalCode: '',
sectionCode: '',
switchCode: '',
- direction: '',
+ labelEnum: '',
position: {
x: 0,
y: 0
@@ -120,7 +120,7 @@ export default {
'position.y': [
{ required: true, message: this.$t('rules.pleaseEnterYCoordinate'), trigger: 'blur' }
],
- direction: [
+ labelEnum: [
{ required: true, message: '请选择方向', trigger: 'change' }
]
}
@@ -156,7 +156,7 @@ export default {
{ prop: 'signalCode', label: '关联信号机:', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', clearable: true, options: this.signalList, hover: this.hover, buttonType: 'linkSignal', buttonShowType: this.isLinkSignalShow, isHidden: !this.isLinkSignal },
{ prop: 'sectionCode', label: '关联区段:', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', clearable: true, options: this.sectionList, hover: this.hover, buttonType: 'linkSection', buttonShowType: this.isLinkSectionShow, isHidden: !this.isLinkSection },
{ prop: 'switchCode', label: '关联道岔:', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', clearable: true, options: this.switchList, hover: this.hover, buttonType: 'linkSwitch', buttonShowType: this.isLinkSwitchShow, isHidden: !this.isLinkSwitch },
- { prop: 'direction', label: '方向:', type: 'select', optionLabel: 'label', optionValue: 'value', options: this.directionList, isHidden: !this.isLinkDirection },
+ { prop: 'labelEnum', label: '方向:', type: 'select', optionLabel: 'label', optionValue: 'value', options: this.directionList, isHidden: !this.isLinkDirection },
{ prop: 'position', label: this.$t('map.textPoints'), type: 'coordinate', width: '120px', children: [
{ prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px', disabled: false },
{ prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px', disabled: false }
@@ -242,7 +242,7 @@ export default {
this.editModel.signalCode = '';
this.editModel.switchCode = '';
this.editModel.sectionCode = '';
- this.editModel.direction = '';
+ this.editModel.labelEnum = '';
this.activeName = 'first';
this.editModel = deepAssign(this.editModel, selected);
} else if (this.field === 'linkSignal' && selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
@@ -288,11 +288,11 @@ export default {
},
updateMapModel(data) {
if (this.isLinkSignal) {
- data.sectionCode = ''; data.switchCode = ''; data.direction = '';
+ data.sectionCode = ''; data.switchCode = ''; data.labelEnum = '';
} else if (this.isLinkSection) {
- data.signalCode = ''; data.switchCode = ''; data.direction = '';
+ data.signalCode = ''; data.switchCode = ''; data.labelEnum = '';
} else if (this.isLinkSwitch) {
- data.signalCode = ''; data.sectionCode = ''; data.direction = '';
+ data.signalCode = ''; data.sectionCode = ''; data.labelEnum = '';
} else if (this.isLinkDirection) {
data.sectionCode = ''; data.signalCode = ''; data.switchCode = '';
}
From c5d60323e26315dbcaac6cda261173b566e7e58b Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 21 Apr 2022 15:10:43 +0800
Subject: [PATCH 22/98] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF?=
=?UTF-8?q?=E8=B0=83=E6=95=B46=20=E8=81=94=E9=94=81=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/assist.js | 2 +-
src/utils/baseUrl.js | 1 +
.../indicatorAssociatedInfo/detail.vue | 240 ++++++------------
.../indicatorAssociatedInfo/route.vue | 19 +-
.../newMap/newMapdraft/mapoperate/index.vue | 5 +-
5 files changed, 91 insertions(+), 176 deletions(-)
diff --git a/src/api/assist.js b/src/api/assist.js
index 77d66e22b..de8a71d94 100644
--- a/src/api/assist.js
+++ b/src/api/assist.js
@@ -18,7 +18,7 @@ export function queryAssistById(id){
// 保存指示灯关联信息
export function saveAssist(data, mapId) {
return request({
- url: `/api/assist/indicator/section/save${mapId}`,
+ url: `/api/assist/indicator/section/save/${mapId}`,
method: 'post',
data
})
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 6827def93..bcfe519ad 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -30,6 +30,7 @@ export function handlerUrl(data) {
// BASE_API = 'http://192.168.8.172:9200'; // 旭强
// BASE_API = 'http://192.168.8.109:9000'; // 张赛
// BASE_API = 'http://192.168.8.140:9000'; // 杜康
+ BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue
index 46e6d1544..461747234 100644
--- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue
@@ -11,7 +11,8 @@
+
diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
index 0aa2adfb2..178c95fd8 100644
--- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
@@ -9,6 +9,7 @@
+
+ 更新
+ 保存
+
+
+
-
+
{{ elem.message }}
-
-
+
+
-
+
-
{{ elem.message }}
+
@@ -95,7 +95,8 @@ export default {
{ id: 7, message: '这是预警信息七' },
],
time: '00:00:00',
- dateString: ''
+ dateString: '',
+ mode: 'liansuo'
}
},
computed: {
@@ -145,6 +146,9 @@ export default {
if (months.length < 2) { months = '0' + months; }
if (dates.length < 2) { dates = '0' + dates; }
this.dateString = years + months + dates;
+ },
+ selectedMode(mode) {
+ this.mode = mode;
}
}
};
@@ -460,6 +464,7 @@ export default {
height: 30px;
text-align: center;
line-height: 30px;
+ cursor: pointer;
}
.warning-window {
width: 400px;
diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index 36fac1920..f928193a5 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -116,7 +116,8 @@ export default {
{ label: '全线限速', value: 'LimitControl' },
{ label: '司机', value: 'Driver' },
{ label: '列车', value: 'Train' },
- { label: '方向杆', value: 'DirectionRod'}
+ { label: '方向杆', value: 'DirectionRod'},
+ { label: 'CTC', value: 'CTC' }
],
simulationDeviceList:[
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index b74bf9bd0..61f5114d9 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -366,5 +366,9 @@ export default {
},
DirectionRod: {
CMD_DIRECTION_CHANGE: {value: 'Direction_Change', label: '切换方向'}
- }
+ },
+ CTC: {
+ CTC_RECEIVING_NOTICE: {value: 'CTC_RECEIVING_NOTICE', label: '接预'},
+ CTC_DEPARTURE_NOTICE: {value: 'CTC_DEPARTURE_NOTICE', label: '发预'}
+ }
};
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index ca8281842..3e15e8cf4 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -3536,7 +3536,21 @@ export const OperationEvent = {
domId: '_Tips-Control-StationControl-Confirm{TOP}'
}
}
- }
+ },
+ CTCCommand: {
+ receivingNotice: {
+ menu: {
+ operation: '1100',
+ domId: '_Tips-CTC-ReceivingNotice-Menu{TOP}'
+ }
+ },
+ departureNotice: {
+ menu: {
+ operation: '1101',
+ domId: '_Tips-CTC-DepartureNotice-Menu{TOP}'
+ }
+ }
+ }
};
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index 9490c50b4..00e59053e 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -197,6 +197,10 @@ function handle(state, data) {
case 'Simulation_Trip_Plan_Change':
state.simulationPlanChange = msg;
break;
+ // 占线板信息
+ case 'Simulation_RailCtcStatus':
+ state.railCtcStatusMsg = msg;
+ break;
}
}
@@ -347,7 +351,8 @@ const socket = {
simulationPause: false,
simulationPslStatus: [], // PSL面板按钮状态信息
simulationPlanChange:{}, // 运行图加线/抽线/变化推送消息
- loggedOutMsg: ''
+ loggedOutMsg: '',
+ railCtcStatusMsg: {}, // 占线板信息
},
getters: {
},
diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue
index b9919eb85..483b891f1 100644
--- a/src/views/newMap/displayCity/lineBoard.vue
+++ b/src/views/newMap/displayCity/lineBoard.vue
@@ -4,25 +4,27 @@
:visible.sync="dialogVisible"
width="99%"
top="5vh"
+ class="lineBoard"
center
:before-close="handleClose">
提示信息窗
{{ '操控A:主机' + ' ' + dateString + ' ' + time }}
-
-
-
-
+
+ {{ jl3dmodel }}
- {{ jl3dname }}
+ {{ jl3dname }}
- {{ jl3dpassflow }}
+ {{ jl3dpassflow }}
@@ -23,7 +23,6 @@
派班计划预览
实操练习
理论考试
- 占线板
留言板
联系方式
@@ -40,7 +39,6 @@
-
-
-
- 集中站
- 始端信号机
-
-
-
-
-
-
-
-
- 进路列表
-
- {{ expandTitle }}
-
-
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
-
-
-
+
+
+ 列车车次
+ {{ selected.tripNumber }}
+
+
+ 进路描述
+
+
+
+
+ 进路显示
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -61,22 +76,19 @@ export default {
},
data() {
return {
- tempData: [],
beforeSectionList: [],
beforeSwitchList: [],
- showExpand: true,
dialogShow: false,
loading: false,
- selected: null,
- row: null,
+ selected: {},
operation: '',
display: true,
- stationName: '',
- signalName: '',
mapData: null,
+ route: '',
tableStyle: {
'border-bottom': 'none'
- }
+ },
+ type: ''
};
},
computed: {
@@ -96,58 +108,21 @@ export default {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
},
title() {
- return '进路设置';
- },
- expandTitle() {
- return this.showExpand ? '收起进路预览' : '展开进路预览';
- },
- commitDisabled() {
- let disabled = true;
- if (this.row) {
- disabled = !this.row.canSetting;
- }
- return disabled;
- }
- },
- watch: {
- '$store.state.map.keyboardEnterCount': function (val) {
- if (this.show && !this.commitDisabled) {
- this.commit();
- }
+ return '进路办理';
}
},
+ watch: {},
created() {
this.mapData = JSON.parse(JSON.stringify(this.$store.state.map.map));
},
methods: {
- expandPath() {
- this.showExpand = !this.showExpand;
- },
- doShow(operate, selected, tempData) {
- this.$root.$emit('dialogOpen', selected);
+ getRouteNames(data) {
+
+ },
+ doShow(selected, type) {
+ // this.$root.$emit('dialogOpen', selected);
this.selected = selected;
- // 如果不是断点激活，而是第一次显示，则需要设置初始值
- if (!this.dialogShow) {
- this.signalName = '';
- this.stationName = '';
- if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
- this.signalName = selected.name;
- const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
- if (station) {
- this.stationName = station.name;
- }
- }
- const routeList = JSON.parse(JSON.stringify(tempData || []));
-
- this.tempData = routeList;
- this.tempData.forEach(route => {
- if (route.turnBack) {
- route.name = `${route.name}(Z)`;
- }
- });
- this.operation = operate.operation;
- }
-
+ this.type = type;
this.dialogShow = true;
this.$nextTick(function () {
this.loadData();
@@ -159,15 +134,14 @@ export default {
this.beforeSectionList = [];
if (this.mapData) {
this.$refs.map.loadData(this.mapData);
+
}
},
doClose() {
this.loading = false;
this.dialogShow = false;
- this.row = null;
+ this.route = null;
this.restoreBeforeDevices();
- this.$root.$emit('dialogClose', this.selected);
- this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
mouseCancelState(this.selected);
},
@@ -194,26 +168,26 @@ export default {
this.beforeSectionList = [];
this.beforeSwitchList = [];
},
- clickEvent(row, event, column) {
- this.row = row;
- if (row) {
+ clickEvent(routeCode) {
+ const route = this.$store.state.map.routeData[routeCode];
+ this.route = route;
+ if (route) {
// 恢复进路区段的切除状态
- this.row.canSetting = true;
this.restoreBeforeDevices();
const containSectionList = [];
const containSwitchList = [];
- if (!row.setting) {
- const signalBegin = this.$refs.map.getDeviceByCode(row.startSignalCode);
- const signalEnd = this.$refs.map.getDeviceByCode(row.endSignalCode);
+ if (!route.setting) {
+ const signalBegin = this.$refs.map.getDeviceByCode(route.startSignalCode);
+ const signalEnd = this.$refs.map.getDeviceByCode(route.endSignalCode);
const diff = signalBegin.position.x - signalEnd.position.x;
- const code = diff > 0 ? row.endSignalCode : row.startSignalCode;
+ const code = diff > 0 ? route.endSignalCode : route.startSignalCode;
const signal = diff > 0 ? signalEnd : signalBegin;
const switchCodeList = [];
this.$refs.map.setCenterWithOffset(code, 50, signal.position.y);
- if (row.routeSectionList && row.routeSectionList.length) {
- row.routeSectionList.forEach(code => {
+ if (route.routeSectionList && route.routeSectionList.length) {
+ route.routeSectionList.forEach(code => {
const section = deepAssign({}, this.$refs.map.getDeviceByCode(code));
if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
section.logicSectionCodeList.forEach(sectionCode => {
@@ -229,8 +203,8 @@ export default {
});
}
- if (row.routeSwitchList && row.routeSwitchList.length) {
- row.routeSwitchList.filter(el => switchCodeList.includes(el.switchCode)).forEach(el => {
+ if (route.routeSwitchList && route.routeSwitchList.length) {
+ route.routeSwitchList.filter(el => switchCodeList.includes(el.switchCode)).forEach(el => {
const swch = deepAssign({}, this.$refs.map.getDeviceByCode(el.switchCode));
const sectionA = this.$refs.map.getDeviceByCode(swch.sectionACode);
const sectionB = this.$refs.map.getDeviceByCode(swch.sectionBCode);
@@ -254,7 +228,7 @@ export default {
// 设置选中指令
const operate = {
operation: OperationEvent.Signal.arrangementRoute.choose.operation,
- val: row.code
+ val: route.code
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
@@ -297,6 +271,15 @@ export default {
this.doClose();
});
}
- }
+ } //D3D8DC
};
+
diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index 08b016802..2720162b0 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -442,7 +442,7 @@ export default {
operate.over = true;
operate.cmdType = CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL;
operate.code = signal.code;
- operate.param = {signalId: signal.code};
+ operate.param = {signalCode: signal.code};
this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {
this.clearOperate();
}).catch(() => this.$refs.noticeInfo.doShow() );
@@ -474,7 +474,7 @@ export default {
operation: this.$store.state.menuOperation.buttonOperation,
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
param: {
- signalId: model._type === 'Signal' ? model.code : model.signalCode
+ signalCode: model._type === 'Signal' ? model.code : model.signalCode
}
};
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
@@ -492,7 +492,7 @@ export default {
code: model.code,
operation: this.Signal.guide.button.operation,
cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
- param: {signalId: model.signalCode}
+ param: {signalCode: model.signalCode}
};
const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode);
// 信号机引导时间15s以内再次点击引导不需要进行密码输入
@@ -514,10 +514,10 @@ export default {
};
const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code);
if (model._type === 'SignalButton' && model.type === 'PICK' && signal.routeLock) {
- operate.param = {signalId: model.signalCode};
+ operate.param = {signalCode: model.signalCode};
this.sendCommand(operate);
} else if (model._type === 'Signal' && model.type === 'SHUNTING' && signal.routeLock) {
- operate.param = {signalId: model.code};
+ operate.param = {signalCode: model.code};
this.sendCommand(operate);
}
},
@@ -527,7 +527,7 @@ export default {
code: model.code,
operation: this.$store.state.menuOperation.buttonOperation,
cmdType: this.cmdType,
- param: { id: model.code}
+ param: { switchCode: model.code}
};
this.sendCommand(operate);
},
@@ -563,18 +563,18 @@ export default {
if (model._type === 'Signal' && !this.checkHasTrainButton(model)) {
if (buttonOperation === this.Signal.lock.button.operation) {
operate.cmdType = CMD.Signal.CMD_SIGNAL_BLOCK;
- operate.param = {signalId: model.code};
+ operate.param = {signalCode: model.code};
} else if (buttonOperation === this.Signal.unlock.button.operation) {
operate.cmdType = CMD.Signal.CMD_SIGNAL_UNBLOCK;
- operate.param = {signalId: model.code};
+ operate.param = {signalCode: model.code};
}
} else if (model._type === 'SignalButton' && model.type === 'PICK') {
if (buttonOperation === this.Signal.lock.button.operation) {
operate.cmdType = CMD.Signal.CMD_SIGNAL_BLOCK;
- operate.param = {signalId: model.signalCode};
+ operate.param = {signalCode: model.signalCode};
} else if (buttonOperation === this.Signal.unlock.button.operation) {
operate.cmdType = CMD.Signal.CMD_SIGNAL_UNBLOCK;
- operate.param = {signalId: model.signalCode};
+ operate.param = {signalCode: model.signalCode};
}
}
this.sendCommand(operate);
@@ -587,7 +587,7 @@ export default {
code: model.code,
operation: this.guideLockRightFlag ? this.Switch.guideLock.rightButton : this.Switch.guideLock.leftButton,
nextCmdType: CMD.Switch.CMD_SWITCH_MASTER_LOCK,
- param: {signalId: model.signalCode}
+ param: {signalCode: model.signalCode}
};
this.$refs.password.doShow(operate);
}
@@ -599,7 +599,7 @@ export default {
code: model.code,
operation: this.$store.state.menuOperation.buttonOperation,
cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK,
- param: {id: model.code}
+ param: {sectionCode: model.code}
};
this.sendCommand(operate);
}
diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
index 178c95fd8..f2aaa44b1 100644
--- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
@@ -131,6 +131,31 @@ export default {
}
],
menuDirective: [
+ {
+ label: '切换驾驶模式',
+ children: [
+ {
+ label: '转AM-C模式',
+ handler: this.handlerApplyAmcMode
+ },
+ {
+ label: '转SM-C模式',
+ handler: this.handlerApplySmcMode
+ },
+ {
+ label: '转AM-I模式',
+ handler: this.handlerApplyAmiMode
+ },
+ {
+ label: '转SM-I模式',
+ handler: this.handlerApplySmiMode
+ },
+ {
+ label: '转RM模式',
+ handler: this.handlerApplyRmMode
+ }
+ ]
+ },
{
label: '确认运行至前方站',
handler: this.nextStation
@@ -146,7 +171,11 @@ export default {
{
label: '越红灯行驶',
handler: this.handleOverEedLight
- }
+ },
+ {
+ label: '驾驶至',
+ handler: this.handleDriveTo
+ },
],
menuSpeed: [
{
@@ -439,6 +468,79 @@ export default {
}
});
},
+ handlerApplyAmcMode() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Change_Preselection_Mode',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: { preselectionMode: 'AM_C' }
+ };
+ commitTrainSend(group, param).then(({ valid, operate }) => {
+ }).catch((error) => {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
+ handlerApplySmcMode() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Change_Preselection_Mode',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: { preselectionMode: 'SM_C' }
+ };
+ commitTrainSend(group, param).then(({ valid, operate }) => {
+ }).catch((error) => {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
+ handlerApplyAmiMode() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Change_Preselection_Mode',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: { preselectionMode: 'AM_I' }
+ };
+ commitTrainSend(group, param).then(({ valid, operate }) => {
+ }).catch((error) => {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
+ handlerApplySmiMode() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Change_Preselection_Mode',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: { preselectionMode: 'SM_I' }
+ };
+ commitTrainSend(group, param).then(({ valid, operate }) => {
+ }).catch((error) => {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
+ handlerApplyRmMode() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Change_Preselection_Mode',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: { preselectionMode: 'RM' }
+ };
+ commitTrainSend(group, param).then(({ valid, operate }) => {
+ }).catch((error) => {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
+ // 驾驶至（托管）
+ handleDriveTo() {
+ commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
+ if (valid) {
+ this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
+ }
+ });
+ },
undeveloped() {
this.doClose();
this.$alert('实现中......', '提示', {
diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue
index 483b891f1..7efeba984 100644
--- a/src/views/newMap/displayCity/lineBoard.vue
+++ b/src/views/newMap/displayCity/lineBoard.vue
@@ -35,7 +35,12 @@
+
+
+ {{ item.name }}
- {{item.trainCode}}
- 客
- 列车未接近
+
+
- {{item.trackName}}
+ {{item.tripNumber}}
+ {{ item.trainType?'客':'' }}
+ {{item.trainDistanceInfo}}
-
+
-
-
始发
- 15:00
+
+
+
+
-
+ 图定始发
- 15:00
+ {{item.arriveTime}}
+ {{item.departureTime}}
+
+
{{ item.planArriveTime }}
+ {{ item.planDepartureTime }}
起点-->终点
- {{ item.trainCode2 }}
- {{ item.sectionName }}
+
+
+
+
+
+ {{ item.tripNumber }}
+ {{ item.trackName }}
- ![]()
- ![]()
- ![]()
- ![]()
- ![]()
- ![]()
- ![]()
-
+
+
+
+
+
+
+
+
+
- 修改申请
只读申请
查找列车
@@ -99,20 +111,35 @@
>
-
+
+
+
{{ '进路序列模式：<可修改>' }}
+ {{ `进路序列模式：<${readOnly ? '只读':'可修改'}>` }}
{{ scope.$index }}
+
+ {{ scope.$index }}
{{getRouteName(scope.row.routeCode)}}
+
+
+
+ {{ item.name }}
+
+
@@ -138,7 +165,7 @@
发送机车
+ {{ `${type === 'dep' ? '发车/通过': '接车/通过'}； 股道：${selected.trackName}；进路按钮：${getRouteNames(selected)}` }}
+
+
-
+
@@ -49,7 +54,12 @@
修改申请
- 只读申请
+ 修改申请
+ 只读申请
查找列车
+
+
起点-->终点
-
+
{{ item.tripNumber }}
@@ -69,8 +79,8 @@
{{ `进路序列模式：<${readOnly ? '只读':'可修改'}>` }}
- 上下行
@@ -83,7 +93,7 @@
/>
接车口
- 发车口
-
-
+
进路预览
-
+ 进路预览
+
- 办理进路
- 发送机车
+ 办理进路
+ 发送机车
调机-J101
-
-
-
-
+
+ 确定
+
+
+ 退出
+
+
+
-
+
+ {{ temp.name }}
-
-
+
+
-
-
- 确定
-
-
- 退出
-
-
-
-
+
+
- {{ temp.name }}
+
+