From 96d560aa132a9638a45f5f6b44f456ffb6836948 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 08 Jun 2021 10:45:49 +0800
Subject: [PATCH] 搜索数据

---
 widgets/visualAngle/Widget.js |   10 -----
 widgets/searchL/Widget.js     |   12 ++++--
 widgets/searchL/css/style.css |   42 +++++++++++++++-----
 3 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index 9da4092..a2093b9 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -102,6 +102,10 @@
 				}
 			},
 			createData:function(d){
+				var i = 1;
+				for(var k in d){
+					d[k].tableId = i ++;
+				}
 				var data = d;
 				this.beginLayUi(data);
 			},
@@ -144,10 +148,10 @@
 							, last: false //不显示尾页
 						}
 						, cols: [[
-							{ field: 'id', width: 59, align: 'center', unresize: true, title: '序号' }
-							, { field: 'username', width: 90, align: 'center', unresize: true, title: '图层名称' }
-							, { field: 'style1', width: 95, align: 'center', unresize: true, title: '图层属性1' }
-							, { field: 'style2', width: 95, align: 'center', unresize: true, title: '图层属性2' }
+							{ field: 'tableId', width: 59, align: 'center', unresize: true, title: '序号' }
+							, { field: 'geoName', width: 90, align: 'center', unresize: true, title: '图层名称' }
+							, { field: 'databaseName', width: 95, align: 'center', unresize: true, title: '图层属性1' }
+							, { field: 'serviceUrl', width: 95, align: 'center', unresize: true, title: '图层属性2' }
 							, { fixed: 'right', width: 115, align: 'center', unresize: true, title: '操作', toolbar: '#demoTable' }
 						]],
 						data: data,
diff --git a/widgets/searchL/css/style.css b/widgets/searchL/css/style.css
index 42e2d0c..79ebfcb 100644
--- a/widgets/searchL/css/style.css
+++ b/widgets/searchL/css/style.css
@@ -57,10 +57,12 @@
   align-items: center;
   justify-content: center;
 }
-.jimu-widget-searchL #inputTwo #local_data2{
+
+.jimu-widget-searchL #inputTwo #local_data2 {
   position: relative;
   left: -15px;
 }
+
 .jimu-widget-searchL .input-sms1 {
   width: 90px;
   height: 35px;
@@ -78,10 +80,11 @@
   border: none;
   /* border-radius: 0px 5px 5px 0px; */
 }
-.jimu-widget-searchL .input_img {
 
+.jimu-widget-searchL .input_img {
   border-left: 1px solid rgba(0, 0, 0, .2);
 }
+
 .jimu-widget-searchL .input-sms1::-webkit-input-placeholder, .jimu-widget-searchL .input-sms::-webkit-input-placeholder {
   color: #afafaf;
   font-size: 14px;
@@ -116,43 +119,54 @@
   border-radius: 5px 5px 5px 5px;
   background-color: rgb(255, 255, 255);
 }
-.jimu-widget-searchL .searchLMain .layui-laypage-em{
+
+.jimu-widget-searchL .searchLMain .layui-laypage-em {
   background-color: #39A5FD;
 }
-.jimu-widget-searchL .searchLMain .layui-this{
+
+.jimu-widget-searchL .searchLMain .layui-this {
   color: #39A5FD;
 }
-.jimu-widget-searchL .searchLMain .layui-btn-xs{
+
+.jimu-widget-searchL .searchLMain .layui-btn-xs {
   background-color: #39A5FD;
 }
-.jimu-widget-searchL .searchLMain .layui-btn-primary{
+
+.jimu-widget-searchL .searchLMain .layui-btn-primary {
   background-color: #ffffff;
 }
-.jimu-widget-searchL .layui-tab-brief>.layui-tab-more li.layui-this:after, .layui-tab-brief>.layui-tab-title .layui-this:after{
+
+.jimu-widget-searchL .layui-tab-brief>.layui-tab-more li.layui-this:after, .layui-tab-brief>.layui-tab-title .layui-this:after {
   border-bottom: 2px solid #39A5FD;
 }
+
 .jimu-widget-searchL .searchLMain .layui-tab-title {
   /* border: 1px saddlebrown solid; */
   display: flex;
   align-items: center;
   justify-content: space-around;
 }
+
 .jimu-widget-searchL .searchLMain .layui-tab-title li {
   font-size: 18px;
 }
-.jimu-widget-searchL .searchLMain  .layui-table-view{
+
+.jimu-widget-searchL .searchLMain .layui-table-view {
   border-bottom: 1px #fff solid;
 }
+
 .jimu-widget-searchL .searchLMain #layui-table-page1 {
   position: relative;
   left: 30px;
   top: 5px;
 }
+
 .jimu-widget-searchL .searchLMain #layui-table-page1::before {
- content: '每页10条,';
- position: relative;
- top: -4px;
+  content: '每页10条,';
+  position: relative;
+  top: -4px;
 }
+
 .jimu-widget-searchL .searchLMain .searchColce {
   position: absolute;
   right: 10px;
@@ -170,4 +184,10 @@
 
 .jimu-widget-searchL .searchLMain .searchColce:hover {
   color: red;
+}
+
+.layui-table-tips-c:before {
+  position: relative;
+  right: 1px;
+  top: -3px;
 }
\ No newline at end of file
diff --git a/widgets/visualAngle/Widget.js b/widgets/visualAngle/Widget.js
index fdead0b..8932302 100644
--- a/widgets/visualAngle/Widget.js
+++ b/widgets/visualAngle/Widget.js
@@ -66,16 +66,6 @@
 					that.map.scene.screenSpaceCameraController.enableTilt = false
 				})
 
-				// $('.RouteNavigate-tool').click(function () {
-				// 	$('.jimu-widget-RouteNavigate').show();
-				// 	$('.jimu-widget-MapPrinting').hide();
-				// 	$('.jimu-widget-CoorPosition').hide();
-				// 	$('.jimu-widget-Measurement').hide();
-				// 	$('.jimu-widget-Sign').hide();
-				// 	$('.jimu-widget-FlyRoute').hide();
-				// 	$('.jimu-widget-DynamicRiver').hide();
-				// 	$('.tool-y-box').toggle()
-				// })
 			},
 
 			closeToolBox: function (item) {

--
Gitblit v1.9.3