修改流程bug

src/components/vBottomMenu.vue

@@ -53,7 +53,7 @@
           <div v-if="showBanChild && fastMenu.click == 'forestban'" class="nav-child">
             <div class="forestban">
               <div class="forestban-con">
-                <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+                <el-tree :data="deptOptionsLiandong" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
               </div>
               <div class="forestban-right">
                 <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="searchFB">
@@ -76,7 +76,7 @@
           <div v-if="showChangChild && fastMenu.click == 'forestchang'" class="nav-child">
             <div class="forestban">
               <div class="forestban-con">
-                <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+                <el-tree :data="deptOptionsLiandong" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
               </div>
               <div class="forestban-right">
                 <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="searchFB">
@@ -321,6 +321,9 @@
 import {
   selectTaskBO, getEventDetail, selectTaskDtpts, receiveTask, refusedTask
 } from '@/api/forest'
+import {
+  treeselectAll as deptTreeselect
+} from '@/api/system/dept'
 import supermapTaskDialog from '@/components/supermap' //超图
 
 export default {
@@ -384,6 +387,7 @@ export default {
           click: 'TVWall'
         }
       ],
+      deptOptionsLiandong:[],
       data: [
         {
           label: '一级 1',
@@ -431,6 +435,12 @@ export default {
       btmCurrent: ''
     }
   },
+  created() {
+    /** 查询部门树结构 */
+    deptTreeselect().then(response => {
+      this.deptOptionsLiandong = response.data
+    })
+  },
   methods: {
     setValue(event) {
       this.centerTaskTaskDepts = []
@@ -759,14 +769,14 @@ export default {
           display: flex;
 
           .forestban-con {
-            width: 10rem;
+            width: 20rem;
             height: 20rem;
             overflow-y: scroll;
             border: 1px solid rgba(51, 70, 127, 0.7);
           }
 
           .forestban-right {
-            width: 15rem;
+            width: 10rem;
             height: 20rem;
             overflow-y: scroll;
             padding: 0 1rem;

src/views/eventdetailsdialog.vue

@@ -25,6 +25,8 @@
                       </el-carousel-item>
                     </el-carousel>
                   </div>
+                    <el-button size="small" @click="">预案调整
+                    </el-button>
                 </div>
                 <!-- 应急预案end -->
                 <!-- 左侧资源 -->
@@ -76,9 +78,9 @@
                                               placement="top" v-for="(item,index) in eventLogList">
                               <el-card style="width: 40vh">
                                 <div class="z-info-list-con">
-                                  <div class="user-and-time flex-d">
-                                    <span>{{ item.createName }}</span><span><i
-                                    class="el-icon-location"></i> 定位</span>
+                                  <div class="user-and-time flex-d" >
+                                    <span>{{ item.createName }}</span>
+                                    <span v-if="eventLogList.length - 1 == index"><i class="el-icon-location"></i> {{ item.address }}</span>
                                   </div>
                                   <div class="z-info">
                                     <div class="this-con-list-info">
@@ -118,7 +120,7 @@
                                 <!--                                </el-button>-->
                                 <el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传
                                 </el-button>
-                                <el-button size="small" icon="el-icon-download" @click="toImage()">保存
+                                <el-button size="small" icon="el-icon-download" @click="toImage()">截图
                                 </el-button>
                               </div>
                               <div class="z-info-btm-grp-right">
@@ -214,16 +216,15 @@
         <el-form-item label="火灾半径" v-if="eventStatusButton=='qs'">
           <el-input type="number" v-model="sendHuoZaiBanJing" placeholder="请输入火灾半径"/>
         </el-form-item>
-        <el-form-item :label="deptNameitem"
-                      v-if="eventStatusButton=='qs'||eventStatusButton=='wb'||eventStatusButton=='cf'||eventStatusButton=='ld'">
+        <el-form-item :label="deptNameitem">
           <!--          <treeselect v-model="deptId" :options="deptOptions" multiple :show-count="true"-->
           <!--                      placeholder="请选择签收部门"/>-->
-          <el-select v-model="sendDeptName" clearable placeholder="请选择部门" class="m-r-1rem" @change="setValue">
+          <el-select v-model="sendDeptName" clearable placeholder="请选择部门" class="m-r-1rem" @change="setValue" v-if="eventStatusButton=='wb'||eventStatusButton=='qs'||eventStatusButton=='cf'||eventStatusButton=='ld'">
             <el-option
               v-for="item in deptOptions"
               :key="item.deptId"
               :label="item.deptName"
-              :value="{value:item.deptId,label:item.deptName}"><!--:disabled="item.eventStatus=='未处理' ? false:true"-->
+              :value="{value:item.deptId,label:item.deptName}">
             </el-option>
           </el-select>
         </el-form-item>
@@ -1082,7 +1083,7 @@ export default {
       this.latitude = null
       this.sendTaskTitle = null
       this.sendTaskContent = null
-      this.sendLianDongDept = null
+      this.sendLianDongDept = []
       this.eventTypeList = []//事件类型列表
       this.guanLianYuAnList = []//关联预案列表
       this.deptOptions = []//签收部门
@@ -1278,7 +1279,7 @@ export default {
             if (res.code == 200) {
               this.$message.success(`联动发起成功!`)
               this.refreshEventDialog(this.eventCode)
-              this.showEventConfirm_gd = false
+              this.showEventConfirm = false
             }
           })
 
@@ -1314,7 +1315,6 @@ export default {
               this.$emit('getTodayEvents', this.calendarDay)
             }
           })
-
         } else {
           //事件处理流程
           let param = {

src/views/forest.vue

@@ -117,8 +117,62 @@
                 <el-row :gutter="20" v-if="todatWeather">
                   <el-col :span="9">
                     <div class="weather-img">
-                      <img src="../assets/images/integrated/weather/yin.png">
-                      <span>{{ weatherinformationWeather }}</span>
+                      <img v-if="weatherinformationWeather==1" src="../assets/images/integrated/weather/qing-1.png">
+                      <img v-if="weatherinformationWeather==2" src="../assets/images/integrated/weather/duoyun-2.png">
+                      <img v-if="weatherinformationWeather==3" src="../assets/images/integrated/weather/yin-3.png">
+                      <img v-if="weatherinformationWeather==4" src="../assets/images/integrated/weather/zhenyu-4.png">
+                      <img v-if="weatherinformationWeather==5" src="../assets/images/integrated/weather/leizhenyu-5.png">
+                      <img v-if="weatherinformationWeather==6" src="../assets/images/integrated/weather/leizhenyubingbao-6.png">
+                      <img v-if="weatherinformationWeather==7" src="../assets/images/integrated/weather/yujiaxue-7.png">
+                      <img v-if="weatherinformationWeather==8" src="../assets/images/integrated/weather/xiaoyu-8.png">
+                      <img v-if="weatherinformationWeather==9||weatherinformationWeather==22" src="../assets/images/integrated/weather/zhongyu-9.png">
+                      <img v-if="weatherinformationWeather==10||weatherinformationWeather==23" src="../assets/images/integrated/weather/dayu-10.png">
+                      <img v-if="weatherinformationWeather==11||weatherinformationWeather==24" src="../assets/images/integrated/weather/baoyu-11.png">
+                      <img v-if="weatherinformationWeather==12||weatherinformationWeather==25" src="../assets/images/integrated/weather/dabaoyu-12.png">
+                      <img v-if="weatherinformationWeather==13||weatherinformationWeather==26" src="../assets/images/integrated/weather/tedabaoyu-13.png">
+                      <img v-if="weatherinformationWeather==14" src="../assets/images/integrated/weather/zhenxue-14.png">
+                      <img v-if="weatherinformationWeather==15" src="../assets/images/integrated/weather/xiaoxue-15.png">
+                      <img v-if="weatherinformationWeather==16||weatherinformationWeather==27" src="../assets/images/integrated/weather/zhongxue-16.png">
+                      <img v-if="weatherinformationWeather==17||weatherinformationWeather==28" src="../assets/images/integrated/weather/daxue-17.png">
+                      <img v-if="weatherinformationWeather==18||weatherinformationWeather==29" src="../assets/images/integrated/weather/baoxue-18.png">
+                      <img v-if="weatherinformationWeather==19" src="../assets/images/integrated/weather/wu-19.png">
+                      <img v-if="weatherinformationWeather==20" src="../assets/images/integrated/weather/dongyu-20.png">
+                      <img v-if="weatherinformationWeather==21" src="../assets/images/integrated/weather/shachenbao-21.png">
+                      <img v-if="weatherinformationWeather==30" src="../assets/images/integrated/weather/fuchen-30.png">
+                      <img v-if="weatherinformationWeather==31" src="../assets/images/integrated/weather/yangsha-31.png">
+                      <img v-if="weatherinformationWeather==32" src="../assets/images/integrated/weather/qiangshachenbao-32.png">
+                      <span v-if="weatherinformationWeather==1">晴</span>
+                      <span v-if="weatherinformationWeather==2">多云</span>
+                      <span v-if="weatherinformationWeather==3">阴</span>
+                      <span v-if="weatherinformationWeather==4">阵雨</span>
+                      <span v-if="weatherinformationWeather==5">雷阵雨</span>
+                      <span v-if="weatherinformationWeather==6">雷阵雨伴有冰雹</span>
+                      <span v-if="weatherinformationWeather==7">雨夹雪</span>
+                      <span v-if="weatherinformationWeather==8">小雨</span>
+                      <span v-if="weatherinformationWeather==9">中雨</span>
+                      <span v-if="weatherinformationWeather==10">大雨</span>
+                      <span v-if="weatherinformationWeather==11">暴雨</span>
+                      <span v-if="weatherinformationWeather==12">大暴雨</span>
+                      <span v-if="weatherinformationWeather==13">特大暴雨</span>
+                      <span v-if="weatherinformationWeather==14">阵雪</span>
+                      <span v-if="weatherinformationWeather==15">小雪</span>
+                      <span v-if="weatherinformationWeather==16">中雪</span>
+                      <span v-if="weatherinformationWeather==17">大雪</span>
+                      <span v-if="weatherinformationWeather==18">暴雪</span>
+                      <span v-if="weatherinformationWeather==19">雾</span>
+                      <span v-if="weatherinformationWeather==20">冻雨</span>
+                      <span v-if="weatherinformationWeather==21">沙尘暴</span>
+                      <span v-if="weatherinformationWeather==22">小雨—中雨</span>
+                      <span v-if="weatherinformationWeather==23">中雨—大雨</span>
+                      <span v-if="weatherinformationWeather==24">大雨—暴雨</span>
+                      <span v-if="weatherinformationWeather==25">暴雨—大暴雨</span>
+                      <span v-if="weatherinformationWeather==26">大暴雨—特大暴雨</span>
+                      <span v-if="weatherinformationWeather==27">小雪—中雪</span>
+                      <span v-if="weatherinformationWeather==28">中雪—大雪</span>
+                      <span v-if="weatherinformationWeather==29">大雪—暴雪</span>
+                      <span v-if="weatherinformationWeather==30">浮尘</span>
+                      <span v-if="weatherinformationWeather==31">扬沙</span>
+                      <span v-if="weatherinformationWeather==32">强沙尘暴</span>
                     </div>
                   </el-col>
                   <el-col :span="15">
@@ -126,9 +180,20 @@
                       <ul>
                         <li>风力：{{ weatherinformationPower }}级</li>
                         <li>低温：{{ weatherinformationLow }}℃</li>
-                        <li>风向：{{ weatherinformationDirection }}</li>
+                        <li v-if="weatherinformationDirection==1">风向：东风</li>
+                        <li v-if="weatherinformationDirection==2">风向：东南风</li>
+                        <li v-if="weatherinformationDirection==3">风向：南风</li>
+                        <li v-if="weatherinformationDirection==4">风向：西南风</li>
+                        <li v-if="weatherinformationDirection==5">风向：西风</li>
+                        <li v-if="weatherinformationDirection==6">风向：西北风</li>
+                        <li v-if="weatherinformationDirection==7">风向：北风</li>
+                        <li v-if="weatherinformationDirection==8">风向：东北风</li>
                         <li>高温：{{ weatherinformationHigh }}℃</li>
-                        <li>火险：{{ weatherinformationLevel }}</li>
+                      <li>火险：<!--  {{ weatherinformationLevel }}-->
+                        <template slot-scope="scope">
+                          <dict-tag :options="dict.type.forest_weatherinformation_level" :value="weatherinformationLevel"/>
+                        </template>
+                      </li>
                         <li>湿度：{{ weatherinformationTemperature }}</li>
                       </ul>
                     </div>
@@ -340,6 +405,7 @@ import DHWs from '@/dahua/lib/DHWs'
 
 let echarts = require('echarts')
 export default {
+  dicts: ['forest_weatherinformation_level'],
   components: {
     supermap,
     supermapNotProcessed,