|
@@ -98,20 +98,6 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
-
|
|
|
|
- <!-- <el-collapse accordion>
|
|
|
|
- <el-collapse-item v-for="(item, index) in forestFarm" :key="index">
|
|
|
|
- <template slot="title">
|
|
|
|
- <div class="d-l-con sj-collapse" :class="{ on: listCurrentIndex1 == item.deptId }"
|
|
|
|
- v-on:click="selectCameraByDeptId(item.deptId)">
|
|
|
|
- <div class="d-l-l-text">
|
|
|
|
- <h4 class="collapse-title">{{ item.deptName }}</h4>
|
|
|
|
- </div>
|
|
|
|
- <div class="d-l-l-count">{{ item.eventCount }}</div>
|
|
|
|
- </div>
|
|
|
|
- </template>
|
|
|
|
- </el-collapse-item>
|
|
|
|
- </el-collapse> -->
|
|
|
|
</div>
|
|
</div>
|
|
</dv-border-box-13>
|
|
</dv-border-box-13>
|
|
</div>
|
|
</div>
|
|
@@ -443,7 +429,7 @@
|
|
getEventPush,
|
|
getEventPush,
|
|
getLatestNotice,
|
|
getLatestNotice,
|
|
getTodayEvents,
|
|
getTodayEvents,
|
|
- getDeptEventCount,
|
|
|
|
|
|
+
|
|
getWeather,
|
|
getWeather,
|
|
selectByMenuId,
|
|
selectByMenuId,
|
|
getEventList,
|
|
getEventList,
|
|
@@ -536,7 +522,7 @@
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
this.getResourcesCount();
|
|
this.getResourcesCount();
|
|
this.getTodayEvents(this.getCurrentDataStr())
|
|
this.getTodayEvents(this.getCurrentDataStr())
|
|
- this.getDeptEventCount(this.getCurrentDataStr())
|
|
|
|
|
|
+
|
|
this.getWeather(this.getCurrentDataStr())
|
|
this.getWeather(this.getCurrentDataStr())
|
|
this.getEventList(this.getCurrentDataStr(), this.pageSize, this.pageNum)
|
|
this.getEventList(this.getCurrentDataStr(), this.pageSize, this.pageNum)
|
|
this.getEventByEventType(this.getCurrentDataStr())
|
|
this.getEventByEventType(this.getCurrentDataStr())
|
|
@@ -583,8 +569,6 @@
|
|
otherTotal_pre: '',
|
|
otherTotal_pre: '',
|
|
readyFinish_pre: '',
|
|
readyFinish_pre: '',
|
|
readySure_pre: '',
|
|
readySure_pre: '',
|
|
- //左侧部门事件数量
|
|
|
|
- forestFarm: [],
|
|
|
|
//右侧天气
|
|
//右侧天气
|
|
todatWeather: false,
|
|
todatWeather: false,
|
|
weatherinformationDirection: '',
|
|
weatherinformationDirection: '',
|
|
@@ -1140,7 +1124,7 @@
|
|
selectDay(day) { //日历点击
|
|
selectDay(day) { //日历点击
|
|
this.pageNum = 1
|
|
this.pageNum = 1
|
|
this.getTodayEvents(day)
|
|
this.getTodayEvents(day)
|
|
- this.getDeptEventCount(day)
|
|
|
|
|
|
+
|
|
this.getWeather(day)
|
|
this.getWeather(day)
|
|
this.getEventList(day, 10, 1)
|
|
this.getEventList(day, 10, 1)
|
|
this.getEventByEventType(day)
|
|
this.getEventByEventType(day)
|
|
@@ -1366,17 +1350,6 @@
|
|
this.eventChartAi(this.aiTotal_pre, this.otherTotal_pre)
|
|
this.eventChartAi(this.aiTotal_pre, this.otherTotal_pre)
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- getDeptEventCount(day, loading) {
|
|
|
|
- let that = this
|
|
|
|
- //左侧获取事件部门数量
|
|
|
|
- getDeptEventCount({
|
|
|
|
- eventTypeIdDl: that.eventTypeIdDl,
|
|
|
|
- eventTypeId: that.eventTypeId,
|
|
|
|
- day: day
|
|
|
|
- }, loading).then(res => {
|
|
|
|
- this.forestFarm = res.data
|
|
|
|
- })
|
|
|
|
- },
|
|
|
|
getWeather(day) {
|
|
getWeather(day) {
|
|
let that = this
|
|
let that = this
|
|
//右侧获取天气信息
|
|
//右侧获取天气信息
|
|
@@ -1506,7 +1479,6 @@
|
|
that.getEventByEventType(that.calendarDay, false)
|
|
that.getEventByEventType(that.calendarDay, false)
|
|
that.getExposureStage(that.calendarDay, false)
|
|
that.getExposureStage(that.calendarDay, false)
|
|
that.getEventByReportorOrder(that.calendarDay, false)
|
|
that.getEventByReportorOrder(that.calendarDay, false)
|
|
- that.getDeptEventCount(that.calendarDay, false)
|
|
|
|
that.getEventList(that.calendarDay, that.pageSize, that.pageNum, '', false)
|
|
that.getEventList(that.calendarDay, that.pageSize, that.pageNum, '', false)
|
|
},
|
|
},
|
|
getEventList(day, pageSize, pageNum, eventSearch, loading) {
|
|
getEventList(day, pageSize, pageNum, eventSearch, loading) {
|
|
@@ -1720,11 +1692,7 @@
|
|
// let data = "{\"fromId\":\"forest\",\"fromUserId\":\""+Cookies.get('username')+"\",\"toUserId\":\""+Cookies.get('username')+"\"}";
|
|
// let data = "{\"fromId\":\"forest\",\"fromUserId\":\""+Cookies.get('username')+"\",\"toUserId\":\""+Cookies.get('username')+"\"}";
|
|
let data = "{\"fromId\":\"traffic\"}";
|
|
let data = "{\"fromId\":\"traffic\"}";
|
|
if (this.calendarDay == this.getCurrentDataStr() && data != e.data) {
|
|
if (this.calendarDay == this.getCurrentDataStr() && data != e.data) {
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
this.getTodayEvents(this.getCurrentDataStr(), false);
|
|
this.getTodayEvents(this.getCurrentDataStr(), false);
|
|
- this.getDeptEventCount(this.getCurrentDataStr(), false);
|
|
|
|
this.getEventByEventType(this.getCurrentDataStr(), false);
|
|
this.getEventByEventType(this.getCurrentDataStr(), false);
|
|
this.getEventByReportorOrder(this.getCurrentDataStr(), false);
|
|
this.getEventByReportorOrder(this.getCurrentDataStr(), false);
|
|
this.getExposureStage(this.getCurrentDataStr(), false);
|
|
this.getExposureStage(this.getCurrentDataStr(), false);
|