From 55a80ac5e42b06d7623e1a755fff5a54d463821f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 15 Jun 2021 08:52:47 +0800
Subject: [PATCH] 部分文件修改

---
 widgets/LeftNavigationBar/Widget.js   |   25 +++++++++++++++++++++++++
 widgets/instructions/Widget.js        |    2 +-
 widgets/FlyRoute/Widget.js            |    1 +
 widgets/searchTabaPopup/css/style.css |   14 +++++++++-----
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/widgets/FlyRoute/Widget.js b/widgets/FlyRoute/Widget.js
index 8ad607f..73266ea 100644
--- a/widgets/FlyRoute/Widget.js
+++ b/widgets/FlyRoute/Widget.js
@@ -150,6 +150,7 @@
 				this.flag = false;
 				$('.jimu-widget-FlyRoute').hide();
 				$('.jimu-widget-visualAngle .v-a-One').addClass('on').siblings().removeClass('on');
+				self.flightTool.flyManager.stop();
 				self.flightTool.RouteCollection.removeAllSites();
 				$("#passPoint").empty();
 			}
diff --git a/widgets/LeftNavigationBar/Widget.js b/widgets/LeftNavigationBar/Widget.js
index e0dcc05..750c7b9 100644
--- a/widgets/LeftNavigationBar/Widget.js
+++ b/widgets/LeftNavigationBar/Widget.js
@@ -327,6 +327,25 @@
 
 				}
 
+				var keyId = this.getUrlKeyId("serviceName");
+
+				if (keyId && keyId != "") {
+					for (var i = 0; i < data.length; i++) {
+
+						if (data[i].title == keyId) {
+							data[i].checked = true
+						}
+
+						for (var j = 0; j < data[i].children.length; j++) {
+
+							if (data[i].children[j].title == keyId) {
+								data[i].children[j].checked = true
+							}
+							 
+						}
+					}
+				}
+
 
 
 				this.data = data;
@@ -962,6 +981,12 @@
 					}]
 				}],
 			}],
+			getUrlKeyId: function (name) {
+				var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+				var r = window.location.search.substr(1).match(reg);
+				if (r != null) return decodeURI(r[2]);
+				return null;
+			},
 			destroy: function () {
 				//销毁的时候触发
 				//todo
diff --git a/widgets/instructions/Widget.js b/widgets/instructions/Widget.js
index e45f1a5..577abba 100644
--- a/widgets/instructions/Widget.js
+++ b/widgets/instructions/Widget.js
@@ -53,7 +53,7 @@
 				var d = [];
 				for (var k in data) {
 					var obj = {
-						title: data[k].name,
+						title: data[k].NAME,
 						id: data[k].id,
 					}
 					if (data[k].seviceUrl) {
diff --git a/widgets/searchTabaPopup/css/style.css b/widgets/searchTabaPopup/css/style.css
index 9e6b109..6df2869 100644
--- a/widgets/searchTabaPopup/css/style.css
+++ b/widgets/searchTabaPopup/css/style.css
@@ -85,13 +85,13 @@
 .jimu-widget-searchTabaPopup .two  .header{
   background-color: #409EFF;
   width: 100%;
-  height: 20px;
+  height: 40px;
   position: absolute;
   font-size: 20px;
   top: 0px;
   left: 0;
   color: #fff;
-  line-height: 20px;
+  line-height: 40px;
   border-radius: 5px 5px 0 0;
   text-indent: 2em;
   z-index: 14;
@@ -134,8 +134,12 @@
 
 .jimu-widget-searchTabaPopup .layui-tab-title li {
   position: relative;
-  top: -5px;
+  top: 0px;
   font-size: 15px;
+}
+
+.jimu-widget-searchTabaPopup .layui-tab {
+  margin: 0 !important;
 }
 
 .jimu-widget-searchTabaPopup .three {
@@ -184,7 +188,7 @@
 
 .jimu-widget-searchTabaPopup .shishishuju .heard {
   width: 100%;
-  height: 20px;
+  height: 36px;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -205,7 +209,7 @@
 }
 
 .jimu-widget-searchTabaPopup .lishijilv .heard {
-  font-size: 18px;
+  font-size: 16px;
   display: flex;
   align-items: center;
   justify-content: space-between;

--
Gitblit v1.9.3