大屏

dcit-hcsystem-hcsystem-master/src/utils/mapUtil.js

@@ -306,33 +306,13 @@ export default class Mutil {
 		//对获取的点坐标数据进行处理，重构，得到我们需要的数据结构
 		for (let i = 0; i < points.length; i++) {
 			let region = points[i];   //单个面
-			//let pointArr = region.split(',');
-			//let p = pointArr[j];
 			let pArr = region.split(',');
 			let pos = fromLonLat(pArr);  //将坐标转为默认投影，默认投影是EPSG：3857
-			let hdms = transform(pos, 'EPSG:3857', 'EPSG:4326');   //坐标系间坐标转换，由前面的坐标转为后面坐标系坐标
-			pointsz.push(pArr)    //将转化格式后的点坐标存储起来
+			//let hdms = transform(pos, 'EPSG:3857', 'EPSG:4326');   //坐标系间坐标转换，由前面的坐标转为后面坐标系坐标
+			pointsz.push(pos)    //将转化格式后的点坐标存储起来
 		};
 		//自己造的地图数据（GeoJSON数据）
-		let geojsonObject = {
-			'type': 'FeatureCollection',    //要素集合
-			'crs': {
-				'type': 'name',
-				'properties': {  //特性
-					'name': 'EPSG:3857'
-				}
-			},
-            'features': [{  //要素
-                'type': 'Feature',
-                'geometry': {  //几何图形
-                    'type': 'GeometryCollection',   //几何图形集合
-                    'geometries': [{   //几何形状
-                        'type': 'Polygon',   //多边形
-                        'coordinates': [pointsz]    //坐标
-                    }]
-                }
-            }]
-		};
+        let geojsonObject = this.structureGeojson(pointsz);
 		let vectorSource = new VectorSource({   //提供矢量图层的数据
 			features: (new GeoJSON().readFeatures(geojsonObject))
 		});
@@ -340,11 +320,11 @@ export default class Mutil {
 			source: vectorSource,   //来源
 			style: new Style({
 				stroke: new Stroke({
-					color: 'yellow',
-					width: 6
+					color: '#08d527',
+					width: 4
 				}),
 				fill: new Fill({
-					color: 'rgba(255,255,0,0.1)'
+					color: 'rgba(212, 220, 29, 0.1)'
 				})
 			})
 		});
@@ -355,17 +335,35 @@ export default class Mutil {
 		this.MAP.addLayer(vectorLayer);
 		this.tempLayer = vectorLayer;
 	}
+    structureGeojson(pointsz){
+		let geojsonObject = {
+			'type': 'FeatureCollection',    //要素集合
+			'crs': {
+				'type': 'name',
+				'properties': {  //特性
+					'name': 'EPSG:3857'
+				}
+			},
+			'features': [{  //要素
+				'type': 'Feature',
+				'geometry': {  //几何图形
+					'type': 'GeometryCollection',   //几何图形集合
+					'geometries': [{   //几何形状
+						'type': 'Polygon',   //多边形
+						'coordinates': [pointsz]    //坐标
+					}]
+				}
+			}]
+		};
+		return geojsonObject;
+	}
 
-	changeCenter(name) {  //根据name传参
+    getBoundaries(name) {  //根据name传参
 		axios.get('https://restapi.amap.com/v3/config/district?key=cb087c0fb3b8bc56a4af064630495bb9&subdistrict=0&extensions=all&keywords='+name).then(res => {
-			
             let local = res.data.districts[0].center.split(",");
-			let view = new View({
-				center: transform(fromLonLat(local), 'EPSG:3857', 'EPSG:4326'),    //将中心点坐标转为EPSG：4326
-				projection: get('EPSG:4326'),   //投影坐标系 EPSG：4326
-				zoom: 10
-			});
-			this.MAP.setView(view);
+            let view = this.MAP.getView();
+            view.setCenter(fromLonLat(local));
+            view.setZoom(10);
 			this.drawArea(res.data.districts[0])
 		})
 	}

dcit-hcsystem-hcsystem-master/src/views/Enterprises/tongji.vue

@@ -81,21 +81,21 @@
 					<img src="../../assets/logo2.png" width="25%" style="margin-top: 2rem;">
 					<p>危险源数量</p>
 				</div>
-				<div style="width: 60%;height: 100%;text-align: center;line-height: 9rem;float: right;font-size: 3rem;font-family: 'UnidreamLED';">12345</div>
+				<div style="width: 60%;height: 100%;text-align: center;line-height: 9rem;float: right;font-size: 3rem;font-family: 'UnidreamLED';">{{tjNumberObj.dangerNum}}</div>
 			</div>
 			<div class="el-tab-pane-div second-div" style="">
 				<div style="width: 40%;height: 100%; text-align: center;float: left;font-size: 15px;">
 					<img src="../../assets/logo2.png" width="25%" style="margin-top: 2rem;">
 					<p>注册企业数量</p>
 				</div>
-				<div style="width: 60%;height: 100%;text-align: center;line-height: 9rem;float: right;font-size: 3rem;font-family: 'UnidreamLED';">12345</div>
+				<div style="width: 60%;height: 100%;text-align: center;line-height: 9rem;float: right;font-size: 3rem;font-family: 'UnidreamLED';">{{tjNumberObj.enterpriseRegNum}}</div>
 			</div>
 			<div class="el-tab-pane-div second-div" style="">
 				<div style="width: 40%;height: 100%; text-align: center;float: left;font-size: 15px;">
 					<img src="../../assets/logo2.png" width="25%" style="margin-top: 2rem;">
 					<p>待审批数量</p>
 				</div>
-				<div style="width: 60%;height: 100%;text-align: center;line-height: 9rem;float: right;font-size: 3rem;font-family: 'UnidreamLED';">12345</div>
+				<div style="width: 60%;height: 100%;text-align: center;line-height: 9rem;float: right;font-size: 3rem;font-family: 'UnidreamLED';">{{tjNumberObj.enterpriseCheckIngNum}}</div>
 			</div>
 		</div>
 		<Demo></Demo>
@@ -136,6 +136,7 @@ export default class EnterprisesMg extends Vue {
   @Provide() searchData: any = {};
   @Provide() loading: Boolean = false;
   @Provide() cityval: any = [];
+  @Provide() tjNumberObj: any = {};
   //编辑组件
   @Provide() dialogVisible: Boolean = false;
   @Provide() formData: any = { dataType: "", enterpriseId: "" };
@@ -157,6 +158,19 @@ export default class EnterprisesMg extends Vue {
       }
     );
   }
+	getStatiData() {
+		let that = this;
+		METHOD.axiosPost(
+			that,
+			`/dataStatistics/managerDataStatistics`,
+			{ cityId: "", countyId: "", provinceId: "" },
+			function (res: any) {
+				if (res.code == 0) {
+					that.tjNumberObj = res.data;
+				}
+			}
+		);
+	}
   searchFun() {
     this.PAGE = { page: 1, size: 10 };
     this.getTableData();
@@ -196,6 +210,9 @@ export default class EnterprisesMg extends Vue {
   created() {
     this.getTableData();
   }
+  mounted() {
+	this.getStatiData();
+  }
 }
 </script>
 <style lang="scss" scoped>

dcit-hcsystem-hcsystem-master/src/views/Plans/PlansMgEdit.vue

@@ -27,8 +27,8 @@
                 </el-form-item>
                 <el-form-item label="是否上报" prop="isReported">
                   <el-radio-group v-model="editForm.isReported">
-                    <el-radio label="'0'">上报</el-radio>
-                    <el-radio label="'1'">未上报</el-radio>
+                    <el-radio label="0">上报</el-radio>
+                    <el-radio label="1">未上报</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item label="预案源文件">

dcit-hcsystem-hcsystem-master/src/views/qyMap/qyMap.vue

@@ -296,10 +296,8 @@ export default class GIS extends Vue {
             if (id) that.getPopcon(id);
         })
         this.getStatiData();
-        this.Mutil.changeCenter("石家庄");
-        // this.$nextTick(function() {
-        //     this.drawPie("pieReport");
-        // });
+
+        this.Mutil.getBoundaries("石家庄");
     }
 	getStatiData() {
 	  let that = this;