diff --git a/src/App.vue b/src/App.vue index 308355b23..48c2ff43e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,12 +1,52 @@ diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js index 4b3080094..ca983d695 100644 --- a/src/i18n/langs/zh/map.js +++ b/src/i18n/langs/zh/map.js @@ -427,6 +427,6 @@ export default { thenList: '交路列表', startStation: '起始站', - endStation: '终到站', + endStation: '终到站' }; diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js index 74ad6263f..ec6e93baf 100644 --- a/src/i18n/langs/zh/rules.js +++ b/src/i18n/langs/zh/rules.js @@ -133,6 +133,6 @@ export default { proximitySection: '请选择接近区段', accessPropertyType: '请选择进路性质类型', autoRouteType: '请选择自动进路类型', - physicalSegmentData: '请选择进路物理区段数据', + physicalSegmentData: '请选择进路物理区段数据' }; diff --git a/src/layout/components/Entry.vue b/src/layout/components/Entry.vue index 246d2138b..f562022f1 100644 --- a/src/layout/components/Entry.vue +++ b/src/layout/components/Entry.vue @@ -4,16 +4,19 @@ {{ item.name }} + diff --git a/src/layout/components/Qcode.vue b/src/layout/components/Qcode.vue new file mode 100644 index 000000000..82b95383e --- /dev/null +++ b/src/layout/components/Qcode.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/src/utils/sock.js b/src/utils/sock.js index 46fc73790..105e29e06 100644 --- a/src/utils/sock.js +++ b/src/utils/sock.js @@ -7,6 +7,7 @@ var Stomp = require('stompjs'); const isDev = process.env.NODE_ENV === 'development'; const websocketUrl = `${getBaseUrl()}/joylink-websocket?token=`; +// const websocketUrl = `http://192.168.3.6:9000/joylink-websocket?token=`; var StompClient = function (headers) { this.url = websocketUrl + handleToken(); diff --git a/src/views/demonstration/deomonList/index.vue b/src/views/demonstration/deomonList/index.vue index c1fd21de1..ebb1bbd96 100644 --- a/src/views/demonstration/deomonList/index.vue +++ b/src/views/demonstration/deomonList/index.vue @@ -9,7 +9,7 @@ :modal="false" :close-on-click-modal="false" > - +
地图列表 -
返回首页
+
@@ -80,9 +80,9 @@ export default { this.clearMapSelect(); }, methods: { - backHome() { - this.$router.push({ path: `/` }); - }, + // backHome() { + // this.$router.push({ path: `/` }); + // }, filterNode(value, data) { if (!value) return true; return data.name.indexOf(value) !== -1; diff --git a/src/views/exam/list/examList.vue b/src/views/exam/list/examList.vue index 688dcb9ca..2c3c7b0ec 100644 --- a/src/views/exam/list/examList.vue +++ b/src/views/exam/list/examList.vue @@ -2,7 +2,7 @@
试题列表 -
返回首页
+
课程列表 -
返回首页
+
-
-
- -
-

综合实训管理者: {{roomInfo.creator}}

-

综合演练室

-
-

可分配角色数量: {{roomInfo.permissionNum - 1}}

- -
-
- -
- -
- -
-
-
-
-

调度员

-
    -
  • - {{nor.nickName}} - -
  • -
-
- - -
-
-
-

车站值班员

-
    -
  • - {{nor.nickName}} - -
    - - - - -
    -
  • -
-
- - -
-
-
-
-
-

教员

-
    -
  • - {{nor.nickName}} - -
  • -
-
- - -
-
-
-

通号

-
    -
  • - {{nor.nickName}} - -
  • -
-
- - -
-
-
-
-
-

司机

-
    -
  • - {{nor.nickName}} - -
  • -
-
- - -
-
-
-
-
-
- - 开始仿真 -
-
- - 进入仿真 - - 结束仿真 -
- 生成二维码 - - 返回 - - 销毁房间 - -
-
+
+
+ +
+

综合实训管理者: {{ roomInfo.creator }}

+

综合演练室

+
+

可分配角色数量: {{ roomInfo.permissionNum - 1 }}

+
- -
-
-
-
{{treeData.length}}/{{roomInfo.totalNum}}
+
+ +
+ +
+ +
+
+
+
+

调度员

+
    +
  • + {{ nor.nickName }} + +
  • +
+
+ +
- - - - - - {{ data.nickName }} - {{ data.nickName }} - - - +
+

车站值班员

+
    +
  • + {{ nor.nickName }} + +
    + + + +
    +
  • +
+
+ +
+
+
+
+
+

教员

+
    +
  • + {{ nor.nickName }} + +
  • +
+
+ +
+
+
+

通号

+
    +
  • + {{ nor.nickName }} + +
  • +
+
+ +
+
+
+
+
+

司机

+
    +
  • + {{ nor.nickName }} + +
  • +
+
+ +
+
+
- - - +
+
+ + 开始仿真 +
+
+ + 进入仿真 + + 结束仿真 +
+ 生成二维码 + + 返回 + + 销毁房间 + +
+
+ +
+
+
+
{{ treeData.length }}/{{ roomInfo.totalNum }}
+
+ + + + + + {{ data.nickName }} + {{ data.nickName }} + + + +
+ + + +