Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/api/practical.js

@@ -1,40 +0,0 @@
-import request from '@/utils/request';
-
-/** 创建实操 */
-export function createPractical(data) {
-    return request({
-        url: `/api/v1/competitionPractical`,
-        method: 'post',
-        data: data
-    });
-}
-/** 加载实操及内容 */
-export function loadingPractical(data) {
-    return request({
-        url: `/api/v1/competitionPractical/distribute`,
-        method: 'post',
-        data: data
-    });
-}
-/** 查询地图下的实操列表 */
-export function getPracticalListByMapId(mapId) {
-    return request({
-        url: `/api/v1/competitionPractical/map/${mapId}`,
-        method: 'get'
-    });
-}
-/** 删除实操 */
-export function deletePractical(practicalId) {
-    return request({
-        url: `/api/v1/competitionPractical/${practicalId}`,
-        method: 'delete'
-    });
-}
-/** 更新实操 */
-export function updatePractical(practicalId, data) {
-    return request({
-        url: `/api/v1/competitionPractical/{practicalId}`,
-        method: 'put',
-        data: data
-    });
-}

src/api/race.js

@@ -33,12 +33,3 @@ export function getPracticeList(params) {
         params
     });
 }
-
-/** 录制实操试题 */
-export function practiceRecordNotify(practiceId) {
-    return request({
-        url: `/api/scriptSimulation/${practiceId}/scriptWrite`,
-        method: 'get'
-    });
-}
-

src/views/competitionManage/practiceList/create.vue

@@ -44,7 +44,7 @@ export default {
                 labelWidth: '120px',
                 items: [
                     { prop: 'name', label: '实操名称', type: 'text' },
-                    { prop:'mapId', label:'地图名称', type:'select', options:this.mapList, disabled:this.isEdit},
+                    { prop:'mapId', label:'实操地图', type:'select', options:this.mapList, disabled:this.isEdit},
                     { prop: 'description', label: '实操描述', type: 'textarea' }
                 ]
             };

src/views/competitionManage/practiceList/index.vue

@@ -7,9 +7,10 @@
 </template>
 <script>
 import Cookies from 'js-cookie';
-import { getPublishMapListOnline } from '@/api/jmap/map';
+import { getPublishMapListOnline, getPublishMapInfo } from '@/api/jmap/map';
-import { getPracticeList, practiceRecordNotify } from '@/api/race';
+import { getPracticeList } from '@/api/race';
 import {updateScript, deleteScript, createScript} from '@/api/script';
+import { scriptRecordNotifyNew } from '@/api/simulation';
 
 import { launchFullscreen } from '@/utils/screen';
 import { UrlConfig } from '@/scripts/ConstDic';
@@ -32,7 +33,7 @@ export default {
                 queryObject: {
                     mapId: {
                         type: 'select',
-                        label: '地图',
+                        label: '实操地图',
                         config: {
                             data: []
                         }
@@ -54,7 +55,7 @@ export default {
                 indexShow: true,
                 columns: [
                     {
-                        title: '竞赛名称',
+                        title: '实操地图',
                         prop: 'mapId',
                         type: 'tag',
                         width: '320',
@@ -63,12 +64,12 @@ export default {
                     },
                     {
                         title: '实操名称',
-                        prop: 'name'
+                        prop: 'name',
+                        width: '400'
                     },
                     {
-                        title: '创建人',
+                        title: '实操描述',
-                        prop: 'creatorName',
+                        prop: 'description'
-                        width: '100'
                     },
                     {
                         type: 'button',
@@ -131,20 +132,30 @@ export default {
             }).catch(() => { });
         },
         doRecord(index, row) {
+            getPublishMapInfo(row.mapId).then(response=>{
+                const lineCode = response.data.lineCode;
+                scriptRecordNotifyNew(row.id).then(resp => {
+                    const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, drawWay:true, lineCode:lineCode};
+                    this.$router.push({ path: `${UrlConfig.scriptDisplayNew}/script`, query });
+                    launchFullscreen();
+                }).catch(error => {
+                    this.$messageBox(`创建仿真失败: ${error.message}`);
+                });
+            });
             // row.id
-            let raceInfo;
+            // let raceInfo;
-            this.raceList.forEach(each=>{
+            // this.raceList.forEach(each=>{
-                if (each.id == row.raceId) {
+            //     if (each.id == row.raceId) {
-                    raceInfo = each;
+            //         raceInfo = each;
-                }
+            //     }
-            });
+            // });
-            practiceRecordNotify(83).then(resp => {
+            // practiceRecordNotify(83).then(resp => {
-                const query = { mapId: raceInfo.mapId, group: resp.data, scriptId: row.id, lineCode:raceInfo.lineCode};
+            //     const query = { mapId: raceInfo.mapId, group: resp.data, scriptId: row.id, lineCode:raceInfo.lineCode};
-                this.$router.push({ path: `${UrlConfig.practiceDisplayNew}/practice`, query });
+            //     this.$router.push({ path: `${UrlConfig.practiceDisplayNew}/practice`, query });
-                launchFullscreen();
+            //     launchFullscreen();
-            }).catch(error => {
+            // }).catch(error => {
-                this.$messageBox(`创建仿真失败: ${error.message}`);
+            //     this.$messageBox(`创建仿真失败: ${error.message}`);
-            });
+            // });
         },
         // 修改
         doUpdate(index, row) {

src/views/demonstration/detail/index.vue

@@ -117,7 +117,7 @@ export default {
                 this.tryUser = 0;
                 this.loading = false;
                 this.drawWay = res.data.drawWay;
-                const remarksList = {'01':'ATS现地工作站原理级仿真实训课程', '02':'ATS行调工作站原理级仿真实训课程', '03':'各岗位应急综合演练', '04':'桌面版模拟驾驶系统', '05':'派班工作站主要是供车辆段/停车场派班员进行派班操作，可以自动生成派班计划，极大的简化了派班计划管理的复杂性', '06': '综合监控管理原理及仿真实训'};
+                const remarksList = {'01':'ATS现地工作站原理级仿真系统，实现车站值班员培训功能。', '02':'ATS行调工作站原理级仿真系统，实现行车调度员培训功能。', '03':'各岗位应急综合演练', '04':'桌面版模拟驾驶系统，实现列车驾驶员培训功能。', '05':'派班工作站主要是供车辆段/停车场派班员进行派班操作，可以自动生成派班计划，极大的简化了派班计划管理的复杂性。', '06': '综合监控工作站原理级仿真系统，实现电调、环调及车站值班员培训功能。', '07':'大屏仿真系统，可显示全线全站场实时状况，便于教学及观摩使用。'};
                 this.courseModel = {
                     id: resp.data.id,
                     name: resp.data.name,

src/views/newMap/displayNew/chatView/chatBox.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- v-quickMenuDrag  -->
   <div class="chatBox">
-    <div v-if="!minimize" class="chat-box">
+    <div v-show="!minimize" class="chat-box">
       <chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" @addCoversition="addCoversition" />
       <div class="chat-box-main">
         <chat-coversition-list ref="chatCoversitionList" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />