Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/33pull/40/head
@@ -478,7 +478,7 @@ export default { | |||||
handleDelete(row) { | handleDelete(row) { | ||||
const id = row.id; | const id = row.id; | ||||
this.$modal | this.$modal | ||||
.confirm('是否确认删除设备编号为"' + id + '"的数据项?') | |||||
.confirm('是否确认删除设备名称为"' + row.name + '"的数据项?') | |||||
.then(function () { | .then(function () { | ||||
return deleteEquipment(id); | return deleteEquipment(id); | ||||
}) | }) | ||||
@@ -1,8 +1,8 @@ | |||||
<!-- | <!-- | ||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2023-08-01 13:52:10 | * @Date: 2023-08-01 13:52:10 | ||||
* @LastEditors: zwq | |||||
* @LastEditTime: 2023-08-01 16:59:35 | |||||
* @LastEditors: DY | |||||
* @LastEditTime: 2023-09-21 15:45:07 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -39,6 +39,12 @@ | |||||
<el-form-item label="产线TT值(h)" prop="tvalue"> | <el-form-item label="产线TT值(h)" prop="tvalue"> | ||||
<el-input v-model="dataForm.tvalue" clearable placeholder="请输入每小时下片数量" /> | <el-input v-model="dataForm.tvalue" clearable placeholder="请输入每小时下片数量" /> | ||||
</el-form-item> | </el-form-item> | ||||
<el-form-item label="额外编码" prop="externalCode"> | |||||
<el-input | |||||
v-model="dataForm.externalCode" | |||||
clearable | |||||
placeholder="请输入额外编码" /> | |||||
</el-form-item> | |||||
<el-form-item label="描述" prop="description"> | <el-form-item label="描述" prop="description"> | ||||
<el-input | <el-input | ||||
v-model="dataForm.description" | v-model="dataForm.description" | ||||
@@ -82,6 +88,7 @@ export default { | |||||
name: undefined, | name: undefined, | ||||
tvalue: undefined, | tvalue: undefined, | ||||
factoryId: undefined, | factoryId: undefined, | ||||
externalCode: undefined, | |||||
remark: undefined, | remark: undefined, | ||||
description: undefined, | description: undefined, | ||||
}, | }, | ||||
@@ -1,8 +1,8 @@ | |||||
<!-- | <!-- | ||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2023-08-01 13:52:10 | * @Date: 2023-08-01 13:52:10 | ||||
* @LastEditors: zwq | |||||
* @LastEditTime: 2023-08-01 16:58:44 | |||||
* @LastEditors: DY | |||||
* @LastEditTime: 2023-09-21 10:48:54 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -37,7 +37,7 @@ | |||||
</el-select> | </el-select> | ||||
</el-form-item> | </el-form-item> | ||||
<el-form-item label="排序" prop="sort"> | <el-form-item label="排序" prop="sort"> | ||||
<el-input-number v-model="dataForm.sort" :min="1" clearable placeholder="请输入排序" /> | |||||
<el-input-number v-model="dataForm.sort" :min="1" :max="100" clearable placeholder="请输入排序" /> | |||||
</el-form-item> | </el-form-item> | ||||
<el-form-item label="备注" prop="remark"> | <el-form-item label="备注" prop="remark"> | ||||
<el-input v-model="dataForm.remark" clearable placeholder="请输入备注" /> | <el-input v-model="dataForm.remark" clearable placeholder="请输入备注" /> | ||||
@@ -1,8 +1,8 @@ | |||||
/* | /* | ||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2022-08-24 11:19:43 | * @Date: 2022-08-24 11:19:43 | ||||
* @LastEditors: zwq | |||||
* @LastEditTime: 2023-08-02 10:56:37 | |||||
* @LastEditors: DY | |||||
* @LastEditTime: 2023-09-21 16:02:07 | |||||
* @Description: | * @Description: | ||||
*/ | */ | ||||
export default { | export default { | ||||
@@ -38,7 +38,7 @@ export default { | |||||
this.dataListLoading = true; | this.dataListLoading = true; | ||||
this.urlOptions.getDataListURL(this.listQuery).then(response => { | this.urlOptions.getDataListURL(this.listQuery).then(response => { | ||||
this.tableData = response.data.list; | this.tableData = response.data.list; | ||||
this.total = response.data.total; | |||||
this.listQuery.total = response.data.total; | |||||
this.dataListLoading = false; | this.dataListLoading = false; | ||||
}); | }); | ||||
}, | }, | ||||
@@ -10,9 +10,9 @@ | |||||
:formConfigs="[{ label: '设备近24小时产线生产数据', type: 'title' }]" | :formConfigs="[{ label: '设备近24小时产线生产数据', type: 'title' }]" | ||||
ref="search-bar" /> | ref="search-bar" /> | ||||
<el-skeleton v-if="initing" :rows="6" animated /> | <el-skeleton v-if="initing" :rows="6" animated /> | ||||
<!-- :span-method="mergeColumnHandler" --> | |||||
<base-table | <base-table | ||||
v-else | v-else | ||||
:span-method="mergeColumnHandler" | |||||
:table-props="tableProps" | :table-props="tableProps" | ||||
:table-data="tableData" | :table-data="tableData" | ||||
@emitFun="handleEmitFun"></base-table> | @emitFun="handleEmitFun"></base-table> | ||||
@@ -62,7 +62,7 @@ export default { | |||||
for (const times of timeArray) { | for (const times of timeArray) { | ||||
if (times !== '投入数量' && times !== '产出数量' && times !== '报废数量' && times !== '产出面积') { | if (times !== '投入数量' && times !== '产出数量' && times !== '报废数量' && times !== '产出面积') { | ||||
const subprop = { | const subprop = { | ||||
label: times, | |||||
label: times.slice(0, 10) + ' ' + times.slice(11), | |||||
align: 'center', | align: 'center', | ||||
children: [ | children: [ | ||||
{ prop: times + '_in', label: '投入数量', align: 'center' }, | { prop: times + '_in', label: '投入数量', align: 'center' }, | ||||
@@ -117,8 +117,8 @@ export default { | |||||
tempData['spec'] = ele.spec | tempData['spec'] = ele.spec | ||||
this.tableData.push(tempData) | this.tableData.push(tempData) | ||||
console.log('看看数据', this.tableData, tempData) | console.log('看看数据', this.tableData, tempData) | ||||
const { sectionName } = tempData | |||||
sectionArr.push(sectionName) | |||||
const { proLineName } = tempData | |||||
sectionArr.push(proLineName) | |||||
}) | }) | ||||
this.setRowSpan(sectionArr) | this.setRowSpan(sectionArr) | ||||
console.log('工段名称列表', sectionArr) | console.log('工段名称列表', sectionArr) | ||||
@@ -1,15 +1,15 @@ | |||||
<!-- | <!-- | ||||
* @Author: Do not edit | * @Author: Do not edit | ||||
* @Date: 2023-08-29 14:59:29 | * @Date: 2023-08-29 14:59:29 | ||||
* @LastEditTime: 2023-09-16 17:41:53 | |||||
* @LastEditTime: 2023-09-22 15:13:48 | |||||
* @LastEditors: DY | * @LastEditors: DY | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
<div class="app-container"> | <div class="app-container"> | ||||
<!-- :isFold="true" 控制展开 --> | |||||
<search-bar | <search-bar | ||||
:formConfigs="formConfig" | :formConfigs="formConfig" | ||||
:isFold="true" | |||||
ref="searchBarForm" | ref="searchBarForm" | ||||
@headBtnClick="buttonClick" /> | @headBtnClick="buttonClick" /> | ||||
<base-table | <base-table | ||||
@@ -36,7 +36,7 @@ | |||||
@pagination="getDataList" /> | @pagination="getDataList" /> | ||||
<div ref="pdf" v-show="false"> | <div ref="pdf" v-show="false"> | ||||
<el-table :data="selectedList" stripe border style="width: 100%"> | <el-table :data="selectedList" stripe border style="width: 100%"> | ||||
<el-table-column prop="reportType" label="产线类型" /> | |||||
<el-table-column prop="reportType" label="报表类型" /> | |||||
<el-table-column prop="reportStartTime" label="统计开始时间" /> | <el-table-column prop="reportStartTime" label="统计开始时间" /> | ||||
<el-table-column prop="reportEndTime" label="统计结束时间" /> | <el-table-column prop="reportEndTime" label="统计结束时间" /> | ||||
<el-table-column prop="proLineName" label="产线名称" /> | <el-table-column prop="proLineName" label="产线名称" /> | ||||
@@ -73,7 +73,7 @@ import FileSaver from 'file-saver' | |||||
const tableProps = [ | const tableProps = [ | ||||
{ | { | ||||
prop: 'reportType', | prop: 'reportType', | ||||
label: '产线类型' | |||||
label: '报表类型' | |||||
}, | }, | ||||
{ | { | ||||
prop: 'reportStartTime', | prop: 'reportStartTime', | ||||
@@ -270,8 +270,8 @@ export default { | |||||
this.listQuery.lineId = val.line ? val.line : undefined; | this.listQuery.lineId = val.line ? val.line : undefined; | ||||
this.listQuery.sectionId = val.section ? val.section : undefined; | this.listQuery.sectionId = val.section ? val.section : undefined; | ||||
this.listQuery.reportType = val.reportType ? val.reportType : undefined; | this.listQuery.reportType = val.reportType ? val.reportType : undefined; | ||||
this.listQuery.reportStartTime = [new Date(val.timeVal[0]).getTime()]; | |||||
this.listQuery.reportEndTime = [new Date(val.timeVal[1]).getTime()]; | |||||
this.listQuery.reportStartTime = val.timeVal ? [new Date(val.timeVal[0]).getTime()] : undefined; | |||||
this.listQuery.reportEndTime = val.timeVal ? [new Date(val.timeVal[1]).getTime()] : undefined; | |||||
this.getDataList(); | this.getDataList(); | ||||
break; | break; | ||||
case 'export': | case 'export': | ||||
@@ -76,6 +76,7 @@ export default { | |||||
startTime: undefined, | startTime: undefined, | ||||
endTime: undefined, | endTime: undefined, | ||||
}, | }, | ||||
dataListLoading: false, | |||||
optionArrUrl: [getProductionLinePage, getWorkshopSectionPage], | optionArrUrl: [getProductionLinePage, getWorkshopSectionPage], | ||||
formConfig: [ | formConfig: [ | ||||
{ | { | ||||