From 140f47abc4cdcd1ae2db549da3788cb975f85935 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 12 Oct 2021 14:39:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=80=89=E9=A1=B9=E5=8D=A1=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/widget/DeWidget/DeTabs.vue | 17 +---------------- frontend/src/styles/index.scss | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue index 26ffb9a7b2..900c979990 100644 --- a/frontend/src/components/widget/DeWidget/DeTabs.vue +++ b/frontend/src/components/widget/DeWidget/DeTabs.vue @@ -34,7 +34,7 @@ -
+
@@ -250,23 +250,8 @@ export default { } .de-tabs { height: 100%; - >>>div.el-tabs__content { - height: calc(100% - 55px); - .el-tab-pane { - height: 100%; - } - } - } - /* .de-tab-i { - transition: 0.1s; - opacity: 0; - transform: translateY(100%); } - .de-tab-drop:hover .de-tab-i { - opacity: 1; - transform: translateY(0); - } */ .de-tab-content { width: 100%; height: 100%; diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index 36e3cc149a..57d327ea2b 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -43,9 +43,6 @@ html { box-sizing: border-box; } -#app { - //height: $contentHeight; -} *, *:before, @@ -151,6 +148,18 @@ div:focus { } } +.de-tabs { + .el-tabs__header { + margin: 0 0 0 0 !important; + } + .el-tabs__content { + height: calc(100% - 55px) !important; + .el-tab-pane { + height: 100% !important; + } + } +} + .de-search-header { .el-tabs__header { display: none !important;; From 95f790004ab81f014c41ace6c9b9dabcec6dcd24 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 12 Oct 2021 15:02:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E9=80=89=E9=A1=B9=E5=8D=A1=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=AF=95=E5=9B=BE=E6=9C=89=E9=BB=98=E8=AE=A4=E9=80=89?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/widget/DeWidget/DeTabs.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue index 900c979990..18fa38d54a 100644 --- a/frontend/src/components/widget/DeWidget/DeTabs.vue +++ b/frontend/src/components/widget/DeWidget/DeTabs.vue @@ -75,7 +75,7 @@ center >
- +
@@ -161,6 +161,10 @@ export default { }, sureViewSelector() { const nodes = this.$refs.viewSelect.getCurrentSelected() + if (!nodes || nodes.length === 0) { + this.viewDialogVisible = false + return + } const node = nodes[0] let component From e3df9ec5c570e0967285ecb24cf32d10a8673ffe Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 12 Oct 2021 19:45:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20flyway=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V18__add_demo.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/resources/db/migration/V18__add_demo.sql b/backend/src/main/resources/db/migration/V18__add_demo.sql index d700a2b67c..fb508a16c4 100644 --- a/backend/src/main/resources/db/migration/V18__add_demo.sql +++ b/backend/src/main/resources/db/migration/V18__add_demo.sql @@ -230,6 +230,7 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- -- Table structure for demo_new_trend_of_diagnosis -- ---------------------------- +DROP TABLE IF EXISTS `demo_new_trend_of_diagnosis`; CREATE TABLE `demo_new_trend_of_diagnosis` ( `date` varchar(50) NOT NULL DEFAULT '' COMMENT '日期', `new_diagnosis` bigint(13) DEFAULT NULL COMMENT '新增确诊', From e177c0d22078c9e504690bc2199ce51635e08a67 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 12 Oct 2021 19:46:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20flyway=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V14__area_code.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/backend/src/main/resources/db/migration/V14__area_code.sql b/backend/src/main/resources/db/migration/V14__area_code.sql index e69de29bb2..75a739301b 100644 --- a/backend/src/main/resources/db/migration/V14__area_code.sql +++ b/backend/src/main/resources/db/migration/V14__area_code.sql @@ -0,0 +1,10 @@ +CREATE TABLE `area_mapping` ( + `id` bigint(20) NOT NULL COMMENT 'id', + `province_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省名称', + `province_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省代码', + `city_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '市名称', + `city_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '市代码', + `county_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '县名称', + `county_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '县代码', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci;