From 4df9631c1eed3bfbb1298be94c52c7f782beffd1 Mon Sep 17 00:00:00 2001 From: liwei Date: Tue, 14 Dec 2021 15:16:12 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=AB=AF=E4=B8=AD=E8=AF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 2 +- .env.test | 2 +- src/server/request.js | 2 +- vue.config.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.dev b/.env.dev index 3eb632d..7299510 100644 --- a/.env.dev +++ b/.env.dev @@ -1,4 +1,4 @@ NODE_ENV = 'production' -VUE_APP_BASE_URL = http://101.201.121.115:8098/ +VUE_APP_BASE_URL = http://101.201.121.115:9010/ VUE_APP_LOGIN_TITLE = 沈阳领新智科智能信息系统有限公司 VUE_APP_LOGIN_LOGO = ../assets/img/logo.png diff --git a/.env.test b/.env.test index 0ef493c..4d13ad3 100644 --- a/.env.test +++ b/.env.test @@ -1,4 +1,4 @@ NODE_ENV = 'production' -VUE_APP_BASE_URL = http://101.201.121.115:8098/ +VUE_APP_BASE_URL = http://101.201.121.115:9010/ VUE_APP_LOGIN_TITLE = 沈阳领新智科智能信息系统有限公司 VUE_APP_LOGIN_LOGO = ../assets/img/logo.png \ No newline at end of file diff --git a/src/server/request.js b/src/server/request.js index db175ab..4511ca9 100644 --- a/src/server/request.js +++ b/src/server/request.js @@ -2,7 +2,7 @@ import axios from "axios"; // create an axios instance const service = axios.create({ - baseURL: process.env.VUE_APP_BASE_URL || 'http://101.201.121.115:8098/', + baseURL: process.env.VUE_APP_BASE_URL || 'http://101.201.121.115:9010/', timeout: 20000, // request timeout }); // request interceptor diff --git a/vue.config.js b/vue.config.js index d9f5adf..830a938 100644 --- a/vue.config.js +++ b/vue.config.js @@ -18,7 +18,7 @@ module.exports = { open: true, proxy: { "/user": { - target: process.env.VUE_APP_BASE_URL || 'http://101.201.121.115:8098/', //要跨域的域名 目标地址 + target: process.env.VUE_APP_BASE_URL || 'http://101.201.121.115:9010/', //要跨域的域名 目标地址 changeOrigin: true, //是否开启跨域 是否更改源路径 ws: true, pathRewrite: { From 2c63a639fe293e1de0b975a0470413492ddba4d3 Mon Sep 17 00:00:00 2001 From: liwei Date: Tue, 14 Dec 2021 15:17:06 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 896ac21..40692d9 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "private": true, "scripts": { "serve": "vue-cli-service serve", + "build:dev": "vue-cli-service build --mode test", "build:test": "vue-cli-service build --mode test", "build:prod": "vue-cli-service build --mode prod", "lint": "vue-cli-service lint" From d13d194433ac8942340a906d5fd04d1932fc6da1 Mon Sep 17 00:00:00 2001 From: liwei Date: Tue, 14 Dec 2021 16:28:07 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 40692d9..632839a 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "scripts": { "serve": "vue-cli-service serve", - "build:dev": "vue-cli-service build --mode test", + "build:dev": "vue-cli-service build --mode dev", "build:test": "vue-cli-service build --mode test", "build:prod": "vue-cli-service build --mode prod", "lint": "vue-cli-service lint" From 7d9aee91c61573ee9f785e94c2cbcb1b05c30ad2 Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 17 Dec 2021 09:08:50 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/base.css | 33 +++++++------------------ src/components/ContentContainer.vue | 2 +- src/components/SearchTemplate.vue | 2 +- src/views/etl/components/edit.vue | 2 +- src/views/etl/index.vue | 4 +-- src/views/etlDB/index.vue | 4 +-- src/views/field/index.vue | 4 +-- src/views/oneimport/components/edit.vue | 2 +- src/views/oneimport/index.vue | 4 +-- src/views/record/index.vue | 2 +- src/views/standard/index.vue | 4 +-- 11 files changed, 24 insertions(+), 39 deletions(-) diff --git a/src/assets/css/base.css b/src/assets/css/base.css index 66a28df..bc8c84d 100644 --- a/src/assets/css/base.css +++ b/src/assets/css/base.css @@ -17,33 +17,18 @@ body { height: 100%; } /* table样式 */ -.el-table th { - background: linear-gradient(180deg, #FAFCFC 0%, #EEEEEE 47%, #E7E7E7 100%); -} -.el-table--border td { - border-bottom: 2px solid #D5D5D5; -} -.el-table--border td { - border-right: 2px solid #D5D5D5; -} -.el-table th.is-leaf { - border-right: none !important; -} -.el-table tr td:first-child { - border-left: 2px solid #D5D5D5; -} -.el-table thead { +.el-table--mini td, .el-table--mini th { + padding: 3px 0; color: #3D3D42; } -.el-table th>.cell { - font-size: 16px; - font-family: PingFangSC-Medium, PingFang SC; - color: #3D3D42; +.el-table__row:nth-child(even) { + background: #F7F7F7; } -.el-table .el-table__body .cell { - font-size: 14px; - font-family: PingFangSC-Medium, PingFang SC; - color: #5C5A5A; +.el-table .el-table__body tr.current-row>td { + background: linear-gradient(180deg, #327e77 0%, #2c9b92 46%, #1e524d 100%); +} +.el-table .el-table__body tr.current-row>td div { + color: #fff; } /* button样式 */ .el-button { diff --git a/src/components/ContentContainer.vue b/src/components/ContentContainer.vue index 1b33435..2a3f48c 100644 --- a/src/components/ContentContainer.vue +++ b/src/components/ContentContainer.vue @@ -7,6 +7,6 @@ diff --git a/src/components/SearchTemplate.vue b/src/components/SearchTemplate.vue index 278287d..d98a4d5 100644 --- a/src/components/SearchTemplate.vue +++ b/src/components/SearchTemplate.vue @@ -9,7 +9,7 @@ width: 100%; min-height: 48px; box-sizing: border-box; - padding: 20px; + padding: 8px; background: linear-gradient(180deg, #fafcfc 0%, #eeeeee 47%, #e7e7e7 100%); box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); } diff --git a/src/views/etl/components/edit.vue b/src/views/etl/components/edit.vue index a5ceb39..7755645 100644 --- a/src/views/etl/components/edit.vue +++ b/src/views/etl/components/edit.vue @@ -102,7 +102,7 @@ - +