diff --git a/src/views/bigScreen/information/left1.vue b/src/views/bigScreen/information/left1.vue index 38dd1a2..e53d825 100644 --- a/src/views/bigScreen/information/left1.vue +++ b/src/views/bigScreen/information/left1.vue @@ -5,7 +5,7 @@
· @@ -78,8 +78,7 @@ · 已完成任务/完成率 {{ totalAndRateTwo.total }}/{{ totalAndRateTwo.rate }}% - - +
diff --git a/src/views/bigScreen/information/right1.vue b/src/views/bigScreen/information/right1.vue index 77e5984..0f876ca 100644 --- a/src/views/bigScreen/information/right1.vue +++ b/src/views/bigScreen/information/right1.vue @@ -457,6 +457,28 @@ export default { ::v-deep .el-progress-bar__inner { background: linear-gradient(180deg, #fad961 0%, #f76b1c 100%) !important; } + +::v-deep .el-date-editor { + border-radius: 0; + box-shadow: none !important; + border: 1px solid rgba(255, 255, 255, 0.2); + vertical-align: middle; + color: #fff; + background-color: transparent; + .el-range-input, + .el-range-separator { + color: #fff; + } + .el-range-editor.is-active { + border-color: #fff !important; + } + + input { + background-color: transparent; + color: #fff; + } +} + .warp-scroll { height: 215px; width: 100%; diff --git a/src/views/bigScreen/scientific/tab1/center-bg.png b/src/views/bigScreen/scientific/tab1/center-bg.png index 166b78d..bd028bb 100644 Binary files a/src/views/bigScreen/scientific/tab1/center-bg.png and b/src/views/bigScreen/scientific/tab1/center-bg.png differ diff --git a/src/views/bigScreen/scientific/tab1/center1.vue b/src/views/bigScreen/scientific/tab1/center1.vue index 415fc92..a5307cc 100644 --- a/src/views/bigScreen/scientific/tab1/center1.vue +++ b/src/views/bigScreen/scientific/tab1/center1.vue @@ -1,14 +1,234 @@ \ No newline at end of file + + diff --git a/src/views/bigScreen/scientific/tab1/icon.png b/src/views/bigScreen/scientific/tab1/icon.png new file mode 100644 index 0000000..c5dd663 Binary files /dev/null and b/src/views/bigScreen/scientific/tab1/icon.png differ diff --git a/src/views/bigScreen/scientific/tab1/icon2.png b/src/views/bigScreen/scientific/tab1/icon2.png new file mode 100644 index 0000000..065ec21 Binary files /dev/null and b/src/views/bigScreen/scientific/tab1/icon2.png differ diff --git a/src/views/bigScreen/scientific/tab1/left1.vue b/src/views/bigScreen/scientific/tab1/left1.vue index 9796933..899c457 100644 --- a/src/views/bigScreen/scientific/tab1/left1.vue +++ b/src/views/bigScreen/scientific/tab1/left1.vue @@ -1,118 +1,112 @@ diff --git a/src/views/bigScreen/scientific/tab1/left2.vue b/src/views/bigScreen/scientific/tab1/left2.vue index f130ac6..58dbd24 100644 --- a/src/views/bigScreen/scientific/tab1/left2.vue +++ b/src/views/bigScreen/scientific/tab1/left2.vue @@ -1,34 +1,53 @@ \ No newline at end of file + diff --git a/src/views/bigScreen/scientific/tab1/right1.vue b/src/views/bigScreen/scientific/tab1/right1.vue index d06bb05..06de4bf 100644 --- a/src/views/bigScreen/scientific/tab1/right1.vue +++ b/src/views/bigScreen/scientific/tab1/right1.vue @@ -1,311 +1,302 @@ \ No newline at end of file +