首页修改代码提交

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}