王通 1 år sedan
förälder
incheckning
93d088047a
4 ändrade filer med 527 tillägg och 466 borttagningar
  1. 1 1
      src/api/components/supermap.js
  2. 6 2
      src/components/vBottomMenu.vue
  3. 1 1
      src/views/bigdata/bigdata.vue
  4. 519 462
      src/views/firespread.vue

+ 1 - 1
src/api/components/supermap.js

@@ -53,7 +53,7 @@ export const iconList = {
   'sj-icon-map-centerdata_water_flow_rate': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_flow_rate.png'), //水流速传感器
 
   'sj-icon-map-centerdata-sand-quarry-camera':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-sand-quarry-camera.png'),//矿坑摄像头
-  'sj-icon-map-centerdata-t-hydraulic-reservoir-camera':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-hydraulic-reservoir.png'),//水库摄像头
+  'sj-icon-map-centerdata-t-hydraulic-reservoir-camera':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-river_camera.png'),//水库摄像头
   //云图图标
   'sj-icon-map-centerdata-slmonitor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-slmonitor.png'),//水利摄像头
   'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata-sand-quarry-camera.png'),//水利摄像头

+ 6 - 2
src/components/vBottomMenu.vue

@@ -178,6 +178,10 @@
           <div class="btm-r-pop-info-box" v-for="(item,index) in messageList">
             <div class="btm-r-pop-info-con">
               <div class="btm-r-pop-info-list">
+                <div class="btm-r-pop-info-list-name">消息时间</div>
+                <div class="btm-r-pop-info-list-text">{{ item.createTime }}</div>
+              </div>
+              <div class="btm-r-pop-info-list">
                 <div class="btm-r-pop-info-list-name">标题</div>
                 <div class="btm-r-pop-info-list-text">{{ item.title }}</div>
               </div>
@@ -197,8 +201,8 @@
               <el-link type="success" v-if="item.eventCode!=null&&item.type ==1" @click="showEventDialog_message(item.eventCode)">
                 查看事件详情
               </el-link>
-              <div class="btm-r-pop-info-btm-btn">
-                <el-button type="primary" v-if="item.type ==2" @click="selectMessageById(item.id)">标记已读
+              <div class="btm-r-pop-info-btm-btn" v-else>
+                <el-button type="primary"  @click="selectMessageById(item.id)">标记已读
                 </el-button>
               </div>
             </div>

+ 1 - 1
src/views/bigdata/bigdata.vue

@@ -23,7 +23,7 @@
       <div class="bigdata-list wid-li-1">
         <div class="b-con mg-b-20">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-            <span>火险事件来源类型统计</span>
+            <span>事件来源类型统计</span>
           </div>
           <chartEvent></chartEvent>
         </div>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 519 - 462
src/views/firespread.vue