Merge remote-tracking branch 'origin/master' into master

imcs-ui/src/api/runManageCenter/orderMgr.js

@@ -79,6 +79,11 @@ const apiList = {
   getOrderStatusCount: {
     method: 'POST',
     url: `/authority/order/getOrderStatusCount`
+  },
+   // 大屏数据统计
+   orderStatitcs: {
+    method: 'POST',
+    url: `/authority/order/orderStatitcs`
   },
   get: {
     method: 'POST',
@@ -223,6 +228,13 @@ export default {
       data
     })
   },
+  // 订单状态数量统计
+  orderStatitcs (data) {
+    return axiosApi({
+      ...apiList.orderStatitcs,
+      data
+    })
+  },
   get (data) {
     return axiosApi({
       ...apiList.get,

imcs-ui/src/lang/zh/zh.js

@@ -113,7 +113,7 @@ export default {
 	    	tips: '舱体线平台'
 	    },
       shuoming3: {
-	    	title: '云箭智能车间系统-框体线',
+	    	title: '云箭智能车间系统',
 	    	tips: '框体线平台'
 	    }
   	},

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

@@ -125,13 +125,13 @@
 							  </el-col>
 							  <el-col :span="6">
 							  	<div class="modelStatus2">
-							  		<p class="centerNums"><countTo :startVal='0' :endVal='allDatas[3]' :duration='3000'></countTo>%</p>
+							  		<p class="centerNums"><countTo :startVal='0' :endVal='allDatas[1]' :duration='3000'></countTo>%</p>
 							  		<div class="centerTitle">合格率</div>
 							  	</div>
 							  </el-col>
 							  <el-col :span="6">
 							  	<div class="modelStatus2">
-							  		<p class="centerNums"><countTo :startVal='0' :endVal='allDatas[4]' :duration='3000'></countTo>%</p>
+							  		<p class="centerNums"><countTo :startVal='0' :endVal='allDatas[2]' :duration='3000'></countTo>%</p>
 							  		<div class="centerTitle">当日合格率</div>
 							  	</div>
 							  </el-col>
@@ -304,7 +304,7 @@
 	    	gaudeWidth: '100%',
 	    	gaudeHeight: '190px',
 	    	percentages: [randomFloor(10,100), randomFloor(20,100), randomFloor(30,100)],
-	    	allDatas: [randomFloor(100,4000), randomFloor(1,10), randomFloor(20,100), randomFloor(90,100), randomFloor(95,100)],
+	    	allDatas: [],
 	    	resourceId: '',
 	    	orderDatas: [], // [插单订单]数据
 	    	runDatas: [],  // [运行中订单]数据
@@ -489,6 +489,20 @@
 					})
                 }				
 			})
+
+            orderMgrApi.orderStatitcs().then(res=> {
+				if (res.status == 200 && res.data.isSuccess) {		
+					 //更新执行时间和合格率			 	 
+					 this.allDatas = [parseInt(res.data.data.lastHour.rate), parseFloat(res.data.data.tadayRate.rate), parseFloat(res.data.data.weekRate.rate)]					 
+				    
+				}else{
+                     this.$message({
+						message: "订单合格率查询失败",
+						type: "error"
+					})
+                }
+			})
+
 			
 			//设备资源数据			
 	        areaMgrApi.iconGroupList({resourceStatus:"1",group:0}).then(res => {
@@ -594,6 +608,9 @@
 						//this.initPercentPie([randomFloor(77,87), randomFloor(59,69), randomFloor(49,69)])
 						this.orderDatas = data.data.zoneMap.zoneData
 						this.runDatas = data.data.planMap.planData.records
+
+						//合格率和工时时长信息更新
+                        this.allDatas = [parseInt(data.data.orderStatistics.lastHour.rate), parseFloat(data.data.orderStatistics.tadayRate.rate), parseFloat(data.data.orderStatistics.weekRate.rate)]
 												
 						this.diaoduList = data.data.orderMap.orderData.records
 						this.incomplete = 0			 			

imcs-ui/src/views/zuihou/resourceProductMgr/equipmentProgramMgr/Index.vue

@@ -85,9 +85,9 @@
 <!--      		</el-tag>-->
 <!--      	</template>-->
 <!--      </el-table-column>-->
-      <el-table-column prop="linkStatus" :label='$t("resource.table.resours.linkStatus")' width="180px" align="center">
+      <el-table-column prop="productionStatus" :label='$t("resource.table.resours.linkStatus")' width="180px" align="center">
       	<template slot-scope="{ row }">
-      		<div class="statusDiv" :style="'background:'+ row.linkStatus.background">{{row.linkStatus.text}}</div>
+      		<div class="statusDiv" :style="'background:'+ row.productionStatus.background">{{row.productionStatus.text}}</div>
       	</template>
       </el-table-column>
       <el-table-column prop="programSynTime" :label='$t("resource.table.resours.programSynTime")' width="180px"></el-table-column>
@@ -539,6 +539,7 @@
 	          	//this.$refs.table.setCurrentRow(this.tableData.data[0]);  // 单选
 	          	//this.$refs.table.toggleRowSelection(this.tableData.data[0], true)  // 多选
 	          	// 加载【刀具列表】数据
+				console.log(this.tableData.data)  
 	          	this.fetch2()
 	          }
 	        }