|
@@ -86,11 +86,11 @@
|
|
|
<div class="modelTitle marginBottom15">车间总体情况</div>
|
|
|
<el-row class="marginBottom15" :gutter="15">
|
|
|
<el-col :span="11" align="left">
|
|
|
- <div class="allTitleLeft font12">持续运行时间</div>
|
|
|
+ <div class="allTitleLeft font13">今日持续加工时间</div>
|
|
|
<div class="allFont" ref="runningTime">{{ (allDatas[0]/60).toFixed(1) }}小时</div>
|
|
|
</el-col>
|
|
|
<el-col :span="13">
|
|
|
- <el-row :gutter="15">
|
|
|
+ <el-row :gutter="15" v-show="false">
|
|
|
<el-col :span="8">
|
|
|
<div class="allTitle font12">产线运行状态</div>
|
|
|
<div class="modelStatus">正常</div>
|
|
@@ -107,6 +107,7 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
+ <div class="modelTitle marginBottom15">生产汇总</div>
|
|
|
<el-row class="borderTop">
|
|
|
<el-col>
|
|
|
<el-row :gutter="15">
|
|
@@ -161,7 +162,7 @@
|
|
|
<td>{{ item.planBomNum }}</td>
|
|
|
<td>{{ item.endTime }}</td>
|
|
|
<td>{{ item.completeNum }}</td>
|
|
|
- <td>{{ item.qualification }}%</td>
|
|
|
+ <td>{{ item.qualification? item.qualification : "0" }}%</td>
|
|
|
<td>
|
|
|
<el-progress :text-inside="true" :stroke-width="15" :percentage="item.process" status="success"></el-progress>
|
|
|
</td>
|
|
@@ -228,8 +229,9 @@
|
|
|
</tr>
|
|
|
<tr v-for="(item, index) in weibaoList" :key="index">
|
|
|
<td>{{ item.productionresourceName }}</td>
|
|
|
- <td class="timeprogress">
|
|
|
- <el-progress :text-inside="true" :stroke-width="15" :percentage="setPercentage(item.repairEndTime)" color="#FF3366" :format="setItemText(item.repairEndTime)" ></el-progress>
|
|
|
+ <td class="timeprogress">
|
|
|
+ <el-progress v-if="item.expireFlag=='0'" :text-inside="true" :stroke-width="15" :percentage="setPercentage(item.repairEndTime)" color="#FF3366" :format="setItemText(item.repairEndTime)" ></el-progress>
|
|
|
+ <el-progress v-else :text-inside="true" :stroke-width="15" :percentage="100" color="#FF3366" :format="expireText(item.repairEndTime)" ></el-progress>
|
|
|
</td>
|
|
|
</tr>
|
|
|
</table>
|
|
@@ -310,6 +312,7 @@
|
|
|
diaoduList: [], // [最新订单/待调度]
|
|
|
mashingOneList: [], // [机器人]产线一数据
|
|
|
mashingTwoList: [], // [机器人]产线二数据
|
|
|
+ mashingThreeList: [],
|
|
|
weibaoList: [], //维保数据
|
|
|
tabDownData: { // 下部分-数据
|
|
|
list: []
|
|
@@ -492,9 +495,10 @@
|
|
|
//console.log(res)
|
|
|
if (res.status == 200 && res.data.isSuccess) {
|
|
|
this.mashingOneList = this.filterResource(res.data.data.iconGroupList[0])
|
|
|
- this.mashingTwoList = this.filterResource(res.data.data.iconGroupList[1])
|
|
|
+ this.mashingTwoList = this.filterResource(res.data.data.iconGroupList[1])
|
|
|
+ this.mashingThreeList = this.filterResource(res.data.data.iconGroupList[2])
|
|
|
//计算产线利用率
|
|
|
- this.mashingOneList.data = this.mashingOneList.data.concat(this.mashingTwoList.data)
|
|
|
+ this.mashingOneList.data = this.mashingOneList.data.concat(this.mashingTwoList.data).concat(this.mashingThreeList.data)
|
|
|
|
|
|
}else{
|
|
|
this.$message({
|
|
@@ -592,14 +596,14 @@
|
|
|
this.incomplete += parseInt(this.diaoduList[i].productNum) - parseInt(this.diaoduList[i].completeNum)
|
|
|
}
|
|
|
}
|
|
|
- this.weibaoList = []
|
|
|
-
|
|
|
- this.weibaoList = data.data.repairMap.repairData.records
|
|
|
+ this.weibaoList = []
|
|
|
+ this.weibaoList = data.data.repairMap.repairData.records
|
|
|
|
|
|
this.mashingOneList = this.filterResource(data.data.groupMap.iconGroupList[0])
|
|
|
this.mashingTwoList = this.filterResource(data.data.groupMap.iconGroupList[1])
|
|
|
+ this.mashingThreeList = this.filterResource(data.data.groupMap.iconGroupList[2])
|
|
|
|
|
|
- this.mashingOneList.data = this.mashingOneList.data.concat(this.mashingTwoList.data)
|
|
|
+ this.mashingOneList.data = this.mashingOneList.data.concat(this.mashingTwoList.data).concat(this.mashingThreeList.data)
|
|
|
|
|
|
//this.$ref.runningTime.innerHmtl = ((allDatas[0] + 5/360)/60).toFixed(1)
|
|
|
|
|
@@ -739,6 +743,11 @@
|
|
|
return this.formatGap(text)[1]
|
|
|
}
|
|
|
},
|
|
|
+ expireText(text){
|
|
|
+ return () => {
|
|
|
+ return "过期" + this.formatGap(text)[1]
|
|
|
+ }
|
|
|
+ },
|
|
|
setPercentage(text){
|
|
|
return this.formatGap(text)[0]>100? 100 : this.formatGap(text)[0]
|
|
|
}
|