Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/abilityStatistics/index.vue

@@ -55,14 +55,13 @@
         <!--类型-->
         <el-form-item>
           <span>类型：</span>
-          <el-select v-if="this.departmentId === 2 || this.departmentId === 4" v-model="abilityType" placeholder="请选择类型"
+          <el-select  @change="changeIiem" v-if="this.departmentId === 2 || this.departmentId === 4"   v-model="abilityType" placeholder="请选择类型" clearable>
-            clearable>
             <el-option label="全部" value=""></el-option>
             <el-option v-for="(item, i) in typeOptions" :key="`${item.name}${i}`" :label="item.name" :value="item.name"
               v-bind="item">
             </el-option>
           </el-select>
-          <el-select v-else v-model="abilityType" placeholder="请选择类型" clearable>
+          <el-select   @change="changeIiem" v-else v-model="abilityType" placeholder="请选择类型" clearable>
             <el-option label="全部" value=""></el-option>
             <el-option v-for="(item, i) in typeOptions1" :key="`${item.name}${i}`" :label="item.name" :value="item.name"
               v-bind="item">
@@ -416,7 +415,7 @@ export default {
     closeModal() {
       this.detailsVisible = false
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       console.log('val------------>', val)
       this.currentPage = val
       // todo
@@ -873,6 +872,10 @@ export default {
       this.resourcesIsShow = false
       this.handleCurrentChange(1)
     },
+    changeIiem(){
+      this.currentPage=1
+      this.pageSize=10
+    },
     // 明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数
     goToDetail () {
       this.currentPage=1