Merge branch 'dev' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into dev

src/components/PdfPreview/view.vue

@@ -64,14 +64,9 @@ export default {
       type: Boolean,
       default: false,
     },
-    boxShow:{
-      type: Boolean,
-      default: true,
-    }
   },
   data() {
     return {
-      likeBox:false,
       src: "",
       showPages: undefined,
       totalPages:0,
@@ -103,13 +98,6 @@ export default {
        this.loadInitPdf(newVal);
       }
     },
-    boxShow(newVal){
-      if(newVal){
-       this.likeBox = true;
-      } else {
-       this.likeBox = false;
-      }
-    },
     loadedRatio(newVal){
       // 直接使用loadedRatio控制进度条没有加载效果
       if(newVal == 1){
@@ -123,7 +111,6 @@ export default {
   methods: {
     goTop() {
      document.documentElement.scrollTop = 0;
-     this.likeBox = false;
     },
     loadProgress(e){
        console.log(e,'loadProgress');
@@ -139,7 +126,6 @@ export default {
           this.showPages++;
        }
       this.isscroll = true;
-      this.likeBox = true;
     },
     //加载页面
     loadInitPdf(url) {
@@ -164,16 +150,18 @@ export default {
       let scrollTop = document.documentElement.scrollTop
       let $this=this;
       if(this.isscroll){
-          this.showPages++;
+        this.showPages++
         this.moreState = 2;
-          this.debounce(this.loadInitPdf($this.filePath),5000);
+          // this.debounce(this.loadInitPdf($this.filePath),5000);
+          //  this.debounce(,200000);
       }
      if(this.pdfpage >= this.totalPages){
         this.isscroll = false;
         this.moreState = 3;
      }
-     if(this.pdfpage < 4){
+       if(this.showPages >= this.totalPages){
-       this.likeBox = false;
+        this.isscroll = false;
+        this.moreState = 3;
      }
         //  if(scrollTop > 400) {
         //   document.querySelector('#articleAnking').style.cssText = "position: fixed;top: 0;width:242.5px";
@@ -181,8 +169,6 @@ export default {
         //   document.querySelector('#articleAnking').style.cssText = "position: static";
         // }
   },
-
-
     debounce(func, wait) {// 非立即执行
     let timeout;
     return function () {

src/views/manage/AddAudiences.vue

@@ -11,7 +11,7 @@
     </el-form>
     <p class="basicInformation">人员信息</p>
     <div class="action">
-      <el-input style="width: 20%" placeholder="请输入姓名或工号" v-model="searchValue"></el-input>
+      <el-input style="width: 20%" clearable placeholder="请输入姓名或工号" v-model="searchValue"></el-input>
       <el-button type="primary" class="findBtn" size="medium" @click="queryTableData">搜索</el-button>
       <el-button type="primary" size="medium" @click="tableDataReset">重置</el-button>
       <el-button type="primary" size="medium" @click="openDialog">添加</el-button>
@@ -168,7 +168,7 @@
         usergroupApi.detail(that.$route.query.id).then((res) => {
             if (res.status == 200) {
               that.form = res.result;
-              that.oldUserGroupItems = JSON.parse(JSON.stringify( res.result.userGroupItems ));
+              // that.oldUserGroupItems = JSON.parse(JSON.stringify( res.result.userGroupItems ));
               that.tableData = res.result.userGroupItems;
               that.queryTableData();
             }
@@ -275,8 +275,10 @@
         this.addUserShow = false;
       },
       tableDataReset(){
-        this.tableData = JSON.parse(JSON.stringify( this.oldUserGroupItems ));
+        this.searchValue = '';
         this.queryTableData();
+        // this.tableData = JSON.parse(JSON.stringify( this.oldUserGroupItems ));
+        // this.queryTableData();
       },
       queryTableData(){
         if(this.searchValue){