代码优化

sgzb-screen/src/components/home/rightOne.vue

@@ -412,7 +412,7 @@ export default {
           },
           borderWidth: 0,
           padding: [0, -50],
-          height: 70,
+          height: 50,
           fontSize: 14,
           align: 'center',
           color: '#ffffff',

sgzb-screen/src/components/home/rightOne1.vue

@@ -430,7 +430,7 @@ export default {
           },
           borderWidth: 0,
           padding: [0, 0],
-          height: 70,
+          height: 50,
           fontSize: 14,
           align: 'center',
           color: '#ffffff',

sgzb-screen/src/views/newHome/index.vue

@@ -1,8 +1,32 @@
 <template>
   <div class="screen-container">
     <div class="data-v-container" :key="key">
-      <NewMap @openDrawer="openDrawer" />
+      <div class="title-bg">
+        <div class="btn-content">
+          <el-button
+            size="medium"
+            type="primary"
+            @click="
+              () => {
+                $router.go(-1)
+              }
+            "
+            >返回</el-button
+          >
+          <el-button size="medium" type="primary" @click="goBackstage"
+            >后台管理</el-button
+          >
+        </div>
 
+        <!-- 获取天气 -->
+        <div class="weather">
+          <div class="weather_box">
+            <div><img alt="" src="../../assets/img/myImage//time.png" /></div>
+            <div class="dateTimeString">{{ dateTimeString }}</div>
+          </div>
+        </div>
+      </div>
+      <NewMap @openDrawer="openDrawer" />
       <div class="screen-left">
         <LeftOne />
         <LeftTwo />
@@ -146,6 +170,7 @@ export default {
       maType: 1,
       // 地图点击时的查询参数
       queryParams: null,
+      dateTimeString: '',
     }
   },
   mounted() {},
@@ -228,6 +253,10 @@ export default {
       const dateTimeString = `${year}/${month}/${day} ${weekday} ${hours}:${minutes}:${seconds}`
       this.dateTimeString = dateTimeString
     },
+
+    goBackstage() {
+      location.href = 'http://192.168.0.14:21624/index'
+    },
   },
 }
 </script>
@@ -257,13 +286,55 @@ export default {
   .screen-left,
   .screen-right {
     width: 22%;
-    height: 100%;
+    margin-top: 87px;
+    height: calc(100% - 87px);
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     z-index: 9;
   }
 
+  .title-bg {
+    height: 87px;
+    width: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    background-color: skyblue;
+    background: url('../..//assets/img/screenBg_new.png') no-repeat;
+    background-size: 100%, 100%;
+    z-index: 8;
+
+    .btn-content {
+      position: absolute;
+      right: 45px;
+      bottom: 8px;
+    }
+
+    .weather {
+      position: absolute;
+      bottom: 10px;
+      right: 15%;
+
+      .weather_box {
+        display: flex;
+        justify-content: flex-start;
+        align-content: center;
+        flex-wrap: nowrap;
+
+        .dateTimeString {
+          font-size: 14px;
+          font-family: Alibaba PuHuiTi, Alibaba PuHuiTi;
+          font-weight: 400;
+          color: #ffffff;
+          line-height: 18px;
+          letter-spacing: 0.1em;
+          margin-left: 5px;
+        }
+      }
+    }
+  }
+
   .screen-left {
     position: absolute;
     left: 0;