邓洁: 修改细节

.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

src/assets/styles/index.scss

@@ -452,8 +452,8 @@ body,
 
 .el-overlay-message-box {
   .el-message-box {
-    width: 500px;
+    width: 327px;
-    height: 230px;
+    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;
+        width: 80px;
-        height: 50px;
+        height: 40px;
         border: 2px solid #0f82af;
-        font-size: 28px;
+        font-size: 18px;
         background-color: #072348;
         color: #08b7b8;
       }

src/components/content/usedEle/UsedEle.vue

@@ -7,7 +7,7 @@
         </div>
         <div>
           <div class="icon"></div>
-          <span>当月用电量：{{ electricityConsumptionMonthly }}v</span>
+          <span>当月用电量：{{ electricityConsumptionMonthly }}kwh</span>
         </div>
       </div>
       <div class="item">
@@ -16,7 +16,7 @@
         </div>
         <div>
           <div class="icon"></div>
-          <span>当月节省量：{{ monthlySavings }}v</span>
+          <span>当月节省量：{{ monthlySavings }}kwh</span>
         </div>
       </div>
     </div>
@@ -27,15 +27,15 @@
         <div class="top-tag">
           <div class="allUsedEle">
             <div class="use-title">
-              12月总用电量
+              {{ month }}总用电量
             </div>
-            <div class="value">2345v</div>
+            <div class="value">{{ electricityConsumptionMonthly }}kwh</div>
           </div>
           <div class="allUsedEle">
             <div class="use-title">
               当月节省量
             </div>
-            <div class="value">345v</div>
+            <div class="value">{{ monthlySavings }}kwh</div>
           </div>
         </div>
         <div class="loading-block" v-if="showLoading">
@@ -55,7 +55,7 @@
 
 <script setup>
 import * as echarts from 'echarts';
-
+import {dateFormat} from "@/utils/date.js";
 const props = defineProps({
   list: Array,
   eleData: Array
@@ -67,6 +67,7 @@ const electricityConsumptionMonthly = ref(0)
 const monthlySavings = ref(4000)
 const length = ref(null);
 const valueA = ref();
+const month = ref(dateFormat('',true));
 const valueB = ref(monthlySavings.value);
 const bgImage = computed(() =>
     isVisited.value

src/utils/date.js

@@ -1,9 +1,10 @@
-export const dateFormat = (time = new Date().getTime()) => { //YYYY年MM月DD日 星期d
+export const dateFormat = (time = new Date().getTime(),flag) => { //YYYY年MM月DD日 星期d
   const _time = time.toString().length > 10 ? time : time * 1000
   const weekList = ["日","一", "二", "三", "四", "五", "六" ];
   const date = new Date(_time);
   const Y = date.getFullYear();
   const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
+  const Mm = (date.getMonth() + 1 < 10 ?  (date.getMonth() + 1) : date.getMonth() + 1);
   const D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate());
   const h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours());
   const m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
@@ -11,7 +12,11 @@ export const dateFormat = (time = new Date().getTime()) => { //YYYY年MM月DD日
   let weekDay = new Date().getDay();
   const week= weekList[weekDay]
   // const strDate = `${Y}/${M}/${D} ${h}:${m}:${s}`
-  return `${Y}年${M}月${D}日 星期${week}`;
+  if(flag){
+    return `${Mm}月`;
+  }else {
+    return `${Y}年${M}月${D}日 星期${week}`;
+  }
 }
 
 export default {

src/utils/request.js

@@ -62,7 +62,8 @@ serveice.interceptors.response.use(response=>{
         confirmButtonText: '重新登录',
         cancelButtonText: '取消',
         type: 'warning',
-        closeOnClickModal: false
+        closeOnClickModal: false,
+        customClass:'message-id'
       }).then(()=>{
         removeToken()
         window.location = '/login'

src/views/login/index.vue

@@ -6,7 +6,7 @@
         :rules="rules"
         label-width="65px"
     >
-      <h3>Tunnel Cloud</h3>
+      <h3>地下复杂洞群智能通风控制系统</h3>
       <el-form-item prop="username" label="账号">
         <el-input v-model="loginForm.username" :prefix-icon="User"></el-input>
       </el-form-item>
@@ -116,12 +116,13 @@ onBeforeUnmount(() => {
 .login-box {
   height: 100%;
   background-color: #4158d0;
-  background-image: linear-gradient(
+  //background-image: linear-gradient(
-          43deg,
+  //        43deg,
-          #4158d0 0%,
+  //        #4158d0 0%,
-          #c850c0 46%,
+  //        #c850c0 46%,
-          #ffcc70 100%
+  //        #ffcc70 100%
-  );
+  //);
+  background-image: url("../../assets/images/login/bg.png");
   display: flex;
   justify-content: center;
   align-items: center;
@@ -130,6 +131,8 @@ onBeforeUnmount(() => {
     padding: 12px 15px;
     border-radius: 12px;
     width: 25%;
+    min-width: 407px;
+    min-height: 300px;
     background-color: #fff;
 
     h3 {