diff --git a/src/service/api/produre/workRecords/index.ts b/src/service/api/produre/workRecords/index.ts index d7b5372..b9eca4e 100644 --- a/src/service/api/produre/workRecords/index.ts +++ b/src/service/api/produre/workRecords/index.ts @@ -3,3 +3,7 @@ import { request } from '~/src/service/request'; export const getOutputLog = (params: any) => { return request.get(`/mes/mesOutputLog/list`, { params }); }; + +export const getOutputLog2 = (params: any) => { + return request.get(`/mes/mesOutputLog/list2`, { params }); +}; diff --git a/src/views/board/kanBan/compents/midMidBot.vue b/src/views/board/kanBan/compents/midMidBot.vue index 6e25d69..575ec2b 100644 --- a/src/views/board/kanBan/compents/midMidBot.vue +++ b/src/views/board/kanBan/compents/midMidBot.vue @@ -8,7 +8,7 @@ import * as echarts from 'echarts'; import { defineComponent } from 'vue'; import resize from './dashboard/mixins/resize'; import {option} from './options/mid_bot_options'; -import { getOutputLog } from '~/src/service/api/produre/workRecords/index'; +import { getOutputLog2 } from '~/src/service/api/produre/workRecords/index'; export default defineComponent({ mixins: [resize], props: { @@ -84,9 +84,9 @@ export default defineComponent({ async getTypeData () { let workstationNames = ["1#CNC机","2#滚筒机","1#钉较机"] - let res = await getOutputLog({ + let res = await getOutputLog2({ pageNum : 1, - pageSize : 10 + pageSize : 20 }) this.config.data = res && res.rows && res.rows.length && res.rows.map(item => { return [item.taskType == '0'?'金属':'板材', item.workstationName == '' || !item.workstationName ? workstationNames[Math.floor(Math.random(0, 2))] : item.workstationName, item.orderSn, item.outputWeight, item.createTime, item.createBy] diff --git a/src/views/board/kanBan/index.vue b/src/views/board/kanBan/index.vue index 8834bae..6d350a0 100644 --- a/src/views/board/kanBan/index.vue +++ b/src/views/board/kanBan/index.vue @@ -317,7 +317,7 @@
- {{ wmsData.finishedProductWeight }} + {{ Math.floor(wmsData.finishedProductWeight / 10) }} 箱
成品总箱数
@@ -330,7 +330,7 @@
- {{ wmsData.finishedProductNum }} + {{ wmsData.finishedProductNum / 10 }} 付
成品
@@ -602,19 +602,19 @@ export default defineComponent({ mounted() { this.detectionDayNum = localStorage.getItem('zjCount'); - if(this.detectionDayNum === null){ - this.detectionDayNum = 28; - localStorage.setItem('zjCount', this.detectionDayNum); - } - setInterval(() => { - this.detectionDayNum = Number(this.detectionDayNum) + 3; - if(this.detectionDayNum > 90){ - this.detectionDayNum = 28; - } - localStorage.setItem('zjCount', this.detectionDayNum); - }, 1000000) + // if(this.detectionDayNum === null){ + // this.detectionDayNum = 28; + // localStorage.setItem('zjCount', this.detectionDayNum); + // } + // setInterval(() => { + // this.detectionDayNum = Number(this.detectionDayNum) + 3; + // if(this.detectionDayNum > 90){ + // this.detectionDayNum = 28; + // } + // localStorage.setItem('zjCount', this.detectionDayNum); + // }, 1000000) const app = useAppStore(); - app.setContentFull(true); + app.setContentFull(false); this.initData(); this.handleScreenAuto(); // 绑定自适应函数 ---防止浏览器栏变化后不再适配 @@ -664,7 +664,7 @@ export default defineComponent({ if (res.code === 200) { for (const key in this.wmsData) { if (res.data[key] && key !== 'finishedProductNum') { - res.data[key] = Number(res.data[key]).toFixed(2); + res.data[key] = Math.floor(Number(res.data[key])); } this.wmsData[key] = res.data[key]; } @@ -749,7 +749,7 @@ export default defineComponent({ }); -