Home Explore Help
Sign In
wangtao
/
fire-mh
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

地图切换完成

wangtao 3 weeks ago
parent
8e20953081
commit
37fe3480f6
11 changed files with 1144 additions and 1196 deletions
Unified View Show Diff Stats
  1. 2 1
      README.md
  2. 2 2
      public/index.html
  3. 0 10
      src/components/basicInfo/index.vue
  4. 0 10
      src/components/complaintInfo/index.vue
  5. 0 3
      src/components/listingInfo/index.vue
  6. 6 0
      src/components/matterInfo/index.vue
  7. 1072 1107
      src/components/mixins/map-data32_9.js
  8. 6 6
      src/components/xunJianInfo/index.vue
  9. 29 29
      src/store/modules/public.js
  10. 27 27
      src/views/index.vue
  11. 0 1
      src/views/security-plan.vue

+ 2 - 1
README.md
View File 

@@ -1,7 +1,8 @@
 
 # 闵行大屏项目

 # 闵行大屏项目

 ### 文档（吉超博）

 ### 文档（吉超博）

 ### https://docs.apipost.cn/preview/61b2861af42252f6/a453b7fa01ec4c0f?target_id=2c54712b-9b38-4642-b3a9-7205d58072ca

 ### https://docs.apipost.cn/preview/61b2861af42252f6/a453b7fa01ec4c0f?target_id=2c54712b-9b38-4642-b3a9-7205d58072ca

-### 地图 https://docs.qq.com/doc/p/45a9e62baebdf0205ee8e062dc788a6ab99f9386?pub=1&dver=2.1.0

+### 地图 https://docs.qq.com/doc/p/45a9e62baebdf0205ee8e062dc788a6ab99f9386?pub=1&dver=2.1.0  旧地图

+### 地图 https://docs.qq.com/doc/p/f7902f50c08430c60fd12ed919ac88e56ac18b91 新地图

 ## node-module插件模块引入

 ## node-module插件模块引入

 ## node 14.16.4

 ## node 14.16.4

+ 2 - 2
public/index.html
View File 

@@ -21,8 +21,8 @@
 
     <!-- <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=8e266e1ac2ad2383c7773ff504ac248f"></script>

     <!-- <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=8e266e1ac2ad2383c7773ff504ac248f"></script>

     <script type="text/javascript" src="//webapi.amap.com/ui/1.1/main.js"></script> -->

     <script type="text/javascript" src="//webapi.amap.com/ui/1.1/main.js"></script> -->

     <!-- 大数据地图 -->

     <!-- 大数据地图 -->

-    <script src="https://gis.shmh.gov.cn/mh_map/js/index_v1.0.js"></script>

-    <!-- <script src="https://onemap-web.shmh.gov.cn/mh_onemap/js/index_v1.0_https.js"></script> -->

+    <!-- <script src="https://gis.shmh.gov.cn/mh_map/js/index_v1.0.js"></script> -->

+    <script src="https://onemap-web.shmh.gov.cn/mh_onemap/js/index_v1.0_https.js"></script>

 </head>

 </head>

 <body>

 <body>

     <noscript>

     <noscript>

+ 0 - 10
src/components/basicInfo/index.vue
View File 

@@ -28,16 +28,6 @@ export default {
 
         this.getData()
 
         this.getData()
 
     },
 
     },
 
     methods: {
 
     methods: {
 
-        selectArray(id) {
 
-            this.checkedArray.checkedData[0] = id;
 
-            let data = this.checkedSelectArray.filter((val) => {
 
-                if (val.value == id) {
 
-                    return val.label;
 
-                }
 
-            });
 
-            this.checkedSelectLabel = data[0].label;
 
-            this.sadianSelect(data[0].value);
 
-        },
 
         //闵行区基本情况
 
         //闵行区基本情况
 
         getData(){
 
         getData(){
 
             this.$axios.get(this.$api.fireSite.regionInfo
 
             this.$axios.get(this.$api.fireSite.regionInfo

+ 0 - 10
src/components/complaintInfo/index.vue
View File 

@@ -35,16 +35,6 @@ export default {
 
         this.getData()
 
         this.getData()
 
     },
 
     },
 
     methods: {
 
     methods: {
 
-        selectArray(id) {
 
-            this.checkedArray.checkedData[0] = id;
 
-            let data = this.checkedSelectArray.filter((val) => {
 
-                if (val.value == id) {
 
-                    return val.label;
 
-                }
 
-            });
 
-            this.checkedSelectLabel = data[0].label;
 
-            this.sadianSelect(data[0].value);
 
-        },
 
         /**
 
         /**
 
          * @投诉举报情况 
          * @投诉举报情况 
          * @api接口请求
 
          * @api接口请求

+ 0 - 3
src/components/listingInfo/index.vue
View File 

@@ -65,9 +65,6 @@ export default {
 
     created() {
 
     created() {
 
         this.getHazardsNoticeStatistic()
 
         this.getHazardsNoticeStatistic()
 
         this.getHazardsNoticeList()
 
         this.getHazardsNoticeList()
 
-        // setTimeout(()=>{
 
-        //     this.autoScroll()
 
-        // },1000)
 
     },
 
     },
 
     mixins: [linstener],
 
     mixins: [linstener],
 
     methods: {
 
     methods: {

+ 6 - 0
src/components/matterInfo/index.vue
View File 

@@ -51,6 +51,12 @@ export default {
 
             data:{},
 
             data:{},
 
         };
 
         };
 
     },
 
     },
 
+    props: {
 
+        addMarker: {
 
+            type: Function,
 
+            default: () => {}
 
+        }
 
+    },
 
     mounted() {
 
     mounted() {
 
         this.getData()
 
         this.getData()
 
     },
 
     },

File diff suppressed because it is too large
+ 1072 - 1107
src/components/mixins/map-data32_9.js


+ 6 - 6
src/components/xunJianInfo/index.vue
View File 

@@ -23,8 +23,8 @@
 
                 <el-row style="padding-left: 5%; flex-flow: nowrap" @click="unitInspection(index)">
 
                 <el-row style="padding-left: 5%; flex-flow: nowrap" @click="unitInspection(index)">
 
                     <img style="width: 100px; height: 100px; padding: 20px; margin: auto 0" :src="require('@/assets/img/self-management/' + (index + 5) + '.png')" alt="" />
 
                     <img style="width: 100px; height: 100px; padding: 20px; margin: auto 0" :src="require('@/assets/img/self-management/' + (index + 5) + '.png')" alt="" />
 
                     <div style="line-height: 40px; margin: auto 0">
 
                     <div style="line-height: 40px; margin: auto 0">
 
-                        <span :style="{ color: 'rgba(115, 251, 253, 1)', fontWeight: 600, fontSize: '18px', display: 'block',}">
 
-                            <CountTo :startVal='0' :endVal=' score? score.value:0' :duration='5000'> {{   score.value || 0 }}</CountTo>
 
+                        <span :style="{ color: 'rgba(115, 251, 253, 1)', fontWeight: 600, fontSize: '18px', display: 'block'}">
 
+                            <CountTo :startVal='0' :endVal='score ? score.value : 0' :duration='5000'> {{   score.value || 0 }}</CountTo>
 
                         </span>
 
                         </span>
 
                         <span style="font-size: 14px; color: #fff">
 
                         <span style="font-size: 14px; color: #fff">
 
                             {{ score.name }}
 
                             {{ score.name }}
 
@@ -70,11 +70,11 @@ export default {
 
         this.getData();
 
         this.getData();
 
     },
 
     },
 
     methods: {
 
     methods: {
 
+        /**
 
+         * @企业自主巡检情况
 
+         * @api请求
 
+         */
 
         getData(){
 
         getData(){
 
-            /**
 
-             * @企业自主巡检情况
 
-             * @api请求
 
-             */
 
             this.$axios.get(
 
             this.$axios.get(
 
                 this.$api.selfManagement.enterpriseAutonomy +
 
                 this.$api.selfManagement.enterpriseAutonomy +
 
                     "?" +
 
                     "?" +

+ 29 - 29
src/store/modules/public.js
View File 

@@ -129,90 +129,90 @@ const useStore = defineStore("public", {
 
         ],

         ],

 

 

         mhjz: [

         mhjz: [

-            { streetTown: "全区", id: 12, x: 121.4175597, y: 31.119248 },

+            { streetTown: "全区", id: 12, x: -6955.680446455513, y: -14133.980214590623 },

             {

             {

                 streetTown: "江川路街道",

                 streetTown: "江川路街道",

                 id: 1201,

                 id: 1201,

-                x: 121.399126538181,

-                y: 31.0099719391863,

+                x: -6724.01877915177,

+                y: -25051.226147144036,

             },

             },

             {

             {

                 streetTown: "新虹街道",

                 streetTown: "新虹街道",

                 id: 1217,

                 id: 1217,

-                x: 121.319329296294,

-                y: 31.1983901916889,

+                x: -14169.847631401555,

+                y: -4123.533402153036,

             },

             },

             {

             {

                 streetTown: "古美路街道",

                 streetTown: "古美路街道",

                 id: 1206,

                 id: 1206,

-                x: 121.388451866936,

-                y: 31.1478233480159,

+                x: -7529.434018984137,

+                y: -9675.55591379224,

             },

             },

             {

             {

                 streetTown: "浦锦街道",

                 streetTown: "浦锦街道",

                 id: 1218,

                 id: 1218,

-                x: 121.483929120352,

-                y: 31.089967318558,

+                x: 1598.7402246072422,

+                y: -16017.821549457249,

             },

             },

             {

             {

                 streetTown: "浦江镇",

                 streetTown: "浦江镇",

                 id: 1215,

                 id: 1215,

-                x: 121.524058543447,

-                y: 31.0540039472667,

+                x: 5476.839776328536,

+                y: -20091.135938677933,

             },

             },

             {

             {

                 streetTown: "吴泾镇",

                 streetTown: "吴泾镇",

                 id: 1213,

                 id: 1213,

-                x: 121.454076463728,

-                y: 31.04860402113,

+                x: -1273.0168477818272,

+                y: -20615.94946350268,

             },

             },

             {

             {

                 streetTown: "马桥镇",

                 streetTown: "马桥镇",

                 id: 1214,

                 id: 1214,

-                x: 121.352680027718,

-                y: 31.0213512298508,

+                x: -10985.608933600415,

+                y: -23437.704344687416,

             },

             },

             {

             {

                 streetTown: "颛桥镇",

                 streetTown: "颛桥镇",

                 id: 1209,

                 id: 1209,

-                x: 121.40607138504,

-                y: 31.0612972443508,

+                x: -5546.493486331954,

+                y: -19635.193396138362,

             },

             },

             {

             {

                 streetTown: "莘庄镇",

                 streetTown: "莘庄镇",

                 id: 1207,

                 id: 1207,

-                x: 121.37064864047,

-                y: 31.1154549548722,

+                x: -9096.96388411951,

+                y: -13601.281015206529,

             },

             },

             {

             {

                 streetTown: "梅陇镇",

                 streetTown: "梅陇镇",

                 id: 1212,

                 id: 1212,

-                x: 121.421346814491,

-                y: 31.1069718313722,

+                x: -3900.029553457814,

+                y: -14963.805578334099,

             },

             },

             {

             {

                 streetTown: "七宝镇",

                 streetTown: "七宝镇",

                 id: 1208,

                 id: 1208,

-                x: 121.350366186317,

-                y: 31.1553292680362,

+                x: -11392.329131452056,

+                y: -8772.997282886055,

             },

             },

             {

             {

                 streetTown: "虹桥镇",

                 streetTown: "虹桥镇",

                 id: 1211,

                 id: 1211,

-                x: 121.37956256207,

-                y: 31.1806219953212,

+                x: -8514.343746047378,

+                y: -5978.066002913978,

             },

             },

             {

             {

                 streetTown: "华漕镇",

                 streetTown: "华漕镇",

                 id: 1210,

                 id: 1210,

-                x: 121.277541517147,

-                y: 31.2289121171624,

+                x: -18087.372694263897,

+                y: -875.6124444732853,

             },

             },

             {

             {

                 streetTown: "莘庄工业区",

                 streetTown: "莘庄工业区",

                 id: 1216,

                 id: 1216,

-                x: 121.376508452784,

-                y: 31.0678185611843,

+                x: -8551.561718097404,

+                y: -18848.381475632996,

             },

             },

         ],

         ],

+ 27 - 27
src/views/index.vue
View File 

@@ -8,7 +8,7 @@
 
                 <div class="box">
 
                 <div class="box">
 
                     <basicInfo />
 
                     <basicInfo />
 
                     <complaintInfo />
 
                     <complaintInfo />
 
-                    <matterInfo />
 
+                    <matterInfo :addMarker="addMarker"/>
 
                 </div>
 
                 </div>
 
                 <div class="box">
 
                 <div class="box">
 
                     <zhiFaInfo />
 
                     <zhiFaInfo />
 
@@ -63,7 +63,6 @@
 
                     <videoInfo />
 
                     <videoInfo />
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
-            <!-- 消防安全重点单位弹框 -->
 
             <transition name="el-fade-in-linear">
 
             <transition name="el-fade-in-linear">
 
                 <div class="tableTooltipwt2" v-if="tk">
 
                 <div class="tableTooltipwt2" v-if="tk">
 
                     <img src="~@a/img/icon/close.png" alt="" class="close" @click="closeTk" />
 
                     <img src="~@a/img/icon/close.png" alt="" class="close" @click="closeTk" />
 
@@ -270,7 +269,6 @@ export default {
 
         };
 
         };
 
     },
 
     },
 
     created() {
 
     created() {
 
-
 
     },
 
     },
 
     mounted() {
 
     mounted() {
 
         this.initMap();
 
         this.initMap();
 
@@ -410,32 +408,35 @@ export default {
 
                                     })
 
                                     })
 
                             )
 
                             )
 
                             .then((res) => {
 
                             .then((res) => {
 
-                                for (let i = 0; i < res.data.records.length; i++) {
 
-                                    arr[i] = {};
 
-                                    arr[i].address = res.data.records[i].mhBuild.address;
 
-                                    arr[i].facilityName = res.data.records[i].mhCompany.companyName;
 
-                                    arr[i].facilityType = res.data.records[i].mhCompany.companyStatus;
 
-                                    arr[i].qrcode = res.data.records[i].mhCompany.qrcode;
 
-                                    arr[i].creditCode = res.data.records[i].mhCompany.creditCode;
 
-                                    arr[i].companyLegal = res.data.records[i].mhCompany.companyLegal;
 
-                                    arr[i].safetyManager = res.data.records[i].mhCompany.safetyManager;
 
-                                    arr[i].phone = res.data.records[i].mhCompany.phone;
 
-                                    arr[i].safetyManager = res.data.records[i].mhCompany.safetyManager;
 
-                                    arr[i].companyArea = res.data.records[i].mhCompany.companyArea;
 
-                                    arr[i].street = res.data.records[i].mhCompany.street;
 
-                                    arr[i].state = res.data.records[i].mhCompany.state;
 
-                                    arr[i].isExamine = res.data.records[i].mhCompany.isExamine;
 
-                                    arr[i].status = res.data.records[i].mhCompany.status;
 
-                                    arr[i].height = res.data.records[i].mhBuild.height;
 
-                                    arr[i].buildNature = res.data.records[i].mhBuild.buildNature;
 
-                                    arr[i].latitude = res.data.records[i].mhBuild.lat;
 
-                                    arr[i].longitude = res.data.records[i].mhBuild.lon;
 
-                                    arr[i].type = "厂房、仓库";
 
-                                    arr[i].type1 = "厂房、仓库";
 
+                                var data = res.data.records;
 
+                                for (let i = 0; i < data.length; i++) {
 
+                                    if(data[i].mhBuild.latitude && data[i].mhBuild.longitude){
 
+                                        arr.push({
 
+                                            address:data[i].mhBuild.address,
 
+                                            facilityName:data[i].mhCompany.companyName,
 
+                                            facilityType:data[i].mhCompany.companyStatus,
 
+                                            qrcode:data[i].mhCompany.qrcode,
 
+                                            creditCode:data[i].mhCompany.creditCode,
 
+                                            companyLegal:data[i].mhCompany.companyLegal,
 
+                                            safetyManager:data[i].mhCompany.safetyManager,
 
+                                            phone:data[i].mhCompany.phone,
 
+                                            companyArea:data[i].mhCompany.companyArea,
 
+                                            street:data[i].mhCompany.street,
 
+                                            state:data[i].mhCompany.state,
 
+                                            isExamine:data[i].mhCompany.isExamine,
 
+                                            status:data[i].mhCompany.status,
 
+                                            height:data[i].mhBuild.height,
 
+                                            buildNature:data[i].mhBuild.buildNature,
 
+                                            latitude:data[i].mhBuild.latitude,
 
+                                            longitude:data[i].mhBuild.longitude,
 
+                                            type:"厂房、仓库",
 
+                                            type1:"厂房、仓库"
 
+                                        })
 
+                                    }
 
                                 }
 
                                 }
 
                                 axiosSub ++
 
                                 axiosSub ++
 
                                 if(axiosSub == this.axiosNum){
 
                                 if(axiosSub == this.axiosNum){
 
-                                    this.addMarker(arr, "index");
 
+                                    this.addMarker(arr, "index","厂房、仓库");
 
                                 }
 
                                 }
 
                             });
 
                             });
 
                         }
 
                         }
 
@@ -453,7 +454,6 @@ export default {
 
              * @api接口请求
 
              * @api接口请求
 
              */
 
              */
 
             async zddwSd(val) {
 
             async zddwSd(val) {
 
-                console.log(val)
 
                 let res = await this.$axios.get(
 
                 let res = await this.$axios.get(
 
                     this.$api.selfManagement.scatterData +
 
                     this.$api.selfManagement.scatterData +
 
                         "?" +
 
                         "?" +

+ 0 - 1
src/views/security-plan.vue
View File 

@@ -1151,7 +1151,6 @@ import category from "@c/category/index22";
 
 import unitBox from "@c/unitBox/index";

 import unitBox from "@c/unitBox/index";

 import CountTo from '@/components/count-to/index.js'

 import CountTo from '@/components/count-to/index.js'

 import Hls from "hls.js";

 import Hls from "hls.js";

-import { set } from "lodash";

 export default {

 export default {

     mixins: [linstener, map],

     mixins: [linstener, map],

     components: { category, gauge, CountTo,unitBox ,Vue3SeamlessScroll },

     components: { category, gauge, CountTo,unitBox ,Vue3SeamlessScroll },

Some files were not shown because too many files changed in this diff