joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
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'
This commit is contained in:
joylink_zhaoerwei 2024-05-27 17:23:35 +08:00
parent 6e6737a7c6
commit 332577b03a
48 changed files with 14198 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
.gitea/workflows/CICD_local_test.yaml Normal file
View File

@ -0,0 +1,52 @@
---
name: local-test分支构建发布到本地服务器
run-name: ${{ gitea.actor }} is testing out Gitea Actions
on:
push:
branches:
- local-test
jobs:
Build-Publish:
runs-on: joylink-local233
steps:
- name: 检出代码
uses: https://gitea.joylink.club/actions/checkout@v4
with:
submodules: recursive
- name: 设置node环境
uses: https://gitea.joylink.club/actions/local-setup-node@v0.1.1
with:
version: v14.21.3
cache: yarn
cache-dependency-path: yarn.lock
- name: 安装yarn,并build
run: |
node -v
npm config set registry https://registry.npmmirror.com
npm install --global yarn
yarn config set registry https://registry.npmmirror.com
yarn
yarn run buildas local-test
tar czvf ./dist-local-test.tar.gz ./dist
- name: 打包发送到服务器
uses: https://gitea.joylink.club/appleboy/scp-action@v0.1.7
with:
host: ${{ secrets.LOCAL_233_SSH_HOST }}
username: ${{ secrets.LOCAL_233_SSH_USER }}
password: ${{ secrets.LOCAL_233_SSH_PASSWORD }}
port: ${{ secrets.LOCAL_233_SSH_PORT }}
source: ./dist-local-test.tar.gz
target: /home/minio/oss/rt-sim-training-client
overwrite: true
- name: SSH连接并解压发布
uses: https://gitea.joylink.club/appleboy/ssh-action@v1.0.3
with:
host: ${{ secrets.LOCAL_233_SSH_HOST }}
port: ${{ secrets.LOCAL_233_SSH_PORT }}
username: ${{ secrets.LOCAL_233_SSH_USER }}
password: ${{ secrets.LOCAL_233_SSH_PASSWORD }}
script: |
cd /home/minio/oss/rt-sim-training-client
rm -rf /usr/local/joylink/client/cbtc
mkdir -p /usr/local/joylink/client
tar xz --strip 2 -C /usr/local/joylink/client -f dist-local-test.tar.gz

52
.gitea/workflows/CICD_master.yaml Normal file
View File

@ -0,0 +1,52 @@
name: master分支构建发布到公网服务器
run-name: ${{ gitea.actor }} is testing out Gitea Actions
on:
push:
branches:
- master
jobs:
Build-Publish:
runs-on: joylink-local233
steps:
- name: 检出代码
uses: https://gitea.joylink.club/actions/checkout@v4
with:
submodules: recursive
- name: 设置node环境
uses: https://gitea.joylink.club/actions/local-setup-node@v0.1.1
with:
version: 'v14.21.3'
cache: 'yarn'
cache-dependency-path: 'yarn.lock'
- name: 安装yarn,并build
run: |
node -v
npm config set registry https://registry.npmmirror.com
npm install --global yarn
yarn config set registry https://registry.npmmirror.com
yarn
yarn run build
tar czvf ./dist-master.tar.gz ./dist
- name: 打包发送到服务器
uses: https://gitea.joylink.club/appleboy/scp-action@v0.1.7
with:
host: ${{ secrets.PUB1_DOMAIN_SSH_HOST }}
port: ${{ secrets.PUB1_DOMAIN_SSH_PORT }}
username: ${{ secrets.PUB1_DOMAIN_SSH_USER }}
password: ${{ secrets.PUB1_DOMAIN_SSH_PASSWORD }}
source: ./dist-master.tar.gz
target: /mnt/data/published/rt-sim-training-client
overwrite: true
- name: SSH连接并解压发布
uses: https://gitea.joylink.club/appleboy/ssh-action@v1.0.3
with:
host: ${{ secrets.PUB1_DOMAIN_SSH_HOST }}
port: ${{ secrets.PUB1_DOMAIN_SSH_PORT }}
username: ${{ secrets.PUB1_DOMAIN_SSH_USER }}
password: ${{ secrets.PUB1_DOMAIN_SSH_PASSWORD }}
script: |
cd /mnt/data/published/rt-sim-training-client
rm -rf /usr/local/joylink/client/cbtc
mkdir -p /usr/local/joylink/client
tar xz --strip 2 -C /usr/local/joylink/client -f dist-master.tar.gz

1
.gitignore vendored
View File

@ -4,7 +4,6 @@ dist/
npm-debug.log* npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
package-lock.json
tests/**/coverage/ tests/**/coverage/
src/utils/baseUrl.js* src/utils/baseUrl.js*

10
src/api/management/exam.js
View File

@ -344,3 +344,13 @@ export function queryTagList(data) {
data data
}); });
} }
/**
* 获取试卷创建者list
*/
export function queryPaperCreatorList(data) {
return request({
url: `/api/v2/paper/composition/list/creatorInfo`,
method: 'POST',
data
})
}

8
src/api/management/user.js
View File

@ -323,3 +323,11 @@ export function isExistEmail(params) {
}); });
} }
// 成工院第三方登录
export function cgyThirdLogin(data) {
return request({
url: '/api/login/cgy/third',
method: 'post',
data
});
}

16
src/jmapNew/config/skinCode/datie_02.js
View File

@ -847,18 +847,16 @@ class SkinCode extends defaultStyle {
trainBody: { trainBody: {
fontFamily: 'consolas', fontFamily: 'consolas',
trainBodyLineWidth: 1, // 车身line宽 trainBodyLineWidth: 1, // 车身line宽
changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
specialTrainType: [ specialTrainType: [
{ {
type: '03', type: '03',
serviceNumber: '---', serviceNumber: '---',
// nameFormat: 'groupNumber:serviceNumber' nameFormat: 'groupNumber:serviceNumber'
nameFormat:'tripNumber'
}, },
{ {
type: '03', type: '03',
// nameFormat: 'serviceNumber:trainNumber' nameFormat: 'serviceNumber:trainNumber'
nameFormat:'tripNumber'
} }
], // 特殊列车类型需设置显示格式 ], // 特殊列车类型需设置显示格式
lrPadding: 4, // 两边间隔 lrPadding: 4, // 两边间隔
@ -956,15 +954,15 @@ class SkinCode extends defaultStyle {
directionType: [ directionType: [
{ {
type: 1, type: 1,
lineLShow: false, lineLShow: true,
lineRShow: false, lineRShow: true,
arrowLShow: false, arrowLShow: false,
arrowRShow: true arrowRShow: true
}, },
{ {
type: 0, type: 0,
lineLShow: false, lineLShow: true,
lineRShow: false, lineRShow: true,
arrowLShow: true, arrowLShow: true,
arrowRShow: false arrowRShow: false
} }

7
src/jmapNew/config/skinCode/fuzhou_01.js
View File

@ -189,6 +189,13 @@ class SkinCode extends defaultStyle {
}, },
lowButton:{ lowButton:{
display: false // 现地 信号机按钮 display: false // 现地 信号机按钮
},
transmission: { // 传输信号机
fillColor: '#f00',
fillColorVirtual: '#f00',
sideLength: 20,
textColor: '#fff',
strokeColor: '#00FFFF'
} }
}; };

7
src/jmapNew/config/skinCode/xian_02.js
View File

@ -233,6 +233,13 @@ class SkinCode extends defaultStyle {
fontSize: 12, fontSize: 12,
distance: 20, distance: 20,
defaultText: 'E' defaultText: 'E'
},
transmission: { // 传输信号机
fillColor: '#f00',
fillColorVirtual: '#f00',
sideLength: 20,
textColor: '#fff',
strokeColor: '#00FFFF'
} }
}; };

13
src/jmapNew/shape/graph/Signal/index.js
View File

@ -847,6 +847,15 @@ class Signal extends Group {
case 'LIGHTING_UNIT_FAULT_HEAD': case 'LIGHTING_UNIT_FAULT_HEAD':
this.lightingUnitFaultHead(); this.lightingUnitFaultHead();
break; break;
case 'R_WIRE_FAULT':
this.lightingUnitFaultName();
break;
case 'G_WIRE_FAULT':
this.lightingUnitFaultName();
break;
case 'Y_WIRE_FAULT':
this.lightingUnitFaultName();
break;
} }
} }
@ -922,8 +931,8 @@ class Signal extends Group {
// 隐藏自动信号和自动进路 // 隐藏自动信号和自动进路
setAutoClose() { setAutoClose() {
if (this.style.Signal.auto.autoRouteType != 'text') { if (this.style.Signal.auto.autoRouteType != 'text') {
this.sigAuto.hide(); this.sigAuto && this.sigAuto.hide();
this.sigAuto.setColor(this.style.backgroundColor); this.sigAuto && this.sigAuto.setColor(this.style.backgroundColor);
} else { } else {
this.sigName.setColor(this.style.Signal.text.defaultColor); this.sigName.setColor(this.style.Signal.text.defaultColor);
} }

10
src/jmapNew/shape/graph/Switch/index.js
View File

@ -326,9 +326,9 @@ export default class Switch extends Group {
} }
this.name.getTextRect().animateStyle(true) this.name.getTextRect().animateStyle(true)
.when(0, { textFill: this.style.backgroundColor }) .when(0, { textFill: this.style.transparentColor })
.when(1000, { textFill: this.style.Switch.text.borderColor }) .when(1000, { textFill: this.style.Switch.text.borderColor })
.when(2000, { textFill: this.style.backgroundColor }) .when(2000, { textFill: this.style.transparentColor })
.start(); .start();
} }
@ -354,7 +354,7 @@ export default class Switch extends Group {
this.lockCircle && this.lockCircle.hide(); // 圆形包围框 this.lockCircle && this.lockCircle.hide(); // 圆形包围框
this.lockArc && this.lockArc.hide(); // 圆形单锁框 this.lockArc && this.lockArc.hide(); // 圆形单锁框
this.name.getNameText().stopAnimation(false); this.name.getNameText().stopAnimation(false);
this.name.getTextRect().setStyle({ fill: this.style.backgroundColor }); this.name.getTextRect().setStyle({ fill: this.style.transparentColor });
this.shapeModelC && this.shapeModelC.hide(); // 形状 C this.shapeModelC && this.shapeModelC.hide(); // 形状 C
this.shapeModelA && this.shapeModelA.hide(); // 形状 A this.shapeModelA && this.shapeModelA.hide(); // 形状 A
this.shapeModelB && this.shapeModelB.hide(); // 形状 B this.shapeModelB && this.shapeModelB.hide(); // 形状 B
@ -626,7 +626,7 @@ export default class Switch extends Group {
} }
if (this.style.Switch.core.specialCircle) { if (this.style.Switch.core.specialCircle) {
this.name.getTextRect().setStyle({ fill: this.style.backgroundColor }); this.name.getTextRect().setStyle({ fill: this.style.transparentColor });
this.setTextColor(this.style.Switch.text.guideMasterLockColor); this.setTextColor(this.style.Switch.text.guideMasterLockColor);
} else { } else {
this.setTextColor(this.style.Switch.text.monolockLocationColor); this.setTextColor(this.style.Switch.text.monolockLocationColor);
@ -911,7 +911,7 @@ export default class Switch extends Group {
this.setHasTextBorder(1, this.style.Switch.text.fpLockBorderColor); this.setHasTextBorder(1, this.style.Switch.text.fpLockBorderColor);
} }
if (this.style.Switch.core.specialCircle) { if (this.style.Switch.core.specialCircle) {
this.name.getTextRect().setStyle({ fill: this.style.backgroundColor }); this.name.getTextRect().setStyle({ fill: this.style.transparentColor });
this.setTextColor(this.style.Switch.text.fpLockColor); this.setTextColor(this.style.Switch.text.fpLockColor);
} }
} }

6
src/jmapNew/theme/components/menus/dialog/setFault.vue
View File

@ -277,9 +277,9 @@ export default {
]; ];
} else if (selected._type === 'Signal' && this.popClass === 'nanjing-02__systerm') { } else if (selected._type === 'Signal' && this.popClass === 'nanjing-02__systerm') {
this.faultList = [ this.faultList = [
{label: '无法开放(非CTC)', value: 'NO_OPEN'}, {label: '红灯断丝', value: 'R_WIRE_FAULT'},
{label: '编号闪', value: 'LIGHTING_UNIT_FAULT_NAME'}, {label: '绿灯断丝', value: 'G_WIRE_FAULT'},
{label: '机头闪', value: 'LIGHTING_UNIT_FAULT_HEAD'} {label: '黄灯断丝', value: 'Y_WIRE_FAULT'}
]; ];
} else if (selected._type === 'Section' && this.popClass === 'nanjing-02__systerm') { } else if (selected._type === 'Section' && this.popClass === 'nanjing-02__systerm') {
this.faultList = [ this.faultList = [

2
src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
View File

@ -24,7 +24,7 @@
</el-row> </el-row>
<div style="padding: 10px 15px; border: 1px double lightgray;height: 60px;margin-top: 15px;"> <div style="padding: 10px 15px; border: 1px double lightgray;height: 60px;margin-top: 15px;">
<span class="base-label" style="left:-10px;background:#f0f0f0;">钩锁位置</span> <span class="base-label" style="left:-10px;background:#f0f0f0;">钩锁位置</span>
<div style=" position: relative; top:-10px;"> <div style=" position: relative; top:10px;">
<el-radio-group v-model="normal"> <el-radio-group v-model="normal">
<el-radio :label="true">定位</el-radio> <el-radio :label="true">定位</el-radio>
<el-radio :label="false">反位</el-radio> <el-radio :label="false">反位</el-radio>

114
src/jmapNew/theme/fuzhou_01/menus/dispatchWorkMenuBar.vue
View File

@ -46,20 +46,20 @@ export default {
data() { data() {
return { return {
menuNormal: [ menuNormal: [
{ // {
title: this.$t('menu.menuBar.system'), // title: this.$t('menu.menuBar.system'),
operate: OperationEvent.Command.mBar.system, // operate: OperationEvent.Command.mBar.system,
click: this.undeveloped, // click: this.undeveloped,
children: [ // children: [
] // ]
}, // },
{ // {
title: this.$t('menu.menuBar.view'), // title: this.$t('menu.menuBar.view'),
operate: OperationEvent.Command.mBar.check, // operate: OperationEvent.Command.mBar.check,
click: this.undeveloped, // click: this.undeveloped,
children: [ // children: [
] // ]
}, // },
{ {
title: this.$t('menu.menuBar.refresh'), title: this.$t('menu.menuBar.refresh'),
operate: OperationEvent.Command.mBar.fresh, operate: OperationEvent.Command.mBar.fresh,
@ -70,7 +70,7 @@ export default {
{ {
title: this.$t('menu.menuBar.display'), title: this.$t('menu.menuBar.display'),
operate: OperationEvent.Command.mBar.view, operate: OperationEvent.Command.mBar.view,
click: this.undeveloped, // click: this.undeveloped,
children: [ children: [
{ {
title: this.$t('menu.menuBar.setTrainIdDisplay'), title: this.$t('menu.menuBar.setTrainIdDisplay'),
@ -89,13 +89,13 @@ export default {
} }
] ]
}, },
{ // {
title: this.$t('menu.menuBar.stationMapSwitch'), // title: this.$t('menu.menuBar.stationMapSwitch'),
operate: '', // operate: '',
click: this.undeveloped, // click: this.undeveloped,
children: [ // children: [
] // ]
}, // },
{ {
title: this.$t('menu.menuBar.planCarOperation'), title: this.$t('menu.menuBar.planCarOperation'),
operate: OperationEvent.Command.mBar.planTrain, operate: OperationEvent.Command.mBar.planTrain,
@ -117,13 +117,13 @@ export default {
} }
] ]
}, },
{ // {
title: this.$t('menu.menuBar.trainNumberMaintenance'), // title: this.$t('menu.menuBar.trainNumberMaintenance'),
operate: '', // operate: '',
click: this.undeveloped, // click: this.undeveloped,
children: [ // children: [
] // ]
}, // },
{ {
title: this.$t('menu.menuBar.controlModeSwitch'), title: this.$t('menu.menuBar.controlModeSwitch'),
operate: OperationEvent.Command.mBar.remoteControl, operate: OperationEvent.Command.mBar.remoteControl,
@ -147,27 +147,27 @@ export default {
} }
] ]
}, },
{ // {
title: this.$t('menu.menuBar.requestOperationArea'), // title: this.$t('menu.menuBar.requestOperationArea'),
operate: OperationEvent.Command.mBar.requestZone, // operate: OperationEvent.Command.mBar.requestZone,
click: this.undeveloped, // click: this.undeveloped,
children: [ // children: [
] // ]
}, // },
{ // {
title: this.$t('menu.menuBar.schedulingLog'), // title: this.$t('menu.menuBar.schedulingLog'),
operate: '', // operate: '',
click: this.undeveloped, // click: this.undeveloped,
children: [ // children: [
] // ]
}, // },
{ // {
title: this.$t('menu.menuBar.systemAnalysis'), // title: this.$t('menu.menuBar.systemAnalysis'),
operate: '', // operate: '',
click: this.undeveloped, // click: this.undeveloped,
children: [ // children: [
] // ]
}, // },
{ {
title: this.$t('menu.menuBar.userManage'), title: this.$t('menu.menuBar.userManage'),
operate: OperationEvent.Command.mBar.userManage, operate: OperationEvent.Command.mBar.userManage,
@ -179,13 +179,13 @@ export default {
} }
] ]
}, },
{ // {
title: this.$t('menu.menuBar.historyQuery'), // title: this.$t('menu.menuBar.historyQuery'),
operate: OperationEvent.Command.mBar.historyQuery, // operate: OperationEvent.Command.mBar.historyQuery,
click: this.undeveloped, // click: this.undeveloped,
children: [ // children: [
] // ]
}, // },
{ {
title: this.$t('menu.menuBar.help'), title: this.$t('menu.menuBar.help'),
operate: OperationEvent.Command.mBar.help, operate: OperationEvent.Command.mBar.help,

74
src/jmapNew/theme/fuzhou_01/menus/localWorkMenuBar.vue
View File

@ -37,20 +37,20 @@ export default {
data() { data() {
return { return {
menuNormal: [ menuNormal: [
{ // {
title: this.$t('menu.menuBar.system'), // title: this.$t('menu.menuBar.system'),
operate: OperationEvent.Command.mBar.system, // operate: OperationEvent.Command.mBar.system,
click: this.undeveloped, // click: this.undeveloped,
children: [ // children: [
] // ]
}, // },
{ // {
title: this.$t('menu.menuBar.view'), // title: this.$t('menu.menuBar.view'),
operate: OperationEvent.Command.mBar.check, // operate: OperationEvent.Command.mBar.check,
click: this.undeveloped, // click: this.undeveloped,
children: [ // children: [
] // ]
}, // },
{ {
title: this.$t('menu.menuBar.refresh'), title: this.$t('menu.menuBar.refresh'),
operate: OperationEvent.Command.mBar.fresh, operate: OperationEvent.Command.mBar.fresh,
@ -61,7 +61,7 @@ export default {
{ {
title: this.$t('menu.menuBar.display'), title: this.$t('menu.menuBar.display'),
operate: OperationEvent.Command.mBar.view, operate: OperationEvent.Command.mBar.view,
click: this.undeveloped, // click: this.undeveloped,
children: [ children: [
{ {
title: this.$t('menu.menuBar.setTrainIdDisplay'), title: this.$t('menu.menuBar.setTrainIdDisplay'),
@ -80,17 +80,17 @@ export default {
} }
] ]
}, },
{ // {
title: this.$t('menu.menuBar.stationMapSwitch'), // title: this.$t('menu.menuBar.stationMapSwitch'),
operate: '', // operate: '',
click: this.undeveloped, // click: this.undeveloped,
children: [ // children: [
] // ]
}, // },
{ {
title: this.$t('menu.menuBar.controlModeSwitch'), title: this.$t('menu.menuBar.controlModeSwitch'),
operate: OperationEvent.Command.mBar.remoteControl, operate: OperationEvent.Command.mBar.remoteControl,
click: this.undeveloped, // click: this.undeveloped,
children: [ children: [
{ {
title: this.$t('menu.menuBar.toStationControl'), title: this.$t('menu.menuBar.toStationControl'),
@ -110,20 +110,20 @@ export default {
// } // }
] ]
}, },
{ // {
title: this.$t('menu.menuBar.requestOperationArea'), // title: this.$t('menu.menuBar.requestOperationArea'),
operate: OperationEvent.Command.mBar.requestZone, // operate: OperationEvent.Command.mBar.requestZone,
click: this.undeveloped, // click: this.undeveloped,
children: [ // children: [
] // ]
}, // },
{ // {
title: this.$t('menu.menuBar.historyQuery'), // title: this.$t('menu.menuBar.historyQuery'),
operate: OperationEvent.Command.mBar.historyQuery, // operate: OperationEvent.Command.mBar.historyQuery,
click: this.undeveloped, // click: this.undeveloped,
children: [ // children: [
] // ]
}, // },
{ {
title: this.$t('menu.menuBar.userManage'), title: this.$t('menu.menuBar.userManage'),
operate: OperationEvent.Command.mBar.userManage, operate: OperationEvent.Command.mBar.userManage,

10
src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
View File

@ -152,11 +152,11 @@ export default {
} }
], ],
menuSpeed: [ menuSpeed: [
{ // {
label: this.$t('menu.menuTrain.confirmRunToFrontStation'), // label: this.$t('menu.menuTrain.confirmRunToFrontStation'),
handler: this.undeveloped, // handler: this.undeveloped,
cmdType:CMD.Train.CMD_TRAIN_MANUAL_LIMIT_DRIVE // cmdType:CMD.Train.CMD_TRAIN_MANUAL_LIMIT_DRIVE
} // }
] ]
}; };
}, },

10
src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue
View File

@ -664,9 +664,9 @@ export default {
this.param = { routeCode: this.route.code }; this.param = { routeCode: this.route.code };
} }
this.tempData = []; this.tempData = [];
this.selectRouteList.forEach(el => { // this.selectRouteList.forEach(el => {
this.tempData.push(el); // this.tempData.push(el);
}); // });
}, },
// 校验上次点击信号机 // 校验上次点击信号机
checkSignal() { checkSignal() {
@ -786,6 +786,10 @@ export default {
} }
}); });
this.tempData = [...overlapList]; this.tempData = [...overlapList];
} else if (row.cmdType === CMD.Signal.CMD_SIGNAL_SET_ROUTE || row.cmdType === CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE) {
this.selectRouteList.forEach(el => {
this.tempData.push(el);
});
} }
if (this.tempData.length) { if (this.tempData.length) {

10
src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue
View File

@ -740,9 +740,9 @@ export default {
this.param = { routeCode: this.route.code }; this.param = { routeCode: this.route.code };
} }
this.tempData = []; this.tempData = [];
this.selectRouteList.forEach(el => { // this.selectRouteList.forEach(el => {
this.tempData.push(el); // this.tempData.push(el);
}); // });
}, },
// 校验上次点击信号机 // 校验上次点击信号机
checkSignal() { checkSignal() {
@ -862,6 +862,10 @@ export default {
} }
}); });
this.tempData = [...overlapList]; this.tempData = [...overlapList];
} else if (row.cmdType === CMD.Signal.CMD_SIGNAL_SET_ROUTE || row.cmdType === CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE) {
this.selectRouteList.forEach(el => {
this.tempData.push(el);
});
} }
if (this.tempData.length) { if (this.tempData.length) {

9
src/permission.js
View File

@ -3,12 +3,12 @@ import store from '@/store/index';
import router from './router/index'; import router from './router/index';
import NProgress from 'nprogress'; import NProgress from 'nprogress';
import 'nprogress/nprogress.css'; import 'nprogress/nprogress.css';
import { setToken, getToken, getSessionStorage, setSessionStorage } from '@/utils/auth'; import { setToken, getToken, getSessionStorage, setSessionStorage, removeToken } from '@/utils/auth';
import { getFrontProjectConfigByLogin} from '@/api/projectConfig'; import { getFrontProjectConfigByLogin} from '@/api/projectConfig';
import localStore from 'storejs'; import localStore from 'storejs';
import { handlerUrl } from '@/utils/baseUrl'; import { handlerUrl } from '@/utils/baseUrl';
const whiteList = ['/login', '/design/login', '/loginNew', '/gzzbxy/relay', '/authorization', '/AUSline', '/AUStool', '/demo', '/thirdLogin']; // 不重定向白名单 const whiteList = ['/login', '/design/login', '/loginNew', '/gzzbxy/relay', '/authorization', '/AUSline', '/AUStool', '/demo', '/thirdLogin', '/cgyLogin']; // 不重定向白名单
// 登录路径判断获取 // 登录路径判断获取
function getRouteInfo(to) { function getRouteInfo(to) {
@ -83,7 +83,10 @@ function handleRoute(to, next, loginPath) {
// store.dispatch('subscribe', {header, type: getSessionStorage('project')}); // store.dispatch('subscribe', {header, type: getSessionStorage('project')});
// } // }
// } // }
router.beforeEach( async (to, from, next) => { router.beforeEach(async (to, from, next) => {
if (to.path == '/thirdLogin') { // 到第三方登录页面时先删除之前的token
removeToken();
}
// 判断第三方登陆 // 判断第三方登陆
if (to.query.thirdJump) { if (to.query.thirdJump) {
setToken(to.query.key); setToken(to.query.key);

6
src/router/index.js
View File

@ -220,6 +220,7 @@ const UserRulesManage = () => import('@/views/userRulesManage/index');
const AuthorityTransfer = () => import('@/views/authorityTransfer/index'); const AuthorityTransfer = () => import('@/views/authorityTransfer/index');
const CreateDistribute = () => import('@/views/authorityTransfer/create/index'); const CreateDistribute = () => import('@/views/authorityTransfer/create/index');
const ThirdJumpSim = () => import('@/views/newMap/display/thirdJump'); const ThirdJumpSim = () => import('@/views/newMap/display/thirdJump');
const CgyLogin = () => import('@/views/thirdLogin/cgyLogin');
const TmsPage = () => import('@/views/jlmap3d/drive/sceneview/tmsPage'); const TmsPage = () => import('@/views/jlmap3d/drive/sceneview/tmsPage');
const ContestSubjectManage = () => import('@/views/contestDataManage/contestSubjectManage/ContestSubjectManage'); const ContestSubjectManage = () => import('@/views/contestDataManage/contestSubjectManage/ContestSubjectManage');
@ -430,6 +431,11 @@ export const constantRoutes = [
component: ThirdJumpSim, component: ThirdJumpSim,
hidden: true hidden: true
}, },
{
path: '/cgyLogin',
component: CgyLogin,
hidden: true
},
{ {
path: '/404', path: '/404',
component: Errpr404, component: Errpr404,

7
src/store/modules/map.js
View File

@ -629,13 +629,6 @@ const map = {
return []; return [];
} }
}, },
stationCircleList: state => {
if (state.nccData) {
return state.nccData.stationCircleList || [];
} else {
return [];
}
},
// trainDetails: (state) => { // trainDetails: (state) => {
// return state.trainDetails; // return state.trainDetails;
// }, // },

15
src/views/contest/contestDetail.vue
View File

@ -44,7 +44,8 @@
</div> </div>
<div style="text-align: center;margin-top: 15px;"> <div style="text-align: center;margin-top: 15px;">
<el-button v-show="nowData.ruleId" v-loading="loading" type="primary" @click="showScoreRule">评分表</el-button> <el-button v-show="nowData.ruleId" v-loading="loading" type="primary" @click="showScoreRule">评分表</el-button>
<el-button v-show="nowData.sceneId&&nowData.scenetype!=='Video'" v-loading="loading" type="primary" @click="startTask">开始任务</el-button> <el-button v-show="nowData.sceneId&&nowData.scenetype=='Local'" v-loading="loading" type="primary" @click="startTask">开始任务</el-button>
<el-button v-show="nowData.sceneId&&nowData.scenetype=='Link'" v-loading="loading" type="primary" @click="startThreeTask">开始任务</el-button>
<el-button v-show="nowData.sceneId&&nowData.scenetype=='Video'" type="primary" @click="playSceneVideo">播放视频</el-button> <el-button v-show="nowData.sceneId&&nowData.scenetype=='Video'" type="primary" @click="playSceneVideo">播放视频</el-button>
<el-button v-loading="loading" type="primary" :disabled="nowKey === taskList.length-1" @click="nextTask">下一任务</el-button> <el-button v-loading="loading" type="primary" :disabled="nowKey === taskList.length-1" @click="nextTask">下一任务</el-button>
</div> </div>
@ -58,6 +59,7 @@
<script> <script>
import { getTaskTree, getContextSenceDetail} from '@/api/contest'; import { getTaskTree, getContextSenceDetail} from '@/api/contest';
import { createSimulationNoFunction } from '@/api/simulation'; import { createSimulationNoFunction } from '@/api/simulation';
import { getToken } from '@/utils/auth';
import { getPublishMapInfo } from '@/api/jmap/map'; import { getPublishMapInfo } from '@/api/jmap/map';
import ScoreRule from './scoreRule'; import ScoreRule from './scoreRule';
import PlayVideo from './PlayVideo'; import PlayVideo from './PlayVideo';
@ -180,6 +182,17 @@ export default {
this.loading = false; this.loading = false;
} }
}, },
startThreeTask() {
this.loading = true;
getContextSenceDetail(this.nowData.sceneId).then((res) => {
const url = res.data.scene.url;
const token = getToken();
window.open(`${url}${token}`, '_blank');
this.loading = false;
}).catch(error => {
this.$message.error(error.message);
});
},
showScoreRule() { showScoreRule() {
this.$refs.scoreRule.doShow(this.nowData.ruleId); this.$refs.scoreRule.doShow(this.nowData.ruleId);
}, },

20
src/views/contestDataManage/contestSceneManage/ContestSceneManage.vue
View File

@ -2,16 +2,18 @@
<div> <div>
<query-list-page ref="user" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" /> <query-list-page ref="user" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
<upload-Video ref="uploadVideo" @reloadTable="reloadTable" /> <upload-Video ref="uploadVideo" @reloadTable="reloadTable" />
<add-three ref="upThree" @reloadTable="reloadTable" />
</div> </div>
</template> </template>
<script> <script>
import { queryContestSencePaged, deleteContestSence } from '@/api/contest'; import { queryContestSencePaged, deleteContestSence } from '@/api/contest';
import UploadVideo from './UploadVideo'; import UploadVideo from './UploadVideo';
import addThree from './addThree';
export default { export default {
name: 'ContestSeasonManage', name: 'ContestSeasonManage',
components: { components: {
UploadVideo UploadVideo, addThree
}, },
data() { data() {
return { return {
@ -92,6 +94,13 @@ export default {
return row.type == 'Video'; return row.type == 'Video';
} }
}, },
{
name: '编辑',
handleClick: this.doEditLink,
showControl: row => {
return row.type == 'Link';
}
},
{ {
name: '删 除', name: '删 除',
handleClick: this.doDelete, handleClick: this.doDelete,
@ -101,7 +110,8 @@ export default {
} }
], ],
actions: [ actions: [
{ text: '上 传', handler: this.doUpload } { text: '上 传', handler: this.doUpload },
{ text: '添 加', handler: this.doUpThree }
] ]
} }
}; };
@ -116,6 +126,12 @@ export default {
doEdit(index, row) { doEdit(index, row) {
this.$refs.uploadVideo.doShow(row.id); this.$refs.uploadVideo.doShow(row.id);
}, },
doUpThree() {
this.$refs.upThree.doShow();
},
doEditLink(index, row) {
this.$refs.upThree.doShow(row.id);
},
doDelete(index, row) { doDelete(index, row) {
this.$confirm('该操作将删除竞赛场景，是否继续？', '提 示', { this.$confirm('该操作将删除竞赛场景，是否继续？', '提 示', {
confirmButtonText: '确 定', confirmButtonText: '确 定',

108
src/views/contestDataManage/contestSceneManage/addThree.vue Normal file
View File

@ -0,0 +1,108 @@
<template>
<el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="500px" :before-close="handleClose" center :close-on-click-modal="false">
<el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="100px">
<el-form-item label="场景名称:" prop="name">
<el-input v-model="formModel.name" style="width: 350px;" />
</el-form-item>
<el-form-item label="场景url:" prop="url">
<el-input v-model="formModel.url" type="textarea" style="width:350px;" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
<el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
</span>
</el-dialog>
</template>
<script>
import { saveSceneVideo, editSceneVideo, getContextSenceDetail } from '@/api/contest';
export default {
name: 'AddContestTask',
data() {
return {
dialogVisible: false,
formModel: {
id: '',
name: '',
url: ''
},
loading: false
};
},
computed: {
rules() {
const crules = {
name: [
{ required: true, message: '请输入场景名称', trigger: 'blur' }
],
url: [
{ required: true, message: '请输入场景url', trigger: 'blur' }
]
};
return crules;
},
title() {
return this.formModel.id ? '修改三维场景' : '新建三维场景';
}
},
methods:{
doShow(sceneId) {
this.dialogVisible = true;
if (sceneId) {
this.formModel.id = sceneId;
getContextSenceDetail(sceneId).then((res) => {
this.formModel.name = res.data.name;
this.formModel.url = res.data.scene.url;
}).catch(error => {
this.$message.error(error.message);
});
} else {
this.formModel = {
id: '',
name: '',
url: ''
};
}
},
handleClose() {
this.formModel = {
id: '',
name: '',
url: ''
};
this.dialogVisible = false;
this.loading = false;
},
doSave() {
this.$refs.ruleForm.validate((valid) => {
if (valid) {
this.loading = true;
const data = { name:this.formModel.name, type:'Link',
scene:{url:this.formModel.url}};
if (this.formModel.id) {
editSceneVideo(this.formModel.id, data).then(() => {
this.$message.success('修改三维场景成功！');
this.handleClose();
this.$emit('reloadTable');
}).catch(error => {
this.$message.error(error.message);
this.loading = false;
});
} else {
saveSceneVideo(data).then(() => {
this.$message.success('创建三维场景成功！');
this.handleClose();
this.$emit('reloadTable');
}).catch(error => {
this.$message.error(error.message);
this.loading = false;
});
}
}
});
}
}
};
</script>

2
src/views/iscs/iscsDesign/demonList.vue
View File

@ -58,7 +58,7 @@ export default {
mapPublishList: [], mapPublishList: [],
pageTreeMap: { pageTreeMap: {
'01': [], '01': [],
'49': [ '63': [
{ {
// 牵引降压混合变电所主接线图 变电所接线图 降压变电所主接线图 解除网图 混合变电所主接线图 // 牵引降压混合变电所主接线图 变电所接线图 降压变电所主接线图 解除网图 混合变电所主接线图
name: '电力监控系统', name: '电力监控系统',

4
src/views/iscs/iscsSystem/config/broadcast/stationHome.vue
View File

@ -471,7 +471,11 @@ export default {
const audio = document.getElementById(position.toLowerCase() + '_voice'); const audio = document.getElementById(position.toLowerCase() + '_voice');
if (!audio) { return; } if (!audio) { return; }
audio.pause(); audio.pause();
if(info.url.startsWith('http')) {
audio.src = info.url;
} else {
audio.src = this.$store.state.user.ossUrl + info.url; audio.src = this.$store.state.user.ossUrl + info.url;
}
audio.play(); audio.play();
const _that = this; const _that = this;
audio.addEventListener('ended', function() { audio.addEventListener('ended', function() {

89
src/views/iscs/iscsSystem/stationNav.vue
View File

@ -86,7 +86,7 @@ import { getByGroupStationList } from '@/api/jmap/map';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
// import { getSessionStorage } from '@/utils/auth'; // import { getSessionStorage } from '@/utils/auth';
import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp'; import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
import { clearSimulation } from '@/api/simulation'; import { destroySimulationByAdmin } from '@/api/simulation';
import alarmConfig from './stationConfig/dialog/alarm'; import alarmConfig from './stationConfig/dialog/alarm';
import incidentConfig from './stationConfig/dialog/incident'; import incidentConfig from './stationConfig/dialog/incident';
@ -117,27 +117,27 @@ export default {
id: 'substation', id: 'substation',
type: 'interface' type: 'interface'
}, },
{ // {
name: '能耗检测管理系统', // name: '能耗检测管理系统',
mode: 'energyDetected', // mode: 'energyDetected',
id: 'energyDetected', // id: 'energyDetected',
type: 'interface' // type: 'interface'
} // }
] }, ] },
environment:{name:'环境与设备监控系统', type:'totalSystem', id: 'environment', active:false, icon:iscs_icon3, environment:{name:'环境与设备监控系统', type:'totalSystem', id: 'environment', active:false, icon:iscs_icon3,
children:[ children:[
{ // {
name: '车站模式管理器', // name: '车站模式管理器',
mode: 'environmentOne', // mode: 'environmentOne',
id: 'environmentOne', // id: 'environmentOne',
type: 'interface' // type: 'interface'
}, // },
{ // {
name: '时间管理器', // name: '时间管理器',
mode: 'environmentTwo', // mode: 'environmentTwo',
id: 'environmentTwo', // id: 'environmentTwo',
type: 'interface' // type: 'interface'
}, // },
{ {
name: '隧道通风系统', name: '隧道通风系统',
mode: 'environmentThree', mode: 'environmentThree',
@ -257,32 +257,32 @@ export default {
]}, ]},
signalSystem:{name:'信号系统', type:'totalSystem', id: 'signalSystem', mode: 'signalSystem', active:false, icon:iscs_icon7, signalSystem:{name:'信号系统', type:'totalSystem', id: 'signalSystem', mode: 'signalSystem', active:false, icon:iscs_icon7,
children:[ children:[
{ // {
name: 'TIS管理器', // name: 'TIS管理器',
mode: 'tis', // mode: 'tis',
id: 'tis', // id: 'tis',
type: 'interface', // type: 'interface',
disabled: true // disabled: true
}, // },
{ {
name: '列车时刻表', name: '列车时刻表',
mode: 'schedule', mode: 'schedule',
id: 'schedule', id: 'schedule',
type: 'interface' type: 'interface'
}, },
{ // {
name: '信号系统', // name: '信号系统',
mode: 'signal', // mode: 'signal',
id: 'signal', // id: 'signal',
type: 'interface' // type: 'interface'
}, // },
{ // {
name: '全线信号系统界面', // name: '全线信号系统界面',
mode: 'allLineSignal', // mode: 'allLineSignal',
id: 'allLineSignal', // id: 'allLineSignal',
type: 'interface', // type: 'interface',
disabled: true // disabled: true
} // }
]}, ]},
communication:{name:'通信', type:'totalSystem', id: 'communication', active:false, icon:iscs_icon7, communication:{name:'通信', type:'totalSystem', id: 'communication', active:false, icon:iscs_icon7,
children:[ children:[
@ -365,7 +365,7 @@ export default {
res.data.forEach(station => { res.data.forEach(station => {
if (!station.depot && station.visible) { if (!station.depot && station.visible) {
const param = { const param = {
name: station.runPlanName.includes('站') ? station.runPlanName : `${station.runPlanName}站`, name: station.name,
id: station.code id: station.code
}; };
@ -492,13 +492,16 @@ export default {
this.$store.dispatch('LogOut').then(() => { this.$store.dispatch('LogOut').then(() => {
location.reload(); location.reload();
}); });
} else { } else if(this.$store.state.training.simulationCreator){
clearSimulation(this.$route.query.group).then(resp => { destroySimulationByAdmin(this.$route.query.group).then(resp => {
this.$router.push({ path: `/trainingPlatform` }); history.go(-1);
}).catch(()=> { }).catch(()=> {
this.$message.error('清除仿真失败！'); this.$message.error('清除仿真失败！');
}); });
} else {
history.go(-1);
} }
}, },
quit() { quit() {
window.close(); window.close();

18
src/views/iscs/iscsSystemNew/config/broadcast/stationHome.vue
View File

@ -488,7 +488,11 @@ export default {
const audio = document.getElementById(position.toLowerCase() + '_voice'); const audio = document.getElementById(position.toLowerCase() + '_voice');
if (!audio) { return; } if (!audio) { return; }
audio.pause(); audio.pause();
if(info.url.startsWith('http')) {
audio.src = info.url;
} else {
audio.src = this.$store.state.user.ossUrl + info.url; audio.src = this.$store.state.user.ossUrl + info.url;
}
audio.play(); audio.play();
// const _that = this; // const _that = this;
// audio.addEventListener('ended', function() { // audio.addEventListener('ended', function() {
@ -635,13 +639,13 @@ export default {
return; return;
} }
sendCommandNew(this.$route.query.group, 'ISCS_PA_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes }).then(resp => { sendCommandNew(this.$route.query.group, 'ISCS_PA_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes }).then(resp => {
// positionList.forEach(elem => { positionList.forEach(elem => {
// const audio = document.getElementById(elem.toLowerCase() + '_voice'); const audio = document.getElementById(elem.toLowerCase() + '_voice');
// audio.pause(); audio && audio.pause();
// }); });
// const audio = document.getElementById('voice'); const audio = document.getElementById('voice');
// audio.pause(); audio.pause();
}).catch(() => { }).catch((e) => {
this.$message.error('背景音乐终止播放失败！'); this.$message.error('背景音乐终止播放失败！');
}); });
}, },

1
src/views/iscs/iscsSystemNew/index.vue
View File

@ -24,7 +24,6 @@ export default {
}; };
}, },
mounted() { mounted() {
}, },
methods:{ methods:{
selectIscsPane(param) { selectIscsPane(param) {

4
src/views/iscs/iscsSystemNew/stationConfig/environment.vue
View File

@ -62,6 +62,9 @@ export default {
watch:{ watch:{
'mode':function() { 'mode':function() {
this.getInitData(); this.getInitData();
},
'stationId':function() {
this.getInitData();
} }
}, },
mounted() { mounted() {
@ -94,6 +97,7 @@ export default {
getInitData() { getInitData() {
let userInterface = ''; let userInterface = '';
this.system = 'environment'; this.system = 'environment';
console.log(this.stationName, '====')
if (this.mode == 'environmentThree') { if (this.mode == 'environmentThree') {
this.title = this.stationName + ' 隧道通风系统'; this.title = this.stationName + ' 隧道通风系统';
this.scaleRate = window.innerWidth / 2000; this.scaleRate = window.innerWidth / 2000;

3
src/views/iscs/iscsSystemNew/stationConfig/fas.vue
View File

@ -47,6 +47,9 @@ export default {
watch:{ watch:{
'mode':function() { 'mode':function() {
this.getInitData(); this.getInitData();
},
'stationId':function() {
this.getInitData();
} }
}, },
mounted() { mounted() {

9
src/views/iscs/iscsSystemNew/stationConfig/index.vue
View File

@ -33,6 +33,7 @@ import PidsEmergency from '../config/pis/emergencyRelease';
import PidsMain from '../config/pis/mainScreen'; import PidsMain from '../config/pis/mainScreen';
import PidsPreview from '../config/pis/timePreview'; import PidsPreview from '../config/pis/timePreview';
import PidsLcd from '../config/pis/lcdControl'; import PidsLcd from '../config/pis/lcdControl';
import { EventBus } from '@/scripts/event-bus';
export default { export default {
name:'StationConfig', name:'StationConfig',
@ -67,6 +68,14 @@ export default {
] ]
}; };
}, },
mounted() {
EventBus.$on('iscsModeChange', (type) => {
this.mode = type;
});
},
beforeDestroy() {
EventBus.$off('iscsModeChange',(type) => {this.mode = type});
},
methods:{ methods:{
showPane(param) { showPane(param) {
this.mode = param.type; this.mode = param.type;

12
src/views/iscs/iscsSystemNew/stationConfig/iscsCanvas.vue
View File

@ -18,6 +18,7 @@ import ProtectReset from './dialog/protectReset';
import mapElement from '@/iscs/status/mapElement.js'; import mapElement from '@/iscs/status/mapElement.js';
import {deviceFactory} from '@/iscs/utils/parser'; import {deviceFactory} from '@/iscs/utils/parser';
import { setNum } from '@/iscs/status/mapElement.js'; import { setNum } from '@/iscs/status/mapElement.js';
import { EventBus } from '@/scripts/event-bus';
export default { export default {
name: 'IscsStation', name: 'IscsStation',
@ -109,15 +110,6 @@ export default {
onlclick(em) { onlclick(em) {
// 父编组上元素内容 // 父编组上元素内容
const query = {
stationName: this.$route.query.stationName,
stationId: this.$route.query.stationId,
group: this.$route.query.group,
mapId: this.$route.query.mapId,
lineCode:'02',
noPreLogout:this.$route.query.noPreLogout,
partId: ''
};
let type = ''; let type = '';
if (em.deviceType == 'IscsButton') { if (em.deviceType == 'IscsButton') {
if (em.deviceModel.function == 'goToStand') { if (em.deviceModel.function == 'goToStand') {
@ -149,7 +141,7 @@ export default {
} }
if (type) { if (type) {
this.$router.replace({ path: `/displayIscs/system/stationConfig/${type}`, query: query }); EventBus.$emit('iscsModeChange', type)
} }
} }
}, },

5
src/views/iscs/iscsSystemNew/stationConfig/signalSystem.vue
View File

@ -43,6 +43,11 @@ export default {
scaleRate:window.innerWidth / 2200, scaleRate:window.innerWidth / 2200,
height: 1000 height: 1000
}; };
},
watch:{
'stationId':function() {
this.getInitData();
}
}, },
mounted() { mounted() {
this.getInitData(); this.getInitData();

4
src/views/iscs/iscsSystemNew/stationConfig/ticketOrEntrance.vue
View File

@ -46,6 +46,9 @@ export default {
}, },
'mode':function() { 'mode':function() {
this.getInitData(); this.getInitData();
},
'stationId':function() {
this.getInitData();
} }
}, },
mounted() { mounted() {
@ -116,4 +119,3 @@ export default {
display: inline-block; display: inline-block;
} }
</style> </style>

103
src/views/iscs/iscsSystemNew/stationNav.vue
View File

@ -82,6 +82,7 @@ import iscs_icon7 from '@/assets/iscs_system/iscs_icon7.png';
import alarmConfig from './stationConfig/dialog/alarm'; import alarmConfig from './stationConfig/dialog/alarm';
import incidentConfig from './stationConfig/dialog/incident'; import incidentConfig from './stationConfig/dialog/incident';
import malfunction from './stationConfig/dialog/malfunction'; import malfunction from './stationConfig/dialog/malfunction';
import { destroySimulationByAdmin } from '@/api/simulation';
export default { export default {
name:'StationNav', name:'StationNav',
components: { components: {
@ -106,27 +107,27 @@ export default {
id: 'substation', id: 'substation',
type: 'interface' type: 'interface'
}, },
{ // {
name: '能耗检测管理系统', // name: '能耗检测管理系统',
mode: 'energyDetected', // mode: 'energyDetected',
id: 'energyDetected', // id: 'energyDetected',
type: 'interface' // type: 'interface'
} // }
] }, ] },
environment:{name:'环境与设备监控系统', type:'totalSystem', id: 'environment', active:false, icon:iscs_icon3, environment:{name:'环境与设备监控系统', type:'totalSystem', id: 'environment', active:false, icon:iscs_icon3,
children:[ children:[
{ // {
name: '车站模式管理器', // name: '车站模式管理器',
mode: 'environmentOne', // mode: 'environmentOne',
id: 'environmentOne', // id: 'environmentOne',
type: 'interface' // type: 'interface'
}, // },
{ // {
name: '时间管理器', // name: '时间管理器',
mode: 'environmentTwo', // mode: 'environmentTwo',
id: 'environmentTwo', // id: 'environmentTwo',
type: 'interface' // type: 'interface'
}, // },
{ {
name: '隧道通风系统', name: '隧道通风系统',
mode: 'environmentThree', mode: 'environmentThree',
@ -246,32 +247,32 @@ export default {
]}, ]},
signalSystem:{name:'信号系统', type:'totalSystem', id: 'signalSystem', mode: 'signalSystem', active:false, icon:iscs_icon7, signalSystem:{name:'信号系统', type:'totalSystem', id: 'signalSystem', mode: 'signalSystem', active:false, icon:iscs_icon7,
children:[ children:[
{ // {
name: 'TIS管理器', // name: 'TIS管理器',
mode: 'tis', // mode: 'tis',
id: 'tis', // id: 'tis',
type: 'interface', // type: 'interface',
disabled: true // disabled: true
}, // },
{ {
name: '列车时刻表', name: '列车时刻表',
mode: 'schedule', mode: 'schedule',
id: 'schedule', id: 'schedule',
type: 'interface' type: 'interface'
}, },
{ // {
name: '信号系统', // name: '信号系统',
mode: 'signal', // mode: 'signal',
id: 'signal', // id: 'signal',
type: 'interface' // type: 'interface'
}, // },
{ // {
name: '全线信号系统界面', // name: '全线信号系统界面',
mode: 'allLineSignal', // mode: 'allLineSignal',
id: 'allLineSignal', // id: 'allLineSignal',
type: 'interface', // type: 'interface',
disabled: true // disabled: true
} // }
]}, ]},
communication:{name:'通信', type:'totalSystem', id: 'communication', active:false, icon:iscs_icon7, communication:{name:'通信', type:'totalSystem', id: 'communication', active:false, icon:iscs_icon7,
children:[ children:[
@ -335,7 +336,7 @@ export default {
res.data.forEach(station => { res.data.forEach(station => {
if (!station.depot && station.visible) { if (!station.depot && station.visible) {
const param = { const param = {
name: station.runPlanName.includes('站') ? station.runPlanName : `${station.runPlanName}站`, name: station.name,
id: station.code id: station.code
}; };
if (station.centralized) { if (station.centralized) {
@ -402,19 +403,19 @@ export default {
this.$refs.malfunction.doShow('CANCEL'); this.$refs.malfunction.doShow('CANCEL');
}, },
back() { back() {
if (this.projectDevice) {
this.$store.dispatch('LogOut').then(() => {
location.reload();
});
} else if(this.$store.state.training.simulationCreator){
destroySimulationByAdmin(this.$route.query.group).then(resp => {
history.go(-1); history.go(-1);
// this.clearSubscribe(); }).catch(()=> {
// if (this.projectDevice) { this.$message.error('清除仿真失败！');
// this.$store.dispatch('LogOut').then(() => { });
// location.reload(); } else {
// }); history.go(-1);
// } else { }
// clearSimulation(this.$route.query.group).then(resp => {
// this.$router.push({ path: `/trainingPlatform` });
// }).catch(()=> {
// this.$message.error('清除仿真失败！');
// });
// }
} }
} }
}; };

1
src/views/newMap/display/exam/examPanel.vue
View File

@ -93,6 +93,7 @@ export default {
beforeDestroy() { beforeDestroy() {
this.$store.dispatch('trainingNew/setExamSwitch', false); this.$store.dispatch('trainingNew/setExamSwitch', false);
if (this.examInterval) { clearInterval(this.examInterval); } if (this.examInterval) { clearInterval(this.examInterval); }
EventBus.$off('trainExamSubmit');
}, },
mounted() { mounted() {
EventBus.$on('trainExamSubmit', (data) => { EventBus.$on('trainExamSubmit', (data) => {

44
src/views/newMap/display/exam/selectExam.vue
View File

@ -7,6 +7,21 @@
:close-on-click-modal="false" :close-on-click-modal="false"
@open="onOpen" @open="onOpen"
> >
<el-form :inline="true" :model="form" size="small" style="display: flex; justify-content: space-between;">
<el-form-item label="创建人">
<el-select v-model="form.creatorId" :clearable="true">
<el-option
v-for="(option,index) in creatorList"
:key="id"
:label="option.name"
:value="option.id"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
</el-form-item>
</el-form>
<el-table :data="paperList" border> <el-table :data="paperList" border>
<el-table-column prop="name" label="试卷名称" width="150px"> <el-table-column prop="name" label="试卷名称" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
@ -58,14 +73,18 @@
</template> </template>
<script> <script>
import { getPapaerListOfOrg, generateExam, getUserExamInfo } from '@/api/management/exam'; import { getPapaerListOfOrg, generateExam, getUserExamInfo, queryPaperCreatorList } from '@/api/management/exam';
export default { export default {
name: 'SelectExam', name: 'SelectExam',
emits: ['examStart'], emits: ['examStart'],
data() { data() {
return { return {
show: false, show: false,
paperList: [] paperList: [],
creatorList: [],
form: {
creatorId: ''
}
}; };
}, },
methods: { methods: {
@ -76,11 +95,28 @@ export default {
this.show = false; this.show = false;
}, },
onOpen() { onOpen() {
getPapaerListOfOrg({ this.creatorList = [];
const data = {
orgId: this.$store.state.user.companyId, orgId: this.$store.state.user.companyId,
mapId: this.$route.query.mapId, mapId: this.$route.query.mapId,
findState: 3 findState: 3
}).then(resp => { }
queryPaperCreatorList(data).then(response => {
this.creatorList = response.data;
});
this.onSubmit();
},
onSubmit() {
const data = {
orgId: this.$store.state.user.companyId,
mapId: this.$route.query.mapId,
creatorId: this.form.creatorId,
findState: 3
};
if(!data.creatorId) {
delete data.creatorId;
}
getPapaerListOfOrg(data).then(resp => {
this.paperList = resp.data.list; this.paperList = resp.data.list;
}); });
}, },

2
src/views/newMap/display/terminals/index.vue
View File

@ -29,7 +29,7 @@
<diagram-load v-else-if="picture === 'diagramLoad'" ref="diagramLoad" :group="group" /> <diagram-load v-else-if="picture === 'diagramLoad'" ref="diagramLoad" :group="group" />
<diagram-preview v-else-if="picture === 'diagramPreview'" ref="diagramPreview" /> <diagram-preview v-else-if="picture === 'diagramPreview'" ref="diagramPreview" />
<diagram-edit v-else-if="picture === 'diagramEdit'" ref="diagramEdit" :plan-id="loadPlanId" @pictureChange="pictureChangeAndPlan" /> <diagram-edit v-else-if="picture === 'diagramEdit'" ref="diagramEdit" :plan-id="loadPlanId" @pictureChange="pictureChangeAndPlan" />
<pis-terminal v-else-if="picture === 'pis'" ref="pisTerminal" /> <pis-terminal v-else-if="picture === 'pisStand' || picture === 'pisTrain'" ref="pisTerminal" />
<display-ba-si-di v-else-if="picture === 'baSiDi'" ref="displayBaSiDi" @pictureChange="pictureChangeByType" /> <display-ba-si-di v-else-if="picture === 'baSiDi'" ref="displayBaSiDi" @pictureChange="pictureChangeByType" />
<tro-work v-else-if="picture === 'troWork'" ref="troWork" /> <tro-work v-else-if="picture === 'troWork'" ref="troWork" />
<tro-detail-work v-else-if="picture === 'troDetailWork'" ref="troDetailWork" :show-station-code="showStationCode" @pictureChange="pictureChangeByType" /> <tro-detail-work v-else-if="picture === 'troDetailWork'" ref="troDetailWork" :show-station-code="showStationCode" @pictureChange="pictureChangeByType" />

6
src/views/newMap/display/terminals/paScreen.vue
View File

@ -8,7 +8,8 @@
<div class="station-box"> <div class="station-box">
<div class="leftRect" /> <div class="leftRect" />
<div class="rightRect" /> <div class="rightRect" />
<div class="station-list-box" :class="{'active': selectStation == item.id,'currentStation':tractionList.includes(item.name)}" @click="changeStation(item.id)" /> <!--@click="changeStation(item.id)"-->
<div class="station-list-box" :class="{'active': selectStation == item.id,'currentStation':tractionList.includes(item.name)}"/>
</div> </div>
<div class="station-name" :class="index==0?'station-name-first':index%2==1?'station-name-up':'station-name-down'">{{ item.name }}</div> <div class="station-name" :class="index==0?'station-name-first':index%2==1?'station-name-up':'station-name-down'">{{ item.name }}</div>
</div> </div>
@ -42,7 +43,7 @@ export default {
res.data.forEach(station => { res.data.forEach(station => {
if (!station.depot && station.visible) { if (!station.depot && station.visible) {
const param = { const param = {
name: station.runPlanName.includes('站') ? station.runPlanName : `${station.runPlanName}站`, name: station.name,
id: station.code id: station.code
}; };
if (station.centralized) { if (station.centralized) {
@ -102,6 +103,7 @@ export default {
border-left: 1px #fdfdfd solid; border-left: 1px #fdfdfd solid;
border-right: 1px #262626 solid; border-right: 1px #262626 solid;
transform: translateY(-50%); transform: translateY(-50%);
cursor: not-allowed;
} }
.station-list-box.currentStation::before{ .station-list-box.currentStation::before{
content: ''; content: '';

2
src/views/newMap/display/terminals/pisScreen.vue
View File

@ -70,7 +70,7 @@ export default {
res.data.forEach(station => { res.data.forEach(station => {
if (!station.depot && station.visible) { if (!station.depot && station.visible) {
const param = { const param = {
name: station.runPlanName.includes('站') ? station.runPlanName : `${station.runPlanName}站`, name: station.name,
id: station.code id: station.code
}; };
if (station.centralized) { if (station.centralized) {

2
src/views/newMap/display/terminals/terminalMenu.vue
View File

@ -81,7 +81,7 @@ export default {
} else { } else {
this.initPictureShow(); this.initPictureShow();
} }
} else if (!this.terminalList.length) { } else {
this.initTerminalList([]); this.initTerminalList([]);
if (this.$route.query.client && !this.nowTerminal.id) { if (this.$route.query.client && !this.nowTerminal.id) {
this.changeQueryClient(); this.changeQueryClient();

11
src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue
View File

@ -359,7 +359,16 @@ export default {
name: '通号端', name: '通号端',
code: 'maintainerSelect', code: 'maintainerSelect',
isShow: () => type === 'METRO' isShow: () => type === 'METRO'
},
{
name: '站台PIS',
code: 'pisStand',
isShow: () => type === 'METRO'
},
{
name: '列车PIS',
code: 'pisTrain',
isShow: () => type === 'METRO'
} }
]; ];
const terminalList = commonTerminals(type); const terminalList = commonTerminals(type);

35
src/views/organization/examManage/index.vue
View File

@ -12,7 +12,7 @@
<script> <script>
import config from '@/scripts/ConstConfig'; import config from '@/scripts/ConstConfig';
import { getPapaerListOfOrg, getAllPapaerListOfOrg, lockPaper, invalidPaper, deletePaper } from '@/api/management/exam'; import { getPapaerListOfOrg, getAllPapaerListOfOrg, lockPaper, invalidPaper, deletePaper, queryPaperCreatorList } from '@/api/management/exam';
import { getPublishMapListOnline } from '@/api/jmap/map'; import { getPublishMapListOnline } from '@/api/jmap/map';
const { paperStateArr, paperStateQueryMap } = config.ConstSelect; const { paperStateArr, paperStateQueryMap } = config.ConstSelect;
@ -25,6 +25,7 @@ export default {
pageSize: 'pageSize', pageSize: 'pageSize',
pageIndex: 'pageNum' pageIndex: 'pageNum'
}, },
creatorList: [],
mapIdList: [], mapIdList: [],
examQueryForm: { examQueryForm: {
leftSpan: 14, leftSpan: 14,
@ -48,6 +49,11 @@ export default {
})) }))
}, },
noClearable: true noClearable: true
},
creatorId: {
type: 'select',
label: '创建人:',
config: {},
} }
} }
}, },
@ -63,6 +69,16 @@ export default {
{ {
title: '简介', title: '简介',
prop: 'profile' prop: 'profile'
},
{
title: '地图',
prop: 'mapId',
type: 'tag',
width: '120',
columnValue: row => {
return this.mapIdList.find(item => item.id == row.mapId) ? this.mapIdList.find(item => item.id == row.mapId).name : ''
},
tagType: row => ''
}, },
{ {
title: '状态', title: '状态',
@ -174,12 +190,29 @@ export default {
getPublishMapListOnline().then(response => { getPublishMapListOnline().then(response => {
this.mapIdList = response.data; this.mapIdList = response.data;
}); });
this.creatorList = [];
const data = {};
if (!this.hasTeachingDataManage()) {
data.orgId = this.orgId;
}
queryPaperCreatorList(data).then(response => {
this.creatorList = response.data.map(item => {
return {
value: item.id,
label: item.name
}
});
this.examQueryForm.queryObject.creatorId.config.data = this.creatorList;
});
}, },
methods: { methods: {
hasTeachingDataManage() { hasTeachingDataManage() {
return this.$route.path.includes('/teachingDataManage/'); return this.$route.path.includes('/teachingDataManage/');
}, },
getListApi(obj) { getListApi(obj) {
if(!obj.creatorId) {
delete obj.creatorId;
}
if (this.hasTeachingDataManage()) { if (this.hasTeachingDataManage()) {
return getAllPapaerListOfOrg({ ...obj }); return getAllPapaerListOfOrg({ ...obj });
} else { } else {

2
src/views/publish/examRule/draft/editRule.vue
View File

@ -380,7 +380,7 @@ export default {
width: 100%; width: 100%;
} }
} }
.dialog-footer { .dialog-footer{
text-align: center; text-align: center;
} }
</style> </style>

2
src/views/publish/examRule/draft/rule.vue
View File

@ -147,7 +147,7 @@ export default {
topicNum: formData.topicNum, topicNum: formData.topicNum,
tags: [formData.tags], tags: [formData.tags],
subTypeParam: { subTypeParam: {
client: formData.trainingClient client: formData.trainingClient || null
} }
}; };
if (formData.subtype === 5 && formData.sceneInfo && formData.sceneInfo.length) { if (formData.subtype === 5 && formData.sceneInfo && formData.sceneInfo.length) {

94
src/views/thirdLogin/cgyLogin.vue Normal file
View File

@ -0,0 +1,94 @@
<template>
<div class="thirdLoginContainer">
<div class="thirdLoginMessage">
{{ message }}
</div>
</div>
</template>
<script>
import { cgyThirdLogin } from '@/api/management/user';
import { setToken } from '@/utils/auth';
import { createSimulation } from '@/api/simulation';
import { launchFullscreen } from '@/utils/screen';
import { getMapFunctioById } from '@/api/trainingPlatform';
import { getPublishMapInfo } from '@/api/jmap/map';
export default {
name:'CgyLogin',
data() {
return {
message:''
};
},
computed: {
project() {
const project = this.$route.query.project;
return project || 'login';
}
},
mounted() {
const appId = this.$route.query.appId;
const sessionId = this.$route.query.sessionId;
const timeStamp = this.$route.query.timeStamp;
const account = this.$route.query.account;
const name = this.$route.query.name;
const parentAccount = this.$route.query.parentAccount;
const functionId = this.$route.query.functionId;
if (appId && account && name) {
const data = {
appId,
sessionId,
timeStamp,
account,
name,
parentAccount,
functionId
};
this.message = '正在登陆中......';
cgyThirdLogin(data).then(resp=> {
const token = resp.data;
const header = { group: '', 'X-Token': token };
setToken(token);
this.$store.dispatch('setToken', token);
this.$store.dispatch('subscribe', {header, type:'class'});
this.enterSimulation();
}).catch(() => {
this.message = '参数有误，请检查';
});
} else {
this.message = '参数有误，请检查';
}
},
methods:{
async enterSimulation() {
const query = {
third: true,
query: 'cgy'
};
const resp = await getMapFunctioById(this.$route.query.systemId);
query.mapId = resp.data.mapId;
query.simType = resp.data.simType;
const resp1 = await getPublishMapInfo(resp.data.mapId);
query.lineCode = resp1.data.lineCode;
createSimulation(this.$route.query.systemId).then(resp => {
query.group = resp.data;
this.$router.replace({ path: `/display/demon`, query: query });
launchFullscreen();
}).catch(error=>{
if (error.code == 10003) {
this.$messageBox(this.$t('error.createSimulationFailed') + '：您的仿真权限不足！');
} else {
this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
}
this.disabled = false;
});
}
}
};
</script>
<style lang="scss" scoped>
.thirdLoginMessage{
padding: 20px;
font-size: 20px;
}
</style>

7
src/views/trainingPlatform/simulation.vue
View File

@ -29,7 +29,7 @@
</template> </template>
</el-collapse> </el-collapse>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="联机" name="second"> <el-tab-pane v-if="canLiji" label="联机" name="second">
<el-form ref="ruleForm" v-loading="loading" :model="ruleForm" :rules="rules" label-width="100px"> <el-form ref="ruleForm" v-loading="loading" :model="ruleForm" :rules="rules" label-width="100px">
<el-form-item label="仿真号" prop="inputGroup"> <el-form-item label="仿真号" prop="inputGroup">
<el-input v-model="ruleForm.inputGroup" placeholder="请输入仿真号" style="width: 200px;" /> <el-input v-model="ruleForm.inputGroup" placeholder="请输入仿真号" style="width: 200px;" />
@ -68,6 +68,7 @@ export default {
return { return {
loading: false, loading: false,
param: '', param: '',
canLiji: false,
collapse: '1', collapse: '1',
subsetList: [], subsetList: [],
subsetMap: {}, subsetMap: {},
@ -307,7 +308,11 @@ export default {
initMapSystem() { initMapSystem() {
queryMapFunctionList({mapId: this.$route.params.mapId, detail: true}).then(resp => { queryMapFunctionList({mapId: this.$route.params.mapId, detail: true}).then(resp => {
this.systemList = resp.data; this.systemList = resp.data;
this.canLiji = false;
this.systemList.forEach(item => { this.systemList.forEach(item => {
if (item.name === '综合演练') {
this.canLiji = true;
}
if (item.subset && this.subsetList.includes(item.subset) && item.name !== '实训室') { if (item.subset && this.subsetList.includes(item.subset) && item.name !== '实训室') {
this.subsetMap[item.subset].push(item); this.subsetMap[item.subset].push(item);
} else if (item.subset && item.name !== '实训室') { } else if (item.subset && item.name !== '实训室') {

13418
yarn.lock Normal file
View File

File diff suppressed because it is too large Load Diff