Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev

src/components/ImageEd.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-09 09:28:46
- * @LastEditTime: 2022-01-16 17:19:03
+ * @LastEditTime: 2022-01-16 18:26:51
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
 -->
@@ -4849,13 +4849,14 @@ export default {
           $(".lt_main_footer").css("opacity", "1");
         });
       } else if (this.$route.name == 'LL' || this.$route.name == 'rgLL') {
+        $(".lt_main_left").css('box-shadow', 'none')
+        $(".el-checkbox").css('opacity', '0')
         $(".lt_main_right").css('box-shadow', 'none')
         $(".lt_header").css('opacity', '0')
         $(".lt_main_header").css('opacity', '0')
         $(".lt_main_footer").css('opacity', '0')
         $(".header").css('opacity', '0')
         $(".lt_cnadidate_search").css('opacity', '0')
-        $(".el-checkbox").css('opacity', '0')
 
         html2canvas(
           document.querySelector(".lt_main"),
@@ -4881,13 +4882,14 @@ export default {
           a.click();
 
           // 恢复界面
+          $(".lt_main_left").css('box-shadow', '0px 4px 10px 0px rgba(5, 95, 231, 0.3)')
+          $(".el-checkbox").css('opacity', '1')
           $(".lt_main_right").css('box-shadow', '0px 4px 10px 0px rgba(5, 95, 231, 0.3)')
           $(".lt_header").css('opacity', '1')
           $(".lt_main_header").css('opacity', '1')
           $(".lt_main_footer").css('opacity', '1')
           $(".header").css('opacity', '1')
           $(".lt_cnadidate_search").css('opacity', '1')
-          $(".el-checkbox").css('opacity', '1')
         });
       } else if (this.$route.name == 'fhxxLT' || this.$route.name == 'fhxxTL' || this.$route.name == 'fhxxLL') {
         $(".fhxx-top").css('box-shadow', 'none')

src/views/AllPersonnelBase/modules/fcx.vue

@@ -161,9 +161,9 @@
           title="高级配置"
           name="1"
         >
-          <template slot="title">
+          <!-- <template slot="title">
             高级配置 <div class="tip"><span class="iconfont">&#xe649;</span>提示：当选择多个逻辑库时，工作流以最小ID逻辑库为准！</div>
-          </template>
+          </template> -->
           <el-form
             :label-position='labelPosition'
             align="left"
@@ -391,9 +391,9 @@
           title="高级配置"
           name="1"
         >
-          <template slot="title">
+          <!-- <template slot="title">
             高级配置 <div class="tip"><span class="iconfont">&#xe649;</span>提示：当选择多个逻辑库时，工作流以最小ID逻辑库为准！</div>
-          </template>
+          </template> -->
           <el-form
             :label-position='labelPosition'
             align="left"

src/views/Editor/modules/ajdaxx.vue

@@ -180,9 +180,9 @@
           <div class="title">
             <div class="line"></div>
             <span class="name">案件逻辑分库</span>
-            <div class="tip">
+            <!-- <div class="tip">
               <span class="iconfont">&#xe649;</span>提示：当选择多个逻辑库时，工作流以最小ID逻辑库为准！
-            </div>
+            </div> -->
           </div>
           <div class="ryljfk">
             <el-form-item

src/views/Editor/modules/rydaxx.vue

@@ -300,9 +300,9 @@
           <div class="title">
             <div class="line"></div>
             <span class="name">人员逻辑分库</span>
-            <div class="tip">
+            <!-- <div class="tip">
               <span class="iconfont">&#xe649;</span>提示：当选择多个逻辑库时，工作流以最小ID逻辑库为准！
-            </div>
+            </div> -->
           </div>
           <div class="ryljfk">
             <el-form-item

src/views/cxyrd/modules/LLSrc.vue

@@ -557,8 +557,8 @@ export default {
       if (!this.isShowPrint) {
         document
           .getElementsByTagName("body")[0]
-          .style.setProperty("--tableHeight", "47.5rem");
-        this.tableHeight = "47.5rem"
+          .style.setProperty("--tableHeight", "48rem");
+        this.tableHeight = "48rem"
         this.options = "折叠";
         $(".ico").css("transform", "rotate(180deg)");
       } else {
@@ -655,7 +655,7 @@ const datas = [
 .lt_src {
   width: 100%;
   height: 100%;
-  background: #ffffff;
+  // background: #ffffff;
 
   div {
     display: inline-block;
@@ -707,7 +707,7 @@ const datas = [
   .lt_middle {
     width: 100%;
     // height: 100%;
-    background: #ffffff;
+    // background: #ffffff;
     border-radius: 8px;
   }
 
@@ -741,14 +741,14 @@ const datas = [
   }
 
   .lt_middle_finger_print {
-    background-color: #ffffff;
+    // background-color: #ffffff;
     width: 100%;
 
     .btns-switch {
       display: flex;
       align-items: center;
-      margin-top: 13px;
       width: 100%;
+      height: 40px;
       display: flex;
       justify-content: center;
       background-color: #fff;
@@ -794,6 +794,7 @@ const datas = [
 
   /*底部的统计数据*/
   .lt_middle_bottom {
+    margin-top: 10px;
     text-align: center;
     background: #fff;
     height: 40px;

src/views/rgrd/modules/TLSrc.vue

@@ -44,7 +44,6 @@
           >
             滚动
           </div>
-          <div class="line"></div>
           <div
             class="btn"
             v-show="!isDelete"
@@ -54,7 +53,6 @@
             平面
           </div>
           <div class="btn isDelete" v-show="isDelete">平面</div>
-          <div class="line"></div>
           <div
             class="btn"
             v-show="!isDelete"
@@ -1851,7 +1849,7 @@ $tableHeight: var(--tableHeight, 180px);
 }
 
 div {
-  display: inline-block;
+  // display: inline-block;
 }
 
 label {
@@ -1867,8 +1865,8 @@ label {
 
 .tl-src {
   width: 100%;
-  height: 100%;
-  background: #fff;
+  height: 100vh;
+  // background: #fff;
 
   .top {
     width: 100%;
@@ -1884,8 +1882,8 @@ label {
 
   .main {
     width: 100%;
-    // height: 100%;
-    background: #ffffff;
+    height: 100%;
+    // background: #ffffff;
     border-radius: 8px;
     overflow: hidden;
     .data {
@@ -1964,18 +1962,19 @@ label {
 }
 
 .finger-print {
-  width: 352px;
+  width: 100%;
   height: 700px;
-  margin-left: 10px;
-  background: #fff;
+  // margin-left: 10px;
+  // background: #fff;
 
   .btns {
-    width: 300px;
+    width: 100%;
     height: 32px;
-    margin: 12px 0 12px 40px;
+    padding: 12px 40px;
     background-color: #FFFFFF;
     display: flex;
     align-items: center;
+    justify-content: space-around;
 
     .btn {
       cursor: pointer;
@@ -1988,7 +1987,6 @@ label {
       border-radius: 4px;
       border: 1px solid #055FE7;
       color: #055FE7;
-      margin-right: 10px;
 
       &:active {
         background: #055fe7;
@@ -2015,10 +2013,11 @@ label {
 
   .fingers {
     background: #f6f8fa;
-    margin-top: 0px;
+    margin-top: 10px;
     overflow-y: auto;
     width: 100%;
-    height: 500px;
+    height: 600px;
+    margin-left: 10px;
     padding-left: 8px;
 
     .outside {
@@ -2483,6 +2482,12 @@ label {
   font-size: 12px;
   font-family: HarmonyOS_Sans_SC;
   color: #999999;
+  background: #ffffff;
+  height: 40px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 50px;
   // position: absolute;
   // bottom: -34px;
   // left: 50%;