dedsudiyu 5 天之前
父节点
当前提交
b8e5ed5b88

+ 10 - 9
src/views/components/center-bottom-right.vue

@@ -4,14 +4,10 @@
     <div class="center-bottom-right-page">
       <div class="dv-scroll-board-title-box">
         <p>设施房间</p>
-        <p>使用人所属
-          单位</p>
-        <p>房间准入总
-          人数</p>
-        <p>30日进入总
-          人次</p>
-        <p>7日进入总
-          人次</p>
+        <p>使用单位</p>
+        <p>准入人数</p>
+        <p>30日进入</p>
+        <p>7日进入</p>
       </div>
       <p class="null-p" v-if="!config.data[0]">暂无数据</p>
       <dv-scroll-board :config="config" style="width:773px;height:540px;margin:0 24px;" v-if="config.data[0]"/>
@@ -91,7 +87,8 @@
         margin:28px 24px 0;
         p{
           font-size:26px;
-          color:#1476DF;
+          /*color:#1476DF;*/
+          color:#fff;
           text-align: center;
           line-height: 28px;
           margin-top:12px;
@@ -102,15 +99,19 @@
         }
         p:nth-child(2){
           width:154px;
+          margin-top:26px;
         }
         p:nth-child(3){
           width:150px;
+          margin-top:26px;
         }
         p:nth-child(4){
           width:150px;
+          margin-top:26px;
         }
         p:nth-child(5){
           width:150px;
+          margin-top:26px;
         }
       }
       ::v-deep .ceil{

+ 1 - 1
src/views/components/center-top.vue

@@ -456,7 +456,7 @@
               margin-bottom:11px;
               .min-center-box-left{
                 display: flex;
-                width:190px;
+                width:155px;
                 p:nth-child(1){
                   width: 88px;
                   height: 50px;

+ 6 - 6
src/views/components/headComponent.vue

@@ -91,17 +91,17 @@
       .logo-img{
         /*margin:35px 16px 0 1245px;*/
         /*分辨率调整*/
-        margin:35px 16px 0 1620px;
-        width:64px;
-        height:64px;
+        margin: 26px 16px 0 1482px;
+        width: 90px;
+        height: 90px;
       }
       .title-p{
         flex:1;
-        line-height:48px;
-        height:48px;
+        line-height:60px;
+        height:60px;
         margin-top:40px;
         font-family: Alimama ShuHeiTi;
-        font-size: 40px;
+        font-size: 60px;
         font-weight: bold;
         background: -webkit-linear-gradient(#FFFFFF, #0095FF);
         -webkit-background-clip: text;

+ 2 - 0
src/views/components/left-bottom.vue

@@ -214,6 +214,8 @@
             left: '6%',
             top: '0%',
             right: '0%',
+            //限制展示范围控制柱状图间距
+            height: barList.length * 60, // 36 = 6 + 30
           },
           xAxis: {
             type: 'value',

+ 3 - 3
src/views/components/left-top.vue

@@ -560,8 +560,8 @@
           text-align: right;
           font-style: normal;
           text-transform: none;
-          background: -webkit-linear-gradient(0deg, #0183FA, #FFFFFF); /* Chrome, Safari */
-          background: linear-gradient(0deg, #0183FA, #FFFFFF); /* 标准语法 */
+          background: -webkit-linear-gradient(0deg, #00FFFF, #FFFFFF); /* Chrome, Safari */
+          background: linear-gradient(0deg, #00FFFF, #FFFFFF); /* 标准语法 */
           -webkit-background-clip: text; /* Chrome, Safari */
           background-clip: text;
           -webkit-text-fill-color: transparent; /* Chrome, Safari */
@@ -605,7 +605,7 @@
             font-family: Alimama ShuHeiTi;
             font-weight: 700;
             font-size: 40px;
-            color: #0183FA;
+            color: #00FFFF;
             text-align: left;
             font-style: normal;
             text-transform: none;

+ 14 - 10
src/views/components/right.vue

@@ -311,13 +311,14 @@
             itemWidth: 60,
             itemHeight: 30,
             itemGap: 20,
-            right: '35%',
+            // right: '29%',
+            left:'35%',
             top: '10%',
             textStyle: {
               fontSize: 30,
               color: '#fff'
             },
-            data: [' 24h温度走势图'],
+            data: [' 24h温度走势图(℃)'],
             selectedMode: false
           },
           xAxis: {
@@ -392,7 +393,7 @@
           series: [
             {
               data: Data,
-              name: ' 24h温度走势图',
+              name: ' 24h温度走势图(℃)',
               type: 'line',
               symbol: 'circle',
               smooth: true,
@@ -497,13 +498,14 @@
             itemWidth: 60,
             itemHeight: 30,
             itemGap: 20,
-            right: '35%',
+            // right: '29%',
+            left:'35%',
             top: '10%',
             textStyle: {
               fontSize: 30,
               color: '#fff'
             },
-            data: [' 24h湿度走势图'],
+            data: [' 24h湿度走势图(%RH)'],
             selectedMode: false
           },
           xAxis: {
@@ -578,7 +580,7 @@
           series: [
             {
               data: Data,
-              name: ' 24h湿度走势图',
+              name: ' 24h湿度走势图(%RH)',
               type: 'line',
               symbol: 'circle',
               smooth: true,
@@ -683,13 +685,14 @@
             itemWidth: 60,
             itemHeight: 30,
             itemGap: 20,
-            right: '29%',
+            // right: '29%',
+            left:'35%',
             top: '10%',
             textStyle: {
               fontSize: 30,
               color: '#fff'
             },
-            data: [' 24h用电功率(w)'],
+            data: [' 24h用电功率(W)'],
             selectedMode: false
           },
           xAxis: {
@@ -764,7 +767,7 @@
           series: [
             {
               data: Data,
-              name: ' 24h用电功率(w)',
+              name: ' 24h用电功率(W)',
               type: 'line',
               symbol: 'circle',
               smooth: true,
@@ -926,7 +929,8 @@
                 margin-top: 12px;
               }
               p:nth-child(2) {
-                color: #0183FA;
+                /*color: #0183FA;*/
+                color: #00FFFF;
                 border-top: 1px solid #fff;
                 border-bottom: 1px solid #fff;
               }