Merge remote-tracking branch 'origin/visu_environment' into visu_environment

src/api/forest.js

@@ -246,8 +246,8 @@ export function dutysystemRemove(param) {
 // 通过部门id获取责任人
 export function userFeginlist(param) {
   return request({
-    url: '/system/user/userFeginlist',
-    method: 'post',
-    data: param
+    url: '/system/user/selectUserWithPostByDeptId',
+    method: 'get',
+    params:param
   })
 }

src/views/findUserByDept.vue

@@ -23,7 +23,7 @@
     <el-table v-loading="loading" :data="userList"  @selection-change="handleSelectionChange">
       <el-table-column align="center" type="selection" width="60"></el-table-column>
       <el-table-column label="姓名" align="center" prop="nickName"></el-table-column>
-      <el-table-column label="岗位" align="center" prop="name" ></el-table-column>
+      <el-table-column label="岗位" align="center" prop="postName" ></el-table-column>
       <el-table-column label="手机号" align="center" prop="phonenumber"></el-table-column>
     </el-table>
   </div>
@@ -99,7 +99,7 @@
           res.dept = '';
           res.depteventId = '';
           res.name = selection[i].nickName;
-          res.post = '';
+          res.post = selection[i].postName;;
           res.telphone = selection[i].phonenumber;
           this.resUser.push(res);
         }

src/views/forest.vue

@@ -286,7 +286,7 @@
               <div class="i-list-con small-bottom-margin" style="height: 30vh;">
                 <div class="event-list-search">
                   <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="eventSearch"
-                            @change="getEventList(calendarDay,200,1,eventSearch)">
+                            @change="getEventList(calendarDay,10,1,eventSearch)">
                   </el-input>
                 </div>
                 <div class="d-l-con padding-box nowrap" v-for="(item,index) in eventList"
@@ -560,7 +560,7 @@
         exposureStageList: [],
         //右侧事件列表
         eventList: [],
-        pageSize: 200,
+        pageSize: 10,
         pageNum: 1,
 
         eventListnew: [],
@@ -639,7 +639,7 @@
         this.getTodayEvents(day)
         this.getDeptEventCount(day)
         this.getWeather(day)
-        this.getEventList(day, 200, 1)
+        this.getEventList(day, 10, 1)
         this.getEventByEventType(day)
         this.getEventByReportorOrder(day)
         this.getExposureStage(day)
@@ -1074,7 +1074,7 @@
           markersMap.icon = 'sj-icon-map-guidang'
         } else if (event.eventStatusValue == 'forest_event_status_7') {
           markersMap.click = 'showEventDialog'
-          markersMap.icon = 'sj-icon-map-xinshangbao'
+          markersMap.icon = 'sj-icon-map-queren'
         }
         markersMap.parameter = event.eventCode
         markersMap.lng = event.longitude