Explorar o código

forst分页bug

qinhouyu %!s(int64=2) %!d(string=hai) anos
pai
achega
66ea9195e9
Modificáronse 2 ficheiros con 6 adicións e 5 borrados
  1. 4 4
      src/views/forest.vue
  2. 2 1
      vue.config.js

+ 4 - 4
src/views/forest.vue

@@ -342,10 +342,10 @@
               </div>
               <!--分页-->
               <div class="paging">
-                <el-button type="button" @click="getEventList(calendarDay, 10, pageNum - 1)" :disabled="nextbutton">上一页
+                <el-button type="button"  @click="getEventList(calendarDay,10,pageNum-1,eventSearch)">上一页
                 </el-button>
-                 <span>第{{pageNum}}页</span>
-                <el-button type="button" @click="getEventList(calendarDay, 10, pageNum + 1)" :disabled="nextbutton">下一页
+                <span>第{{pageNum}}页</span>
+                <el-button type="button" :disabled="nextbutton" @click="getEventList(calendarDay,10,pageNum+1,eventSearch)">下一页
                 </el-button>
               </div>
             </dv-border-box-13>
@@ -1046,7 +1046,7 @@ export default {
       //右侧获取事件列表
       getEventList({ eventTypeIdDl: that.eventTypeIdDl, eventTypeId: that.eventTypeId, day: day, pageSize: pageSize, pageNum: pageNum, eventName: eventSearch }, loading).then(res => {
         this.eventList = res.data
-        if(res.data!==null&&res.data.length!==0)
+        if(res.data!==null&&res.data.length!==0&&res.data.length==10)
         {
           this.nextbutton=false
         }else

+ 2 - 1
vue.config.js

@@ -52,7 +52,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://127.0.0.1:3031`,
-        // target: `http://192.168.2.118:3031`,
+        // target: `http://192.168.31.180:3031`,
+        // target: `http://192.168.31.93:3031`,
          target: `http://121.36.228.66:3031`,
         //  target: `https://29613561xe.eicp.vip`,
         changeOrigin: true,