mirror of
https://gitee.com/beecue/fastbee.git
synced 2025-12-17 16:36:03 +08:00
Revert "!41 大屏设备地图实现"
This reverts commitb007f4889c, reversing changes made to6bdb2a2b37.
This commit is contained in:
@@ -1,40 +0,0 @@
|
||||
package com.ruoyi.iot.controller;
|
||||
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.iot.model.bigscreen.vo.BigScreenMapReqVo;
|
||||
import com.ruoyi.iot.service.IBigScreenService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
|
||||
/**
|
||||
* 设备告警Controller
|
||||
*
|
||||
* @author long
|
||||
* @date 2022-01-13
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/iot/big/screen")
|
||||
public class BigScreenController extends BaseController
|
||||
{
|
||||
private final IBigScreenService bigScreenService;
|
||||
|
||||
@Autowired
|
||||
public BigScreenController(IBigScreenService bigScreenService) {
|
||||
this.bigScreenService = bigScreenService;
|
||||
}
|
||||
|
||||
/**
|
||||
* 大屏首页 地图
|
||||
*/
|
||||
@PostMapping("/map")
|
||||
public AjaxResult index(@RequestBody BigScreenMapReqVo reqVo)
|
||||
{
|
||||
return AjaxResult.success(bigScreenService.map(reqVo));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,76 +0,0 @@
|
||||
package com.ruoyi.iot.domain;
|
||||
|
||||
/**
|
||||
* @author sunalong
|
||||
*/
|
||||
public class AreaCityGeo {
|
||||
private String id;
|
||||
|
||||
private String pid;
|
||||
|
||||
private String deep;
|
||||
|
||||
private String name;
|
||||
|
||||
private String extPath;
|
||||
|
||||
private Object geo;
|
||||
|
||||
private Object polygon;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getPid() {
|
||||
return pid;
|
||||
}
|
||||
|
||||
public void setPid(String pid) {
|
||||
this.pid = pid;
|
||||
}
|
||||
|
||||
public String getDeep() {
|
||||
return deep;
|
||||
}
|
||||
|
||||
public void setDeep(String deep) {
|
||||
this.deep = deep;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getExtPath() {
|
||||
return extPath;
|
||||
}
|
||||
|
||||
public void setExtPath(String extPath) {
|
||||
this.extPath = extPath;
|
||||
}
|
||||
|
||||
public Object getGeo() {
|
||||
return geo;
|
||||
}
|
||||
|
||||
public void setGeo(Object geo) {
|
||||
this.geo = geo;
|
||||
}
|
||||
|
||||
public Object getPolygon() {
|
||||
return polygon;
|
||||
}
|
||||
|
||||
public void setPolygon(Object polygon) {
|
||||
this.polygon = polygon;
|
||||
}
|
||||
}
|
||||
@@ -69,15 +69,6 @@ public class Device extends BaseEntity
|
||||
/** 设备影子 */
|
||||
private Integer isShadow;
|
||||
|
||||
/** 设备省 */
|
||||
private String province;
|
||||
|
||||
/** 设备市 */
|
||||
private String city;
|
||||
|
||||
/** 设备区 */
|
||||
private String county;
|
||||
|
||||
/** 设备所在地址 */
|
||||
@Excel(name = "设备所在地址")
|
||||
private String networkAddress;
|
||||
@@ -343,30 +334,6 @@ public class Device extends BaseEntity
|
||||
return activeTime;
|
||||
}
|
||||
|
||||
public String getProvince() {
|
||||
return province;
|
||||
}
|
||||
|
||||
public void setProvince(String province) {
|
||||
this.province = province;
|
||||
}
|
||||
|
||||
public String getCity() {
|
||||
return city;
|
||||
}
|
||||
|
||||
public void setCity(String city) {
|
||||
this.city = city;
|
||||
}
|
||||
|
||||
public String getCounty() {
|
||||
return county;
|
||||
}
|
||||
|
||||
public void setCounty(String county) {
|
||||
this.county = county;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
package com.ruoyi.iot.mapper;
|
||||
|
||||
import com.ruoyi.iot.domain.AreaCityGeo;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author sunalong
|
||||
*/
|
||||
@Repository
|
||||
public interface AreaCityGeoMapper {
|
||||
/***
|
||||
* 根据坐标查询
|
||||
* @param point 坐标
|
||||
* @return 省市县
|
||||
*/
|
||||
List<AreaCityGeo> selectAreaCityGeoByPoint(@Param("point")String point);
|
||||
}
|
||||
@@ -4,8 +4,6 @@ import com.ruoyi.iot.domain.Device;
|
||||
import com.ruoyi.iot.model.*;
|
||||
import com.ruoyi.iot.model.ThingsModels.ThingsModelValuesInput;
|
||||
import com.ruoyi.iot.model.ThingsModels.ThingsModelValuesOutput;
|
||||
import com.ruoyi.iot.model.bigscreen.dto.TotalDeviceArea;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
@@ -199,17 +197,4 @@ public interface DeviceMapper
|
||||
*/
|
||||
public int resetDeviceStatus(String deviceNum);
|
||||
|
||||
/***
|
||||
* 分组所有设备省
|
||||
* @return 结果
|
||||
*/
|
||||
List<TotalDeviceArea> groupDeviceProvince();
|
||||
|
||||
/***
|
||||
* 分组所有设备city
|
||||
* @param province 省
|
||||
* @return 结果
|
||||
*/
|
||||
List<TotalDeviceArea> groupDeviceCityByProvince(@Param("province") String province);
|
||||
|
||||
}
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
package com.ruoyi.iot.model.bigscreen.dto;
|
||||
|
||||
|
||||
/**
|
||||
* @author sunalong
|
||||
*/
|
||||
|
||||
public class TotalDeviceArea {
|
||||
private String name;
|
||||
|
||||
private int value;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public int getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public void setValue(int value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package com.ruoyi.iot.model.bigscreen.vo;
|
||||
|
||||
|
||||
/**
|
||||
* @author sunalong
|
||||
*/
|
||||
public class BigScreenMapReqVo {
|
||||
|
||||
private String province;
|
||||
|
||||
public String getProvince() {
|
||||
return province;
|
||||
}
|
||||
|
||||
public void setProvince(String province) {
|
||||
this.province = province;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
package com.ruoyi.iot.model.bigscreen.vo;
|
||||
|
||||
|
||||
|
||||
import com.ruoyi.iot.model.bigscreen.dto.TotalDeviceArea;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author sunalong
|
||||
*/
|
||||
public class BigScreenMapRespVo {
|
||||
|
||||
private List<TotalDeviceArea> list;
|
||||
|
||||
public List<TotalDeviceArea> getList() {
|
||||
return list;
|
||||
}
|
||||
|
||||
public void setList(List<TotalDeviceArea> list) {
|
||||
this.list = list;
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package com.ruoyi.iot.service;
|
||||
|
||||
|
||||
import com.ruoyi.iot.model.bigscreen.vo.BigScreenMapReqVo;
|
||||
import com.ruoyi.iot.model.bigscreen.vo.BigScreenMapRespVo;
|
||||
|
||||
/**
|
||||
* @author sunalong
|
||||
*/
|
||||
public interface IBigScreenService {
|
||||
/***
|
||||
* 大屏
|
||||
* @param reqVo 请求
|
||||
* @return BigScreenRespVo
|
||||
*/
|
||||
BigScreenMapRespVo map(BigScreenMapReqVo reqVo);
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
package com.ruoyi.iot.service.impl;
|
||||
|
||||
|
||||
import com.ruoyi.iot.mapper.DeviceMapper;
|
||||
import com.ruoyi.iot.model.bigscreen.dto.TotalDeviceArea;
|
||||
import com.ruoyi.iot.model.bigscreen.vo.BigScreenMapReqVo;
|
||||
import com.ruoyi.iot.model.bigscreen.vo.BigScreenMapRespVo;
|
||||
import com.ruoyi.iot.service.IBigScreenService;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author sunalong
|
||||
*/
|
||||
@Service
|
||||
public class BigScreenServiceImpl implements IBigScreenService {
|
||||
private final DeviceMapper deviceMapper;
|
||||
|
||||
public BigScreenServiceImpl(DeviceMapper deviceMapper) {
|
||||
this.deviceMapper = deviceMapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BigScreenMapRespVo map(BigScreenMapReqVo reqVo) {
|
||||
String province = reqVo.getProvince();
|
||||
|
||||
List<TotalDeviceArea> list;
|
||||
if (StringUtils.isBlank(province)) {
|
||||
list = deviceMapper.groupDeviceProvince();
|
||||
}else {
|
||||
list = deviceMapper.groupDeviceCityByProvince(province);
|
||||
}
|
||||
BigScreenMapRespVo vo = new BigScreenMapRespVo();
|
||||
vo.setList(list);
|
||||
return vo;
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,10 @@ import com.ruoyi.common.utils.DateUtils;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.common.utils.http.HttpUtils;
|
||||
import com.ruoyi.common.utils.ip.IpUtils;
|
||||
import com.ruoyi.iot.domain.*;
|
||||
import com.ruoyi.iot.domain.Device;
|
||||
import com.ruoyi.iot.domain.DeviceLog;
|
||||
import com.ruoyi.iot.domain.DeviceUser;
|
||||
import com.ruoyi.iot.domain.Product;
|
||||
import com.ruoyi.iot.mqtt.EmqxService;
|
||||
import com.ruoyi.iot.tdengine.service.ILogService;
|
||||
import com.ruoyi.iot.mapper.DeviceLogMapper;
|
||||
@@ -82,9 +85,6 @@ public class DeviceServiceImpl implements IDeviceService {
|
||||
@Lazy
|
||||
private EmqxService emqxService;
|
||||
|
||||
@Autowired
|
||||
private com.ruoyi.iot.mapper.AreaCityGeoMapper areaCityGeoMapper;
|
||||
|
||||
/**
|
||||
* 查询设备
|
||||
*
|
||||
@@ -765,7 +765,6 @@ public class DeviceServiceImpl implements IDeviceService {
|
||||
device.setProductId(null);
|
||||
device.setProductName(null);
|
||||
}
|
||||
setArea(device);
|
||||
deviceMapper.updateDevice(device);
|
||||
// 设备取消禁用
|
||||
if (oldDevice.getStatus() == 2 && device.getStatus() == 4) {
|
||||
@@ -892,33 +891,10 @@ public class DeviceServiceImpl implements IDeviceService {
|
||||
JSONObject location = baiduObject.getJSONObject("result").getJSONObject("location");
|
||||
device.setLongitude(location.getBigDecimal("lng"));
|
||||
device.setLatitude(location.getBigDecimal("lat"));
|
||||
|
||||
setArea(device);
|
||||
|
||||
System.out.println(device.getSerialNumber() + "- 设置经度:" + location.getBigDecimal("lng") + ",设置纬度:" + location.getBigDecimal("lat"));
|
||||
}
|
||||
}
|
||||
|
||||
private void setArea(Device device){
|
||||
try {
|
||||
List<AreaCityGeo> areaList = areaCityGeoMapper.selectAreaCityGeoByPoint("POINT(" + device.getLongitude() + " " + device.getLatitude() + ")");
|
||||
if (areaList != null && areaList.size() == 3) {
|
||||
String geoProvince = areaList.stream().filter(en -> en.getDeep().equals("0")).findFirst().get().getName();
|
||||
String geoCity = areaList.stream().filter(en -> en.getDeep().equals("1")).findFirst().get().getName();
|
||||
String geoCounty = areaList.stream().filter(en -> en.getDeep().equals("2")).findFirst().get().getName();
|
||||
device.setProvince(geoProvince);
|
||||
if (geoProvince.equals(geoCity)) {
|
||||
device.setCity(geoCounty);
|
||||
} else {
|
||||
device.setCity(geoCity);
|
||||
device.setCounty(geoCounty);
|
||||
}
|
||||
}
|
||||
}catch (Exception ex){
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 上报设备信息
|
||||
*
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.iot.mapper.AreaCityGeoMapper">
|
||||
<resultMap id="BaseResultMap" type="com.ruoyi.iot.domain.AreaCityGeo">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table area_city_geo-->
|
||||
<result column="id" jdbcType="VARCHAR" property="id" />
|
||||
<result column="pid" jdbcType="VARCHAR" property="pid" />
|
||||
<result column="deep" jdbcType="VARCHAR" property="deep" />
|
||||
<result column="name" jdbcType="VARCHAR" property="name" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, pid, deep, `name`
|
||||
</sql>
|
||||
|
||||
<select id="selectAreaCityGeoByPoint" resultMap="BaseResultMap">
|
||||
select <include refid="Base_Column_List"/> from area_city_geo where
|
||||
ST_Intersects(polygon, ST_GeomFromText(#{point,jdbcType=VARCHAR},0))=1
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -322,9 +322,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="imgUrl != null">img_url,</if>
|
||||
<if test="summary != null">summary,</if>
|
||||
<if test="province != null">province,</if>
|
||||
<if test="city != null">city,</if>
|
||||
<if test="county != null">county,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="deviceName != null and deviceName != ''">#{deviceName},</if>
|
||||
@@ -354,9 +351,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="imgUrl != null">#{imgUrl},</if>
|
||||
<if test="summary != null">#{summary},</if>
|
||||
<if test="province != null">#{province},</if>
|
||||
<if test="city != null">#{city},</if>
|
||||
<if test="county != null">#{county},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
@@ -390,9 +384,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="imgUrl != null">img_url = #{imgUrl},</if>
|
||||
<if test="summary != null">summary = #{summary},</if>
|
||||
<if test="province != null">province = #{province},</if>
|
||||
<if test="city != null">city = #{city},</if>
|
||||
<if test="county != null">county = #{county},</if>
|
||||
</trim>
|
||||
where device_id = #{deviceId}
|
||||
</update>
|
||||
@@ -406,9 +397,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="longitude != null">longitude = #{longitude},</if>
|
||||
<if test="latitude != null">latitude = #{latitude},</if>
|
||||
<if test="activeTime != null">active_time = #{activeTime},</if>
|
||||
<if test="province != null">province = #{province},</if>
|
||||
<if test="city != null">city = #{city},</if>
|
||||
<if test="county != null">county = #{county},</if>
|
||||
</trim>
|
||||
where serial_number = #{serialNumber}
|
||||
</update>
|
||||
@@ -475,18 +463,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="userId != null"> and group_id in(select group_id from iot_group where user_id = #{userId})</if>
|
||||
</where>
|
||||
</delete>
|
||||
|
||||
<resultMap type="com.ruoyi.iot.model.bigscreen.dto.TotalDeviceArea" id="TotalDeviceAreaResult">
|
||||
<result property="name" column="name" />
|
||||
<result property="value" column="value" />
|
||||
</resultMap>
|
||||
|
||||
<select id="groupDeviceProvince" resultMap="TotalDeviceAreaResult">
|
||||
select province name,IFNULL(count(device_id), 0)value from iot_device group by province
|
||||
</select>
|
||||
|
||||
<select id="groupDeviceCityByProvince" resultMap="TotalDeviceAreaResult">
|
||||
select city name,IFNULL(count(device_id), 0)value from iot_device where province = #{province,jdbcType=VARCHAR} group by city
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -1,10 +0,0 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 大屏 map
|
||||
export function map(data) {
|
||||
return request({
|
||||
url: '/iot/big/screen/map',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
@@ -6,8 +6,8 @@
|
||||
<div class="you"></div>
|
||||
</div>
|
||||
<div class="mapwrap">
|
||||
<dv-border-box-13>
|
||||
<div class="quanguo" @click="getbigScreenMapData('',-1)" v-if="code !== 'china' && userCode == -1">
|
||||
<dv-border-box-13 >
|
||||
<div class="quanguo" @click="getData(-1)" v-if="code !== 'china' && userCode == -1">
|
||||
中国
|
||||
</div>
|
||||
|
||||
@@ -18,46 +18,46 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import xzqCode from "../../../utils/bigScreen/map/xzqCode";
|
||||
import xzqCode from "../../../utils/bigScreen/map/xzqCode";
|
||||
import { currentGET } from '@/api/bigScreen/modules'
|
||||
|
||||
import {
|
||||
GETNOBASE
|
||||
} from '@/api/bigScreen/api'
|
||||
import {
|
||||
map,
|
||||
} from "@/api/iot/bigScreen";
|
||||
export default {
|
||||
import { GETNOBASE } from '@/api/bigScreen/api'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
maptitle: "设备分布图",
|
||||
options: {},
|
||||
code: "china",
|
||||
userCode: -1, //-1 代表中国 用户权限的行政区code
|
||||
userCode: -1,//-1 代表中国 用户权限的行政区code
|
||||
echartBindClick: false
|
||||
};
|
||||
},
|
||||
created() {},
|
||||
created() { },
|
||||
|
||||
mounted() {
|
||||
// console.log(xzqCode);
|
||||
this.getbigScreenMapData('',-1);
|
||||
this.getData()
|
||||
|
||||
|
||||
},
|
||||
methods: {
|
||||
getbigScreenMapData(province, code) {
|
||||
map({
|
||||
province: province
|
||||
}).then((res) => {
|
||||
getData(code) {
|
||||
currentGET('big8',{regionCode:code}).then(res => {
|
||||
console.log('设备分布', res);
|
||||
if (res.success) {
|
||||
if (!code) {
|
||||
this.userCode = code;
|
||||
this.userCode = res.data.regionCode;
|
||||
}
|
||||
this.getGeojson(code, res.data.list);
|
||||
this.getGeojson(res.data.regionCode, res.data.dataList);
|
||||
this.mapclick();
|
||||
});
|
||||
|
||||
} else {
|
||||
this.$Message.warning(res.msg)
|
||||
}
|
||||
})
|
||||
},
|
||||
getGeojson(name, mydata) {
|
||||
console.log('设备分布1', name);
|
||||
console.log('设备分布2', mydata);
|
||||
|
||||
if (name == -1) {
|
||||
name = 'china'
|
||||
}
|
||||
@@ -129,34 +129,13 @@
|
||||
visualMap: {
|
||||
left: 20,
|
||||
bottom: 20,
|
||||
pieces: [{
|
||||
gte: 1000,
|
||||
label: "1000个以上"
|
||||
}, // 不指定 max,表示 max 为无限大(Infinity)。
|
||||
{
|
||||
gte: 600,
|
||||
lte: 999,
|
||||
label: "600-999个"
|
||||
},
|
||||
{
|
||||
gte: 200,
|
||||
lte: 599,
|
||||
label: "200-599个"
|
||||
},
|
||||
{
|
||||
gte: 50,
|
||||
lte: 199,
|
||||
label: "49-199个"
|
||||
},
|
||||
{
|
||||
gte: 10,
|
||||
lte: 49,
|
||||
label: "10-49个"
|
||||
},
|
||||
{
|
||||
lte: 9,
|
||||
label: "1-9个"
|
||||
}, // 不指定 min,表示 min 为无限大(-Infinity)。
|
||||
pieces: [
|
||||
{ gte: 1000, label: "1000个以上" }, // 不指定 max,表示 max 为无限大(Infinity)。
|
||||
{ gte: 600, lte: 999, label: "600-999个" },
|
||||
{ gte: 200, lte: 599, label: "200-599个" },
|
||||
{ gte: 50, lte: 199, label: "49-199个" },
|
||||
{ gte: 10, lte: 49, label: "10-49个" },
|
||||
{ lte: 9, label: "1-9个" }, // 不指定 min,表示 min 为无限大(-Infinity)。
|
||||
],
|
||||
inRange: {
|
||||
// 渐变颜色,从小到大
|
||||
@@ -194,7 +173,8 @@
|
||||
disabled: true,
|
||||
},
|
||||
},
|
||||
series: [{
|
||||
series: [
|
||||
{
|
||||
name: "MAP",
|
||||
type: "map",
|
||||
mapType: name,
|
||||
@@ -234,9 +214,7 @@
|
||||
}
|
||||
},
|
||||
rich: {},
|
||||
emphasis: {
|
||||
show: false
|
||||
},
|
||||
emphasis: { show: false },
|
||||
},
|
||||
itemStyle: {
|
||||
borderColor: "rgba(147, 235, 248, .8)",
|
||||
@@ -246,7 +224,8 @@
|
||||
x: 0.5,
|
||||
y: 0.5,
|
||||
r: 0.8,
|
||||
colorStops: [{
|
||||
colorStops: [
|
||||
{
|
||||
offset: 0,
|
||||
color: "rgba(147, 235, 248, 0)", // 0% 处的颜色
|
||||
},
|
||||
@@ -327,11 +306,10 @@
|
||||
this.options = option;
|
||||
},
|
||||
message(text) {
|
||||
// this.$Message({
|
||||
// text: text,
|
||||
// type: 'warning'
|
||||
// })
|
||||
alert(text);
|
||||
this.$Message({
|
||||
text: text,
|
||||
type: 'warning'
|
||||
})
|
||||
},
|
||||
mapclick() {
|
||||
if (this.echartBindClick || this.userCode !== -1) return
|
||||
@@ -339,22 +317,19 @@
|
||||
this.$refs.CenterMap.chart.on("click", (params) => {
|
||||
// console.log(params);
|
||||
let xzqData = xzqCode[params.name];
|
||||
console.log(xzqData)
|
||||
if (xzqData) {
|
||||
this.getbigScreenMapData(xzqData.name, xzqData.adcode);
|
||||
this.getData(xzqData.adcode);
|
||||
} else {
|
||||
// alert("暂无下级地市!");
|
||||
// this.message("暂无下级地市!");
|
||||
this.message("暂无下级地市!");
|
||||
}
|
||||
});
|
||||
this.echartBindClick = true
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
};
|
||||
</script>
|
||||
<style lang='scss' scoped>
|
||||
.centermap {
|
||||
.centermap {
|
||||
margin-bottom: 30px;
|
||||
|
||||
.maptitle {
|
||||
@@ -419,6 +394,5 @@
|
||||
0 0 6px rgba(0, 237, 237, 0.4);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
</style>
|
||||
@@ -32,24 +32,13 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
getDeviceStatistic,
|
||||
} from "@/api/iot/device";
|
||||
import {
|
||||
listAllDeviceShort,
|
||||
} from "@/api/iot/device";
|
||||
let style = {
|
||||
import { currentGET } from '@/api/bigScreen/modules'
|
||||
let style = {
|
||||
fontSize: 24
|
||||
}
|
||||
export default {
|
||||
}
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
// 设备列表
|
||||
deviceList: [],
|
||||
// 设备统计信息
|
||||
deviceStatistic: {},
|
||||
// 设备总数
|
||||
deviceCount: 0,
|
||||
options: {},
|
||||
userOverview: {
|
||||
alarmNum: 0,
|
||||
@@ -60,7 +49,7 @@
|
||||
pageflag: true,
|
||||
timer: null,
|
||||
config: {
|
||||
number: [],
|
||||
number: [100],
|
||||
content: '{nt}',
|
||||
style: {
|
||||
...style,
|
||||
@@ -106,7 +95,8 @@
|
||||
created() {
|
||||
this.getData()
|
||||
},
|
||||
mounted() {},
|
||||
mounted() {
|
||||
},
|
||||
beforeDestroy() {
|
||||
this.clearData()
|
||||
|
||||
@@ -120,18 +110,28 @@
|
||||
},
|
||||
getData() {
|
||||
this.pageflag = true;
|
||||
getDeviceStatistic().then(res => {
|
||||
// this.deviceStatistic = response.data;
|
||||
currentGET("big2").then((res) => {
|
||||
if (!this.timer) {
|
||||
console.log("设备总览", res);
|
||||
}
|
||||
if (res.code == 200) {
|
||||
if (res.success) {
|
||||
this.userOverview = res.data;
|
||||
this.onlineconfig = {
|
||||
...this.onlineconfig,
|
||||
number: [res.data.onlineNum]
|
||||
}
|
||||
this.config = {
|
||||
...this.config,
|
||||
number: [res.data.totalNum]
|
||||
}
|
||||
this.offlineconfig = {
|
||||
...this.offlineconfig,
|
||||
number: [res.data.offlineNum]
|
||||
}
|
||||
this.laramnumconfig = {
|
||||
...this.laramnumconfig,
|
||||
number: [res.data.alertCount]
|
||||
number: [res.data.alarmNum]
|
||||
}
|
||||
this.getAllDevice();
|
||||
this.switper()
|
||||
} else {
|
||||
this.pageflag = false;
|
||||
@@ -149,33 +149,11 @@
|
||||
};
|
||||
this.timer = setInterval(looper, this.$store.state.settings.echartsAutoTime);
|
||||
},
|
||||
/**查询所有设备 */
|
||||
getAllDevice() {
|
||||
listAllDeviceShort(this.queryParams).then(response => {
|
||||
this.deviceList = response.rows;
|
||||
this.deviceCount = response.total;
|
||||
let online = this.deviceList.filter(x => x.status == 3).length;
|
||||
let offline = this.deviceList.length - online;
|
||||
this.config = {
|
||||
...this.config,
|
||||
number: [this.deviceCount]
|
||||
}
|
||||
this.onlineconfig = {
|
||||
...this.onlineconfig,
|
||||
number: [online]
|
||||
}
|
||||
this.offlineconfig = {
|
||||
...this.offlineconfig,
|
||||
number: [offline]
|
||||
}
|
||||
})
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
};
|
||||
</script>
|
||||
<style lang='scss' scoped>
|
||||
.user_Overview {
|
||||
.user_Overview {
|
||||
li {
|
||||
flex: 1;
|
||||
|
||||
@@ -240,6 +218,5 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user