From 308cfa4acf5912fd2d4cb9b17bdf157a78820c60 Mon Sep 17 00:00:00 2001 From: maochaoying <925670706@qq.com> Date: Mon, 4 Sep 2023 13:38:32 +0800 Subject: [PATCH] progress header --- src/assets/img/operator/time.png | Bin 0 -> 4759 bytes src/components/Progress.vue | 208 +++++++++++++++------------------------ src/pages/Home.vue | 5 +- 3 files changed, 80 insertions(+), 133 deletions(-) create mode 100644 src/assets/img/operator/time.png diff --git a/src/assets/img/operator/time.png b/src/assets/img/operator/time.png new file mode 100644 index 0000000000000000000000000000000000000000..86821a15f242462815e9ae6c6af208ebfc3414c9 GIT binary patch literal 4759 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
-
-
剩余时间
+

{{ operatorStore.estimatedRemainingTimeS == 0 @@ -10,51 +9,48 @@ : `${time_To_hhmmss(operatorStore.estimatedRemainingTimeS)}` }}

-

预热时间约5分钟

-
-
-
- 停止消毒 -
-
- 返回 -
- + + + + + + + + + + + + +
+ 结束消毒 +
+
+ 返回
@@ -628,104 +624,54 @@ const continueDisinfect = () => { box-sizing: border-box; background: #ffffff; border-radius: 16px; - padding: 20px; padding-bottom: 30px; .header_wrap { display: flex; align-items: center; - margin-bottom: 49px; - .left_progress { - // width: 860px; - flex: 1; - height: 80px; - border-radius: 14px; - background: #f6f6f6; - box-sizing: border-box; - padding: 0 23px; - display: flex; - align-items: center; + justify-content: space-between; + margin-bottom: 34px; + height: 107px; + box-sizing: border-box; + padding: 13px 36px 13px 20px; + background: #f6f6f6; + border-radius: 16px 16px 0 0; + .left_time { position: relative; - .left_time_tag { - width: 158.66px; - height: 45px; - border-radius: 23px; - opacity: 1; - background: #06518b; - display: flex; - align-items: center; - justify-content: center; - font-family: Source Han Sans CN; - font-size: 14px; - font-weight: normal; - letter-spacing: 0.1em; - color: #ffffff; - } + width: 377px; + height: 61px; + background: url(../assets/img/operator/time.png) no-repeat; + background-size: 100% 100%; .time { - // width: 90px; - flex: 1; - height: 20px; font-family: Source Han Sans CN; - font-size: 14px; - font-weight: 500; + font-size: 28px; + font-weight: bold; + line-height: normal; letter-spacing: 0.1em; - color: #000000; - display: flex; - align-items: center; - justify-content: center; - } - .pre_time { + color: #ffffff; position: absolute; - font-family: Source Han Sans CN; - font-size: 14px; - font-weight: 500; - letter-spacing: 0.1em; - color: red; - left: 214px; - } - .progress_bg { - width: 396px; - height: 14px; - border-radius: 7px; - background: #ffffff; - position: relative; - overflow: hidden; - .pro { - position: absolute; - left: 0; - top: 0; - height: 14px; - border-radius: 7px; - background: #06518b; - width: var(--width); - } + left: 165px; + top: 9px; + width: 178px; + height: 41px; + text-align: center; } } - .right_btns { + .btn { + padding: 12px 28px; + box-sizing: border-box; + width: 140px; + height: 50px; + border-radius: 25px; + background: #06518b; display: flex; align-items: center; - box-sizing: border-box; - margin-left: 20px; - .btn { - width: 140px; - height: 45px; - border-radius: 23px; - background: #f6f6f6; - display: flex; - align-items: center; - justify-content: center; - font-family: Source Han Sans CN; - font-size: 14px; - font-weight: normal; - letter-spacing: 0.1em; - color: #d8d8d8; - } - .active { - color: #ffffff; - background: #06518b; - } - .ml { - margin: 0 20px; - } + justify-content: center; + font-family: Source Han Sans CN; + font-size: 20px; + font-weight: 500; + line-height: normal; + letter-spacing: 0.07em; + color: #ffffff; } } .echarts_wrap { diff --git a/src/pages/Home.vue b/src/pages/Home.vue index c381b03..cafa734 100644 --- a/src/pages/Home.vue +++ b/src/pages/Home.vue @@ -170,10 +170,11 @@ :hideKeyBoard="hideKeyBoard" :input="input" /> - + /> --> +