1

src/views/datacenter.vue

@@ -405,7 +405,7 @@ export default {
           id: null,
           labelCode: data.cameraList[i].cameraCode,
           labelName: data.cameraList[i].cameraName,
-          cameraType: "1",
+          cameraType:data.cameraList[i].cameraType,
           parentLabelCode: "999",
         });
         labelChannels.push({
@@ -415,7 +415,7 @@ export default {
               channelCode: data.cameraList[i].cameraCode,
               channelName: data.cameraList[i].cameraName,
               channelSn: null,
-              cameraType: "1",
+              cameraType:data.cameraList[i].cameraType,
               online: "1",
               cameraCode: "1",
             },

src/views/forest.vue

@@ -342,10 +342,10 @@
               </div>
               <!--分页-->
               <div class="paging">
-                <el-button type="button" @click="getEventList(calendarDay, 10, pageNum - 1)">上一页
+                <el-button type="button" @click="getEventList(calendarDay, 10, pageNum - 1)" :disabled="nextbutton">上一页
                 </el-button>
                  <span>第{{pageNum}}页</span>
-                <el-button type="button" @click="getEventList(calendarDay, 10, pageNum + 1)">下一页
+                <el-button type="button" @click="getEventList(calendarDay, 10, pageNum + 1)" :disabled="nextbutton">下一页
                 </el-button>
               </div>
             </dv-border-box-13>
@@ -509,6 +509,7 @@ export default {
   },
   data() {
     return {
+      nextbutton:false,
       title:"",
       //警报MP3文件
       audioSrc: require('@/assets/jingbao.mp3'),
@@ -1035,6 +1036,13 @@ 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)
+        {
+          this.nextbutton=false
+        }else
+        {
+          this.nextbutton=true
+        }
         if (this.eventList != null && this.eventList.length > 0) {
           if (this.eventList[0].eventStatusValue == 'forest_event_status_1') {
             that.$refs.bottomMenu.updateAlert()