Merge remote-tracking branch 'origin/master'

mybusiness/src/main/resources/static/visualization/css/th_yj.css

@@ -113,6 +113,19 @@ body::-webkit-scrollbar {
 	text-shadow: rgb(0, 180, 255) 1px 1px 0px;
 	font-weight: 900;
 }
+.header_nav a select{
+	border: 0px;
+	background: none;
+	color: #fff;
+	font-size: 16px;
+	outline: 0px;
+}
+.header_nav a option{
+	background: #03070d;
+}
+
+
+
 
 .content {
 	margin: 20px 25px;
@@ -432,12 +445,190 @@ body::-webkit-scrollbar {
 	top: 0px;
 	left: 0px;
 }
+.map_id1,
+.map_id2,
+.map_id3,
+.map_id4,
+.map_id5,
+.map_id6,
+.map_id7,
+.map_id8,
+.map_id9,
+.map_id10,
+.map_id11,
+.map_id12,
+.map_id13{
+	opacity: 0;
+}
 
 .map_img {
 	top: 0px;
 	left: 0px;
 	transition: all 1s ease 0s;
 }
+.map_img.mp1{
+	top: -1165px!important;
+	left: -1048px!important;
+}
+.map_img.mp2{
+	top: -1339px!important;
+	left: -779px!important;
+}
+.map_img.mp3{
+	top: -2611px!important;
+	left: -315px!important;
+}
+.map_img.mp4{
+	top: -780px!important;
+	left: -549px!important;
+}
+.map_img.mp5 {
+	top: -866px !important;
+	left: -634px !important;
+}
+
+
+
+
+
+.map_img.mp5{
+	top: -1886px!important;
+	left: -645px!important;
+}
+
+
+.map_img.mp6{
+	top: -1461px!important;
+	left: -823px!important;
+}
+.map_img.mp7{
+	top: -195px!important;
+	left: -1831px!important;
+}
+.map_img.mp8{
+	top: -1228px!important;
+	left: -1099px!important;
+}
+.map_img.mp9{
+	top: -2085px!important;
+	left: -1796px!important;
+}
+.map_img.mp10{
+	top: -1266px!important;
+	left: -1119px!important;
+}
+.map_img.mp11{
+	top: -1011px!important;
+	left: -1303px!important;
+}
+.map_img.mp12{
+	top: -1385px!important;
+	left: -1363px!important;
+}
+
+
+
+.map_id2 {
+	top: 150px!important;
+	left: 260px!important;
+}
+
+.map_id3 {
+	top: 350px!important;
+	left: 460px!important;
+}
+
+.map_id4 {
+	top: 300px!important;
+	right: 460px!important;
+}
+.map_id5 {
+	top: 200px!important;
+	right: 560px!important;
+}
+.map_id6 {
+	top: 349px!important;
+	left: 100px!important;
+}
+.map_id7 {
+	top: 66px!important;
+	right: 544px!important;
+}
+.map_id8 {
+	top: 250px!important;
+	right: 760px!important;
+}
+.map_id9 {
+	top: 62px!important;
+	right: 357px!important;
+}
+.map_id10 {
+	top: 191px!important;
+	right: 691px!important;
+}
+.map_id11 {
+	top: 305px!important;
+	right: 329px!important;
+}
+.map_id12 {
+	top: 100px!important;
+	right: 460px!important;
+}
+
+
+.mp_show {
+	animation: 1s linear 0s 1 normal none running mp_show;
+	opacity: 1 !important;
+}
+
+@keyframes mp_show {
+	0% {
+		opacity: 0;
+	}
+
+	25% {
+		opacity: 0.25;
+	}
+
+	50% {
+		opacity: 0.5;
+	}
+
+	75% {
+		opacity: 0.75;
+	}
+
+	100% {
+		opacity: 1;
+	}
+}
+
+.mp_hide {
+	animation: 0.5s linear 0s 1 normal none running mp_hide;
+	opacity: 0 !important;
+}
+
+@keyframes mp_hide {
+	0% {
+		transform: translateY(100%);
+	}
+
+	25% {
+		transform: translateY(75%);
+	}
+
+	50% {
+		transform: translateY(50%);
+	}
+
+	75% {
+		transform: translateY(25%);
+	}
+
+	100% {
+		transform: translateY(0px);
+	}
+}
 
 .map_img.movefd {
 	top: -40% !important;
@@ -555,8 +746,8 @@ body::-webkit-scrollbar {
 
 .map_txt {
 	background: url("../images/map_txt.png") center center / 100% 100% no-repeat;
-	width: 225px;
-	height: 100px;
+	width: 240px;
+	height: 140px;
 	padding: 20px;
 }
 
@@ -572,81 +763,7 @@ body::-webkit-scrollbar {
 	line-height: 20px;
 }
 
-.map_id1,
-.map_id2,
-.map_id3,
-.map_id4 {
-	opacity: 0;
-}
-
-.map_id2 {
-	top: 150px;
-	left: 260px;
-}
-
-.map_id3 {
-	top: 350px;
-	left: 460px;
-}
-
-.map_id4 {
-	top: 300px;
-	right: 460px;
-}
-
-.mp_show {
-	animation: 1s linear 0s 1 normal none running mp_show;
-	opacity: 1 !important;
-}
-
-@keyframes mp_show {
-	0% {
-		opacity: 0;
-	}
-
-	25% {
-		opacity: 0.25;
-	}
-
-	50% {
-		opacity: 0.5;
-	}
-
-	75% {
-		opacity: 0.75;
-	}
-
-	100% {
-		opacity: 1;
-	}
-}
-
-.mp_hide {
-	animation: 0.5s linear 0s 1 normal none running mp_hide;
-	opacity: 0 !important;
-}
 
-@keyframes mp_hide {
-	0% {
-		transform: translateY(100%);
-	}
-
-	25% {
-		transform: translateY(75%);
-	}
-
-	50% {
-		transform: translateY(50%);
-	}
-
-	75% {
-		transform: translateY(25%);
-	}
-
-	100% {
-		transform: translateY(0px);
-	}
-}
 
 #canvas {
 	position: absolute;
@@ -1079,9 +1196,9 @@ body::-webkit-scrollbar {
 }
 .tk_bottom2{
 	width: 487px;
-	    float: left;
-	    height: 325px;
-		margin-top: 20px;
+	float: left;
+	height: 325px;
+	margin-top: 20px;
 }
 #jkspfx{
 	width: 487px;
@@ -1104,7 +1221,7 @@ body::-webkit-scrollbar {
 .tit_date option::-ms-expand{ display: none; }
 .tit_date option{
 	-moz-appearance:none; / Firefox /
--webkit-appearance:none; / Safari 和 Chrome /
+-webkit-appearance:none; / Safari 和 Chrome /
 appearance:none;
 	background: #031957;
 	border: 0px;

mybusiness/src/main/resources/static/visualization/js/th_jk.js

@@ -1,6 +1,6 @@
     $(function () {
         //地图
-        setInterval("autochange()", 10000);
+        // setInterval("autochange()", 10000);
         //背景
         var wid = $(document).width();
         var hei = $(document).height();
@@ -105,8 +105,21 @@
         imputationDataList();
         // 弹框数据归集
         // tk_gjsj();
+
+
+
+        // mp1();
+
+        // setInterval("autochange()", 10000);
+
+
+
     });
 
+
+
+
+
     //时间
     function getNow(Mytime) {
         return Mytime < 10 ? '0' + Mytime : Mytime;
@@ -131,68 +144,69 @@
         $(".sfm").text(now2);
     }
 
-    //地图
-    var obj = [
-        function () {
-            $(".map_img").removeClass("movefd");
-            $(".map_img").addClass("movesx");
-        }, function () {
-            $(".map_img").removeClass("movesx");
-            $(".map_img").addClass("movess");
-        },
-        function () {
-            $(".map_img").removeClass("movess");
-            $(".map_img").addClass("movexj");
-        },
-        function () {
-            $(".map_img").removeClass("movexj");
-            $(".map_img").addClass("movefd");
-        }
-    ]
-    $.each(obj, function (i) {
-        // Replace 500 with whatever you want
-        setInterval(this, 10000 * i);
-    });
 
 
-    function mp_id1() {
-        $('.map_id1').addClass("mp_hide").removeClass("mp_show");
-        $('.map_id2').addClass("mp_show").removeClass("mp_hide");
+    var t = 10000;
+    function func1(){
+        $(".map_img").attr('class','map_img mp1');
+        $('.map_id1').addClass('mp_show').siblings('.map_id').removeClass('mp_show');
+        setTimeout(func2,t);
     }
-
-    function mp_id2() {
-        $('.map_id2').addClass("mp_hide").removeClass("mp_show");
-        $('.map_id3').addClass("mp_show").removeClass("mp_hide");
+    function func2(){
+        $(".map_img").attr('class','map_img mp2');
+        $('.map_id2').addClass('mp_show').siblings('.map_id').removeClass('mp_show');
+        setTimeout(func3,t);
     }
-
-    function mp_id3() {
-        $('.map_id3').addClass("mp_hide").removeClass("mp_show");
-        $('.map_id4').addClass("mp_show").removeClass("mp_hide");
+    function func3(){
+        $(".map_img").attr('class','map_img mp3');
+        $('.map_id3').addClass('mp_show').siblings('.map_id').removeClass('mp_show');
+        setTimeout(func4,t)
     }
-
-    function mp_id4() {
-        $('.map_id4').addClass("mp_hide").removeClass("mp_show");
-        $('.map_id1').addClass("mp_show").removeClass("mp_hide");
+    function func4(){
+        $(".map_img").attr('class','map_img mp4');
+        $('.map_id4').addClass('mp_show').siblings('.map_id').removeClass('mp_show');
+        setTimeout(func5,t)
     }
-
-    // 设置一个判断计数器
-    var count = 0;
-    // 根据计数器状态切换响应的皮肤
-    function autochange() {
-        if (count == 0) {
-            mp_id1();
-        }
-        if (count == 1) {
-            mp_id2();
-        }
-        if (count == 2) {
-            mp_id3();
-        }
-        if (count == 3) {
-            mp_id4();
-        }
-        count = count + 1;
-        if (count > 3) {
-            count = 0;
-        }
+    function func5(){
+        $(".map_img").attr('class','map_img mp5');
+        $('.map_id5').addClass('mp_show').siblings('.map_id').removeClass('mp_show');
+        setTimeout(func6,t)
+    }
+    function func6(){
+        $(".map_img").attr('class','map_img mp6');
+        $('.map_id6').addClass('mp_show').siblings('.map_id').removeClass('mp_show');
+        setTimeout(func7,t)
     }
+    function func7(){
+        $(".map_img").attr('class','map_img mp7');
+        $('.map_id7').addClass('mp_show').siblings('.map_id').removeClass('mp_show');
+        setTimeout(func8,t)
+    }
+    function func8(){
+        $(".map_img").attr('class','map_img mp8');
+        $('.map_id8').addClass('mp_show').siblings('.map_id').removeClass('mp_show');
+        setTimeout(func9,t)
+    }
+    function func9(){
+        $(".map_img").attr('class','map_img mp9');
+        $('.map_id9').addClass('mp_show').siblings('.map_id').removeClass('mp_show');
+        setTimeout(func10,t)
+    }
+    function func10(){
+        $(".map_img").attr('class','map_img mp10');
+        $('.map_id10').addClass('mp_show').siblings('.map_id').removeClass('mp_show');
+        setTimeout(func11,t)
+    }
+    function func11(){
+        $(".map_img").attr('class','map_img mp11');
+        $('.map_id11').addClass('mp_show').siblings('.map_id').removeClass('mp_show');
+        setTimeout(func12,t)
+    }
+    function func12(){
+        $(".map_img").attr('class','map_img mp12');
+        $('.map_id12').addClass('mp_show').siblings('.map_id').removeClass('mp_show');
+        setTimeout(func1,t)
+    }
+
+    window.onload = func1;
+    

mybusiness/src/main/resources/static/visualization/visualization/tk_iframe.html

@@ -14,6 +14,8 @@
 		<script type="text/javascript" th:src="@{/visualization/js/th_jk.js}"></script>
 	</head>
 	<body>
+	<img th:src="@{/visualization/js/01.jpg}"/>
+
 		<div class="tk_tit">
 			<span>XXXX部门</span>
 			<u class="tk_close">X</u>

mybusiness/src/main/resources/templates/visualization/index.html

@@ -21,7 +21,16 @@
     <h1 class="logo"><img th:src="@{/visualization/images/thqzj_logo.png}"/></h1>
     <div class="header_nav fr">
         <a class="on">大数据</a>
-        <a>接入部门</a>
+        <a>
+            <select>
+            <option selected>接入部门</option>
+                <option>血站</option>
+                <option>体检中心</option>
+                <option>图书馆</option>
+                <option>自来水公司</option>
+                <option>不动产登记中心</option>
+            </select>
+          </a>
         <a>接口故障<i>（<span id="faultInterfaceCount">0</span>）</i></a>
     </div>
 </div>
@@ -93,7 +102,8 @@
     </div>
     <div id="map_div" class="fl con_left2">
         <img th:src="@{/visualization/images/map.png}" class="map_img"/>
-        <div class="map_id map_id1 mp_show">
+        <div class="map_index">
+        <div class="map_id map_id1 ">
             <div class="map_sj">
                 <i class="map_wz4"></i>
                 <i class="map_wz3"></i>
@@ -102,10 +112,10 @@
             </div>
             <div class="map_dx">
                 <div class="map_txt">
-                    <h1>通化市1XXX部门</h1>
+                    <h1>通化市血站</h1>
                     <p>联系人：柳爽</p>
                     <p>电话：15636365656</p>
-                    <p>地址：通化市童话街璐璐大厦2256</p>
+                    <p>地址：通化市东昌区新站路东方假日酒店西侧约80米</p>
                 </div>
                 <i class="map_d"></i>
                 <i class="map_x"></i>
@@ -120,10 +130,10 @@
             </div>
             <div class="map_dx">
                 <div class="map_txt">
-                    <h1>通化市2XXX部门</h1>
+                    <h1>通化健康体检中心</h1>
                     <p>联系人：柳爽</p>
                     <p>电话：15636365656</p>
-                    <p>地址：通化市童话街璐璐大厦2256</p>
+                    <p>地址：吉林省通化市东昌区龙泉路118号</p>
                 </div>
                 <i class="map_d"></i>
                 <i class="map_x"></i>
@@ -138,10 +148,10 @@
             </div>
             <div class="map_dx">
                 <div class="map_txt">
-                    <h1>通化市3XXX部门</h1>
+                    <h1>通化市图书馆(江南馆)</h1>
                     <p>联系人：柳爽</p>
-                    <p>电话：15636365656</p>
-                    <p>地址：通化市童话街璐璐大厦2256</p>
+                    <p>电话：(0435)3216559</p>
+                    <p>地址：通化市东昌区江南西路590号</p>
                 </div>
                 <i class="map_d"></i>
                 <i class="map_x"></i>
@@ -156,16 +166,162 @@
             </div>
             <div class="map_dx">
                 <div class="map_txt">
-                    <h1>通化市4XXX部门</h1>
+                    <h1>通化市自来水公司客户服务中心</h1>
                     <p>联系人：柳爽</p>
                     <p>电话：15636365656</p>
-                    <p>地址：通化市童话街璐璐大厦2256</p>
+                    <p>地址：吉林省通化市东昌区秀泉路965号</p>
+                </div>
+                <i class="map_d"></i>
+                <i class="map_x"></i>
+            </div>
+        </div>
+        <div class="map_id map_id5">
+            <div class="map_sj">
+                <i class="map_wz4"></i>
+                <i class="map_wz3"></i>
+                <i class="map_wz2"></i>
+                <i class="map_wz1"></i>
+            </div>
+            <div class="map_dx">
+                <div class="map_txt">
+                    <h1>通化市不动产登记中心</h1>
+                    <p>联系人：柳爽</p>
+                    <p>电话：(0435)3919031</p>
+                    <p>地址：吉林省通化市东昌区光明路416号</p>
                 </div>
                 <i class="map_d"></i>
                 <i class="map_x"></i>
             </div>
         </div>
 
+        <div class="map_id map_id6">
+            <div class="map_sj">
+                <i class="map_wz4"></i>
+                <i class="map_wz3"></i>
+                <i class="map_wz2"></i>
+                <i class="map_wz1"></i>
+            </div>
+            <div class="map_dx">
+                <div class="map_txt">
+                    <h1>通化市住房公积金管理中心</h1>
+                    <p>联系人：柳爽</p>
+                    <p>电话：(0435)3269066</p>
+                    <p>地址：通化市东昌区东昌路707号</p>
+                </div>
+                <i class="map_d"></i>
+                <i class="map_x"></i>
+            </div>
+        </div>
+        <div class="map_id map_id7">
+            <div class="map_sj">
+                <i class="map_wz4"></i>
+                <i class="map_wz3"></i>
+                <i class="map_wz2"></i>
+                <i class="map_wz1"></i>
+            </div>
+            <div class="map_dx">
+                <div class="map_txt">
+                    <h1>吉林省通化市燃气总公司</h1>
+                    <p>联系人：柳爽</p>
+                    <p>电话：(0435)3961181</p>
+                    <p>地址：吉林省通化市东昌区新胜北路219号</p>
+                </div>
+                <i class="map_d"></i>
+                <i class="map_x"></i>
+            </div>
+        </div>
+        <div class="map_id map_id8">
+            <div class="map_sj">
+                <i class="map_wz4"></i>
+                <i class="map_wz3"></i>
+                <i class="map_wz2"></i>
+                <i class="map_wz1"></i>
+            </div>
+            <div class="map_dx">
+                <div class="map_txt">
+                    <h1>通化市医药和食品产业服务中心</h1>
+                    <p>联系人：柳爽</p>
+                    <p>电话：(0435)3961181</p>
+                    <p>地址：通化市东昌区秀泉路通化市政府西侧约50米</p>
+                </div>
+                <i class="map_d"></i>
+                <i class="map_x"></i>
+            </div>
+        </div>
+        <div class="map_id map_id9">
+            <div class="map_sj">
+                <i class="map_wz4"></i>
+                <i class="map_wz3"></i>
+                <i class="map_wz2"></i>
+                <i class="map_wz1"></i>
+            </div>
+            <div class="map_dx">
+                <div class="map_txt">
+                    <h1>通化市殡仪馆</h1>
+                    <p>联系人：柳爽</p>
+                    <p>电话：(0435)3961181</p>
+                    <p>地址：吉林省通化市东昌区新安路1111号</p>
+                </div>
+                <i class="map_d"></i>
+                <i class="map_x"></i>
+            </div>
+        </div>
+
+        <div class="map_id map_id10">
+            <div class="map_sj">
+                <i class="map_wz4"></i>
+                <i class="map_wz3"></i>
+                <i class="map_wz2"></i>
+                <i class="map_wz1"></i>
+            </div>
+            <div class="map_dx">
+                <div class="map_txt">
+                    <h1>通化市房产管理中心</h1>
+                    <p>联系人：柳爽</p>
+                    <p>电话：(0435)3961181</p>
+                    <p>地址：通化市东昌区新华大街30号</p>
+                </div>
+                <i class="map_d"></i>
+                <i class="map_x"></i>
+            </div>
+        </div>
+        <div class="map_id map_id11">
+            <div class="map_sj">
+                <i class="map_wz4"></i>
+                <i class="map_wz3"></i>
+                <i class="map_wz2"></i>
+                <i class="map_wz1"></i>
+            </div>
+            <div class="map_dx">
+                <div class="map_txt">
+                    <h1>通化市公共资源交易中心</h1>
+                    <p>联系人：柳爽</p>
+                    <p>电话：(0435)3961181</p>
+                    <p>地址：吉林省通化市东昌区新城路113号</p>
+                </div>
+                <i class="map_d"></i>
+                <i class="map_x"></i>
+            </div>
+        </div>
+        <div class="map_id map_id12">
+            <div class="map_sj">
+                <i class="map_wz4"></i>
+                <i class="map_wz3"></i>
+                <i class="map_wz2"></i>
+                <i class="map_wz1"></i>
+            </div>
+            <div class="map_dx">
+                <div class="map_txt">
+                    <h1>通化市城市管理行政执法局</h1>
+                    <p>联系人：柳爽</p>
+                    <p>电话：(0435)3961181</p>
+                    <p>地址：吉林省通化市东昌区新站路352号</p>
+                </div>
+                <i class="map_d"></i>
+                <i class="map_x"></i>
+            </div>
+        </div>
+        </div>
     </div>
     <div class="fr con_right">
         <div class="jkgj con_bg">