Merge remote-tracking branch 'origin/test'

src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <router-view />
+    <router-view v-if="loadingComponent" />
     <deomon-list ref="deomonList" @enterQcode="qcodeEntry" />
     <qcode ref="qcode" />
     <div v-show="loading" class="AppAll">
@@ -50,7 +50,8 @@ export default {
             appLoading: AppLoading,
             loading: false,
             jlFavicon: Favicon,
-            project: ''
+            project: '',
+            loadingComponent: false
         };
     },
     computed: {
@@ -120,6 +121,7 @@ export default {
     methods: {
         initFrontProjectConfig() {
             getFrontProjectConfigByLogin(this.project).then(resp => {
+                this.loadingComponent = true;
                 const urlData = handlerUrl();
                 const { baseApiUrl, baseSite, ossUrl, loginProLogo, browserTitle} = resp.data.viewSetting;
                 this.$store.dispatch('setBaseUrl', baseApiUrl || urlData.BASE_API);

src/views/newMap/display/simulationId.vue

@@ -0,0 +1,48 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="350px" :before-close="done => {}" :show-close="false" center>
+    <div v-if="group" class="qrcodeGroup">
+      <span>{{ $t('global.roomId')+group }}</span>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="doClose">{{ $t('global.close') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+    name: 'SimulationId',
+    data() {
+        return {
+            dialogVisible: false,
+            title: '',
+            loading: false,
+            group: ''
+        };
+    },
+    methods: {
+        clearModel() {
+            this.title = '';
+        },
+        doShow(data) {
+            this.clearModel();
+            if (data) {
+                this.title = data.title;
+                this.dialogVisible = true;
+                this.group = data.group;
+            }
+        },
+        doClose() {
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.qrcodeView{text-align:center;  margin:auto;}
+.qrcodeGroup{text-align: center;font-size: 18px;font-weight: bold; margin-top:40px;}
+/deep/ .el-dialog{
+	background-image: url('~@/assets/sim_id.jpg');
+	background-size: 100% 100%;
+}
+</style>

src/views/newMap/display/simulationMenu/simulationMenu.vue

@@ -17,11 +17,10 @@
     <select-exam ref="selectExam" @examStart="examStart" />
     <exam-panel ref="examPanel" />
     <device-manage ref="deviceManage" />
-    <qr-code ref="qrCode" />
+    <simulation-id ref="simulationId" />
   </div>
 </template>
 <script>
-import { getSimulationQrcode } from '@/api/jointSimulation';
 import { initSimulation } from '@/api/rtSimulation';
 import ContectUs from './contectUs';
 import FlowData from './flowData';
@@ -32,11 +31,11 @@ import SelectExam from '../exam/selectExam';
 import ExamPanel from '../exam/examPanel';
 import getErrorTip from '@/scripts/errorTip';
 import DeviceManage from './deviceManage';
-import QrCode from '@/components/QrCode';
 import { SimulationUserType } from '@/scripts/ConstDic';
 import { destroySimulationByAdmin, ranAsPlan} from '@/api/simulation';
 import { EventBus } from '@/scripts/event-bus';
 import SimulationControl from './simulationControl';
+import SimulationId from '../simulationId';
 export default {
     name: 'SimulationMenu',
     components: {
@@ -48,8 +47,8 @@ export default {
         Jl3dDevice,
         MemberManage,
         DeviceManage,
-        QrCode,
-        SimulationControl
+        SimulationControl,
+        SimulationId
     },
     data() {
         return {
@@ -63,7 +62,7 @@ export default {
                 { label: '设备视图', name: 'jlmap3dmodel', click: this.jlmap3dmodel, isDisabled: () => { return false; }, isShow: () => { return this.$route.query.client !== 'diagramEdit'; } },
                 { label: '设备管理', name: 'deviceManage', click: this.deviceManage, isDisabled: () => { return false; }, isShow: () => { return (this.$store.state.training.domConfig.hasDeviceManage && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER) || (this.$route.query.client === 'interlockWork' && this.$route.query.projectDevice === 'ILW'); } },
                 { label: '联系方式', name: 'contectUs', click: this.contectUs, isDisabled: () => { return false; }, isShow: () => { return true; } },
-                { label: '生成二维码', name: 'generateQrCode', click: this.generateQrCode, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.joint && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
+                { label: '生成仿真号', name: 'generateQrCode', click: this.generateQrCode, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.joint && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
                 { label: '切换客流数据', name: 'changeFlowData', click: this.changeFlowData, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasLpf && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
                 { label: '成员管理', name: 'memberManage', click: this.memberManage, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasMemberManage && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
                 { label: '考试', name: 'exam', click: this.goExam, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasExam && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
@@ -130,18 +129,11 @@ export default {
         },
         generateQrCode() {
             this.hideMenuList();
-            getSimulationQrcode(this.$route.query.group).then(resp => {
             const param = {
-                    url: resp.data,
-                    title: this.$t('综合演练二维码'),
+                title: this.$t('综合演练仿真号'),
                 group: this.$route.query.group
             };
-                if (this.$refs) {
-                    this.$refs.qrCode.doShow(param);
-                }
-            }).catch(() => {
-                this.$messageBox('仿真生成二维码失败！');
-            });
+            this.$refs.simulationId.doShow(param);
         },
         deviceManage() {
             this.hideMenuList();