diff --git a/src/api/quest.js b/src/api/quest.js
index 34290433a..4f86e1d66 100644
--- a/src/api/quest.js
+++ b/src/api/quest.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 
-/** 分页查找仿真任务*/
+/** 分页查找个人录制的仿真任务*/
 export function getQuestPageList(params) {
 	return request({
 		url: `/api/quest/paging`,
@@ -53,3 +53,12 @@ export function updateMapLocation(id, data) {
 		data
 	});
 }
+
+/** 分页查找上线的仿真任务*/
+export function getQuestPageListOnline(params) {
+	return request({
+		url: `/api/quest/paging/online`,
+		method: 'get',
+		params: params
+	});
+}
diff --git a/src/api/simulation.js b/src/api/simulation.js
index c996d166f..ae46daa7d 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -337,11 +337,11 @@ export function getQuestRecord(group) {
 }
 
 /** 加载任务*/
-export function loadQuest(questId, group) {
-	return request({
-		url: `/api/simulation/${group}/quest/${questId}`,
-		method: 'post'
-	});
+export function loadQuest(questId, memberId, group) {
+    return request({
+        url: `/api/simulation/${group}/quest/${questId}?memberId=${memberId}`,
+        method: 'post'
+    });
 }
 
 /** 退出任务*/
diff --git a/src/utils/Export2Excel.js b/src/utils/Export2Excel.js
index ef6998882..8422abaf8 100644
--- a/src/utils/Export2Excel.js
+++ b/src/utils/Export2Excel.js
@@ -1,6 +1,6 @@
 /* eslint-disable */
 require('script-loader!file-saver');
-require('script-loader!@/utils/Blob');
+require('@/utils/Blob');
 import XLSX from 'xlsx';
 import { translate } from '@/scripts/translate';
 
diff --git a/src/views/display/demon/addQuest.vue b/src/views/display/demon/addQuest.vue
index 3e1ff47c3..346ae91b6 100644
--- a/src/views/display/demon/addQuest.vue
+++ b/src/views/display/demon/addQuest.vue
@@ -1,223 +1,188 @@
 <template>
-  <div>
-    <el-dialog
-      title="任务列表"
-      :visible.sync="show"
-      top="50px"
-      width="70%"
-      :before-do-close="doClose"
-      :close-on-click-modal="false"
-      :z-index="2000"
-    >
-      <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    </el-dialog>
-    <el-dialog
-      title="角色选择"
-      :visible.sync="roleShow"
-      top="50px"
-      width="350px"
-      :before-do-close="roleDoClose"
-      :close-on-click-modal="false"
-      :z-index="5000"
-    >
-      <div>
-        <el-form ref="ruleForm" :model="form" :rules="rules" label-width="50px">
-          <el-form-item label="角色" prop="role">
-            <el-select v-model="form.role" placeholder="请选择">
-              <el-option
-                v-for="item in memberList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-                :disabled="checkDisabled(item.role)"
-              />
-            </el-select>
-          </el-form-item>
-        </el-form>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="roleDoClose">取 消</el-button>
-        <el-button type="primary" @click="confirm">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
-
+    <div>
+        <el-dialog title="剧本列表" :visible.sync="show" top="50px" width="70%" :before-doClose="doClose"
+            :close-on-click-modal="false" :z-index="2000">
+            <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm"
+                :query-list="queryList">
+            </QueryListPage>
+        </el-dialog>
+        <el-dialog title="角色选择" :visible.sync="roleShow" top="50px" width="350px" :before-do-close="roleDoClose"
+            :close-on-click-modal="false" :z-index="5000">
+            <div>
+                <el-form ref="ruleForm" :model="form" label-width="50px">
+                    <el-form-item label="角色" prop="role">
+                        <el-select v-model="form.role" placeholder="请选择">
+                            <el-option v-for="item in memberList" :key="item.id" :label="item.name" :value="item.id"
+                                :disabled="checkDisabled(item.role)" />
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="roleDoClose">取 消</el-button>
+                <el-button type="primary" @click="confirm">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { getQuestPageList, getQuestByIdList } from '@/api/quest';
-import { getSkinStyleList } from '@/api/management/mapskin';
+    import { getQuestPageListOnline, getQuestByIdList } from '@/api/quest';
+	import { listPublishMap } from '@/api/jmap/map';
 
-export default {
-	name: 'AddQuest',
-	props: {
-		trainings: {
-			type: Array,
-			default: () => {
-				return [];
-			}
-		},
-		detail: {
-			type: Object,
-			default: () => {
-				return {};
-			}
-		}
-	},
-	data() {
-		return {
-			show: false,
-			roleShow: false,
-			skinCodeList: [],
-			pagerConfig: {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNum'
-			},
-			row: {},
-			memberList: [],
-			form: {
-				role: ''
-			},
-			rules: {
-				role: [
-					{ required: true, message: '请选择', trigger: 'change' }
-				]
-			},
-			queryForm: {
-				labelWidth: '80px',
-				reset: false,
-				show: false,
-				queryObject: {
+    export default {
+        name: 'addQuest',
+        props: {
+            trainings: {
+                type: Array,
+            },
+            detail: {
+                type: Object,
+            }
+        },
+        data() {
+            return {
+                show: false,
+                roleShow: false,
+                mapList: [],
+                pagerConfig: {
+                    pageSize: 'pageSize',
+                    pageIndex: 'pageNum'
+                },
+                row: {},
+                form: {
+                    role: ''
+                },
+                memberList: [],
+                queryForm: {
+                    labelWidth: '80px',
+                    reset: false,
+                    show: false,
+                    queryObject: {
 
-				}
-			},
-			queryList: {
-				query: this.listQuest,
-				selectCheckShow: false,
-				indexShow: true,
-				columns: [
-					{
-						title: '任务名称',
-						prop: 'name'
-					},
-					{
-						title: '皮肤类型',
-						prop: 'skinCode',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']); },
-						tagType: (row) => { return 'success'; }
-					},
-					{
-						title: '创建时间',
-						prop: 'createTime'
-					},
-					{
-						type: 'button',
-						title: '操作',
-						width: '250',
-						buttons: [
-							{
-								name: '加载剧本',
-								type: 'primary',
-								handleClick: this.handleLoad
-							}
-						]
-					}
-				],
-				actions: [
-				]
-			},
+                    }
+                },
+                queryList: {
+                    query: this.listQuest,
+                    selectCheckShow: false,
+                    indexShow: true,
+                    columns: [
+                        {
+                            title: '任务名称',
+                            prop: 'name'
+                        },
+                        {
+                            title: '地图',
+                            prop: 'mapId',
+                            type: 'tag',
+                            columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
+							tagType: (row) => { return 'success'; }
+                        },
+                        {
+                            title: '创建时间',
+                            prop: 'createTime',
+                        },
+                        {
+                            type: 'button',
+                            title: '操作',
+                            width: '250',
+                            buttons: [
+                                {
+                                    name: '加载任务',
+                                    type: 'primary',
+                                    handleClick: this.handleLoad
+                                },
+                            ]
+                        }
+                    ],
+                    actions: [
+                    ]
+                },
 
-			currentModel: {}
-		};
-	},
-	created() {
-		this.loadInitData();
-	},
-	methods: {
-		doShow() {
-			this.show = true;
-			this.reloadTable();
-		},
-		doClose() {
-			this.show = false;
-		},
-		listQuest(params) {
-			params['skinCode'] = this.$route.query.skinStyle;
-			return getQuestPageList(params);
-		},
-		convertList(FromList, ToList, ChecktypeFunction) {
-			if (FromList) {
-				ToList.length = 0;
-				FromList.forEach(elem => {
-					if (ChecktypeFunction(elem)) {
-						ToList.push({ value: elem.code, label: elem.name });
-					}
-				});
-			}
-		},
-		async loadInitData() {
-			// 皮肤类型
-			this.skinCodeList = [];
-			getSkinStyleList().then(response => {
-				this.skinCodeList = response.data;
-			});
-		},
+                currentModel: {}
+            }
+        },
+        created() {
+            this.loadInitData();
+        },
+        methods: {
+            doShow() {
+                this.show = true;
+                this.reloadTable();
+            },
+            doClose() {
+                this.show = false;
+            },
+            listQuest(params) {
+                params['skinCode'] = this.$route.query.skinStyle;
+                return getQuestPageListOnline(params);
+            },
+            convertList(FromList, ToList, ChecktypeFunction) {
+                if (FromList) {
+                    ToList.length = 0;
+                    FromList.forEach(elem => {
+                        if (ChecktypeFunction(elem)) {
+                            ToList.push({ value: elem.code, label: elem.name });
+                        }
+                    });
+                }
+            },
+            async loadInitData() {
+                // 皮肤类型
+                this.mapList = [];
+				listPublishMap().then(response => {
+					this.mapList = response.data;
+				})
+            },
 
-		convertField(fieldValue, enumList, converFormat) {
-			if (converFormat && converFormat.length >= 2) {
-				const value = converFormat[0];
-				const label = converFormat[1];
-				for (let i = 0; i < enumList.length; i++) {
-					if ('' + fieldValue === '' + enumList[i][value]) {
-						return enumList[i][label];
-					}
-				}
-			}
-		},
+            convertField(fieldValue, enumList, converFormat) {
+                if (converFormat && converFormat.length >= 2) {
+                    let value = converFormat[0];
+                    let label = converFormat[1];
+                    for (let i = 0; enumList && i < enumList.length; i++) {
+                        if ('' + fieldValue === '' + enumList[i][value]) {
+                            return enumList[i][label];
+                        }
+                    }
+                }
+            },
 
-		async handleLoad(index, row) {
-			this.row = row;
-			const res = await getQuestByIdList(row.id);
-			if (res.code == 200) {
-				this.memberList = res.data.memberVOList;
-				this.memberList.unshift({id: '', name: '观众', role: 'Dispatcher'});
-			}
-			this.roleShow = true;
-		},
+            async handleLoad(index, row) {
+                this.row = row;
+                const res = await getQuestByIdList(row.id);
+                if (res.code == 200) {
+                    this.memberList = res.data.memberVOList;
+                    this.memberList.unshift({ id: '', name: '无', role: 'Dispatcher' });
+                }
+                this.roleShow = true;
+            },
 
-		reloadTable() {
-			if (this.queryList && this.queryList.reload) {
-				this.queryList.reload();
-			}
-		},
+            reloadTable() {
+                if (this.queryList && this.queryList.reload) {
+                    this.queryList.reload();
+                }
+            },
 
-		confirm() {
-			this.$refs['ruleForm'].validate((valid) => {
-				if (valid) {
-					this.$emit('selectQuest', this.row, this.form.role);
-					this.doClose();
-					this.roleDoClose();
-				}
-			});
-		},
+            confirm() {
+                this.$emit('selectQuest', this.row, this.form.role);
+                this.doClose();
+                this.roleDoClose();
+            },
 
-		roleDoClose() {
-			this.$refs['ruleForm'].resetFields();
-			this.roleShow = false;
-		},
+            roleDoClose() {
+                this.$refs['ruleForm'].resetFields();
+                this.roleShow = false;
+            },
 
-        checkDisabled(role) {
-            if(this.$route.query.prdType == '01'){
-                return role != 'Attendant';
-            } else if (this.$route.query.prdType == '02'){
-                return role != 'Dispatcher';
-            }else if (this.$route.query.prdType == '04'){
-                return role !== 'Driver';
-            }else {
-                return false;
+            checkDisabled(role) {
+                if(this.$route.query.prdType == '01'){
+                  return role !== 'Attendant';
+                } else if (this.$route.query.prdType == '02'){
+                  return role !== 'Dispatcher';
+                }else if (this.$route.query.prdType == '04'){
+                  return role !== 'Driver';
+                }
             }
         }
-	}
-};
+    }
 </script>
diff --git a/src/views/display/index.vue b/src/views/display/index.vue
index e27e9fc3d..0fc8103e6 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -449,14 +449,14 @@ export default {
 			this.$refs.addQuest.doShow();
 		},
 		// 选择脚本
-		async selectQuest(row, role) {
-			const res = await loadQuest(row.id, this.group);
+		async selectQuest(row, id) {
+			let res = await loadQuest(row.id, id, this.group);
 			if (res && res.code == 200) {
 				this.questId = parseInt(row.id);
-                if(res.data && res.data.mapLocation) {
-                    let mapLocation={"offsetX":res.data.mapLocation.x,"offsetY":res.data.mapLocation.y,"scaleRate":res.data.mapLocation.scale};
-                    Vue.prototype.$jlmap.setOptions(mapLocation)
-                }
+				if(res.data && res.data.mapLocation) {
+					let mapLocation={"offsetX":res.data.mapLocation.x,"offsetY":res.data.mapLocation.y,"scaleRate":res.data.mapLocation.scale};
+					Vue.prototype.$jlmap.setOptions(mapLocation)
+				}
 			}
 
 			if (this.$refs.menuDemon) {