Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/App.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-07 09:58:13
- * @LastEditTime: 2021-12-16 10:24:53
+ * @LastEditTime: 2021-12-18 11:08:03
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\App.vue
@@ -59,6 +59,9 @@ export default {
   width: 6px; // 横向滚动条
   height: 6px; // 纵向滚动条 必写
 }
+.el-message {
+  z-index: 999999 !important;
+}
 // 滚动条的滑块
 /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
   background-color: #dadde0;

src/views/Home.vue

@@ -1185,7 +1185,7 @@ export default {
     }
 
     .loading {
-        z-index: 999999;
+        z-index: 999998;
         position: fixed;
         left: 0;
         top: 0;

src/views/bzxxgl/fhxxLL.vue

@@ -540,7 +540,7 @@ export default {
     @import "./scss/fhxxLT.scss";
     // 加载动画
     .loading {
-        z-index: 999999;
+        z-index: 999998;
         position: fixed;
         left: 0;
         top: 0;

src/views/bzxxgl/fhxxLT.vue

@@ -581,7 +581,7 @@ export default {
     @import "./scss/fhxxLT.scss";
     // 加载动画
     .loading {
-        z-index: 999999;
+        z-index: 999998;
         position: fixed;
         left: 0;
         top: 0;

src/views/bzxxgl/fhxxTL.vue

@@ -593,7 +593,7 @@ export default {
     @import "./scss/fhxxLT.scss";
     // 加载动画
     .loading {
-        z-index: 999999;
+        z-index: 999998;
         position: fixed;
         left: 0;
         top: 0;

src/views/bzxxgl/fhxxTT copy.vue

@@ -378,7 +378,7 @@ export default {
 @import "./scss/fhxxLT.scss";
 // 加载动画
 .loading {
-  z-index: 999999;
+  z-index: 999998;
   position: fixed;
   left: 0;
   top: 0;

src/views/bzxxgl/fhxxTT.vue

@@ -1600,7 +1600,7 @@ export default {
     @import "./scss/fhxxLT.scss";
     // 加载动画
     .loading {
-        z-index: 999999;
+        z-index: 999998;
         position: fixed;
         left: 0;
         top: 0;
@@ -2149,7 +2149,7 @@ export default {
     }
 
     .loading {
-        z-index: 999999;
+        z-index: 999998;
         position: fixed;
         left: 0;
         top: 0;

src/views/cxyrd/LL.vue

@@ -599,7 +599,7 @@ export default {
 <style scoped lang="scss">
 // 加载动画
 .loading {
-  z-index: 999999;
+  z-index: 999998;
   position: fixed;
   left: 0;
   top: 0;

src/views/cxyrd/LT.vue

@@ -526,7 +526,7 @@ export default {
 <style scoped lang="scss">
 // 加载动画
 .loading {
-  z-index: 999999;
+  z-index: 999998;
   position: fixed;
   left: 0;
   top: 0;

src/views/cxyrd/QueryConfirm.vue

 <template>
   <el-container class="confirm-page" direction="vertical">
     <div class="confirm_header_search">
-      <div class="display_style">
-        <span><b>查询条件</b></span>
-        <div class="clear_btn" @click="clearParams">清空</div>
-      </div>
       <div
         class="width100 margin_top24_bottom24"
         style="display: flex; align-items: center"
@@ -68,21 +64,7 @@
           >
           </el-date-picker>
         </div>
-        <!--        <div class="display_style">-->
-        <!--          <el-dropdown trigger="click">-->
-        <!--            <span class="el-dropdown-link">-->
-        <!--              更多<i-->
-        <!--                class="el-icon-arrow-down-->
-        <!--         el-icon&#45;&#45;right"-->
-        <!--              ></i>-->
-        <!--            </span>-->
-        <!--            <el-dropdown-menu slot="dropdown">-->
-        <!--              <el-dropdown-item>更多1</el-dropdown-item>-->
-        <!--              <el-dropdown-item>更多2</el-dropdown-item>-->
-        <!--              <el-dropdown-item>更多3</el-dropdown-item>-->
-        <!--            </el-dropdown-menu>-->
-        <!--          </el-dropdown>-->
-        <!--        </div>-->
+        <div class="clear_btn" @click="clearParams">清空</div>
         <el-button type="primary" @click="search">筛选结果</el-button>
       </div>
       <div class="width100 margin_top24_bottom24">
@@ -654,8 +636,13 @@ export default {
       }
     },
     // 获取认定列表
-    search() {
+    search(type) {
       this.getParam();
+      if (type) {
+        this.reqParam.page.currPage = 1;
+        this.reqParam.page.pageSize = 10;
+        this.reqParam.page.total = 0;
+      }
       // //console.info("请求===>", this.reqParam.contrastCustomSearchReq);
       this.$axios
         .post("/api/queryque/standardQid", this.reqParam)
@@ -759,7 +746,7 @@ export default {
       this.reqParam.contrastCustomSearchReq[type] = JSON.parse(
         JSON.stringify(list)
       );
-      this.search();
+      this.search('yes');
     },
     // 格式化
     dataFormat(row, prop) {
@@ -1081,7 +1068,7 @@ export default {
         this.reqParam.contrastCustomSearchReq[type].filter(
           (item) => item !== value
         );
-      this.search();
+      this.search('yes');
     },
     // 标签生成
     tagClick(name) {
@@ -1114,7 +1101,7 @@ export default {
       });
       this.dynamicTags = newdynamicTags;
       this.$set(this.reqParam.contrastCustomSearchReq, "querystates", []);
-      this.search();
+      this.search('yes');
     },
     showHistory() {
       this.historyDialogVisible = true;
@@ -1123,7 +1110,7 @@ export default {
     clearAll() {
       this.dynamicTags = [];
       this.clearParams();
-      this.search();
+      this.search('yes');
     },
     // 清空筛选条件
     clearParams() {
@@ -1172,7 +1159,7 @@ export default {
   },
   activated() {
     this.$bus.on("enter", () => {
-      this.search();
+      this.search('yes');
     });
   },
   deactivated() {
@@ -1183,7 +1170,7 @@ export default {
   },
   mounted() {
     this.$bus.on("enter", () => {
-      this.search();
+      this.search('yes');
     });
     //console.log(this.$moment, 222222222222);
     // //console.log(window.innerHeight);
@@ -1195,7 +1182,7 @@ export default {
     // let h3 = document.querySelector('.confirm_main').offsetTop
     // this.height = h1 -h2 -h3
     // //console.log(this.height);
-    this.search();
+    this.search('yes');
   },
 };
 // 用户ID 下拉的数据
@@ -1573,7 +1560,7 @@ b {
   border: none;
   height: 22px;
   padding: 0;
-  margin: 0 12px 0 12px;
+  margin: 0 12px 0 0;
   font-size: 14px;
   font-weight: 350;
   color: #333333;

src/views/cxyrd/TL.vue

@@ -522,7 +522,7 @@ export default {
 <style scoped lang="scss">
 // 加载动画
 .loading {
-  z-index: 999999;
+  z-index: 999998;
   position: fixed;
   left: 0;
   top: 0;

src/views/cxyrd/TT.vue

@@ -2270,7 +2270,7 @@ div {
   padding: 0;
 }
 .loading {
-  z-index: 999999;
+  z-index: 999998;
   position: fixed;
   left: 0;
   top: 0;

src/views/cxyrd/modules/Fcxtj.vue

@@ -33,7 +33,7 @@
         label-width="6.25rem"
         class="demo-ruleForm"
       >
-        <el-form-item label="查询类型:" prop="cxlx">
+        <el-form-item label="查询类型:" prop="cxlx" class="fromItem1">
           <el-radio-group v-model="ruleForm.cxlx.querytype">
             <el-radio label="1" style="color: #e60012" class="color_e60012"
               >倒查</el-radio
@@ -113,12 +113,6 @@
             class="demo-ruleForm"
           >
             <el-form-item label="目标逻辑库:" class="mbljk">
-              <el-checkbox
-                :indeterminate="isIndeterminate_mbljk"
-                v-model="checkAll_mbljk"
-                @change="handleCheckAllChange_ry"
-                >全选</el-checkbox
-              >
               <el-checkbox-group
                 v-model="checkedTargets"
                 @change="handleCheckedTargetsChange_ry"
@@ -238,7 +232,7 @@
         label-width="6.25rem"
         class="demo-ruleForm"
       >
-        <el-form-item label="查询类型:" prop="cxlx">
+        <el-form-item label="查询类型:" prop="cxlx" class="fromItem1">
           <el-radio-group v-model="ruleForm.cxlx.querytype">
             <el-radio label="2" style="color: #00b47a" class="color_00b47a"
               >正查</el-radio
@@ -288,12 +282,6 @@
             class="demo-ruleForm"
           >
             <el-form-item label="目标逻辑库:" class="mbljk">
-              <el-checkbox
-                :indeterminate="isIndeterminate_mbljk"
-                v-model="checkAll_mbljk"
-                @change="handleCheckAllChange_aj"
-                >全选</el-checkbox
-              >
               <el-checkbox-group
                 v-model="checkedTargets"
                 @change="handleCheckedTargetsChange_aj"
@@ -363,7 +351,7 @@
 
     <span slot="footer" class="dialog-footer">
       <el-button class="confirmBtn" @click="off()" type="primary"
-        >取 消</el-button
+        >关 闭</el-button
       >
     </span>
   </el-dialog>
@@ -834,10 +822,15 @@ export default {
   top: 50%;
   transform: translateX(-50%) translateY(-55%);
   margin: 0;
+  background: #ffffff;
+  box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.2);
+  .el-dialog__body {
+    padding-top: 20px;
+  }
 }
 /deep/.el-dialog__header {
   border-bottom: 1px solid #eee;
-  padding: 15px 20px 8px;
+  padding: 15px 34px 8px;
 }
 /deep/.el-dialog__title {
   font-size: 16px;
@@ -848,21 +841,24 @@ export default {
 /deep/ .el-checkbox {
   margin-right: 24px;
 }
+.mbljk /deep/ .el-checkbox {
+  width: 94px;
+}
 /deep/.el-radio__input.is-checked .el-radio__inner {
   border-color: #055fe7;
   background: #055fe7;
 }
-/deep/.color_e60012 .el-radio__input.is-checked + .el-radio__label {
-  color: #e60012;
+/deep/.color_e60012 .el-radio__input + .el-radio__label {
+  color: #e60012 !important;
 }
-/deep/.color_fa9500 .el-radio__input.is-checked + .el-radio__label {
-  color: #fa9500;
+/deep/.color_fa9500 .el-radio__input + .el-radio__label {
+  color: #fa9500 !important;
 }
-/deep/.color_00b47a .el-radio__input.is-checked + .el-radio__label {
-  color: #00b47a;
+/deep/.color_00b47a .el-radio__input + .el-radio__label {
+  color: #00b47a !important;
 }
-/deep/.color_055fe7 .el-radio__input.is-checked + .el-radio__label {
-  color: #055fe7;
+/deep/.color_055fe7 .el-radio__input + .el-radio__label {
+  color: #055fe7 !important;
 }
 /deep/.el-radio__input.is-checked + .el-radio__label {
   color: #333333;
@@ -885,6 +881,7 @@ export default {
 /deep/.el-dialog__footer {
   text-align: center;
   padding-top: 0;
+  padding-bottom: 30px;
 }
 /deep/.el-form-item {
   margin-bottom: 0;
@@ -898,7 +895,10 @@ export default {
 }
 /deep/.el-collapse-item__header {
   border-bottom: none;
+  height: 50px;
+  padding-top: 10px;
 }
+
 .top {
   width: 828px;
   height: 79px;
@@ -1095,6 +1095,16 @@ export default {
     }
   }
 }
+.el-checkbox-group /deep/ {
+  .el-checkbox__input.is-disabled + span.el-checkbox__label {
+    color: #666666;
+  }
+}
+.el-radio-group /deep/ {
+  .el-radio__input.is-disabled + span.el-radio__label {
+    color: #666666;
+  }
+}
 .middle {
   width: 827px;
   margin: 0 auto;
@@ -1195,6 +1205,7 @@ export default {
     }
   }
   .mbljk {
+    padding-top: 0px;
     /deep/.el-checkbox {
       margin-right: 30px;
     }
@@ -1265,9 +1276,22 @@ export default {
       border-color: #b1b6c2;
       background-color: #b1b6c2;
       &::after {
+        width: 7px !important;
+        height: 7px !important;
         background-color: #fff;
       }
     }
   }
 }
+.fromItem1 /deep/ {
+  .el-form-item__label {
+    transform: translateY(-2px);
+  }
+  .el-form-item__content {
+    line-height: 35px;
+  }
+  .el-checkbox-group {
+    transform: translateY(-2px);
+  }
+}
 </style>
\ No newline at end of file

src/views/rgrd/rgLL.vue

@@ -599,7 +599,7 @@ export default {
 <style scoped lang="scss">
 // 加载动画
 .loading {
-  z-index: 999999;
+  z-index: 999998;
   position: fixed;
   left: 0;
   top: 0;

src/views/rgrd/rgLT.vue

@@ -526,7 +526,7 @@ export default {
 <style scoped lang="scss">
 // 加载动画
 .loading {
-  z-index: 999999;
+  z-index: 999998;
   position: fixed;
   left: 0;
   top: 0;

src/views/rgrd/rgTL.vue

@@ -533,7 +533,7 @@ export default {
 <style scoped lang="scss">
 // 加载动画
 .loading {
-  z-index: 999999;
+  z-index: 999998;
   position: fixed;
   left: 0;
   top: 0;

src/views/rgrd/rgTT.vue

@@ -2229,7 +2229,7 @@ div {
   padding: 0;
 }
 .loading {
-  z-index: 999999;
+  z-index: 999998;
   position: fixed;
   left: 0;
   top: 0;