瀏覽代碼

Merge pull request 'projects/mesxc-zhp' (#358) from projects/mesxc-zhp into projects/mesxc-test

Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/358
projects/mesxc-dev
juzi 4 月之前
父節點
當前提交
ec0c09a674
共有 2 個文件被更改,包括 12 次插入3 次删除
  1. +2
    -2
      src/views/OperationalOverview/processingBoard.vue
  2. +10
    -1
      src/views/report/qcReport/fullInspection/index.vue

+ 2
- 2
src/views/OperationalOverview/processingBoard.vue 查看文件

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2024-04-24 14:36:29
* @LastEditTime: 2024-04-24 14:48:00
* @Description:
-->
<template>
@@ -37,7 +37,7 @@
</el-col>

<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">
<el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;">
<!-- <el-col :span="12"> -->


+ 10
- 1
src/views/report/qcReport/fullInspection/index.vue 查看文件

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 14:08:46
* @LastEditTime: 2024-04-24 14:12:24
* @LastEditTime: 2024-04-24 14:41:01
* @LastEditors: zhp
* @Description:
-->
@@ -484,6 +484,15 @@ export default {
// },
// 获取数据列表
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.listQuery.startTime = '1713197388000';
// this.listQuery.endTime = '1713254961000';


Loading…
取消
儲存