From 4d8ef5d02421b1bb60f575e56b75d43a1ea4c2bb Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 15 Jun 2021 14:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap
---
widgets/MapPrinting/Widget.html | 4 +
widgets/SplitScreen/css/style.css | 3
widgets/CoorPosition/css/style.css | 39 +++++-------
widgets/searchTabaPopup/css/style.css | 72 ++++++++++++++++-------
widgets/CoorPosition/Widget.html | 2
widgets/Rolling/css/style.css | 4 +
widgets/Measurement/css/style.css | 8 ++
widgets/searchTabaPopup/Widget.js | 1
widgets/searchTabaPopup/Widget.html | 4
widgets/Rolling/Widget.html | 2
widgets/MapPrinting/css/style.css | 6 +
widgets/Measurement/Widget.html | 2
widgets/Tool/css/style.css | 2
widgets/Sign/css/style.css | 11 +++
widgets/Sign/Widget.html | 2
15 files changed, 102 insertions(+), 60 deletions(-)
diff --git a/widgets/CoorPosition/Widget.html b/widgets/CoorPosition/Widget.html
index e058345..38f45b7 100644
--- a/widgets/CoorPosition/Widget.html
+++ b/widgets/CoorPosition/Widget.html
@@ -2,7 +2,7 @@
<div class="CoorPosition-zbdw" id="CoorPosition-zbdw">
<span class="CoorPosition-zbdw-pic"></span>
<div class="CoorPosition-zbdw-zbdw">坐标定位</div>
- <span class="CoorPosition-zbdw-x">x</span>
+ <span class="CoorPosition-zbdw-x"><i class="layui-icon">ဆ</i></span>
</div>
<div class="CoorPosition-input">
<div class="CoorPosition-input-JD mouseenterJD">
diff --git a/widgets/CoorPosition/css/style.css b/widgets/CoorPosition/css/style.css
index a2ed75d..13b584d 100644
--- a/widgets/CoorPosition/css/style.css
+++ b/widgets/CoorPosition/css/style.css
@@ -1,7 +1,7 @@
-.jimu-widget-CoorPosition{
+.jimu-widget-CoorPosition {
background-color: rgb(255, 255, 255);
font-size: 14px;
- border: 1px solid rgb(69, 154, 251);
+ /* border: 1px solid rgb(69, 154, 251); */
color: rgb(0, 0, 0);
font-size: 16px;
width: 100%;
@@ -9,6 +9,7 @@
border-radius: 5px;
display: none;
box-sizing: border-box;
+ box-shadow: 0 0 8px #fff;
}
.CoorPosition-zbdw {
@@ -32,23 +33,27 @@
.CoorPosition-zbdw-zbdw {
width: 100%;
line-height: 33px;
- font-size: 14px;
+ font-size: 17px;
}
.CoorPosition-zbdw-x {
position: absolute;
- right: 6px;
+ right: 13px;
top: 5px;
width: 10px;
font-size: 18px;
cursor: pointer;
}
-
+.CoorPosition-zbdw-x:hover{
+ color: red;
+}
.CoorPosition-input {
width: 100%;
/* background-color: blue; */
padding: 8px 5px;
- font-size: 14px;
+ font-size: 15px;
+ position: relative;
+ top: 5px;
}
.CoorPosition-input-JD {
@@ -69,11 +74,13 @@
background-color: rgba(69, 154, 251, 0.35);
border: none;
text-indent: 2em;
- caret-color:rgba(69, 154, 251, 1);
+ caret-color: rgba(69, 154, 251, 1);
color: rgb(0, 0, 0);
}
.queDing {
+ height: 28px;
+ line-height: 5px;
background-color: rgba(255, 255, 255);
border: 1px solid rgba(69, 154, 251, 0.35);
color: rgb(0, 0, 0);
@@ -81,7 +88,7 @@
padding: 5px;
cursor: pointer;
border-radius: 5px;
- box-shadow: 3px 3px 20px -4px #3E9FFC;
+ box-shadow: 3px 3px 15px -4px #3E9FFC;
}
.jiantou {
@@ -114,18 +121,4 @@
right: -16px;
width: 19px;
height: 19px;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
\ No newline at end of file
diff --git a/widgets/MapPrinting/Widget.html b/widgets/MapPrinting/Widget.html
index 2f6070d..f0966e7 100644
--- a/widgets/MapPrinting/Widget.html
+++ b/widgets/MapPrinting/Widget.html
@@ -10,6 +10,8 @@
<img class="MapPrinting-pic" src="../../images/newImages/打印.png" alt="">
<span class="MapPrinting-right-dayin">打印</span>
</div>
- <span class="MapPrinting-flex-x">x</span>
+ <span class="MapPrinting-flex-x">
+ <i class="layui-icon">ဆ</i>
+ </span>
</div>
</div>
\ No newline at end of file
diff --git a/widgets/MapPrinting/css/style.css b/widgets/MapPrinting/css/style.css
index 96bc00a..3d60ab9 100644
--- a/widgets/MapPrinting/css/style.css
+++ b/widgets/MapPrinting/css/style.css
@@ -8,6 +8,7 @@
height: 100%;
border-radius: 10px;
display: none;
+ box-shadow: 0 0 8px #fff;
}
.MapPrinting-flex {
@@ -64,4 +65,7 @@
/* padding: 5px; */
position: relative;
top: -2px;
-}
\ No newline at end of file
+}
+.MapPrinting-flex-x :hover{
+ color: red;
+}
diff --git a/widgets/Measurement/Widget.html b/widgets/Measurement/Widget.html
index 4019ffe..03e53e1 100644
--- a/widgets/Measurement/Widget.html
+++ b/widgets/Measurement/Widget.html
@@ -1,6 +1,6 @@
<div id="table">
<div class="th">
- <i class="i"></i><span class="tsls">图上量算</span><span class="xx">×</span>
+ <i class="i"></i><span class="tsls">图上量算</span><span class="xx"><i class="layui-icon">ဆ</i></span>
</div>
<div class="td">
<div class="fangge" id="measuerLength" title="提示:单击按钮激活对应功能,在地图上单击开始,绘制中单击增加点,双击结束">
diff --git a/widgets/Measurement/css/style.css b/widgets/Measurement/css/style.css
index 7c90337..0d6458f 100644
--- a/widgets/Measurement/css/style.css
+++ b/widgets/Measurement/css/style.css
@@ -3,11 +3,12 @@
height: 100%;
background-color: rgb(255, 255, 255);
font-size: 14px;
- border: 1px solid rgb(69, 154, 251);
+ /* border: 1px solid rgb(69, 154, 251); */
color: rgb(0, 0, 0);
font-size: 16px;
display: none;
border-radius: 5px;
+ box-shadow: 0 0 8px #fff;
}
#table {
@@ -39,6 +40,11 @@
font-size: 30px;
line-height: 20px;
cursor: pointer;
+ position: relative;
+ top: -2px;
+}
+.xx:hover {
+ color: red;
}
.td {
diff --git a/widgets/Rolling/Widget.html b/widgets/Rolling/Widget.html
index d5af37f..ba60733 100644
--- a/widgets/Rolling/Widget.html
+++ b/widgets/Rolling/Widget.html
@@ -14,7 +14,7 @@
<option class="optionVal4" value="2">天地图影像</option>
</select>
</div>
- <span class="rollinng-table-hezi-xx">x</span>
+ <span class="rollinng-table-hezi-xx"><i class="layui-icon">ဆ</i> </span>
</div>
<div class="hiddenHeZi">
diff --git a/widgets/Rolling/css/style.css b/widgets/Rolling/css/style.css
index 644e280..a14c130 100644
--- a/widgets/Rolling/css/style.css
+++ b/widgets/Rolling/css/style.css
@@ -2,7 +2,7 @@
width: 100%;
height: 320px;
/* background-color: #323a36; */
- background-color: rgba(255, 255, 255,.75);
+ background-color: rgb(255, 255, 255);
font-size: 14px;
/* border: 1px solid rgb(69, 154, 251); */
color: rgb(0, 0, 0);
@@ -11,6 +11,7 @@
height: 100%;
border-radius: 10px;
display: none;
+ box-shadow: 0 0 8px #fff;
}
.jimu-widget-Rolling .rollinng-table-hezi {
@@ -48,6 +49,7 @@
border-radius: 5px;
position: relative;
top: 1px;
+ box-shadow: 3px 3px 10px -4px #3E9FFC;
}
.jimu-widget-Rolling .hezi-select:hover {
diff --git a/widgets/Sign/Widget.html b/widgets/Sign/Widget.html
index 8f05a50..f191c07 100644
--- a/widgets/Sign/Widget.html
+++ b/widgets/Sign/Widget.html
@@ -4,7 +4,7 @@
<!-- <i class="sign-head-th-pic"></i> -->
<img class="sign-head-th-pic" src="./images/我的标记.png" alt="">
<span class="sign-head-th-biaoji">我的标记</span>
- <span class="sign-head-th-xx">×</span>
+ <span class="sign-head-th-xx"><i class="layui-icon">ဆ</i></span>
</div>
<div class="sign-head-td">
<ul class="sign-head-td-ul">
diff --git a/widgets/Sign/css/style.css b/widgets/Sign/css/style.css
index ce4c3d7..f551590 100644
--- a/widgets/Sign/css/style.css
+++ b/widgets/Sign/css/style.css
@@ -3,12 +3,13 @@
height: 320px;
background-color: rgb(255, 255, 255);
font-size: 14px;
- border: 1px solid rgb(69, 154, 251);
+ /* border: 1px solid rgb(69, 154, 251); */
/* opacity : .8; */
color: rgb(0, 0, 0);
font-size: 16px;
display: none;
border-radius: 5px;
+ box-shadow: 0 0 8px #fff;
}
#sign_table {
@@ -48,8 +49,14 @@
}
.sign-head-th-xx {
- font-size: 30px;
+ /* font-size: 25px; */
+ width: 25px;
cursor: pointer;
+ /* font-weight: 100; */
+ /* border: 1px solid springgreen; */
+}
+.sign-head-th-xx:hover{
+ color: red;
}
.sign-head-td {
diff --git a/widgets/SplitScreen/css/style.css b/widgets/SplitScreen/css/style.css
index 26b3ae2..734da6d 100644
--- a/widgets/SplitScreen/css/style.css
+++ b/widgets/SplitScreen/css/style.css
@@ -6,13 +6,14 @@
height: auto !important;
background-color: rgb(207, 207, 207);
font-size: 14px;
- border: 1px solid rgb(69, 154, 251);
+ /* border: 1px solid rgb(69, 154, 251); */
/* opacity : .8; */
color: rgb(0, 0, 0);
font-size: 16px;
z-index: 101;
border-radius: 10px 0 10px 10px;
display: none;
+ box-shadow: 0 0 8px #fff;
}
.jimu-widget-SplitScreen .split-select {
diff --git a/widgets/Tool/css/style.css b/widgets/Tool/css/style.css
index 9816062..ace5bd2 100644
--- a/widgets/Tool/css/style.css
+++ b/widgets/Tool/css/style.css
@@ -9,7 +9,7 @@
border-radius: 6px 0 0 6px;
text-align: center;
cursor: pointer;
- z-index: 1111 !important
+ z-index: 11 !important
}
.jimu-widget-Tool .tool-bar {
diff --git a/widgets/searchTabaPopup/Widget.html b/widgets/searchTabaPopup/Widget.html
index 875bf47..5273bde 100644
--- a/widgets/searchTabaPopup/Widget.html
+++ b/widgets/searchTabaPopup/Widget.html
@@ -23,8 +23,8 @@
<div class="layui-tab-item ">
<div class="shishishuju">
<div class="heard">
- <div>当前站点：<span class="myOUrtitle">南矶山备战湖</span> </div>
- <div>监测时间：<span class="myOUrtime">2021-05-06 10：07:00</span> </div>
+ <div class="lefts">当前站点：<span class="myOUrtitle">南矶山备战湖</span> </div>
+ <div class="rights">监测时间：<span class="myOUrtime">2021-05-06 10：07:00</span> </div>
</div>
<div class="layui-tab">
<ul class="layui-tab-title">
diff --git a/widgets/searchTabaPopup/Widget.js b/widgets/searchTabaPopup/Widget.js
index a51f42a..af52577 100644
--- a/widgets/searchTabaPopup/Widget.js
+++ b/widgets/searchTabaPopup/Widget.js
@@ -218,6 +218,7 @@
// text: '折线图堆叠'
// },
animationDuration: 1000,
+ color: ['#1AD4AD', '#5AB1EF', '#F96D85', '#FFBD87', '#0067A5','#CABDE7','#D87C82','#A0BEFF','#D9D0C7','#8DAD9C'],
dataZoom: [{
type: 'slider'
}, {
diff --git a/widgets/searchTabaPopup/css/style.css b/widgets/searchTabaPopup/css/style.css
index 6df2869..412e374 100644
--- a/widgets/searchTabaPopup/css/style.css
+++ b/widgets/searchTabaPopup/css/style.css
@@ -12,13 +12,13 @@
background: rgba(0, 0, 0, 0.5);
/* border : 1px solid #000; */
/* cursor : pointer; */
- z-index: 13 !important;
+ z-index: 14 !important;
}
.jimu-widget-searchTabaPopup .popup {
/* display: none; */
- width: 900px;
- height: 600px;
+ width: 880px;
+ height: 540px;
/* min-height: 600px; */
/* max-height: 750px; */
/* overflow: auto; */
@@ -63,7 +63,7 @@
font-size: 20px;
} */
-.jimu-widget-searchTabaPopup .two #poput-m-t-video{
+.jimu-widget-searchTabaPopup .two #poput-m-t-video {
width: 100%;
height: 560px;
/* border: 1px springgreen solid; */
@@ -76,13 +76,15 @@
top: 40px;
overflow: hidden;
}
+
/* .jimu-widget-searchTabaPopup .two #poput-m-t-video .title{
color: #409EFF;
width: 92%;
font-size: 25px;
padding: 20px 0 8px 0;
} */
-.jimu-widget-searchTabaPopup .two .header{
+
+.jimu-widget-searchTabaPopup .two .header {
background-color: #409EFF;
width: 100%;
height: 40px;
@@ -97,27 +99,28 @@
z-index: 14;
}
-.jimu-widget-searchTabaPopup .shishishuju .layui-tab-content{
-
+.jimu-widget-searchTabaPopup .shishishuju .layui-tab-content {
height: 450px;
overflow: auto;
/* border: 1px springgreen solid; */
}
-#poput-m-t-video-video{
+#poput-m-t-video-video {
width: 100%;
height: 560px;
object-fit: fill;
/* border: 1px springgreen solid; */
}
-#poput-m-t-video-login{
+
+#poput-m-t-video-login {
width: 100%;
height: 560px;
display: flex;
align-items: center;
justify-content: center;
}
-#poput-m-t-video-none{
+
+#poput-m-t-video-none {
font-size: 24px;
width: 100%;
height: 560px;
@@ -125,8 +128,6 @@
align-items: center;
justify-content: center;
}
-
-
.jimu-widget-searchTabaPopup .layui-this {
color: #409EFF !important;
@@ -154,32 +155,35 @@
}
.jimu-widget-searchTabaPopup .xiangqing th {
- width: 140px;
+ width: 160px;
text-align-last: justify;
font-size: 14px;
- padding: 20px;
+ padding: 19px;
border-right: transparent 1px solid !important;
}
.jimu-widget-searchTabaPopup .xiangqing td {
- width: 400px;
+ width: 380px;
text-align-last: right;
padding-right: 5px;
font-size: 14px;
}
-.jimu-widget-searchTabaPopup .xiangqing tr:nth-child(6) td , .jimu-widget-searchTabaPopup .xiangqing tr:nth-child(7) td{
+
+.jimu-widget-searchTabaPopup .xiangqing tr:nth-child(6) td, .jimu-widget-searchTabaPopup .xiangqing tr:nth-child(7) td {
text-align-last: left;
text-indent: 2em;
padding-left: 5px;
}
-.jimu-widget-searchTabaPopup .xiangqing th, .jimu-widget-searchTabaPopup .xiangqing td ,.jimu-widget-searchTabaPopup .xiangqing table{
+.jimu-widget-searchTabaPopup .xiangqing th, .jimu-widget-searchTabaPopup .xiangqing td, .jimu-widget-searchTabaPopup .xiangqing table {
border-color: rgba(0, 0, 0, .1);
}
-.jimu-widget-searchTabaPopup .xiangqing img{
+
+.jimu-widget-searchTabaPopup .xiangqing img {
width: 175px;
-padding: 5px 5px 5px 0;
+ padding: 5px 5px 5px 0;
}
+
.jimu-widget-searchTabaPopup .shishishuju {
width: 100%;
height: 100%;
@@ -196,8 +200,9 @@
padding-bottom: 5px;
padding-top: 5px;
}
-.layui-tab-content{
-padding: 0 !important;
+
+.layui-tab-content {
+ padding: 0 !important;
}
.jimu-widget-searchTabaPopup .shishishuju thead th, .jimu-widget-searchTabaPopup .shishishuju tbody td {
@@ -214,12 +219,14 @@
align-items: center;
justify-content: space-between;
}
-.jimu-widget-searchTabaPopup .lishijilv .heard .left{
+
+.jimu-widget-searchTabaPopup .lishijilv .heard .left {
/* border: 1px solid springgreen; */
display: flex;
align-items: center;
}
-.jimu-widget-searchTabaPopup .lishijilv .heard .layui-form-item{
+
+.jimu-widget-searchTabaPopup .lishijilv .heard .layui-form-item {
/* border: 1px solid springgreen; */
position: relative;
top: 12px;
@@ -245,4 +252,23 @@
input::-ms-input-placeholder {
color: #afafaf;
font-size: 14px;
+}
+
+.jimu-widget-searchTabaPopup .lishijilv #query, .jimu-widget-searchTabaPopup .lishijilv #empty {
+ border-radius: 5px;
+}
+
+.jimu-widget-searchTabaPopup .rights {
+ position: relative;
+ left: -10px;
+}
+
+.jimu-widget-searchTabaPopup .lefts {
+ position: relative;
+ left: 10px;
+}
+
+.jimu-widget-searchTabaPopup #shuiwenshishi {
+ overflow: auto;
+ height: 411px;
}
\ No newline at end of file
--
Gitblit v1.9.3