From b6e8fdb6f9bb50d29aeb29aa62b19a75c9a1ef9d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 17:31:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/css/index_layout.css | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 104 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/css/index_layout.css b/gx_tieta/WebRoot/css/index_layout.css
index 3b6fab0..8a30d97 100644
--- a/gx_tieta/WebRoot/css/index_layout.css
+++ b/gx_tieta/WebRoot/css/index_layout.css
@@ -6,6 +6,7 @@
width:100%;
}
#content .nav-map {
+ position: relative;
display: table;
width: 80%;
height: 500px;
@@ -24,9 +25,16 @@
width: 100%;
height: 100%;
}
+
+.map-status-container {
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ z-index: 99;
+}
+
/*鏄剧ず涓浗鍜屼腑鍥藉悇鐪侊紙琛屾斂鍖猴紝鐩磋緰甯傦級鐨勫湴鍥�*/
#content .china-map{
- display: table-cell;
width: auto;
height:100%;
min-height: 200px;
@@ -37,6 +45,7 @@
/*鏁呴殰鍜屽憡璀﹂ゼ鐘跺浘*/
#content .pie-con{
float:right;
+ position: relative;
width:20%;
background-color:#F3F0F0;
border-top:#ddd;
@@ -64,6 +73,21 @@
width:100%;
height:100px;
background-color:#F3F0F0;
+}
+
+.pie-conf {
+ position: absolute;
+ top: 2px;
+ right: 8px;
+ z-index: 99;
+}
+.pie-conf .pie-btn {
+ color: #bbbbbb;
+ font-size: 18px;
+ cursor: pointer;
+}
+.pie-conf .pie-btn:hover {
+ color: #000000;
}
/*鎴戠殑浣滀笟*/
#content .my-work{
@@ -426,3 +450,82 @@
.item-timeout {
/* color: blue !important; */
}
+
+.map-info-panel-left {
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ z-index: 10;
+ background-color: #FFFFFF;
+ border: 1px solid #cccccc;
+}
+.map-info-panel-content {
+ position: relative;
+}
+
+.map-info-panel-content .map-info {
+ padding: 0 10px;
+ line-height: 30px;
+ text-align: center;
+ background-color: #CDDCFA;
+ border-bottom: 1px solid #CCCCCC;
+}
+.map-info-panel-content .map-info .k-point {
+ font-weight: bold;
+}
+.map-info-btn-icon {
+ margin-left: 15px;
+ font-size: 18px;
+ vertical-align: middle;
+ cursor: pointer;
+}
+.map-info-btn-icon:hover {
+ color: #1495E7;
+}
+
+.map-info-detail {
+ display: none;
+}
+.map-info-detail table {
+ width: 100%;
+ margin-top: 8px;
+ margin-bottom: 8px;
+}
+.map-info-detail table td {
+ padding: 4px 0;
+}
+.map-info-detail table select {
+ width: 96%;
+ height: 24px;
+ border: 1px solid #CCCCCC;
+}
+.map-info-footer {
+ padding: 8px 0;
+ border-top: 1px solid #CCCCCC;
+}
+.map-info-footer button {
+ padding:6px 20px;
+ border: 1px solid #c1c1c1;
+ background: #FFFFFF;
+ background: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f4f4f4));
+ background: -o-linear-gradient(top, #ffffff, #f4f4f4);
+ background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 100%);
+ background: linear-gradient(top, #ffffff, #f4f4f4);
+ color: #555;
+}
+.map-info-footer button:hover {
+ background: #f4f4f4;
+ color: #555;
+}
+#mapImgDesc span {
+ line-height: 30px;
+ margin-left: 6px;
+ margin-right: 8px;
+}
+
+#mapImgDesc img{
+ width: 22px;
+ height: 22px;
+ margin-right: 8px;
+ vertical-align: middle;
+}
\ No newline at end of file
--
Gitblit v1.9.1