修复前端bug

imcs-ui/src/views/zuihou/runManageCenter/productionScheduling/Index.vue

@@ -98,7 +98,7 @@
 	  computed: {
 	  },
 	  mounted () {
-	    
+	    this.timerTask()
 	  },
 	  methods: {
 	  	tabClick(e){
@@ -106,16 +106,19 @@
 	  		// 如果点击的是【任务时间甘特图】 resource
 	  		if(e.index == 0){
 	  			// 加载列表数据
+				this.clearTimer()
 	  			this.$refs.plan.fetch()
 	  		}
 	  		// 如果点击的是【生产资源任务】 resource
 	  		if(e.index == 1){
 	  			// 加载列表数据
+				this.clearTimer()
 	  			this.$refs.resource.fetch()
 	  		}
 	  		// 如果点击的是【订单计划】 resource
 	  		if(e.index == 2){
 	  			// 加载列表数据
+				this.timerTask()
 	  			this.$refs.task.search()
 	  		}
 	  	},
@@ -123,6 +126,18 @@
 	  	setChange(){
 	  		this.isShow = !this.isShow
 	  	},
+		timerTask(){
+       		let that = this
+       		that.timer = setInterval(()=>{
+          	   window.location.reload()
+      	 	}, 60000)
+    	},
+    	clearTimer(){
+       		if(this.timer){
+          	clearInterval(this.timer)
+          	this.timer = null
+       		}
+   		 },
 	  	// 获取统计数据
 	  	getTaskCount(){
 	  		taskMgrApi.getTaskCount({}).then(res => {

imcs-ui/src/views/zuihou/runManageCenter/productionScheduling/components/SchedResource.vue

@@ -42,24 +42,23 @@
 		      		:key="item.id" 
 		      		:prop="item.field" 
 		      		:label='item.text' 
-		      		align="center" 
-		      		width="120px"
+		      		align="left" 
+		      		width="480px"
 		      	>
 				    <template slot-scope="{ row }">
-				    	<div v-for="obj in jsuanTime(row, item.text)">
+				    	<div v-for="obj in jsuanTime(row, item.text)" :key="obj.id">
 					    	<!-- 背景色条（10个）-->
-							<div class="timeDom">
+							<div class="timeDom" >
 								<template v-for="child in obj.child">
 									<div v-if="child.isFull" :class="obj.flag == '1' ? 'timeItem tiGyActive' : (obj.flag == '2' ? 'timeItem tiOgActive' : 'timeItem tiActive')"></div>
 									<div v-else class="timeItem"></div>
 								</template>
 							</div>
 							<!-- 备注文字 -->
-							<el-tooltip class="item" :content="obj.bomDesc +' / '+ obj.procedureNo +' / '+ obj.planTime" effect="dark" placement="top-start">
-								<div class="timeItemDesc" :style="{left: obj.leftNums+'%'}">
-									<div>{{ obj.bomDesc ? obj.bomDesc : '' }}</div>
-									<div>{{ obj.procedureNo ? obj.procedureNo : '' }}</div>
-									<div>{{ obj.planTime ? obj.planTime : '' }}</div>
+							<el-tooltip v-if="obj.bomDesc" class="item" :content="obj.bomDesc +' / '+ obj.procedureNo +' / '+ obj.planTime" effect="dark" placement="top-start">
+								<div class="timeItemDesc"  :style="{left: obj.leftNums+'%'}"  >								    
+									<span class="bomDesc" :title="obj.bomDesc">{{ obj.bomDesc ? obj.bomDesc.replace('产品零件', '') : '' }}({{ obj.procedureNo ? obj.procedureNo : '' }})</span>	
+									<div v-show="false" class="splanTime">{{ obj.splanTime ? obj.splanTime : '' }}</div>									
 								</div>
 							</el-tooltip>
 						</div>
@@ -286,7 +285,7 @@ export default {
   				if(flag == '1') {
   					// 文字偏移量
   					let leftNums = 0;
-  					// console.log("时间点：",[filedTime, filedTime + 30], [expectStartTime, expectEndTime], flag, item);
+  					//console.log("时间点：",[filedTime, filedTime + 30], [expectStartTime, expectEndTime], flag, item);
   					arr[0].child.forEach((obj, index) => {
   						let modal = filedTime + (index+1)*2;
 						// 小模块，【被包含】在起止时间区间
@@ -298,10 +297,13 @@ export default {
 							}
 						}
 					})
-  					arr[0].planTime = item.planTime;
+					//console.log(item.planTime)
+					arr[0].planTime = item.planTime;
+  					arr[0].splanTime = item.expectStartTime.substr(11,5)+"到"+item.expectEndTime.substr(11,5);
 					arr[0].procedureNo = item.procedureNo;
 					arr[0].bomDesc = item.bomDesc;
-					arr[0].leftNums = leftNums*6.66;
+					arr[0].count = leftNums-1;
+					arr[0].leftNums = (leftNums-1)*6.66;
 					arr[0].flag = item.flag ? item.flag : '';
   				}
   				// interval【有交集】终止点，在cell中，
@@ -331,9 +333,10 @@ export default {
 						}
 					})
 					arr[0].planTime = item.planTime;
+  					arr[0].splanTime = item.expectStartTime.substr(11,5)+"到"+item.expectEndTime.substr(11,5);
 					arr[0].procedureNo = item.procedureNo;
 					arr[0].bomDesc = item.bomDesc;
-					arr[0].leftNums = leftNums*6.66;
+					arr[0].leftNums = (leftNums-1)*6.66;
 					arr[0].flag = item.flag ? item.flag : '';
   				}
   				
@@ -438,13 +441,17 @@ export default {
 <style lang="scss" scoped>
 	/*计算时间的css-start*/
 	.timeDom {
-		width: 100%;
+		width: 100%;		
 		.timeItem {
 			display: inline-block;
+			//min-width: 40px;
 			width: -moz-calc(100%/15);
 			width: -webkit-calc(100%/15);
 			width: calc(100%/15);
-			height: 70px;
+			//width:100%;
+			height: 40px;		
+			//border: solid 1px;
+						
 		}
 		.tiActive{
 			background: #3CC787;
@@ -453,27 +460,42 @@ export default {
 			background: #CC9900;
 		}
 		.tiGyActive{
-			background: #999999;
+			background: #00a7d0;
 		}
 	}
 	.timeItemDesc {
 		position: absolute;
-		top: 18px;
-		left: 10px;
+		top: 12px;
+		left: 0;
 		font-size: 12px;
-		line-height: 16px;
-		min-width: 120px;
-		color: white;
-		z-index: 999;
-		text-align: left;
+		transform: scale(0.8);				
+		color: #000;		
+		text-align: center;		
+		//width:40px;	
+		//width: calc(100%/15);
+		//padding: 2px;	    
+		min-width: calc(100%/15);
+		margin-left: -1.2%;
+		font-weight: bold;
+	}	
+	.bomDesc {
+		word-wrap: break-word; 
+		word-break: break-all;
+		display: block;		
 	}
+
+	.splanTime{
+		//transform: scale(0.75);
+		//text-align:right;	
+		margin-left:-2%;
+	}
+    
 	.dashedDom {
 		position: absolute;
 		top: 0;
-		left: 50%;
-		height: 88px;
+		left: 0;		
 		border-right: 1px dashed #1890ff;
-		z-index: 999;
+		height:100%;
 	}
 	/*计算时间的css-end*/
 	.tabDiv{