样式修改

src/layout/components/TagsView/index.vue

@@ -13,7 +13,7 @@
         @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
-        {{ tag.title }}
+        <span style="color: #168DE8">{{ tag.title }}</span>
         <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>

src/styles/variables.scss

@@ -90,7 +90,7 @@ $menuHover:#1A2137;
 $subMenuBg:#232C48;
 $subMenuHover:#1A2137;
 
-$sideBarWidth: 254px;
+$sideBarWidth: 224px;
 $sideHideWidth: 54px;
 
 // the :export directive is the magic sauce for webpack

src/views/login/login.vue

@@ -176,7 +176,7 @@ export default {
   position: fixed;
   top: 17px;
   left: 43%;
-  width: 5vw;
+  //width: 5vw;
 }
 .title {
   margin: 10vh auto 7vh auto;
@@ -196,9 +196,9 @@ export default {
   //background: #ffffff no-repeat;
   background-size: 59%;
   background-position-y: 57px;
-  width: 29vw;
-  height: 65vh;
-  padding: 25px 25px 5px 25px;
+  width: 25vw;
+  height: 62vh;
+  padding: 25px 45px 5px 45px;
   .login-form-content{
     //position: absolute;
     //top: 40%;

src/views/overView/dashboard/equipment.vue

@@ -3,6 +3,7 @@
     <el-row :gutter="12">
       <el-col :span="6">
         <div class="equipmentLeft">
+          <div style="height: 50px"></div>
           <el-card class="box-card">
             <div style="display: flex;margin-top: 10px">
               <el-divider direction="vertical" />
@@ -46,10 +47,10 @@
           <el-card class="box-card">
             <div style="display: flex;margin-top: 10px;margin-bottom: 10px">
               <el-divider direction="vertical" />
-              <div class="cardTitle">未处理警告</div>
+              <div style="margin-bottom: 8px" class="cardTitle">未处理警告</div>
             </div>
             <div v-for="(item, index) in messageList" :key="index" class="warnMessage">
-              <div>
+              <div style="display: flex;justify-content: space-between">
                 <span>{{ item.label }}</span>
                 <span>{{ item.time }}</span>
               </div>
@@ -65,11 +66,11 @@
               <div id="echarts-proLineMonitor" class="span_1">
                 <el-row>
                   <el-col :span="16">
-                    <div id="dataCharts_proLineMonitor" ref="chart_stay" style="height: 30vh" />
+                    <div id="dataCharts_proLineMonitor" ref="chart_stay" style="height: 40vh" />
                   </el-col>
                   <el-col :span="8">
                     <div class="middleLattice">
-                      <div style="margin-bottom: 15px;margin-top: 15px">设备总数：104</div>
+                      <div style="margin-bottom: 15px;margin-top: 60px">设备总数：104</div>
                       <div class="middleLatticeChild">正常：78</div>
                       <div class="middleLatticeChild">故障：9</div>
                       <div class="middleLatticeChild">危险：3</div>
@@ -84,11 +85,11 @@
               <div id="echarts-MonitoringPpoint" class="span_1">
                 <el-row>
                   <el-col :span="16">
-                    <div id="dataCharts_MonitoringPpoint" ref="chart_stay" style="height: 30vh" />
+                    <div id="dataCharts_MonitoringPpoint" ref="chart_stay" style="height: 40vh" />
                   </el-col>
                   <el-col :span="8">
                     <div class="middleLattice">
-                      <div style="margin-bottom: 15px;margin-top: 15px">监测点总数：2143</div>
+                      <div style="margin-bottom: 15px;margin-top: 60px">监测点总数：2143</div>
                       <div class="middleLatticeChild">正常：1658</div>
                       <div class="middleLatticeChild">故障：17</div>
                       <div class="middleLatticeChild">危险：12</div>
@@ -104,11 +105,11 @@
       </el-col>
       <el-col :span="6">
         <div class="equipmentRight">
-          <div style="display: flex">
-            <img id="fullscreen_btn" style="cursor:pointer;" :src="expandPage">
-            <div style="font-size: 30px;padding-right: 20px">{{ nowDate }}</div>
+          <div style="display: flex;justify-content: end; height: 50px;padding-right: 5px">
+            <img id="fullscreen_btn" style=" cursor:pointer;height: 35px;width: 35px" :src="expandPage">
+            <div style="font-size: 30px;padding-left: 20px; padding-right: 20px">{{ nowDate }}</div>
             <div>
-              <div>{{ week }}</div>
+              <div style="font-size: 20px">{{ week }}</div>
               <div>{{ date_show }}</div>
             </div>
           </div>
@@ -168,6 +169,7 @@ export default {
         { label: '智盘服务器-10.1.154', time: '2019-12-09' },
         { label: '智盘服务器-10.1.154', time: '2019-12-09' },
         { label: '智盘服务器-10.1.154', time: '2019-12-09' },
+        { label: '智盘服务器-10.1.154', time: '2019-12-09' },
         { label: '智盘服务器-10.1.154', time: '2019-12-09' }
       ],
       equipmentIcon: require('@/assets/image/shebeizongshu.png'),
@@ -475,26 +477,27 @@ export default {
           textStyle: {
             textAlign: 'center',
             fill: '#333',
-            fontSize: 18,
+            fontSize: 14,
             fontWeight: 400
           }
         },
         graphic: {
           type: 'text',
           left: 'center',
-          top: '40%',
+          top: '43%',
           style: {
             text: '104',
             textAlign: 'center',
             fill: '#333',
-            fontSize: 20
+            fontSize: 18,
+            fontWeight: 800
           }
         },
         series: [
           {
             name: 'Access From',
             type: 'pie',
-            radius: ['30%', '70%'],
+            radius: ['30%', '50%'],
             avoidLabelOverlap: false,
             itemStyle: {
               borderRadius: 10,
@@ -540,26 +543,27 @@ export default {
           textStyle: {
             textAlign: 'center',
             fill: '#333',
-            fontSize: 18,
+            fontSize: 14,
             fontWeight: 400
           }
         },
         graphic: {
           type: 'text',
           left: 'center',
-          top: '40%',
+          top: '43%',
           style: {
             text: '2143',
             textAlign: 'center',
             fill: '#333',
-            fontSize: 20
+            fontSize: 18,
+            fontWeight: 800
           }
         },
         series: [
           {
             name: 'Access From',
             type: 'pie',
-            radius: ['30%', '70%'],
+            radius: ['30%', '50%'],
             avoidLabelOverlap: false,
             itemStyle: {
               borderRadius: 10,
@@ -591,24 +595,28 @@ export default {
 
 <style lang="scss" >
 .equipment{
-  padding: 15px;
+  padding: 0 15px 15px;
+.el-divider--vertical{
+  margin-left: 0px!important;
+}
   .equipmentMiddle{
     .middleLattice{
       .middleLatticeChild{
-        width: 90px;
+        width: 100px;
         padding: 5px;
         border: 1px solid black;
         border-bottom: 0;
       }
     }
     .middleBody{
+      padding-top: 20px;
       .middleChild{
         margin-bottom: 30px;
       }
     }
     .bigTitle{
       text-align: center;
-      font-size: 35px;
+      font-size: 32px;
       color: #46bcf2;
     }
   }
@@ -617,13 +625,14 @@ export default {
     margin-bottom: 10px;
     .el-divider--vertical{
       width: 5px!important;
-      background-color: #46bcf2!important;
+      background-color: #168DE8!important;
     }
     .warnMessage{
-      padding-bottom: 5px;
-      margin-bottom: 5px;
-      border-bottom: 1px solid #46bcf2;
-
+      margin-left: 15px;
+      padding-bottom: 10px;
+      margin-bottom: 10px;
+      border-bottom: 1px solid #e5e5e5;
+      font-size: 14px;
     }
     .cardTitle{
       text-align: left;
@@ -638,12 +647,14 @@ export default {
       }
       .cardNum{
         margin-top: 10px;
+        font-weight: bold;
         font-size: 20px;
       }
     }
     .el-card__body{
       text-align: center!important;
-      padding: 10px!important;
+      padding: 10px !important;
+      padding-left: 0px!important;
     }
     .span_middle{
       font-size: 14px;