Merge remote-tracking branch 'origin/visu_traffic_01_siping_2.5d' into visu_traffic_01_siping_2.5d

src/api/bigdata/bigdata.js

@@ -24,3 +24,17 @@ export function deptBigData() {
   })
 }
 
+
+//热力图
+export function getRlt(param) {
+  //暂时传当年，以后再说
+  if (param == null) {
+    let myDate = new Date();
+    param = {day: myDate.getFullYear()}
+  }
+  return request({
+    url: '/center-traffic/data/getHeatMap',
+    method: 'post',
+    data : param
+  })
+}

src/assets/styles/base.scss

@@ -230,9 +230,59 @@ ul {
   width: 100%;
   height: 100vh;
 }
+.sj-icon-btn {
+
+  padding: 0 .3rem;
+  height: 1.5rem;
+  background-color: #112543;
+  color: $inBlue;
+  border: 1px $searchBorder;
+}
+.sj-icon-btn:hover {
+  text-shadow: 0 0 15px rgba($color: $inBlueHover, $alpha: 1.0);
+}
+.sj-upload{
+  .el-upload--picture-card{
+    background-color: #0d1620!important;
+    border: 1px dashed #083874;
+  }
+  .el-upload--picture-card i {
+    color: #153d6c;
+  }
+}
+// 下拉
+.el-select-dropdown {
+  border: none;
+  background-color: rgba(1, 28, 82, 0.8);
+}
+.el-select-dropdown__item{
+  color: $white;
+}
+.el-select-dropdown{
+  background-color: #00335c;
+  border: solid 1px #56dfff;
+  color: $white;
+}
+.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
+  background-color: #035faa;
+
+}
+
+  //下拉框选中
+.el-select-dropdown__item {
+  color: #eee;
+}
+
+//鼠标经过下拉框
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  color: #00d3e9;
+  background-color: #0f3360;
+}
+
 //tips样式
 .js-tps{
-    
+
   // background-image: -moz-linear-gradient($boxBG)!important;
   // background-image: -webkit-linear-gradient($boxBG) !important;
   // background-image: linear-gradient($boxBG)!important;
@@ -3278,4 +3328,4 @@ div::-webkit-scrollbar {
 
 .el-message{
   z-index: 9999 !important;
-}
+}

src/components/supermap-2.5d.vue

@@ -5,11 +5,14 @@
       <transition name='fade'>
         <div class="map-tit" v-show="mapshow">
           <div class="top-tit">
-            <i class="iconfont sj-icon-jkzx" @click="openTvwall()"></i>
+            <i class="iconfont sj-icon-jkzx"></i>
             <span><img src="../assets/images/close.svg" @click="mapshow=false" /></span>
           </div>
           <div class="map-txt" v-html="bindPopupHtml">
           </div>
+          <el-button size="mini" type="primary" class="sj-icon-btn" @click="openTvwall()" v-if="_click!=''">
+            查看
+          </el-button>
           <div id="super2" />
         </div>
       </transition>
@@ -194,6 +197,9 @@
             "Cun_yitong@SiPing#1",
           ],
         ],
+        vdivcesiumContainer: "",
+        _click: null,
+        _parameter: null,
       }
     },
     watch: {},
@@ -827,9 +833,11 @@
         });
       },
       openTvwall() {
-        if(this.openZt){
-          this.mapshow=false;
+        this.mapshow = false;
+        if (this.openZt) {
           this.$emit('fatherMethod', this.dianshiqiang, this.longitude, this.latitude, this.userList);
+        } else {
+          this.$emit(this._click, this._parameter);
         }
       },
       /**
@@ -878,6 +886,8 @@
               that.bindPopupHtml = html
               that.mapshow = true
               that.openZt = false
+              that._click = id._click;
+              that._parameter = id._parameter;
             } else {
               that.mapshow = false
             }
@@ -1012,4 +1022,4 @@
     opacity: 0;
     transform: translateY(-10rem);
   }
-</style>
+</style>

src/components/vBottomMenu.vue

@@ -197,8 +197,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>
@@ -432,7 +432,7 @@
                                                  v-for="(itemfile,indexfile) in item.fileVOs">
                                       <el-image :src="itemfile.fileUrl" v-if="itemfile.fileType=='image'"
                                                 :preview-src-list="assetTypeAnImage(item.fileVOs)"
-                                                style="width:3rem; height:3rem;margin: 2px;" :title="itemfile.fileName">
+                                                style="width:3rem; height:3rem;margin: 2px;" :z-index="10000" :title="itemfile.fileName">
                                       </el-image>
                                       <img v-else-if="itemfile.fileType=='video'"
                                            style="width:3rem; height:3rem;margin: 2px;"
@@ -532,13 +532,17 @@
           </el-input>
         </el-form-item>
         <el-form-item label="附件" prop="schedulePictures" v-if="eventStatusButton=='sh'">
-          <ImageUpload ref="ImageUpload" :limit="10" :fileType="['jpg', 'png','jpeg']" :value="uploadAttachList"
+          <ImageUpload class="sj-upload" ref="ImageUpload" :limit="10" :fileType="['jpg', 'png','jpeg']" :value="uploadAttachList"
                        @input="getUrl"></ImageUpload>
         </el-form-item>
         <el-button size="mini" type="primary" v-if="eventStatusButton=='sh'"
+                   class="sj-icon-btn"
+                   icon="el-icon-circle-check"
                    @click="updateCentereventTEventcatalogueStatus('shtg',true)">通过
         </el-button>
         <el-button size="mini" type="primary" v-if="eventStatusButton=='sh'"
+                   class="sj-icon-btn"
+                   icon="el-icon-circle-close"
                    @click="updateCentereventTEventcatalogueStatus('shbtg',true)">不通过
         </el-button>
       </el-form>

src/views/bigdata/bigdata.vue

@@ -121,7 +121,7 @@
 	import chartPit_sg from './chart-pit-sg.vue' //饼图
   import bigdataSupermap from '@/components/supermap' //超图
 
-  import {initPieChartData,eventcatalogueBigData,deptBigData} from '@/api/bigdata/bigdata';
+  import {initPieChartData,eventcatalogueBigData,deptBigData,getRlt} from '@/api/bigdata/bigdata';
   import {
     fontConfig
   } from '@/api/login'
@@ -144,11 +144,10 @@
     created() {
       this.fontConfig()
       this.eventcatalogueBigData();
+			this.rlt()
     },
     mounted() {
-      setTimeout(() => {
-        this.$refs.bigdataSupermap.loadHeatMap()//事件分布
-      }, 1000)
+
     },
 		data() {
 			return {
@@ -189,6 +188,15 @@
 			}
 		},
     methods: {
+			rlt() {
+				let that = this
+				getRlt().then(resp => {
+					setTimeout(() => {
+						//事件分布
+						that.$refs.bigdataSupermap.loadHeatMap(resp.data)
+					}, 5000)
+				})
+			},
       fontConfig(){
         fontConfig().then(res => {
           this.systemTitle.title = res.data.fontTitle;

src/views/eventdetailsdialog.vue

@@ -335,7 +335,7 @@
           </el-input>
         </el-form-item>
         <el-form-item label="附件" prop="schedulePictures" v-if="eventStatusButton=='sh'">
-          <ImageUpload ref="ImageUpload" :limit="10" :fileType="['jpg', 'png','jpeg']" :value="uploadAttachList"
+          <ImageUpload class="sj-upload"  ref="ImageUpload" :limit="10" :fileType="['jpg', 'png','jpeg']" :value="uploadAttachList"
                        @input="getUrl"></ImageUpload>
         </el-form-item>
         <!--<el-form-item label="联系人" v-if="eventStatusButton=='qs'">-->
@@ -348,24 +348,38 @@
         <!--</el-select>-->
         <!--</el-form-item>-->
         <el-button size="mini" type="primary" v-if="eventStatusButton=='qr'"
+                   class="sj-icon-btn"
+                   icon="el-icon-document-checked"
                    @click="updateCentereventTEventcatalogueStatus('qr',false)">确认
         </el-button>
         <el-button size="mini" type="primary" v-if="eventStatusButton=='qs'"
+                   class="sj-icon-btn"
+                   icon="el-icon-edit"
                    @click="updateCentereventTEventcatalogueStatus('qs',true)">签收
         </el-button>
         <el-button size="mini" type="primary" v-if="eventStatusButton=='wb'"
+                   class="sj-icon-btn"
+                   icon="el-icon-close-notification"
                    @click="updateCentereventTEventcatalogueStatus('wb',true)">误报
         </el-button>
         <el-button size="mini" type="primary" v-if="eventStatusButton=='cf'"
+                   class="sj-icon-btn"
+                   icon="el-icon-document-copy"
                    @click="updateCentereventTEventcatalogueStatus('cf',true)">重复
         </el-button>
         <el-button size="mini" type="primary" v-if="eventStatusButton=='ld'"
+                   class="sj-icon-btn"
+                   icon="el-icon-phone"
                    @click="updateCentereventTEventcatalogueStatus('ld',true)">发起联动
         </el-button>
         <el-button size="mini" type="primary" v-if="eventStatusButton=='sh'"
+                   class="sj-icon-btn"
+                   icon="el-icon-circle-check"
                    @click="updateCentereventTEventcatalogueStatus('shtg',true)">通过
         </el-button>
         <el-button size="mini" type="primary" v-if="eventStatusButton=='sh'"
+                   class="sj-icon-btn"
+                   icon="el-icon-circle-close"
                    @click="updateCentereventTEventcatalogueStatus('shbtg',true)">不通过
         </el-button>
       </el-form>

src/views/monitor.vue

@@ -206,13 +206,12 @@
     mounted() {
       // 初始化地图数据
       this.getSuperMapUrl();
-
+      this.deptId = Cookies.get("deptId");
       setTimeout(() => {
         this.selectKeyAreaList();
         this.getTreeselect();
-        this.deptId = Cookies.get("deptId");
-        this.getMonitorDeviceAndDataLists();
       }, 2000)
+      this.getMonitorDeviceAndDataLists();
       this.bottomMenuList(); //获取底部公共组件消息和任务
       // this.getSensorListByDeptId(-1)
       // this.getDlblistBydeptId(-1)
@@ -367,7 +366,7 @@
       //传感器2
       getMonitorDeviceAndDataLists() {
         let that = this;
-        getMonitorDeviceAndDataList(this.deptId).then((res) => {
+        getMonitorDeviceAndDataList(that.deptId).then((res) => {
           that.sensorNum = res.data.length;
         });
       },
@@ -486,7 +485,7 @@
         let markersList = [];
         getDlblistBydeptId(that.deptId)
           .then(function(res) {
-            that.loudspeakerNum = res.data.length;
+            // that.loudspeakerNum = res.data.length;
             that.visuForestCloudCameraBOListSearch = [];
             that.visuForestCloudCameraBOList=[];
             if (res.data != null && res.data.length > 0) {