Browse Source

fix 人员历史页面

liu 2 năm trước cách đây
mục cha
commit
55e5ad411d

+ 5 - 7
ruoyi-system/src/main/resources/templates/ahrs/personnel/editPart.html

@@ -440,8 +440,8 @@
               <div style=" width:4px;height:18px; margin-right: 12px;background: #4377FE;"></div>
               <span class="ft-20 font-weight color-333">岗位变更信息</span>
           </div>
-          <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">
-            <iframe id="iframe1" frameborder="0"   name="iframe1" style="width: 100%;height: 700px" src=""></iframe>
+          <div class="">
+            <iframe id="iframe1" frameborder="0"   name="iframe1" style="width: 100%;height: 400px" src=""></iframe>
           </div>
         </div>
         <!-- 历史修改信息 -->
@@ -451,11 +451,9 @@
               <div style=" width:4px;height:18px; margin-right: 12px;background: #4377FE;"></div>
               <span class="ft-20 font-weight color-333">历史修改信息</span>
           </div>
-          <div class="col-sm-12">
-              <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">
-                  <iframe id="iframe2" frameborder="0" name="iframe2" style="width: 100%;height: 700px" src=""></iframe>
-              </div>
-          </div>
+            <div class="" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">
+                <iframe id="iframe2" frameborder="0" name="iframe2" style="width: 100%;height: 400px" src=""></iframe>
+            </div>
         </div>
         <div id="post5" style="height: 100px">
         </div>

+ 42 - 15
ruoyi-system/src/main/resources/templates/ahrs/personnel/personnelChangeHistory.html

@@ -3,6 +3,7 @@
 <head>
     <th:block th:include="include :: header('岗位变更信息')" />
     <style>
+        /* 新改 */
         .table > thead > tr > th {
             color: #666;
             border: none!important;
@@ -22,36 +23,62 @@
 
         .table > tbody > tr {
             height: 80px;
+            background-color: white!important;
+        }
+
+        .row {
+            background: white;
+            border-radius: 4px;
+            padding: 22px;
+            margin: 0 0 24px 0;
+        }
+
+        .ibox-title, .ibox-content{
+            border: none!important;
+            padding: 0;
+        }
+
+        .top-file-show{
+            height: 48px;
+            line-height: 48px;
+            background: #EBEFFA;
+            border-radius: 48px;
+            color: #5780E9;
+            padding: 0 50px;
+        }
+
+        .need-del-last-border > a:last-child{
+            border-right: none!important;
         }
         /* //定义滚动条宽高,滚动条背景 */
-          ::-webkit-scrollbar{
-          width:10px;
-          height:10px;
+        ::-webkit-scrollbar{
+            width:10px;
+            height:10px;
         }
         /* //滚动条的轨道颜色,轨道阴影,轨道圆角 */
         ::-webkit-scrollbar-track{
-          -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.1);
-          background-color: #f4f7fe;
-          border-radius: 4px;
+            -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.1);
+            background-color: #f4f7fe;
+            border-radius: 4px;
         }
         /* //滑块颜色,滑块阴影,滑块圆角 */
         ::-webkit-scrollbar-thumb{
-          border-radius: 4px;
-          -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.1);
-          background-color: #efefef;
+            border-radius: 4px;
+            -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.1);
+            background-color: #efefef;
         }
     </style>
 </head>
-<body class="gray-bg">
-<div class="container-div">
-    <div class="row">
-        <div class="" style="padding: 15px 0;">
-            <h5 align="center">历史修改信息</h5>
+<body class="">
+<div class="">
+    <div class="">
+        <div class="">
+<!--            <h5 align="center">历史修改信息</h5>-->
             <form id="formId" type="hidden">
                 <input name="idcard" type="hidden" id="idcard" th:value="${idcard}">
             </form>
         </div>
-        <div class="select-table table-striped" style="padding: 0 15px;margin-top: 0;">
+        <div class="col-sm-12 select-table" style="padding: 0;box-shadow: none;">
             <table id="bootstrap-table"></table>
         </div>
     </div>

+ 50 - 23
ruoyi-system/src/main/resources/templates/ahrs/personnel/personnelPostChangeHistory.html

@@ -3,26 +3,53 @@
 <head>
     <th:block th:include="include :: header('岗位变更信息')" />
     <style>
-      .table > thead > tr > th {
-          color: #666;
-          border: none!important;
-      }
-      .table > thead > tr > td {
-          border-bottom: 1px solid #fafafa!important;
-      }
+        /* 新改 */
+        .table > thead > tr > th {
+            color: #666;
+            border: none!important;
+        }
+        .table > thead > tr > td {
+            border-bottom: 1px solid #fafafa!important;
+        }
 
-      .table > tbody > tr > td {
-          border-bottom: 1px solid #EBEFFA!important;
-      }
+        .table > tbody > tr > td {
+            border-bottom: 1px solid #EBEFFA!important;
+        }
 
-      .table > thead > tr {
-          background-color: #FAFAFA;
-          height: 44px;
-      }
+        .table > thead > tr {
+            background-color: #FAFAFA;
+            height: 44px;
+        }
 
-      .table > tbody > tr {
-          height: 80px;
-      }
+        .table > tbody > tr {
+            height: 80px;
+            background-color: white!important;
+        }
+
+        .row {
+            background: white;
+            border-radius: 4px;
+            padding: 22px;
+            margin: 0 0 24px 0;
+        }
+
+        .ibox-title, .ibox-content{
+            border: none!important;
+            padding: 0;
+        }
+
+        .top-file-show{
+            height: 48px;
+            line-height: 48px;
+            background: #EBEFFA;
+            border-radius: 48px;
+            color: #5780E9;
+            padding: 0 50px;
+        }
+
+        .need-del-last-border > a:last-child{
+            border-right: none!important;
+        }
       /* //定义滚动条宽高,滚动条背景 */
         ::-webkit-scrollbar{
         width:10px;
@@ -42,16 +69,16 @@
       }
   </style>
 </head>
-<body class="gray-bg">
-<div class="container-div">
-    <div class="row">
-        <div class="" style="padding: 15px 0;">
-            <h5 align="center">岗位变更信息</h5>
+<body class="">
+<div class="">
+    <div class="" style="box-shadow: none;border: none;">
+        <div class="">
+<!--            <h5 align="center">岗位变更信息</h5>-->
             <form id="formId" type="hidden">
                 <input name="idcard" type="hidden" id="idcard" th:value="${idcard}">
             </form>
         </div>
-        <div class="select-table table-striped" style="padding: 0 15px;margin-top: 0;">
+        <div class="col-sm-12 select-table" style="padding: 0;box-shadow: none;">
             <table id="bootstrap-table"></table>
         </div>
     </div>