#278 projects/mesxc-dy

已合併
juzi 5 月之前 將 2 次代碼提交從 projects/mesxc-dy合併至 projects/mesxc-test
  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 查看文件

@@ -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) { export function groupClassesListAll(query) {
return request({ return request({


+ 2
- 2
src/views/core/monitoring/data24/index.vue 查看文件

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


export default { export default {
name: 'productionLineData24', name: 'productionLineData24',
@@ -88,7 +88,7 @@ export default {
} }
this.tableProps = this.arr this.tableProps = this.arr
const paramsTime = [parseTime(timeArr[0]), parseTime(timeArr[23])] 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 this.monitorList = res.data.data
console.log('报废', this.monitorList) console.log('报废', this.monitorList)


+ 2
- 2
src/views/equipment/base/inspection/Confirm/WaitingListTable.vue 查看文件

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


+ 5
- 5
src/views/equipment/base/inspection/Confirm/add-or-updata.vue 查看文件

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


+ 1
- 1
src/views/equipment/base/inspection/Record/index.vue 查看文件

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


Loading…
取消
儲存