#278 projects/mesxc-dy

Birleştirildi
juzi 5 ay önce projects/mesxc-dy içindeki 2 işleme projects/mesxc-test ile birleştirdi
  1. +9
    -0
      src/api/monitoring/teamProduction.js
  2. +2
    -2
      src/views/core/monitoring/data24/index.vue
  3. +2
    -2
      src/views/equipment/base/inspection/Confirm/WaitingListTable.vue
  4. +5
    -5
      src/views/equipment/base/inspection/Confirm/add-or-updata.vue
  5. +1
    -1
      src/views/equipment/base/inspection/Record/index.vue

+ 9
- 0
src/api/monitoring/teamProduction.js Dosyayı Görüntüle

@@ -18,6 +18,15 @@ export function getSchedulingMonitoringRecord(query) {
})
}

// 获得不同产线每小时报废数据,用于班组检测 班组生产情况详情(动态结构)
export function getSchedulingMonitoringRecord1(query) {
return request({
url: '/base/quality-inspection-record/getSchedulingMonitoringRecord24h',
method: 'get',
params: query
})
}

// 获得所有列表
export function groupClassesListAll(query) {
return request({


+ 2
- 2
src/views/core/monitoring/data24/index.vue Dosyayı Görüntüle

@@ -26,7 +26,7 @@
<script>
import { getPdlDataOneDay } from '@/api/core/monitoring/data24'
import { parseTime } from '../../mixins/code-filter';
import { getSchedulingMonitoringRecord } from '@/api/monitoring/teamProduction'
import { getSchedulingMonitoringRecord1 } from '@/api/monitoring/teamProduction'

export default {
name: 'productionLineData24',
@@ -88,7 +88,7 @@ export default {
}
this.tableProps = this.arr
const paramsTime = [parseTime(timeArr[0]), parseTime(timeArr[23])]
await getSchedulingMonitoringRecord({checkTime: paramsTime}).then(res =>{
await getSchedulingMonitoringRecord1({checkTime: paramsTime}).then(res =>{
// 报废数据
this.monitorList = res.data.data
console.log('报废', this.monitorList)


+ 2
- 2
src/views/equipment/base/inspection/Confirm/WaitingListTable.vue Dosyayı Görüntüle

@@ -46,9 +46,9 @@
<el-table-column
v-if="selectedBox[2]"
label="巡检时间"
prop="planCheckTime">
prop="actualCheckTime">
<template slot-scope="scope">
{{ scope.row.planCheckTime | timeFilter }}
{{ scope.row.actualCheckTime | timeFilter }}
</template>
</el-table-column>
<el-table-column


+ 5
- 5
src/views/equipment/base/inspection/Confirm/add-or-updata.vue Dosyayı Görüntüle

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2024-03-20 17:58:29
* @LastEditTime: 2024-03-25 15:44:49
* @Description:
-->
<template>
@@ -85,12 +85,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="巡检时间" prop="planCheckTime">
<el-form-item label="实际巡检时间" prop="actualCheckTime">
<el-date-picker
v-model="dataForm.planCheckTime"
v-model="dataForm.actualCheckTime"
type="datetime"
:disabled="isdetail"
placeholder="请选择巡检时间"
placeholder="请选择实际巡检时间"
value-format="timestamp"
style="width: 100%" />
</el-form-item>
@@ -250,7 +250,7 @@ export default {
departmentId: undefined,
groupClass: [],
checkPerson: [],
planCheckTime: undefined
actualCheckTime: undefined
},
detList: [],
groupOptions: [],


+ 1
- 1
src/views/equipment/base/inspection/Record/index.vue Dosyayı Görüntüle

@@ -120,7 +120,7 @@ export default {
tableProps: [
{ prop: 'name', label: '巡检单名称' },
{ prop: 'department', label: '部门' },
{ prop: 'planCheckTime', label: '巡检时间', filter: parseTime },
{ prop: 'actualCheckTime', label: '巡检时间', filter: parseTime },
{ prop: 'groupClass', label: '班次' },
// { prop: 'opt', label: '巡检内容', name: '详情', subcomponent: btn },
{ prop: 'remark', label: '备注' }


Yükleniyor…
İptal
Kaydet