*

dsk-operate-ui/src/views/enterpriseManagement/index.vue

@@ -57,7 +57,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:role:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -68,7 +67,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:role:remove']"
         >批量删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

dsk-operate-ui/src/views/enterpriseManagement/programme.vue

@@ -24,7 +24,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:role:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -35,7 +34,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:role:remove']"
         >批量删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

dsk-operate-ui/src/views/project/projectList/component/addProject.vue

@@ -13,9 +13,9 @@
     </div>
     <el-form class="popform j" :model="queryParam" :rules="rules" ref="ruleForm" label-width="130px">
       <el-form-item label="项目名称：" class="row"  prop="projectName">
-        <el-input type="text" placeholder="请输入" v-model="queryParam.projectName" @input="getProject" :οnkeyup="queryParam.projectName=queryParam.projectName.replace(/^\s+|\s+$/g,'')"></el-input>
-        <div class="resultlist" v-if="proList.length>0" id="box1">
-          <div v-for="(item,index) in proList" @click="selProject(item)"><span  v-html="item.projectName"></span></div>
+        <el-input type="text" placeholder="请输入" v-model="queryParam.projectName" @input="getProject(1)" :οnkeyup="queryParam.projectName=queryParam.projectName.replace(/^\s+|\s+$/g,'')"></el-input>
+        <div class="resultlist infinite-list" v-infinite-scroll="load1" v-if="proList.length>0" id="box1">
+          <div class="infinite-list-item" v-for="(item,index) in proList" @click="selProject(item)"><span  v-html="item.projectName"></span></div>
         </div>
       </el-form-item>
       <el-form-item label="招采单位：" class="row"  prop="ownerCompany">
@@ -97,6 +97,7 @@
         projectCategory:[],//项目类别
         proList:[],//项目列表
         companypage:1,
+        projectpage:1,
         isscroll:false,
       }
     },
@@ -177,16 +178,41 @@
       },
       //获取项目名称
       getProject(value){
-        if (value.length>=2){
+        this.queryParam.projectStage = null
+        this.queryParam.investmentAmount = null
+        this.queryParam.projectType = null
+        this.queryParam.projectCategory = null
+        this.queryParam.status = 0
+        this.queryParam.ownerCompany = ''
+        if(value == 1){
+          this.proList = []
+          this.projectpage = 1
+        }
+        if (this.queryParam.projectName.length>=2){
           let param = {
-            projectName:value,
+            projectName:this.queryParam.projectName,
+            page:{
+              limit:20,
+              page:this.projectpage
+            }
           }
           queryProject(JSON.stringify(param)).then(result=>{
             if(result.code != 200){
-              this.proList = []
               return false
             }
+            if(result.data != null && result.data.length>0){
+              this.isscroll = true
+              if (this.proList.length===0) {
                 this.proList = result.data
+              } else {
+                let arr2 = result.data
+                arr2.unshift(2, 0);
+                Array.prototype.splice.apply(this.proList, arr2);
+              }
+              this.projectpage += 1
+            }else{
+              this.isscroll = false
+            }
           })
         }
       },
@@ -195,6 +221,11 @@
           this.getCompany(2)
         }
       },
+      load1(){
+        if(this.isscroll){
+          this.getProject(2)
+        }
+      },
       selCompany(item){
         this.queryParam.companyId = item.jskEid
         this.queryParam.ownerCompany = item.name.replace(/<[^>]+>/g, '')

dsk-operate-ui/src/views/system/user/profile/index.vue

@@ -53,7 +53,7 @@
             </el-tab-pane>
           </el-tabs>
         </el-card>
-        <el-card style="margin-top: 16px" v-if="tableDataTotal > 0">
+        <el-card style="margin-top: 16px">
           <div slot="header" class="clearfix">
             <span>数据导出</span>
           </div>
@@ -84,6 +84,12 @@
           <div class="pagination-box" v-if="tableDataTotal>params.pageSize">
             <el-pagination background :current-page="params.pageNum" :page-size="params.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
           </div>
+          <div class="tables">
+          <div class="empty" v-if="tableDataTotal==0">
+            <img class="img" src="@/assets/images/project/empty.png">
+            <div class="p1">暂无数据展示</div>
+          </div>
+          </div>
         </el-card>
       </el-col>
     </el-row>
@@ -133,6 +139,7 @@ export default {
           this.tableData = []
           this.tableDataTotal = 0
         }
+        this.tableDataTotal = 0
         this.isSkeleton = false
       })
     },
@@ -151,3 +158,20 @@ export default {
   }
 };
 </script>
+<style scoped lang="scss">
+  .empty{
+    margin: 0 auto;
+    height: 300px;
+    text-align: center;
+    .img{
+      width: 108px;
+      height: 108px;
+      margin-bottom: 24px;
+      margin-top: 70px;
+    }
+    .p1{
+      color: #333333;
+      font-size: 16px;
+    }
+  }
+</style>