1

src/views/datacenter.vue

@@ -592,7 +592,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({
@@ -602,7 +602,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

@@ -381,10 +381,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>
@@ -562,6 +562,7 @@
     },
     data() {
       return {
+        nextbutton:false,
         title:"",
         //左侧资源
         resourcesList: [],
@@ -1421,6 +1422,13 @@
           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();