From ebefa651ad2d6edbfdb30fea3fc1ff97232a0aee Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 15 Jun 2021 11:07:52 +0800
Subject: [PATCH] 工具样式
---
widgets/MapPrinting/Widget.html | 6 +
widgets/SplitScreen/css/style.css | 9 +-
images/newImages/shanchu.png | 0
images/newImages/图上测量.png | 0
widgets/SplitScreen/Widget.js | 25 +++--
widgets/CoorPosition/Widget.html | 6
widgets/Rolling/css/style.css | 15 +++
widgets/Measurement/css/style.css | 6
images/newImages/dakaiwenjian1_1.png | 0
images/newImages/锁.png | 0
images/newImages/打印.png | 0
images/newImages/文件.png | 0
images/newImages/tj1.png | 0
images/newImages/文件3.png | 0
widgets/Sign/Widget.html | 15 ++-
images/newImages/打开文件夹.png | 0
widgets/CoorPosition/css/style.css | 15 ++-
images/newImages/jiesuo.png | 0
images/newImages/cwj1.png | 0
images/newImages/dk1.png | 0
images/newImages/我的标记.png | 0
images/newImages/删除.png | 0
widgets/Sign/Widget.js | 12 +-
images/newImages/储存.png | 0
images/newImages/坐标定位.png | 0
widgets/MapPrinting/css/style.css | 49 ++++++------
images/newImages/解锁.png | 0
images/newImages/dakaiwenjian1.png | 0
images/newImages/文件1.png | 0
widgets/Sign/css/style.css | 45 +++++++++--
30 files changed, 123 insertions(+), 80 deletions(-)
diff --git a/images/newImages/cwj1.png b/images/newImages/cwj1.png
new file mode 100644
index 0000000..aedb81d
--- /dev/null
+++ b/images/newImages/cwj1.png
Binary files differ
diff --git a/images/newImages/dakaiwenjian1.png b/images/newImages/dakaiwenjian1.png
new file mode 100644
index 0000000..1793f13
--- /dev/null
+++ b/images/newImages/dakaiwenjian1.png
Binary files differ
diff --git a/images/newImages/dakaiwenjian1_1.png b/images/newImages/dakaiwenjian1_1.png
new file mode 100644
index 0000000..1ce2a75
--- /dev/null
+++ b/images/newImages/dakaiwenjian1_1.png
Binary files differ
diff --git a/images/newImages/dk1.png b/images/newImages/dk1.png
new file mode 100644
index 0000000..acde479
--- /dev/null
+++ b/images/newImages/dk1.png
Binary files differ
diff --git a/images/newImages/jiesuo.png b/images/newImages/jiesuo.png
new file mode 100644
index 0000000..5d30af1
--- /dev/null
+++ b/images/newImages/jiesuo.png
Binary files differ
diff --git a/images/newImages/shanchu.png b/images/newImages/shanchu.png
new file mode 100644
index 0000000..0bdc849
--- /dev/null
+++ b/images/newImages/shanchu.png
Binary files differ
diff --git a/images/newImages/tj1.png b/images/newImages/tj1.png
new file mode 100644
index 0000000..92f3369
--- /dev/null
+++ b/images/newImages/tj1.png
Binary files differ
diff --git "a/images/newImages/\345\202\250\345\255\230.png" "b/images/newImages/\345\202\250\345\255\230.png"
new file mode 100644
index 0000000..8482c7b
--- /dev/null
+++ "b/images/newImages/\345\202\250\345\255\230.png"
Binary files differ
diff --git "a/images/newImages/\345\210\240\351\231\244.png" "b/images/newImages/\345\210\240\351\231\244.png"
new file mode 100644
index 0000000..8b75a3d
--- /dev/null
+++ "b/images/newImages/\345\210\240\351\231\244.png"
Binary files differ
diff --git "a/images/newImages/\345\233\276\344\270\212\346\265\213\351\207\217.png" "b/images/newImages/\345\233\276\344\270\212\346\265\213\351\207\217.png"
new file mode 100644
index 0000000..c4ff700
--- /dev/null
+++ "b/images/newImages/\345\233\276\344\270\212\346\265\213\351\207\217.png"
Binary files differ
diff --git "a/images/newImages/\345\235\220\346\240\207\345\256\232\344\275\215.png" "b/images/newImages/\345\235\220\346\240\207\345\256\232\344\275\215.png"
new file mode 100644
index 0000000..d510c88
--- /dev/null
+++ "b/images/newImages/\345\235\220\346\240\207\345\256\232\344\275\215.png"
Binary files differ
diff --git "a/images/newImages/\346\210\221\347\232\204\346\240\207\350\256\260.png" "b/images/newImages/\346\210\221\347\232\204\346\240\207\350\256\260.png"
new file mode 100644
index 0000000..fdb05bf
--- /dev/null
+++ "b/images/newImages/\346\210\221\347\232\204\346\240\207\350\256\260.png"
Binary files differ
diff --git "a/images/newImages/\346\211\223\345\215\260.png" "b/images/newImages/\346\211\223\345\215\260.png"
new file mode 100644
index 0000000..2fcd099
--- /dev/null
+++ "b/images/newImages/\346\211\223\345\215\260.png"
Binary files differ
diff --git "a/images/newImages/\346\211\223\345\274\200\346\226\207\344\273\266\345\244\271.png" "b/images/newImages/\346\211\223\345\274\200\346\226\207\344\273\266\345\244\271.png"
new file mode 100644
index 0000000..08452eb
--- /dev/null
+++ "b/images/newImages/\346\211\223\345\274\200\346\226\207\344\273\266\345\244\271.png"
Binary files differ
diff --git "a/images/newImages/\346\226\207\344\273\266.png" "b/images/newImages/\346\226\207\344\273\266.png"
new file mode 100644
index 0000000..e8b1d60
--- /dev/null
+++ "b/images/newImages/\346\226\207\344\273\266.png"
Binary files differ
diff --git "a/images/newImages/\346\226\207\344\273\2661.png" "b/images/newImages/\346\226\207\344\273\2661.png"
new file mode 100644
index 0000000..ea9cb81
--- /dev/null
+++ "b/images/newImages/\346\226\207\344\273\2661.png"
Binary files differ
diff --git "a/images/newImages/\346\226\207\344\273\2663.png" "b/images/newImages/\346\226\207\344\273\2663.png"
new file mode 100644
index 0000000..7a47a69
--- /dev/null
+++ "b/images/newImages/\346\226\207\344\273\2663.png"
Binary files differ
diff --git "a/images/newImages/\350\247\243\351\224\201.png" "b/images/newImages/\350\247\243\351\224\201.png"
new file mode 100644
index 0000000..5dece80
--- /dev/null
+++ "b/images/newImages/\350\247\243\351\224\201.png"
Binary files differ
diff --git "a/images/newImages/\351\224\201.png" "b/images/newImages/\351\224\201.png"
new file mode 100644
index 0000000..41ebd09
--- /dev/null
+++ "b/images/newImages/\351\224\201.png"
Binary files differ
diff --git a/widgets/CoorPosition/Widget.html b/widgets/CoorPosition/Widget.html
index be2af63..e058345 100644
--- a/widgets/CoorPosition/Widget.html
+++ b/widgets/CoorPosition/Widget.html
@@ -6,7 +6,7 @@
</div>
<div class="CoorPosition-input">
<div class="CoorPosition-input-JD mouseenterJD">
- <div class="jingDu">经度<input id="jingdu-val" value="114.93" type="text" class="jingDu-input"></div>
+ <div class="jingDu">经度：<input id="jingdu-val" value="114.93" type="text" class="jingDu-input"></div>
<div class="jiantou jinddu">
<span class="span-jiantou" id="jingdu-th">
<img class="leftjiantou" src="./images/leftjiantou.png" alt="">
@@ -17,7 +17,7 @@
</div>
</div>
<div class="CoorPosition-input-JD mouseenterED">
- <div class="jingDu">纬度<input id="weidu-val" value="25.83" type="text" class="jingDu-input"></div>
+ <div class="jingDu">纬度：<input id="weidu-val" value="25.83" type="text" class="jingDu-input"></div>
<div class="jiantou weidu">
<span class="span-jiantou" id="weidu-th">
<img class="leftjiantou" src="./images/leftjiantou.png" alt="">
@@ -28,7 +28,7 @@
</div>
</div>
<div class="CoorPosition-input-JD mouseenterGD">
- <div class="jingDu">高度<input id="gaodu-val" value="1286" type="text" class="jingDu-input"></div>
+ <div class="jingDu">高度：<input id="gaodu-val" value="1286" type="text" class="jingDu-input"></div>
<div class="jiantou gaodu">
<span class="span-jiantou" id="gaodu-th">
<img class="leftjiantou" src="./images/leftjiantou.png" alt="">
diff --git a/widgets/CoorPosition/css/style.css b/widgets/CoorPosition/css/style.css
index 77ef614..a2ed75d 100644
--- a/widgets/CoorPosition/css/style.css
+++ b/widgets/CoorPosition/css/style.css
@@ -1,12 +1,12 @@
.jimu-widget-CoorPosition{
- background-color: rgba(255, 255, 255, 0.75);
+ background-color: rgb(255, 255, 255);
font-size: 14px;
border: 1px solid rgb(69, 154, 251);
color: rgb(0, 0, 0);
font-size: 16px;
width: 100%;
height: 100%;
- border-radius: 10px;
+ border-radius: 5px;
display: none;
box-sizing: border-box;
}
@@ -26,7 +26,7 @@
top: 9px;
width: 15px;
height: 13px;
- background: url(../../../images/toolbox.png ) no-repeat 0 -32px;
+ background: url(../../../images/newImages/坐标定位.png ) no-repeat;
}
.CoorPosition-zbdw-zbdw {
@@ -55,7 +55,7 @@
position: relative;
width: 100%;
height: 28px;
- background-color: rgba(69, 154, 251, 0.35);
+ /* background-color: rgba(69, 154, 251, 0.35); */
margin-bottom: 3px;
text-align: center;
}
@@ -74,13 +74,14 @@
}
.queDing {
- background-color: rgba(69, 154, 251, 0.75);
- border: none;
+ background-color: rgba(255, 255, 255);
+ border: 1px solid rgba(69, 154, 251, 0.35);
color: rgb(0, 0, 0);
margin-left: 160px;
padding: 5px;
cursor: pointer;
- border-radius: 10px;
+ border-radius: 5px;
+ box-shadow: 3px 3px 20px -4px #3E9FFC;
}
.jiantou {
diff --git a/widgets/MapPrinting/Widget.html b/widgets/MapPrinting/Widget.html
index 741f855..2f6070d 100644
--- a/widgets/MapPrinting/Widget.html
+++ b/widgets/MapPrinting/Widget.html
@@ -1,11 +1,13 @@
<div class="MapPrinting">
<div class="MapPrinting-flex">
<div class="MapPrinting-left">
- <span class="MapPrinting-left-pic"></span>
+ <!-- <span class="MapPrinting-left-pic"></span> -->
+ <img class="MapPrinting-pic" src="../../images/newImages/储存.png" alt="">
<span class="MapPrinting-left-cunwei">存为图片</span>
</div>
<div class="MapPrinting-right">
- <span class="MapPrinting-right-pic"></span>
+ <!-- <span class="MapPrinting-right-pic"></span> -->
+ <img class="MapPrinting-pic" src="../../images/newImages/打印.png" alt="">
<span class="MapPrinting-right-dayin">打印</span>
</div>
<span class="MapPrinting-flex-x">x</span>
diff --git a/widgets/MapPrinting/css/style.css b/widgets/MapPrinting/css/style.css
index aef8b6d..96bc00a 100644
--- a/widgets/MapPrinting/css/style.css
+++ b/widgets/MapPrinting/css/style.css
@@ -1,5 +1,5 @@
-.jimu-widget-MapPrinting{
- background-color: rgba(255, 255, 255, 0.75);
+.jimu-widget-MapPrinting {
+ background-color: rgb(255, 255, 255);
font-size: 14px;
/* border: 1px solid rgb(69, 154, 251); */
color: rgb(0, 0, 0);
@@ -20,26 +20,39 @@
.MapPrinting-left, .MapPrinting-right {
position: relative;
- background-color: rgba(62,159,252, 0.75);
+ background-color: rgb(255, 255, 255);
/* border: 1px solid rgba(62,159,252, 0.75); */
- border-radius: 10px;
+ border-radius: 5px;
padding: 5px;
cursor: pointer;
+ height: 30px;
+ box-shadow: 3px 3px 20px -4px #3E9FFC;
}
-.MapPrinting-left-pic, .MapPrinting-right-pic {
+.MapPrinting-left:hover, .MapPrinting-right:hover {
+ background-color: #3E9FFC;
+ box-shadow: 3px 3px 20px -4px #000000;
+ /* color:#fff; */
+ filter: grayscale(100%) brightness(200%);
+}
+
+/* .MapPrinting-left-pic, .MapPrinting-right-pic {
position: absolute;
left: 0;
top: 8px;
width: 18px;
height: 15px;
margin-left: 5px;
- background: url(../../../images/toolbox.png ) no-repeat 0 -173px;
+ background: url(../../../images/newImages/储存.png ) no-repeat;
+} */
+
+.MapPrinting-pic {
+ width: 25px;
}
.MapPrinting-left-cunwei, .MapPrinting-right-dayin {
font-size: 11px;
- margin-left: 17px;
+ /* margin-left: 17px; */
}
.MapPrinting-flex-x {
@@ -48,21 +61,7 @@
/* border: 1px solid rgba(62,159,252, 0.75); */
font-size: 26px;
/* border-radius: 10px; */
- padding: 5px;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ /* padding: 5px; */
+ position: relative;
+ top: -2px;
+}
\ No newline at end of file
diff --git a/widgets/Measurement/css/style.css b/widgets/Measurement/css/style.css
index 2f859a0..7c90337 100644
--- a/widgets/Measurement/css/style.css
+++ b/widgets/Measurement/css/style.css
@@ -1,13 +1,13 @@
.jimu-widget-Measurement{
width: 100%;
height: 100%;
- 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);
font-size: 16px;
display: none;
- border-radius: 10px;
+ border-radius: 5px;
}
#table {
@@ -24,7 +24,7 @@
width: 20px;
background-color: red;
height: 17px;
- background: url(../../../images/measure_imgs/toolbox.png ) no-repeat 0 0;
+ background: url(../../../images/newImages/图上测量.png ) no-repeat 0 0;
float: left;
margin-top: 3px;
margin-right: 10px;
diff --git a/widgets/Rolling/css/style.css b/widgets/Rolling/css/style.css
index 37f2d3c..644e280 100644
--- a/widgets/Rolling/css/style.css
+++ b/widgets/Rolling/css/style.css
@@ -14,6 +14,8 @@
}
.jimu-widget-Rolling .rollinng-table-hezi {
+ width: 100%;
+ height: 100%;
display: flex;
justify-content: space-between;
align-items: center;
@@ -21,11 +23,14 @@
}
.jimu-widget-Rolling .hezi-left-select {
- line-height: 50px;
+ /* line-height: 50px; */
+ height: 32px;
+ /* border: 1px solid salmon */
}
.jimu-widget-Rolling .hezi-right-select {
height: 32px;
+ /* border: 1px solid salmon */
}
.jimu-widget-Rolling .hezi-leftspan, .hezi-rightspan {
@@ -35,11 +40,14 @@
}
.jimu-widget-Rolling .hezi-select {
- background-color: rgb(129, 129, 129);
- color: #fff;
+ background-color: #fff;
+ color: rgb(0, 0, 0);
padding: 5px;
border: none;
outline: none;
+ border-radius: 5px;
+ position: relative;
+ top: 1px;
}
.jimu-widget-Rolling .hezi-select:hover {
@@ -51,6 +59,7 @@
font-size: 20px;
margin-bottom: 5px;
margin-left: 5px;
+ /* border: 1px solid salmon */
}
.jimu-widget-Rolling .rollinng-table-hezi-xx:hover {
diff --git a/widgets/Sign/Widget.html b/widgets/Sign/Widget.html
index ca71770..8f05a50 100644
--- a/widgets/Sign/Widget.html
+++ b/widgets/Sign/Widget.html
@@ -1,33 +1,34 @@
<div id="sign_table">
<div class="sign-head">
<div class="sign-head-th">
- <i class="sign-head-th-pic"></i>
+ <!-- <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>
</div>
<div class="sign-head-td">
<ul class="sign-head-td-ul">
<li class="sign-head-td-ul-border addPic addTianjia" title="添加注记">
- <img src="./images/tj1.png" alt="">
+ <img src="./images/newImages/文件.png" alt="">
</li>
<li class="sign-head-td-ul-hengxian">|</li>
<li class="sign-head-td-ul-border dakai" id="dkwj" title="打开文件">
<input type="file" class="file" id="fileDKWJ" />
- <img src="./images/dk1.png" alt="">
+ <img src="./images/newImages/打开文件夹.png" alt="">
</li>
<li class="sign-head-td-ul-border dakai" id="djwj" title="叠加文件">
<input type="file" class="file" id="fileDJWJ">
- <img src="./images/dakaiwenjian1.png" alt="">
+ <img src="./images/newImages/文件1.png" alt="">
</li>
<li class="sign-head-td-ul-border" id="bcwj" title="保存文件">
- <img src="./images/cwj1.png" alt="">
+ <img src="./images/newImages/文件3.png" alt="">
</li>
<li class="sign-head-td-ul-hengxian">|</li>
<li class="sign-head-td-ul-border" id="qkbj" title="清空标记">
- <img src="./images/shanchu.png" alt="">
+ <img src="./images/newImages/删除.png" alt="">
</li>
<li class="sign-head-td-ul-border" id="suo" title="是否编辑">
- <img id="jiesuo" src="./images/jiesuo.png" alt="">
+ <img id="jiesuo" src="./images/newImages/锁.png" alt="">
</li>
</ul>
</div>
diff --git a/widgets/Sign/Widget.js b/widgets/Sign/Widget.js
index 746319d..52a6a61 100644
--- a/widgets/Sign/Widget.js
+++ b/widgets/Sign/Widget.js
@@ -108,7 +108,7 @@
that.arrQsrbz.push($('.sign-tian-hang-textarea').val());
that.updateadd.label.text = $('.sign_im_text').val() ? $('.sign_im_text').val() : '我的标记';
$('.sign-content-my').hide();
- $('.sign-content').append('<div class = \'wdbj\'><div class = \'dingWeiFei\'><input class = \'wdbj-text\' disabled value = ' + ($('.sign_im_text').val() ? $('.sign_im_text').val() : '我的标记') + ' entitydataid=\'' + $('.sign_im_text').attr('entityid') + '\'></input></div><img class=\'wdbj-shanchu\' src=\'./images/shanchu.png\'></img></div>');
+ $('.sign-content').append('<div class = \'wdbj\'><div class = \'dingWeiFei\'><input class = \'wdbj-text\' disabled value = ' + ($('.sign_im_text').val() ? $('.sign_im_text').val() : '我的标记') + ' entitydataid=\'' + $('.sign_im_text').attr('entityid') + '\'></input></div><img class=\'wdbj-shanchu\' src=\'./images/newImages/删除.png\'></img></div>');
handlers.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
}, Cesium.ScreenSpaceEventType.LEFT_CLICK);
@@ -145,7 +145,7 @@
that.updateadd.label.text = datas[i].name;
$('.sign-content-my').hide();
- $('.sign-content').append('<div class = \'wdbj\'><div class = \'dingWeiFei\'><input class = \'wdbj-text\' disabled value = ' + that.Dname[i] + ' entitydataid = ' + (datas[i].shuzi + date) + ' ></input></div><img class=\'wdbj-shanchu\' src=\'./images/shanchu.png\'></img></div>');
+ $('.sign-content').append('<div class = \'wdbj\'><div class = \'dingWeiFei\'><input class = \'wdbj-text\' disabled value = ' + that.Dname[i] + ' entitydataid = ' + (datas[i].shuzi + date) + ' ></input></div><img class=\'wdbj-shanchu\' src=\'./images/newImages/删除.png\'></img></div>');
}
};
event.target.value = null;
@@ -183,7 +183,7 @@
that.updateadd.label.text = datas[i].name;
$('.sign-content-my').hide();
- $('.sign-content').append('<div class = \'wdbj\'><div class = \'dingWeiFei\'><input class = \'wdbj-text\' disabled value = ' + datas[i].name + ' entitydataid = ' + (datas[i].shuzi + date) + ' ></input></div><img class=\'wdbj-shanchu\' src=\'./images/shanchu.png\'></img></div>');
+ $('.sign-content').append('<div class = \'wdbj\'><div class = \'dingWeiFei\'><input class = \'wdbj-text\' disabled value = ' + datas[i].name + ' entitydataid = ' + (datas[i].shuzi + date) + ' ></input></div><img class=\'wdbj-shanchu\' src=\'./images/newImages/删除.png\'></img></div>');
}
};
that.DzbX = '';
@@ -438,7 +438,7 @@
// 切换是否解锁图片
$('#suo').on('click', function () {
if (that.toggle) {
- $('#jiesuo').attr('src', './images/suo.png');
+ $('#jiesuo').attr('src', './images/newImages/解锁.png');
$('.sign-tian-hang-input').attr('disabled', 'disabled');
$('.sign-tian-hang-textarea').attr('disabled', 'disabled');
$('.delWenZi').remove();
@@ -453,7 +453,7 @@
$('.addPic').css('pointer-events', 'auto');
handler = new Cesium.ScreenSpaceEventHandler(that.map.scene.canvas);
mouseEvent();
- $('#jiesuo').attr('src', './images/jiesuo.png');
+ $('#jiesuo').attr('src', './images/newImages/锁.png');
$('.sign-tian-hang-input').removeAttr('disabled');
$('.sign-tian-hang-textarea').removeAttr('disabled');
@@ -626,7 +626,7 @@
if (that.localqsrbz) {
$('.sign-tian-hang-textarea').val(that.localqsrbz[i]);
$('.sign_im_text').val(that.localname[i]);
- $('.sign-content').append('<div class = \'wdbj\'><div class = \'dingWeiFei\'><input class = \'wdbj-text\' disabled value = ' + that.localname[i] + ' entitydataid = ' + that.localarr[i] + ' ></input></div><img class=\'wdbj-shanchu\' src=\'./images/shanchu.png\'></img></div>');
+ $('.sign-content').append('<div class = \'wdbj\'><div class = \'dingWeiFei\'><input class = \'wdbj-text\' disabled value = ' + that.localname[i] + ' entitydataid = ' + that.localarr[i] + ' ></input></div><img class=\'wdbj-shanchu\' src=\'./images/newImages/删除.png\'></img></div>');
that.onClickEntity[i].label.text = that.localname[i];
that.Dname.push(JSON.parse(window.localStorage.getItem("BJDname"))[i]);
that.arrQsrbz.push(JSON.parse(window.localStorage.getItem('BJDqsrbz'))[i]);
diff --git a/widgets/Sign/css/style.css b/widgets/Sign/css/style.css
index 85e1d1e..ce4c3d7 100644
--- a/widgets/Sign/css/style.css
+++ b/widgets/Sign/css/style.css
@@ -1,13 +1,14 @@
.jimu-widget-Sign {
width: 100%;
height: 320px;
- background-color: rgba(255, 255, 255, 0.75);
+ background-color: rgb(255, 255, 255);
font-size: 14px;
border: 1px solid rgb(69, 154, 251);
/* opacity : .8; */
color: rgb(0, 0, 0);
font-size: 16px;
display: none;
+ border-radius: 5px;
}
#sign_table {
@@ -35,9 +36,10 @@
.sign-head-th-pic {
margin-top: 4px;
- width: 20px;
- height: 18px;
- background: url(../../../images/toolbox.png ) no-repeat 0 -63px;
+ width: 9px;
+ /* height: 18px; */
+ /* z-index: 10; */
+ /* background: url(./images/我的标记.png ) no-repeat; */
}
.sign-head-th-biaoji {
@@ -72,13 +74,23 @@
}
.sign-head-td-ul-border {
+ position: relative;
+ top: -5px;
cursor: pointer;
width: 30px;
height: 30px;
margin-top: 6px;
- border: 1px solid #377bc9;
+ border-radius: 5px;
+ border: 1px solid #ffffff;
+ box-shadow: 3px 3px 15px -5px #3E9FFC;
}
-
+.sign-head-td-ul-border:hover{
+ box-shadow: 1px 3px 0px -5px #000000;
+}
+.sign-head-td-ul-border img{
+ width: 30px !important;
+ height: 30px !important;
+}
.dakai {
position: relative;
cursor: pointer;
@@ -107,6 +119,7 @@
border: 1px solid #377bc9;
margin-left: 1px;
overflow: hidden;
+ border-radius: 5px;
}
.sign-content-mc {
@@ -114,6 +127,8 @@
width: 315px;
height: 40px;
border: 1px solid #377bc9;
+ border-top: 1px solid transparent;
+ border-left: 1px solid transparent;
display: flex;
padding-left: 10px;
}
@@ -184,6 +199,8 @@
font-size: 15px;
border-right: 1px solid #377bc9;
cursor: pointer;
+ position: relative;
+ right: -2px;
}
.wdbj .wdbj-text:hover {
@@ -193,7 +210,8 @@
.wdbj-shanchu {
line-height: 40px;
padding-right: 10px;
- height: 20px;
+ height: 30px;
+ /* width: 30px; */
}
.danji,
@@ -201,12 +219,14 @@
.modifyEdit,
.dragEdit {
padding: 5px;
- background-color: rgba(62,159,252, 0.45);
+ background-color: #3E9FFC;
position: fixed;
top: 0;
left: 0;
display : none;
border-radius: 5px;
+ box-shadow: 2px 3px 20px -5px #fff;
+ color: #fff;
}
.actEdit {
@@ -241,6 +261,7 @@
align-items: center;
padding: 0 8px;
border-bottom: 1px solid #377bc9;
+ border-radius: 5px 5px 0 0;
}
.sign-tian-thead span {
@@ -260,6 +281,7 @@
width: 100%;
padding: 10px;
background-color: rgba(255, 255, 255, 0.75);
+ border-radius: 0 0 5px 5px;
}
.sign-tian-hang {
@@ -271,7 +293,7 @@
.sign-tian-hang-input {
margin-top: 5px;
- background-color: #377bc9;
+ background-color: #ffffff;
line-height: 25px;
width: 100%;
border: none;
@@ -280,6 +302,7 @@
padding: 5px;
font-size: 10px;
color: rgb(0, 0, 0);
+ border-radius: 5px;
}
.sign-tian-hang-textarea {
@@ -295,6 +318,7 @@
width: 100%;
color: rgb(0, 0, 0);
font-family: '黑体';
+ border-radius: 5px;
}
.sign-tian-bao {
@@ -312,6 +336,9 @@
border: none;
line-height: 25px;
border-radius: 5px;
+ width: 40px;
+ box-shadow: 3px 3px 15px -5px #3E9FFC;
+ cursor: pointer;
}
.sign-tian-bao .shanchu {
diff --git a/widgets/SplitScreen/Widget.js b/widgets/SplitScreen/Widget.js
index fab7e99..a850bbb 100644
--- a/widgets/SplitScreen/Widget.js
+++ b/widgets/SplitScreen/Widget.js
@@ -1,11 +1,11 @@
define([
- 'dojo/_base/declare',
- 'dojo/_base/lang',
- 'dojo/_base/array',
- 'dojo/_base/html',
- 'dojo/topic',
- 'jimu/BaseWidget',
- ],
+ 'dojo/_base/declare',
+ 'dojo/_base/lang',
+ 'dojo/_base/array',
+ 'dojo/_base/html',
+ 'dojo/topic',
+ 'jimu/BaseWidget',
+],
function (declare,
lang,
array,
@@ -25,6 +25,7 @@
$('#viewportType').click(function () {
$(".split-select .split-select-option").toggle();
})
+
$(".split-select .split-select-option li").click(function () {
@@ -102,21 +103,23 @@
}
})
- $('.jimu-widget-SplitScreen .close').click(function () {
- that.closeSplitScreen('closeSplitScreen')
- });
+ $('.jimu-widget-SplitScreen .split-select .close').click(() => {
+ $('.jimu-widget-SplitScreen').hide();
+ that.closeSplitScreen('SplitScreen')
+ })
},
openSplitScreen: function (item) {
if (item == this.name) {
this.flag = true;
- $('.jimu-widget-SplitScreen').show();
+ $('.jimu-widget-SplitScreen').show();
}
},
closeSplitScreen: function (item) {
var that = this;
+ console.log(item,this.name)
if (item == this.name) {
if (this.flag = true) {
this.flag = false;
diff --git a/widgets/SplitScreen/css/style.css b/widgets/SplitScreen/css/style.css
index 6d92564..26b3ae2 100644
--- a/widgets/SplitScreen/css/style.css
+++ b/widgets/SplitScreen/css/style.css
@@ -4,7 +4,7 @@
right: 20px !important;
width: auto !important;
height: auto !important;
- background-color: rgba(255, 255, 255, .75);
+ background-color: rgb(207, 207, 207);
font-size: 14px;
border: 1px solid rgb(69, 154, 251);
/* opacity : .8; */
@@ -32,9 +32,10 @@
font-size: 14px;
line-height: 24px;
text-align: center;
- background: rgb(69, 154, 251);
+ background: #3E9FFC;
border-radius: 50%;
- border: 1px solid rgb(69, 154, 251);
+ border: 1px solid #3E9FFC;
+ cursor: pointer;
}
.jimu-widget-SplitScreen .split-select button {
@@ -79,7 +80,7 @@
.jimu-widget-SplitScreen .split-select .split-select-option li:hover {
color: #fff;
- background-color: #0081c2;
+ background-color: #3E9FFC;
}
#split_up {
--
Gitblit v1.9.3