From de3839498d97e951c30040ef6c6bcc18bdafa515 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 二月 2020 14:44:42 +0800
Subject: [PATCH] 2020-02-14
---
src/components/tabview/index.scss | 2 +-
src/tabviews/rolemanage/index.scss | 2 +-
src/tabviews/commontable/index.scss | 16 +++++++---------
src/tabviews/formtab/index.scss | 2 +-
src/tabviews/subtable/index.scss | 2 +-
src/tabviews/datamanage/index.scss | 2 +-
src/tabviews/commontable/index.jsx | 3 ++-
src/tabviews/subtabtable/index.scss | 2 +-
8 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/components/tabview/index.scss b/src/components/tabview/index.scss
index 7e37b01..e51ffb7 100644
--- a/src/components/tabview/index.scss
+++ b/src/components/tabview/index.scss
@@ -39,7 +39,7 @@
.main-copy {
position: fixed;
z-index: 2;
- bottom: 75px;
+ bottom: 65px;
right: 30px;
width: 40px;
height: 40px;
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 9c6156d..05afd1b 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -447,7 +447,8 @@
let LText = `select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows`
let DateCount = `select count(1) as total from ${_dataresource} ${_search}`
- // console.log(LText)
+ console.log(LText)
+ console.log(DateCount)
param.LText = Utils.formatOptions(LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
diff --git a/src/tabviews/commontable/index.scss b/src/tabviews/commontable/index.scss
index ef364c5..8e15cd8 100644
--- a/src/tabviews/commontable/index.scss
+++ b/src/tabviews/commontable/index.scss
@@ -24,12 +24,6 @@
left: calc(50vw - 22px);
top: calc(50vh - 70px);
}
- > .ant-tabs {
- padding: 0px 20px;
- .ant-tabs-tab:not(.ant-tabs-tab-active) {
- cursor: pointer;
- }
- }
> .ant-card {
margin: 0 20px 20px;
> .ant-card-head {
@@ -68,8 +62,12 @@
}
}
}
- .ant-tabs + .ant-tabs {
- margin-top: 20px;
+ > .ant-tabs {
+ padding: 0px 20px;
+ margin-bottom: 20px;
+ .ant-tabs-tab:not(.ant-tabs-tab-active) {
+ cursor: pointer;
+ }
}
}
.commontable.pick-control {
@@ -78,7 +76,7 @@
}
}
.ant-back-top {
- bottom: 30px;
+ bottom: 20px;
right: 30px;
}
.popview-modal {
diff --git a/src/tabviews/datamanage/index.scss b/src/tabviews/datamanage/index.scss
index d51b566..2ad8d27 100644
--- a/src/tabviews/datamanage/index.scss
+++ b/src/tabviews/datamanage/index.scss
@@ -26,6 +26,6 @@
}
}
.ant-back-top {
- bottom: 30px;
+ bottom: 20px;
right: 30px;
}
\ No newline at end of file
diff --git a/src/tabviews/formtab/index.scss b/src/tabviews/formtab/index.scss
index 0b6453a..1a33f49 100644
--- a/src/tabviews/formtab/index.scss
+++ b/src/tabviews/formtab/index.scss
@@ -165,7 +165,7 @@
}
}
.ant-back-top {
- bottom: 30px;
+ bottom: 20px;
right: 30px;
}
.popview-modal {
diff --git a/src/tabviews/rolemanage/index.scss b/src/tabviews/rolemanage/index.scss
index e937241..7deb261 100644
--- a/src/tabviews/rolemanage/index.scss
+++ b/src/tabviews/rolemanage/index.scss
@@ -9,6 +9,6 @@
}
}
.ant-back-top {
- bottom: 30px;
+ bottom: 20px;
right: 30px;
}
\ No newline at end of file
diff --git a/src/tabviews/subtable/index.scss b/src/tabviews/subtable/index.scss
index ba390c5..f5fe1be 100644
--- a/src/tabviews/subtable/index.scss
+++ b/src/tabviews/subtable/index.scss
@@ -31,7 +31,7 @@
}
}
.ant-back-top {
- bottom: 30px;
+ bottom: 20px;
right: 30px;
}
.popview-modal {
diff --git a/src/tabviews/subtabtable/index.scss b/src/tabviews/subtabtable/index.scss
index ed702d6..890b283 100644
--- a/src/tabviews/subtabtable/index.scss
+++ b/src/tabviews/subtabtable/index.scss
@@ -31,6 +31,6 @@
}
}
.ant-back-top {
- bottom: 30px;
+ bottom: 20px;
right: 30px;
}
\ No newline at end of file
--
Gitblit v1.8.0