meswork/50-XiAn204-MacroinfManage_MES
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit 20221024

Browse Source
This commit is contained in:
LIUHAO
2022-10-24 08:33:42 +08:00
parent f96f54dc0a
commit 894e6573d1
14 changed files with 280 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/ipAddress.js
View File

@@ -1,3 +1,4 @@
export const ip = 'http://localhost:8051'
// export const ip = 'http://124.220.15.242:8154' // AP
// export const ip = 'http://124.220.15.242:8153' // 福田

8
src/views/ProcessManagement/AndonMaintenance/index.vue
View File

@@ -189,11 +189,11 @@ export default {
data() {
return {
stationNumber: [],
stationNumberValue: 'OP1005',
stationName: '扫描上线工位',
stationNumberValue: '',
stationName: '',
andonArr: [],
andonValue: 1,
andonLabel: '物料ANDON',
andonValue: '',
andonLabel: '',
worksheet: [],
itemFile: [],
unSpecification: [],

10
src/views/ProcessManagement/PdfCardMaintenance/index.vue
View File

@@ -85,12 +85,12 @@ export default {
fileName1: '',
tableData: [], // 总数据数组
stationNumber: [],
stationNumberValue: 'OP1005',
stationName: '扫描上线工位',
stationNumberValue: '',
stationName: '',
moduleDescription: [],
moduleDescriptionValue: '',
engineTypeValue: 'SGM-5P',
engineTypeValue1: '1',
engineTypeValue: '',
engineTypeValue1: '',
engineTypeName: '',
engineType: [],
isDisableValue: 0,
@@ -131,7 +131,7 @@ export default {
}
},
created() {
this.searchTable()
// this.searchTable()
this.getStationNumber()
this.getEndStation()
},

8
src/views/ProcessManagement/ProcessPictureMaintenance/index.vue
View File

@@ -71,11 +71,11 @@ export default {
upload: url,
tableData: [], // 总数据数组
stationNumber: [],
stationNumberValue: 'OP1005',
stationName: '扫描上线工位',
stationNumberValue: '',
stationName: '',
moduleDescription: [],
moduleDescriptionValue: '',
engineTypeValue: 'SGM-5P',
engineTypeValue: '',
engineTypeValue1: '',
engineTypeName: '',
engineType: [],
@@ -108,7 +108,7 @@ export default {
}
},
created() {
this.searchTable()
// this.searchTable()
this.getStationNumber()
this.getEndStation()
},

52
src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue
View File

@@ -28,17 +28,20 @@
:value="item.value"
size="mini"/>
</el-select>
<span style="margin-left: 10px">精确追溯码：</span>
<el-select v-model="traceabilityCode" placeholder="请选择精确追溯码" filterable clearable size="small" style="width: 200px">
<el-option
v-for="item in traceabilityCodeArr"
:key="item.ID"
:label="item.label"
:value="item.value"
size="mini"/>
</el-select>
<span style="margin-left: 10px">批次条码：</span>
<el-input v-model="traceabilityCode" placeholder="请输入批次条码" clearable size="small" style="width: 200px; margin-left: 13px"/>
<!-- <span style="margin-left: 10px">精确追溯码：</span>-->
<!-- <el-input v-model="traceabilityCode" placeholder="请输入精确追溯码" clearable size="small" style="width: 200px"/>-->
<!-- <el-select v-model="traceabilityCode" placeholder="请选择精确追溯码" filterable clearable size="small" style="width: 200px">-->
<!-- <el-option-->
<!-- v-for="item in traceabilityCodeArr"-->
<!-- :key="item.ID"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- size="mini"/>-->
<!-- </el-select>-->
<span style="margin-left: 10px">总成编号：</span>
<el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 200px; margin-left: 13px">
<el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 200px;">
<el-option
v-for="item in assemblyNumber"
:key="item.value"
@@ -81,15 +84,14 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="getOrderNumber();getTraceabilityCode();getBatchBarcode();getAssemblyNumber()"/>
<span style="margin-left: 10px">批次条码：</span>
<el-select v-model="batchBarcodeValue" placeholder="请选择批次条码" clearable filterable size="small" style="width: 200px; margin-left: 13px">
<el-option
v-for="item in batchBarcode"
:key="item.value"
:label="item.label"
:value="item.value"
size="mini"/>
</el-select>
<!-- <el-select v-model="batchBarcodeValue" placeholder="请选择批次条码" clearable filterable size="small" style="width: 200px; margin-left: 13px">-->
<!-- <el-option-->
<!-- v-for="item in batchBarcode"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- size="mini"/>-->
<!-- </el-select>-->
<span style="margin-left: 10px">是否合格：</span>
<el-select v-model="isQualifiedValue" placeholder="请选择是否合格" clearable size="small" style="width: 200px; margin-left: 13px">
<el-option
@@ -110,7 +112,7 @@
</el-select>
</div>
<div style="margin: 10px 0 0 89%">
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="selectDate()">查询</el-button>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageCurrent = 1,pageSize = 30,selectDate()">查询</el-button>
<el-button type="info" size="small" icon="el-icon-download" @click="exportExcel()">Excel</el-button>
</div>
<el-table
@@ -249,7 +251,7 @@ export default {
value: 2
}
], // 是否合格
isQualifiedValue: '', // 是否合格
isQualifiedValue: 2, // 是否合格
dateTime: '', // 时间
loading: false, // 时间
tableData: [], // 时间
@@ -294,7 +296,6 @@ export default {
var param = []
var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.stationNumberValue = response.data[0].工位号 }
for (let i = 0; i < response.data.length; i++) {
this.stationNumber.push({
label: response.data[i].工位号,
@@ -312,7 +313,6 @@ export default {
var param = []
var Data = this.CreateData('11', 'MES_基本变量_机型代码_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.engineTypeValue = response.data[0].发动机型号 }
for (let i = 0; i < response.data.length; i++) {
this.engineType.push({
label: response.data[i].发动机型号,
@@ -338,7 +338,6 @@ export default {
param[2] = ['合格标志', isQualifiedValue]
var Data = this.CreateData('11', '测量数据合格索引_订单号_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.orderNumberValue = response.data[0].订单号 }
for (let i = 0; i < response.data.length; i++) {
this.orderNumber.push({
label: response.data[i].订单号,
@@ -365,7 +364,6 @@ export default {
param[6] = ['分线总线', 1]
var Data = this.CreateData('11', '初始化二维码_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.traceabilityCode = response.data[0].物料条码 }
for (let i = 0; i < response.data.length; i++) {
this.traceabilityCodeArr.push({
label: response.data[i].物料条码,
@@ -392,7 +390,6 @@ export default {
param[6] = ['分线总线', 1]
var Data = this.CreateData('11', '测量数据合格索引_发动机号_发动机型号_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.assemblyNumberValue = response.data[0].发动机号 }
for (let i = 0; i < response.data.length; i++) {
this.assemblyNumber.push({
label: response.data[i].发动机号,
@@ -411,7 +408,6 @@ export default {
param[2] = ['工位号', this.stationNumberValue]
var Data = this.CreateData('11', '物料数据_视图_物料条码批次号_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.batchBarcodeValue = response.data[0].物料条码 }
for (let i = 0; i < response.data.length; i++) {
this.batchBarcode.push({
label: response.data[i].物料条码,
@@ -426,7 +422,6 @@ export default {
param[0] = ['工位号', this.stationNumberValue]
var Data = this.CreateData('11', '质量数据查询_测量位置 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.measuringPositionValue = response.data[0].测量位置 }
for (let i = 0; i < response.data.length; i++) {
this.measuringPosition.push({
label: response.data[i].测量位置,
@@ -444,7 +439,6 @@ export default {
param[1] = ['测量位置', this.measuringPositionValue]
var Data = this.CreateData('11', '质量数据查询_测量项目 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.measuringProjectValue = response.data[0].测量项目 }
for (let i = 0; i < response.data.length; i++) {
this.measuringProject.push({
label: response.data[i].测量项目,

4
src/views/QualityAssurance/InquiryTransitInformation/index.vue
View File

@@ -224,7 +224,6 @@ export default {
var param = []
var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.stationNumberValue = response.data[0].工位号 }
for (let i = 0; i < response.data.length; i++) {
this.stationNumber.push({
label: response.data[i].工位号,
@@ -239,7 +238,6 @@ export default {
var param = []
var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
this.ExecDatabase(Data).then(response => {
this.stationNumberValueN = response.data[0].工位号
for (let i = 0; i < response.data.length; i++) {
this.stationNumberN.push({
label: response.data[i].工位号,
@@ -258,7 +256,6 @@ export default {
// param[1] = ['结束时间', this.dateTime[1]]
var Data = this.CreateData('11', '测量数据发动机在线状态_订单号_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.orderNumberValue = response.data[0].订单号 }
for (let i = 0; i < response.data.length; i++) {
this.orderNumber.push({
label: response.data[i].订单号,
@@ -280,7 +277,6 @@ export default {
param[3] = ['订单号', this.orderNumberValue]
var Data = this.CreateData('11', '测量数据发动机在线状态_发动机号_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.assemblyNumberValue = response.data[0].发动机号 }
for (let i = 0; i < response.data.length; i++) {
this.assemblyNumber.push({
label: response.data[i].发动机号,

75
src/views/QualityAssurance/LineItemQuery/index.vue
View File

@@ -29,14 +29,16 @@
size="mini"/>
</el-select>
<span style="margin-left: 10px">精确追溯码：</span>
<el-select v-model="traceabilityCode" placeholder="请选择精确追溯码" filterable clearable size="small" style="width: 200px">
<el-option
v-for="item in traceabilityCodeArr"
:key="item.ID"
:label="item.label"
:value="item.value"
size="mini"/>
</el-select>
<el-input v-model="traceabilityCode" placeholder="请输入精确追溯码" clearable size="small" style="width: 200px;"/>
<!-- <span style="margin-left: 10px">精确追溯码：</span>-->
<!-- <el-select v-model="traceabilityCode" placeholder="请选择精确追溯码" filterable clearable size="small" style="width: 200px">-->
<!-- <el-option-->
<!-- v-for="item in traceabilityCodeArr"-->
<!-- :key="item.ID"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- size="mini"/>-->
<!-- </el-select>-->
<span style="margin-left: 10px">分总成编号：</span>
<el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 200px">
<el-option
@@ -71,17 +73,19 @@
end-placeholder="结束日期"
@change="getTraceabilityCode();getBatchBarcode();getAssemblyNumber()"/>
<span style="margin-left: 10px">批次条码：</span>
<el-select v-model="batchBarcodeValue" placeholder="请选择批次条码" clearable filterable size="small" style="width: 200px;margin-left: 13px">
<el-option
v-for="item in batchBarcode"
:key="item.value"
:label="item.label"
:value="item.value"
size="mini"/>
</el-select>
<el-input v-model="batchBarcodeValue" placeholder="请输入批次条码" clearable size="small" style="width: 200px; margin-left: 13px"/>
<!-- <span style="margin-left: 10px">批次条码：</span>-->
<!-- <el-select v-model="batchBarcodeValue" placeholder="请选择批次条码" clearable filterable size="small" style="width: 200px;margin-left: 13px">-->
<!-- <el-option-->
<!-- v-for="item in batchBarcode"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- size="mini"/>-->
<!-- </el-select>-->
</div>
<div style="margin: 10px 0 0 89%">
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="selectDate()">查询</el-button>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageCurrent = 1,pageSize = 30,selectDate()">查询</el-button>
<el-button type="info" size="small" icon="el-icon-download" @click="exportExcel()">Excel</el-button>
</div>
<el-table
@@ -262,9 +266,6 @@ export default {
var param = []
var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) {
this.stationNumberValue = response.data[0].工位号
}
for (let i = 0; i < response.data.length; i++) {
this.stationNumber.push({
label: response.data[i].工位号,
@@ -281,9 +282,6 @@ export default {
var param = []
var Data = this.CreateData('11', 'MES_基本变量_机型代码_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) {
this.engineTypeValue = response.data[0].发动机型号
}
for (let i = 0; i < response.data.length; i++) {
this.engineType.push({
label: response.data[i].发动机型号,
@@ -300,7 +298,6 @@ export default {
param[1] = ['工位号', this.stationNumberValue]
var Data = this.CreateData('11', '电子看板装配零件_零件名称_初始化查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.partNameValue = response.data[0].零件名称 }
for (let i = 0; i < response.data.length; i++) {
this.partName.push({
label: response.data[i].零件名称,
@@ -317,10 +314,8 @@ export default {
this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
var param = []
param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
// param[0] = ['开始时间', this.dateTime[0]]
// param[1] = ['结束时间', this.dateTime[1]]
param[0] = ['开始时间', this.dateTime[0]]
param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -328,7 +323,6 @@ export default {
param[6] = ['分线总线', 2]
var Data = this.CreateData('11', '初始化二维码_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.traceabilityCode = response.data[0].物料条码 }
for (let i = 0; i < response.data.length; i++) {
this.traceabilityCodeArr.push({
label: response.data[i].物料条码,
@@ -353,9 +347,6 @@ export default {
param[6] = ['分线总线', 2]
var Data = this.CreateData('11', '测量数据合格索引_发动机号_发动机型号_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) {
this.assemblyNumberValue = response.data[0].发动机号
}
for (let i = 0; i < response.data.length; i++) {
this.assemblyNumber.push({
label: response.data[i].发动机号,
@@ -367,15 +358,12 @@ export default {
getBatchBarcode() {
this.batchBarcode = []
var param = []
param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
// param[0] = ['开始时间', this.dateTime[0]]
// param[1] = ['结束时间', this.dateTime[1]]
param[0] = ['开始时间', this.dateTime[0]]
param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['工位号', this.stationNumberValue]
console.log(param, 'param')
var Data = this.CreateData('11', '物料数据分线_视图_物料条码批次号_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.batchBarcodeValue = response.data[0].物料条码 }
for (let i = 0; i < response.data.length; i++) {
this.batchBarcode.push({
label: response.data[i].物料条码,
@@ -391,7 +379,6 @@ export default {
param[1] = ['测量位置', this.measuringPositionValue]
var Data = this.CreateData('11', '质量数据查询_测量项目 ', param)
this.ExecDatabase(Data).then(response => {
this.measuringProjectValue = response.data[0].测量项目
for (let i = 0; i < response.data.length; i++) {
this.measuringProject.push({
label: response.data[i].测量项目,
@@ -410,10 +397,8 @@ export default {
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
var param = []
param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
// param[0] = ['开始时间', this.dateTime[0]]
// param[1] = ['结束时间', this.dateTime[1]]
param[0] = ['开始时间', this.dateTime[0]]
param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
@@ -450,10 +435,8 @@ export default {
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
var param = []
param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
// param[0] = ['开始时间', this.dateTime[0]]
// param[1] = ['结束时间', this.dateTime[1]]
param[0] = ['开始时间', this.dateTime[0]]
param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['发动机号_ischeck', assemblyNumberValue_check]

243
src/views/QualityAssurance/LineQualityQuery/index.vue
View File

@@ -10,8 +10,8 @@
filterable
clearable
size="small"
style="width: 200px"
@change="getMeasuringPosition();getTraceabilityCode();getBatchBarcode();getAssemblyNumber()">
style="width: 200px; margin-left: 13px"
@change="getPartName();getBatchBarcode();getAssemblyNumber();getTraceabilityCode()">
<el-option
v-for="item in stationNumber"
:key="item.value"
@@ -20,7 +20,7 @@
size="mini"/>
</el-select>
<span style="margin-left: 10px">机型：</span>
<el-select v-model="engineTypeValue" placeholder="请选择机型" filterable clearable size="small" style="width: 240px" @change="getAssemblyNumber()">
<el-select v-model="engineTypeValue" placeholder="请选择机型" filterable clearable size="small" style="width: 240px" @change="getPartName();getAssemblyNumber">
<el-option
v-for="item in engineType"
:key="item.value"
@@ -29,16 +29,18 @@
size="mini"/>
</el-select>
<span style="margin-left: 10px">精确追溯码：</span>
<el-select v-model="traceabilityCode" placeholder="请选择精确追溯码" filterable clearable size="small" style="width: 200px">
<el-option
v-for="item in traceabilityCodeArr"
:key="item.ID"
:label="item.label"
:value="item.value"
size="mini"/>
</el-select>
<span style="margin-left: 10px">总成编号：</span>
<el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 200px; margin-left: 13px">
<el-input v-model="traceabilityCode" placeholder="请输入精确追溯码" clearable size="small" style="width: 200px;"/>
<!-- <span style="margin-left: 10px">精确追溯码：</span>-->
<!-- <el-select v-model="traceabilityCode" placeholder="请选择精确追溯码" filterable clearable size="small" style="width: 200px">-->
<!-- <el-option-->
<!-- v-for="item in traceabilityCodeArr"-->
<!-- :key="item.ID"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- size="mini"/>-->
<!-- </el-select>-->
<span style="margin-left: 10px">分总成编号：</span>
<el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 200px">
<el-option
v-for="item in assemblyNumber"
:key="item.value"
@@ -46,24 +48,13 @@
:value="item.value"
size="mini"/>
</el-select>
<!-- <span style="margin-left: 10px">总成编号：</span>-->
<!-- <el-input v-model="assemblyNumber" style="width:150px;" placeholder="总成编号" size="small" clearable/>-->
<span style="margin-left: 10px">测量位置：</span>
<el-select v-model="measuringPositionValue" placeholder="请选择测量位置" filterable clearable size="small" style="width: 200px" @change="getMeasuringProject()">
<el-option
v-for="item in measuringPosition"
:key="item.value"
:label="item.label"
:value="item.value"
size="mini"/>
</el-select>
</div>
<div style="margin-top: 10px">
<span style="margin-left: 10px">订单号：</span>
<el-select v-model="orderNumberValue" placeholder="请选择订单" clearable filterable size="small" style="width: 200px">
<span style="margin-left: 10px">零件名称：</span>
<el-select v-model="partNameValue" placeholder="请选择零件名称" filterable clearable size="small" style="width: 200px;">
<el-option
v-for="item in orderNumber"
:key="item.value"
v-for="item in partName"
:key="item.ID"
:label="item.label"
:value="item.value"
size="mini"/>
@@ -80,37 +71,21 @@
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="getOrderNumber();getTraceabilityCode();getBatchBarcode();getAssemblyNumber()"/>
@change="getTraceabilityCode();getBatchBarcode();getAssemblyNumber()"/>
<span style="margin-left: 10px">批次条码：</span>
<el-select v-model="batchBarcodeValue" placeholder="请选择批次条码" clearable filterable size="small" style="width: 200px; margin-left: 13px">
<el-option
v-for="item in batchBarcode"
:key="item.value"
:label="item.label"
:value="item.value"
size="mini"/>
</el-select>
<span style="margin-left: 10px">是否合格：</span>
<el-select v-model="isQualifiedValue" placeholder="请选择是否合格" clearable size="small" style="width: 200px; margin-left: 13px">
<el-option
v-for="item in isQualified"
:key="item.value"
:label="item.label"
:value="item.value"
size="mini"/>
</el-select>
<span style="margin-left: 10px">测量项目：</span>
<el-select v-model="measuringProjectValue" placeholder="请选择测量项目" filterable clearable size="small" style="width: 200px">
<el-option
v-for="item in measuringProject"
:key="item.value"
:label="item.label"
:value="item.value"
size="mini"/>
</el-select>
<el-input v-model="batchBarcodeValue" placeholder="请输入批次条码" clearable size="small" style="width: 200px; margin-left: 13px"/>
<!-- <span style="margin-left: 10px">批次条码：</span>-->
<!-- <el-select v-model="batchBarcodeValue" placeholder="请选择批次条码" clearable filterable size="small" style="width: 200px;margin-left: 13px">-->
<!-- <el-option-->
<!-- v-for="item in batchBarcode"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- size="mini"/>-->
<!-- </el-select>-->
</div>
<div style="margin: 10px 0 0 89%">
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="selectDate()">查询</el-button>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageCurrent = 1,pageSize = 30,selectDate()">查询</el-button>
<el-button type="info" size="small" icon="el-icon-download" @click="exportExcel()">Excel</el-button>
</div>
<el-table
@@ -140,7 +115,7 @@
{{ scope.row.发动机型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="总成编号">
<el-table-column align="center" label="分总成编号">
<template slot-scope="scope">
{{ scope.row.发动机号 }}
</template>
@@ -155,49 +130,44 @@
{{ scope.row.工序名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="测量位置">
<el-table-column align="center" label="零件数量">
<template slot-scope="scope">
{{ scope.row.测量位置 }}
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="测量项目">
<el-table-column align="center" label="零件名称">
<template slot-scope="scope">
{{ scope.row.测量项目 }}
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="测量值" width="80px">
<el-table-column align="center" label="零件图号">
<template slot-scope="scope">
{{ scope.row.测量值 }}
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="测量单位" width="80px">
<el-table-column align="center" label="物料号">
<template slot-scope="scope">
{{ scope.row.测量单位 }}
{{ scope.row.物料号 }}
</template>
</el-table-column>
<el-table-column align="center" label="理论值" width="80px">
<el-table-column align="center" label="生产厂家">
<template slot-scope="scope">
{{ scope.row.理论值 }}
{{ scope.row.生产厂家 }}
</template>
</el-table-column>
<el-table-column align="center" label="值上限" width="80px">
<el-table-column align="center" label="物料条码">
<template slot-scope="scope">
{{ scope.row.上限值 }}
{{ scope.row.物料条码 }}
</template>
</el-table-column>
<el-table-column align="center" label="值下限" width="80px">
<el-table-column align="center" label="物料条码批次">
<template slot-scope="scope">
{{ scope.row.下限值 }}
{{ scope.row.物料条码批次 }}
</template>
</el-table-column>
<el-table-column align="center" label="生产日期">
<el-table-column align="center" label="操作时间">
<template slot-scope="scope">
{{ scope.row.生产日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="合格标志" width="80px">
<template slot-scope="scope">
{{ scope.row.合格标志 }}
{{ scope.row.操作时间 }}
</template>
</el-table-column>
</el-table>
@@ -237,19 +207,21 @@ export default {
engineType: [], // 机型
batchBarcode: [], // 批次条码
batchBarcodeValue: '', // 批次条码
partName: [], // 零件名称
partNameValue: '', // 零件名称
isQualified: [
{
label: '合格',
value: 1
}, {
label: '不合格',
value: 0
value: 2
}, {
label: '全部',
value: 2
value: 0
}
], // 是否合格
isQualifiedValue: 2, // 是否合格
isQualifiedValue: 1, // 是否合格
dateTime: '', // 时间
loading: false, // 时间
tableData: [], // 时间
@@ -274,9 +246,9 @@ export default {
this.getEngineType()
},
mounted() {
this.getOrderNumber()
this.getTraceabilityCode()
this.getAssemblyNumber()
setTimeout(() => { this.getPartName() }, 200)
},
methods: {
// 表格颜色变化
@@ -294,7 +266,6 @@ export default {
var param = []
var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.stationNumberValue = response.data[0].工位号 }
for (let i = 0; i < response.data.length; i++) {
this.stationNumber.push({
label: response.data[i].工位号,
@@ -303,7 +274,6 @@ export default {
}
}).then(() => {
this.getBatchBarcode()
this.getMeasuringPosition()
})
},
// 机型
@@ -312,7 +282,6 @@ export default {
var param = []
var Data = this.CreateData('11', 'MES_基本变量_机型代码_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.engineTypeValue = response.data[0].发动机型号 }
for (let i = 0; i < response.data.length; i++) {
this.engineType.push({
label: response.data[i].发动机型号,
@@ -321,21 +290,19 @@ export default {
}
})
},
// 订单号
getOrderNumber() {
this.orderNumber = []
// 零件名称
getPartName() {
this.partName = []
var param = []
param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
// param[0] = ['开始时间', this.dateTime[0]]
// param[1] = ['结束时间', this.dateTime[1]]
var Data = this.CreateData('11', '测量数据发动机在线状态_订单号_查询 ', param)
param[0] = ['发动机型号', this.engineTypeValue]
param[1] = ['工位号', this.stationNumberValue]
var Data = this.CreateData('11', '电子看板装配零件_零件名称_初始化查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.orderNumberValue = response.data[0].订单号 }
for (let i = 0; i < response.data.length; i++) {
this.orderNumber.push({
label: response.data[i].订单号,
value: response.data[i].订单号
this.partName.push({
label: response.data[i].零件名称,
value: response.data[i].零件名称,
ID: response.data[i].ID
})
}
})
@@ -358,7 +325,6 @@ export default {
param[6] = ['分线总线', 2]
var Data = this.CreateData('11', '初始化二维码_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.traceabilityCode = response.data[0].物料条码 }
for (let i = 0; i < response.data.length; i++) {
this.traceabilityCodeArr.push({
label: response.data[i].物料条码,
@@ -385,7 +351,6 @@ export default {
param[6] = ['分线总线', 2]
var Data = this.CreateData('11', '测量数据合格索引_发动机号_发动机型号_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.assemblyNumberValue = response.data[0].发动机号 }
for (let i = 0; i < response.data.length; i++) {
this.assemblyNumber.push({
label: response.data[i].发动机号,
@@ -402,34 +367,17 @@ export default {
// param[0] = ['开始时间', this.dateTime[0]]
// param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['工位号', this.stationNumberValue]
console.log(param, 'param')
var Data = this.CreateData('11', '物料数据分线_视图_物料条码批次号_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.batchBarcodeValue = response.data[0].物料条码批次 }
for (let i = 0; i < response.data.length; i++) {
this.batchBarcode.push({
label: response.data[i].物料条码批次,
value: response.data[i].物料条码批次
label: response.data[i].物料条码,
value: response.data[i].物料条码
})
}
})
},
getMeasuringPosition() {
this.measuringPosition = []
var param = []
param[0] = ['工位号', this.stationNumberValue]
var Data = this.CreateData('11', '质量数据查询_测量位置 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.measuringPositionValue = response.data[0].测量位置 }
for (let i = 0; i < response.data.length; i++) {
this.measuringPosition.push({
label: response.data[i].测量位置,
value: response.data[i].测量位置
})
}
}).then(() => {
this.getMeasuringProject()
})
},
getMeasuringProject() {
this.measuringProject = []
var param = []
@@ -437,7 +385,6 @@ export default {
param[1] = ['测量位置', this.measuringPositionValue]
var Data = this.CreateData('11', '质量数据查询_测量项目 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.measuringProjectValue = response.data[0].测量项目 }
for (let i = 0; i < response.data.length; i++) {
this.measuringProject.push({
label: response.data[i].测量项目,
@@ -448,14 +395,13 @@ export default {
},
selectDate() {
this.tableData = []
let engineTypeValue_check, assemblyNumberValue_check, stationNumberValue_check, measuringPositionValue_check, measuringProjectValue_check, traceabilityCode_check, orderNumberValue_check
let engineTypeValue_check, assemblyNumberValue_check, stationNumberValue_check, partNameValue_check, traceabilityCode_check, batchBarcodeValue_check
this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
this.assemblyNumberValue ? assemblyNumberValue_check = 1 : (assemblyNumberValue_check = 0, this.assemblyNumberValue = '')
this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
this.measuringPositionValue ? measuringPositionValue_check = 1 : (measuringPositionValue_check = 0, this.measuringPositionValue = '')
this.measuringProjectValue ? measuringProjectValue_check = 1 : (measuringProjectValue_check = 0, this.measuringProjectValue = '')
this.partNameValue ? partNameValue_check = 1 : (partNameValue_check = 0, this.partNameValue = '')
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
var param = []
param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
@@ -467,20 +413,17 @@ export default {
param[5] = ['发动机号', this.assemblyNumberValue]
param[6] = ['工位号_ischeck', stationNumberValue_check]
param[7] = ['工位号', this.stationNumberValue]
param[8] = ['测量位置_ischeck', measuringPositionValue_check]
param[9] = ['测量位置', this.measuringPositionValue]
param[10] = ['测量项目_ischeck', measuringProjectValue_check]
param[11] = ['测量项目', this.measuringProjectValue]
param[12] = ['订单号_ischeck', orderNumberValue_check]
param[13] = ['订单号', this.orderNumberValue]
param[14] = ['批次条码_ischeck', traceabilityCode_check]
param[15] = ['批次条码', this.traceabilityCode]
param[16] = ['合格标志', this.isQualifiedValue]
param[17] = ['PageCurrent', this.pageCurrent]
param[18] = ['PageSize', this.pageSize]
param[19] = ['PageCount', '1111', 'int', '1']
param[20] = ['ItemCount', '1111', 'int', '1']
var Data = this.CreateData('11', '质量数据_发动机分线质量数据_综合查询', param)
param[8] = ['零件名称_ischeck', partNameValue_check]
param[9] = ['零件名称', this.partNameValue]
param[10] = ['二维码_ischeck', traceabilityCode_check]
param[11] = ['二维码', this.traceabilityCode]
param[12] = ['物料条码批次_ischeck', batchBarcodeValue_check]
param[13] = ['物料条码批次', this.batchBarcodeValue]
param[14] = ['PageCurrent', this.pageCurrent]
param[15] = ['PageSize', this.pageSize]
param[16] = ['PageCount', '1111', 'int', '1']
param[17] = ['ItemCount', '1111', 'int', '1']
var Data = this.CreateData('11', '物料数据分线_视图_查询', param)
this.ExecDatabase(Data).then(response => {
console.log(response, 66)
if (response.data.result.length !== 0) {
@@ -492,14 +435,13 @@ export default {
},
exportExcel() {
if (this.tableData.length !== 0) {
let engineTypeValue_check, assemblyNumberValue_check, stationNumberValue_check, measuringPositionValue_check, measuringProjectValue_check, traceabilityCode_check, orderNumberValue_check
let engineTypeValue_check, assemblyNumberValue_check, stationNumberValue_check, partNameValue_check, traceabilityCode_check, batchBarcodeValue_check
this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
this.assemblyNumberValue ? assemblyNumberValue_check = 1 : (assemblyNumberValue_check = 0, this.assemblyNumberValue = '')
this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
this.measuringPositionValue ? measuringPositionValue_check = 1 : (measuringPositionValue_check = 0, this.measuringPositionValue = '')
this.measuringProjectValue ? measuringProjectValue_check = 1 : (measuringProjectValue_check = 0, this.measuringProjectValue = '')
this.partNameValue ? partNameValue_check = 1 : (partNameValue_check = 0, this.partNameValue = '')
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
var param = []
param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
@@ -511,16 +453,13 @@ export default {
param[5] = ['发动机号', this.assemblyNumberValue]
param[6] = ['工位号_ischeck', stationNumberValue_check]
param[7] = ['工位号', this.stationNumberValue]
param[8] = ['测量位置_ischeck', measuringPositionValue_check]
param[9] = ['测量位置', this.measuringPositionValue]
param[10] = ['测量项目_ischeck', measuringProjectValue_check]
param[11] = ['测量项目', this.measuringProjectValue]
param[12] = ['订单号_ischeck', orderNumberValue_check]
param[13] = ['订单号', this.orderNumberValue]
param[14] = ['批次条码_ischeck', traceabilityCode_check]
param[15] = ['批次条码', this.traceabilityCode]
param[16] = ['合格标志', this.isQualifiedValue]
var Data = this.CreateData('2001', '质量数据分线_导出新', param)
param[8] = ['零件名称_ischeck', partNameValue_check]
param[9] = ['零件名称', this.partNameValue]
param[10] = ['二维码_ischeck', traceabilityCode_check]
param[11] = ['二维码', this.traceabilityCode]
param[12] = ['物料条码批次_ischeck', batchBarcodeValue_check]
param[13] = ['物料条码批次', this.batchBarcodeValue]
var Data = this.CreateData('2001', '物料数据分线查询_报表新', param)
this.exportExcel_NPOI(Data)
} else {
this.$message.warning('暂无数据')

46
src/views/QualityAssurance/MaterialDataQuery/index.vue
View File

@@ -22,14 +22,15 @@
size="mini"/>
</el-select>
<span style="margin-left: 10px">精确追溯码：</span>
<el-select v-model="traceabilityCode" placeholder="请选择精确追溯码" filterable clearable size="small" style="width: 200px">
<el-option
v-for="item in traceabilityCodeArr"
:key="item.ID"
:label="item.label"
:value="item.value"
size="mini"/>
</el-select>
<el-input v-model="traceabilityCode" placeholder="请输入精确追溯码" clearable size="small" style="width: 200px;"/>
<!-- <el-select v-model="traceabilityCode" placeholder="请选择精确追溯码" filterable clearable size="small" style="width: 200px">-->
<!-- <el-option-->
<!-- v-for="item in traceabilityCodeArr"-->
<!-- :key="item.ID"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- size="mini"/>-->
<!-- </el-select>-->
<span style="margin-left: 10px">总成编号：</span>
<el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 200px">
<el-option
@@ -64,17 +65,18 @@
end-placeholder="结束日期"
@change="getTraceabilityCode();getBatchBarcode();getAssemblyNumber()"/>
<span style="margin-left: 10px">批次条码：</span>
<el-select v-model="batchBarcodeValue" placeholder="请选择批次条码" clearable filterable size="small" style="width: 200px;margin-left: 13px">
<el-option
v-for="item in batchBarcode"
:key="item.value"
:label="item.label"
:value="item.value"
size="mini"/>
</el-select>
<el-input v-model="batchBarcodeValue" placeholder="请输入批次条码" clearable size="small" style="width: 200px; margin-left: 13px"/>
<!-- <el-select v-model="batchBarcodeValue" placeholder="请选择批次条码" clearable filterable size="small" style="width: 200px;margin-left: 13px">-->
<!-- <el-option-->
<!-- v-for="item in batchBarcode"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- size="mini"/>-->
<!-- </el-select>-->
</div>
<div style="margin: 10px 0 0 89%">
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="selectDate()">查询</el-button>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageCurrent = 1,pageSize = 30,selectDate()">查询</el-button>
<el-button type="info" size="small" icon="el-icon-download" @click="exportExcel()">Excel</el-button>
</div>
<el-table
@@ -255,7 +257,6 @@ export default {
var param = []
var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.stationNumberValue = response.data[0].工位号 }
for (let i = 0; i < response.data.length; i++) {
this.stationNumber.push({
label: response.data[i].工位号,
@@ -273,7 +274,6 @@ export default {
var param = []
var Data = this.CreateData('11', 'MES_基本变量_机型代码_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.engineTypeValue = response.data[0].发动机型号 }
for (let i = 0; i < response.data.length; i++) {
this.engineType.push({
label: response.data[i].发动机型号,
@@ -290,7 +290,6 @@ export default {
param[1] = ['工位号', this.stationNumberValue]
var Data = this.CreateData('11', '电子看板装配零件_零件名称_初始化查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.partNameValue = response.data[0].零件名称 }
for (let i = 0; i < response.data.length; i++) {
this.partName.push({
label: response.data[i].零件名称,
@@ -318,7 +317,6 @@ export default {
param[6] = ['分线总线', 1]
var Data = this.CreateData('11', '初始化二维码_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.traceabilityCode = response.data[0].物料条码 }
for (let i = 0; i < response.data.length; i++) {
this.traceabilityCodeArr.push({
label: response.data[i].物料条码,
@@ -345,7 +343,6 @@ export default {
param[6] = ['分线总线', 1]
var Data = this.CreateData('11', '测量数据合格索引_发动机号_发动机型号_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) this.assemblyNumberValue = response.data[0].发动机号
for (let i = 0; i < response.data.length; i++) {
this.assemblyNumber.push({
label: response.data[i].发动机号,
@@ -364,7 +361,6 @@ export default {
param[2] = ['工位号', this.stationNumberValue]
var Data = this.CreateData('11', '物料数据_视图_物料条码批次号_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) this.batchBarcodeValue = response.data[0].物料条码
for (let i = 0; i < response.data.length; i++) {
this.batchBarcode.push({
label: response.data[i].物料条码,
@@ -379,7 +375,6 @@ export default {
param[0] = ['工位号', this.stationNumberValue]
var Data = this.CreateData('11', '质量数据查询_测量位置 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) this.measuringPositionValue = response.data[0].测量位置
for (let i = 0; i < response.data.length; i++) {
this.measuringPosition.push({
label: response.data[i].测量位置,
@@ -397,7 +392,6 @@ export default {
param[1] = ['测量位置', this.measuringPositionValue]
var Data = this.CreateData('11', '质量数据查询_测量项目 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) this.measuringProjectValue = response.data[0].测量项目
for (let i = 0; i < response.data.length; i++) {
this.measuringProject.push({
label: response.data[i].测量项目,
@@ -472,7 +466,7 @@ export default {
param[11] = ['二维码', this.traceabilityCode]
param[12] = ['物料条码批次_ischeck', batchBarcodeValue_check]
param[13] = ['物料条码批次', this.batchBarcodeValue]
var Data = this.CreateData('2001', '物料数据查询_报表', param)
var Data = this.CreateData('2001', '物料数据查询_报表新', param)
this.exportExcel_NPOI(Data)
} else {
this.$message.warning('暂无数据')

4
src/views/QualityAssurance/ProductionPlanOrderCompletion/index.vue
View File

@@ -369,9 +369,9 @@ export default {
this.yData[j] = 0
}
if (this.xData[j] === response.data[i].工位号) {
if (response.data[i].是否合格 === 'PASS') {
if (response.data[i].是否合格 === '0') {
this.number[j]++
} else if (response.data[i].是否合格 === 'FAIL') {
} else if (response.data[i].是否合格 === '1') {
this.yData[j]++
}
}

40
src/views/SearchData/FTTTrendChart/index.vue
View File

@@ -14,7 +14,8 @@
format="yyyy-MM-dd"
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
end-placeholder="结束日期"
@change="JudgeDateTime"/>
<span style="margin-left: 10px">工位号：</span>
<el-select v-model="stationNumberValue" placeholder="请选择工位号" clearable filterable size="small" style="width: 200px; margin-left: 13px">
<el-option
@@ -138,19 +139,40 @@ export default {
}
},
created() {
var year, month, day, audiTime
this.date = new Date() // 修改数据date
year = new Date().getFullYear()
month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
audiTime = year + '-' + month + '-' + day
console.log(audiTime, 'audiTime')
this.dateTime = [audiTime, audiTime]
this.initialization()
this.getStationNumber()
},
mounted() {
},
methods: {
initialization() {
var year, month, day, audiTime
this.date = new Date() // 修改数据date
year = new Date().getFullYear()
month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
audiTime = year + '-' + month + '-' + day
console.log(audiTime, 'audiTime')
this.dateTime = [audiTime, audiTime]
},
DateDiff(sDate1, sDate2) {
// sDate1和sDate2是2022-08-18格式
var aDate1, aDate2, oDate1, oDate2, iDays
aDate1 = sDate1.split('-')
oDate1 = new Date(aDate1[1] + '/' + aDate1[2] + '/' + aDate1[0])
aDate2 = sDate2.split('-')
oDate2 = new Date(aDate2[1] + '/' + aDate2[2] + '/' + aDate2[0])
iDays = parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24)
return iDays
},
JudgeDateTime() {
var n = this.DateDiff(this.dateTime[0], this.dateTime[1])
console.log(n, '时间差')
if (n > 31) {
this.$message.error('时间范围不得超过31天!')
this.initialization()
}
},
// 表格颜色变化
tableRowClassName({ row, rowIndex }) {
// console.log(row, rowIndex)

40
src/views/SearchData/JPHTrendChart/index.vue
View File

@@ -14,7 +14,8 @@
format="yyyy-MM-dd"
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
end-placeholder="结束日期"
@change="JudgeDateTime"/>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageSize=12;pageCurrent=1;searchOrder();searchOrder1()">查询</el-button>
<!-- <el-button type="info" size="small" icon="el-icon-download" @click="exportExcel()">Excel</el-button>-->
</div>
@@ -99,18 +100,39 @@ export default {
}
},
created() {
var year, month, day, audiTime
this.date = new Date() // 修改数据date
year = new Date().getFullYear()
month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
audiTime = year + '-' + month + '-' + day
console.log(audiTime, 'audiTime')
this.dateTime = [audiTime, audiTime]
this.initialization()
},
mounted() {
},
methods: {
initialization() {
var year, month, day, audiTime
this.date = new Date() // 修改数据date
year = new Date().getFullYear()
month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
audiTime = year + '-' + month + '-' + day
console.log(audiTime, 'audiTime')
this.dateTime = [audiTime, audiTime]
},
DateDiff(sDate1, sDate2) {
// sDate1和sDate2是2022-08-18格式
var aDate1, aDate2, oDate1, oDate2, iDays
aDate1 = sDate1.split('-')
oDate1 = new Date(aDate1[1] + '/' + aDate1[2] + '/' + aDate1[0])
aDate2 = sDate2.split('-')
oDate2 = new Date(aDate2[1] + '/' + aDate2[2] + '/' + aDate2[0])
iDays = parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24)
return iDays
},
JudgeDateTime() {
var n = this.DateDiff(this.dateTime[0], this.dateTime[1])
console.log(n, '时间差')
if (n > 31) {
this.$message.error('时间范围不得超过31天!')
this.initialization()
}
},
// 表格颜色变化
tableRowClassName({ row, rowIndex }) {
// console.log(row, rowIndex)

54
src/views/SearchData/OEETrendChart/index.vue
View File

@@ -14,7 +14,8 @@
format="yyyy-MM-dd"
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
end-placeholder="结束日期"
@change="JudgeDateTime"/>
<span style="margin-left: 10px">工位号：</span>
<el-select v-model="stationNumberValue" placeholder="请选择工位号" clearable filterable size="small" style="width: 200px; margin-left: 13px">
<el-option
@@ -160,26 +161,38 @@ export default {
}
},
created() {
var year, month, day, audiTime
this.date = new Date() // 修改数据date
year = new Date().getFullYear()
month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
audiTime = year + '-' + month + '-' + day
console.log(audiTime, 'audiTime')
this.dateTime = [audiTime, audiTime]
this.initialization()
this.getStationNumber()
},
mounted() {
},
methods: {
// 表格颜色变化
tableRowClassName({ row, rowIndex }) {
// console.log(row, rowIndex)
if (rowIndex % 2 === 0) {
return 'black'
} else {
return 'red'
initialization() {
var year, month, day, audiTime
this.date = new Date() // 修改数据date
year = new Date().getFullYear()
month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
audiTime = year + '-' + month + '-' + day
console.log(audiTime, 'audiTime')
this.dateTime = [audiTime, audiTime]
},
DateDiff(sDate1, sDate2) {
// sDate1和sDate2是2006-12-18格式
var aDate1, aDate2, oDate1, oDate2, iDays
aDate1 = sDate1.split('-')
oDate1 = new Date(aDate1[1] + '/' + aDate1[2] + '/' + aDate1[0])
aDate2 = sDate2.split('-')
oDate2 = new Date(aDate2[1] + '/' + aDate2[2] + '/' + aDate2[0])
iDays = parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24)
return iDays
},
JudgeDateTime() {
var n = this.DateDiff(this.dateTime[0], this.dateTime[1])
console.log(n, '时间差')
if (n > 31) {
this.$message.error('时间范围不得超过31天!')
this.initialization()
}
},
// 工位号
@@ -308,6 +321,15 @@ export default {
this.drawLine()
})
},
// 表格颜色变化
tableRowClassName({ row, rowIndex }) {
// console.log(row, rowIndex)
if (rowIndex % 2 === 0) {
return 'black'
} else {
return 'red'
}
},
// 分页
handleSizeChange(val) {
this.pageCurrent = 1

1
static/config.js
View File

@@ -6,6 +6,7 @@ export const name4_config = `OP9999`
var url = `http://localhost:8100`
// var url = `http://124.220.15.242:8104`
// var url = `http://124.220.15.242:8110` // AP
export const readFile_config = url + `/webpage/file/` // invoice
export const readImg_config = url + `/webpage/img/` // delivery/MS/performancebond