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

projects/mesxc-zhp #358

Merged
juzi merged 2 commits from projects/mesxc-zhp into projects/mesxc-test 2024-04-24 14:54:40 +08:00
Conversation 0 Commits 2 Files Changed 2 +12 -3
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8e2b332c7b - Show all commits

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

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-07-19 15:18:30 * @Date: 2021-07-19 15:18:30
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-04-24 14:36:29 * @LastEditTime: 2024-04-24 14:48:00
* @Description: * @Description:
--> -->
<template> <template>
@ -37,7 +37,7 @@
</el-col> </el-col>
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%"> <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%">
<base-container :show-time="true" :height="318" :size="'small'" :title="'工单监控'" :title-icon="'eqMonitoring'"> <base-container :show-time="false" :height="318" :size="'small'" :title="'工单监控'" :title-icon="'eqMonitoring'">
<div class="order" style="width: 100%; overflow: hidden scroll; height: 350px"> <div class="order" style="width: 100%; overflow: hidden scroll; height: 350px">
<el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;"> <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;">
<!-- <el-col :span="12"> --> <!-- <el-col :span="12"> -->

11
src/views/report/qcReport/fullInspection/index.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-04-18 14:08:46 * @Date: 2024-04-18 14:08:46
* @LastEditTime: 2024-04-24 14:12:24 * @LastEditTime: 2024-04-24 14:41:01
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -484,6 +484,15 @@ export default {
// }, // },
// 获取数据列表 // 获取数据列表
getDataList() { getDataList() {
if (this.radio === '晚班查询') {
let str = this.listQuery.startTime
// console.log(str);
this.listQuery.startTime = new Date(new Date(str).setHours(1, 9, 0, 0)).getTime()
} else {
let str = this.listQuery.startTime
// console.log(str);
this.listQuery.startTime = new Date(new Date(str).setHours(0, 7, 0, 0)).getTime()
}
this.dataListLoading = true; this.dataListLoading = true;
// this.listQuery.startTime = '1713197388000'; // this.listQuery.startTime = '1713197388000';
// this.listQuery.endTime = '1713254961000'; // this.listQuery.endTime = '1713254961000';