From 5927a3f45e65a512eb7c48a935322760fb7cd656 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Wed, 16 Jan 2019 08:54:00 +0800 Subject: [PATCH 1/7] request --- src/utils/request.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 3337ad5e..f997ba78 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,24 +3,24 @@ import axios from 'axios' // import store from '../store' // import { getToken } from '@/utils/auth' -export const wsuri = `ws://192.168.1.212:61101//WebMoudule//websocket` +export const wsuri = `ws://192.168.1.231:61101//WebMoudule//websocket` export const name = `OP8888` // 创建axios实例 -export const readFile = `192.168.1.212:8411/webpage/file/` // invoice -export const readImg = `192.168.1.212:8411/webpage/img/` // delivery/MS/performancebond -export const upload = `192.168.1.212:8411/submit/uploadFile.ashx` // ContractInformationManagement -export const upload2 = `192.168.1.212:8411/submit/upload2.ashx` // delivery -export const upload3 = `192.168.1.212:8411/submit/upload3.ashx` // performancebond -export const uploadInvoiceScan = `192.168.1.212:8411/submit/uploadInvoiceScan.ashx` // invoice -export const download = `192.168.1.212:8411/submit/downloadFile.ashx` // ContractInformationManagement +export const readFile = `192.168.1.231:8411/webpage/file/` // invoice +export const readImg = `192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond +export const upload = `192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement +export const upload2 = `192.168.1.231:8411/submit/upload2.ashx` // delivery +export const upload3 = `192.168.1.231:8411/submit/upload3.ashx` // performancebond +export const uploadInvoiceScan = `192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice +export const download = `192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 From 0ecb58bc9a319dbeacabe16c75d2c3dc78008993 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 16 Jan 2019 15:51:20 +0800 Subject: [PATCH 2/7] 1 --- src/utils/request.js | 2 +- src/views/ManufacturingCenter/OwnTimeStatistics/index.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index 3337ad5e..e3cc882a 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -20,7 +20,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue b/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue index 292ac286..efcbc443 100644 --- a/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue +++ b/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue @@ -90,6 +90,8 @@ export default { } if (this.date1 === '' || this.date1 === null || this.date2 === '' || this.date2 === null) { this.check2 = 0 + this.date1 = '' + this.date2 = '' } else { this.check2 = 1 } From 1bb99c2a54955f1c84e4d1e5cd9209190d0f8265 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 16 Jan 2019 15:57:36 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=AE=9A=E9=A2=9D?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 16 ++++++++-------- .../ProcessPlanning/index.vue | 9 +++++++++ .../QuotaFormulation/index.vue | 9 +++++++++ 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index f997ba78..e3cc882a 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,17 +3,17 @@ import axios from 'axios' // import store from '../store' // import { getToken } from '@/utils/auth' -export const wsuri = `ws://192.168.1.231:61101//WebMoudule//websocket` +export const wsuri = `ws://192.168.1.212:61101//WebMoudule//websocket` export const name = `OP8888` // 创建axios实例 -export const readFile = `192.168.1.231:8411/webpage/file/` // invoice -export const readImg = `192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond -export const upload = `192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement -export const upload2 = `192.168.1.231:8411/submit/upload2.ashx` // delivery -export const upload3 = `192.168.1.231:8411/submit/upload3.ashx` // performancebond -export const uploadInvoiceScan = `192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice -export const download = `192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement +export const readFile = `192.168.1.212:8411/webpage/file/` // invoice +export const readImg = `192.168.1.212:8411/webpage/img/` // delivery/MS/performancebond +export const upload = `192.168.1.212:8411/submit/uploadFile.ashx` // ContractInformationManagement +export const upload2 = `192.168.1.212:8411/submit/upload2.ashx` // delivery +export const upload3 = `192.168.1.212:8411/submit/upload3.ashx` // performancebond +export const uploadInvoiceScan = `192.168.1.212:8411/submit/uploadInvoiceScan.ashx` // invoice +export const download = `192.168.1.212:8411/submit/downloadFile.ashx` // ContractInformationManagement const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index fa078a74..06bc3f1d 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -555,6 +555,7 @@ import { searchRecord } from '@/api/ManufacturingCenter/ProcessPlanning' import elInput from 'element-ui/packages/input' +import { mapGetters } from 'vuex' export default { components: { @@ -667,6 +668,14 @@ export default { material2: '' } }, + computed: { + ...mapGetters([ + 'sidebar', + 'avatar', + 'name', + 'id' + ]) + }, created() { this.fetchData() this.initPerson() diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue index bf943e12..ed354aa0 100644 --- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue +++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue @@ -98,6 +98,7 @@