Bladeren bron

门户样式调试·

lixing 2 jaren geleden
bovenliggende
commit
68ca271e96

+ 211 - 206
spring-cloud/server-page/src/main/resources/static/ipad/index.html

@@ -1,83 +1,87 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="utf-8">
-		<title>导览平板</title>
-		<link rel="stylesheet" type="text/css" href="css/index.css"/>
-		<style>
-			.layui-layedit {
-				height: 100%;
-			}
-			.layui-layedit-iframe iframe {
-				height: 100% !important;
-			}
-			.layui-layedit-iframe {
-				height: 72%;
-			}
-			.ifm iframe{
-			  /* pointer-events: none; */
-			}
-			
-		</style>
-	</head>
-	<body>
-		<div class="header">
-			<div class="head_left">
-				<img src="img/header_logo.png" />
-				<i>导&nbsp;览&nbsp;平&nbsp;板&nbsp;-&nbsp;<i class="def_sch">默认方案</i></i>
-			</div>
-			<div class="head_right">
-				<span class="swith" onclick="explainMore(this)" data-sign="allPlan">
+
+<head>
+    <meta charset="utf-8">
+    <title>导览平板</title>
+    <link rel="stylesheet" type="text/css" href="css/index.css" />
+    <style>
+        .layui-layedit {
+            height: 100%;
+        }
+        
+        .layui-layedit-iframe iframe {
+            height: 100% !important;
+        }
+        
+        .layui-layedit-iframe {
+            height: 72%;
+        }
+        
+        .ifm iframe {
+            /* pointer-events: none; */
+        }
+    </style>
+</head>
+
+<body>
+    <div class="header">
+        <div class="head_left">
+            <img src="img/header_logo.png" />
+            <i>导&nbsp;览&nbsp;平&nbsp;板&nbsp;-&nbsp;<i class="def_sch">默认方案</i></i>
+        </div>
+        <div class="head_right">
+            <span class="swith" onclick="explainMore(this)" data-sign="allPlan">
 					切换方案
 				</span>
-				<button id="mainBack" type="button">退出</button>
-			</div>
-		</div>
-		<div class="main">
-			<div class="mian_cont">
-				<!-- 收头tab -->
-				<div class="tab_header">
-					<img src="img/bottom.png" style="width: 18px;"/>
-				</div>
-				<!-- 展开头 -->
-				<div class="tab_header2">
-					<img src="img/top.png" style="width: 18px;"/>
-				</div>
-				<!-- 收左 -->
-				<div class="lr_sh">
-					<img src="img/top.png" style="width: 70%;transform: rotate(90deg);" />
-				</div>
-				<div class="mian_left">
-					<div class="tab">
-						<ul id="areaTabs" class="tabs">
-							<!-- <li class="tab_item tab_iac">页面一</li>
+            <button id="mainBack" type="button">退出</button>
+        </div>
+    </div>
+    <div class="main">
+        <div class="mian_cont">
+            <!-- 收头tab -->
+            <div class="tab_header">
+                <img src="img/bottom.png" style="width: 18px;" />
+            </div>
+            <!-- 展开头 -->
+            <div class="tab_header2">
+                <img src="img/top.png" style="width: 18px;" />
+            </div>
+            <!-- 收左 -->
+            <div class="lr_sh">
+                <img src="img/top.png" style="width: 70%;transform: rotate(90deg);" />
+            </div>
+            <div class="mian_left">
+                <div class="tab">
+                    <ul id="areaTabs" class="tabs">
+                        <!-- <li class="tab_item tab_iac">页面一</li>
 							<li class="tab_item">页面二</li>
 							<li class="tab_item">页面三</li>
 							<li class="tab_item">页面四</li> -->
-						</ul>
-					</div>
-					<div class="ifm">
-						<div class="cur_title">
-							<div class="left_block">
-								<i></i>
-								<i></i>
-							</div>
-							<div class="title">
-								当前画面
-							</div>
-							<div class="right_block">
-								<i></i>
-								<i></i>
-							</div>
-							<div class="tools">
-								<span onclick="saveAsPlan()">另存</span>
-								<span onclick="savePlan()">保存</span>
-								<span onclick="explainMore(this)" data-sign="plan">更多</span>
-								<span onclick="window.location.reload();">刷新</span>
-							</div>
-						</div>
-						<iframe id="mainIframe" src="https://baijiahao.baidu.com/s?id=1727916354464598031"></iframe>
-						<!-- <div class="frame_box">
+                    </ul>
+                </div>
+                <div class="ifm">
+                    <div class="cur_title">
+                        <div class="left_block">
+                            <i></i>
+                            <i></i>
+                        </div>
+                        <div class="title">
+                            当前画面
+                        </div>
+                        <div class="right_block">
+                            <i></i>
+                            <i></i>
+                        </div>
+                        <div class="tools">
+                            <span onclick="saveAsPlan()">另存</span>
+                            <span onclick="savePlan()">保存</span>
+                            <span onclick="explainMore(this)" data-sign="plan">更多</span>
+                            <span onclick="window.location.reload();">刷新</span>
+                        </div>
+                    </div>
+                    <iframe id="mainIframe" src="https://baijiahao.baidu.com/s?id=1727916354464598031"></iframe>
+                    <!-- <div class="frame_box">
 							<div class="frame1">
 								<div class="f1_sf" data-bs="1">
 									<img src="img/big_sf.png" />
@@ -91,114 +95,114 @@
 								<iframe id="mainIframe" src="https://baijiahao.baidu.com/s?id=1727916354464598031"></iframe>
 							</div>
 						</div> -->
-					</div>
-					<div class="bot_long">
-						<img src="img/top.png" class="bottom" style="width: 40%;" />
-					</div>
-					<div class="foot_block" style="display: none;">
-						<div class="foot_sig">
-							<div class="cur_title">
-								<div class="left_block">
-									<i></i>
-									<i></i>
-								</div>
-								<div class="title">
-									可切换信号源
-								</div>
-								<div class="right_block">
-									<i></i>
-									<i></i>
-								</div>
-								<div class="tools">
-									<span onclick="signMore()">更多</span>
-									<img src="img/top.png" class="bottom" style="width: 18px;display: none;" />
-								</div>
-							</div>
-							<ul id="signalList" class="sig_list">
-								<!-- <li class="sig_item">
+                </div>
+                <div class="bot_long">
+                    <img src="img/top.png" class="bottom" style="width: 40%;" />
+                </div>
+                <div class="foot_block" style="display: none;">
+                    <div class="foot_sig">
+                        <div class="cur_title">
+                            <div class="left_block">
+                                <i></i>
+                                <i></i>
+                            </div>
+                            <div class="title">
+                                可切换信号源
+                            </div>
+                            <div class="right_block">
+                                <i></i>
+                                <i></i>
+                            </div>
+                            <div class="tools">
+                                <span onclick="signMore()">更多</span>
+                                <img src="img/top.png" class="bottom" style="width: 18px;display: none;" />
+                            </div>
+                        </div>
+                        <ul id="signalList" class="sig_list">
+                            <!-- <li class="sig_item">
 									<img src="img/sig1.png" />
 									<div class="sig_title">
 										一键联动
 									</div>
 								</li> -->
-							</ul>
-						</div>
-						<div class="foot_words">
-							<div class="cur_title">
-								<div class="left_block">
-									<i></i>
-									<i></i>
-								</div>
-								<div class="title">
-									讲解词
-								</div>
-								<div class="right_block">
-									<i></i>
-									<i></i>
-								</div>
-								<div class="tools">
-									<span onclick="explainWhole(this)">全部</span>
-									<span onclick="explainMore(this)" data-sign="explain">更多</span>
-									<!-- <img src="img/top.png" class="bottom" style="width: 18px;display: none;" /> -->
-								</div>
-							</div>
-							<div id="explainPart" class="cont_text">
-								<textarea id="explain" style="display: none;"></textarea>
-							</div>
-							<div id="explainWhole" class="cont_text" style="height: 95%;overflow-y: auto;display: none;">
-								
-							</div>
-						</div>
-					</div>
-					<div class="top" style="display: flex;">
-						<img src="img/bottom.png" style="width: 40%;" />
-					</div>
-				</div>
-				<div class="main_right" style="display: none;">
-					<div class="main_tab">
-						<!-- <div class="sys_tab main_tab_act">
+                        </ul>
+                    </div>
+                    <div class="foot_words">
+                        <div class="cur_title">
+                            <div class="left_block">
+                                <i></i>
+                                <i></i>
+                            </div>
+                            <div class="title">
+                                讲解词
+                            </div>
+                            <div class="right_block">
+                                <i></i>
+                                <i></i>
+                            </div>
+                            <div class="tools">
+                                <span onclick="explainWhole(this)">全部</span>
+                                <span onclick="explainMore(this)" data-sign="explain">更多</span>
+                                <!-- <img src="img/top.png" class="bottom" style="width: 18px;display: none;" /> -->
+                            </div>
+                        </div>
+                        <div id="explainPart" class="cont_text">
+                            <textarea id="explain" style="display: none;"></textarea>
+                        </div>
+                        <div id="explainWhole" class="cont_text" style="height: 95%;overflow-y: auto;display: none;">
+
+                        </div>
+                    </div>
+                </div>
+                <div class="top" style="display: flex;">
+                    <img src="img/bottom.png" style="width: 40%;" />
+                </div>
+            </div>
+            <div class="main_right" style="display: none;">
+                <div class="main_tab">
+                    <!-- <div class="sys_tab main_tab_act">
 							系统操作
 						</div> -->
-						<div class="set_tab main_tab_act">
-							大厅设置
-						</div>
-						<div class="sys_tab" style="width: 45%;"></div>
-					</div>
-					<!-- 流程 -->
-					<div class="flow_con">
-						<div class="flow_title">
-							<img src="img/lckz.png" />
-							<span>设备控制</span>
-						</div>
-						<div id="deviceBtns" class="buts">
-							<!-- <button type="button">上一页</button>
+                    <div class="set_tab main_tab_act">
+                        大厅设置
+                    </div>
+                    <div class="sys_tab" style="width: 45%;"></div>
+                </div>
+                <!-- 流程 -->
+                <div class="flow_con">
+                    <div class="flow_title">
+                        <img src="img/lckz.png" />
+                        <span>设备控制</span>
+                    </div>
+                    <div id="deviceBtns" class="buts">
+                        <!-- <button type="button">上一页</button>
 							<button type="button">下一页</button>
 							<button type="button">播放视频</button>
 							<button type="button">结束视频</button>
 							<button type="button">自动讲解</button>
 							<button type="button">停止讲解</button> -->
-						</div>
-					</div>
-					<div class="flow_con">
-						<div class="flow_title">
-							<img src="img/lckz.png" />
-							<span>讲解词播报</span>
-						</div>
-						<div id="explainBtns" class="buts">
-							<div class="layui-form" lay-filter="explainForm" style="width: 100%;">
-								<div class="layui-form-item">
-									<input type="radio" name="type" lay-filter="captionPlayType" value="1" title="当前" checked="">
-									<input type="radio" name="type" lay-filter="captionPlayType" value="2" title="全部">
-								</div>
-							</div>
-							<button type="button" style="width: 30%;" data-type="1">播报</button>
-							<button class="btn-color-disable" type="button" style="width: 30%;" data-type="2">停止</button>
-							<button class="btn-color-disable" type="button" style="width: 30%;" data-type="3">暂停</button>
-							<!--<div id="volume" style="width:100%"></div>-->
-						</div>
-					</div>
-					<!-- 页面操作 -->
-					<!-- <div class="page_oper">
+                    </div>
+                </div>
+                <div class="flow_con">
+                    <div class="flow_title">
+                        <img src="img/lckz.png" />
+                        <span>讲解词播报</span>
+                    </div>
+                    <div id="explainBtns" class="buts">
+                        <div class="layui-form" lay-filter="explainForm" style="width: 100%;">
+                            <div class="layui-form-item">
+                                <input type="radio" name="type" lay-filter="captionPlayType" value="1" title="当前" checked="">
+                                <input type="radio" name="type" lay-filter="captionPlayType" value="2" title="全部">
+                            </div>
+                        </div>
+                        <button type="button" style="width: 30%;" data-type="1">播报</button>
+                        <button class="btn-color-disable" type="button" style="width: 30%;" data-type="2">停止</button>
+                        <button class="btn-color-disable" type="button" style="width: 30%;" data-type="3">暂停</button>
+                        <!--<div id="volume" style="width:100%"></div>-->
+                    </div>
+                </div>
+                <!-- 页面操作 -->
+                <!-- <div class="page_oper">
 						<div class="page_title">
 							<img src="img/ymcz.png" />
 							<span>页面操作</span>
@@ -210,49 +214,50 @@
 							<button type="button">关闭页面</button>
 						</div>
 					</div> -->
-				</div>
-			</div>
-		</div>
-		<div id="schList" class="sch_box" style="display: none;">
-			<!-- <div class="sch_title">
+            </div>
+        </div>
+    </div>
+    <div id="schList" class="sch_box" style="display: none;">
+        <!-- <div class="sch_title">
 				方案选择
 			</div> -->
-			<ul class="sch_list">
-				<li class="sch_item"></li>
-				<li class="sch_item"></li>
-				<li class="sch_item"></li>
-				<li class="sch_item"></li>
-				<li class="sch_item"></li>
-				<li class="sch_item"></li>
-			</ul>
-		</div>
-		<div id="sigList2" class="sch_box" style="display: none;">
-			<!-- <div class="sch_title">
+        <ul class="sch_list">
+            <li class="sch_item"></li>
+            <li class="sch_item"></li>
+            <li class="sch_item"></li>
+            <li class="sch_item"></li>
+            <li class="sch_item"></li>
+            <li class="sch_item"></li>
+        </ul>
+    </div>
+    <div id="sigList2" class="sch_box" style="display: none;">
+        <!-- <div class="sch_title">
 				信号源选择
 			</div> -->
-			<ul class="sig_list2">
-				<!-- <li class="sig_item2">
+        <ul class="sig_list2">
+            <!-- <li class="sig_item2">
 					<img src="img/sig1.png" />
 					<div class="sig_title">
 						一键联动
 					</div>
 				</li> -->
-			</ul>
-		</div>
-		<div id="planPop" class="layui-form layui-hide">
-			<div class="layui-form-item" style="padding: 15px;">
-			    <!-- <label class="layui-form-label">方案:</label> -->
-			    <div class="layui-input-block">
-			      <input type="text" id="planName" autocomplete="off" placeholder="请输入方案名称" class="layui-input">
-			    </div>
-			    <div class="layui-input-block" style="margin-top: 20px;">
-			      <button onclick="planPopSub()" type="button" class="layui-btn layui-btn-normal">确定</button>
-			      <button onclick="planPopBack()" type="button" class="layui-btn layui-btn-primary">取消</button>
-			    </div>
-			</div>
-		</div>
-		<script type="text/javascript" src="js/websocket.js"></script>
-		<script type="text/javascript" src="js/util.min.js"></script>
-		<script src="js/basic/index.js" type="text/javascript" charset="utf-8"></script>
-	</body>
-</html>
+        </ul>
+    </div>
+    <div id="planPop" class="layui-form layui-hide">
+        <div class="layui-form-item" style="padding: 15px;">
+            <!-- <label class="layui-form-label">方案:</label> -->
+            <div class="layui-input-block">
+                <input type="text" id="planName" autocomplete="off" placeholder="请输入方案名称" class="layui-input">
+            </div>
+            <div class="layui-input-block" style="margin-top: 20px;">
+                <button onclick="planPopSub()" type="button" class="layui-btn layui-btn-normal">确定</button>
+                <button onclick="planPopBack()" type="button" class="layui-btn layui-btn-primary">取消</button>
+            </div>
+        </div>
+    </div>
+    <script type="text/javascript" src="js/websocket.js"></script>
+    <script type="text/javascript" src="js/util.min.js"></script>
+    <script src="js/basic/index.js" type="text/javascript" charset="utf-8"></script>
+</body>
+
+</html>

+ 8 - 8
spring-cloud/server-page/src/main/resources/static/ipad/js/constant.js

@@ -1,10 +1,10 @@
-var FLAT_PATH = 'http://23.37.100.80:8084/';
+var FLAT_PATH = 'http://23.37.100.87:8084/';
 var FLAT_PATH_BASIC = FLAT_PATH + 'basic/';
 var FLAT_PATH_THREE = FLAT_PATH + 'threeapi/';
-var FLAT_PATH_IMG = 'http://23.37.100.80:8085';
-var XN_PATH = 'http://23.37.100.80:8092/';
-var WS_PATH = 'ws://23.37.100.80:8087';
-var YK_PATH = 'http://23.37.100.80:${port}/vnc.html';
+var FLAT_PATH_IMG = 'http://23.37.100.87:8085';
+var XN_PATH = 'http://23.37.100.87:8092/';
+var WS_PATH = 'ws://23.37.100.87:8087';
+var YK_PATH = 'http://23.37.100.87:${port}/vnc.html';
 
 var DEVICE_GROUP = {
 	dpq: {
@@ -31,11 +31,11 @@ var DEVICE_GROUP = {
 
 var DEVICE_CODE_GROUP = ['mtq', 'hpq', 'dpq', 'xcqn', 'xcqw', 'dpzhd'];
 
-var DPZHD_VNC_HOST = "23.37.100.80";
+var DPZHD_VNC_HOST = "23.37.100.87";
 var DPZHD_PATH = 'http://' + DPZHD_VNC_HOST + ':8123/';
 var DPZHD_VNC_PATH = 'http://' + DPZHD_VNC_HOST + ':29050/vnc.html';
-var KJY_PATH = "http://23.37.100.80/dldp2/index.html";
+var KJY_PATH = "http://23.37.100.87/dldp2/index.html";
 
 
 var OLD_YK_URL_HOST = "23.37.100.87";
-var NEW_YK_URL_HOST = "23.37.100.80";
+var NEW_YK_URL_HOST = "23.37.100.87";

+ 207 - 203
spring-cloud/server-page/src/main/resources/static/ipad/login.html

@@ -1,210 +1,214 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
-	<meta charset="UTF-8">
-	<title>重庆市城市管理局-导览平板</title>
-	<link rel="stylesheet" type="text/css" href="font/iconfont.css"/>
-	<!-- <link rel="stylesheet" type="text/css" href="./css/main.css"/> -->
-	<style>
-		*{
-			margin: 0;
-			padding: 0;
-		}
-		html,body{
-			height: 100%;
-		}
-		
-		@font-face {
-			font-family: jiangxizhuokai;
-			src: url(./font/jiangxi.TTF)
-		}
-		
-		body{
-			background:linear-gradient(to right,#0BC8FF, #3556FF);
-			position: relative;
-		}
-		
-		.login-form{
-			position: absolute;
-		/* 	border: 1px solid red; */
-			width: 976px;
-			height: 530px;
-			margin: auto;
-			top: 0;
-			bottom: 0;
-			right: 0;
-			left: 0;
-			text-align: center;
-		}
-		
-		.login-title{
-			margin-bottom: 50px;
-			font-family: jiangxizhuokai;
-		}
-		
-		
-		.login-title p{
-			background: linear-gradient(to bottom, #ffffff, #0AC6FF);
-			-webkit-background-clip: text;
-			color: transparent;
-			-webkit-text-fill-color: transparent;
-			text-fill-color: transparent;
-			border: none;
-			font-size: 53px;
-			font-weight: bold;
-			font-family: jiangxizhuokai;
-			
-		}
-		
-		.login-con{
-			background-image: url(images/login-con.png);
-			background-size: 100% 100%;
-			height: 366px;
-			position: relative;
-		}
-		
-		.login-formCon{
-			height: 100%;
-			width: 453px;
-			position: absolute;
-			/* border: 1px solid red; */
-			margin: auto;
-			top: 0;
-			bottom: 0;
-			right: 0;
-			left: 0;
-			text-align: center;
-			background-image: url(images/login-form.png);
-			background-size: 100% 100%;
-			padding: 70px 50px;
-			box-sizing: border-box;
-		}
-		
-		.login-formCon div{
-			position: relative;
-		}
-		.login-formCon span{
-			position: absolute;
-			background: linear-gradient(to bottom, #75D75F, #35BDE8);
-			-webkit-background-clip: text;
-			color: transparent;
-			-webkit-text-fill-color: transparent;
-			text-fill-color: transparent;
-			font-size: 28px;
-			line-height: 32px;
-			    padding: 0 10px;
-			    border-right: 2px solid #7DA0B6;
-			    margin-top: 10px;
-		}
-		.login-formCon .icon-mima{
-			font-size: 34px;
-			padding:0 7px;
-		}
-		
-		.login-formCon input{
-			margin-bottom: 25px;
-			width: 100%;
-			border: none;
-			box-shadow:  1px 1px 1px #35BDE8;
-			height: 50px;
-			border: 1px solid #35BDE8;
-			border-radius: 4px;
-			text-align: center;
-			color: #708c94;
-			outline: none;
-			font-size: 18px;
-		}
-		
-		input::-webkit-input-placeholder { 
-		/* WebKit browsers */ 
-		color: #708c94; 
-		} 
-		input:-moz-placeholder { 
-		/* Mozilla Firefox 4 to 18 */ 
-		color: #708c94; 
-		} 
-		input::-moz-placeholder { 
-		/* Mozilla Firefox 19+ */ 
-		color: #708c94; 
-		} 
-		input:-ms-input-placeholder { 
-		/* Internet Explorer 10+ */ 
-		color: #708c94; 
-		}
-	
-		
-		
-		.login-btn{
-			background-image: url(images/login-btn.png);
-			width: 100%;
-			margin: 0 auto;
-			background-size: 100% 100%;
-			height: 90px;
-			line-height: 86px;
-			color: #fff;
-			letter-spacing: 3px;
-			margin-top:24px;
-		}
-		
-		.login-btn button {
-			width: 100%;
-			    height: 90px;
-			    background-color: transparent;
-			    outline: none;
-			    border: none;
-			    color: #fff;
-			    font-size: 18px;
-			    letter-spacing: 3px;
-				cursor: pointer;
-		}
-		
-		
-	</style>
+    <meta charset="UTF-8">
+    <title>重庆市城市管理局-导览平板</title>
+    <link rel="stylesheet" type="text/css" href="font/iconfont.css" />
+    <!-- <link rel="stylesheet" type="text/css" href="./css/main.css"/> -->
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+        }
+        
+        html,
+        body {
+            height: 100%;
+        }
+        
+        @font-face {
+            font-family: jiangxizhuokai;
+            src: url(./font/jiangxi.TTF)
+        }
+        
+        body {
+            background: linear-gradient(to right, #0BC8FF, #3556FF);
+            position: relative;
+        }
+        
+        .login-form {
+            position: absolute;
+            /* 	border: 1px solid red; */
+            width: 976px;
+            height: 530px;
+            margin: auto;
+            top: 0;
+            bottom: 0;
+            right: 0;
+            left: 0;
+            text-align: center;
+        }
+        
+        .login-title {
+            margin-bottom: 50px;
+            font-family: jiangxizhuokai;
+        }
+        
+        .login-title p {
+            background: linear-gradient(to bottom, #ffffff, #0AC6FF);
+            -webkit-background-clip: text;
+            color: transparent;
+            -webkit-text-fill-color: transparent;
+            text-fill-color: transparent;
+            border: none;
+            font-size: 53px;
+            font-weight: bold;
+            font-family: jiangxizhuokai;
+        }
+        
+        .login-con {
+            background-image: url(images/login-con.png);
+            background-size: 100% 100%;
+            height: 366px;
+            position: relative;
+        }
+        
+        .login-formCon {
+            height: 100%;
+            width: 453px;
+            position: absolute;
+            /* border: 1px solid red; */
+            margin: auto;
+            top: 0;
+            bottom: 0;
+            right: 0;
+            left: 0;
+            text-align: center;
+            background-image: url(images/login-form.png);
+            background-size: 100% 100%;
+            padding: 70px 50px;
+            box-sizing: border-box;
+        }
+        
+        .login-formCon div {
+            position: relative;
+        }
+        
+        .login-formCon span {
+            position: absolute;
+            background: linear-gradient(to bottom, #75D75F, #35BDE8);
+            -webkit-background-clip: text;
+            color: transparent;
+            -webkit-text-fill-color: transparent;
+            text-fill-color: transparent;
+            font-size: 28px;
+            line-height: 32px;
+            padding: 0 10px;
+            border-right: 2px solid #7DA0B6;
+            margin-top: 10px;
+        }
+        
+        .login-formCon .icon-mima {
+            font-size: 34px;
+            padding: 0 7px;
+        }
+        
+        .login-formCon input {
+            margin-bottom: 25px;
+            width: 100%;
+            border: none;
+            box-shadow: 1px 1px 1px #35BDE8;
+            height: 50px;
+            border: 1px solid #35BDE8;
+            border-radius: 4px;
+            text-align: center;
+            color: #708c94;
+            outline: none;
+            font-size: 18px;
+        }
+        
+        input::-webkit-input-placeholder {
+            /* WebKit browsers */
+            color: #708c94;
+        }
+        
+        input:-moz-placeholder {
+            /* Mozilla Firefox 4 to 18 */
+            color: #708c94;
+        }
+        
+        input::-moz-placeholder {
+            /* Mozilla Firefox 19+ */
+            color: #708c94;
+        }
+        
+        input:-ms-input-placeholder {
+            /* Internet Explorer 10+ */
+            color: #708c94;
+        }
+        
+        .login-btn {
+            background-image: url(images/login-btn.png);
+            width: 100%;
+            margin: 0 auto;
+            background-size: 100% 100%;
+            height: 90px;
+            line-height: 86px;
+            color: #fff;
+            letter-spacing: 3px;
+            margin-top: 24px;
+        }
+        
+        .login-btn button {
+            width: 100%;
+            height: 90px;
+            background-color: transparent;
+            outline: none;
+            border: none;
+            color: #fff;
+            font-size: 18px;
+            letter-spacing: 3px;
+            cursor: pointer;
+        }
+    </style>
 </head>
+
 <body id="mydiv">
-	<!-- 背景div -->
-	<div class="login-form">
-		<div class="login-title">
-			<p>导览平板</p>
-		</div>
-		<div class="login-con">
-			<div class="login-formCon">
-				<div>
-					<span class="iconfont icon-yonghu"></span>
-					<input placeholder="请输入账号" type="text" name="" id="loginAccount" value=""/>
-				</div>
-				<div>
-					<span class="iconfont icon-mima"></span>
-					<input placeholder="请输入密码" type="password" name="" id="password" value=""/>
-				</div>
-				<div class="login-btn">
-					<button type="button" id="subLogin">登 录</button>
-				</div>
-			</div>
-		</div>
-	</div>
-	<script type="text/javascript">
-		window.onload = function() {
-		    //配置
-		    var config = {
-		        vx: 4,	//小球x轴速度,正为右,负为左
-		        vy: 4,	//小球y轴速度
-		        height: 2,	//小球高宽,其实为正方形,所以不宜太大
-		        width: 2,
-		        count: 200,		//点个数
-		        color: "121, 162, 185", 	//点颜色
-		        stroke: "130,255,255", 		//线条颜色
-		        dist: 6000, 	//点吸附距离
-		        e_dist: 20000, 	//鼠标吸附加速距离
-		        max_conn: 10 	//点到点最大连接数
-		    }
+    <!-- 背景div -->
+    <div class="login-form">
+        <div class="login-title">
+            <p>导览平板</p>
+        </div>
+        <div class="login-con">
+            <div class="login-formCon">
+                <div>
+                    <span class="iconfont icon-yonghu"></span>
+                    <input placeholder="请输入账号" type="text" name="" id="loginAccount" value="" />
+                </div>
+                <div>
+                    <span class="iconfont icon-mima"></span>
+                    <input placeholder="请输入密码" type="password" name="" id="password" value="" />
+                </div>
+                <div class="login-btn">
+                    <button type="button" id="subLogin">登 录</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/javascript">
+        window.onload = function() {
+            //配置
+            var config = {
+                vx: 4, //小球x轴速度,正为右,负为左
+                vy: 4, //小球y轴速度
+                height: 2, //小球高宽,其实为正方形,所以不宜太大
+                width: 2,
+                count: 200, //点个数
+                color: "121, 162, 185", //点颜色
+                stroke: "130,255,255", //线条颜色
+                dist: 6000, //点吸附距离
+                e_dist: 20000, //鼠标吸附加速距离
+                max_conn: 10 //点到点最大连接数
+            }
 
-		    //调用
-		    CanvasParticle(config);
-		}
-	</script>
-	<script type="text/javascript" src="lib/canvas-particle.js"></script>
-	<script type="text/javascript" src="js/util.min.js"></script>
-	<script type="text/javascript" src="js/basic/login.js"></script>
+            //调用
+            CanvasParticle(config);
+        }
+    </script>
+    <script type="text/javascript" src="lib/canvas-particle.js"></script>
+    <script type="text/javascript" src="js/util.min.js"></script>
+    <script type="text/javascript" src="js/basic/login.js"></script>
 </body>
-</html>
+
+</html>

+ 318 - 321
spring-cloud/server-page/src/main/resources/static/jjy/mainLight.html

@@ -1,340 +1,337 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="utf-8" name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-		<title></title>
-		<link rel="stylesheet" type="text/css" href="./font/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="css/main.css" />
-		<link rel="stylesheet" type="text/css" href="css/mainLight.css"/>
-	</head>
-	<body>
-		<div class="main-body">
-			<div class="header">
-				<div>重庆市城市管理局指挥大厅综合管理平台</div>
-				<div class="userinfo">
-					<span>用户名名称</span><span>|</span><span class="iconfont icon-tuichu"></span><span>退出</span>
-				</div>
-			</div>
-			<div class="content iframe-body-sty">
-				<iframe id="iframe-shrink" src="http://192.168.1.5:8080/db/4" width="100%" height="100%"></iframe>
-				<div class="tabbar">
-					<ul>
-						<li class="tabbarActive mtq" data-type="mtq"><span>门厅区</span></li>
-						<li class="hpq" data-type="hpq"><span>弧屏区</span></li>
-						<li class="xcq" data-type="xcq"><span>宣传墙</span></li>
-						<li class="dpq" data-type="dpq"><span>大屏区</span></li>
-					</ul>
-				</div>
-			</div>
-			<div class="footer">
-				<div class="signal-source">
-					<div class="footer-title">
-						<span>可切换信号源</span>
-					</div>
-					<div class="footer-cont">
-						<div class="signal-type">
-							贯彻执行国家有关市政公用设施运行管理、市容环境卫生管理、城市供水节水管理、园 林绿化管理、城市管理执法等城市管理的法律、法规、规章和方针政策会同有关部门研究起
-							草城市管理方面的地方性法规、规章和有关政策并组织实施;统筹城市管理领域重大事项, 负责拟订城市管理发展战略、规划、计划并组织实施。 负责城市管理行业规范、技术标准体系建设;负责市直管城市管理基础设施维护工程技
-							术方案的审查;负责城市管理工作的组织协调、监督检查和考核评价。
-						</div>
-						<div class="signal-type">
-							贯彻执行国家有关市政公用设施运行管理、市容环境卫生管理、城市供水节水管理、园 林绿化管理、城市管理执法等城市管理的法律、法规、规章和方针政策会同有关部门研究起
-							草城市管理方面的地方性法规、规章和有关政策并组织实施;统筹城市管理领域重大事项, 负责拟订城市管理发展战略、规划、计划并组织实施。 负责城市管理行业规范、技术标准体系建设;负责市直管城市管理基础设施维护工程技
-							术方案的审查;负责城市管理工作的组织协调、监督检查和考核评价。
-						</div>
-					</div>
-				</div>
-				<div class="commentary">
-					<div class="footer-title">
-						<span>讲解词</span>
-					</div>
-					<div class="footer-cont">
-						<div>
-							贯彻执行国家有关市政公用设施运行管理、市容环境卫生管理、城市供水节水管理、园 林绿化管理、城市管理执法等城市管理的法律、法规、规章和方针政策会同有关部门研究起
-							草城市管理方面的地方性法规、规章和有关政策并组织实施;统筹城市管理领域重大事项, 负责拟订城市管理发展战略、规划、计划并组织实施。 负责城市管理行业规范、技术标准体系建设;负责市直管城市管理基础设施维护工程技
-							术方案的审查;负责城市管理工作的组织协调、监督检查和考核评价。
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
 
-		<!-- 侧边栏 -->
-		<div id="jzmap-hidden-div-xstable">
-			<a class="jzmap-hidden-div-yctable-a">
-				<i class="jzmap-hidden-div-yctable-i"></i>
-			</a>
-		</div>
-		<div id="jzmap-hidden-div">
-			<div id="jzmap-hidden-div-yctable">
-				<a class="jzmap-hidden-div-yctable-a">
-					<i class="jzmap-hidden-div-yctable-i" style="background-image:url(./images/triLight-icon.png);"></i>
-				</a>
-			</div>
-			<div id="jzmap-hidden-div-head">
-				<div class="menu-listTit">
-					<span>可控设备操作区域</span>
-				</div>
-				<div class="sliderList active mtq">
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-shexiangji"></span><span>状态:</span><span class="greenCo">开启</span></div>
-							<div class="setBtn" index="0" onclick="input(this)">设置</div>
-						</div>
-						<div class="itemList">
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">开启视频同步录像</label>
-							</div>
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">关闭视频同步录像</label></div>
-						</div>
+<head>
+    <meta charset="utf-8" name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <title></title>
+    <link rel="stylesheet" type="text/css" href="./font/iconfont.css" />
+    <link rel="stylesheet" type="text/css" href="css/main.css" />
+    <link rel="stylesheet" type="text/css" href="css/mainLight.css" />
+</head>
 
-					</div>
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-shengyin"></span><span>扬声器:</span><span class="greenCo">44%</span></div>
-							<div class="setBtn" index="1" onclick="input(this)">设置</div>
-						</div>
-						<div class="itemList">
-							<div class="watermarkOpacity_div">
-								<div class="proNum">
-									<input class="col-sm-8 form-control" id="opacity" value="0" type="text">
-								</div>
-								<div class="watermarkOpacity_progress">
-									<p><i></i></p>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-yuyin"></span><span>语音讲解:</span></div>
-							<div class="switch">
-								<input id="cmn-toggle-1" class="cmn-toggle cmn-toggle-round" type="checkbox">
-								<label for="cmn-toggle-1"></label>
-							</div>
-						</div>
-						<div class="itemList">
-							<div>
-								<button type="button">暂停</button>
-								<button type="button">继续</button>
-							</div>
-						</div>
-					</div>
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-kaimen"></span><span>开门:</span></div>
-						</div>
-						<div class="itemList">
-							<div class="openDoor">
-								<div>
-									<span class="iconfont icon-a-lujing66"></span><span>开门</span>
-								</div>
+<body>
+    <div class="main-body">
+        <div class="header">
+            <div>重庆市城市管理局指挥大厅综合管理平台</div>
+            <div class="userinfo">
+                <span>用户名名称</span><span>|</span><span class="iconfont icon-tuichu"></span><span>退出</span>
+            </div>
+        </div>
+        <div class="content iframe-body-sty">
+            <iframe id="iframe-shrink" src="http://192.168.1.5:8080/db/4" width="100%" height="100%"></iframe>
+            <div class="tabbar">
+                <ul>
+                    <li class="tabbarActive mtq" data-type="mtq"><span>门厅区</span></li>
+                    <li class="hpq" data-type="hpq"><span>弧屏区</span></li>
+                    <li class="xcq" data-type="xcq"><span>宣传墙</span></li>
+                    <li class="dpq" data-type="dpq"><span>大屏区</span></li>
+                </ul>
+            </div>
+        </div>
+        <div class="footer">
+            <div class="signal-source">
+                <div class="footer-title">
+                    <span>可切换信号源</span>
+                </div>
+                <div class="footer-cont">
+                    <div class="signal-type">
+                        贯彻执行国家有关市政公用设施运行管理、市容环境卫生管理、城市供水节水管理、园 林绿化管理、城市管理执法等城市管理的法律、法规、规章和方针政策会同有关部门研究起 草城市管理方面的地方性法规、规章和有关政策并组织实施;统筹城市管理领域重大事项, 负责拟订城市管理发展战略、规划、计划并组织实施。 负责城市管理行业规范、技术标准体系建设;负责市直管城市管理基础设施维护工程技 术方案的审查;负责城市管理工作的组织协调、监督检查和考核评价。
+                    </div>
+                    <div class="signal-type">
+                        贯彻执行国家有关市政公用设施运行管理、市容环境卫生管理、城市供水节水管理、园 林绿化管理、城市管理执法等城市管理的法律、法规、规章和方针政策会同有关部门研究起 草城市管理方面的地方性法规、规章和有关政策并组织实施;统筹城市管理领域重大事项, 负责拟订城市管理发展战略、规划、计划并组织实施。 负责城市管理行业规范、技术标准体系建设;负责市直管城市管理基础设施维护工程技 术方案的审查;负责城市管理工作的组织协调、监督检查和考核评价。
+                    </div>
+                </div>
+            </div>
+            <div class="commentary">
+                <div class="footer-title">
+                    <span>讲解词</span>
+                </div>
+                <div class="footer-cont">
+                    <div>
+                        贯彻执行国家有关市政公用设施运行管理、市容环境卫生管理、城市供水节水管理、园 林绿化管理、城市管理执法等城市管理的法律、法规、规章和方针政策会同有关部门研究起 草城市管理方面的地方性法规、规章和有关政策并组织实施;统筹城市管理领域重大事项, 负责拟订城市管理发展战略、规划、计划并组织实施。 负责城市管理行业规范、技术标准体系建设;负责市直管城市管理基础设施维护工程技 术方案的审查;负责城市管理工作的组织协调、监督检查和考核评价。
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 
+    <!-- 侧边栏 -->
+    <div id="jzmap-hidden-div-xstable">
+        <a class="jzmap-hidden-div-yctable-a">
+            <i class="jzmap-hidden-div-yctable-i"></i>
+        </a>
+    </div>
+    <div id="jzmap-hidden-div">
+        <div id="jzmap-hidden-div-yctable">
+            <a class="jzmap-hidden-div-yctable-a">
+                <i class="jzmap-hidden-div-yctable-i" style="background-image:url(./images/triLight-icon.png);"></i>
+            </a>
+        </div>
+        <div id="jzmap-hidden-div-head">
+            <div class="menu-listTit">
+                <span>可控设备操作区域</span>
+            </div>
+            <div class="sliderList active mtq">
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-shexiangji"></span><span>状态:</span><span class="greenCo">开启</span></div>
+                        <div class="setBtn" index="0" onclick="input(this)">设置</div>
+                    </div>
+                    <div class="itemList">
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">开启视频同步录像</label>
+                        </div>
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">关闭视频同步录像</label></div>
+                    </div>
 
-							</div>
-							<div class="panel-footer"></div>
-						</div>
-					</div>
+                </div>
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-shengyin"></span><span>扬声器:</span><span class="greenCo">44%</span></div>
+                        <div class="setBtn" index="1" onclick="input(this)">设置</div>
+                    </div>
+                    <div class="itemList">
+                        <div class="watermarkOpacity_div">
+                            <div class="proNum">
+                                <input class="col-sm-8 form-control" id="opacity" value="0" type="text">
+                            </div>
+                            <div class="watermarkOpacity_progress">
+                                <p><i></i></p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-yuyin"></span><span>语音讲解:</span></div>
+                        <div class="switch">
+                            <input id="cmn-toggle-1" class="cmn-toggle cmn-toggle-round" type="checkbox">
+                            <label for="cmn-toggle-1"></label>
+                        </div>
+                    </div>
+                    <div class="itemList">
+                        <div>
+                            <button type="button">暂停</button>
+                            <button type="button">继续</button>
+                        </div>
+                    </div>
+                </div>
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-kaimen"></span><span>开门:</span></div>
+                    </div>
+                    <div class="itemList">
+                        <div class="openDoor">
+                            <div>
+                                <span class="iconfont icon-a-lujing66"></span><span>开门</span>
+                            </div>
 
-				</div>
-				<div class="sliderList hpq">
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-shexiangji"></span><span>状态:</span><span class="greenCo">开启</span></div>
-							<div class="setBtn" index="0">设置</div>
-						</div>
-						<div class="itemList">
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">开启视频同步录像</label>
-							</div>
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">关闭视频同步录像</label></div>
-						</div>
 
-					</div>
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-shengyin"></span><span>扬声器:</span><span class="greenCo">44%</span></div>
-							<div class="setBtn" index="1">设置</div>
-						</div>
-						<div class="itemList">
-							<div class="watermarkOpacity_div">
-								<div class="proNum">
-									<input class="col-sm-8 form-control" id="opacity" value="0" type="text">
-								</div>
-								<div class="watermarkOpacity_progress">
-									<p><i></i></p>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-yuyin"></span><span>语音讲解:</span></div>
-							<div class="switch">
-								<input id="cmn-toggle-1" class="cmn-toggle cmn-toggle-round" type="checkbox">
-								<label for="cmn-toggle-1"></label>
-							</div>
-						</div>
-						<div class="itemList">
-							<div>
-								<button type="button">暂停</button>
-								<button type="button">继续</button>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="sliderList xcq">
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-shexiangji"></span><span>状态:</span><span class="greenCo">开启</span></div>
-							<div class="setBtn" index="0" onclick="input(this)">设置</div>
-						</div>
-						<div class="itemList">
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">开启视频同步录像</label>
-							</div>
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">关闭视频同步录像</label></div>
-						</div>
+                        </div>
+                        <div class="panel-footer"></div>
+                    </div>
+                </div>
 
-					</div>
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-shengyin"></span><span>扬声器:</span><span class="greenCo">44%</span></div>
-							<div class="setBtn" index="1" onclick="input(this)">设置</div>
-						</div>
-						<div class="itemList">
-							<div class="watermarkOpacity_div">
-								<div class="proNum">
-									<input class="col-sm-8 form-control" id="opacity" value="0" type="text">
-								</div>
-								<div class="watermarkOpacity_progress">
-									<p><i></i></p>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-yuyin"></span><span>语音讲解:</span></div>
-							<div class="switch">
-								<input id="cmn-toggle-1" class="cmn-toggle cmn-toggle-round" type="checkbox">
-								<label for="cmn-toggle-1"></label>
-							</div>
-						</div>
-						<div class="itemList">
-							<div>
-								<button type="button">暂停</button>
-								<button type="button">继续</button>
-							</div>
-						</div>
-					</div>
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-kaimen"></span><span>投影仪升降:</span><span class="greenCo">已升起</span></div>
-							<div class="setBtn" index="0" onclick="input(this)">设置</div>
-						</div>
-						<div class="itemList">
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">同时升起</label>
-							</div>
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">同时降下</label></div>
-						</div>
+            </div>
+            <div class="sliderList hpq">
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-shexiangji"></span><span>状态:</span><span class="greenCo">开启</span></div>
+                        <div class="setBtn" index="0">设置</div>
+                    </div>
+                    <div class="itemList">
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">开启视频同步录像</label>
+                        </div>
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">关闭视频同步录像</label></div>
+                    </div>
 
-					</div>
-				</div>
-				<div class="sliderList dpq">
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-shexiangji"></span><span>状态:</span><span class="greenCo">开启</span></div>
-							<div class="setBtn" index="0" onclick="input(this)">设置</div>
-						</div>
-						<div class="itemList">
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">开启视频同步录像</label>
-							</div>
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">关闭视频同步录像</label></div>
-						</div>
+                </div>
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-shengyin"></span><span>扬声器:</span><span class="greenCo">44%</span></div>
+                        <div class="setBtn" index="1">设置</div>
+                    </div>
+                    <div class="itemList">
+                        <div class="watermarkOpacity_div">
+                            <div class="proNum">
+                                <input class="col-sm-8 form-control" id="opacity" value="0" type="text">
+                            </div>
+                            <div class="watermarkOpacity_progress">
+                                <p><i></i></p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-yuyin"></span><span>语音讲解:</span></div>
+                        <div class="switch">
+                            <input id="cmn-toggle-1" class="cmn-toggle cmn-toggle-round" type="checkbox">
+                            <label for="cmn-toggle-1"></label>
+                        </div>
+                    </div>
+                    <div class="itemList">
+                        <div>
+                            <button type="button">暂停</button>
+                            <button type="button">继续</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="sliderList xcq">
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-shexiangji"></span><span>状态:</span><span class="greenCo">开启</span></div>
+                        <div class="setBtn" index="0" onclick="input(this)">设置</div>
+                    </div>
+                    <div class="itemList">
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">开启视频同步录像</label>
+                        </div>
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">关闭视频同步录像</label></div>
+                    </div>
 
-					</div>
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-shengyin"></span><span>扬声器:</span><span class="greenCo">44%</span></div>
-							<div class="setBtn" index="1" onclick="input(this)">设置</div>
-						</div>
-						<div class="itemList">
-							<div class="watermarkOpacity_div">
-								<div class="proNum">
-									<input class="col-sm-8 form-control" id="opacity" value="0" type="text">
-								</div>
-								<div class="watermarkOpacity_progress">
-									<p><i></i></p>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-yuyin"></span><span>语音讲解:</span></div>
-							<div class="switch">
-								<input id="cmn-toggle-1" class="cmn-toggle cmn-toggle-round" type="checkbox">
-								<label for="cmn-toggle-1"></label>
-							</div>
-						</div>
-						<div class="itemList">
-							<div>
-								<button type="button">暂停</button>
-								<button type="button">继续</button>
-							</div>
-						</div>
-					</div>
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-kaimen"></span><span>灯光状态:</span><span class="greenCo">开启</span></div>
-							<div class="setBtn" index="0" onclick="input(this)">设置</div>
-						</div>
-						<div class="itemList">
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">开启</label>
-							</div>
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">关闭</label></div>
-						</div>
+                </div>
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-shengyin"></span><span>扬声器:</span><span class="greenCo">44%</span></div>
+                        <div class="setBtn" index="1" onclick="input(this)">设置</div>
+                    </div>
+                    <div class="itemList">
+                        <div class="watermarkOpacity_div">
+                            <div class="proNum">
+                                <input class="col-sm-8 form-control" id="opacity" value="0" type="text">
+                            </div>
+                            <div class="watermarkOpacity_progress">
+                                <p><i></i></p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-yuyin"></span><span>语音讲解:</span></div>
+                        <div class="switch">
+                            <input id="cmn-toggle-1" class="cmn-toggle cmn-toggle-round" type="checkbox">
+                            <label for="cmn-toggle-1"></label>
+                        </div>
+                    </div>
+                    <div class="itemList">
+                        <div>
+                            <button type="button">暂停</button>
+                            <button type="button">继续</button>
+                        </div>
+                    </div>
+                </div>
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-kaimen"></span><span>投影仪升降:</span><span class="greenCo">已升起</span></div>
+                        <div class="setBtn" index="0" onclick="input(this)">设置</div>
+                    </div>
+                    <div class="itemList">
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">同时升起</label>
+                        </div>
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">同时降下</label></div>
+                    </div>
 
-					</div>
-					<div class="status">
-						<div class="statusTit">
-							<div><span class="iconfont icon-kaimen"></span><span>移动站台:</span></div>
-							<div class="setBtn" index="0" onclick="input(this)">设置</div>
-						</div>
-						<div class="itemList">
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">起始点</label>
-							</div>
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">弧屏区中心点</label></div>
-							<div>
-								<input type="radio" name="" id="" value="" /><label for="">大屏讲解点</label>
-							</div>
-						</div>
+                </div>
+            </div>
+            <div class="sliderList dpq">
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-shexiangji"></span><span>状态:</span><span class="greenCo">开启</span></div>
+                        <div class="setBtn" index="0" onclick="input(this)">设置</div>
+                    </div>
+                    <div class="itemList">
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">开启视频同步录像</label>
+                        </div>
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">关闭视频同步录像</label></div>
+                    </div>
 
+                </div>
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-shengyin"></span><span>扬声器:</span><span class="greenCo">44%</span></div>
+                        <div class="setBtn" index="1" onclick="input(this)">设置</div>
+                    </div>
+                    <div class="itemList">
+                        <div class="watermarkOpacity_div">
+                            <div class="proNum">
+                                <input class="col-sm-8 form-control" id="opacity" value="0" type="text">
+                            </div>
+                            <div class="watermarkOpacity_progress">
+                                <p><i></i></p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-yuyin"></span><span>语音讲解:</span></div>
+                        <div class="switch">
+                            <input id="cmn-toggle-1" class="cmn-toggle cmn-toggle-round" type="checkbox">
+                            <label for="cmn-toggle-1"></label>
+                        </div>
+                    </div>
+                    <div class="itemList">
+                        <div>
+                            <button type="button">暂停</button>
+                            <button type="button">继续</button>
+                        </div>
+                    </div>
+                </div>
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-kaimen"></span><span>灯光状态:</span><span class="greenCo">开启</span></div>
+                        <div class="setBtn" index="0" onclick="input(this)">设置</div>
+                    </div>
+                    <div class="itemList">
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">开启</label>
+                        </div>
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">关闭</label></div>
+                    </div>
 
-					</div>
-				</div>
+                </div>
+                <div class="status">
+                    <div class="statusTit">
+                        <div><span class="iconfont icon-kaimen"></span><span>移动站台:</span></div>
+                        <div class="setBtn" index="0" onclick="input(this)">设置</div>
+                    </div>
+                    <div class="itemList">
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">起始点</label>
+                        </div>
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">弧屏区中心点</label></div>
+                        <div>
+                            <input type="radio" name="" id="" value="" /><label for="">大屏讲解点</label>
+                        </div>
+                    </div>
 
 
+                </div>
+            </div>
 
-			</div>
 
-		</div>
 
-	</body>
-	<script src="js/jquery.js" type="text/javascript" charset="utf-8"></script>
-	<script src="js/websocket.js" type="text/javascript" charset="utf-8"></script>
-	<script type="text/javascript" src="js/constants.js"></script>
-	<script src="js/main.js" type="text/javascript" charset="utf-8"></script>
-</html>
+        </div>
+
+    </div>
+
+</body>
+<script src="js/jquery.js" type="text/javascript" charset="utf-8"></script>
+<script src="js/websocket.js" type="text/javascript" charset="utf-8"></script>
+<script type="text/javascript" src="js/constants.js"></script>
+<script src="js/main.js" type="text/javascript" charset="utf-8"></script>
+
+</html>

+ 40 - 52
spring-cloud/server-page/src/main/resources/static/jsc/css/index.css

@@ -69,16 +69,17 @@ main {
 .center-icon {
     position: absolute;
     left: 50%;
-    bottom: 40%;
+    bottom: 10%;
     transform: translateX(-50%);
     width: 20%;
-    height: 100%;
+    height: 130%;
     /* background: url(../img/center1.png) top center no-repeat; */
     background: url(../img/center2.png) top center no-repeat;
-    background-size: initial;
+    background-size: 80% 100%;
 }
 
 .center-title {
+    z-index: 999;
     position: absolute;
     left: 50%;
     top: 10%;
@@ -95,41 +96,19 @@ main {
 }
 
 .liu-box {
-    /* display: flex; */
     position: relative;
     width: 100%;
     height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
-.liu-box>div {
+
+/* .liu-box>div {
     position: absolute;
     -webkit-box-reflect: below 0 linear-gradient(transparent, transparent, rgba(0, 0, 0, 0.4));
-}
-
-.liu-box>div:nth-child(1) {
-    left: 28%;
-    bottom: 46%;
-}
-
-.liu-box>div:nth-child(2) {
-    left: 34%;
-    bottom: 27%;
-}
-
-.liu-box>div:nth-child(3) {
-    left: 46%;
-    bottom: 21%;
-}
-
-.liu-box>div:nth-child(4) {
-    right: 34%;
-    bottom: 27%;
-}
-
-.liu-box>div:nth-child(5) {
-    right: 28%;
-    bottom: 46%;
-}
+} */
 
 .serve-bottom,
 .vol-bottom {
@@ -215,19 +194,25 @@ main {
     background-size: inherit;
 }
 
+.icon-text>span {
+    margin-right: 80px;
+}
+
 .left-top .icon-text {
+    display: flex;
+    align-items: center;
     position: absolute;
     left: 70%;
     top: 58%;
-    width: 25%;
+    width: 40%;
     transform: rotate(3deg) translate(-50%, -50%);
     color: #BEDDFA;
-    font-size: 80px;
+    font-size: 120px;
     cursor: pointer;
 }
 
 .left-top .icon-text>i {
-    font-size: 80px;
+    font-size: 120px;
 }
 
 .left-center {
@@ -256,11 +241,11 @@ main {
     right: 8%;
     transform: translateY(-50%) rotate(3deg);
     color: #BEDDFA;
-    font-size: 80px;
+    font-size: 140px;
 }
 
 .theme>div>i {
-    font-size: 80px;
+    font-size: 140px;
 }
 
 .x-line1 {
@@ -288,7 +273,7 @@ main {
 }
 
 .left-center>div .text {
-    font-size: 50px;
+    font-size: 120px;
     color: #BEDDFA;
 }
 
@@ -312,6 +297,9 @@ main {
     color: #F8BE69 !important;
 }
 
+
+/* 子代 */
+
 .left-center>div:hover:not(.theme)>.text {
     color: #F8BE69;
 }
@@ -386,44 +374,44 @@ main {
     top: 4%;
     right: 35%;
     height: 30%;
-    font-size: 70px;
+    font-size: 120px;
 }
 
 .left-bottom div:nth-child(1)>i {
-    font-size: 70px;
+    font-size: 120px;
 }
 
 .left-bottom div:nth-child(2) {
     top: 38%;
     right: 32%;
     height: 15%;
-    font-size: 50px;
+    font-size: 120px;
 }
 
 .left-bottom div:nth-child(2)>i {
-    font-size: 50px;
+    font-size: 120px;
 }
 
 .left-bottom div:nth-child(3) {
     top: 55%;
     right: 28%;
     height: 15%;
-    font-size: 50px;
+    font-size: 120px;
 }
 
 .left-bottom div:nth-child(3)>i {
-    font-size: 50px;
+    font-size: 120px;
 }
 
 .left-bottom div:nth-child(4) {
     top: 74%;
     right: 23%;
     height: 15%;
-    font-size: 50px;
+    font-size: 120px;
 }
 
 .left-bottom div:nth-child(4)>i {
-    font-size: 50px;
+    font-size: 120px;
 }
 
 
@@ -452,17 +440,17 @@ main {
 
 .right-top .icon-text {
     position: absolute;
-    right: 44%;
+    right: 30%;
     top: 52%;
-    width: 25%;
+    width: 35%;
     transform: rotate(-3deg) translate(-50%, -50%);
     color: #BEDDFA;
-    font-size: 80px;
+    font-size: 120px;
     cursor: pointer;
 }
 
 .right-top .icon-text>i {
-    font-size: 80px;
+    font-size: 120px;
 }
 
 .right-center {
@@ -488,7 +476,7 @@ main {
 }
 
 .right-center .themes .text {
-    font-size: 70px;
+    font-size: 120px;
     color: #BEDDFA;
 }
 
@@ -535,7 +523,7 @@ main {
 }
 
 .right-bottom1>div>.text {
-    font-size: 80px;
+    font-size: 120px;
     color: #BEDDFA;
 }
 
@@ -576,7 +564,7 @@ main {
 }
 
 .right-bottom2>div>.text {
-    font-size: 80px;
+    font-size: 120px;
     color: #BEDDFA;
 }
 

+ 72 - 19
spring-cloud/server-page/src/main/resources/static/jsc/index.html

@@ -8,6 +8,36 @@
     <title>重庆城市管理局-驾驶舱</title>
     <link rel="stylesheet" href="css/iconfont.css">
     <link rel="stylesheet" href="css/index.css">
+    <link rel="stylesheet" href="css/domo2.css">
+    <style>
+        .ball {
+            background-color: transparent;
+            border-radius: 0%;
+            -webkit-box-reflect: below 0 linear-gradient(transparent, transparent, rgba(0, 0, 0, 0.4));
+            width: 175px;
+            height: 152px;
+        }
+        
+        .bg1 {
+            background-image: url(./img/1.png);
+        }
+        
+        .bg2 {
+            background-image: url(./img/2.png);
+        }
+        
+        .bg3 {
+            background-image: url(./img/3.png);
+        }
+        
+        .bg4 {
+            background-image: url(./img/4.png);
+        }
+        
+        .bg5 {
+            background-image: url(./img/5.png);
+        }
+    </style>
 </head>
 
 <body>
@@ -30,21 +60,12 @@
                     <p>智慧城管大数据</p>
                 </div>
                 <div class="liu-box">
-                    <div class='one'>
-                        <img src="img/1.png" />
-                    </div>
-                    <div class='two'>
-                        <img src="img/2.png" />
-                    </div>
-                    <div class='three'>
-                        <img src="img/3.png" />
-                    </div>
-                    <div class='four'>
-                        <img src="img/4.png" />
-                    </div>
-                    <div class='five'>
-                        <img src="img/5.png" />
-                    </div>
+                    <!-- 循环圆圈 -->
+                    <div class="ball bg1" onmouseenter="onMouseGo()" onmouseout="onMouseMove()" onclick="clickMsg(this)">1</div>
+                    <div class="ball bg2" onmouseenter="onMouseGo()" onmouseout="onMouseMove()" onclick="clickMsg(this)">2</div>
+                    <div class="ball bg3" onmouseenter="onMouseGo()" onmouseout="onMouseMove()" onclick="clickMsg(this)">3</div>
+                    <div class="ball bg4" onmouseenter="onMouseGo()" onmouseout="onMouseMove()" onclick="clickMsg(this)">4</div>
+                    <div class="ball bg5" onmouseenter="onMouseGo()" onmouseout="onMouseMove()" onclick="clickMsg(this)">5</div>
                 </div>
             </div>
             <div class="vol-bottom">
@@ -61,8 +82,7 @@
                 </div>
             </div>
             <div class="left-center">
-                <!-- <p class="x-line1"></p> -->
-                <!-- <p class="x-line2"></p> -->
+                <!-- 大数据 -->
                 <div class="theme" data-id="5">
                     <div>
                         <span>大数据平台</span>
@@ -100,6 +120,7 @@
                 </div>
             </div>
             <div class="left-bottom">
+                <!-- 资源保障 -->
                 <div class="sw" data-id="10">
                     <span class="text">资源保障</span>
                     <i class="iconfont icon-shuibiao_shiti text"></i>
@@ -128,6 +149,7 @@
             </div>
             <div class="right-center">
                 <div class="themes">
+                    <!-- i标签显示字体图标 -->
                     <i class="iconfont icon-yingjiche text"></i>
                     <span class="text">应急资源主题</span>
                 </div>
@@ -167,8 +189,39 @@
         </div>
     </main>
     <script src="js/jquery.min.js"></script>
-    <!--<script src="js/init.js"></script>-->
-	<script src="js/test.js"></script>
+    <script src="js/test.js"></script>
+    <script>
+        var items = document.querySelectorAll('.ball');
+        // items[0].style['animation-delay'] = '-5s,0s,0s';
+        // items[0].querySelector('.item__circle').style['transform'] = 'scale(1.5)';
+        for (var i = 0; i < items.length; i++) {
+            (function(i) {
+                items[i].style['animation-delay'] = (-5) - 4 * i + 's,' + (-4 * i) + 's,' + (-4 * i) + 's'
+            })(i);
+        }
+
+        function onMouseGo() {
+            // document.querySelectorAll('.ball').classList.add('active')
+            for (var i = 0; i < items.length; i++) {
+                (function(i) {
+                    items[i].classList.add('active')
+                })(i);
+            }
+        }
+
+        function onMouseMove() {
+            // document.getElementsByClassName('ball').classList.remove('active')
+            for (var i = 0; i < items.length; i++) {
+                (function(i) {
+                    items[i].classList.remove('active')
+                })(i);
+            }
+        }
+
+        function clickMsg(e) {
+            alert(e.innerText)
+        }
+    </script>
 </body>
 
 </html>

File diff suppressed because it is too large
+ 0 - 1
spring-cloud/server-page/src/main/resources/static/jsc/js/jquery.min.js


+ 36 - 11
spring-cloud/server-page/src/main/resources/static/jsc/js/test.js

@@ -1,13 +1,15 @@
 // const GATEWAY_URL = "http://23.37.100.87:8084"; //连业务网的IP
 // const GATEWAY_URL = "http://23.37.100.80:8084"; //放到服务器上的IP
+// 暴露的端口号
 const GATEWAY_URL = "http://192.168.0.95:8084";
 const PAGE_BASIC = GATEWAY_URL + "/basic";
 
 $(function() {
     // 数据对象
     let dataObj = reqGet(PAGE_BASIC + '/apiNoProcess/scence/getAllSceneAndThemeAndSystem');
-    let scene = dataObj.scenes; //场景
-    let theme = dataObj.sceneThemes; //主题
+
+    let theme = dataObj.sceneThemes; //主题模块
+    let scene = dataObj.scenes; //场景类
 
     // 开场动画效果
     (function() {
@@ -25,7 +27,8 @@ $(function() {
         }, 1000);
     })();
 
-    // 绑定初始化id
+    // 初始化id添加属性绑定
+    // 左中左下
     $(".theme").attr("data-id", scene[0].id);
     $(".sw").attr("data-id", scene[3].id);
 
@@ -36,20 +39,26 @@ $(function() {
 
 
 
-    // 左中
-    // 初始化dom,封装
+    //初始化左中数据
     function initLeftCenter(id, name) {
         $(".left-center").off("mousewheel"); //清除事件,防止变量污染
         $(".theme").attr("data-id", id);
+        // 默认第一个场景
         $(".theme>div>span").text(name || scene[0].sceneName);
+        // 获取自定义属性
         let idenId = $(".theme").attr("data-id");
+        // theme主题模块返回和当前定义属性相同的id的数据比如场景数据 场景id和主题id
         let leftTheme = theme.filter(function(item) {
             return item.sceneId == idenId
         });
         let leftId = 1; //中间变量控制
+        // 有好多页数据判断
         let leftIdenId = Math.ceil(leftTheme.length / 7); //控制变量的最大值限制
+        // html值左边
         let leftCenterHtml = '';
+        // 移除清空
         $(".left-center>div:not(.theme)").remove();
+        // 场景数据条数小于7条或等于7条直接插入dom中
         for (let i = 0; i < (leftTheme.length <= 7 ? leftTheme.length : 7); i++) {
             leftCenterHtml += `
                 <div data-url="${leftTheme[i].url}">
@@ -61,13 +70,15 @@ $(function() {
         $(".left-center").append(leftCenterHtml);
         // 监听滚动方向
         $(".left-center").on("mousewheel", function(e) {
+            // 有滑动数据大于7条
             if (leftTheme.length > 7) {
                 let html = ""
+                    // 正值向下滚动 滚动值
                 if (e.originalEvent.wheelDelta > 0) {
                     if (leftId > 1) {
                         $(".left-center>div:not(.theme)").remove();
                         leftId--;
-                        // 切片数据
+                        // 切片数据(leftId - 1)上一页数据
                         const data = leftTheme.slice(7 * (leftId - 1), 7 * leftId).reverse();
                         for (let i = data.length; i > 0; i--) {
                             html += `
@@ -79,23 +90,28 @@ $(function() {
                     }
 
                 } else {
+                    // 向上滚动页码值leftIdenId
                     if (leftId < leftIdenId) {
+                        // 清空dom
                         $(".left-center>div:not(.theme)").remove();
-                        // 切片数据
+                        // 切片数据切数组
                         const data = leftTheme.slice(7 * leftId, 7 * (leftId + 1));
                         leftId++;
                         for (let i = 0; i < data.length; i++) {
                             html += `
                             <div data-url="${data[i].url}">
-                                <span class="text">${data[i].themeName}</span>
+                                <span class="text">${data[i].themeName}</span、、
+                                
                                 <i class="iconfont icon-lajiche text"></i>
                             </div>
                         `;
                         }
                     }
                 }
+                // 页码值大于页码索引才插入
                 if (leftId <= leftIdenId) {
                     $(".left-center").append(html);
+                    // 且绑定点击事件
                     leftCenterClick();
                 }
             }
@@ -104,6 +120,7 @@ $(function() {
 
 
     // 右中
+    // 中间变量控件
     let rightId = 1;
     let rightIdenId = Math.ceil(scene.length / 6); //控制变量的最大值限制
     // 初始化dom,封装
@@ -111,6 +128,7 @@ $(function() {
         let htmlRight = '';
         $(".right-center").empty();
         for (let i = 0; i < (scene.length <= 6 ? scene.length : 6); i++) {
+            // 自定义属性
             htmlRight += `
                 <div class="themes" data-id="${scene[i].id}" data-iden="${i < 3 ? 1 : 2}">
                 <i class="iconfont icon-zhibanzhishou text"></i>
@@ -121,8 +139,11 @@ $(function() {
     };
     // 监听滚动方向
     $(".right-center").on("mousewheel", function(e) {
+
         if (scene.length > 6) {
+            // 清空
             let html = ""
+                // 数据向上走
             if (e.originalEvent.wheelDelta > 0) {
                 if (rightId > 1) {
                     $(".right-center").empty();
@@ -138,6 +159,8 @@ $(function() {
                     };
                 }
             } else {
+                // 数据往后下
+                // 总页码数大于当前页码
                 if (rightId < rightIdenId) {
                     $(".right-center").empty();
                     // 切片数据
@@ -230,14 +253,16 @@ $(function() {
     // 封装点击事件,在dom结构变化事件会消失
     function leftCenterClick() { //左边中间的点击
         $(".theme").on("click", function() {
-            console.log(1)
-        })
+                console.log(1)
+            })
+            // 可以事件代理
         $(".left-center>div:not(.theme)").on("click", function() {
             // 判断当前点击是否有选中类
             // if (!$(this).hasClass("left-center-ative")) {
             //     $(this).not(".theme").siblings().removeClass("left-center-ative");
             //     $(this).addClass("left-center-ative")
             // }
+            // 没a的跳转
             location.href = $(this).attr("data-url"); //跳转
         })
     };
@@ -260,6 +285,7 @@ $(function() {
         $(".themes").on("click", function() {
             const id = $(this).attr("data-id") * 1; //场景id
             const text = $(this).text(); //场景名称
+            // 判断1和2渲染在哪个部分
             const idenId = $(this).attr("data-iden"); //标识id
             // 判断渲染到左边的上面还是下面
             if (idenId == 1) {
@@ -294,7 +320,6 @@ $(function() {
                 console.log(err)
             }
         });
-
         return data
     };
 })

+ 38 - 34
spring-cloud/server-page/src/main/resources/static/lbzd/index.html

@@ -1,36 +1,40 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width,initial-scale=1.0">
-		<title>重庆城市管理局-来宾终端</title>
-		<link rel="stylesheet" type="text/css" href="font/iconfont.css"/>
-		<link rel="stylesheet" type="text/css" href="css/index_lbfz.css"/>
-	</head>
-	<body>
-		<div class="header">
-			<div class="head_left">
-				<img src="img/header_logo.png" />
-				<i>来&nbsp;宾&nbsp;辅&nbsp;助&nbsp;终&nbsp;端</i>
-			</div>
-			<div class="head_right">
-				<button id="mainBack" type="button">退出</button>
-			</div>
-		</div>
-		<main>
-			<div class="main-tab">
-				<ul class="tab-list">
-					<li class="tab-item tab-item-act" data-iden="indexb">大厅概况</li>
-					<li class="tab-item" data-iden="ztzs">主题展示</li>
-					<li class="tab-item" data-iden="xczs">宣传展示</li>
-					<li class="tab-item" data-iden="qtgn">互动功能</li>
-				</ul>
-			</div>
-			<section>
-				<iframe src="indexb.html" id="sec-ifr" style="width: 100%;height: 100%;border: none;"></iframe>
-			</section>
-		</main>
-		<script src="js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
-		<script src="js/index.js" type="text/javascript" charset="utf-8"></script>
-	</body>
-</html>
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <title>重庆城市管理局-来宾终端</title>
+    <link rel="stylesheet" type="text/css" href="font/iconfont.css" />
+    <link rel="stylesheet" type="text/css" href="css/index_lbfz.css" />
+</head>
+
+<body>
+    <div class="header">
+        <div class="head_left">
+            <img src="img/header_logo.png" />
+            <i>来&nbsp;宾&nbsp;辅&nbsp;助&nbsp;终&nbsp;端</i>
+        </div>
+        <div class="head_right">
+            <button id="mainBack" type="button">退出</button>
+        </div>
+    </div>
+    <main>
+        <div class="main-tab">
+            <ul class="tab-list">
+                <li class="tab-item tab-item-act" data-iden="indexb">大厅概况</li>
+                <li class="tab-item" data-iden="ztzs">主题展示</li>
+                <li class="tab-item" data-iden="xczs">宣传展示</li>
+                <li class="tab-item" data-iden="qtgn">互动功能</li>
+            </ul>
+        </div>
+        <!-- 子栏目 -->
+        <section>
+            <iframe src="indexb.html" id="sec-ifr" style="width: 100%;height: 100%;border: none;"></iframe>
+        </section>
+    </main>
+    <script src="js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
+    <script src="js/index.js" type="text/javascript" charset="utf-8"></script>
+</body>
+
+</html>

+ 2 - 2
spring-cloud/server-page/src/main/resources/static/mh2/js/init.js

@@ -1,6 +1,6 @@
 // const GATEWAY_URL = "http://23.37.100.87:8084";
-const GATEWAY_URL = "http://23.37.100.80:8084";
-// const GATEWAY_URL = "http://192.168.0.95:8084"
+// const GATEWAY_URL = "http://23.37.100.80:8084";
+const GATEWAY_URL = "http://192.168.0.95:8084"
 const PAGE_BASIC = GATEWAY_URL + "/basic";
 let sceneThemes;
 $(function() {

+ 1 - 1
spring-cloud/server-page/src/main/resources/static/testEcharts/test/js/move.js

@@ -25,7 +25,7 @@ function move(select, maxLeft, maxTop) {
         }
         this.style.zIndex = ++zIndex;
         // link copy move
-        e.dataTransfer.effectAllowed = 'move'; // 改变鼠标样式,此属性必须在此事件上设
+        e.dataTransfer.effectAllowed = 'move'; // 改变鼠标样式,此属性必须在此事件上设
         x = e.clientX;
         y = e.clientY;
     };

Some files were not shown because too many files changed in this diff