'update'

public/datav/index.html

@@ -85,26 +85,24 @@
 
 		@keyframes floatShadow {
 		  0% {
-			text-shadow: 0 0 5px #fff;
 			transform:translateX(1300px);
 			display:block;
 		  }
 		  100% {
-			text-shadow: 0 0 5px #fff;
 			transform:translateX(-1300px);
 			display:none;
 		  }
 		}
 		 
 		.floating-text {
-		  font-size: 30px;
-		  color: #FDD756;
-		  //animation: floatShadow;
+		  font-size:18px;line-height:1;
+		  color: #FDD756;text-shadow: 0 0 5px #fff;
+		  animation: floatShadow;
 		  animation-name:floatShadow;
 		  animation-duration: 20s;
 		  animation-iteration-count: infinite;
 		  animation-timing-function:linear;
-		  position:absolute;
+		  position:absolute;top:3px;
 		}
 
 		.a0a_{
@@ -159,9 +157,14 @@
 				<div class="floating-text">中和地信有限公司欢迎您</div>
 
 
-				<div class="a0a_">
-					<ul><li data-id="1" class="active">应急管理</li> <li data-id="2" class="">自然资源</li></ul>
-					<ul><li data-id="5" class="">水利系统</li> <li data-id="6" class="">电子档案</li></ul>
+				<div class="a0a_" id="h_tab">
+					<ul>
+						<li data-id="1" class="active">应急管理</li>
+						<li data-id="2" class="" >自然资源</li></ul>
+					<ul>
+						<li data-id="3" class="" >水利系统</li>
+						<li data-id="4" class="">电子档案</li>
+					</ul>
 				</div>
             </div>
         </div>
@@ -796,8 +799,6 @@
 	
     const host = location.protocol + '//' + (location.hostname === '192.168.3.226' ? '192.168.3.37' : '192.168.13.200') + ':8013';
 
-	console.log('host ________________ ', location.hostname);
-
 	const selfHost = location.hostname === '192.168.3.226' ? 'http://192.168.3.226:8057' : 'http://192.168.13.200:8057';
 
 
@@ -986,6 +987,25 @@
                 }
                 this.noticeIndex = this.noticeIndex + 1;
             }, 10 * 1000);
+
+
+			// tab event
+			var h_tab = this.$el.querySelector("#h_tab");
+			console.log('h_tab ________________ ', h_tab);
+
+			h_tab.onclick = function(e){
+				var tag = e.target || e.srcElement;
+				console.log('tag ________________ ', tag);
+				if(tag.nodeName === 'LI'){
+					var did = ~~tag.dataset.id;
+
+					if(did === 2){
+						window.open('/datav/natural.html')
+					}else if(did === 3){
+						window.open('/datav/watersource.html')
+					};
+				};
+			};
         },
         methods: {
             querySearchAsync(queryString, cb) {

public/datav/natural.html

@@ -752,10 +752,10 @@
 						</div>
 						<div class="a0a_" id="a0a_">
 							<ul>
-								<li><a href="javascript:void(0)">返回首页</a></li>
+								<li><a href="/datav/index.html">返回首页</a></li>
 							</ul>
 							<ul>
-								<li><a href="javascript:void(0)">后台管理</a></li>
+								<li><a href="/#/dashboard">后台管理</a></li>
 							</ul>
 						</div>
 					</header>
@@ -916,12 +916,17 @@
 
 	const LOCAL_API = location.protocol + '//' + (location.hostname === '192.168.3.226' ? '192.168.3.37' : '192.168.13.200') + ':8013';
 
-	console.log('LOCAL_API ________________ ', LOCAL_API);
+	const selfHost = location.hostname === '192.168.3.226' ? 'http://192.168.3.226:8057' : 'http://192.168.13.200:8013';
     
 	qf(function(){
 		var host = location.protocol + '//' + window.location.host;
 		var token = Cookies.get('ELADMIN-TOEKN');
 
+		if (!token) {
+			window.open(selfHost + '/#/login', '_self')
+			return
+		}
+
 
 		axios = axios.create({
 			baseURL: LOCAL_API,
@@ -997,8 +1002,6 @@
 				var wrap33 = amd33.querySelector(".wrap");
 				var select33 = amd33.querySelector("select");
 
-				console.log('mounted ________________ ', this);
-
 				select33.onchange = function(e){
 					var value = this.selectedOptions[0].value;
 					m.alarmTrend(value);
@@ -1176,7 +1179,7 @@
 				})();
 
 
-				// 温度监测
+				// 风速监测
 				(m.fengsu = function(dateRange){
 					m.requst('get', '/data/sz/countStatistics/feng', {}).then(function(res){
 						self.dm4 = res;