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

更新

Browse Source
This commit is contained in:
liushuai
2019-09-25 08:21:48 +08:00
parent 6cd2c4e1c3
commit d3b8f17031
3 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request.js
View File

@@ -23,7 +23,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 MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })

4
src/views/Assembly/AssemblyExecution/index.vue
View File

@@ -49,7 +49,7 @@
</el-table-column> </el-table-column>
<el-table-column label="装配开始时间" align="center"> <el-table-column label="装配开始时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床装配开始时间 }} {{ scope.row.机床装配实际开始时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="装配结束时间" align="center"> <el-table-column label="装配结束时间" align="center">
@@ -131,7 +131,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="300px" fixed="right"> <el-table-column label="操作" align="center" width="300px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip effect="dark" content="编辑部装工时" placement="top" open-delay="1200"> <el-tooltip :open-delay="1200" effect="dark" content="编辑部装工时" placement="top">
<el-button v-if="!scope.row.isEditing" type="primary" plain size="small" @click="editTable2(scope.row)">编辑</el-button> <el-button v-if="!scope.row.isEditing" type="primary" plain size="small" @click="editTable2(scope.row)">编辑</el-button>
</el-tooltip> </el-tooltip>
<el-button v-if="scope.row.isEditing" type="primary" plain size="small" @click="submitTable2(scope.row)">确定</el-button> <el-button v-if="scope.row.isEditing" type="primary" plain size="small" @click="submitTable2(scope.row)">确定</el-button>

34
src/views/ManufacturingCenter/ParseQuery/index.vue
View File

@@ -652,7 +652,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="实际总工时"> <el-table-column align="center" label="实际总工时">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.结束时间 ? parseInt(scope.row.实际工时) + parseInt(scope.row.修补工时) : '--' }} {{ scope.row.实际工时 ? parseInt(scope.row.实际工时) + parseInt(scope.row.修补工时) : '--' }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -1835,12 +1835,6 @@
align="center" align="center"
type="index" type="index"
width="50"/> width="50"/>
<el-table-column align="center" label="是否完成">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否合格)=== 1" type="success" size="mini" style="width: 80px">合格</el-tag>
<el-tag v-else type="danger" size="mini" style="width: 80px">不合格</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="机床图号"> <el-table-column align="center" label="机床图号">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 ? scope.row.机床图号 : '--' }} {{ scope.row.机床图号 ? scope.row.机床图号 : '--' }}
@@ -1851,29 +1845,24 @@
{{ scope.row.机床名称 ? scope.row.机床名称 : '--' }} {{ scope.row.机床名称 ? scope.row.机床名称 : '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" width="80px"> <el-table-column align="center" label="总装开始时间" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 ? scope.row.组号 : '--' }} {{ scope.row.机床装配实际开始时间 ? scope.row.机床装配实际开始时间 : '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组件名称"> <el-table-column align="center" label="总装完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组件名称 ? scope.row.组件名称 : '--' }} {{ scope.row.机床装配实际完成时间 ? scope.row.机床装配实际完成时间 : '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="检测项"> <el-table-column align="center" label="调试开始时间">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.检测项 ? scope.row.检测项 : '--' }} {{ scope.row.调试开始时间 ? scope.row.调试开始时间 : '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="检测项明细"> <el-table-column align="center" label="调试完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.检测项明细 ? scope.row.检测项明细 : '--' }} {{ scope.row.调试结束时间 ? scope.row.调试结束时间 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="备注">
<template slot-scope="scope">
{{ scope.row.备注 ? scope.row.备注 : '--' }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -4024,8 +4013,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `SELECT * name: `select 机床图号,机床名称,机床装配实际开始时间,机床装配实际完成时间,调试开始时间,调试结束时间 from PDM_机床名称 where 机床流水号 = ${this.machineValue1}`
FROM [质检管理_装配质检_查询视图] where 机床流水号 = ${this.machineValue1} and 组件流水号 is null`
} }
}).then(res => { }).then(res => {
this.tableDataDiv22 = res.data this.tableDataDiv22 = res.data
@@ -4470,7 +4458,7 @@ export default {
width: 1858px; width: 1858px;
height: 400px; height: 400px;
/*border: 1px solid red;*/ /*border: 1px solid red;*/
background: url('../../../assets/img/img13.png') repeat; background: url('../../../assets/img/img11.png') repeat;
background-repeat:no-repeat; background-repeat:no-repeat;
background-size:100% 100%;-moz-background-size:100% 100%; background-size:100% 100%;-moz-background-size:100% 100%;
} }