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-12-24 12:18:36 +08:00
parent be42004625
commit 5a01f67439
3 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/router/index.js
View File

@@ -33,10 +33,6 @@ export const constantRouterMap = [
path: 'http://192.168.1.231:8005/#/TVF', path: 'http://192.168.1.231:8005/#/TVF',
meta: { title: '设备运行监控', icon: 'MaterialManagement' } meta: { title: '设备运行监控', icon: 'MaterialManagement' }
}, },
{
path: 'http://192.168.1.231:8005/#/TVA',
meta: { title: 'MES工作站', icon: 'MaterialManagement' }
},
{ {
path: 'http://192.168.1.231:8005/#/TVD', path: 'http://192.168.1.231:8005/#/TVD',
meta: { title: '设备状态监控', icon: 'MaterialManagement' } meta: { title: '设备状态监控', icon: 'MaterialManagement' }

4
src/utils/request.js
View File

@@ -17,7 +17,7 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic
export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
export const url = `http://192.168.0.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://192.168.0.104:8079/submit/downloadFile.ashx' // 导出excel export const ExcelDownLoad = 'http://192.168.0.104:8079/submit/downloadFile.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段 // 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const ServerIP = `http://192.168.1.231:8411/webpage/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 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.0.104:8079/submit/MESCommonBase.ashx`, baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

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

@@ -10,7 +10,7 @@
<!-- <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>--> <!-- <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
</el-row> </el-row>
</div> </div>
<el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 790px" size="mini"> <el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 639px" size="mini">
<el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip> <el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
@@ -26,21 +26,21 @@
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料来源" prop="物料来源" align="center" width="80"> <!--<el-table-column label="物料来源" prop="物料来源" align="center" width="80">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.物料来源 }} <!--{{ scope.row.物料来源 }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<!-- <el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">--> <!--&lt;!&ndash; <el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">&ndash;&gt;-->
<!-- <template slot-scope="scope">--> <!--&lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!-- {{ scope.row.仓库名称 }}--> <!--&lt;!&ndash; {{ scope.row.仓库名称 }}&ndash;&gt;-->
<!-- </template>--> <!--&lt;!&ndash; </template>&ndash;&gt;-->
<!-- </el-table-column>--> <!--&lt;!&ndash; </el-table-column>&ndash;&gt;-->
<el-table-column label="货位" prop="货位名称" align="center" width="80"> <!--<el-table-column label="货位" prop="货位名称" align="center" width="80">-->
<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" width="100" prop="货位存量"> <el-table-column label="货位存量" align="center" width="100" prop="货位存量">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.changeValue"> <template v-if="scope.row.changeValue">
@@ -220,7 +220,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: `库存管理_库存盘点_物料货位数量_查询数据`, name: `库存管理_库存盘点_物料货位数量_查询数据_新`,
param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}`, param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}`,
Pagination: this.pageCurrent + '&' + this.pageSize Pagination: this.pageCurrent + '&' + this.pageSize
} }