diff --git a/.drone.yml b/.drone.yml index 7cc4390..b193984 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,7 @@ steps: - export NODE_MODULES_PATH=`pwd`/node_modules - npm config set registry https://registry.npm.taobao.org - set NODE_OPTIONS=--openssl-legacy-provider - - npm install +# - npm install - npm run build - echo $NODE_MODULES_PATH - cp -r dist /app/build/$DRONE_REPO_NAME diff --git a/src/assets/images/login/bg.png b/src/assets/images/login/bg.png new file mode 100644 index 0000000..b376e3a Binary files /dev/null and b/src/assets/images/login/bg.png differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 61c4fd9..1f38eca 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -452,8 +452,8 @@ body, .el-overlay-message-box { .el-message-box { - width: 500px; - height: 230px; + width: 327px; + height:190px; background: rgba(7, 35, 72, 0.79); border-radius: 20px; border: 2px solid #0f82af; @@ -461,16 +461,20 @@ body, .el-message-box__title { display: none; } - +.el-message-box__close{ + display: none; +} .el-message-box__content { .el-icon { display: none; } .el-message-box__message { + //text-align: center; //width: 315px; height: 80px; - font-size: 32px; + line-height: 80px; + font-size: 22px; font-weight: bold; color: #08b7b8; letter-spacing: 3px; @@ -482,15 +486,14 @@ body, } .el-message-box__btns { - margin-top: 20px; display: flex; justify-content: space-around; .el-button { - width: 130px; - height: 50px; + width: 80px; + height: 40px; border: 2px solid #0f82af; - font-size: 28px; + font-size: 18px; background-color: #072348; color: #08b7b8; } diff --git a/src/components/content/usedEle/UsedEle.vue b/src/components/content/usedEle/UsedEle.vue index 4e5fe39..10de6ca 100644 --- a/src/components/content/usedEle/UsedEle.vue +++ b/src/components/content/usedEle/UsedEle.vue @@ -7,7 +7,7 @@
- 当月用电量:{{ electricityConsumptionMonthly }}v + 当月用电量:{{ electricityConsumptionMonthly }}kwh
@@ -16,7 +16,7 @@
- 当月节省量:{{ monthlySavings }}v + 当月节省量:{{ monthlySavings }}kwh
@@ -27,15 +27,15 @@
- 12月总用电量 + {{ month }}总用电量
-
2345v
+
{{ electricityConsumptionMonthly }}kwh
当月节省量
-
345v
+
{{ monthlySavings }}kwh
@@ -55,7 +55,7 @@