From bfb3c9357c5495fd97479ddff2259bdcf4356f8d Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 19 May 2020 17:06:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E7=B3=BB=E7=BB=9F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baseUrl.js                          |  6 +--
 src/views/error-page/401.vue                  | 54 +++++++++----------
 src/views/jsxt/competition/examDetail.vue     |  3 +-
 .../newMap/jointTrainingNew/menuDemon.vue     | 27 +++++++---
 4 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 82af2a080..e9046878d 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,12 +2,12 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
-        BASE_API = 'http://192.168.3.41:9000'; // 张赛
+        // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
-        // BASE_API = 'http://192.168.3.41:9000'; // 张S赛
+        // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip';    // 张赛
diff --git a/src/views/error-page/401.vue b/src/views/error-page/401.vue
index 3b44ee832..2f5be5120 100644
--- a/src/views/error-page/401.vue
+++ b/src/views/error-page/401.vue
@@ -1,27 +1,27 @@
 <template>
   <div class="errPage-container">
     <el-button icon="arrow-left" class="pan-back-btn" @click="back">
-      {{$t('global.back')}}
+      {{ $t('global.back') }}
     </el-button>
     <el-row>
       <el-col :span="12">
         <h1 class="text-jumbo text-ginormous">
           Oops!
         </h1>
-        {{$t('error.gifSource')}}<a href="https://zh.airbnb.com/" target="_blank">airbnb</a> {{$t('error.page')}}
-        <h2>{{$t('error.noPermissionToGoToThisPage')}}</h2>
-        <h6>{{$t('error.dissatisfied')}}</h6>
+        {{ $t('error.gifSource') }}<a href="https://zh.airbnb.com/" target="_blank">airbnb</a> {{ $t('error.page') }}
+        <h2>{{ $t('error.noPermissionToGoToThisPage') }}</h2>
+        <h6>{{ $t('error.dissatisfied') }}</h6>
         <ul class="list-unstyled">
-          <li>{{$t('error.orYouCanGo')}}</li>
+          <li>{{ $t('error.orYouCanGo') }}</li>
           <li class="link-type">
             <router-link to="/dashboard">
-              {{$t('error.backToHome')}}
+              {{ $t('error.backToHome') }}
             </router-link>
           </li>
           <li class="link-type">
-            <a href="https://www.taobao.com/">{{$t('error.justLookingAround')}}</a>
+            <a href="https://www.taobao.com/">{{ $t('error.justLookingAround') }}</a>
           </li>
-          <li><a href="#" @click.prevent="dialogVisible=true">{{$t('error.pointMeToSeeThePicture')}}</a></li>
+          <li><a href="#" @click.prevent="dialogVisible=true">{{ $t('error.pointMeToSeeThePicture') }}</a></li>
         </ul>
       </el-col>
       <el-col :span="12">
@@ -35,27 +35,27 @@
 </template>
 
 <script>
-import errGif from '@/assets/401_images/401.gif'
+import errGif from '@/assets/401_images/401.gif';
 
 export default {
-	name: 'Page401',
-	data() {
-		return {
-			errGif: errGif + '?' + +new Date(),
-			ewizardClap: 'https://wpimg.wallstcn.com/007ef517-bafd-4066-aae4-6883632d9646',
-			dialogVisible: false
-		}
-	},
-	methods: {
-		back() {
-			if (this.$route.query.noGoBack) {
-				this.$router.push({ path: '/dashboard' })
-			} else {
-				this.$router.go(-1)
-			}
-		}
-	}
-}
+    name: 'Page401',
+    data() {
+        return {
+            errGif: errGif + '?' + +new Date(),
+            ewizardClap: 'https://wpimg.wallstcn.com/007ef517-bafd-4066-aae4-6883632d9646',
+            dialogVisible: false
+        };
+    },
+    methods: {
+        back() {
+            if (this.$route.query.noGoBack) {
+                this.$router.push({ path: '/dashboard' });
+            } else {
+                this.$router.go(-1);
+            }
+        }
+    }
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index d02045961..2ef3ebd4e 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -49,7 +49,6 @@
   </div>
 </template>
 <script>
-import { examNotify, examNotifyNew } from '@/api/simulation';
 import { getExamLessonDetail } from '@/api/management/exam';
 import { generateExamList } from '@/api/management/userexam';
 import { PermissionType } from '@/scripts/ConstDic';
@@ -195,7 +194,7 @@ export default {
                 this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}`);
             } else {
                 // this.disabled = true;
-                const query = { lineCode: '06', mapId: '34', group: '52-128-102', roomId: '380' };
+                const query = { lineCode: '11', mapId: '41', group: '15-4-482', roomId: '385' };
                 this.$router.replace({ path: `/jointTrainingNew`, query: query});
             }
         },
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index de0aba85c..4d083df8b 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -9,6 +9,10 @@
           <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
           <el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('joinTraining.exitPlan') }}</el-button>
         </template>
+        <template v-if="project==='jsxt'">
+          <el-button :disabled="jsStart" type="success">开始</el-button>
+          <el-button :disabled="canJsEnd" type="danger">结束</el-button>
+        </template>
         <el-button type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button>
       </el-button-group>
     </div>
@@ -20,8 +24,6 @@
 
 <script>
 import QrCode from '@/components/QrCode';
-// import ChartWindow from './chatWindow';
-// import ChartView from './chartView';
 import ChatBox from './chatBox';
 import SetTime from '@/views/newMap/displayNew/demon/setTime';
 import { ranAsPlan, exitRunPlan } from '@/api/simulation';
@@ -71,7 +73,9 @@ export default {
             offset: 10,
             userId: '',
             stationList: [],
-            stationLists: []
+            stationLists: [],
+            jsStart: true,
+            canJsEnd: true
         };
     },
     computed: {
@@ -89,6 +93,9 @@ export default {
         },
         isProject() {
             return getSessionStorage('project').endsWith('gzb') && this.userRole === 'CI';
+        },
+        project() {
+            return getSessionStorage('project');
         }
     },
     watch: {
@@ -263,11 +270,15 @@ export default {
         back() {
             this.$store.dispatch('training/over').then(() => {
                 this.backLoading = true;
-                putJointTrainingSimulationUserNew(this.group).then(() => {
-                    this.$router.replace({ path: `/trainroom`, query: { lineCode: this.lineCode, group: this.group, drawWay: true } });
-                    exitFullscreen();
-                    this.backLoading = false;
-                });
+                if (this.project === 'jsxt') {
+                    this.$router.go(-1);
+                } else {
+                    putJointTrainingSimulationUserNew(this.group).then(() => {
+                        this.$router.replace({ path: `/trainroom`, query: { lineCode: this.lineCode, group: this.group, drawWay: true } });
+                        exitFullscreen();
+                        this.backLoading = false;
+                    });
+                }
             });
         },
         jumpjlmap3d() {