|
@@ -113,7 +113,7 @@
|
|
|
<div class="forthis">
|
|
|
<dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)">
|
|
|
<img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
|
|
|
- <div class="i-list-con small-bottom-margin h-13">
|
|
|
+ <div class="i-list-con small-bottom-margin h-18">
|
|
|
<el-row :gutter="20" v-if="todatWeather">
|
|
|
<el-col :span="9">
|
|
|
<div class="weather-img">
|
|
@@ -189,10 +189,7 @@
|
|
|
<li v-if="weatherinformationDirection==7">风向:北风</li>
|
|
|
<li v-if="weatherinformationDirection==8">风向:东北风</li>
|
|
|
<li>高温:{{ weatherinformationHigh }}℃</li>
|
|
|
- <li>火险:<!-- {{ weatherinformationLevel }}-->
|
|
|
- <template slot-scope="scope">
|
|
|
- <dict-tag :options="dict.type.forest_weatherinformation_level" :value="weatherinformationLevel"/>
|
|
|
- </template>
|
|
|
+ <li>火险:{{ weatherinformationLevelValue }}
|
|
|
</li>
|
|
|
<li>湿度:{{ weatherinformationTemperature }}</li>
|
|
|
</ul>
|
|
@@ -207,11 +204,11 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<div class="firestate" v-if="todatWeather">
|
|
|
- <div class="state-block1"></div>
|
|
|
- <div class="state-block2"></div>
|
|
|
- <div class="state-block3 state-on"></div>
|
|
|
- <div class="state-block4"></div>
|
|
|
- <div class="state-block5"></div>
|
|
|
+ <div :class="weatherinformationLevel=='forest_weatherinformation_level_5'? 'state-block1 state-on':'state-block1'"></div>
|
|
|
+ <div :class="weatherinformationLevel=='forest_weatherinformation_level_4'? 'state-block2 state-on':'state-block2'"></div>
|
|
|
+ <div :class="weatherinformationLevel=='forest_weatherinformation_level_3'? 'state-block3 state-on':'state-block3'"></div>
|
|
|
+ <div :class="weatherinformationLevel=='forest_weatherinformation_level_2'? 'state-block4 state-on':'state-block4'"></div>
|
|
|
+ <div :class="weatherinformationLevel=='forest_weatherinformation_level_1'? 'state-block5 state-on':'state-block5'"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</dv-border-box-13>
|
|
@@ -250,7 +247,7 @@
|
|
|
<span>事件列表</span>
|
|
|
<dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>
|
|
|
</div>
|
|
|
- <div class="i-list-con small-bottom-margin h-39">
|
|
|
+ <div class="i-list-con small-bottom-margin h-34">
|
|
|
<div class="event-list-search">
|
|
|
<el-input
|
|
|
placeholder="请输入内容"
|
|
@@ -405,7 +402,6 @@ import DHWs from '@/dahua/lib/DHWs'
|
|
|
|
|
|
let echarts = require('echarts')
|
|
|
export default {
|
|
|
- dicts: ['forest_weatherinformation_level'],
|
|
|
components: {
|
|
|
supermap,
|
|
|
supermapNotProcessed,
|
|
@@ -442,6 +438,7 @@ export default {
|
|
|
// this.initWebSocket()
|
|
|
/** ----------------------------------weosocket结束------------------------------------- */
|
|
|
this.selectTaskList()//获取任务
|
|
|
+ console.log(this.dict)
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
@@ -468,6 +465,7 @@ export default {
|
|
|
weatherinformationDirection: '',
|
|
|
weatherinformationHigh: '',
|
|
|
weatherinformationLevel: '',
|
|
|
+ weatherinformationLevelValue: '',//火险登记中文
|
|
|
weatherinformationLow: '',
|
|
|
weatherinformationPower: '',
|
|
|
weatherinformationTemperature: '',
|
|
@@ -859,6 +857,7 @@ export default {
|
|
|
this.weatherinformationDirection = res.data.weatherinformationDirection
|
|
|
this.weatherinformationHigh = res.data.weatherinformationHigh
|
|
|
this.weatherinformationLevel = res.data.weatherinformationLevel
|
|
|
+ this.weatherinformationLevelValue = res.data.weatherinformationLevelValue
|
|
|
this.weatherinformationLow = res.data.weatherinformationLow
|
|
|
this.weatherinformationPower = res.data.weatherinformationPower
|
|
|
this.weatherinformationTemperature = res.data.weatherinformationTemperature
|