看板优化

imcs-ui/src/views/zuihou/largeScreen/twoDatasModel/Index.vue

@@ -59,7 +59,7 @@
 		  	<div class="rightDiv marginBottom15">
 		  		<div class="modelTitle marginBottom15">设备利用率</div>
 		  		<el-row :gutter="15">
-					  <el-col :span="8">
+<!--					  <el-col :span="8">
 					  	<div id="percenter1" class="percenter">
 					  		<el-progress type="circle" :percentage="percentages[0]" :stroke-width="10" :width="100"></el-progress>
 					  		<span class="pcText">智能生产保障系统</span>
@@ -72,16 +72,16 @@
 					  		<span class="pcText">框体类加工单元</span>
 					  	</div>
 						  <div class="timeTxt">{{ timeSpanList.timeSpanStatistics["框体类加工单元"] }}分钟</div>
-					  </el-col>
-					  <el-col :span="8">
+					  </el-col>-->
+					  <el-col :span="24">
 					  	<div id="percenter3" class="percenter">
 					  		<el-progress type="circle" :percentage="percentages[2]" color="#6a5acd" :stroke-width="10" :width="100"></el-progress>
-					  		<span class="pcText">舱体类加工单元</span>
+					  		<span class="pcText">FMS2.0产线</span>
 					  	</div>
-						  <div class="timeTxt">{{ timeSpanList.timeSpanStatistics["舱体类加工单元"] }}分钟</div>
+						  <div class="timeTxt">{{ timeSpanList.timeSpanStatistics["FMS2.0产线"] }}分钟</div>
 					  </el-col>
 				</el-row>
-				<el-row :gutter="15">
+<!--				<el-row :gutter="15">
 						<el-col :span="8">
 						<div id="percenter4" class="percenter" v-show="false">
 					  		<el-progress type="circle" :percentage="percentages[3]" :stroke-width="10" :width="100"></el-progress>
@@ -103,7 +103,7 @@
 					  	</div>
 						<div class="timeTxt">{{ this.mashingThreeList.runData? this.mashingThreeList.runData.length: 0}}</div>
 					</el-col>
-				</el-row>
+				</el-row>-->
 		  	</div>
   		</el-col>
   		<!-- 中 -->
@@ -573,24 +573,25 @@
 	        areaMgrApi.iconGroupList({resourceStatus:"1",group:0}).then(res => {
 				//console.log(res)
 				if (res.status == 200 && res.data.isSuccess) {
-				    this.mashingOneList = this.filterResource(res.data.data.iconGroupList[0], true)
-					this.mashingTwoList = this.filterResource(res.data.data.iconGroupList[1], false)
-					this.mashingThreeList = this.filterResource(res.data.data.iconGroupList[2], false)
+				    this.mashingTwoList = this.filterResource(res.data.data.iconGroupList[0], true)
+					/*this.mashingOneList = this.filterResource(res.data.data.iconGroupList[1], false)
+					this.mashingThreeList = this.filterResource(res.data.data.iconGroupList[2], false)*/
 
 					//this.initPercentPie([parseInt(100 * this.mashingOneList.runData.length / this.mashingOneList.data.length),
 					//	  parseInt(100 * this.mashingTwoList.runData.length / this.mashingTwoList.data.length), parseInt(100 * this.mashingThreeList.runData.length / this.mashingThreeList.data.length)])
-					if(this.timeSpend>0){
+					/*if(this.timeSpend>0){
 						 	this.initPercentPie([parseInt(100* this.timeSpanList.timeSpanStatistics["智能生产保障系统"]/ this.timeSpend),
-					     		parseInt(100 * this.timeSpanList.timeSpanStatistics["框体类加工单元"] / this.timeSpend), parseInt(100 * this.timeSpanList.timeSpanStatistics["舱体类加工单元"]  / this.timeSpend),
+					     		parseInt(100 * this.timeSpanList.timeSpanStatistics["框体类加工单元"] / this.timeSpend), parseInt(100 * this.timeSpanList.timeSpanStatistics["FMS2.0"]  / this.timeSpend),
 								parseInt(100 * this.mashingOneList.runData.length / this.mashingOneList.data.length),parseInt(100 * this.mashingTwoList.runData.length / this.mashingTwoList.data.length), parseInt(100 * this.mashingThreeList.runData.length / this.mashingThreeList.data.length)
 				    		])
 					}else{
 							this.initPercentPie([0,0,0,parseInt(100 * this.mashingOneList.runData.length / this.mashingOneList.data.length),parseInt(100 * this.mashingTwoList.runData.length / this.mashingTwoList.data.length), parseInt(100 * this.mashingThreeList.runData.length / this.mashingThreeList.data.length)
 				    		])
-					}
+					}*/
 
-					let runLen = this.mashingOneList.runData.length + this.mashingTwoList.runData.length + this.mashingThreeList.runData.length
-					this.mashingTwoList.data = this.mashingTwoList.data.concat(this.mashingThreeList.data).concat(this.mashingOneList.data)
+					//let runLen = this.mashingOneList.runData.length + this.mashingTwoList.runData.length + this.mashingThreeList.runData.length
+          let runLen = this.mashingTwoList.runData.length
+					//this.mashingTwoList.data = this.mashingTwoList.data.concat(this.mashingThreeList.data).concat(this.mashingOneList.data)
 
 					//this.gaugeData = {value : parseFloat(runLen/this.mashingTwoList.data.length).toFixed(2), name:"效率"}
                     this.gaugeData = {value:0.67, name:"效率"}
@@ -851,14 +852,16 @@
 		filterResource(mashingList, bool){
 		   let arr = mashingList.data.filter((data) => {
 			   return data.name.indexOf("接驳位") <0 && data.name.indexOf("托板") < 0 && data.name.indexOf("上下料站") < 0
-			          && data.name.indexOf("线边库") <0 && data.name.indexOf("立库") <0 && data.name.indexOf("三坐标") && data.name.indexOf("打标机")
+			          && data.name.indexOf("线边库") <0 && data.name.indexOf("立库") <0 && data.name.indexOf("三坐标") && data.name.indexOf("打标机") && data.name.indexOf("机器人") < 0
            });
 		   mashingList.data = arr
+      console.log("mashingList.data:" + JSON.stringify(mashingList.data))
 		   if(bool){
 			    mashingList.runData = arr.filter((data)=> { return data.todoTaskcount>0});
 		   }else{
 		   		mashingList.runData = arr.filter((data)=> { return data.productionStatusCN=="生产中"});
 		   }
+
 		   return mashingList
 		},