liyongli 2 年之前
父節點
當前提交
7ec6ae607b

+ 2 - 2
src/api/bigScreen.js

@@ -26,14 +26,14 @@ export function getMapfull(data) {
 }
 export function getData(data) {
   return Net({
-    url: `${config.localBaseUrl}/cxzx-screen/big-screen/index`,
+    url: `${config.localBaseUrl}/cxzx-screen/big-screen/index/x2`,
     method: "GET",
     data,
   });
 }
 export function getCommonData(data) {
   return Net({
-    url: `${config.localBaseUrl}/cxzx-screen/big-screen/index/x2`,
+    url: `${config.localBaseUrl}/cxzx-screen/big-screen/index`,
     method: "GET",
     data,
   });

+ 10 - 10
src/assets/style/BigScreenHome.css

@@ -1,5 +1,5 @@
 .home {
-  background-image: url("/src/assets/img/bg@3x.jpg");
+  background-image: url('/src/assets/img/bg@3x.jpg');
   background-size: 100% 100%;
   width: 100%;
   height: 100%;
@@ -37,7 +37,7 @@
 }
 
 .home .sz {
-  float: left;
+  position: absolute;
   padding-left: 5em;
 }
 
@@ -57,7 +57,7 @@
   font-size: 18pt;
   color: #ff9900;
   font-weight: 600;
-  font-family: "微软雅黑";
+  font-family: '微软雅黑';
 }
 
 .icons {
@@ -114,7 +114,7 @@
   font-size: 17px;
 }
 .livRang .head::before {
-  content: " ";
+  content: ' ';
   float: left;
   display: block;
   margin-left: -10px;
@@ -208,7 +208,7 @@
 }
 
 .home .TabBtn {
-    flex: 1;
+  flex: 1;
   padding: 5px 0 5px 5px;
   white-space: nowrap;
   /* display: inline-block;
@@ -226,11 +226,11 @@
 }
 
 .tabIcon {
-    width: 100%;
-    vertical-align: middle;
-    margin-right: 3px;
+  width: 100%;
+  vertical-align: middle;
+  margin-right: 3px;
 }
 
-.newMdia{
-    width: 100%;
+.newMdia {
+  width: 100%;
 }

+ 1 - 1
src/assets/style/CommonBigScreenHome.css

@@ -37,7 +37,7 @@
 }
 
 .home .sz {
-  float: left;
+  position: absolute;
   padding-left: 5em;
 }
 

+ 1 - 1
src/pages/CommonBigScreen/Home.jsx

@@ -216,7 +216,7 @@ function BigScreenHome() {
         <div class="home">
             <div class="homeHeader">
                 <div class="sz">
-                    <img style={{ "vertical-align": 'middle', width: '115px' }}
+                    <img style={{ "vertical-align": 'middle', width: '115px', "margin-right": '3px' }}
                         src="https://cxzx.smcic.net/topic/tool/img/jtlogo.png" alt="" />
                     <span style={{ "vertical-align": 'middle' }}>
                         {TimeDate()}

+ 5 - 1
src/pages/CommonBigScreen/components/Map-l7.jsx

@@ -279,13 +279,17 @@ function Map(prop) {
     onMount(() => {
         TrendChart()
     })
+
+    const openBigData = () => {
+        window.open("http://djweb.smcic.net/centerRelay/center.html?"+ Date.now())
+    }
     return (
         <div class="livRang map" style={{
             width: `${prop.width}px`
         }}>
             <div class="head">
                 {prop.title}
-                <div class="btn">大数据平台登录入口</div>
+                <div onClick={openBigData} class="btn">大数据平台登录入口</div>
             </div>
             <div ref={$canvas} style={{
                 width: `${prop.width}px`,

+ 1 - 1
src/pages/CommonBigScreen/components/NewMedia.jsx

@@ -71,7 +71,7 @@ function NewMedia(prop) {
 
     return (
         <div class="livRang newMdia" style={p}>
-            <div class="head">{prop.title}1</div>
+            <div class="head">{prop.title}</div>
             <div style={{ "white-space": "nowrap", "display": "flex" }}>
                 <For each={prop.list}>{(item, i) => <div class="TabBtn">
                     <img onClick={() => imgClick(i())} class="tabIcon" src={getimg(item.name, act() === i())} />

+ 1 - 1
src/pages/bigScreen/Home.jsx

@@ -231,7 +231,7 @@ function BigScreenHome() {
         <div class="home">
             <div class="homeHeader">
                 <div class="sz">
-                    <img style={{ "vertical-align": 'middle', width: '115px' }}
+                    <img style={{ "vertical-align": 'middle', width: '115px', "margin-right": '3px' }}
                         src="https://cxzx.smcic.net/topic/tool/img/jtlogo.png" alt="" />
                     <span style={{ "vertical-align": 'middle' }}>
                         {TimeDate()}

+ 1 - 1
src/pages/bigScreen/components/NewMedia.jsx

@@ -71,7 +71,7 @@ function NewMedia(prop) {
 
     return (
         <div class="livRang newMdia" style={p}>
-            <div class="head">{prop.title}1</div>
+            <div class="head">{prop.title}</div>
             <div style={{ "white-space": "nowrap", "display": "flex" }}>
                 <For each={prop.list}>{(item, i) => <div class="TabBtn">
                     <img onClick={() => imgClick(i())} class="tabIcon" src={getimg(item.name, act() === i())} />