Merge branch 'dev_product' into dev

src/views/approval/script/index.vue

@@ -8,6 +8,9 @@
     </div>
 </template>
 <script>
+    import { launchFullscreen } from '@/utils/screen';
+    import { UrlConfig } from '@/router/index';
+    import { scriptRecordNotify } from '@/api/simulation';
     import ScriptOperate from './operate';
     import { reviewScriptList,publishScript,rejectScript } from '@/api/designPlatform';
     import { listPublishMap } from '@/api/jmap/map';
@@ -18,6 +21,7 @@
         },
         data() {
             return{
+                allMapList:[],
                 pagerConfig: {
                     pageSize: 'pageSize',
                     pageIndex: 'pageNum'
@@ -128,6 +132,7 @@
                     // 获取地图
                     this.mapList = [];
                     const res = await listPublishMap();
+                    this.allMapList=res.data;
                     res.data.forEach(elem => {
                         this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
                         this.mapList.push({ value: elem.id, label: elem.name });
@@ -146,7 +151,14 @@
                 this.$refs.applyReject.doShow(row);
             },
             scriptPreview(index,row){
-                debugger;
+                let mapInfo=this.allMapList.find(elem=>{return elem.id=row.mapId});
+                scriptRecordNotify(row.id).then(resp => {
+                    const query = { mapId: row.mapId, group: resp.data, scriptId: row.id,skinCode:mapInfo.skinCode,try:0};
+                    this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
+                    launchFullscreen();
+                }).catch(error => {
+                    this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
+                });
             },
             handleConfirmReject(data){
                 rejectScript(data.id,data).then(resp => {

src/views/display/designIndex.vue

@@ -140,7 +140,9 @@ export default {
 				'02': '02', 	// 行调 => 行调
 				'04': '02', 	// 司机 => 行调
 				'05': ''		// 派班 => null
-			}
+            },
+            isDrive:this.prdType == '04',
+            isShowScheduling:this.prdType == '05'
 		};
 	},
 	computed: {
@@ -201,12 +203,12 @@ export default {
 		isPlan() {
 			return this.mode === 'plan';
 		},
-		isDrive() {
-			return this.prdType == '04';
-		},
-		isShowScheduling() {
-			return this.prdType == '05';
-		}
+		// isDrive() {
+		// 	return this.prdType == '04';
+		// },
+		// isShowScheduling() {
+		// 	return this.prdType == '05';
+		// }
 	},
 	watch: {
 		'$store.state.config.menuBarLoadedCount': function (val) {
@@ -226,7 +228,6 @@ export default {
         },
         '$store.state.training.prdType':function(val){
             // this.prdType=val;
-            debugger;
             this.isDrive=(val == '04');
             this.isShowScheduling=(val == '05');
         },