Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

gassafetyprogress-web/src/assets/styles/all.scss

@@ -633,6 +633,40 @@
     overflow-y: hidden !important;
   }
 }
+
+// 后台系统右上角消息图标
+.el-badge {
+  position: relative;
+  vertical-align: middle;
+  display: inline-block;
+  margin-bottom: 25px;
+  margin-right: 10px;
+}
+[class^=el-icon-], [class*=" el-icon-"] {
+  font-family: "element-icons" !important;
+  speak: none;
+  font-style: normal;
+  font-weight: 900 !important;
+  font-variant: normal;
+  text-transform: none;
+  vertical-align: text-bottom;
+  vertical-align: baseline;
+  display: inline-block;
+  -webkit-font-smoothing: antialiased;
+  display: inline-block;
+  padding: 0 8px;
+  height: 100% !important;
+  font-size: 22px;
+  color: #5a5e66;
+  -moz-osx-font-smoothing: grayscale;
+}
+.el-badge__content.is-fixed {
+  top: 15px !important;
+  right: 20px !important;
+}
+.el-badge__content {
+  padding: 0 2px !important;
+}
 //去除高德logo
 .amap-logo{
   display: none;

gassafetyprogress-web/src/components/bigWindow/leftBar.vue

@@ -205,11 +205,12 @@
           // 绘制图表
           pieone.setOption({
               title: {
-                  text: '巡检任务完成率:'+(this.allNum.typeOne+this.allNum.typeTwo),
+                  text: '巡检任务数(个) : '+ (this.allNum.typeOne+this.allNum.typeTwo),
                   left: 'center',
                   top :20,
                   textStyle:{
-                      color: "#00ffff"
+                      color: "#00ffff",
+                      fontSize: "16"
                   }
               },
               grid: {
@@ -281,11 +282,12 @@
           });
           pietwo.setOption({
               title: {
-                  text: '隐患整治完成率:'+(this.allNum.typeOne+this.allNum.typeTwo),
+                  text: '隐患整治数(个) : '+ (this.allNum.typeOne+this.allNum.typeTwo),
                   left: 'center',
                   top :20,
                   textStyle:{
-                      color: "#00ffff"
+                      color: "#00ffff",
+                      fontSize: "16"
                   }
               },
               grid: {

gassafetyprogress-web/src/components/bigWindow/rightBar.vue

@@ -51,7 +51,7 @@
     <div class="" style="padding: 0px 10px;">
       <div class="yujingleft yujing" style="width: 33%;height: 90px;float: left;">
           <div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
-            <img src="@/assets/mapinages/group786.png" alt="" style="width: 60px;height: 60px;" />
+            <img src="@/assets/mapinages/group786.png" alt="" style="width: 50px;height: 50px;" />
           </div>
           <div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
             <p>设备预警</p>
@@ -60,7 +60,7 @@
       </div>
       <div class="yujingcenter yujing" style="width: 33%;height: 90px;float: left;">
         <div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
-          <img src="@/assets/mapinages/group787.png" alt="" style="width: 60px;height: 60px;" />
+          <img src="@/assets/mapinages/group787.png" alt="" style="width: 50px;height: 50px;" />
         </div>
         <div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
           <p>事件情况</p>
@@ -69,7 +69,7 @@
       </div>
       <div class="yujingright yujing" style="width: 33%;height: 90px;float: left;">
         <div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
-          <img src="@/assets/mapinages/group788.png" alt="" style="width: 60px;height: 60px;" />
+          <img src="@/assets/mapinages/group788.png" alt="" style="width: 50px;height: 50px;" />
         </div>
         <div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
           <p>隐患数量</p>

gassafetyprogress-web/src/layout/components/Navbar.vue

@@ -7,13 +7,17 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+        <!-- <search id="header-search" class="right-menu-item" /> -->
+          <el-badge :value="200" :max="99" class="item">
+            <i class="el-icon-chat-dot-round"></i>
+          </el-badge>
+          
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
       </template>