mt-fe-group/yudao-dev
12
0
複製 0
程式碼 問題管理 合併請求 版本發佈 Wiki Activity

Merge pull request 'projects/mesxc-zhp' (#375) from projects/mesxc-zhp into projects/mesxc-test
Some checks failed
continuous-integration/drone/push Build is failing
Details

瀏覽代碼 
Reviewed-on: #375
This commit is contained in:
朱菊兰 2024-04-26 13:59:41 +08:00
當前提交 e7f21456a3
共有 3 個文件被更改，包括 14 次插入 和 11 次删除
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/report/qcReport/cutDayReport/index.vue
查看文件

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 10:01:33
* @LastEditTime: 2024-04-25 17:13:14
* @LastEditTime: 2024-04-26 10:44:00
* @LastEditors: zhp
* @Description:
-->
@ -167,7 +167,7 @@ export default {
listQuery: {
startTime: undefined,
endTime: undefined,
lineId: null,
lineId: undefined,
},
formConfig: [
// {
@ -189,7 +189,7 @@ export default {
type: 'datePicker',
label: '时间段',
dateType: 'daterange',
format: 'yyyy-MM-dd HH:mm:ss',
format: 'yyyy-MM-dd',
valueFormat: "timestamp",
rangeSeparator: '-',
startPlaceholder: '开始时间',
@ -205,6 +205,7 @@ export default {
labelField: 'name',
valueField: 'id',
param: 'lineId',
multiple:true,
filterable: true
},
{

15
src/views/report/qcReport/lineReport.vue
查看文件

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 10:01:33
* @LastEditTime: 2024-04-26 09:42:54
* @LastEditTime: 2024-04-26 10:44:27
* @LastEditors: zhp
* @Description:
-->
@ -104,7 +104,7 @@ export default {
listQuery: {
startTime: undefined,
endTime: undefined,
lineId:null,
lineId:undefined,
},
formConfig: [
// {
@ -132,7 +132,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
},
{
@ -142,6 +142,7 @@ export default {
labelField: 'name',
valueField: 'id',
param: 'lineId',
multiple:true,
filterable: true
},
{
@ -170,8 +171,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()
@ -365,8 +366,8 @@ 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 = 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;

3
src/views/report/qcReport/optimizeCutData.vue
查看文件

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 15:07:53
* @LastEditTime: 2024-04-26 09:41:54
* @LastEditTime: 2024-04-26 10:44:41
* @LastEditors: zhp
* @Description:
-->
@ -146,6 +146,7 @@ export default {
labelField: 'name',
valueField: 'id',
param: 'lineId',
multiple:true,
filterable: true
},
{