From d78d11579073afec2195d2b011b25fee18d5bca0 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 11 Jun 2021 18:07:54 +0800
Subject: [PATCH] 样式
---
widgets/searchTabaPopup/Widget.html | 6 +-
widgets/searchTabaPopup/css/style.css | 45 +++++++++++++++-------
widgets/legends/css/style.css | 11 +++--
widgets/searchL/Widget.js | 21 +++++++---
widgets/searchL/css/style.css | 5 ++
5 files changed, 58 insertions(+), 30 deletions(-)
diff --git a/widgets/legends/css/style.css b/widgets/legends/css/style.css
index 28e3e5a..44f48ee 100644
--- a/widgets/legends/css/style.css
+++ b/widgets/legends/css/style.css
@@ -1,9 +1,9 @@
.jimu-widget-legends {
position: absolute !important;
font-size: 14px;
- height: 243px !important;
+ height: 290px !important;
line-height: 32px;
- width: 188px !important;
+ width: 230px !important;
right: 60px !important;
bottom: 40px !important;
left: auto !important;
@@ -22,16 +22,17 @@
.jimu-widget-legends .title {
/* margin: 10px 0 7px 0; */
- font-size: 0.5rem;
+ font-size: 18px;
}
.jimu-widget-legends .main .m-init {
width: 100%;
- height: 1.5rem;
+ /* height: 1.5rem; */
+ /* border: 1px solid springgreen; */
flex-direction: row;
display: flex;
align-items: center;
- font-size: 0.6rem;
+ font-size: 15px;
}
.jimu-widget-legends .main .m-init i {
diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index 7a04cee..f619448 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -284,7 +284,7 @@
});
}
if (data1 != 1) {
-
+
table.render({
elem: '#test1'
// , url: './data'//监控
@@ -298,7 +298,7 @@
}
, cols: [[
{ field: 'tableId', width: 59, align: 'center', unresize: true, title: '序号' }
- , { field: 'name', width: 90, align: 'center', unresize: true, title: '名称' }
+ , { field: 'name', width: 90, align: 'center', unresize: true, title: '站点' }
, { field: 'protectName', width: 95, align: 'center', unresize: true, title: '所属保护区' }
, { field: 'remark', width: 95, align: 'center', unresize: true, title: '备注' }
, { fixed: 'right', align: 'center', unresize: true, title: '操作', toolbar: '#demoTable1' }
@@ -378,7 +378,7 @@
}
, cols: [[
{ field: 'tableId', width: 59, align: 'center', unresize: true, title: '序号' }
- , { field: 'name', width: 90, align: 'center', unresize: true, title: '名称' }
+ , { field: 'name', width: 90, align: 'center', unresize: true, title: '站点' }
, { field: 'wetlandName', width: 95, align: 'center', unresize: true, title: '所属保护区' }
, { field: 'remark', width: 95, align: 'center', unresize: true, title: '备注' }
, { fixed: 'right', align: 'center', unresize: true, title: '操作', toolbar: '#demoTable2' }
@@ -391,6 +391,7 @@
, limit: 10 //每页默认显示的数量
});
+
table.on('tool(test2)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
var data = obj.data //获得当前行数据
, layEvent = obj.event; //获得 lay-event 对应的值
@@ -411,9 +412,15 @@
}
});
}
-
+ that.addTitle();
//…
});
+ },
+ addTitle: function () {
+ let tdom = $("[data-field]");
+ for (var i = 0; i < tdom.length; i++) {
+ $(tdom[i]).attr("title", $(tdom[i]).text())
+ }
},
setXiangqing(obj) {
var str = '';
@@ -493,9 +500,9 @@
$('#test-endDate-1').val(date1);
window.defultEchartsTimes = [date2, date1];
// var time = setTimeout(() => {
- $('.jimu-widget-searchTabaPopup').find('#query').click();
- // clearTimeout(time);
- // time = null;
+ $('.jimu-widget-searchTabaPopup').find('#query').click();
+ // clearTimeout(time);
+ // time = null;
// }, 500);
var str = '',
diff --git a/widgets/searchL/css/style.css b/widgets/searchL/css/style.css
index 055ccad..5368c2a 100644
--- a/widgets/searchL/css/style.css
+++ b/widgets/searchL/css/style.css
@@ -226,4 +226,9 @@
position: relative;
right: 1px;
top: -3px;
+}
+
+/* 隐藏layui表格溢出的详情框 */
+.layui-table-grid-down{
+display: none;
}
\ No newline at end of file
diff --git a/widgets/searchTabaPopup/Widget.html b/widgets/searchTabaPopup/Widget.html
index b2ce02e..875bf47 100644
--- a/widgets/searchTabaPopup/Widget.html
+++ b/widgets/searchTabaPopup/Widget.html
@@ -76,19 +76,19 @@
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- <div style="width: 1080px;height:380px;" class="popup-threse-shuiwenEcharts"
+ <div style="width: 870px;height:380px;" class="popup-threse-shuiwenEcharts"
id="popup-threse-shuiwenEcharts">
</div>
</div>
<div class="layui-tab-item">
- <div style="width: 1080px;height:380px;" class="popup-threse-shuiwenEcharts"
+ <div style="width: 870px;height:380px;" class="popup-threse-shuiwenEcharts"
id="popup-threse-shuiwenEcharts1">
</div>
</div>
<div class="layui-tab-item">
- <div style="width: 1080px;height:380px;" class="popup-threse-shuiwenEcharts"
+ <div style="width: 870px;height:380px;" class="popup-threse-shuiwenEcharts"
id="popup-threse-shuiwenEcharts2">
</div>
diff --git a/widgets/searchTabaPopup/css/style.css b/widgets/searchTabaPopup/css/style.css
index a7fa056..9e6b109 100644
--- a/widgets/searchTabaPopup/css/style.css
+++ b/widgets/searchTabaPopup/css/style.css
@@ -12,20 +12,21 @@
background: rgba(0, 0, 0, 0.5);
/* border : 1px solid #000; */
/* cursor : pointer; */
- z-index: 13 !important;
+ z-index: 13 !important;
}
.jimu-widget-searchTabaPopup .popup {
/* display: none; */
- width: 1100px;
- min-height: 600px;
- max-height: 750px;
- overflow: auto;
+ width: 900px;
+ height: 600px;
+ /* min-height: 600px; */
+ /* max-height: 750px; */
+ /* overflow: auto; */
/* border: 1px solid salmon; */
position: relative;
border-radius: 5px;
- top: calc(50% - 380px);
- left: calc(50% - 549px);
+ top: calc(50% - 300px);
+ left: calc(50% - 450px);
background-color: rgba(255, 255, 255, 1);
}
@@ -84,17 +85,25 @@
.jimu-widget-searchTabaPopup .two .header{
background-color: #409EFF;
width: 100%;
- height: 40px;
+ height: 20px;
position: absolute;
font-size: 20px;
top: 0px;
left: 0;
color: #fff;
- line-height: 40px;
+ line-height: 20px;
border-radius: 5px 5px 0 0;
text-indent: 2em;
z-index: 14;
}
+
+.jimu-widget-searchTabaPopup .shishishuju .layui-tab-content{
+
+ height: 450px;
+ overflow: auto;
+ /* border: 1px springgreen solid; */
+}
+
#poput-m-t-video-video{
width: 100%;
height: 560px;
@@ -124,11 +133,13 @@
}
.jimu-widget-searchTabaPopup .layui-tab-title li {
- font-size: 20px;
+ position: relative;
+ top: -5px;
+ font-size: 15px;
}
.jimu-widget-searchTabaPopup .three {
- padding: 20px;
+ padding: 10px;
box-sizing: border-box;
}
@@ -163,7 +174,7 @@
}
.jimu-widget-searchTabaPopup .xiangqing img{
width: 175px;
-padding: 10px 10px 10px 0;
+padding: 5px 5px 5px 0;
}
.jimu-widget-searchTabaPopup .shishishuju {
width: 100%;
@@ -173,12 +184,16 @@
.jimu-widget-searchTabaPopup .shishishuju .heard {
width: 100%;
- height: 60px;
+ height: 20px;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 16px;
- padding-bottom: 10px;
+ padding-bottom: 5px;
+ padding-top: 5px;
+}
+.layui-tab-content{
+padding: 0 !important;
}
.jimu-widget-searchTabaPopup .shishishuju thead th, .jimu-widget-searchTabaPopup .shishishuju tbody td {
@@ -186,7 +201,7 @@
}
.jimu-widget-searchTabaPopup .shishishuju .layui-tab-title li {
- font-size: 18px;
+ font-size: 15px;
}
.jimu-widget-searchTabaPopup .lishijilv .heard {
--
Gitblit v1.9.3