首页修改代码提交

src/styles/view/3dview/indexCharts.scss

@@ -21,7 +21,7 @@
 
     .body-left {
       top: 7rem;
-      font-size: 14px;
+      font-size: 16px;
     }
 
     .body-second {
@@ -30,7 +30,7 @@
 
     .body-right {
       top: 7rem;
-      font-size: 14px;
+      font-size: 16px;
     }
   }
 
@@ -63,7 +63,7 @@
       }
 
       .point {
-        padding-top: 60px;
+        padding-top:130px;
       }
 
       .dangerNums {
@@ -194,7 +194,7 @@
       }
 
       .alarmLineChart {
-        height: 20rem;
+        height: 23rem;
         background: transparent;
         background-color: #2965ca;
         user-select: none;
@@ -210,18 +210,33 @@
           .quarter-div {
             float: left;
             width: 50%;
-            height: 8rem;
+            height: 10em;
+            padding-top: 7px;
             background-color: rgba(23, 90, 201, 0.9);
-            border: 1px solid white;
+          }
+
+          .top-left {
+            border-right: 1px solid white;
+            border-bottom: 1px solid white;
+          }
+
+          .top-right {
+            border-bottom: 1px solid white;
+          }
+
+          .down-left {
+            border-right: 1px solid white;
           }
 
           .dh-title {
             padding: 0.2em 0.8em;
+            font-size: 15px;
             text-align: left;
           }
 
           .xf-title {
             padding: 0.2em 0.8em;
+            font-size: 15px;
             text-align: left;
           }
 
@@ -234,7 +249,6 @@
             display: inline-block;
             width: 30px;
             height: 70%;
-            padding-top: 6px;
             text-align: center;
             vertical-align: top;
           }
@@ -249,6 +263,7 @@
             .dh-values-item {
               display: inline-block;
               padding: 4px;
+              font-size: 14px;
             }
           }
 
@@ -262,10 +277,12 @@
 
           .xf-city-values {
             margin-right: 2em;
+            font-size: 14px;
           }
 
           .xf-yc-values {
             margin-right: 2em;
+            font-size: 14px;
             color: red;
           }
 
@@ -696,8 +713,8 @@
         color: white;
 
         .xian {
-          width: 100px;
-          height: 50px;
+          width: 150px;
+          height: 100px;
           background-color: #f50000;
 
           .xian-line {
@@ -716,11 +733,12 @@
           height: 22px;
 
           .xianyang-line {
+            position: absolute;
             width: 1px;
-            height: 130px;
-            margin-left: 142px;
-            -webkit-transform: rotate(135deg);
-            -moz-transform: rotate(-45deg);
+            height: 150px;
+            margin-top: 1px;
+            margin-left: 138px;
+            -webkit-transform: rotate(145deg);
           }
 
           span {
@@ -794,18 +812,18 @@
 
       .xian {
         position: absolute;
-        top: -68px;
-        left: 28px;
-        width: 100px;
-        height: 22px;
-
+        top: -199px;
+        left: 274px;
+        width: 122px;
+        height: 36px;
+        font-size: 21px;
         .xian-line {
           position: absolute;
           width: 1px;
-          height: 90px;
-          margin-top: 15px;
-          margin-left: -10px;
-          -webkit-transform: rotate(195deg);
+          height: 342px;
+          margin-top: -41px;
+          margin-left: -130px;
+          -webkit-transform: rotate(234deg);
         }
 
         span {
@@ -816,25 +834,29 @@
 
         .pulse-spread-circular {
           position: absolute;
-          top: 78px;
-          left: -40px;
-          width: 40px;
-          height: 40px;
+          top: -8px;
+          left: -11px;
+          z-index: 1;
+          width: 140px;
+          height: 50px;
+          cursor: pointer;
           border: 3px solid red;
-          border-radius: 50%;
+          border-width: 15px;
           opacity: 0;
-          box-shadow: 1px 1px 20px 5px red;
+          box-shadow: 1px 1px 30px 8px red;
+          -webkit-animation: pulseAnim 1.5s ease-out;
           animation: pulseAnim 1.5s ease-out;
+          -webkit-animation-iteration-count: infinite;
           animation-iteration-count: infinite;
         }
 
         .pulse-spread-div {
           position: absolute;
-          top: -3px;
+          top: -7px;
           left: -5px;
           z-index: 1;
-          width: 110px;
-          height: 30px;
+          width: 122px;
+          height: 50px;
           cursor: pointer;
           border: 3px solid red;
           border-width: 15px;
@@ -847,18 +869,19 @@
 
       .xianyang {
         position: absolute;
-        top: -70px;
-        left: -135px;
-        width: 100px;
-        height: 22px;
+        top: -189px;
+        left: -331px;
+        width: 122px;
+        height: 35px;
+        font-size: 21px;
 
         .xianyang-line {
           position: absolute;
           width: 1px;
-          height: 90px;
-          margin-top: 12px;
-          margin-left: 122px;
-          -webkit-transform: rotate(150deg);
+          height: 300px;
+          margin-top: -26px;
+          margin-left: 228px;
+          -webkit-transform: rotate(130deg);
         }
 
         span {
@@ -869,8 +892,8 @@
 
         .pulse-spread-circular {
           position: absolute;
-          top: 80px;
-          left: 122px;
+          top: 200px;
+          left: 337px;
           width: 40px;
           height: 40px;
           border: 3px solid red;
@@ -883,11 +906,11 @@
 
         .pulse-spread-div {
           position: absolute;
-          top: -3px;
+          top: -7px;
           left: -5px;
           z-index: 1;
-          width: 110px;
-          height: 30px;
+          width: 122px;
+          height: 50px;
           cursor: pointer;
           border: 3px solid red;
           border-width: 15px;
@@ -900,33 +923,34 @@
 
       .xidajie {
         position: absolute;
-        top: -11px;
-        left: 90px;
-        width: 100px;
-        height: 22px;
+        top: -31px;
+        left: 316px;
+        width: 153px;
+        height: 35px;
+        font-size: 21px;
 
         .xidajie-line {
           position: absolute;
           width: 1px;
-          height: 90px;
-          margin-top: -14px;
-          margin-left: -40px;
-          -webkit-transform: rotate(75deg);
+          height: 320px;
+          margin-top: -113px;
+          margin-left: -146px;
+          -webkit-transform: rotate(85deg);
         }
 
         span {
           position: absolute;
-          margin-left: 7px;
+          margin-left: 14px;
           cursor: pointer;
         }
 
         .pulse-spread-div {
           position: absolute;
-          top: -3px;
-          left: -5px;
+          top: -17px;
+          left: -32px;
           z-index: 1;
-          width: 110px;
-          height: 30px;
+          width: 214px;
+          height: 65px;
           border: 3px solid red;
           border-width: 15px;
           opacity: 0;
@@ -938,18 +962,19 @@
 
       .xian-bank {
         position: absolute;
-        top: 95px;
-        left: 40px;
-        width: 100px;
-        height: 22px;
+        top: 263px;
+        left: 136px;
+        width: 122px;
+        height: 35px;
+        font-size: 21px;
 
         .xian-bank-line {
           position: absolute;
           width: 1px;
-          height: 90px;
-          margin-top: -70px;
-          margin-left: -15px;
-          -webkit-transform: rotate(160deg);
+          height: 300px;
+          margin-top: -263px;
+          margin-left: -60px;
+          -webkit-transform: rotate(152deg);
         }
 
         span {
@@ -960,11 +985,11 @@
 
         .pulse-spread-div {
           position: absolute;
-          top: -3px;
+          top: -7px;
           left: -5px;
           z-index: 1;
-          width: 110px;
-          height: 30px;
+          width: 122px;
+          height: 50px;
           cursor: pointer;
           border: 3px solid red;
           border-width: 15px;
@@ -977,18 +1002,18 @@
 
       .snxs-bank {
         position: absolute;
-        top: 55px;
-        left: 85px;
-        width: 100px;
-        height: 22px;
-
+        top: 124px;
+        left: 250px;
+        width: 122px;
+        height: 35px;
+        font-size: 21px;
         .snxs-bank-line {
           position: absolute;
           width: 1px;
-          height: 90px;
-          margin-top: -45px;
-          margin-left: -35px;
-          -webkit-transform: rotate(120deg);
+          height: 260px;
+          margin-top: -177px;
+          margin-left: -121px;
+          -webkit-transform: rotate(112deg);
         }
 
         span {
@@ -999,11 +1024,11 @@
 
         .pulse-spread-div {
           position: absolute;
-          top: -3px;
+          top: -7px;
           left: -5px;
           z-index: 1;
-          width: 110px;
-          height: 30px;
+          width: 122px;
+          height: 50px;
           cursor: pointer;
           border: 3px solid red;
           border-width: 15px;
@@ -1017,23 +1042,18 @@
       .jszx-bank {
         position: absolute;
         top: -25px;
-        left: -175px;
-        width: 100px;
-        height: 22px;
-        // top: 87px;
-        // left: -135px;
+        left: -440px;
+        width: 140px;
+        height: 35px;
+        font-size: 21px;
 
         .jszx-bank-line {
           position: absolute;
           width: 1px;
-          // height: 90px;
-          // margin-top: -62px;
-          // margin-left: 120px;
-          // -webkit-transform: rotate(30deg);
-          height: 100px;
-          margin-top: -12px;
-          margin-left: 145px;
-          -webkit-transform: rotate(110deg);
+          height: 320px;
+          margin-top: -112px;
+          margin-left: 283px;
+          -webkit-transform: rotate(95deg);
         }
 
         span {
@@ -1044,11 +1064,11 @@
 
         .pulse-spread-div {
           position: absolute;
-          top: -3px;
+          top: -7px;
           left: -5px;
           z-index: 1;
-          width: 110px;
-          height: 30px;
+          width: 122px;
+          height: 50px;
           cursor: pointer;
           border: 3px solid red;
           border-width: 15px;
@@ -1061,24 +1081,19 @@
 
       .ch-an-bank {
         position: absolute;
-        top: 80px;
-        left: -150px;
-        width: 100px;
-        height: 22px;
-        // top: 40px;
-        // left: -175px;
+        top: 263px;
+        left: -201px;
+        width: 122px;
+        height: 35px;
+        font-size: 21px;
 
         .ch-an-bank-line {
           position: absolute;
           width: 1px;
-          // height: 90px;
-          // margin-top: -40px;
-          // margin-left: 140px;
-          // -webkit-transform: rotate(70deg);
-          height: 100px;
-          margin-top: -67px;
-          margin-left: 131px;
-          -webkit-transform: rotate(40deg);
+          height: 280px;
+          margin-top: -254px;
+          margin-left: 163px;
+          -webkit-transform: rotate(20deg);
         }
 
         span {
@@ -1089,11 +1104,11 @@
 
         .pulse-spread-div {
           position: absolute;
-          top: -3px;
+          top: -7px;
           left: -5px;
           z-index: 1;
-          width: 110px;
-          height: 30px;
+          width: 122px;
+          height: 50px;
           cursor: pointer;
           border: 3px solid red;
           border-width: 15px;
@@ -1106,24 +1121,19 @@
 
       .qn-bank {
         position: absolute;
-        top: 35px;
-        left: -180px;
-        width: 100px;
-        height: 22px;
-        // top: -17px;
-        // left: -190px;
+        top: 124px;
+        left: -426px;
+        width: 122px;
+        height: 35px;
+        font-size: 21px;
 
         .qn-bank-line {
           position: absolute;
           width: 1px;
-          height: 100px;
-          margin-top: -42px;
-          margin-left: 146px;
-          -webkit-transform: rotate(75deg);
-          // height: 110px;
-          // margin-top: -20px;
-          // margin-left: 150px;
-          // -webkit-transform: rotate(105deg);
+          height: 350px;
+          margin-top: -218px;
+          margin-left: 275px;
+          -webkit-transform: rotate(74deg);
         }
 
         span {
@@ -1134,11 +1144,14 @@
 
         .pulse-spread-div {
           position: absolute;
-          top: -3px;
+          top: -7px;
           left: -5px;
           z-index: 1;
-          width: 110px;
-          height: 30px;
+          width: 122px;
+          height: 50px;
+
+
+
           cursor: pointer;
           border: 3px solid red;
           border-width: 15px;
@@ -1229,32 +1242,6 @@
           margin-left: -93px;
         }
       }
-      // .xian {
-      //   position: absolute;
-      //   width: 270px;
-      //   top: 30px;
-      //   left: 5px;
-      //   span {
-      //     position: absolute;
-      //     width: 100px;
-      //     margin-top: 40px;
-      //     margin-left: -85px;
-      //     cursor: pointer;
-      //   }
-      //   .pulse-spread-xian {
-      //     position: absolute;
-      //     top: -25px;
-      //     left: -20px;
-      //     width: 50px;
-      //     height: 50px;
-      //     border: 3px solid red;
-      //     border-radius: 50%;
-      //     opacity: 0;
-      //     box-shadow: 1px 1px 20px 5px red;
-      //     animation: pulseAnim 1.5s ease-out;
-      //     animation-iteration-count: infinite;
-      //   }
-      // }
       .title8 {
         position: absolute;
         right: -5px;
@@ -1280,32 +1267,6 @@
           margin-left: -115px;
         }
       }
-      // .xianyang {
-      //   position: absolute;
-      //   width: 175px;
-      //   right: -8px;
-      //   bottom: -27px;
-      //   span {
-      //     position: absolute;
-      //     width: 70px;
-      //     margin-top: 8px;
-      //     margin-left: -145px;
-      //     cursor: pointer;
-      //   }
-      //   .pulse-spread-xianyang {
-      //     position: absolute;
-      //     right: -20px;
-      //     top: 93px;
-      //     width: 40px;
-      //     height: 40px;
-      //     border: 3px solid red;
-      //     border-radius: 50%;
-      //     opacity: 0;
-      //     box-shadow: 1px 1px 20px 5px red;
-      //     animation: pulseAnim 1.5s ease-out;
-      //     animation-iteration-count: infinite;
-      //   }
-      // }
 
       .pulse-spread-name-xian {
         position: absolute;
@@ -1341,19 +1302,6 @@
         animation-iteration-count: infinite;
       }
 
-      // .xidajie {
-      //   position: absolute;
-      //   width: 270px;
-      //   top: 18px;
-      //   left: 10px;
-      //   span {
-      //     position: absolute;
-      //     margin-top: 7px;
-      //     margin-left: -95px;
-      //     cursor: pointer;
-      //   }
-      // }
-
       .after_circle_center {
         position: absolute;
         width: 20px;
@@ -1454,7 +1402,7 @@
 
         .left-chart-top {
           width: 100%;
-          height: 99%;
+          height:110%;
 
           .left-chart-child-patrol {
             float: left;
@@ -1467,7 +1415,8 @@
           .left-chart-child {
             float: left;
             width: 100%;
-            height: 45%;
+            height: 56%;
+            margin-top: 3px;
             margin-bottom: 2px;
             background: rgba(23, 90, 201, 0.9);
 
@@ -1476,6 +1425,12 @@
               height: 160px !important;
             }
 
+            .left-chart-echars {
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              height: calc(100% - 28px);
+            }
             .child-title {
               height: 50px !important;
               padding: 0 0 5px 10px;
@@ -1489,16 +1444,20 @@
       }
 
       .technology {
+        margin-top: 113px;
+        font-size: 14px;
         .chartBody {
           height: 220px;
 
           .leaderBox {
+            display: flex;
+            width: 100%;
             .leader {
-              // height: 40px;
-              // line-height: 40px;
-              height: 38px;
+              width: 30%;
+              height: 100px;
               margin-bottom: 1px;
               line-height: 38px;
+              text-align: center;
               background: rgba(23, 90, 201, 0.9);
 
               .itemLabel {
@@ -1508,33 +1467,46 @@
               }
 
               .itemValue {
-                text-align: left;
+                display: block;
+                text-align: center;
+                height: 30px;
               }
             }
 
             .secondLine {
-              height: 60px;
-              //line-height: 35px;
+              width: 70%;
+              border-left: 1px solid white;
               margin-bottom: 1px;
-              background: rgba(23, 90, 201, 0.9);
-
+              background: rgba(23,90,201,0.9);
               .itemLabel {
-                display: inline-block;
-                float: left;
-                width: 100px;
+                // display: inline-block;
+                // float: left;
+                display: block;
                 overflow: auto;
-                line-height: 60px;
+                line-height: 40px;
                 text-align: center;
               }
 
               .itemList {
                 float: left;
-                width: calc(100% - 100px);
-                height: 60px;
+                width: calc(100% - 1px);
+                height: 40px;
+                margin-left: 15px;
                 //padding: 5px 0;
                 > div {
-                  height: 30px;
-                  line-height: 30px;
+                  display: flex;
+                  .itemIcon {
+                    height: 73%;
+                    margin-top: 5px;
+                    vertical-align: middle;
+                  }
+                  .itemContent{
+                    width: 22%;
+                    height: 72%;
+                    line-height: 30px;
+                    text-align: center;
+                    vertical-align: middle;
+                  }
                 }
               }
             }
@@ -1543,7 +1515,6 @@
 
         .table-middle {
           height: calc(100% - 4px);
-
           .table-header-row,
           .content {
             height: 31px;
@@ -1616,7 +1587,7 @@
           }
 
           .table-header-split {
-            height: 30px;
+            height: 40px;
             padding: 3px 10px;
             margin-top: 1px;
             color: #fff;
@@ -1692,15 +1663,11 @@
       }
 
       .chartBody {
-        height: 87px;
+        height: 136px;
 
         @media screen and (min-width: 1280px) and (max-width: 1366px) {
           height: 40px;
         }
-
-        @media screen and (min-width: 1680px) and (max-width: 1980px) {
-          height: 123px;
-        }
       }
     }
   }
@@ -2024,9 +1991,9 @@
     cursor: pointer;
     //margin-left: 10px;
     background: url('/src/assets/3dview/maquee.png') no-repeat;
-    background-size: 100% 100%;
+    background-size: 100% 110%;
     flex: 1;
-
+    opacity: 0.8;
     .tops-news-item {
       height: 52px;
       font-size: 15px;

src/styles/view/biz/header.scss

@@ -65,6 +65,7 @@
 
               .nav-menu-item-label {
                 font-size: 18px;
+                font-weight: 500;
                 color: white;
               }
 
@@ -121,8 +122,8 @@
 
     .leftNavs {
       .nav-menu-wrapper {
-        padding-right: 15%;
-        padding-left: 25.5%;
+        padding-right: 10%;
+        padding-left: 28.5%;
 
         .nav-menu-item {
           width: 33.3% !important;
@@ -132,7 +133,7 @@
 
     .rightNavs {
       .nav-menu-wrapper {
-        padding-left: 15%;
+        padding-left: 9%;
       }
     }
 
@@ -143,7 +144,7 @@
       text-align: center;
 
       img {
-        width: 65%;
+        width: 100%;
         vertical-align: middle;
       }
     }

src/view/bank/3dview/alarmMarquee.js

@@ -80,10 +80,10 @@ class AlarmMarquee extends Component {
             direction="left"
             behavior="scroll"
             scrollamount="10px"
-            scrolldelay="0"
+            scrolldelay="120"
             loop="-1"
             width="auto"
-            height="42"
+            height="100"
             bgcolor="transparent"
             hspace="0"
             vspace="0"

src/view/bank/3dview/indexCharts/leftCharts.js

@@ -329,7 +329,7 @@ class LeftCharts extends Component {
     return (
       <div className="equipmentdiv">
         <AmosWebSocket ref={node => (this.aws = node)} url={SysWsURL.dyTopoURI} onMessage={this.handleData} reconnect debug />
-        <div className="quarter-div">
+        <div className="quarter-div top-left">
           <div className="dh-title">清算中心机房</div>
           <div className='dh-content'>
             <div className="dh-icon">
@@ -341,7 +341,7 @@ class LeftCharts extends Component {
             </div>
           </div>
         </div>
-        <div className="quarter-div">
+        <div className="quarter-div top-right">
           <div className="dh-title">设备间</div>
           <div className='dh-content'>
             <div className="dh-icon">
@@ -353,19 +353,19 @@ class LeftCharts extends Component {
             </div>
           </div>
         </div>
-        <div className="quarter-div">
+        <div className="quarter-div down-left">
           <div className="dh-title">货币发行机房</div>
           <div className='dh-content'>
             <div className="dh-icon">
               <img src="/src/assets/indexChart/temperature.png" alt='' className="dh-img" />
             </div>
             <div className="dh-values" >
-              <div className="dh-values-item">1#温度：{wd5.value === undefined ? '0°C' : wd5.value }  </div>
-              <div className="dh-values-item">5#温度：{wd6.value === undefined ? '0°C' : wd6.value }  </div>
+              <div className="dh-values-item">1温度：{wd5.value === undefined ? '0°C' : wd5.value }  </div>
+              <div className="dh-values-item">5温度：{wd6.value === undefined ? '0°C' : wd6.value }  </div>
             </div>
           </div>
         </div>
-        <div className="quarter-div ">
+        <div className="quarter-div">
           <div className="xf-title">消防监测</div>
           <div className="xf-values" >
             <span className="xf-citys">西安：</span><span className={xaxf.value === '正常' ? 'xf-city-values' : 'xf-yc-values'}>{xaxf.value}</span>

src/view/bank/3dview/indexCharts/rightChartChild/middleTable.js

@@ -97,56 +97,40 @@ class MiddleTable extends Component {
           <div className='leaderBox'>
             <div className='leader'>
               <span className='itemLabel'>带班领导</span>
-              <span className='itemValue'>{leader.dutyName || ''}&nbsp;&nbsp;&nbsp;{ leader.mobile || ''}</span>
+              <span className='itemValue'>{leader.dutyName || ''}</span>
+              <span className='itemValue'>{ leader.mobile || ''}</span>
             </div>
             <div className='secondLine'>
               <span className='itemLabel'>二线人员</span>
               <div className='itemList'>
                 { secondTier && secondTier.map(e => {
                   let postName = e.postName.replace('二线', '') + '岗';
-                  return (<div key={e.dutyName + e.phone}>
-                    <img src={ imgs[e.postName] }/><span style={{color:'#05ddf9'}}>{postName}</span>&emsp;&emsp;
-                    {e.dutyName} &emsp; { e.mobile }
-                  </div>)
+                  return (
+                    <div>
+                      <img className='itemIcon' src={imgs[e.postName]} /> <div  className='itemContent' style={{color:'#05ddf9'}}>{postName}</div>
+                      <div className='itemContent' >{e.dutyName}</div>
+                      <div className='itemContent'> { e.mobile }</div>
+                    </div>);
                 }) }
               </div>
             </div>
           </div>
-          {/**<Row className='table-header'>
-            <Col className='table-header-left'>
-              <Row className='table-header-row'>带班领导</Row>
-              <Row className='table-header-row'>{ leader.name || '' }</Row>
-              <Row className='table-header-row'>{ leader.phone || ''}</Row>
-            </Col>
-            <Col className='table-header-right'>
-              <Row className='table-header-row'>
-
-
-              </Row>
-              { second && second.map(e => {
-                return (<Row className='table-header-row' key={e}>
-                          <img src={ imgs[e.post] }/><span style={{color:'#05ddf9'}}>{e.post}</span>&emsp;&emsp;
-                          {e.name} &emsp;&emsp;&emsp; { e.phone }
-                        </Row>)
-              }) }
-            </Col>
-          </Row>*/}
           <Row className='table-header-split'>一线人员</Row>
           <Row className='table-body-cotent firstPeople'>
             <Col className=''>
               <Row className='table-header-row duty-title'>
                 <Col className='leftBtn' span={1}><img className='table-page-img' src="/src/assets/3dview/left.png" onClick={ () => this.leftClick() }/></Col>
-                <Col span={6}>岗位</Col>
+                <Col span={5}>岗位</Col>
                 <Col span={11}>{arrange.startTime} - {arrange.endTime} </Col>
-                <Col span={4}>电话</Col>
+                <Col span={6}>电话</Col>
                 <Col className='rightBtn' span={1}><img className='table-page-img' src="/src/assets/3dview/right.png" onClick={ () => this.rightClick() }/></Col>
               </Row>
               { dataList && dataList.map((d,index) => {
                 return (
                   <Row className='table-header-row content' key={index}>
                     <Col span={6}>{ d.postName }</Col>
-                    <Col span={11}>{ d.dutyName }</Col>
-                    <Col span={4}>{ d.mobile }</Col>
+                    <Col span={8}>{ d.dutyName }</Col>
+                    <Col span={10}>{ d.mobile }</Col>
                   </Row>
                 )
               }) }

src/view/bank/3dview/indexCharts/rightChartChild/topChart.js

@@ -84,8 +84,8 @@ class TopCharts extends Component {
         x: 'left',
         top: '35%',
         left: '10%',
-        itemWidth: 15,
-        itemHeight: 10,
+        itemWidth: 17,
+        itemHeight: 12,
         itemGap: 10,
         data: ['正常', '异常', '漏点', '未计划'],
         formatter: function (name) {
@@ -97,7 +97,7 @@ class TopCharts extends Component {
         },
         textStyle: {
           color: '#ffffff',//字体颜色
-          fontSize: 14
+          fontSize: 16
         }
       },
       color: ['#88FF00', '#FF9100', '#FF0000', '#D8D8D8'],
@@ -121,7 +121,7 @@ class TopCharts extends Component {
                 return view;
               },
               textStyle: {
-                fontSize: 14,
+                fontSize: 16,
                 color: '#D8D8D8'
               },
             },
@@ -162,7 +162,7 @@ class TopCharts extends Component {
         top: 12,
         textStyle: {
           color: "#fff",
-          fontSize: 14
+          fontSize: 16
         },
         itemWidth: 12,
         itemHeight: 10,
@@ -182,7 +182,7 @@ class TopCharts extends Component {
           // rotate: 40,
           textStyle: {
             fontFamily: 'Microsoft YaHei',
-            fontSize: 13
+            fontSize: 14
           }
         }
       },
@@ -309,11 +309,12 @@ class TopCharts extends Component {
         <div className='left-chart-child'>
           <div className='title'>
             <span className='titleLeft'>
-              <span className='titleIcon' style={{ background: 'url("/src/assets/indexChart/point.png") no-repeat center center/100% 100%' }}></span>
+            <span className='titleIcon' style={{ background: 'url("/src/assets/indexChart/point.png") no-repeat center center/100% 100%' }}></span>
                   巡检点状态统计</span>
           </div>
-          <ReactEcharts option={this.getOptions(xun, "")} className='child-pie' />
-
+          <div className='left-chart-echars'>
+            <ReactEcharts option={this.getOptions(xun, "")} className='child-pie' />
+          </div>
         </div>
         <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
         <AmosWebSocket ref={node => this.aws = node} url={planTaskWsURL} onMessage={this.handleData} reconnect debug />

src/view/bank/3dview/indexCharts/rightPane/alarmLineChart.js

@@ -67,10 +67,18 @@ class AlarmLineChart extends Component {
         },
         axisLabel: {
           interval: 0,
-          show: true
+          show: true,
+          textStyle: {
+            color: 'white',
+            fontSize: 13
+          }
         },
         axisLine: {
-          show: false
+          show: false,
+          textStyle: {
+            color: 'white',
+            fontSize: 13
+          }
         },
         axisTick: {
           show: false

src/view/bank/3dview/indexMap.js

@@ -1085,14 +1085,14 @@ class IndexMap extends Component {
               </div>
             </Col>
           </div>*/}
-          <div
+          {/* <div
             className="new_track"
             onClick={() => {
               currentCss === 1 ? this.show2dMap(2) : this.showIndexMap(1);
             }}
           >
             <img src={currentCss === 1 ? newTrackUnSelect : newTrackSelect} />
-          </div>
+          </div> */}
           {/* <div className="middle">
                         <div className={`${fwCss}`} onClick={() => { this.showIndexMap(1) }}>
                             <img src={currentCss === 1 ? fwSelectImg : fwUnSelectImg} />

src/view/bank/dynamicRing/TopologyComponent.js

@@ -127,6 +127,9 @@ class TopologyComponent extends Component {
   }
 
   getNodeDetail = (id) => {
+    this.setState({
+      detailData: []
+    });
     nodeDetailTopoAction(id).then(data => {
       this.setState({
         detailData: data

src/view/common/mainframe/MainFrameView.js

@@ -152,7 +152,7 @@ class MainFrame extends Component {
       <div className="view-port">
         <Header
           navs={extendSystem}
-          logoText={'运维安全预控执行系统'}
+          logoText={'西安CCPC运维安全预控执行系统'}
           onLogoClick={this.onLogoClick}
           onNavItemClick={this.handleMenuClick}
           renderSubmenu={renderSubmenu}