mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mesxc-zhp #372

Merged
juzi merged 4 commits from projects/mesxc-zhp into projects/mesxc-test 2024-04-26 09:54:08 +08:00
Conversation 0 Commits 4 Files Changed 4 +15 -15
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 539dddf217 - Show all commits

20
src/views/OperationalOverview/processingBoard.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2024-04-26 08:32:02
* @LastEditTime: 2024-04-26 09:50:21
* @Description:
-->
<template>
@ -44,18 +44,18 @@
<!-- <div style="height: 34px;"> -->
<span style="display: inline-block;width: 400px;height: 10px;">
<span class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</span>
<el-divider class="split" v-if="op.name" direction="vertical"></el-divider>
<el-divider v-if="op.specifications" class="split" v-if="op.name" direction="vertical"></el-divider>
<!-- <span v-if="op.size" class="split"></span> -->
<span v-if="op.specifications" class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{
<span class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{
op.specifications }}</span>
<el-divider class="split" v-if="op.specifications" direction="vertical"></el-divider>
<span v-if="op.planQuantity" class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{
<el-divider class="split" v-if="op.planQuantity" direction="vertical"></el-divider>
<span class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{
op.planQuantity }}</span>
<span v-if="op.planQuantity" class="orderFinishTwo"
style="font-size: 14px;opacity: calc(.6);">片</span>
</span>
<!-- <span style="overflow: hidden;"> -->
<span v-if="op.actualQuantity" class="orderFinish" style="font-size: 14px;margin-left: 40px;">{{
<span class="orderFinish" style="font-size: 14px;margin-left: 40px;">{{
op.actualQuantity
}}</span>
<span v-if="op.actualQuantity" class="orderFinishTwo" style="font-size: 14px">片</span>
@ -746,7 +746,7 @@ export default {
name: this.getStr(String(ele.name), 8),
progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
specifications: ele.specifications ? '规格' + ele.specifications : '',
planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan),6) : '',
planQuantity: ele.planQuantity ? '计划' + this.getStr(String(ele.planQuantity),6) : '',
actualQuantity: ele.actualQuantity ? this.getStr(String(ele.actualQuantity), 6) : '',
};
}
@ -756,11 +756,11 @@ export default {
let eqArr = this.SJGWsData.detData.map((item, index) => [
`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
</span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.lineName || ''
}</span>`,
`<span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
</span>`,
`<span style="color:rgba(255,255,255,0.5)">${
item.lineName || ''
}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0' : item.status == '停机' ? 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;background-color: #FFBD02;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:13px 10px 0 0'}"></div> ${item.status || ''}</span>`,
// `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == false ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:10px 10px 0 0 '}"></div> ${item.error == true ?'是' :'否' || ''}</span>`,
]);

4
src/views/report/qcReport/lineReport.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 10:01:33
* @LastEditTime: 2024-04-25 17:13:43
* @LastEditTime: 2024-04-26 09:42:54
* @LastEditors: zhp
* @Description:
-->
@ -56,7 +56,7 @@ const tableProps = [
},
{
prop: 'equipmentName',
label: '',
label: '机械手名称',
width: '200'
},
{

6
src/views/report/qcReport/optimizeCutData.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 15:07:53
* @LastEditTime: 2024-04-26 09:27:07
* @LastEditTime: 2024-04-26 09:41:54
* @LastEditors: zhp
* @Description:
-->
@ -56,7 +56,7 @@ const tableProps = [
},
{
prop: 'dataType',
label: '',
label: '类别',
width: '150',
},
{
@ -300,7 +300,7 @@ export default {
type: ele.type == '合计' ? '' : ele.type,
pieces: ele.pieces,
area: ele.area,
rate: ele.rate ? (ele.rate * 100).toFixed(2) : '',
rate: ele.lineName != '总计' && ele.rate ? (ele.rate * 100).toFixed(2) : '',
rateSum: ele.lineName === '总计' ? (ele.rate * 100).toFixed(2) : ''
// useNum: ele.useNum,
// num: ele.num,