|
|
@@ -9,7 +9,7 @@
|
|
|
size="mini"
|
|
|
style="border:none"
|
|
|
>
|
|
|
- 虹桥镇（自选）中网格：2，小网格：22
|
|
|
+ 虹桥镇（自选）中网格：2，小网格：11
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<div class="leftTopContent2">
|
|
|
@@ -349,6 +349,10 @@
|
|
|
<img :src="stores.sadianIcon.zfjly" alt="" />
|
|
|
<span>执法记录仪</span>
|
|
|
</div>
|
|
|
+ <div @click="checkboxChange(21)" :class="checkedArray.checkedData[0] == 21 ? 'checkTypeSelect' : ''">
|
|
|
+ <img :src="stores.sadianIcon.yyjk" alt="" />
|
|
|
+ <span>鹰眼监控</span>
|
|
|
+ </div>
|
|
|
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -412,7 +416,7 @@
|
|
|
<div class="girdCheckItem">
|
|
|
<div class="row_g">
|
|
|
<div style="font-size:.175rem">累计:</div>
|
|
|
- <div @click="basicStaticsData('新消监')">检查家数<br>4097家次</div>
|
|
|
+ <div @click="basicStaticsData('新消监')">检查家数<br>4128家次</div>
|
|
|
<div @click="basicStaticsData('新消监')">发现隐患数<br>1047处</div>
|
|
|
<div @click="basicStaticsData('新消监')">整改隐患<br>786处</div>
|
|
|
<div style="font-size:.175rem;margin-left:.125rem" >当日:</div>
|
|
|
@@ -1162,10 +1166,10 @@ export default {
|
|
|
// title: '第三期： 第六届中国国际进口博览会每日工作动态',
|
|
|
// url: 'http://32.0.15.107:8080/mhvi/20231025.pdf',
|
|
|
// },
|
|
|
- // {
|
|
|
- // title: '第二期： 第六届中国国际进口博览会每日工作动态',
|
|
|
- // url: 'http://32.0.15.107:8080/mhvi/20231024.pdf',
|
|
|
- // },
|
|
|
+ {
|
|
|
+ title: '第六期： 第七届中国国际进口博览会每日工作动态',
|
|
|
+ url: 'https://mhxfzd.shmh.gov.cn/data/10.30闵行疏导区每日动态.pdf',
|
|
|
+ },
|
|
|
{
|
|
|
title: '第五期： 第七届中国国际进口博览会每日工作动态',
|
|
|
url: 'https://mhxfzd.shmh.gov.cn/data/10.29闵行疏导区每日动态.pdf',
|
|
|
@@ -1584,9 +1588,9 @@ export default {
|
|
|
"value":29,
|
|
|
},
|
|
|
{
|
|
|
- "name": '儿童福利',
|
|
|
- "count": 1,
|
|
|
- "value": '41',
|
|
|
+ "name": '九小场所',
|
|
|
+ "count": 4128,
|
|
|
+ "value": '39',
|
|
|
},
|
|
|
{
|
|
|
"name": "居民小区",
|
|
|
@@ -1827,6 +1831,7 @@ export default {
|
|
|
{ value: 17, label: "监控视频" },
|
|
|
{ value: 18, label: "监督检查" },
|
|
|
{ value: 20, label: "执法记录仪" },
|
|
|
+ { value: 21, label: "鹰眼监控" },
|
|
|
],
|
|
|
}, //类型筛选
|
|
|
checkedSelectValue: "40",
|
|
|
@@ -2103,7 +2108,7 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
mounted() {
|
|
|
- this.gridStatisticsData()//处置网格数据
|
|
|
+ // this.gridStatisticsData()//处置网格数据
|
|
|
this.grid(15);
|
|
|
this.tableDataGrid=this.tableDataBigGrid;
|
|
|
setTimeout(() => {
|
|
|
@@ -2115,7 +2120,7 @@ export default {
|
|
|
this.dwgjcmcAndhzzx()//大网格名称及会展中心
|
|
|
// this.anbaoMap()
|
|
|
// this.getFireSiteDuty(); //各站点执勤实力
|
|
|
- this.selectVideo(); //视频在线
|
|
|
+ // this.selectVideo(); //视频在线
|
|
|
// this.sadianSelect(this.checkedArray.checkedData[0]); //撒点
|
|
|
this.getStaticData(this.value111) //疏导区社会单位情况统计
|
|
|
this.getZQStaticData() //执勤战备力量部署
|
|
|
@@ -2129,7 +2134,7 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
|
|
|
-
|
|
|
+ //中网格对应左侧疏导区基本情况
|
|
|
async staticsSd(name,grideGrade,mapGridName){
|
|
|
let res = await this.$axios.get(
|
|
|
this.$api.security.gridMemderStatistic +
|
|
|
@@ -2148,11 +2153,17 @@ export default {
|
|
|
this.line3Array[4].count=res.data.factoryStoreNum;//厂房仓库
|
|
|
this.line3Array[5].count=res.data.medicalInstitutionNum;//医疗机构
|
|
|
this.line3Array[6].count=res.data.elderCareNum;//养老机构
|
|
|
- this.line3Array[7].count=res.data.dealerMarketNum;//批发市场 ？？？
|
|
|
- this.line3Array[8].count=res.data.schoolNum;//儿童福利机构
|
|
|
- this.line3Array[9].count=res.data.streetFrontNum;//沿街门面
|
|
|
- this.line3Array[10].count=res.data.villageNum;//居民小区
|
|
|
- this.line3Array[11].count=res.data.subwayStationNum;//地铁站
|
|
|
+ this.line3Array[7].count=0;//九小场所
|
|
|
+ // this.line3Array[7].count=res.data.dealerMarketNum;//批发市场 ？？？
|
|
|
+ // this.line3Array[8].count=res.data.schoolNum;//儿童福利机构
|
|
|
+ // this.line3Array[9].count=res.data.streetFrontNum;//沿街门面
|
|
|
+ // this.line3Array[10].count=res.data.villageNum;//居民小区
|
|
|
+ // this.line3Array[11].count=res.data.subwayStationNum;//地铁站
|
|
|
+ this.line3Array[8].count=res.data.villageNum//居民小区
|
|
|
+ this.line3Array[9].count=0//混合经营场所
|
|
|
+
|
|
|
+ this.line3Array[10].count=res.data.constructionSiteNum//在建工地
|
|
|
+ this.line3Array[11].count=res.data.schoolNum;//寄宿学校
|
|
|
|
|
|
|
|
|
}
|
|
|
@@ -2391,7 +2402,7 @@ export default {
|
|
|
gisY: 31.189991,
|
|
|
type: "国家会展中心",
|
|
|
};
|
|
|
- // arr.push(data)
|
|
|
+ arr.push(data)
|
|
|
if(type == "29" || type == "30"){
|
|
|
this.arrayData= res.data;
|
|
|
}
|
|
|
@@ -2403,13 +2414,9 @@ export default {
|
|
|
if(type == 39){ //九小场所
|
|
|
|
|
|
this.anbaoSDUWG()//疏导区网格
|
|
|
- if(name){
|
|
|
+ if(name == "九小场所"){
|
|
|
for(let i=0;i<arr.length;i++){
|
|
|
- if(arr[i].checkComment){
|
|
|
- if(name == arr[i].checkComment){
|
|
|
- dataOther.push(arr[i])
|
|
|
- }
|
|
|
- }
|
|
|
+ dataOther.push(arr[i])
|
|
|
}
|
|
|
this.addMarker(dataOther, "security-plan", name)
|
|
|
}else{
|
|
|
@@ -2688,6 +2695,20 @@ export default {
|
|
|
* 在线视频
|
|
|
*/
|
|
|
async selectVideo(id) {
|
|
|
+ this.$axios
|
|
|
+ .get(
|
|
|
+ this.$api.zfjlj +
|
|
|
+ "?" +
|
|
|
+ this.$qs.stringify({
|
|
|
+ apikey:"643e6591-a489-4648-ba35-c15c39c64022&f_in_civilCode=31021019,31020414",
|
|
|
+ pageNo:0,
|
|
|
+ pageSize:10000
|
|
|
+ })
|
|
|
+ )
|
|
|
+ .then((res) => {
|
|
|
+ console.log(res.data)
|
|
|
+ })
|
|
|
+ return
|
|
|
await axios({
|
|
|
headers: {
|
|
|
"Content-Type": "application/json;charset=UTF-8",
|
|
|
@@ -2695,7 +2716,7 @@ export default {
|
|
|
method: "get",
|
|
|
// url: "http://32.0.15.107:8080/video-api/kiop-gateway-core/4G/device/ext?apikey=643e6591-a489-4648-ba35-c15c39c64022",
|
|
|
// url: "http://32.0.15.107:8080/video-api/kiop-gateway-core/tysbs/device/ext?apikey=643e6591-a489-4648-ba35-c15c39c64022&f_in_civilCode=31021019,31020414&pageNo=0&pageSize=10000",
|
|
|
- url: "http://32.150.119.108:8080/video-api/kiop-gateway-core/tysbs/device/ext?apikey=643e6591-a489-4648-ba35-c15c39c64022&f_in_civilCode=31021019,31020414&pageNo=0&pageSize=10000",
|
|
|
+ url: "http://mhxfzd.shmh.gov.cn/video-api/kiop-gateway-core/tysbs/device/ext?apikey=643e6591-a489-4648-ba35-c15c39c64022&f_in_civilCode=31021019,31020414&pageNo=0&pageSize=10000",
|
|
|
}).then((res) => {
|
|
|
let arr = [];
|
|
|
let zfjly = [];
|
|
|
@@ -2762,6 +2783,42 @@ export default {
|
|
|
// this.addMarker(arr, "enforcement-dynamic");
|
|
|
// }
|
|
|
},
|
|
|
+ /**
|
|
|
+ * 鹰眼监控
|
|
|
+ */
|
|
|
+ async selectVideo2() {
|
|
|
+ await axios({
|
|
|
+ headers: {
|
|
|
+ "Content-Type": "application/json;charset=UTF-8",
|
|
|
+ },
|
|
|
+ method: "get",
|
|
|
+ url: "http://32.1.7.96:8012/apiMhzdZdab/fireMajorSecurityProcess/selectSecurityViewUrl?pageNum=1&pageSize=100&isHG=1",
|
|
|
+ }).then((res) => {
|
|
|
+ var arr = []
|
|
|
+ let data = res.data.data;
|
|
|
+ let data2 = {
|
|
|
+ gisX: 121.302183,
|
|
|
+ gisY: 31.189991,
|
|
|
+ type: "国家会展中心",
|
|
|
+ };
|
|
|
+ arr.push(data2)
|
|
|
+ for (let i = 0; i < data.length; i++) {
|
|
|
+ var num = {
|
|
|
+ id: data[i].id,
|
|
|
+ name: data[i].installPlace,
|
|
|
+ groupName: data[i].name,
|
|
|
+ gisX: data[i].longitude,
|
|
|
+ gisY: data[i].latitude,
|
|
|
+ type: "鹰眼监控",
|
|
|
+ url:data[i].viewUrl
|
|
|
+ };
|
|
|
+ arr.push(num);
|
|
|
+ }
|
|
|
+
|
|
|
+ this.addMarker(arr, "security-plan","鹰眼监控");
|
|
|
+
|
|
|
+ })
|
|
|
+ },
|
|
|
selectArray(id) {
|
|
|
this.checkedArray.checkedData[0] = 4;
|
|
|
let data = this.checkedSelectArray.filter((val) => {
|
|
|
@@ -2909,6 +2966,11 @@ export default {
|
|
|
this.gridStatus = id;
|
|
|
this.selectVideo(1)
|
|
|
this.anbaoSDUWG()//疏导区网格
|
|
|
+ } else if (id == 21) {
|
|
|
+ console.log("鹰眼监控")
|
|
|
+ this.gridStatus = id;
|
|
|
+ this.anbaoSDUWG()//疏导区网格
|
|
|
+ this.selectVideo2()
|
|
|
} else {
|
|
|
this.sadianSelect(id);
|
|
|
this.hzzxtb()
|
|
|
@@ -3592,6 +3654,7 @@ export default {
|
|
|
|
|
|
watch: {
|
|
|
"stores.$state.gridData": function (newValue, oldValue) {
|
|
|
+ console.log(newValue,this.gridStatus)
|
|
|
if (this.gridStatus == 19) {
|
|
|
this.grid(19, newValue.name, newValue.position);
|
|
|
}
|
wangtao
