周玉环 2 дней назад
Родитель
Сommit
35491fd225

BIN
xinkeaboard-admin/src/assets/bigscreen/screen-bg.png


+ 0 - 1
xinkeaboard-admin/src/pages/statistics/bigscreen/components/WorldMap.js

@@ -57,7 +57,6 @@ class WorldMap extends React.Component {
   initChart() {
     if (!this.chartRef.current) return;
     this.chartInstance = echarts.init(this.chartRef.current);
-    console.log(this.props.data, "--sdsdsd");
     // const seriesData = [
     //   { name: "China", value: [116.4074, 39.9042, 100] },
     //   { name: "United States", value: [-100.0, 40.0, 80] },

+ 18 - 16
xinkeaboard-admin/src/pages/statistics/bigscreen/index.js

@@ -13,7 +13,7 @@ import AddProductTrend from "./components/addProductTrend";
 import SearchRankCloud from "./components/SearchRankCloud";
 import MemberLocation from "./components/MemberLocation";
 import StoreTraffic from "./components/StoreTraffic";
-import MapContainer from "./components/MapContainer"
+import MapContainer from "./components/MapContainer";
 
 @connect(({ bigscreen }) => ({
   bigscreen,
@@ -146,12 +146,14 @@ class BigScreen extends React.Component {
 
     return (
       <div className={styles.screenWrapper}>
-        <button
-          className={styles.fullscreenBtn}
-          onClick={this.toggleFullScreen}
-        >
-          {isFullScreen ? "退出全屏" : "全屏"}
-        </button>
+        {isFullScreen ? null : (
+          <button
+            className={styles.fullscreenBtn}
+            onClick={this.toggleFullScreen}
+          >
+            {"全屏"}
+          </button>
+        )}
         <div className={styles.screenContainer}>
           {/* 顶部 */}
           <div className={styles.headPanel}>
@@ -166,7 +168,7 @@ class BigScreen extends React.Component {
                   width: "932px",
                   height: "560px",
                   marginBottom: "48px",
-                  backgroundImage: `url(${require("../../../assets/bigscreen/box-1.png")})`,
+                  // backgroundImage: `url(${require("../../../assets/bigscreen/box-1.png")})`,
                 }}
               >
                 <PortalTraffic />
@@ -176,7 +178,7 @@ class BigScreen extends React.Component {
                 height="560px"
                 marginBottom="48px"
                 styleObj={{
-                  backgroundImage: `url(${require("../../../assets/bigscreen/box-1.png")})`,
+                  // backgroundImage: `url(${require("../../../assets/bigscreen/box-1.png")})`,
                 }}
               >
                 <Enquire />
@@ -186,7 +188,7 @@ class BigScreen extends React.Component {
                   styleObj={{
                     width: "434px",
                     marginRight: "60px",
-                    backgroundImage: `url(${require("../../../assets/bigscreen/box-2.png")})`,
+                    // backgroundImage: `url(${require("../../../assets/bigscreen/box-2.png")})`,
                   }}
                 >
                   <OverseasEnquireLocation />
@@ -194,7 +196,7 @@ class BigScreen extends React.Component {
                 <PanelBlock
                   styleObj={{
                     width: "434px",
-                    backgroundImage: `url(${require("../../../assets/bigscreen/box-2.png")})`,
+                    // backgroundImage: `url(${require("../../../assets/bigscreen/box-2.png")})`,
                   }}
                 >
                   <DistributorEnquireLocation />
@@ -217,7 +219,7 @@ class BigScreen extends React.Component {
                   width="822px"
                   marginRight="64px"
                   styleObj={{
-                    backgroundImage: `url(${require("../../../assets/bigscreen/box-3.png")})`,
+                    // backgroundImage: `url(${require("../../../assets/bigscreen/box-3.png")})`,
                   }}
                 >
                   <AddMemberTrend />
@@ -225,7 +227,7 @@ class BigScreen extends React.Component {
                 <PanelBlock
                   width="822px"
                   styleObj={{
-                    backgroundImage: `url(${require("../../../assets/bigscreen/box-3.png")})`,
+                    // backgroundImage: `url(${require("../../../assets/bigscreen/box-3.png")})`,
                   }}
                 >
                   <AddProductTrend />
@@ -240,7 +242,7 @@ class BigScreen extends React.Component {
                 width="932px"
                 marginBottom="68px"
                 styleObj={{
-                  backgroundImage: `url(${require("../../../assets/bigscreen/box-4.png")})`,
+                  // backgroundImage: `url(${require("../../../assets/bigscreen/box-4.png")})`,
                 }}
               >
                 <SearchRankCloud />
@@ -249,7 +251,7 @@ class BigScreen extends React.Component {
                 height="864px"
                 width="932px"
                 styleObj={{
-                  backgroundImage: `url(${require("../../../assets/bigscreen/box-4.png")})`,
+                  // backgroundImage: `url(${require("../../../assets/bigscreen/box-4.png")})`,
                 }}
               >
                 <StoreTraffic />
@@ -257,7 +259,7 @@ class BigScreen extends React.Component {
             </div>
 
             <div className={styles.mapContainer}>
-              <MapContainer></MapContainer>
+              <MapContainer />
             </div>
           </div>
         </div>

+ 2 - 1
xinkeaboard-admin/src/pages/statistics/bigscreen/index.less

@@ -8,9 +8,10 @@
   flex-direction: column;
   overflow: hidden;
   position: relative;
-  background: url("../../../assets/bigscreen/screen-bg.jpg") no-repeat center
+  background: url("../../../assets/bigscreen/screen-bg.png") no-repeat center
     center;
   background-size: cover;
+  background-color: #122A52;
 
   .fullscreenBtn {
     position: absolute;

+ 1 - 1
xinkeaboard-admin/src/pages/statistics/bigscreen/styles/overview.less

@@ -53,7 +53,7 @@
 
       .item_label {
         position: absolute;
-        top: 70px;
+        top: 80px;
         font-family: Source Han Sans CN, Source Han Sans CN;
         font-weight: 400;
         font-size: 32px;