mt-fe-group
/
yudao-dev
11
0
Fork 0
Código Incidencias 0 Pull Requests 0 Lanzamientos 0 Wiki Actividad
Etiquetas Hitos
Nuevo Pull Request

#370 projects/mesxc-zhp

Fusionado
juzi fusionados 7 commits de projects/mesxc-zhp en projects/mesxc-test hace 4 meses
Conversación 0 Commits 7 Archivos modificados 6
Se han modificado 6 ficheros con 59 adiciones y 37 borrados
Espacio blanco
Mostrar todos los cambios Ignorar espacio en blanco al comparar líneas Ignorar cambios en cantidad de espacio en blanco Ignorar cambios en espacios en blanco al final de la línea
Dividir vista
Opciones de diferencias
Mostrar estadísticas Descargar archivo de parche Descargar archivo de diferencias
  1. +18
    -19
      src/views/OperationalOverview/processingBoard.vue
  2. +12
    -8
      src/views/report/ingredientReport/day.vue
  3. +5
    -1
      src/views/report/qcReport/cutDayReport/index.vue
  4. +5
    -1
      src/views/report/qcReport/fullInspection/index.vue
  5. +6
    -1
      src/views/report/qcReport/lineReport.vue
  6. +13
    -7
      src/views/report/qcReport/optimizeCutData.vue

+ 18
- 19
src/views/OperationalOverview/processingBoard.vue Ver fichero

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2024-04-25 09:02:38
* @LastEditTime: 2024-04-26 08:32:02
* @Description:
-->
<template>
@@ -298,11 +298,11 @@ export default {
// equipmentList:[],
EnergyMonitoringList: [],
eqConfig: {
header: ['序号', '设备名称', '产线名', '设备状态'],
header: ['序号', '产线名', '设备名称', '设备状态'],
headerBGC: 'rgba(32, 55, 96, 0.8)',
oddRowBGC: 'rgba(32, 55, 96, 0.8)',
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
columnWidth: [70, 130, 240, 120],
columnWidth: [70, 150, 200, 120],
align: ['center'],
data: [],
// index:true,
@@ -387,7 +387,7 @@ export default {
progressRate: 0.933333,
specifications: '1100*5554*22',
plan: 111111111111,
actualQuantity:10000001111,
actualQuantity:1000000111111,
},
{
id: '2',
@@ -458,12 +458,12 @@ export default {
this.orderList = detData.map((ele, index) => {
if (ele.progressRate && ele.progressRate != 1) {
return {
id: ele.id,
name: ele.name,
id: ele.id,
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)) : '',
actualQuantity: ele.actualQuantity ?this.getStr(String(ele.actualQuantity)) : '',
specifications: ele.specifications ? '规格' + ele.specifications : '',
planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan), 6) : '',
actualQuantity: ele.actualQuantity ? this.getStr(String(ele.actualQuantity), 6) : '',
};
}
});
@@ -483,10 +483,9 @@ export default {
`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
</span>`,
// formatDate(item.planStartTime) || '',
`
`<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>`,
]);
this.eqConfig.data = eqArr;
@@ -566,10 +565,10 @@ export default {
// removeEventListener('resize', resizeFun)
// },
methods: {
getStr(str) {
getStr(str,num) {
//你要处理的字符串
if (str.length > 6) { //如果字符长度超过10，后面的字符就变成...可自行调整长度和代替字符
str = str.substr(0, 6) + "..." //截取从第一个字符开始，往后取10个字符，剩余的用...代替
if (str.length > num) { //如果字符长度超过10，后面的字符就变成...可自行调整长度和代替字符
str = str.substr(0, num) + "..." //截取从第一个字符开始，往后取10个字符，剩余的用...代替
return str
} else {
return str
@@ -743,12 +742,12 @@ export default {
this.orderList = this.SJGWsData.detData.map((ele, index) => {
if (ele.progressRate && ele.progressRate != 1) {
return {
id: ele.id,
name: ele.name,
id: ele.id,
name: this.getStr(String(ele.name), 8),
progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
specifications: ele.specifications ? '规格' + ele.specifications :null,
planQuantity: ele.planQuantity ? '计划' + ele.planQuantity + '片' : null,
actualQuantity: ele.actualQuantity ? ele.actualQuantity + '片' : null,
specifications: ele.specifications ? '规格' + ele.specifications : '',
planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan),6) : '',
actualQuantity: ele.actualQuantity ? this.getStr(String(ele.actualQuantity), 6) : '',
};
}
});


+ 12
- 8
src/views/report/ingredientReport/day.vue Ver fichero

@@ -170,8 +170,8 @@ export default {
mounted() {
// this.formConfig[1].defaultSelect[]
this.listQuery.startTime = Date.now()
this.time = moment(new Date(Date.now())).format('YYYY-MM-DD')
this.listQuery.endTime = Date.now() + 24 * 60 * 60 * 1000
this.time = moment(new Date((Date.now())).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now() + 24*60*60*1000).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss')
this.listQuery.endTime = Date.now()
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
this.getDataList()
// this.getSpanArr(this.tableData)
@@ -308,7 +308,7 @@ export default {
'sj11': null,

'sj14': null,
putType: '原料投入'
putType: '原料投入(kg)'
},
{
classType: 1,
@@ -374,7 +374,7 @@ export default {
'sj11': null,

'sj14': null,
putType: '原料投入',
putType: '原料投入(kg)',
},
{
classType: 2,
@@ -440,7 +440,7 @@ export default {
'sj11': null,

'sj14': null,
putType: '原料投入',
putType: '原料投入(kg)',
},
{
classType: 3,
@@ -535,9 +535,9 @@ export default {
// Date.now() - 24 * 60 * 60 - 1000
switch (val.btnName) {
case 'search':
this.listQuery.startTime = val.checkTime ? val.checkTime : undefined;
this.time = moment(new Date(this.listQuery.startTime)).format('YYYY-MM-DD')
this.listQuery.endTime = val.checkTime ? val.checkTime + 24 * 60 * 60 * 1000 : undefined;
this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime).setHours(8, 0, 0, 0)).getTime() : undefined;
this.time = moment(new Date((val.checkTime)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(7, 59, 59)).format('YYYY-MM-DD HH:mm:ss')
this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(7, 59, 59)).getTime() : undefined;
this.getDataList();
break;
case 'export':
@@ -551,6 +551,10 @@ export default {
};
</script>
<style scoped>
.baseTable{
border-color: #D1D4DB;
background-color: #F2F4F9;
}
::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
background-color: #EAF1FC;
}


+ 5
- 1
src/views/report/qcReport/cutDayReport/index.vue Ver fichero

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 10:01:33
* @LastEditTime: 2024-04-25 13:40:51
* @LastEditTime: 2024-04-25 17:13:14
* @LastEditors: zhp
* @Description:
-->
@@ -493,6 +493,10 @@ export default {
};
</script>
<style scoped>
.baseTable {
border-color: #D1D4DB;
background-color: #F2F4F9;
}
::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
background-color: #EAF1FC;
}


+ 5
- 1
src/views/report/qcReport/fullInspection/index.vue Ver fichero

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 14:08:46
* @LastEditTime: 2024-04-25 13:30:11
* @LastEditTime: 2024-04-25 17:13:28
* @LastEditors: zhp
* @Description:
-->
@@ -413,6 +413,10 @@ export default {
};
</script>
<style scoped>
.baseTable {
border-color: #D1D4DB;
background-color: #F2F4F9;
}
::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
background-color: #EAF1FC;
}


+ 6
- 1
src/views/report/qcReport/lineReport.vue Ver fichero

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 10:01:33
* @LastEditTime: 2024-04-25 13:40:36
* @LastEditTime: 2024-04-25 17:13:43
* @LastEditors: zhp
* @Description:
-->
@@ -395,6 +395,11 @@ export default {
};
</script>
<style>

.baseTable {
border-color: #D1D4DB;
background-color: #F2F4F9;
}
.baseTable .el-table__body tr.current-row>td.el-table__cell {
background-color: #EAF1FC;
}


+ 13
- 7
src/views/report/qcReport/optimizeCutData.vue Ver fichero

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 15:07:53
* @LastEditTime: 2024-04-25 13:41:27
* @LastEditTime: 2024-04-26 08:42:00
* @LastEditors: zhp
* @Description:
-->
@@ -67,7 +67,7 @@ const tableProps = [
},
{
prop: 'area',
label: '面积'
label: '面积(㎡)'
},
{
prop: 'rate',
@@ -129,7 +129,7 @@ export default {
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'checkTime',
defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime(), new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000],
defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000, new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()],
width: 350
},
{
@@ -167,8 +167,8 @@ export default {
created() { },
mounted() {
// this.formConfig[1].defaultSelect[]
this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime()
this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000
this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000
this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
this.getDataList()
this.getDict()
@@ -357,8 +357,10 @@ export default {
// this.listQuery.materialId = val.materialId ? val.materialId : undefined;
// this.listQuery.startTime = '1706144404000';
// this.listQuery.endTime = '1706230804000';
this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined;
this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000 : undefined;
// this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000
// this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()
this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000 : undefined;
this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() : undefined;
this.listQuery.lineId = val.lineId ? val.lineId : undefined
this.getDataList();
break;
@@ -387,6 +389,10 @@ export default {
};
</script>
<style scoped>
.baseTable {
border-color: #D1D4DB;
background-color: #F2F4F9;
}
::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
background-color: #EAF1FC;
}


Escribir Vista previa
Cargando…
Cancelar
Guardar