From ec38b6cfe60c48a13873285c2aca0e90571e5a55 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Fri, 28 Dec 2018 17:20:32 +0800 Subject: [PATCH 1/3] request --- src/utils/request.js | 18 +++++++++--------- src/views/login/index.vue | 40 --------------------------------------- 2 files changed, 9 insertions(+), 49 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index a7f36777..558460f9 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,23 +3,23 @@ import axios from 'axios' // import store from '../store' // import { getToken } from '@/utils/auth' -export const wsuri = `ws://localhost:61101//WebMoudule//websocket` +export const wsuri = `ws://192.168.0.2:61101//WebMoudule//websocket` export const name = `OP8888` // 创建axios实例 -export const readFile = `http://localhost:8411/webpage/file/` // invoice -export const readImg = `http://localhost:8411/webpage/img/` // delivery/MS/performancebond -export const upload = `http://localhost:8411/submit/uploadFile.ashx` // ContractInformationManagement -export const upload2 = `http://localhost:8411/submit/upload2.ashx` // delivery -export const upload3 = `http://localhost:8411/submit/upload3.ashx` // performancebond -export const uploadInvoiceScan = `http://localhost:8411/submit/uploadInvoiceScan.ashx` // invoice -export const download = `http://localhost:8411/submit/downloadFile.ashx` // ContractInformationManagement +export const readFile = `http://192.168.0.2:8411/webpage/file/` // invoice +export const readImg = `http://192.168.0.2:8411/webpage/img/` // delivery/MS/performancebond +export const upload = `http://192.168.0.2:8411/submit/uploadFile.ashx` // ContractInformationManagement +export const upload2 = `http://192.168.0.2:8411/submit/upload2.ashx` // delivery +export const upload3 = `http://192.168.0.2:8411/submit/upload3.ashx` // performancebond +export const uploadInvoiceScan = `http://192.168.0.2:8411/submit/uploadInvoiceScan.ashx` // invoice +export const download = `http://192.168.0.2: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.0.2: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/login/index.vue b/src/views/login/index.vue index 589ce021..d774b930 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -39,46 +39,6 @@ 登录 -
- 超级管理员 - 账号：0000 - 密码：admin -
-
- 营销中心 - 账号：2001 - 密码：2001 -
-
- 技术中心 - 账号：3001 - 密码：3001 -
-
- 制造中心 - 账号：4001 - 密码：4001 -
-
- 采购部 - 账号：4101 - 密码：4101 -
-
- 仓库 - 账号：4201 - 密码：4201 -
-
- 金工车间 - 账号：4301 - 密码：4301 -
-
- 装配车间 - 账号：4401 - 密码：4401 -
From 3b9e6b8cbf2b8ae6315bf3beea7ba3f705b29341 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 28 Dec 2018 17:22:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/icons/svg/CreatePreparationBill.svg | 1 + src/icons/svg/MachiningSequenceAdjustment.svg | 1 + src/icons/svg/MaterialArrivalManagement.svg | 1 + 3 files changed, 3 insertions(+) create mode 100644 src/icons/svg/CreatePreparationBill.svg create mode 100644 src/icons/svg/MachiningSequenceAdjustment.svg create mode 100644 src/icons/svg/MaterialArrivalManagement.svg diff --git a/src/icons/svg/CreatePreparationBill.svg b/src/icons/svg/CreatePreparationBill.svg new file mode 100644 index 00000000..82524232 --- /dev/null +++ b/src/icons/svg/CreatePreparationBill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MachiningSequenceAdjustment.svg b/src/icons/svg/MachiningSequenceAdjustment.svg new file mode 100644 index 00000000..399e3967 --- /dev/null +++ b/src/icons/svg/MachiningSequenceAdjustment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MaterialArrivalManagement.svg b/src/icons/svg/MaterialArrivalManagement.svg new file mode 100644 index 00000000..6366a880 --- /dev/null +++ b/src/icons/svg/MaterialArrivalManagement.svg @@ -0,0 +1 @@ + \ No newline at end of file From 344fe94622ce30e8ecd40ed1441267884b07dd50 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 28 Dec 2018 20:41:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E5=88=B6=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/ProcessPlanning.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js index 72d253a9..6f0f26fc 100644 --- a/src/api/ManufacturingCenter/ProcessPlanning.js +++ b/src/api/ManufacturingCenter/ProcessPlanning.js @@ -115,7 +115,7 @@ export function processNameClick() { method: 'post', data: { type: '1', - name: '车间生产管理工艺_基础表_工艺分类名称_查询数据' + name: '车间生产管理工艺_基础表_工艺分类名称_查询数据_零件工艺制定专用' } }) }