13127578837 1 yıl önce
ebeveyn
işleme
2a1347ed74

+ 64 - 77
src/components/mixins/map-data1.js

@@ -40,9 +40,7 @@ export default {
                     // ToDo...
                 },
                 map_left_click_callback: (obj, type, movement, event) => {
-                    console.log(movement.position)
                     this.stores.$state.tankuangXY = { x: movement.position.x, y: movement.position.y };
-                    // this.$store.commit("tankuangXY", { x: movement.position.x, y: movement.position.y });
                 },
                 map_right_click_callback: (obj) => {},
             };
@@ -51,63 +49,58 @@ export default {
             window.jMap.createMap("mapF", res.data, window.location.origin, map_params, {});
             // 地图背景样式
             window.jMap.switchBaseLayer("blue");
-            if(type == "anbao"){
-                
-                // var options = {
-                //     click: addLayerCallBack,
-                //     isZoom: false,
-                //     style: {
-                //         outline: true,
-                //         outlineColor: "rgb(255,0,0,0.8)",
-                //         material: "rgb(154,255,154,0)",
-                //         perPositionHeight: false,
-                //         height: 5,
-                //         width: 5,
-                //         label: {
-                //             show: true,
-                //             text: 'name',
-                //             font: "12px Helvetica",
-                //             fillColor: 'rgb(0,255,0,0.9)',
-                //             pixelOffset: [0, -40],
-                //             backgroundColor: 'rgb(0,0,0,0)',
-                //             showBackground: false
-                //         }
-                //     },
-                //     // where: "name = '莘庄镇'"
-
-                // };
-                // jMap.addLayer('mh_dyn_cywg', [0], options);
-                // var options2 = {
-                //     click: addLayerCallBack,
-                //     isZoom: false,
-                //     style: {
-                //         outline: true,
-                //         outlineColor: "rgb(255,0,0,0.8)",
-                //         material: "rgb(154,255,154,0)",
-                //         perPositionHeight: false,
-                //         height: 5,
-                //         width: 5,
-                //         label: {
-                //             show: true,
-                //             text: 'name',
-                //             font: "12px Helvetica",
-                //             fillColor: 'rgb(0,255,0,0.9)',
-                //             pixelOffset: [0, -40],
-                //             backgroundColor: 'rgb(0,0,0,0)',
-                //             showBackground: false
-                //         }
-                //     },
-                //     where: "name = '赵家村村委会'"
-
-                // };
-                // jMap.addLayer('mh_dyn_district', [2], options2);
-                // 点击事件回调函数
-                function addLayerCallBack(obj) {
-                    console.log(obj);
-                }
-            }
+
+             /**
+             * 获取街镇信息
+             */
+            var options = {
+                click: addLayerCallBack,
+                isZoom: false,
+                style: {
+                    outline: true,
+                    outlineColor: "rgb(255,0,0,0.8)",
+                    material: "rgb(154,255,154,0)",
+                    perPositionHeight: false,
+                    height: 5,
+                    width: 5,
+                    label: {
+                        show: true,
+                        text: "name",
+                        font: "16px Helvetica",
+                        fillColor: "rgb(0,255,0,0.9)",
+                        pixelOffset: [0, -40],
+                        backgroundColor: "rgb(0,0,0,0)",
+                        showBackground: false,
+                    },
+                },
+                // where:"name = '莘庄镇'"
+            };
+
+            window.jMap.addLayer("mh_dyn_district", [1], options);
             
 
+            // 街镇标题绘制
+            // var qp = new JMapQueryParam({
+            //     queryMapService: "mh_dyn_district",
+            //     queryMapLayers: [1],
+            //     outFields: ["code", "name", "center_x", "center_y"],
+            //     // queryWhere: "name like '%莘庄镇%' ",
+            //     callBack: (res) => {
+
+            //         res.features.forEach(async(val) => {
+            //             await window.jMap.FlagInfo.show({
+            //                 id: val.attributes.code,
+            //                 position: { x: Number(val.attributes.center_x), y: Number(val.attributes.center_y), z: 0 },
+            //                 element: `<div class='ysc-dynamic-layer ys-css3-box' onclick="vue.clickFlag(${val.attributes.code})">
+            //                                     <div class='biaozhu' style="font-size:18px !important">${val.attributes.name}   ${val.attributes.code}</div>
+            //                             </div>`,
+            //             }, { isZoom: false });
+            //         });
+            //     },
+            // });
+            // new JMapQuery(window.jMap).execQuery(qp)
+
+
            
         },
         /**
@@ -209,15 +202,15 @@ export default {
                                     id: idx,
                                     attributes: {
                                         name: 
-                                        name[index] ==  "华漕镇处置网格二(纪王西片区)" ? "闵S1-1(纪王西网格)" 
-                                        : name[index] ==  "华漕镇处置网格一(纪王东片区)" ? "闵S1-2(纪王东网格)"
-                                        : name[index] ==  "华漕镇处置网格四(诸翟北片区)" ? "闵S1-3(诸翟北网格)"
-                                        : name[index] ==  "华漕镇处置网格五(诸翟南片区)" ? "闵S1-4(诸翟南网格)"
-                                        : name[index] ==  "华漕镇处置网格三(老华漕片区)" ? "闵S1-5(老华漕网格)"
+                                        name[index] ==  "华漕镇处置网格二(纪王西片区)" ? "闵S1-1纪王西网格)" 
+                                        : name[index] ==  "华漕镇处置网格一(纪王东片区)" ? "闵S1-2纪王东网格)"
+                                        : name[index] ==  "华漕镇处置网格四(诸翟北片区)" ? "闵S1-3诸翟北网格)"
+                                        : name[index] ==  "华漕镇处置网格五(诸翟南片区)" ? "闵S1-4诸翟南网格)"
+                                        : name[index] ==  "华漕镇处置网格三(老华漕片区)" ? "闵S1-5老华漕网格)"
                                         : name[index] ==  "新虹街道处置网格二(爱博)" ? "闵S2-1(爱博网格)"
-                                        : name[index] ==  "新虹街道处置网格三(华美)" ? "闵S2-2(华美网格)"
+                                        : name[index] ==  "新虹街道处置网格三(华美)" ? "闵S2-2华美网格)"
                                         : name[index] ==  "新虹街道处置网格一(枢纽)" ? "闵S2-3(枢纽网格)"
-                                        : name[index] ==  "新虹街道处置网格四(航华)" ? "闵S2-4(航华网格)"
+                                        : name[index] ==  "新虹街道处置网格四(航华)" ? "闵S2-4航华网格)"
                                         : name[index] ==  "七宝镇处置网格一(七宝北片网格)" ? "闵S3-1(七宝北片网格)"
                                         : name[index] ==  "七宝镇处置网格二(七宝中片网格)" ? "闵S3-2(七宝吴宝路网格)"
                                         : name[index] ==  "七宝镇处置网格五(航华网格)" ? "闵S3-3(七宝航华网格)"
@@ -228,15 +221,15 @@ export default {
                                     position: item,
                                     label: {
                                         text:  
-                                        name[index] ==  "华漕镇处置网格二(纪王西片区)" ? "闵S1-1(纪王西网格)" 
-                                        : name[index] ==  "华漕镇处置网格一(纪王东片区)" ? "闵S1-2(纪王东网格)"
-                                        : name[index] ==  "华漕镇处置网格四(诸翟北片区)" ? "闵S1-3(诸翟北网格)"
-                                        : name[index] ==  "华漕镇处置网格五(诸翟南片区)" ? "闵S1-4(诸翟南网格)"
-                                        : name[index] ==  "华漕镇处置网格三(老华漕片区)" ? "闵S1-5(老华漕网格)"
+                                        name[index] ==  "华漕镇处置网格二(纪王西片区)" ? "闵S1-1纪王西网格)" 
+                                        : name[index] ==  "华漕镇处置网格一(纪王东片区)" ? "闵S1-2纪王东网格)"
+                                        : name[index] ==  "华漕镇处置网格四(诸翟北片区)" ? "闵S1-3诸翟北网格)"
+                                        : name[index] ==  "华漕镇处置网格五(诸翟南片区)" ? "闵S1-4诸翟南网格)"
+                                        : name[index] ==  "华漕镇处置网格三(老华漕片区)" ? "闵S1-5老华漕网格)"
                                         : name[index] ==  "新虹街道处置网格二(爱博)" ? "闵S2-1(爱博网格)"
-                                        : name[index] ==  "新虹街道处置网格三(华美)" ? "闵S2-2(华美网格)"
+                                        : name[index] ==  "新虹街道处置网格三(华美)" ? "闵S2-2华美网格)"
                                         : name[index] ==  "新虹街道处置网格一(枢纽)" ? "闵S2-3(枢纽网格)"
-                                        : name[index] ==  "新虹街道处置网格四(航华)" ? "闵S2-4(航华网格)"
+                                        : name[index] ==  "新虹街道处置网格四(航华)" ? "闵S2-4航华网格)"
                                         : name[index] ==  "七宝镇处置网格一(七宝北片网格)" ? "闵S3-1(七宝北片网格)"
                                         : name[index] ==  "七宝镇处置网格二(七宝中片网格)" ? "闵S3-2(七宝吴宝路网格)"
                                         : name[index] ==  "七宝镇处置网格五(航华网格)" ? "闵S3-3(七宝航华网格)"
@@ -272,13 +265,7 @@ export default {
     
                                 // 分布点点击事件的回调函数
                                 function regionLocateCallBack(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)

+ 53 - 44
src/views/security-plan.vue

@@ -6,46 +6,9 @@
                     <h4>疏导区基本情况</h4>
                     <div class="leftTopContent2">
                         <el-row>
-                            <div>
-                                <p>疏导区总面积</p>
-                                <p><strong>59</strong>km²</p>
-                            </div>
-                            <div>
-                                <p>华漕镇</p>
-                                <p><strong>28.2</strong>km²</p>
-                            </div>
-                            <div>
-                                <p>新虹街道</p>
-                                <p><strong>19.26</strong>km²</p>
-                            </div>
-                            <div>
-                                <p>七宝镇</p>
-                                <p><strong>7.51</strong>km²</p>
-                            </div>
-                            <div>
-                                <p>虹桥镇</p>
-                                <p><strong>4.03</strong>km²</p>
-                            </div>
-                            <div>
-                                <p>大网格</p>
-                                <p><strong>4</strong>个</p>
-                            </div>
-                            <div>
-                                <p>中网格</p>
-                                <p><strong>14</strong>个</p>
-                            </div>
-                            
-                            <div>
-                                <p>小网格</p>
-                                <p><strong>103</strong>个</p>
-                            </div>
-                            <div>
-                                <p>分管领导</p>
-                                <p><strong>20</strong></p>
-                            </div>
-                            <div>
-                                <p>增援干部</p>
-                                <p><strong>11</strong>个</p>
+                            <div v-for="(item,index) in diversionArea" :key="index">
+                                <p>{{ item.name }}</p>
+                                <p><strong><CountTo :startVal='0' :endVal='item.value' :duration='5000'> {{   item.value || 0 }}</CountTo></strong>{{ item.unit }}</p>
                             </div>
                         </el-row>
                     </div>
@@ -371,12 +334,60 @@ import map from "@c/mixins/map-data1";
 import gauge from "@c/gauge/index6";
 // import map from "@c/mixins/map-gaode-public";
 import category from "@c/category/index22";
+import CountTo from '@/components/count-to/index.js'
 export default {
     mixins: [linstener, map],
-    components: { category, gauge },
+    components: { category, gauge, CountTo },
     data() {
         return {
-            gridStatus:undefined,
+            diversionArea:[
+                {
+                    name:"华漕镇",
+                    value:28.2,
+                    unit:"km²",
+                },
+                {
+                    name:"新虹街道",
+                    value:19.26,
+                    unit:"km²",
+                },
+                {
+                    name:"七宝镇",
+                    value:7.51,
+                    unit:"km²",
+                },
+                {
+                    name:"虹桥镇",
+                    value:4.03,
+                    unit:"km²",
+                },
+                {
+                    name:"大网格",
+                    value:4,
+                    unit:"个",
+                },
+                {
+                    name:"中网格",
+                    value:14,
+                    unit:"个",
+                },
+                {
+                    name:"小网格",
+                    value:103,
+                    unit:"个",
+                },
+                {
+                    name:"分管领导",
+                    value:20,
+                    unit:"位",
+                },
+                {
+                    name:"增援干部",
+                    value:11,
+                    unit:"位",
+                },
+            ],//疏导区
+            gridStatus:2,
             dataNo: "加载中...",
             stores: this.$useStore(),
             proptionList: [
@@ -1244,9 +1255,7 @@ export default {
     },
     watch:{
         "stores.$state.gridName": function(newValue, oldValue) {
-            console.log(newValue,this.gridStatus)
             if(this.gridStatus == 2){
-                
                 this.grid(2,newValue)
             }
             if(this.gridStatus == 3){

+ 1 - 2
src/views/self-management.vue

@@ -119,8 +119,7 @@
                                             display: 'block',
                                         }"
                                     >
-                                        <CountTo :startVal='0' :endVal=' score? score.value:0' :duration='3000'> {{   score.value || 0 }}</CountTo>
-                                        <!-- {{ score.mark }} -->
+                                        <CountTo :startVal='0' :endVal=' score? score.value:0' :duration='5000'> {{   score.value || 0 }}</CountTo>
                                     </span>
                                     <span style="font-size: 0.175rem; color: #ffffff">
                                         {{ score.name }}