From 5c79d064f8b5b41679b63e3fd9e2469f86516c82 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 4 Mar 2022 17:48:24 +0800 Subject: [PATCH 01/10] fdsfs --- src/views/modules/importRecord/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue index 1796ece1..bd98184c 100644 --- a/src/views/modules/importRecord/index.vue +++ b/src/views/modules/importRecord/index.vue @@ -22,7 +22,7 @@ >导入中 已完成 导入失败导入失败,未知错误 @@ -85,7 +85,7 @@ export default { }, computed: { maxTableHeight() { - return this.clientHeight - 450; + return this.clientHeight - 300; }, ...mapGetters(["clientHeight"]), }, From 408f70d3b7741bcadb3d26b5c55edd11f78e080d Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 4 Mar 2022 18:05:44 +0800 Subject: [PATCH 02/10] =?UTF-8?q?-=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- public/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index 17eebff3..6592f042 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api +VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/public/index.html b/public/index.html index 6b33435e..1fcf3218 100644 --- a/public/index.html +++ b/public/index.html @@ -64,7 +64,7 @@ <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %> <% } %> From 736c35d4acb83ac7334a5f4ca9c9b8575d5955fa Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 4 Mar 2022 18:14:05 +0800 Subject: [PATCH 03/10] =?UTF-8?q?-=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=20=E6=8F=90=E4=B8=AA=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- public/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index 6592f042..eb6b823a 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api +VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api22 VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/public/index.html b/public/index.html index 1fcf3218..308bf5ae 100644 --- a/public/index.html +++ b/public/index.html @@ -64,7 +64,7 @@ <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %> <% } %> From 820abc70788ca31882849a6bd9b54bb348a30cb3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 4 Mar 2022 18:14:27 +0800 Subject: [PATCH 04/10] =?UTF-8?q?-=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=20=E6=8F=90=E4=B8=AA=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- public/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index eb6b823a..6592f042 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api22 +VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/public/index.html b/public/index.html index 308bf5ae..1fcf3218 100644 --- a/public/index.html +++ b/public/index.html @@ -64,7 +64,7 @@ <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %> <% } %> From ba46ba45e6818a0105bdc14bf1f2616325373369 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 7 Mar 2022 14:06:04 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=89=93=E6=89=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/search.scss | 4 +++- src/views/modules/shequ/index.vue | 16 +++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/assets/scss/modules/search.scss b/src/assets/scss/modules/search.scss index d0222b5c..7b4cb925 100644 --- a/src/assets/scss/modules/search.scss +++ b/src/assets/scss/modules/search.scss @@ -26,13 +26,15 @@ .input { position: relative; - select { + .select-show { border: none; + display: block; font-size: 16px; width: 90px; line-height: 32px; text-align: center; color: #0082fb; + cursor: default; } input { diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue index c0f09f69..7469479e 100644 --- a/src/views/modules/shequ/index.vue +++ b/src/views/modules/shequ/index.vue @@ -9,11 +9,17 @@