Merge branch 'master' of ssh://code.vnet1000.com:28888/zhangmuyue/zjjc

pages/htjc.html

@@ -92,15 +92,43 @@
 
     <div id="popup-info" class="popup-info hidden">
         <div class="head"></div>
-        <div class="main">
+        <div class="tab">
+            
+        </div>
+        <div class="main data-detail-main">
             <div class="left-item" id="subrwList">
                 <div class="noData">暂无数据</div>
             </div>
             <div class="right-item right-item1"></div>
             <div class="right-item right-item2 hiddenImportant"></div>
         </div>
-        <div class="hoverInfo hidden" id="hoverInfo"></div>
+        <div id="test-location-main" class="test-location-main hiddenImportant"></div>
+        <div class="hoverInfo hidden" id="hoverInfo" onmouseover="detail.hoverInfoMouseover()"
+            onmouseout="detail.hoverInfoMouseout()"></div>
+    </div>
+
+    <div id="popup-info-change-list" class="popup-info hidden">
+        <div class="content">
+            <div class="table">
+                <table  cellspacing="0">
+                    <thead class="table-head">
+                        <tr>
+                            <th width="25%">修改人员</th>
+                            <th width="25%">修改时间</th>
+                            <th width="25%">修改前</th>
+                            <th width="25%">修改后</th>
+                        </tr>
+                    </thead>
+
+                    <tbody class="table-body">
+                    </tbody>
+                </table>
+            
+            </div>
         </div>
+    </div>
+
+
     <div class="swiper hidden" id="swiper">
         <div class="mask" onclick="detail.swiperHide()"></div>
         <div class="main">

static/css/dist/htjc.css

@@ -318,7 +318,7 @@
 }
 
 .popup-info .head {
-  height: .7rem;
+  height: .5rem;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -326,9 +326,124 @@
   font-size: .18rem;
 }
 
+.popup-info .tab {
+  width: 100%;
+
+  background: #113883;
+  padding: 0.15rem 0.5rem;
+  margin-bottom: 0.05rem;
+}
+
+.popup-info .tab .tabBox {
+  display: flex;
+  align-items: center;
+  color: #FFFFFF;
+}
+
+.popup-info .tab .tabBox>div {
+  margin-right: 0.68rem;
+  cursor: pointer;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.popup-info .tab .tabBox>div.actived {
+  color: #00FFFF;
+}
+
+.popup-info .tab .tabBox .actived::after {
+  display: block;
+  content: '';
+  width: 0.55rem;
+  height: 0.02rem;
+  background: #00FFFF;
+  position: relative;
+  top: 0.15rem;
+
+}
+
+.popup-info .test-location-main {
+  width: 100%;
+  height: calc(100% - .97rem);
+}
+
+
+.amap-logo {
+  display: none !important;
+}
+
+.amap-copyright {
+  display: none !important;
+}
+
+.modalBox {
+  padding: 0.2rem 0.1rem;
+  background: rgba(0, 0, 0, .7);
+  border: none;
+  border-radius: 4px;
+  color: #C0D3E6;
+  font-size: 14px;
+
+}
+.modalBox .content{
+  max-height: 3.5rem;
+  overflow: auto;
+}
+
+.modalBox .content::-webkit-scrollbar {
+  width: 0.1rem;
+  height: 0.1rem;
+}
+
+.modalBox .content::-webkit-scrollbar-thumb {
+  background: #36384F;
+  border-radius: 8px;
+}
+
+.modalBox .content::-webkit-scrollbar-track {
+  background: #070813;
+  border-radius: 8px;
+}
+
+
+
+.taskNoBox{
+  color: #3FD9FF;
+}
+.rwdImg{
+  width: 0.19rem;
+  height: 0.18rem;
+}
+.countBox{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 0.14rem;
+  margin-bottom: 0.1rem;
+
+}
+.countBox >div{
+  padding: 0.08rem 0.16rem;
+  border: 1px solid #90A1B1;
+}
+
+.modalBoxItem{
+  padding: 0.13rem 0.14rem;
+  border-top: 1px solid rgba(192, 211, 230, .4);
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.amap-marker-label {
+  border: 0;
+  background-color:transparent;
+}
+
 .popup-info .main {
   display: flex;
-  height: calc(100% - .7rem);
+  height: calc(100% - .97rem);
 }
 
 .popup-info .main .left-item {
@@ -515,7 +630,7 @@
   justify-content: space-evenly;
 }
 
-.popup-info .main .right-item .flex-item .box .item > div {
+.popup-info .main .right-item .flex-item .box .item>div {
   word-break: keep-all;
   white-space: nowrap;
   display: flex;
@@ -702,10 +817,7 @@
 
 .popup-info .main .right-item .info-item .bw-item .item {
   position: relative;
-  background: #0D3177;
-  border: .01rem solid #90A1B1;
   font-size: .18rem;
-  color: #C0D3E6;
   height: .8rem;
   width: calc(25% - .2rem);
   margin: .2rem .1rem 0;
@@ -716,7 +828,29 @@
   cursor: pointer;
 }
 
-.popup-info .main .right-item .info-item .bw-item .item:hover {
+.popup-info .main .right-item .info-item .bw-item .item .icon-change {
+  width: 63px;
+  height: 46px;
+  position: absolute;
+  right: 0;
+  top: 0;
+
+}
+
+.popup-info .main .right-item .info-item .bw-item .common {
+  background: #0D3177;
+  border: .01rem solid #90A1B1;
+  color: #C0D3E6;
+}
+
+.popup-info .main .right-item .info-item .bw-item .fail {
+  background: rgba(147, 24, 24, .5);
+  border: .01rem solid #931818;
+  color: #E7555C;
+
+}
+
+.popup-info .main .right-item .info-item .bw-item .common:hover {
   background: rgba(42, 210, 255, 0.2);
   border: .02rem solid #2AD2FF;
   color: #2AD2FF;
@@ -771,6 +905,76 @@
   margin-bottom: .1rem;
 }
 
+.popup-info .hoverInfo .modification {
+  border: .01rem solid #A76619;
+  color: #D99749;
+  cursor: pointer;
+}
+
+#popup-info-change-list .content {
+  box-sizing: border-box;
+  padding: 20px;
+  font-size: 18px;
+  height: calc(100% - .44rem);
+
+
+}
+
+#popup-info-change-list .content .table {
+  height: 100%;
+  overflow: auto;
+}
+
+#popup-info-change-list .content .table::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+#popup-info-change-list .content .table::-webkit-scrollbar-thumb {
+  background: rgba(0, 0, 0, 0.4);
+  border-radius: 8px;
+}
+
+#popup-info-change-list .content .table::-webkit-scrollbar-track {
+  background: rgba(42, 93, 197, 0.3);
+  border-radius: 8px;
+}
+
+
+#popup-info-change-list .content .table-head {
+  height: 50px;
+  color: #fff;
+  background: rgb(17, 56, 131);
+  position: sticky;
+  top: 0;
+}
+
+
+
+#popup-info-change-list .content .table-body tr {
+  height: 50px;
+  color: #fff;
+  
+
+}
+
+#popup-info-change-list .content .table-body tr:nth-child(odd) {
+
+  background: rgba(17, 56, 131, .5);
+}
+
+#popup-info-change-list .content .table-body tr:nth-child(even) {
+
+  background: rgba(17, 56, 131, .7);
+}
+
+#popup-info-change-list .content .table-body td {
+  text-align: center;
+  font-weight: 100;
+  
+}
+
+
 .layui-layer-content {
   height: calc(100% - 42px) !important;
 }