loading&ticketName

src/views/bigScreen/index.vue

@@ -773,7 +773,7 @@ export default {
 			audioList:{},
 			employeeScroll:0,
 			searchKeyWord:'',
-
+			ElLoading:null
 		}
 	},
 	// created() {
@@ -1014,11 +1014,21 @@ export default {
 	methods: {
 		loadScript(id, url, callback) {
 			debugger;
+			let that = this;
 			//如果已经存在这个id，则证明已经加载过，已经有这个js文件了，可以直接执行回调里面的操作
 			if (document.querySelector(`#${id}`)) {
+				// that.ElLoading = null;
+				that.ElLoading.close();
 				callback && callback()
 				return;
+			}else{
+				that.ElLoading = this.$loading({
+				lock: true,
+				text: '地图资源加载中...',
+				background: 'rgba(0, 0, 0, 0)',
+			})
 			}
+			
 			//第一次加载，先创建 script 标签
 			const script = document.createElement('script');
 			script.src = url;
@@ -1030,9 +1040,13 @@ export default {
 			firstScript.parentNode.insertBefore(script, firstScript);
 			//script 一加载就执行
 			script.onload = script.onreadystatechange = function() {
+				that.ElLoading.close();
+				// that.ElLoading = null;
+				
 				// 加载完成
 				if (!this.readyState || this.readyState == 'loaded' || this.readyState == 'complete') {
 					callback && callback()
+					
 				}
 			};
 		},
@@ -1063,13 +1077,8 @@ export default {
 		},
 		handleChange(item, check,item2,item3) {
 			let that = this;
-			// debugger;
-			// console.log(check)
-			
 			this.deptChecked = check.checkedKeys;
 			this.userParams.depts = check.checkedKeys;
-			// that.userMaskerLayer.removeAllIconTextMark();
-			// this.refreshUserMarker();
 		},
 		//人员类型选择
 		userFilter() {
@@ -1084,19 +1093,14 @@ export default {
 			window.map.addLayer(that.userMaskerLayer);
 			let userListNew = [];
 			that.userList.filter(item=>{
-				// debugger;
-				// console.log(item);
 				if(checkedKeys.indexOf(item.my_info.employee_.belong_dept_)>-1){
-					// debugger;
 					userListNew.push(item)
 					}
 			})
-			// debugger;
 			that.userList = userListNew;
 			console.log(that.userList)
 			that.showUserMarkers(userListNew);
 			this.showUserSelect = false;
-			// this.screenUser = true;
 		},
 		//
 		audioFinished(){
@@ -3821,6 +3825,7 @@ export default {
 #mapContainer {
 	width: 100%;
 	height: 100%;
+	background-color: #3798ff;
 }
 
 #bigScreenUserTable {

src/views/rpm/rpjadd.vue

@@ -128,7 +128,7 @@
         hidePagination
         hideDo
         stripe
-        style="height: 300px"
+        style="height: 680px"
       >
         <el-table-column
           label="#"
@@ -224,7 +224,7 @@
         hidePagination
         hideDo
         stripe
-        style="height: 300px"
+        style="height: 680px"
       >
         <el-table-column
           label="#"
@@ -638,7 +638,7 @@ export default {
       let ticket = {};
       ticket.title = this.rpjform.name;
       ticket.workflow = this.initForm.workflow;
-      ticket.ticket_data = { rpj: this.rpjId };
+      ticket.ticket_data = { rpj: this.rpjId ,name:this.rpjform.name};
       ticket.transition = id;
       this.$API.wf.ticket.create.req(ticket).then((res) => {
         this.$message.success("提交成功");

src/views/vm/vistoradd.vue

@@ -554,7 +554,7 @@ this.$API.vm.visit.update
      this.ticket={};
      this.ticket.title = this.form.name;
       this.ticket.workflow=this.initform.workflow;
-       this.ticket.ticket_data={visit:this.visitid};
+       this.ticket.ticket_data={visit:this.visitid,name:this.form.name};
         this.ticket.transition=id;
        this.$API.wf.ticket.create.req(this.ticket).then((res) => {
         this.$message.success("提交成功");