Merge remote-tracking branch 'origin/master'

src/main/resources/static/admin/bigScreen/index.html

@@ -38,6 +38,9 @@
 <!--header-->
 <div class="header">
     <div class="bg_header">
+        <div onclick="fullScreen()">
+            <img class="fullScreen" src="../images/icons8-全屏-50.png">
+        </div>
         <div class="header_nav fl t_title">
             服务平台大数据中心
         </div>
@@ -48,66 +51,6 @@
 <div class="data_content" style="height: 100vh;">
 
     <div class="data_bottom">
-        <!--<div class="bottom_1 fl t_btn5" style="cursor: pointer;">
-            <div class="t_line_box">
-                <i class="t_l_line"></i>
-                <i class="l_t_line"></i>
-            </div>
-            <div class="t_line_box">
-                <i class="t_r_line"></i>
-                <i class="r_t_line"></i>
-            </div>
-            <div class="t_line_box">
-                <i class="l_b_line"></i>
-                <i class="b_l_line"></i>
-            </div>
-            <div class="t_line_box">
-                <i class="r_b_line"></i>
-                <i class="b_r_line"></i>
-            </div>
-            <div class="main_title">
-                <img src="../picture/t_7.png" alt="">
-                农村电商交易概况
-            </div>
-
-            <div class="main_table t_btn8">
-                <img src="../picture/jichuang.jpg">
-                <table>
-                    <thead>
-                    <tr>
-                        <th>设备状态</th>
-                        <th>空闲</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td>设备名称</td>
-                        <td>设备名称</td>
-                    </tr>
-                    <tr>
-                        <td>型号</td>
-                        <td>型号</td>
-                    </tr>
-                    <tr>
-                        <td>主轴转速</td>
-                        <td>12000</td>
-                    </tr>
-                    <tr>
-                        <td>主轴倍率</td>
-                        <td>12000</td>
-                    </tr>
-                    <tr>
-                        <td>进给速度</td>
-                        <td>12000</td>
-                    </tr>
-                    <tr>
-                        <td>进给倍率</td>
-                        <td>12000</td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>-->
     </div>
 
 </div>
@@ -127,7 +70,7 @@
     function init(){
         callAPI();
         // 首次调用函数开始刷新
-        refreshPage();
+        //refreshPage();
     }
     function refreshPage() {
         setTimeout(function() {
@@ -225,7 +168,7 @@
                         // 动态创建链接并跳转
                         const link = document.createElement('a');
                         link.href = '/admin/bigScreenDetail/index.html?id=' + encodeURIComponent(id);
-                        link.target = '_blank'; // 设置链接在新标签页中打开
+                        /*link.target = '_blank'; // 设置链接在新标签页中打开*/
                         document.body.appendChild(link);
                         link.click();
 
@@ -250,7 +193,32 @@
             }
         });
     }
-
+    function fullScreen() {
+        const element = document.documentElement; // 获取整个页面元素
+        if (!document.fullscreenElement) {
+            // 如果当前不是全屏状态，则请求全屏
+            if (element.requestFullscreen) {
+                element.requestFullscreen();
+            } else if (element.webkitRequestFullscreen) {
+                // 兼容性处理，针对某些浏览器
+                element.webkitRequestFullscreen();
+            } else if (element.msRequestFullscreen) {
+                // 兼容性处理，针对IE浏览器
+                element.msRequestFullscreen();
+            }
+        } else {
+            // 如果当前是全屏状态，则退出全屏
+            if (document.exitFullscreen) {
+                document.exitFullscreen();
+            } else if (document.webkitExitFullscreen) {
+                // 兼容性处理，针对某些浏览器
+                document.webkitExitFullscreen();
+            } else if (document.msExitFullscreen) {
+                // 兼容性处理，针对IE浏览器
+                document.msExitFullscreen();
+            }
+        }
+    }
     init();
 
 </script>

src/main/resources/static/admin/bigScreenDetail/css/index.css

@@ -334,4 +334,36 @@ a{
 .t_b_box3{
     top: 84%;
     left: 78%;
-}
+}
+
+.t_header {
+    width: 100%;
+    height: 80px;
+    position: relative;
+}
+
+.background-image {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: url(../img/linx.png) no-repeat;
+    background-size: 100% 100%;
+}
+
+.background-image img {
+    position: absolute;
+    top: 10%;
+    left: 1%;
+    mix-blend-mode: lighten;
+    cursor: pointer;
+}
+
+.fullScreen {
+    position: absolute;
+    top: 17%;
+    left: 5%;
+    mix-blend-mode: lighten;
+    cursor: pointer;
+}

src/main/resources/static/admin/bigScreenDetail/index.html

@@ -15,7 +15,15 @@
 <body>
 <div class="t_container">
     <header class="t_header">
+        <div class="background-image">
+            <a href="../bigScreen/index.html">
+                <img src="img/icons8-左2圈-64.png">
+            </a>
+        </div>
         <span>设备监测平台</span>
+        <div onclick="fullScreen()">
+           <img class="fullScreen" src="../images/icons8-全屏-50.png">
+        </div>
     </header>
     <main class="t_main">
         <div class="t_left_box">
@@ -91,7 +99,7 @@
     function init(){
         callAPI();
         // 首次调用函数开始刷新
-        refreshPage();
+        //refreshPage();
 
 
     }
@@ -115,7 +123,7 @@
                     <div class="t_mbox t_rbox">
                     <i></i>
                                         <span>主程序号</span>
-                                        <h2>${data.mainProg}</h2>
+                                        <h2>${(data.mainProg !== null && data.mainProg !== undefined && data.mainProg !== 'NaN' && data.mainProg !== '') ? data.mainProg : ''}</h2>
                                     </div>
                                     <div class="t_mbox t_gbox">
                                         <i></i>
@@ -206,6 +214,33 @@
             }
         });
     }
+    function fullScreen() {
+        const element = document.documentElement; // 获取整个页面元素
+        if (!document.fullscreenElement) {
+            // 如果当前不是全屏状态，则请求全屏
+            if (element.requestFullscreen) {
+                element.requestFullscreen();
+            } else if (element.webkitRequestFullscreen) {
+                // 兼容性处理，针对某些浏览器
+                element.webkitRequestFullscreen();
+            } else if (element.msRequestFullscreen) {
+                // 兼容性处理，针对IE浏览器
+                element.msRequestFullscreen();
+            }
+        } else {
+            // 如果当前是全屏状态，则退出全屏
+            if (document.exitFullscreen) {
+                document.exitFullscreen();
+            } else if (document.webkitExitFullscreen) {
+                // 兼容性处理，针对某些浏览器
+                document.webkitExitFullscreen();
+            } else if (document.msExitFullscreen) {
+                // 兼容性处理，针对IE浏览器
+                document.msExitFullscreen();
+            }
+        }
+    }
+
     init();
 
     function echart_1() {

src/main/resources/static/admin/css/index.css

@@ -335,7 +335,7 @@
 
 }
 .data_content .data_bottom .bottom_1{
-    width: 19%;
+    width: 24%;
     height: 250px;
     position: relative;
     box-sizing: border-box;
@@ -431,7 +431,7 @@
 }
 .data_content .data_bottom div .main_table td{
     color:#fff;
-    font-size: 10px;
+    font-size: 15px;
     text-align: center;
 }
 .data_content .data_bottom div .main_table tbody tr
@@ -447,4 +447,12 @@
 }
 .table_zdy a{
     color: #fff;
+}
+
+.fullScreen {
+    position: absolute;
+    top: 3%;
+    left: 5%;
+    mix-blend-mode: lighten;
+    cursor: pointer;
 }