From 48987a9150b8bc71485634b578c6f5a468a2386f Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 27 Sep 2019 12:06:38 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A21900?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ManufacturingCenter/ParseQuery/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue index e29ec966..c0f5f18a 100644 --- a/src/views/ManufacturingCenter/ParseQuery/index.vue +++ b/src/views/ManufacturingCenter/ParseQuery/index.vue @@ -191,7 +191,7 @@ From ae02a510205e133a74c645fc869a2d1251ad289f Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 27 Sep 2019 12:08:11 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A21900?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ManufacturingCenter/ParseQuery/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue index c0f5f18a..0206457b 100644 --- a/src/views/ManufacturingCenter/ParseQuery/index.vue +++ b/src/views/ManufacturingCenter/ParseQuery/index.vue @@ -186,7 +186,7 @@ From 5f1b5527a4fc622de691aaedd73594827b292304 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 27 Sep 2019 13:35:06 +0800 Subject: [PATCH 3/8] a --- src/utils/request.js | 2 +- src/views/ManufacturingCenter/ParseQuery/index.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 857e6f30..f61bf8ab 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -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 MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.103:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue index 0206457b..d76f8a29 100644 --- a/src/views/ManufacturingCenter/ParseQuery/index.vue +++ b/src/views/ManufacturingCenter/ParseQuery/index.vue @@ -2412,14 +2412,14 @@ export default { if (response.data[0].能力平衡 === 0) { this.color[10] = 'weikaishi' } else if (response.data[0].能力平衡 !== 0 && response.data[0].能力平衡 !== 100) { this.color[10] = 'jixingzhong' } else if (response.data[0].能力平衡 === 100) { this.color[10] = 'yiwancheng' } if (response.data[0].外协 === 0) { this.color[11] = 'weikaishi' } else if (response.data[0].外协 !== 0 && response.data[0].外协 !== 100) { this.color[11] = 'jixingzhong' } else if (response.data[0].外协 === 100) { this.color[11] = 'yiwancheng' } if (response.data[0].车间加工 === 0) { this.color[12] = 'weikaishi' } else if (response.data[0].车间加工 !== 0 && response.data[0].车间加工 !== 100) { this.color[12] = 'jixingzhong' } else if (response.data[0].车间加工 === 100) { this.color[12] = 'yiwancheng' } - if (response.data[0].采购质检 === '-') { this.color[13] = 'weikaishi' } else { this.color[13] = 'jixingzhong' } - if (response.data[0].自制质检 === '-') { this.color[14] = 'weikaishi' } else { this.color[14] = 'jixingzhong' } + if (response.data[0].采购质检 === 11111111) { this.color[13] = 'weikaishi' } else { this.color[13] = 'jixingzhong' } + if (response.data[0].自制质检 === 11111111) { this.color[14] = 'weikaishi' } else { this.color[14] = 'jixingzhong' } if (response.data[0].成组配套 === 0) { this.color[15] = 'weikaishi' } else if (response.data[0].成组配套 !== 0 && response.data[0].成组配套 !== 100) { this.color[15] = 'jixingzhong' } else if (response.data[0].成组配套 === 100) { this.color[15] = 'yiwancheng' } if (response.data[0].油漆 === 0) { this.color[16] = 'weikaishi' } else if (response.data[0].油漆 !== 0 && response.data[0].油漆 !== 100) { this.color[16] = 'jixingzhong' } else if (response.data[0].油漆 === 100) { this.color[16] = 'yiwancheng' } if (response.data[0].冷作 === 0) { this.color[17] = 'weikaishi' } else if (response.data[0].冷作 !== 0 && response.data[0].冷作 !== 100) { this.color[17] = 'jixingzhong' } else if (response.data[0].冷作 === 100) { this.color[17] = 'yiwancheng' } if (response.data[0].机械装配 === 0) { this.color[18] = 'weikaishi' } else if (response.data[0].机械装配 !== 0 && response.data[0].机械装配 !== 100) { this.color[18] = 'jixingzhong' } else if (response.data[0].机械装配 === 100) { this.color[18] = 'yiwancheng' } if (response.data[0].电气装配 === 0) { this.color[19] = 'weikaishi' } else if (response.data[0].电气装配 !== 0 && response.data[0].电气装配 !== 100) { this.color[19] = 'jixingzhong' } else if (response.data[0].电气装配 === 100) { this.color[19] = 'yiwancheng' } - if (response.data[0].装配质检 === '-') { this.color[20] = 'weikaishi' } else { this.color[20] = 'jixingzhong' } + if (response.data[0].装配质检 === 11111111) { this.color[20] = 'weikaishi' } else { this.color[20] = 'jixingzhong' } if (response.data[0].总装调试状态 === 0) { this.color[21] = 'weikaishi' } else if (response.data[0].总装调试状态 === 1) { this.color[21] = 'jixingzhong' } else if (response.data[0].总装调试状态 === 2) { this.color[21] = 'yiwancheng' } if (response.data[0].发货状态 === 0) { this.color[22] = 'weikaishi' } else if (response.data[0].发货状态 === 1) { this.color[22] = 'jixingzhong' } else if (response.data[0].发货状态 === 2) { this.color[22] = 'yiwancheng' } }) From 6640b52bc853e8b4d0c37c296b4d1a4639eeacfa Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 27 Sep 2019 13:35:15 +0800 Subject: [PATCH 4/8] a --- src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index f61bf8ab..867f7256 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -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 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.103:8005/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service From a03ebcbdd531c5edb735b8167b708af6a1cfc561 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 27 Sep 2019 17:12:09 +0800 Subject: [PATCH 5/8] login --- src/icons/svg/InventoryQuery.svg | 1 + .../InventoryQuery/index.vue | 142 ++++++++++++++++++ src/views/login/index.vue | 3 +- 3 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 src/icons/svg/InventoryQuery.svg create mode 100644 src/views/ManufacturingCenter/InventoryQuery/index.vue diff --git a/src/icons/svg/InventoryQuery.svg b/src/icons/svg/InventoryQuery.svg new file mode 100644 index 00000000..7e5897a2 --- /dev/null +++ b/src/icons/svg/InventoryQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue new file mode 100644 index 00000000..c325af8e --- /dev/null +++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index eb19fd82..21fa058b 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -297,7 +297,8 @@ export default { } .el-input__inner{ border: none!important; - font-size: 18px!important; + /*高精电脑登录input点击往上串*/ + /*font-size: 18px!important;*/ color: #29335b!important; } .el-form-item { From c9335aad03e84cee2ae740f4cca470f78f8893d8 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 27 Sep 2019 17:41:24 +0800 Subject: [PATCH 6/8] a --- src/styles/index.scss | 15 ++++++++------- src/views/login/index.vue | 3 +-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/styles/index.scss b/src/styles/index.scss index edb9e08d..f21840f0 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -197,13 +197,14 @@ el-card{ border-color: #ff9759; } } -.el-input__inner:focus { - border: 1px solid #1b55a0!important; - height: 29px; -} -.el-input--small .el-input__inner { - height: 29px; -} +//登录页login输入框上串 +//.el-input__inner:focus { +// border: 1px solid #1b55a0!important; +// height: 29px; +//} +//.el-input--small .el-input__inner { +// height: 29px; +//} .el-breadcrumb__separator { color: black; } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 21fa058b..eb19fd82 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -297,8 +297,7 @@ export default { } .el-input__inner{ border: none!important; - /*高精电脑登录input点击往上串*/ - /*font-size: 18px!important;*/ + font-size: 18px!important; color: #29335b!important; } .el-form-item { From e6d87c69112df3afcc479258df6589ec0aa5df1e Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 27 Sep 2019 17:48:39 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=90=88=E5=90=8C1900?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/index.scss | 2 +- .../ContractInformationManagement/index.vue | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/styles/index.scss b/src/styles/index.scss index f21840f0..6af05507 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -197,7 +197,7 @@ el-card{ border-color: #ff9759; } } -//登录页login输入框上串 +//登录页login输入框上串所以屏蔽 //.el-input__inner:focus { // border: 1px solid #1b55a0!important; // height: 29px; diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index 3fd474f3..dfc50c05 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -131,27 +131,27 @@ From 663d74c89205e3abbd04cef505628f79a59eb00f Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 27 Sep 2019 17:53:18 +0800 Subject: [PATCH 8/8] 1900 --- .../MarketingCenter/ComprehensiveInquiryMS/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue index 6a7c8212..a690f13c 100644 --- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue +++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue @@ -85,27 +85,27 @@