网格效果

src/App.vue

@@ -60,14 +60,15 @@ export default {
      * 弹框关闭
      */
     close() {
-            setTimeout(()=>{
-                this.stores.$state.arrayList = [];
-            },1000)
+      setTimeout(()=>{
+          this.stores.$state.arrayList = [];
+      },1000)
     },
   },
 
   computed: {
     isFollow3() {
+      
       return this.stores.$state.tankuangXY; //需要监听撒点距离xy坐标
     },
   },

src/components/bar/index.vue

@@ -131,7 +131,7 @@ export default {
               focus: "series",
             },
             barWidth: "50%",
-            data: (dataMap["火灾扑救"] && dataMap["火灾扑救"].map((val) => val.number)) || [],
+            data: (dataMap["火灾"] && dataMap["火灾"].map((val) => val.number)) || [],
           },
           {
             name: "火灾月平均值",

src/components/gauge/index6.vue

@@ -27,13 +27,11 @@ export default {
             this.getData(val);
         },
     },
-//     mounted() {
-//         this.getData();
-//     },
+    mounted() {
+        this.getData();
+    },
     methods: {
-        getData(val) {
-
-                console.log(11122,val)
+        getData(val = this.data) {
             this.$echarts.init(this.$refs.echartD1).setOption({
                 grid: {},
                 series: [
@@ -68,7 +66,6 @@ export default {
                         },
                         detail: {
                             formatter: (value) => {
-                                    console.log(value)
                                     if(value == 99){
                                             return `${value}%`;
                                     }else{

src/components/mixins/map-data1.js

@@ -116,7 +116,7 @@ export default {
          * @param {*} status 是否有图层
          */
         anbao(status,id){
-            
+            var that = this
             var color = [
                 // "#2c6395",
                 // "#1b6cb6",
@@ -154,7 +154,6 @@ export default {
               ];
             var JmapQuery = new JMapQuery(window.jMap); // JMap为初始化地图时，实例化的JMap对象
             if(status){
-                console.log(11111111)
                 window.jMap.Locate.clearLocate(); //清楚分布
                 // window.jMap.removeLayer();    //  空值清除所有已添加图层
             }
@@ -250,7 +249,13 @@ export default {
                                     }
                                 };
                                 var options = {
-                                    isZoom: true,
+                                    isZoom: 10,
+                                    camera: {
+                                        x: 121.4175597,
+                                        y: 31.119248,
+                                        radius: 18000.0,
+                                        offset: { heading: -4, pitch: -70, range: 0 },
+                                    },
                                     click: regionLocateCallBack,
                                     style: {
                                         color: color[index],
@@ -267,7 +272,13 @@ export default {
     
                                 // 分布点点击事件的回调函数
                                 function regionLocateCallBack(obj) {
-                                    console.log(obj); // obj为返回值
+                                    console.log(234,obj._attributes.name); // obj为返回值
+                                    console.log(that.stores)
+                                    that.stores.gridNameChange( obj._attributes.name);
+                                    setTimeout(()=>{
+                                        console.log(that.stores.$state.gridName)
+                                    },1000)
+                                    
                                 }
     
                             }, idx * 1)
@@ -381,7 +392,6 @@ export default {
                             }
                             // name2.push(obj.features[i].attributes.name)
                         }
-                        console.log(a)
                         var big2Arr = []
                         obj.features.forEach(function(item, index) {
                             var b2 = item.geometry.rings;
@@ -397,11 +407,6 @@ export default {
                                 big2Arr.push(newArr2);
                                 name2.push(item.attributes.name)
                             })
-
-                            
-                            
-                            
-    
                         })
                         
                         big2Arr.forEach(function(item, index) {
@@ -425,7 +430,7 @@ export default {
                                         isZoom: true,
                                         click: regionLocateCallBack2,
                                         style: {
-                                            color: "red",
+                                            color: "#68afc1",
                                             transparency: 0.6,
                                             outline: true,
                                             outlineColor: 'blue',
@@ -435,8 +440,6 @@ export default {
                                     setTimeout(()=>{
                                         jMap.Locate.regionLocate(target, options);
                                     },500)
-                                    
-    
                                     // 分布点点击事件的回调函数
                                     function regionLocateCallBack2(obj) {
                                         console.log(obj); // obj为返回值

src/http/api.js

@@ -43,7 +43,7 @@ let api = {
         caseList: "/prod-api/service-fire/demCase/caseList", //企业自主管理-历史案件
         caseStatistics: "/prod-api/service-fire/demCase/caseStatistics", //企业自主管理-历史案件
         streetDynamic: "/prod-api/service-fire/bscEnterpriseAutonomy/streetDynamic", //企业自主管理-各街镇物联动态
-        // iotDisposal: "/prod-api/service-fire/bscEnterpriseAutonomy/iotDisposal", //企业自主管理-物联网处置情况
+        iotDisposal: "/prod-api/service-fire/bscEnterpriseAutonomy/iotDisposal", //企业自主管理-物联网处置情况
         deviceTypeList: "/prod-api/service-fire/baseDevice/deviceTypeList", //企业自主管理-物联网设备情况
         deviceTypeScatter: "/prod-api/service-fire/baseDevice/deviceTypeScatter", //企业自主管理-物联网设备撒点
     },
@@ -79,7 +79,8 @@ let api = {
         demStreetMicroStationList: "/prod-api/service-fire/demStreetMicroStation/demStreetMicroStationList", //微型消防站撒点
         demHighRiseList: "/prod-api/service-fire/demHighRise/demHighRiseList", //高层建筑撒点
         // gridMemberList: "/prod-api/service-fire/demNewInspectRecord/siAeAllCollect", //网格人员 SAA
-        gridMemberList: "/prod-api/service-fire/demGridMember/gridMemberList", //网格人员 SAA
+        // gridMemberList: "/prod-api/service-fire/demNewInspectRecord/siAeAllCollect", //网格人员 SAA
+        gridMemberScatter: "/prod-api/service-fire/demGridMember/gridMemberScatter", //网格人员 SAA
         regionInfo: "/prod-api/service-fire/baseRegionStatistic/regionInfo", //闵行区基本情况
 
     },

src/http/axios.js

@@ -2,7 +2,7 @@ import axios from "axios";
 import { ElMessage } from "element-plus";
 if (process.env.NODE_ENV !== "development") {
   axios.defaults.baseURL = process.env.VUE_APP_BASE_URL;
-  axios.defaults.timeout = 5000
+  axios.defaults.timeout = 15000
 }
 // console.log( axios.defaults)
 // 请求拦截

src/store/modules/public.js

@@ -194,9 +194,13 @@ const useStore = defineStore("public", {
         tankuangXY: {}, //撒点弹框坐标
         zddwId: 111,
         xfzfdt: {}, //执法记录仪
-        arrayList: [], //撒点弹框数据存储
+        arrayList: [], //撒点弹框数据存储,
+        gridName:1,
     }),
     actions: {
+        gridNameChange(name){
+            this.gridName = name
+        },
 
         /**
          * @左侧收起按钮

src/views/comprehensive-disposal.vue

@@ -665,7 +665,6 @@ export default {
      * 撒点测绘院、高德
      */
     sadianSelect(id) {
-        console.log(id)
       if (this.stroes.$state.mapBool == 1) {
         this.mapCluster();
         // this.warningInstanceScattererApi();

src/views/enforcement-dynamic.vue

@@ -820,7 +820,7 @@ export default {
                                 type: "执法记录仪",
                                 gbid: data[i].gbid,
                                 url:
-                                    "https://10.107.31.215/dispatch-ms/#/conference/single_url?ipc_live=1&key=643e6591-a489-4648-ba35-c15c39c64022&gbids=" +
+                                    "http://10.107.31.215:50080/dispatch-ms/#/conference/single_url?ipc_live=1&key=643e6591-a489-4648-ba35-c15c39c64022&gbids=" +
                                     data[i].gbid,
                             };
                             console.log(1111,num.name,data[i].gbid)

src/views/fire-data-analysis.vue

@@ -574,25 +574,25 @@ export default {
         },
     },
     mounted() {
-        // 通过$refs获取dom元素
-        this.box = this.$refs.seTable.$el.childNodes[2];
-        // 监听这个dom的scroll事件
-        this.box.addEventListener("scroll", (e) => {
-            const scrollTop = e.target.scrollTop; // 已滚动到可视区域上方的高度
-            const clientHeight = e.target.clientHeight; // 可视区域高度
-            const scrollHeight = e.target.scrollHeight; // 滚动内容的总高度
-            if (scrollHeight - (scrollTop + clientHeight) <= 20) {
-                // 不足10像素触发加载更多
-                if (this.isScroll) {
-                    this.isScroll = false;
-                    ++this.current;
-                    this.getFireStatis();
-                    console.log(
-                        scrollHeight - (scrollTop + clientHeight) <= 20
-                    );
-                }
-            }
-        });
+        // // 通过$refs获取dom元素
+        // this.box = this.$refs.seTable.$el.childNodes[2];
+        // // 监听这个dom的scroll事件
+        // this.box.addEventListener("scroll", (e) => {
+        //     const scrollTop = e.target.scrollTop; // 已滚动到可视区域上方的高度
+        //     const clientHeight = e.target.clientHeight; // 可视区域高度
+        //     const scrollHeight = e.target.scrollHeight; // 滚动内容的总高度
+        //     if (scrollHeight - (scrollTop + clientHeight) <= 20) {
+        //         // 不足10像素触发加载更多
+        //         if (this.isScroll) {
+        //             this.isScroll = false;
+        //             ++this.current;
+        //             this.getFireStatis();
+        //             console.log(
+        //                 scrollHeight - (scrollTop + clientHeight) <= 20
+        //             );
+        //         }
+        //     }
+        // });
         window.addEventListener(
             "resize",
             () =>
@@ -637,7 +637,7 @@ export default {
         //     }
             this.getTrend();
             this.getFireCause();
-            this.getFireStatis();
+            // this.getFireStatis();
             this.policeInfo();
             this.sadianSelect(1)
            

src/views/fire-signs.vue

@@ -407,7 +407,7 @@
                         </div>
                     </h4>
                         
-                    <div class="rightBotContent" >
+                    <div class="rightBotContent" v-if="tableData.length>0">
                         <el-table :data="tableData" class="transparentTableRow" height="100%" v-fit-columns  v-loading="loading" :empty-text="dataNo"  ref="reportTable"
                         @mouseenter="autoScroll(true)"
                         @mouseleave="autoScroll()">
@@ -1319,6 +1319,8 @@ export default {
                 { prop: "bookNum", name: "文号" },
                 { prop: "checkTime", name: "检查日期" },
                 { prop: "orderCorrectTime", name: "整改期限" },
+                { prop: "listingLevel", name: "挂牌级别" },
+                
                 { prop: "noticeState", name: "销案状态" },
             ],
             fireAddressList: [],
@@ -1357,9 +1359,6 @@ export default {
     },
     created() {
         this.getData();
-        setTimeout(()=>{
-            this.autoScroll()
-        },2000)
         let _that = this;
         // setInterval(()=>{
         //        console.log(_that.stores.$state.streetTown)
@@ -1757,7 +1756,15 @@ export default {
                                 }else{
                                         this.tableData[i].noticeState  = "未销案"
                                 }
+                                if(this.tableData[i].listingLevel == 1){
+                                        this.tableData[i].listingLevel  = "市级"
+                                }
+                                
+                                if(this.tableData[i].listingLevel == 2){
+                                        this.tableData[i].listingLevel  = "区级"
+                                }
                         }
+                        
                 }
                 this.loading = false
             })

src/views/self-management.vue

@@ -480,7 +480,8 @@
                     <h4 v-if="!stroes.$state.streetTown">各街镇物联动态</h4>
 
                     <div class="rightBotContent" v-if="!stroes.$state.streetTown">
-                        <el-table ref="table" height="100%" :data="streetDynamicData" class="transparentTableRow" style="width: 100%">
+                        <el-table ref="table" height="100%" :data="streetDynamicData" class="transparentTableRow" style="width: 100%" @mouseenter="autoScroll(true)"
+                        @mouseleave="autoScroll()">
                             <el-table-column v-for="item in streetDynamicHeaderData" :key="item.prop" :prop="item.prop" align="center" :label="item.name">
                                 <template #default="scope">
                                     <el-tooltip placement="left" trigger="click">
@@ -1868,7 +1869,7 @@ export default {
                         name: item.deviceTypeName,
                         value: item.deviceCount,
                         lineCount: item.lineCount,
-                        lineRate: (item.lineRate * 100).toFixed(2),
+                        lineRate: item.lineRate.toFixed(2),
                         deviceTypeCode:item.deviceTypeCode
                     }
                 })
@@ -1893,7 +1894,7 @@ export default {
                 startDate = this.getMonth().startTime;
                 endDate = this.getMonth().endTime;
             }
-
+console.log(111111,)
             let res = await this.$axios.get(
                 this.$api.selfManagement.iotDisposal +
                     "?" +
@@ -1903,7 +1904,7 @@ export default {
                         endDate: endDate, //结束时间
                     })
             );
-
+console.log(222222,res)
             if (res.status === "SUCCESS") {
                 if (this.tabsArea2 == "data1") {
                     this.iotDisposalList[0].value = 9004;