meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2020-01-07 12:17:50 +08:00
parent 66a4d3e816 434e66453d
commit 005652b855
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request.js
View File

@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service

38
src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
View File

@@ -19,9 +19,9 @@
<el-button type="success" class="el-icon-search" size="small" style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
</el-card>
<el-row>
<el-col :span="8">
<el-col :span="9">
<el-card>
<el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" style="width: 100%;" height="700px" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column label="操作者" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.姓名 }}
@@ -32,17 +32,12 @@
{{ scope.row.定额总工时 }}
</template>
</el-table-column>
<el-table-column label="设备工时" align="center" width="70px">
<el-table-column label="实际工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.设备总工时 }}
</template>
</el-table-column>
<el-table-column label="扫码工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.扫码总工时 }}
</template>
</el-table-column>
<el-table-column label="修补准结工时" align="center" width="100px">
<el-table-column label="录入准结工时" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.修补准结总工时 }}
</template>
@@ -52,6 +47,11 @@
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="扫码工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.扫码总工时 }}
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@@ -63,9 +63,9 @@
</div>
</el-card>
</el-col>
<el-col :span="16">
<el-col :span="15">
<el-card>
<el-table v-loading="loading2" :data="tableData2" size="mini" stripe highlight-current-row style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
<el-table v-loading="loading2" :data="tableData2" size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -91,17 +91,12 @@
{{ scope.row.工时总额 }}
</template>
</el-table-column>
<el-table-column label="设备工时" align="center" width="70px">
<el-table-column label="实际工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.设备工时 }}
</template>
</el-table-column>
<el-table-column label="扫码工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.扫码工时 }}
</template>
</el-table-column>
<el-table-column label="修补准结工时" align="center" width="100px">
<el-table-column label="录入准结工时" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.修补准结工时 }}
</template>
@@ -111,6 +106,11 @@
{{ scope.row.操作时间 }}
</template>
</el-table-column>
<el-table-column label="扫码工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.扫码工时 }}
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@@ -161,6 +161,7 @@ export default {
this.tableData2 = []
this.total2 = 0
searchtable(this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
console.log(response.data, 111)
if (response.data.total === 0) {
this.loading = false
} else {
@@ -176,6 +177,7 @@ export default {
this.tableData2 = []
this.pageCurrent2 = 1
searchtable2(row.人员编号, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
console.log(response.data, 222)
if (response.data.rows.length !== 0) {
this.tableData2 = response.data.rows
}