joylink_zhaoerwei
|
332577b03a
|
Squashed commit of the following:
commit cef55a4c6b
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon May 27 17:09:01 2024 +0800
三维url调整
commit 869c86b94d
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon May 27 16:57:01 2024 +0800
更改三维地址
commit dc2165733e
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon May 27 16:33:48 2024 +0800
场景添加三维场景，实训中可根据url打开三维场景（待测试）
commit 0c5bba7c0f
Author: joylink_fanyuhong <18706759286@163.com>
Date: Tue May 21 16:47:37 2024 +0800
传输信号机调整
commit ef9165faa4
Author: joylink_fanyuhong <18706759286@163.com>
Date: Thu May 16 15:43:56 2024 +0800
third
commit ae74123f18
Author: joylink_fanyuhong <18706759286@163.com>
Date: Wed May 8 09:17:37 2024 +0800
成都工学院第三方登录调整
commit b1baeaabcd
Author: joylink_fanyuhong <18706759286@163.com>
Date: Tue May 7 15:46:29 2024 +0800
成都工业学院第三方登录调整
commit 91a8410dc2
Author: joylink_fanyuhong <18706759286@163.com>
Date: Wed Apr 24 10:58:02 2024 +0800
道岔名称背景颜色更换透明色
commit c97def5fca
Author: joylink_fanyuhong <18706759286@163.com>
Date: Mon Apr 22 17:15:20 2024 +0800
没有综合演练不显示联机
commit 31376bc221
Author: joylink_fanyuhong <18706759286@163.com>
Date: Mon Apr 22 16:09:03 2024 +0800
道岔钩锁调整
commit 5be2cea1ca
Author: joylink_fanyuhong <18706759286@163.com>
Date: Mon Apr 22 15:52:58 2024 +0800
列车pis和站台pis调整
commit dda44c870f
Author: joylink_fanyuhong <18706759286@163.com>
Date: Mon Apr 22 09:31:41 2024 +0800
pa客户端车站选择禁用
commit 5548806ea5
Author: joylink_fanyuhong <18706759286@163.com>
Date: Sun Apr 21 17:49:03 2024 +0800
pa客户端调整&标准线未开放调整
commit 3fc31777a2
Author: fan <fanyuhong@joylink.club>
Date: Fri Apr 19 22:25:43 2024 +0800
iscs退出仿真调整&iscs绘制地图调整
commit d5eb68ea1c
Author: fan <fanyuhong@joylink.club>
Date: Fri Apr 19 18:25:09 2024 +0800
实时广播问题调整&注释iscs信号系统&stationNav换成车站名称&iscs点击修改mode
commit bd10b05228
Author: fan <fanyuhong@joylink.club>
Date: Wed Apr 17 17:08:47 2024 +0800
iscs调整
commit 2b13ff0a5a
Author: joylink_fanyuhong <18706759286@163.com>
Date: Thu Apr 11 19:19:19 2024 +0800
提示调整
commit 5212b6417a
Author: joylink_fanyuhong <18706759286@163.com>
Date: Thu Apr 11 19:04:50 2024 +0800
推出考试销毁提交事件
commit 5666af96cc
Author: joylink_fanyuhong <18706759286@163.com>
Date: Thu Apr 11 18:17:14 2024 +0800
createId为空删除参数
commit 6b3d83979d
Author: fan <fanyuhong@joylink.club>
Date: Thu Apr 11 11:45:51 2024 +0800
接口调整
commit a21e880a18
Author: fan <fanyuhong@joylink.club>
Date: Thu Apr 11 11:20:28 2024 +0800
考试调整
commit 27129e8b21
Author: fan <fanyuhong@joylink.club>
Date: Thu Apr 11 11:10:03 2024 +0800
试卷调整
commit 6c3b06c4a0
Author: fan <fanyuhong@joylink.club>
Date: Wed Apr 10 14:33:10 2024 +0800
考试管理调整
commit d1f8927355
Author: joylink_fanyuhong <18706759286@163.com>
Date: Mon Apr 8 16:39:33 2024 +0800
南京二信号机故障调整again
commit f1e6121a8f
Author: joylink_fanyuhong <18706759286@163.com>
Date: Mon Apr 8 16:05:24 2024 +0800
南京二信号机故障调整&南京二进路排列方式调整
commit 8f14259db7
Author: joylink_fanyuhong <18706759286@163.com>
Date: Fri Mar 29 11:14:08 2024 +0800
客户端调整
commit 2c79bd847f
Author: joylink_fanyuhong <18706759286@163.com>
Date: Wed Mar 27 13:38:05 2024 +0800
subTypeParam参数调整
commit db8f007ca8
Author: soul-walker <walkersxq@163.com>
Date: Tue Mar 26 19:44:28 2024 +0800
修改任务及步骤名称
commit 8d4e0d2a89
Author: soul-walker <walkersxq@163.com>
Date: Tue Mar 26 17:57:39 2024 +0800
修改yaml格式错误（tab换成空格）
commit abdce5a30d
Author: soul-walker <walkersxq@163.com>
Date: Tue Mar 26 17:31:03 2024 +0800
修改工作流文件名
添加公网构建发布工作流
commit 86aaa5d5b1
Author: soul-walker <walkersxq@163.com>
Date: Tue Mar 26 17:13:36 2024 +0800
测试yarn build
local-test分支构建发布工作流
commit 06aef16a5d
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Mar 21 17:28:59 2024 +0800
Squashed commit of the following:
commit 6e6737a7c6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Mar 21 16:57:58 2024 +0800
播放视频调整
commit 506fcd481b
Merge: fdaf9d81f 7971fce1b
Author: joylink_fanyuhong <18706759286@163.com>
Date: Tue Mar 12 11:16:44 2024 +0800
Merge remote-tracking branch 'origin/test'
commit fdaf9d81f8
Merge: 29d5474e4 720546f99
Author: joylink_fanyuhong <18706759286@163.com>
Date: Tue Mar 12 10:34:45 2024 +0800
Merge remote-tracking branch 'origin/test'
commit 29d5474e40
Merge: 47c5168e4 8a15cd0d1
Author: joylink_fanyuhong <18706759286@163.com>
Date: Tue Mar 12 10:33:51 2024 +0800
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client
commit 8a15cd0d1c
Merge: aeb581dce bb8678e48
Author: fan <fanyuhong@joylink.club>
Date: Fri Mar 8 19:05:37 2024 +0800
Merge remote-tracking branch 'origin/test'
commit aeb581dced
Merge: 5ea69acaf ee36444dc
Author: fan <fanyuhong@joylink.club>
Date: Fri Mar 8 15:46:16 2024 +0800
Merge remote-tracking branch 'origin/test'
commit 5ea69acaf8
Merge: 6dbe1dc14 b2989b0eb
Author: fan <fanyuhong@joylink.club>
Date: Fri Mar 8 11:29:24 2024 +0800
Merge remote-tracking branch 'origin/test'
commit 6dbe1dc14c
Merge: 7b07b17e1 a1ed6248b
Author: fan <fanyuhong@joylink.club>
Date: Fri Mar 8 09:33:28 2024 +0800
Merge remote-tracking branch 'origin/test'
commit 7b07b17e13
Merge: bb453012c c7a622ead
Author: fan <fanyuhong@joylink.club>
Date: Fri Mar 8 09:33:09 2024 +0800
Merge remote-tracking branch 'origin/test'
commit bb453012c8
Merge: cf94b2570 e5c38220a
Author: fan <fanyuhong@joylink.club>
Date: Wed Mar 6 09:41:39 2024 +0800
Merge remote-tracking branch 'origin/test'
commit cf94b2570d
Merge: 2ae715a93 ce1be2d1c
Author: fan <fanyuhong@joylink.club>
Date: Tue Mar 5 15:04:26 2024 +0800
Merge remote-tracking branch 'origin/test'
commit 2ae715a936
Merge: 3e5996aee 7de898980
Author: fan <fanyuhong@joylink.club>
Date: Tue Mar 5 13:53:17 2024 +0800
Merge remote-tracking branch 'origin/test'
commit 3e5996aee4
Merge: 8cf496c2a bdec36100
Author: fan <fanyuhong@joylink.club>
Date: Tue Mar 5 13:52:28 2024 +0800
Merge remote-tracking branch 'origin/test'
commit 8cf496c2ae
Merge: 31f1192de 0444ef9c4
Author: fan <fanyuhong@joylink.club>
Date: Mon Mar 4 17:05:56 2024 +0800
Merge remote-tracking branch 'origin/test'
commit 31f1192de0
Merge: 13aefab82 c60127798
Author: fan <fanyuhong@joylink.club>
Date: Mon Mar 4 09:20:30 2024 +0800
Merge remote-tracking branch 'origin/test'
commit 13aefab82b
Merge: 4804cebfc 32866bab9
Author: fan <fanyuhong@joylink.club>
Date: Thu Feb 29 10:42:02 2024 +0800
Merge remote-tracking branch 'origin/test'
commit 47c5168e4b
Merge: 4804cebfc 5564e354b
Author: joylink_fanyuhong <18706759286@163.com>
Date: Mon Feb 19 13:28:54 2024 +0800
Merge remote-tracking branch 'origin/test'
commit 4804cebfcd
Merge: 1ecab822f d8219cc2e
Author: fan <fanyuhong@joylink.club>
Date: Tue Jan 16 09:36:39 2024 +0800
Merge remote-tracking branch 'origin/test'
commit 1ecab822f4
Author: fan <fanyuhong@joylink.club>
Date: Tue Dec 5 10:34:14 2023 +0800
浙大网新操作调整
commit a9f18f6d61
Merge: c33c50005 3cb71dce3
Author: fan <fanyuhong@joylink.club>
Date: Mon Dec 4 17:55:44 2023 +0800
Merge remote-tracking branch 'origin/test'
commit c33c50005c
Merge: 56eea551f ef230ae27
Author: fan <fanyuhong@joylink.club>
Date: Thu Nov 30 17:54:51 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 56eea551fb
Merge: 007548623 19fde5c7f
Author: fan <fanyuhong@joylink.club>
Date: Thu Nov 16 15:08:19 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 007548623d
Author: fan <fanyuhong@joylink.club>
Date: Thu Nov 2 17:02:16 2023 +0800
Revert "乘客信息发布系统拆分"
This reverts commit 4c67af284c.
commit 4c67af284c
Author: fan <fanyuhong@joylink.club>
Date: Thu Nov 2 16:59:37 2023 +0800
乘客信息发布系统拆分
commit 684f32c481
Merge: 2ef158851 597d4ea7d
Author: fan <fanyuhong@joylink.club>
Date: Tue Oct 31 17:51:57 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 2ef158851d
Merge: f9c47cbac e795ba157
Author: fan <fanyuhong@joylink.club>
Date: Wed Oct 25 14:05:58 2023 +0800
Merge remote-tracking branch 'origin/test'
commit f9c47cbac6
Merge: 8fbddfe40 efbd29a70
Author: fan <fanyuhong@joylink.club>
Date: Wed Oct 25 10:36:11 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 8fbddfe40d
Merge: 910082305 ca183eed7
Author: fan <fanyuhong@joylink.club>
Date: Mon Oct 23 16:42:09 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 910082305d
Merge: 0598da9a2 16d9ee72b
Author: joylink_zhangsai <1021828630@qq.com>
Date: Wed Sep 27 18:11:19 2023 +0800
Merge branch 'test'
# Conflicts:
# src/views/newMap/display/terminals/index.vue
commit 0598da9a2d
Author: fan <fanyuhong@joylink.club>
Date: Wed Sep 27 15:46:10 2023 +0800
实训问题修复
commit ac096dd663
Merge: ee58c53b8 fbdb48dc0
Author: fan <fanyuhong@joylink.club>
Date: Wed Sep 20 14:51:28 2023 +0800
Merge remote-tracking branch 'origin/test'
commit ee58c53b83
Merge: 8e34a0f26 0600abc0c
Author: fan <fanyuhong@joylink.club>
Date: Mon Jun 12 10:13:52 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 8e34a0f267
Merge: 6b18628b7 a8e2c9ef3
Author: fan <fanyuhong@joylink.club>
Date: Thu Jun 8 13:27:05 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 6b18628b7c
Merge: 42779dc95 d232546e8
Author: fan <fanyuhong@joylink.club>
Date: Wed Jun 7 18:01:28 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 42779dc952
Merge: 3855087ab 9aab60fe9
Author: fan <fanyuhong@joylink.club>
Date: Tue Jun 6 10:09:00 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 3855087abd
Merge: ca329a4db 928b38081
Author: fan <fanyuhong@joylink.club>
Date: Thu Jun 1 18:15:18 2023 +0800
Merge remote-tracking branch 'origin/test'
commit ca329a4db7
Merge: e32d8f9b6 b863211cc
Author: fan <fanyuhong@joylink.club>
Date: Tue May 30 17:55:25 2023 +0800
Merge remote-tracking branch 'origin/test'
commit e32d8f9b6b
Merge: 23975cd27 7ebc8dbf1
Author: fan <fanyuhong@joylink.club>
Date: Fri May 26 17:59:19 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 23975cd271
Merge: f4e27a6e3 adf75ebc1
Author: fan <fanyuhong@joylink.club>
Date: Fri May 26 17:43:20 2023 +0800
Merge remote-tracking branch 'origin/test'
commit f4e27a6e31
Merge: 4424137da 3d63abcdb
Author: fan <fanyuhong@joylink.club>
Date: Fri May 26 17:18:59 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 4424137da9
Merge: ac82fad04 18b578041
Author: fan <fanyuhong@joylink.club>
Date: Fri May 26 15:56:44 2023 +0800
Merge remote-tracking branch 'origin/test'
commit ac82fad041
Merge: fd5af534a edcdd8989
Author: fan <fanyuhong@joylink.club>
Date: Fri May 26 15:34:23 2023 +0800
Merge remote-tracking branch 'origin/test'
commit fd5af534af
Merge: 06e4bb93c 9426ece04
Author: joylink_zhangsai <1021828630@qq.com>
Date: Wed May 24 19:19:48 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 06e4bb93c7
Author: fan <fanyuhong@joylink.club>
Date: Mon May 22 11:18:37 2023 +0800
Revert "Revert "修改新会话实训问题""
This reverts commit 7fa5b1d62e.
commit 8a966ac5ae
Author: fan <fanyuhong@joylink.club>
Date: Mon May 22 11:18:16 2023 +0800
Revert "Revert "群消息已读""
This reverts commit 204aef15
commit 5eb2a3f80c
Author: fan <fanyuhong@joylink.club>
Date: Mon May 22 11:18:02 2023 +0800
Revert "Revert "NCC行调名称调整成NCC调度""
This reverts commit a7b0609389.
commit e1bf3dbcea
Author: fan <fanyuhong@joylink.club>
Date: Mon May 22 11:16:59 2023 +0800
Revert "Revert "添加角色NCC行调""
This reverts commit 5c72107b
commit 67ea7ef5ae
Author: fan <fanyuhong@joylink.club>
Date: Mon May 22 11:16:27 2023 +0800
Revert "Revert "Squashed commit of the following:""
This reverts commit b6edc491
commit 3fc6f13c6a
Merge: ce62a19aa bc6ad0226
Author: fan <fanyuhong@joylink.club>
Date: Sat May 20 18:13:52 2023 +0800
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/store/modules/map.js
# src/views/newMap/display/index.vue
# src/views/newMap/display/newChat/chatContent.vue
# src/views/newMap/display/newChat/chatDialog.vue
# src/views/newMap/display/newChat/editGroup.vue
# src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
# src/views/organization/index.vue
# src/views/publish/examRule/draft/editRule.vue
commit ce62a19aa0
Author: dongq107 <58670809@qq.com>
Date: Thu May 18 15:12:31 2023 +0800
到第三方登录页面时先删除之前的token
commit d09e415720
Author: dongq107 <58670809@qq.com>
Date: Thu May 18 14:12:51 2023 +0800
第三方登录必需调接口
commit 503c4c4ed3
Author: fan <fanyuhong@joylink.club>
Date: Thu May 11 15:21:46 2023 +0800
扬工院教学管理隐藏班级管理
commit fff07141b6
Author: joylink_zhangsai <1021828630@qq.com>
Date: Sat May 6 19:00:17 2023 +0800
修改错误的冲突合并
commit 80178a80f6
Merge: 1d824c135 e35328959
Author: joylink_zhangsai <1021828630@qq.com>
Date: Sat May 6 18:37:26 2023 +0800
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/jmapNew/painter.js
commit 1d824c135e
Merge: 8e7b653bd 1318ecb97
Author: joylink_zhangsai <1021828630@qq.com>
Date: Sat May 6 18:35:52 2023 +0800
Merge remote-tracking branch 'origin/test_revert5.6'
commit 1318ecb97a
Merge: e3857a75d f3ae97f7f
Author: Yuan <yuanliyedefy@gmail.com>
Date: Sat May 6 18:03:37 2023 +0800
Merge branch 'test_revert5.6' of git.code.tencent.com:lian-cbtc/jl-client into test_revert5.6
commit e3857a75d0
Author: Yuan <yuanliyedefy@gmail.com>
Date: Sat May 6 18:03:32 2023 +0800
bugfix - 试卷规则标签选项
commit f3ae97f7f8
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Sat May 6 17:26:09 2023 +0800
故障提示NCC
commit b472601fbc
Author: Yuan <yuanliyedefy@gmail.com>
Date: Sat May 6 16:22:15 2023 +0800
bugfix - 查看规则时标签字段未填充
(cherry picked from commit 2e51c9ee4c)
commit d0a6b8e951
Author: dong <58670809@qq.com>
Date: Sat May 6 16:17:38 2023 +0800
切换考试时实训模式弹窗关闭
commit dd45877e1c
Author: dong <58670809@qq.com>
Date: Sat May 6 16:01:16 2023 +0800
实训标签只可添加，不能删除
commit b6edc4913b
Author: fan <fanyuhong@joylink.club>
Date: Sat May 6 10:54:30 2023 +0800
Revert "Squashed commit of the following:"
This reverts commit 77560336
commit 5c72107b90
Author: fan <fanyuhong@joylink.club>
Date: Sat May 6 10:53:25 2023 +0800
Revert "添加角色NCC行调"
This reverts commit 6d848115b3.
commit c4028ee8c6
Author: fan <fanyuhong@joylink.club>
Date: Sat May 6 10:53:15 2023 +0800
Revert "会话群代码调整"
This reverts commit 79fbb8d071.
commit a7b0609389
Author: fan <fanyuhong@joylink.club>
Date: Sat May 6 10:53:02 2023 +0800
Revert "NCC行调名称调整成NCC调度"
This reverts commit fcae8539d9.
commit 204aef1583
Author: fan <fanyuhong@joylink.club>
Date: Sat May 6 10:52:15 2023 +0800
Revert "群消息已读"
This reverts commit 0805383f
commit c563fe8efa
Author: fan <fanyuhong@joylink.club>
Date: Sat May 6 10:49:24 2023 +0800
Revert "会话群代码调整"
This reverts commit 2d15eee9f8.
commit 1b1ddad29e
Author: fan <fanyuhong@joylink.club>
Date: Sat May 6 10:49:05 2023 +0800
Revert "修改语音最长秒数"
This reverts commit 20de76047b.
commit 7fa5b1d62e
Author: fan <fanyuhong@joylink.club>
Date: Sat May 6 10:48:54 2023 +0800
Revert "修改新会话实训问题"
This reverts commit eb4cd6ab4a.
commit e353289594
Author: fan <fanyuhong@joylink.club>
Date: Fri May 5 09:32:34 2023 +0800
第三方登录增加组织选择
commit 210a7d0fdd
Author: fan <fanyuhong@joylink.club>
Date: Thu Apr 27 13:21:50 2023 +0800
第三方登录页项目配置调整
commit a373d21deb
Author: fan <fanyuhong@joylink.club>
Date: Thu Apr 27 09:23:21 2023 +0800
线路数据设置归属项目管理项目数据通过接口查询
commit f2039927db
Author: dong <58670809@qq.com>
Date: Wed Apr 19 10:42:38 2023 +0800
Squashed commit of the following:
commit d082dc2fbc
Author: dong <58670809@qq.com>
Date: Wed Apr 19 10:41:17 2023 +0800
修改收令单位不显示调度命令问题
commit c52925960c
Merge: a3bc0de08 1f5d891c5
Author: joylink_zhangsai <1021828630@qq.com>
Date: Tue Apr 18 16:25:03 2023 +0800
Merge remote-tracking branch 'origin/test' into test
commit a3bc0de08a
Author: joylink_zhangsai <1021828630@qq.com>
Date: Tue Apr 18 16:24:34 2023 +0800
处理列车异常显示问题 by fan
commit 1f5d891c55
Author: dong <58670809@qq.com>
Date: Mon Apr 17 14:40:39 2023 +0800
修改苏电院交控线路顶部菜单展开后没法收回去问题
commit 0d50ac586b
Author: dong <58670809@qq.com>
Date: Mon Apr 17 13:26:39 2023 +0800
修改弹窗没有高度问题
commit 73c9c0777e
Author: dong <58670809@qq.com>
Date: Fri Apr 14 16:25:38 2023 +0800
去掉实训管理查询项缓存
commit c020d69150
Author: dong <58670809@qq.com>
Date: Mon Apr 17 14:51:08 2023 +0800
Squashed commit of the following:
commit 1f5d891c55
Author: dong <58670809@qq.com>
Date: Mon Apr 17 14:40:39 2023 +0800
修改苏电院交控线路顶部菜单展开后没法收回去问题
commit f27fd63e29
Author: dong <58670809@qq.com>
Date: Mon Apr 17 13:28:06 2023 +0800
Squashed commit of the following:
commit 0d50ac586b
Author: dong <58670809@qq.com>
Date: Mon Apr 17 13:26:39 2023 +0800
修改弹窗没有高度问题
commit 857472ba72
Author: dong <58670809@qq.com>
Date: Fri Apr 14 16:26:57 2023 +0800
Squashed commit of the following:
commit 73c9c0777e
Author: dong <58670809@qq.com>
Date: Fri Apr 14 16:25:38 2023 +0800
去掉实训管理查询项缓存
commit 1aca150711
Merge: 859317468 dff6b0f54
Author: fan <fanyuhong@joylink.club>
Date: Fri Apr 14 13:09:38 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 8593174685
Merge: 2bb8c6df9 0e1dcbb5f
Author: fan <fanyuhong@joylink.club>
Date: Thu Apr 13 16:23:01 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 2bb8c6df92
Author: dong <58670809@qq.com>
Date: Wed Apr 12 18:34:06 2023 +0800
Squashed commit of the following:
commit 30763300ac
Author: dong <58670809@qq.com>
Date: Wed Apr 12 18:31:39 2023 +0800
修改前端配置带id
commit cde33feb22
Author: fan <fanyuhong@joylink.club>
Date: Wed Apr 12 18:07:47 2023 +0800
宁波三进路选择表示样式不取消
commit 34a94e2c6d
Author: fan <fanyuhong@joylink.club>
Date: Wed Apr 12 17:58:11 2023 +0800
区域选择界面调整
commit 52af1d994b
Author: fan <fanyuhong@joylink.club>
Date: Wed Apr 12 13:33:03 2023 +0800
系统管理-教学考试数据管理
commit 6187b449c1
Author: dong <58670809@qq.com>
Date: Fri Apr 7 15:22:33 2023 +0800
代码调整
commit 074453ece7
Author: weizhihong <weizhihong@joylink.club>
Date: Fri Mar 31 16:52:08 2023 +0800
【删除注释】
commit 54fb5eb47a
Author: dong <58670809@qq.com>
Date: Fri Apr 7 15:27:22 2023 +0800
Squashed commit of the following:
commit 6187b449c1
Author: dong <58670809@qq.com>
Date: Fri Apr 7 15:22:33 2023 +0800
代码调整
commit 074453ece7
Author: weizhihong <weizhihong@joylink.club>
Date: Fri Mar 31 16:52:08 2023 +0800
【删除注释】
commit 95b6d019dd
Merge: ed1c4c0e5 2b6fa6a9f
Author: fan <fanyuhong@joylink.club>
Date: Thu Apr 6 17:32:19 2023 +0800
Merge remote-tracking branch 'origin/test'
commit ed1c4c0e53
Merge: 6fd16fcc9 770de3c73
Author: fan <fanyuhong@joylink.club>
Date: Thu Mar 23 17:51:52 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 6fd16fcc95
Author: fan <fanyuhong@joylink.club>
Date: Mon Mar 13 15:01:59 2023 +0800
三方跳转调整
commit 8ec88a84a2
Merge: 8e7b653bd 4aa047458
Author: fan <fanyuhong@joylink.club>
Date: Fri Mar 10 09:37:53 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 8e7b653bd3
Author: fan <fanyuhong@joylink.club>
Date: Wed Mar 1 15:51:05 2023 +0800
设备管理配置调整
commit 710dd576d4
Merge: 3e3d3622d dd0fd1972
Author: fan <fanyuhong@joylink.club>
Date: Sat Feb 18 12:21:53 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 3e3d3622dc
Merge: 916688b47 85ca94a66
Author: fan <fanyuhong@joylink.club>
Date: Fri Feb 17 18:17:00 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 916688b47c
Merge: 1c2912285 2bec6887f
Author: dong <58670809@qq.com>
Date: Mon Jan 16 18:04:58 2023 +0800
Merge remote-tracking branch 'remotes/origin/test'
commit 1c2912285b
Merge: 47e87c045 d671daa67
Author: dong <58670809@qq.com>
Date: Mon Jan 16 15:52:07 2023 +0800
Merge remote-tracking branch 'remotes/origin/test'
commit 47e87c0457
Merge: 910e0c571 9fe37f4c6
Author: dong <58670809@qq.com>
Date: Mon Jan 16 14:20:18 2023 +0800
Merge remote-tracking branch 'remotes/origin/test'
commit 910e0c5712
Author: fan <fanyuhong@joylink.club>
Date: Mon Jan 16 10:08:07 2023 +0800
北京一号线折返策略
commit 00866bde38
Merge: da4020e8c 1ae99e90d
Author: fan <fanyuhong@joylink.club>
Date: Fri Jan 13 18:50:42 2023 +0800
Merge remote-tracking branch 'origin/test'
commit da4020e8c6
Merge: bf1d744b3 9700682a2
Author: fan <fanyuhong@joylink.club>
Date: Fri Jan 13 18:48:27 2023 +0800
Merge remote-tracking branch 'origin/test'
commit bf1d744b34
Merge: c9dd8752c aee86e802
Author: fan <fanyuhong@joylink.club>
Date: Fri Jan 13 18:14:05 2023 +0800
Merge remote-tracking branch 'origin/test'
commit c9dd8752c1
Merge: 22064af28 36adbaeda
Author: dong <58670809@qq.com>
Date: Fri Jan 13 16:09:21 2023 +0800
Merge remote-tracking branch 'remotes/origin/test'
commit 22064af280
Merge: d9a06f3f1 e28b1f333
Author: dong <58670809@qq.com>
Date: Fri Jan 13 13:30:50 2023 +0800
Merge remote-tracking branch 'remotes/origin/test'
commit d9a06f3f1e
Merge: a03b16e60 3054160b1
Author: fan <fanyuhong@joylink.club>
Date: Fri Jan 13 13:11:24 2023 +0800
Merge remote-tracking branch 'origin/test'
commit a03b16e60a
Merge: 6897cb6c0 c3db4d4c2
Author: fan <fanyuhong@joylink.club>
Date: Wed Jan 11 17:49:25 2023 +0800
Merge remote-tracking branch 'origin/test'
commit 6897cb6c0b
Merge: 082c07529 58bcd7223
Author: fan <fanyuhong@joylink.club>
Date: Tue Jan 10 18:01:34 2023 +0800
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/scripts/ProjectConfig.js
# src/utils/baseUrl.js
# src/views/login/index.vue
# src/views/newMap/displayBaSiDi/index.vue
# src/views/newMap/displayCity/demonMenu.vue
# src/views/newMap/displayCity/index.vue
# src/views/system/deviceManage/index.vue
# src/views/trainingPlatform/demonList.vue
commit 082c075290
Author: fan <fanyuhong@joylink.club>
Date: Mon Nov 21 18:50:20 2022 +0800
成都工业跳转调度大赛
commit 3a35705576
Author: joylink_fanyuhong <18706759286@163.com>
Date: Sun Nov 20 14:24:36 2022 +0800
苏安院调整
commit 313c587314
Author: fan <fanyuhong@joylink.club>
Date: Fri Oct 28 14:20:56 2022 +0800
三方跳转不设置子系统节点
commit 401e09cdee
Author: fan <fanyuhong@joylink.club>
Date: Thu Oct 27 18:45:09 2022 +0800
代码调整
commit b35ca66983
Author: fan <fanyuhong@joylink.club>
Date: Thu Oct 27 16:53:14 2022 +0800
京津冀职业发展联盟
commit 24d64b91ac
Merge: c5d4e425e 802f4abbc
Author: fan <fanyuhong@joylink.club>
Date: Sat Oct 8 18:44:43 2022 +0800
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/views/newMap/mapDraftPicture/createPicture.vue
commit c5d4e425e4
Author: fan <fanyuhong@joylink.club>
Date: Thu Sep 8 09:14:21 2022 +0800
红河财经 隐藏案例
commit f9f05f12fd
Author: fan <fanyuhong@joylink.club>
Date: Thu Sep 1 16:09:49 2022 +0800
红河财经CCTV调整
commit e47e38003e
Author: fan <fanyuhong@joylink.club>
Date: Thu Aug 25 15:10:26 2022 +0800
大屏显示调整
commit 6802e297a8
Merge: ef7c7601b 832d26709
Author: fan <fanyuhong@joylink.club>
Date: Wed Aug 24 18:03:36 2022 +0800
Merge remote-tracking branch 'origin/test'
commit ef7c7601b8
Merge: 5dda53243 9341b3f80
Author: joylink_zhangsai <1021828630@qq.com>
Date: Thu Aug 4 21:09:33 2022 +0800
Merge remote-tracking branch 'origin/test'
commit 5dda532435
Merge: 76de50fc6 ff9101233
Author: joylink_zhangsai <1021828630@qq.com>
Date: Thu Aug 4 21:09:10 2022 +0800
Merge remote-tracking branch 'origin/master'
commit 76de50fc6a
Merge: 44363cc3e e20e21253
Author: joylink_zhangsai <1021828630@qq.com>
Date: Thu Aug 4 21:08:53 2022 +0800
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/jmapNew/theme/datie_02/menus/menuButton.vue
commit ff9101233c
Merge: 44363cc3e 93a4010ea
Author: fan <fanyuhong@joylink.club>
Date: Tue Jul 26 18:08:14 2022 +0800
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/jmapNew/theme/datie_02/menus/menuButton.vue
commit 44363cc3e8
Merge: 577c1f714 a9bd7ef94
Author: joylink_zhangsai <1021828630@qq.com>
Date: Thu Jul 21 18:09:03 2022 +0800
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/jmapNew/config/skinCode/datie_02.js
commit 577c1f7141
Author: fan <fanyuhong@joylink.club>
Date: Wed Jul 20 10:05:22 2022 +0800
长兴技术=》长兴技师
commit fa8f5dca6c
Merge: d2cf5489b fbf6e5fa2
Author: Yuan <yuanliyedefy@gmail.com>
Date: Fri Jul 15 18:17:16 2022 +0800
Merge branch 'test'
commit d2cf5489b3
Merge: 1fe561222 dd935f0ae
Author: fan <fanyuhong@joylink.club>
Date: Thu Jul 14 18:15:52 2022 +0800
Merge remote-tracking branch 'origin/test'
commit 1fe561222c
Merge: 3e60f4b8e 012c8e713
Author: fan <fanyuhong@joylink.club>
Date: Tue Jul 5 18:03:57 2022 +0800
Merge remote-tracking branch 'origin/test'
commit 3e60f4b8e1
Merge: 131e70c72 8b3c7eadc
Author: fan <fanyuhong@joylink.club>
Date: Mon Jun 27 18:08:41 2022 +0800
Merge remote-tracking branch 'origin/test'
commit 131e70c729
Author: fan <fanyuhong@joylink.club>
Date: Mon Jun 27 13:22:25 2022 +0800
子系统栏显示调整
commit a8ce60f33e
Author: fan <fanyuhong@joylink.club>
Date: Mon Jun 27 13:08:46 2022 +0800
子系统栏显示调整
commit 15cf33c850
Merge: d568be81e 80361b40a
Author: fan <fanyuhong@joylink.club>
Date: Tue Jun 21 13:22:00 2022 +0800
Merge remote-tracking branch 'origin/test'
commit d568be81ec
Merge: 0929b54f9 58427fb83
Author: fan <fanyuhong@joylink.club>
Date: Mon Jun 20 17:47:12 2022 +0800
Merge remote-tracking branch 'origin/test'
commit 0929b54f9d
Author: fan <18706759286@163.com>
Date: Mon Jun 6 16:43:11 2022 +0800
实训双击问题调整
commit 215dab7074
Merge: 013e66745 93c5bc4fb
Author: fan <18706759286@163.com>
Date: Mon May 30 17:44:09 2022 +0800
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/jmapNew/theme/datie_02/menus/menuTrain.vue
commit 013e667452
Author: fan <18706759286@163.com>
Date: Mon May 30 17:34:44 2022 +0800
实训仿真结束 退出实训界面
commit b05cedd44c
Merge: b73395f84 b9fa32a96
Author: joylink_zhangsai <1021828630@qq.com>
Date: Fri May 20 18:24:36 2022 +0800
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/jmapNew/config/skinCode/datie_02.js
# src/jmapNew/theme/datie_02/menus/menuButton.vue
# src/jmapNew/theme/datie_02/menus/menuTrain.vue
commit b73395f840
Merge: 0cb4088f6 e6876ee7f
Author: joylink_zhangsai <1021828630@qq.com>
Date: Fri May 20 18:24:17 2022 +0800
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/jmapNew/config/skinCode/datie_02.js
# src/jmapNew/constant/deviceRender.js
# src/jmapNew/constant/deviceType.js
# src/jmapNew/parser/parser-graph.js
# src/jmapNew/shape/graph/SaidLamp/EPickOrDepartArrow.js
# src/jmapNew/shape/graph/SaidLamp/index.js
# src/jmapNew/shape/graph/SignalButton/index.js
# src/jmapNew/shape/graph/Station/index.js
# src/jmapNew/shape/graph/index.js
# src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue
# src/jmapNew/theme/datie_02/menus/index.vue
# src/jmapNew/theme/datie_02/menus/menuButton.vue
# src/jmapNew/theme/datie_02/menus/menuSection.vue
# src/jmapNew/theme/datie_02/menus/menuSignal.vue
# src/jmapNew/theme/datie_02/menus/menuStation.vue
# src/jmapNew/theme/datie_02/menus/menuStationStand.vue
# src/jmapNew/theme/datie_02/menus/menuSwitch.vue
# src/jmapNew/theme/datie_02/menus/menuTrain.vue
# src/jmapNew/theme/factory.js
# src/scripts/cmdPlugin/OperationHandler.js
# src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
# src/views/newMap/newMapdraft/mapoperate/models.js
# src/views/newMap/newMapdraft/mapoperate/signalButton.vue
commit b9fa32a96a
Merge: 7677fa460 a69e27f43
Author: joylink_cuiweidong <364937672@qq.com>
Date: Thu May 12 11:38:28 2022 +0800
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# src/jmapNew/config/skinCode/datie_02.js
# src/jmapNew/constant/deviceRender.js
# src/jmapNew/constant/deviceType.js
# src/jmapNew/parser/parser-graph.js
# src/jmapNew/shape/graph/SaidLamp/EPickOrDepartArrow.js
# src/jmapNew/shape/graph/SaidLamp/index.js
# src/jmapNew/shape/graph/SignalButton/index.js
# src/jmapNew/shape/graph/Station/index.js
# src/jmapNew/shape/graph/index.js
# src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue
# src/jmapNew/theme/datie_02/menus/index.vue
# src/jmapNew/theme/datie_02/menus/menuButton.vue
# src/jmapNew/theme/datie_02/menus/menuSection.vue
# src/jmapNew/theme/datie_02/menus/menuSignal.vue
# src/jmapNew/theme/datie_02/menus/menuStation.vue
# src/jmapNew/theme/datie_02/menus/menuStationStand.vue
# src/jmapNew/theme/datie_02/menus/menuSwitch.vue
# src/jmapNew/theme/datie_02/menus/menuTrain.vue
# src/jmapNew/theme/factory.js
# src/scripts/cmdPlugin/OperationHandler.js
# src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
# src/views/newMap/newMapdraft/mapoperate/models.js
# src/views/newMap/newMapdraft/mapoperate/signalButton.vue
commit 0cb4088f6c
Merge: 000cbada5 7677fa460
Author: joylink_zhangsai <1021828630@qq.com>
Date: Thu May 12 11:08:12 2022 +0800
Merge remote-tracking branch 'origin/master'
commit 7677fa4607
Author: joylink_cuiweidong <364937672@qq.com>
Date: Tue Apr 19 19:18:31 2022 +0800
代码调整
commit 226744e7f7
Author: joylink_cuiweidong <364937672@qq.com>
Date: Tue Apr 19 14:07:27 2022 +0800
代码调整
commit ad47f33d16
Author: joylink_cuiweidong <364937672@qq.com>
Date: Tue Apr 19 14:03:06 2022 +0800
代码调整
commit bf1886a534
Author: joylink_cuiweidong <364937672@qq.com>
Date: Tue Apr 19 13:45:00 2022 +0800
代码调整
commit f61785fc5e
Author: joylink_cuiweidong <364937672@qq.com>
Date: Mon Apr 18 18:54:21 2022 +0800
代码调整
commit d82ab8f93c
Author: joylink_cuiweidong <364937672@qq.com>
Date: Mon Apr 18 18:43:39 2022 +0800
代码调整
commit 62be008849
Author: joylink_cuiweidong <364937672@qq.com>
Date: Mon Apr 18 17:13:54 2022 +0800
代码调整
commit 25c8ddd667
Author: joylink_cuiweidong <364937672@qq.com>
Date: Mon Apr 18 17:10:12 2022 +0800
代码调整
commit 62e0f34ef6
Author: joylink_cuiweidong <364937672@qq.com>
Date: Mon Apr 18 15:41:37 2022 +0800
代码调整
commit 03611598e1
Author: joylink_cuiweidong <364937672@qq.com>
Date: Mon Apr 18 14:40:05 2022 +0800
成绩统计代码调整
commit fc9c148753
Author: joylink_cuiweidong <364937672@qq.com>
Date: Mon Apr 18 09:28:37 2022 +0800
学生统计信息代码调整
commit 87dc324d74
Author: joylink_cuiweidong <364937672@qq.com>
Date: Fri Apr 15 18:45:08 2022 +0800
代码调整
commit e5240b10ca
Author: joylink_cuiweidong <364937672@qq.com>
Date: Fri Apr 15 15:26:12 2022 +0800
代码调整
commit f876c33603
Author: joylink_cuiweidong <364937672@qq.com>
Date: Fri Apr 15 14:46:24 2022 +0800
学生统计页面添加
commit a56505a3d0
Author: joylink_cuiweidong <364937672@qq.com>
Date: Thu Apr 14 17:18:26 2022 +0800
成绩统计 代码调整
commit ecb4c2569e
Author: joylink_cuiweidong <364937672@qq.com>
Date: Wed Apr 13 17:26:50 2022 +0800
学生单次考试成绩 页面添加
commit 6ed22109af
Author: fan <18706759286@163.com>
Date: Mon Apr 18 14:57:12 2022 +0800
大铁线路调整2
commit 7fbe309f70
Author: fan <18706759286@163.com>
Date: Fri Apr 15 16:49:11 2022 +0800
大铁线路调整
commit c8ba0b63b7
Merge: 3fdff6d32 adc9f3816
Author: fan <18706759286@163.com>
Date: Fri Mar 25 14:00:34 2022 +0800
Merge remote-tracking branch 'origin/test'
commit 3fdff6d329
Merge: 38b1beeef 92d192cfe
Author: fan <18706759286@163.com>
Date: Tue Mar 15 10:06:37 2022 +0800
Merge remote-tracking branch 'origin/test'
commit 38b1beeef5
Author: joylink_fanyuhong <18706759286@163.com>
Date: Thu Jan 20 19:07:15 2022 +0800
iscs调整
commit 4431fe9dd4
Merge: 5bf48a83f 4b3376ec2
Author: joylink_fanyuhong <18706759286@163.com>
Date: Thu Jan 20 18:02:40 2022 +0800
Merge remote-tracking branch 'origin/test'
commit 5bf48a83f0
Merge: 204995be2 62f22d0c7
Author: joylink_fanyuhong <18706759286@163.com>
Date: Wed Jan 5 17:58:55 2022 +0800
Merge remote-tracking branch 'origin/test'
# Conflicts:
# .env.production
commit 204995be22
Merge: 958a469ba c4e9ab234
Author: joylink_fanyuhong <18706759286@163.com>
Date: Wed Dec 29 14:04:20 2021 +0800
Merge remote-tracking branch 'origin/test'
commit 958a469ba7
Author: joylink_fanyuhong <18706759286@163.com>
Date: Wed Dec 29 10:21:08 2021 +0800
ip调整
commit c1698252aa
Author: joylink_fanyuhong <18706759286@163.com>
Date: Wed Dec 29 10:04:07 2021 +0800
正式ip调整
commit 000cbada55
Merge: 9a37c1f97 253408b86
Author: joylink_zhangsai <1021828630@qq.com>
Date: Tue Oct 26 18:48:57 2021 +0800
Merge remote-tracking branch 'origin/test'
|
2024-05-27 17:23:35 +08:00 |
|