Merge branch 'visu_traffic_01_siping_2.5d' of http://121.37.83.100:3000/sooka_onest/sooka_onest_forestfire_vue2_visualization into visu_traffic_01_siping_2.5d

src/assets/iconfont/iconfont.json

@@ -6,6 +6,160 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "14191056",
+      "name": "喇叭广播",
+      "font_class": "labaguangbo",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "36067460",
+      "name": "水利摄像头",
+      "font_class": "shuilishexiangtou",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "11032209",
+      "name": "类型",
+      "font_class": "leixing",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "14296829",
+      "name": "点位总数",
+      "font_class": "dianweizongshu",
+      "unicode": "e6cc",
+      "unicode_decimal": 59084
+    },
+    {
+      "icon_id": "17930624",
+      "name": "测量工具",
+      "font_class": "celianggongju",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "35809866",
+      "name": "流速",
+      "font_class": "gather-flow",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "7335549",
+      "name": "氨氮",
+      "font_class": "gather-ammoniaNitrogen",
+      "unicode": "eb32",
+      "unicode_decimal": 60210
+    },
+    {
+      "icon_id": "7335568",
+      "name": "溶解氧",
+      "font_class": "gather-dissolve",
+      "unicode": "eb37",
+      "unicode_decimal": 60215
+    },
+    {
+      "icon_id": "7335569",
+      "name": "液位",
+      "font_class": "gather-level",
+      "unicode": "eb36",
+      "unicode_decimal": 60214
+    },
+    {
+      "icon_id": "7335632",
+      "name": "酸碱度",
+      "font_class": "gather-ph",
+      "unicode": "eb46",
+      "unicode_decimal": 60230
+    },
+    {
+      "icon_id": "9082594",
+      "name": "氧化还原电位",
+      "font_class": "gather-orp",
+      "unicode": "eb51",
+      "unicode_decimal": 60241
+    },
+    {
+      "icon_id": "13638743",
+      "name": "温度",
+      "font_class": "gather-temperature",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "13804980",
+      "name": "浊度",
+      "font_class": "gather-turbidity",
+      "unicode": "e781",
+      "unicode_decimal": 59265
+    },
+    {
+      "icon_id": "12770896",
+      "name": "垃圾桶",
+      "font_class": "centerdata-t-hydraulic-garbage-station",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "35584502",
+      "name": "河道蓝线资源",
+      "font_class": "centerdata-t-hydraulic-channel-blueline",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "2116699",
+      "name": "河流面",
+      "font_class": "centerdata-t-hydraulic-river",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "2777434",
+      "name": "桥梁工程",
+      "font_class": "centerdata-t-hydraulic-wade-bridge-culvert",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "4274470",
+      "name": "闸门信息",
+      "font_class": "centerdata-t-hydraulic-water-gate",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "9400975",
+      "name": "推土机",
+      "font_class": "centerdata-t-hydraulic-battlefield",
+      "unicode": "e703",
+      "unicode_decimal": 59139
+    },
+    {
+      "icon_id": "9466856",
+      "name": "河长制河段",
+      "font_class": "centerdata-t-hydraulic-reach",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "11858519",
+      "name": "排污口",
+      "font_class": "centerdata-t-hydraulic-outlet-sewage",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "13956683",
+      "name": "水库",
+      "font_class": "centerdata-t-hydraulic-reservoir",
+      "unicode": "e6b3",
+      "unicode_decimal": 59059
+    },
+    {
       "icon_id": "6850817",
       "name": "三角警示",
       "font_class": "centerdata-t-traffic-warning-sign",
@@ -246,42 +400,42 @@
     {
       "icon_id": "21492584",
       "name": "5饲料",
-      "font_class": "farmenterprise_2",
+      "font_class": "centerdata-t-farm-enterprise-3",
       "unicode": "e67a",
       "unicode_decimal": 59002
     },
     {
       "icon_id": "1486836",
       "name": "生鲜",
-      "font_class": "farmenterprise_1",
+      "font_class": "centerdata-t-farm-enterprise-1",
       "unicode": "e639",
       "unicode_decimal": 58937
     },
     {
       "icon_id": "2116698",
       "name": "规模化畜禽养殖场",
-      "font_class": "filingslivestock",
+      "font_class": "centerdata-t-farm-filings-livestock",
       "unicode": "e63a",
       "unicode_decimal": 58938
     },
     {
       "icon_id": "4670127",
       "name": "农业",
-      "font_class": "protectinfo",
+      "font_class": "centerdata-t-farm-botany-protect-info",
       "unicode": "e63b",
       "unicode_decimal": 58939
     },
     {
       "icon_id": "5387788",
       "name": "人工改站_o",
-      "font_class": "complexmodification",
+      "font_class": "centerdata-t-farm-complex-modification",
       "unicode": "eb56",
       "unicode_decimal": 60246
     },
     {
       "icon_id": "11831137",
       "name": "菜刀",
-      "font_class": "farmenterprise_3",
+      "font_class": "centerdata-t-farm-enterprise-2",
       "unicode": "e731",
       "unicode_decimal": 59185
     },
@@ -379,7 +533,7 @@
     {
       "icon_id": "765262",
       "name": "首页",
-      "font_class": "farmlivestock",
+      "font_class": "centerdata-t-farm-livestock",
       "unicode": "e629",
       "unicode_decimal": 58921
     },
@@ -393,7 +547,7 @@
     {
       "icon_id": "8353896",
       "name": "三农补助",
-      "font_class": "greenhousefilm",
+      "font_class": "centerdata-t-farm-greenhouse-film",
       "unicode": "e62a",
       "unicode_decimal": 58922
     },
@@ -421,7 +575,7 @@
     {
       "icon_id": "18262823",
       "name": "畜禽养殖粪污处理情况30",
-      "font_class": "excrementdispose",
+      "font_class": "centerdata-t-farm-excrement-dispose",
       "unicode": "e82e",
       "unicode_decimal": 59438
     },
@@ -435,7 +589,7 @@
     {
       "icon_id": "21432644",
       "name": "农民合作社",
-      "font_class": "agriculturalcooperatives",
+      "font_class": "centerdata-t-farm-agricultural-cooperatives",
       "unicode": "e62e",
       "unicode_decimal": 58926
     },
@@ -582,7 +736,7 @@
     {
       "icon_id": "30787123",
       "name": "森林防火队",
-      "font_class": "fireteam",
+      "font_class": "centerdata-t-forest-fireteam",
       "unicode": "e607",
       "unicode_decimal": 58887
     },
@@ -638,14 +792,14 @@
     {
       "icon_id": "30787132",
       "name": "起降点",
-      "font_class": "landing",
+      "font_class": "centerdata-t-forest-landing",
       "unicode": "e60f",
       "unicode_decimal": 58895
     },
     {
       "icon_id": "30787133",
       "name": "水源渠道",
-      "font_class": "channel",
+      "font_class": "centerdata-t-forest-channel",
       "unicode": "e610",
       "unicode_decimal": 58896
     },

src/views/forest.vue

@@ -367,7 +367,7 @@
               <div class="paging">
                 <el-button type="button" @click="getEventList(calendarDay, 10, pageNum - 1)">上一页
                 </el-button>
-                <!-- <span>第0页</span> -->
+                <span>第{{pageNum}}页</span>
                 <el-button type="button" @click="getEventList(calendarDay, 10, pageNum + 1)">下一页
                 </el-button>
               </div>
@@ -1739,4 +1739,4 @@
       background-color: #0f3655;
     }
   }
-</style>
+</style>

src/views/monitor.vue

@@ -97,7 +97,7 @@
                 :class="{ on: listCurrentIndex2 == index }"
                 v-on:click="dropLocation(item.latitude, item.longitude, index)">
                 <div class="d-l-l-text">
-                  <i class="iconfont sj-icon-jkzx icon-sxt"></i>
+                  <i class="iconfont icon-sxt" :class="jkListIcon"></i>
                   <h4>{{ item.cameraName }}</h4>
                   <!-- <h4 v-if="onChuan" v-html="cgqData[index]"></h4> -->
                 </div>
@@ -228,6 +228,7 @@
     },
     data() {
       return {
+        jkListIcon:'sj-icon-jkzx',
         cgqData: [],
         iconCurrentIndex1: "-1",
         listCurrentIndex1: "-1",
@@ -451,6 +452,7 @@
         this.placeholderMsg = "请输入摄像头名称";
         clearInterval(this.cgqTimer);
         this.selectDeviceType();
+        this.jkListIcon = 'sj-icon-jkzx'
       },
       laClick() {
         this.onLa = true;
@@ -462,6 +464,7 @@
         this.deptId = Cookies.get("deptId");
         clearInterval(this.cgqTimer);
         this.getDlblistBydeptId();
+        this.jkListIcon = 'sj-icon-labaguangbo'
       },
       chuanClick() {
         this.onLa = false;
@@ -475,6 +478,7 @@
         this.cgqTimer = setInterval(() => {
           this.getMonitorDeviceAndDataList();
         }, 20 * 1000);
+        this.jkListIcon = 'sj-icon-centerdata-t-firecontrol-fire-pressure-sensor'
       },
       // 云广播
       getDlblistBydeptId(index) {
@@ -484,6 +488,7 @@
           .then(function(res) {
             that.loudspeakerNum = res.data.length;
             that.visuForestCloudCameraBOListSearch = [];
+            that.visuForestCloudCameraBOList=[];
             if (res.data != null && res.data.length > 0) {
               for (let j = 0; j < res.data.length; j++) {
                 let dat = {
@@ -492,6 +497,7 @@
                   latitude: res.data[j].latitude,
                 };
                 that.visuForestCloudCameraBOListSearch.push(dat);
+                that.visuForestCloudCameraBOList.push(dat)
               }
               for (let i = 0; i < res.data.length; i++) {
                 let markersMap = {
@@ -590,6 +596,7 @@
         let markersList = [];
         getMonitorDeviceAndDataList(this.deptId).then((res) => {
           this.visuForestCloudCameraBOListSearch = [];
+          this.visuForestCloudCameraBOList=[]
           list = res.data;
           //this.sensorNum = list.length
           list.forEach((item) => {
@@ -599,6 +606,7 @@
               latitude: item.latitude,
             };
             this.visuForestCloudCameraBOListSearch.push(dat);
+            this.visuForestCloudCameraBOList.push(dat);
             let markersMap = {
               lng: 124.59,
               lat: 43.02,

src/views/system/login.vue

@@ -72,7 +72,7 @@
         </el-form-item>
         <!--				<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>-->
         <el-form-item style="width: 100%">
-          <el-popover placement="top" trigger="click" @hide="onhide" v-model="popoverVisible">
+          <el-popover placement="top" trigger="manual" @hide="onhide" v-model="popoverVisible">
             <!-- 滑动拼图验证区 -->
             <el-form-item v-if="sliderOnOff">
               <SliderVerify ref="sliderVerify" :l="42" :r="10" :w="390" :h="155" slider-text="向右拖动滑块完成验证"
@@ -223,6 +223,7 @@
         };
       },
       handleLogin() {
+        this.popoverVisible = true;
         this.verified = false;
         this.sliderOnOff = true;
       },
@@ -457,4 +458,4 @@
     padding: 0 1rem;
     cursor: pointer;
   }
-</style>
+</style>