Skip to content

G
gassafety-progress
Commit 27abfa50 authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 380abc51 bcb28b4a
Hide whitespace changes
Inline Side-by-side
Showing with 447 additions and 21 deletions
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/system/TEnterpriseInfoController.java
View file @ 27abfa50
......@@ -57,6 +57,17 @@ public class TEnterpriseInfoController extends BaseController
return getDataTable(list);
}
/**
*查询所有企业信息
* @param tEnterpriseInfo
* @return
*/
@GetMapping("/enterpriseInfoList")
public AjaxResult enterpriseInfoList(TEnterpriseInfo tEnterpriseInfo)
{
return AjaxResult.success(tEnterpriseInfoService.enterpriseInfoList(tEnterpriseInfo));
}
/**
* 导出企业信息列表
*/
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEnterpriseInfo.java
View file @ 27abfa50
......@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
import java.math.BigDecimal;
/**
* 企业信息对象 t_enterprise_info
*
......@@ -34,6 +36,15 @@ public class TEnterpriseInfo extends BaseEntity
@Excel(name = "经营区域")
private String businessArea;
/** 经度 */
private BigDecimal longitude;
/** 纬度 */
private BigDecimal latitude;
/** 图表类型 */
private String iconType;
/** 许可证编号 */
@Excel(name = "许可证编号")
private String licenseKey;
......@@ -98,6 +109,23 @@ public class TEnterpriseInfo extends BaseEntity
{
return businessArea;
}
public BigDecimal getLongitude() {
return longitude;
}
public void setLongitude(BigDecimal longitude) {
this.longitude = longitude;
}
public BigDecimal getLatitude() {
return latitude;
}
public void setLatitude(BigDecimal latitude) {
this.latitude = latitude;
}
public void setLicenseKey(String licenseKey)
{
this.licenseKey = licenseKey;
......@@ -121,6 +149,14 @@ public class TEnterpriseInfo extends BaseEntity
this.annualSupervisionInspection = annualSupervisionInspection;
}
public String getIconType() {
return iconType;
}
public void setIconType(String iconType) {
this.iconType = iconType;
}
public String getAnnualSupervisionInspection()
{
return annualSupervisionInspection;
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/vo/TEnterpriseInfoVO.java 0 → 100644
View file @ 27abfa50
package com.zehong.system.domain.vo;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
/**
* 企业信息对象 t_enterprise_info
*
* @author zehong
* @date 2022-01-24
*/
@Data
public class TEnterpriseInfoVO extends BaseEntity
{
/** 企业id */
private Long enterpriseId;
/** 企业名称 */
private String enterpriseName;
/** 企业切换使用 */
private String companyType;
/** 经度 */
private BigDecimal longitude;
/** 纬度 */
private BigDecimal latitude;
/** 图表类型 */
private String iconType;
/** 注册地址 */
private String registerAddress;
/** 法定代表人 */
private String legalRepresentative;
/** 经营区域 */
private String businessArea;
/** 许可证编号 */
private String licenseKey;
/** 许可证有效期 */
private String licenseValidityTime;
/** 年度监督检查情况 */
private String annualSupervisionInspection;
/** 备注 */
private String remarks;
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/ITEnterpriseInfoService.java
View file @ 27abfa50
......@@ -2,6 +2,7 @@ package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.TEnterpriseInfo;
import com.zehong.system.domain.vo.TEnterpriseInfoVO;
/**
* 企业信息Service接口
......@@ -19,6 +20,8 @@ public interface ITEnterpriseInfoService
*/
public TEnterpriseInfo selectTEnterpriseInfoById(Long enterpriseId);
public List<TEnterpriseInfoVO> enterpriseInfoList(TEnterpriseInfo tEnterpriseInfo);
/**
* 查询企业信息列表
*
......
gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TEnterpriseInfoServiceImpl.java
View file @ 27abfa50
package com.zehong.system.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.zehong.common.utils.DateUtils;
import com.zehong.common.utils.bean.BeanUtils;
import com.zehong.system.domain.vo.TEnterpriseInfoVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TEnterpriseInfoMapper;
......@@ -32,6 +35,28 @@ public class TEnterpriseInfoServiceImpl implements ITEnterpriseInfoService
return tEnterpriseInfoMapper.selectTEnterpriseInfoById(enterpriseId);
}
/**
* 查询企业信息列表
*
* @param tEnterpriseInfo 企业信息
* @return 企业信息
*/
@Override
public List<TEnterpriseInfoVO> enterpriseInfoList(TEnterpriseInfo tEnterpriseInfo)
{
List<TEnterpriseInfoVO> list = new ArrayList<>();
List<TEnterpriseInfo> enterpriseInfoList = tEnterpriseInfoMapper.selectTEnterpriseInfoList(tEnterpriseInfo);
for(TEnterpriseInfo info : enterpriseInfoList){
TEnterpriseInfoVO tEnterpriseInfoVO = new TEnterpriseInfoVO();
BeanUtils.copyProperties(info, tEnterpriseInfoVO);
tEnterpriseInfoVO.setCompanyType(info.getEnterpriseId().toString());
list.add(tEnterpriseInfoVO);
}
return list;
}
/**
* 查询企业信息列表
*
......
gassafetyprogress-system/src/main/resources/mapper/system/TEnterpriseInfoMapper.xml
View file @ 27abfa50
......@@ -10,6 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="registerAddress" column="register_address" />
<result property="legalRepresentative" column="legal_representative" />
<result property="businessArea" column="business_area" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
<result property="iconType" column="icon_type" />
<result property="licenseKey" column="license_key" />
<result property="licenseValidityTime" column="license_validity_time" />
<result property="annualSupervisionInspection" column="annual_supervision_inspection" />
......@@ -23,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectTEnterpriseInfoVo">
select enterprise_id, enterprise_name, register_address, legal_representative,
business_area, license_key, license_validity_time, annual_supervision_inspection,
business_area, longitude, latitude, icon_type, license_key, license_validity_time, annual_supervision_inspection,
create_by, create_time, update_by, update_time, remarks from t_enterprise_info
</sql>
......@@ -55,6 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="registerAddress != null">register_address,</if>
<if test="legalRepresentative != null">legal_representative,</if>
<if test="businessArea != null">business_area,</if>
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
<if test="iconType != null">icon_type,</if>
<if test="licenseKey != null">license_key,</if>
<if test="licenseValidityTime != null">license_validity_time,</if>
<if test="annualSupervisionInspection != null">annual_supervision_inspection,</if>
......@@ -70,6 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="registerAddress != null">#{registerAddress},</if>
<if test="legalRepresentative != null">#{legalRepresentative},</if>
<if test="businessArea != null">#{businessArea},</if>
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
<if test="iconType != null">#{iconType},</if>
<if test="licenseKey != null">#{licenseKey},</if>
<if test="licenseValidityTime != null">#{licenseValidityTime},</if>
<if test="annualSupervisionInspection != null">#{annualSupervisionInspection},</if>
......@@ -89,6 +98,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="registerAddress != null">register_address = #{registerAddress},</if>
<if test="legalRepresentative != null">legal_representative = #{legalRepresentative},</if>
<if test="businessArea != null">business_area = #{businessArea},</if>
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
<if test="iconType != null">icon_type = #{iconType},</if>
<if test="licenseKey != null">license_key = #{licenseKey},</if>
<if test="licenseValidityTime != null">license_validity_time = #{licenseValidityTime},</if>
<if test="annualSupervisionInspection != null">annual_supervision_inspection = #{annualSupervisionInspection},</if>
......
gassafetyprogress-web/src/api/bigWindow/getDevice.js
View file @ 27abfa50
/*
* @Author: your name
* @Date: 2022-02-23 15:28:07
* @LastEditTime: 2022-03-01 09:05:43
* @LastEditTime: 2022-03-01 15:54:19
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /newDev/gassafety-progress/gassafetyprogress-web/src/api/bigWindow/getdevice.js
......@@ -60,6 +60,15 @@ export function getUser(query) {
params: query
})
}
// 企业接口
export function getEnterprise(query) {
return request({
url: '/regulation/info/enterpriseInfoList',
method: 'get',
params: query
})
}
// 获取公司名称以及id
export function getCompany(query) {
return request({
......@@ -75,4 +84,4 @@ export function userAlarm(query) {
method: 'get',
params: query
})
}
\ No newline at end of file
}
gassafetyprogress-web/src/assets/image/zcrq.svg 0 → 100644
View file @ 27abfa50
<svg width="56" height="51" viewBox="0 0 56 51" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="28" cy="35" r="16" fill="url(#paint0_linear_218_40)"/>
<path d="M24.3506 40.459C21.4894 45.9554 25.7938 49.6511 28.3036 50.8119C19.9271 52.0354 20.1154 44.2237 21.7154 38.106C23.3154 31.9884 29.0579 27.6854 29.0565 27.7531C29.0565 27.0001 29.5585 26.2472 29.8095 25.9648C29.2824 28.6754 31.9114 34.3099 33.2918 36.7884C37.5083 43.4895 33.7311 48.4276 31.3154 50.059C33.1977 47.6119 31.9742 43.4707 29.7154 39.3295C27.9083 36.0166 27.9585 31.8001 28.2095 30.106C27.0801 31.706 26.7036 37.5413 29.8095 42.3413C32.2942 46.1813 31.284 48.7727 30.4683 49.5884C30.9954 46.426 29.3075 45.1335 28.3977 44.8825C29.3765 46.4637 28.5546 47.4237 28.0212 47.706C27.8644 46.608 27.306 44.2801 26.3271 43.7531C25.3483 43.226 24.6016 41.3374 24.3506 40.459Z" fill="url(#paint1_linear_218_40)"/>
<path d="M6.34375 5.02441V3.82129H7.62891V5.02441H10.917C11.6143 5.02441 12.1497 5.16341 12.5234 5.44141C13.0065 5.80599 13.248 6.30273 13.248 6.93164L13.2412 12.0654C13.2412 12.6761 13.1182 13.1432 12.8721 13.4668C12.4893 13.9727 11.9219 14.2256 11.1699 14.2256H7.62891L7.63574 15.415L6.34375 15.4082V14.2256H3.09668C2.44043 14.2256 1.9528 14.1322 1.63379 13.9453C1.05501 13.6081 0.765625 12.9678 0.765625 12.0244V7.19141C0.765625 6.48958 0.943359 5.96322 1.29883 5.6123C1.69531 5.22038 2.23079 5.02441 2.90527 5.02441H6.34375ZM6.34375 12.9404V6.30957H2.86426C2.54069 6.30957 2.3151 6.39616 2.1875 6.56934C2.09635 6.69694 2.05078 6.89746 2.05078 7.1709V11.9219C2.05078 12.2318 2.06217 12.4163 2.08496 12.4756C2.19889 12.79 2.44954 12.9473 2.83691 12.9473L6.34375 12.9404ZM7.62891 12.9404L10.9375 12.9473C11.6211 12.9518 11.9629 12.6647 11.9629 12.0859V7.2666C11.9629 6.87467 11.8854 6.61719 11.7305 6.49414C11.5846 6.38021 11.3385 6.32096 10.9922 6.31641L7.62891 6.30273V12.9404ZM14.7246 8.11426V6.84961H15.9277C16.388 6.84961 16.7275 6.96354 16.9463 7.19141C17.1514 7.4056 17.2539 7.74284 17.2539 8.20312V13.4736C17.2539 13.7334 17.2835 13.8929 17.3428 13.9521C17.4111 14.0251 17.5615 14.0615 17.7939 14.0615H18.1016V15.3262H17.4316C16.985 15.3262 16.6797 15.2669 16.5156 15.1484C16.1647 14.8932 15.9893 14.5378 15.9893 14.082V8.74316C15.9893 8.44694 15.9368 8.26009 15.832 8.18262C15.7682 8.13704 15.6383 8.11426 15.4424 8.11426H14.7246ZM14.7246 5.10645V3.8418H17.4521V5.10645H14.7246ZM18.3887 15.292V14.0342C18.5026 14.016 18.5801 13.9795 18.6211 13.9248C18.6803 13.8519 18.71 13.6992 18.71 13.4668V6.61035C18.71 5.99512 18.8763 5.5166 19.209 5.1748C19.5371 4.84212 19.9632 4.67578 20.4873 4.67578H23.4541L23.3447 3.73242H24.6299L24.7393 4.67578H25.6621V3.73242H26.9268V4.67578H27.2275V5.94043H24.8896L25.4229 10.3223C25.6325 10.0352 25.7669 9.75944 25.8262 9.49512C25.8717 9.29004 25.9105 8.99154 25.9424 8.59961H27.2002C27.1546 9.32422 27.084 9.8278 26.9883 10.1104C26.8698 10.4567 26.7126 10.7575 26.5166 11.0127C26.3571 11.2223 26.0859 11.4958 25.7031 11.833C25.9128 12.4027 26.1292 12.8538 26.3525 13.1865C26.5713 13.5146 26.863 13.8223 27.2275 14.1094V15.4766C26.5576 15.1986 26.0358 14.8704 25.6621 14.4922C25.2702 14.0957 24.9124 13.5124 24.5889 12.7422L23.3447 13.7539V12.0859L24.2402 11.3682L23.5977 5.94043H20.8906C20.2663 5.94043 19.9587 6.25033 19.9678 6.87012L19.9746 7.27344L21.499 7.28027C21.9639 7.28027 22.292 7.37598 22.4834 7.56738C22.7021 7.78158 22.8115 8.12337 22.8115 8.59277V13.6377C22.8115 14.4899 22.4014 14.916 21.5811 14.916H20.6855V13.6377H21.0068C21.2119 13.6377 21.3555 13.5921 21.4375 13.501C21.5241 13.4053 21.5674 13.2754 21.5674 13.1113V9.15332C21.5674 8.91634 21.515 8.75228 21.4102 8.66113C21.3327 8.59733 21.1071 8.56543 20.7334 8.56543H19.9746V13.5625C19.9746 13.9772 19.904 14.2962 19.7627 14.5195C19.5895 14.7975 19.3594 15.0049 19.0723 15.1416C18.9173 15.2191 18.6895 15.2692 18.3887 15.292ZM28.6631 15.5859V14.0205C29.0322 13.779 29.3307 13.3825 29.5586 12.8311C29.7773 12.2979 29.8867 11.6644 29.8867 10.9307V3.85547H31.001V11.0195C31.001 11.7533 31.1309 12.389 31.3906 12.9268C31.6139 13.3916 31.8919 13.7493 32.2246 14V15.3604C31.7962 15.1234 31.4453 14.8545 31.1719 14.5537C30.9395 14.2985 30.723 13.9772 30.5225 13.5898C30.2581 14.0957 29.9414 14.5264 29.5723 14.8818C29.39 15.0641 29.0869 15.2988 28.6631 15.5859ZM28.6631 11.4912V4.30664H29.415V11.4912H28.6631ZM31.5342 11.4912V4.30664H32.2861V11.4912H31.5342ZM32.4844 15.4697V14.2939C32.612 14.2848 32.6963 14.2575 32.7373 14.2119C32.7829 14.1572 32.8057 14.016 32.8057 13.7881V12.9473H34.0703V13.7266C34.0703 14.8066 33.5417 15.3877 32.4844 15.4697ZM32.6074 6.9248V5.5918C32.89 5.44141 33.0973 5.22721 33.2295 4.94922C33.3434 4.7168 33.4437 4.31576 33.5303 3.74609H34.8154L34.6992 4.31348H35.6699C36.1211 4.31348 36.4743 4.39779 36.7295 4.56641C36.8434 4.63932 36.9642 4.76693 37.0918 4.94922H38.3291V3.83496H39.6211V4.94922H40.0654V4.04688H41.166V4.94922H41.3438L41.3369 6.21387H39.6211C39.6439 6.89746 39.6826 7.39876 39.7373 7.71777C39.874 8.46061 40.127 9.14648 40.4961 9.77539C40.7012 10.1309 40.9746 10.516 41.3164 10.9307V12.5234C40.7559 12.0404 40.2956 11.5459 39.9355 11.04C39.6165 10.5843 39.3112 10.0329 39.0195 9.38574C38.7096 10.1924 38.3883 10.8304 38.0557 11.2998C37.7503 11.7282 37.3493 12.1383 36.8525 12.5303V10.8486C37.3447 10.2653 37.7093 9.60905 37.9463 8.87988C38.1514 8.25553 38.2812 7.36686 38.3359 6.21387H37.1123C36.7386 8.21452 36.2783 9.64779 35.7314 10.5137C35.2803 11.2246 34.7152 11.7533 34.0361 12.0996C33.6898 12.2773 33.2204 12.4323 32.6279 12.5645V11.4023C33.0335 11.293 33.3366 11.1813 33.5371 11.0674C33.7923 10.9261 34.0612 10.6937 34.3438 10.3701H32.9287V9.10547H35.1162L35.3828 8.41504H32.9082V7.15723H35.7246C35.8659 6.61491 35.9365 6.25488 35.9365 6.07715C35.9365 5.8903 35.891 5.75586 35.7998 5.67383C35.736 5.6237 35.5674 5.59863 35.2939 5.59863L34.3506 5.5918C34.1182 5.98828 33.8698 6.27539 33.6055 6.45312C33.3092 6.6582 32.9766 6.81543 32.6074 6.9248ZM35.1641 15.4355V12.9473H36.4287V15.4355H35.1641ZM37.6318 15.4355V12.9473H38.8896V15.4355H37.6318ZM40.0586 15.4355V12.9473H41.3232V15.4355H40.0586ZM42.6836 7.12305V5.97461C42.9388 5.90169 43.1143 5.8151 43.21 5.71484C43.3102 5.61003 43.4401 5.26139 43.5996 4.66895C43.6862 4.35905 43.7637 4.06738 43.832 3.79395H45.0352L44.9053 4.22461H54.6123V5.48926H44.5703C44.4427 5.94043 44.2422 6.30729 43.9688 6.58984H54.6123V7.84766H43.4561V6.93164C43.3285 6.98633 43.071 7.05013 42.6836 7.12305ZM42.7246 10.2129V8.94141H52.6572C53.2269 8.94141 53.6325 9.02116 53.874 9.18066C54.4255 9.54069 54.6989 10.0124 54.6943 10.5957V13.3506C54.6898 13.7197 54.8971 13.9909 55.3164 14.1641V15.4492C54.8151 15.3535 54.4118 15.1576 54.1064 14.8613C53.8102 14.5742 53.6097 14.2529 53.5049 13.8975C53.4548 13.7152 53.4297 13.444 53.4297 13.084V11.1357C53.4297 10.8304 53.3613 10.598 53.2246 10.4385C53.0879 10.2835 52.917 10.2061 52.7119 10.2061L42.7246 10.2129Z" fill="white"/>
<defs>
<linearGradient id="paint0_linear_218_40" x1="28" y1="19" x2="28" y2="51" gradientUnits="userSpaceOnUse">
<stop stop-color="#92D4F4"/>
<stop offset="0.541667" stop-color="#38B4F0"/>
<stop offset="1" stop-color="#0B618C"/>
</linearGradient>
<linearGradient id="paint1_linear_218_40" x1="28.0191" y1="25.9648" x2="28.0191" y2="50.9397" gradientUnits="userSpaceOnUse">
<stop stop-color="#FABB00"/>
<stop offset="0.463542" stop-color="#F75001"/>
<stop offset="1" stop-color="#E90712"/>
</linearGradient>
</defs>
</svg>
gassafetyprogress-web/src/assets/image/zrxk.svg 0 → 100644
View file @ 27abfa50
<svg width="56" height="51" viewBox="0 0 56 51" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6.34375 5.02441V3.82129H7.62891V5.02441H10.917C11.6143 5.02441 12.1497 5.16341 12.5234 5.44141C13.0065 5.80599 13.248 6.30273 13.248 6.93164L13.2412 12.0654C13.2412 12.6761 13.1182 13.1432 12.8721 13.4668C12.4893 13.9727 11.9219 14.2256 11.1699 14.2256H7.62891L7.63574 15.415L6.34375 15.4082V14.2256H3.09668C2.44043 14.2256 1.9528 14.1322 1.63379 13.9453C1.05501 13.6081 0.765625 12.9678 0.765625 12.0244V7.19141C0.765625 6.48958 0.943359 5.96322 1.29883 5.6123C1.69531 5.22038 2.23079 5.02441 2.90527 5.02441H6.34375ZM6.34375 12.9404V6.30957H2.86426C2.54069 6.30957 2.3151 6.39616 2.1875 6.56934C2.09635 6.69694 2.05078 6.89746 2.05078 7.1709V11.9219C2.05078 12.2318 2.06217 12.4163 2.08496 12.4756C2.19889 12.79 2.44954 12.9473 2.83691 12.9473L6.34375 12.9404ZM7.62891 12.9404L10.9375 12.9473C11.6211 12.9518 11.9629 12.6647 11.9629 12.0859V7.2666C11.9629 6.87467 11.8854 6.61719 11.7305 6.49414C11.5846 6.38021 11.3385 6.32096 10.9922 6.31641L7.62891 6.30273V12.9404ZM14.6631 15.5859V14.0205C15.0322 13.779 15.3307 13.3825 15.5586 12.8311C15.7773 12.2979 15.8867 11.6644 15.8867 10.9307V3.85547H17.001V11.0195C17.001 11.7533 17.1309 12.389 17.3906 12.9268C17.6139 13.3916 17.8919 13.7493 18.2246 14V15.3604C17.7962 15.1234 17.4453 14.8545 17.1719 14.5537C16.9395 14.2985 16.723 13.9772 16.5225 13.5898C16.2581 14.0957 15.9414 14.5264 15.5723 14.8818C15.39 15.0641 15.0869 15.2988 14.6631 15.5859ZM14.6631 11.4912V4.30664H15.415V11.4912H14.6631ZM17.5342 11.4912V4.30664H18.2861V11.4912H17.5342ZM18.4844 15.4697V14.2939C18.612 14.2848 18.6963 14.2575 18.7373 14.2119C18.7829 14.1572 18.8057 14.016 18.8057 13.7881V12.9473H20.0703V13.7266C20.0703 14.8066 19.5417 15.3877 18.4844 15.4697ZM18.6074 6.9248V5.5918C18.89 5.44141 19.0973 5.22721 19.2295 4.94922C19.3434 4.7168 19.4437 4.31576 19.5303 3.74609H20.8154L20.6992 4.31348H21.6699C22.1211 4.31348 22.4743 4.39779 22.7295 4.56641C22.8434 4.63932 22.9642 4.76693 23.0918 4.94922H24.3291V3.83496H25.6211V4.94922H26.0654V4.04688H27.166V4.94922H27.3438L27.3369 6.21387H25.6211C25.6439 6.89746 25.6826 7.39876 25.7373 7.71777C25.874 8.46061 26.127 9.14648 26.4961 9.77539C26.7012 10.1309 26.9746 10.516 27.3164 10.9307V12.5234C26.7559 12.0404 26.2956 11.5459 25.9355 11.04C25.6165 10.5843 25.3112 10.0329 25.0195 9.38574C24.7096 10.1924 24.3883 10.8304 24.0557 11.2998C23.7503 11.7282 23.3493 12.1383 22.8525 12.5303V10.8486C23.3447 10.2653 23.7093 9.60905 23.9463 8.87988C24.1514 8.25553 24.2812 7.36686 24.3359 6.21387H23.1123C22.7386 8.21452 22.2783 9.64779 21.7314 10.5137C21.2803 11.2246 20.7152 11.7533 20.0361 12.0996C19.6898 12.2773 19.2204 12.4323 18.6279 12.5645V11.4023C19.0335 11.293 19.3366 11.1813 19.5371 11.0674C19.7923 10.9261 20.0612 10.6937 20.3438 10.3701H18.9287V9.10547H21.1162L21.3828 8.41504H18.9082V7.15723H21.7246C21.8659 6.61491 21.9365 6.25488 21.9365 6.07715C21.9365 5.8903 21.891 5.75586 21.7998 5.67383C21.736 5.6237 21.5674 5.59863 21.2939 5.59863L20.3506 5.5918C20.1182 5.98828 19.8698 6.27539 19.6055 6.45312C19.3092 6.6582 18.9766 6.81543 18.6074 6.9248ZM21.1641 15.4355V12.9473H22.4287V15.4355H21.1641ZM23.6318 15.4355V12.9473H24.8896V15.4355H23.6318ZM26.0586 15.4355V12.9473H27.3232V15.4355H26.0586ZM28.7314 15.4219V14.4648C28.8317 14.4421 28.8978 14.4124 28.9297 14.376C28.9479 14.3486 28.9616 14.2233 28.9707 14V8.00488H29.9346V14.0684C29.9346 14.8978 29.5335 15.349 28.7314 15.4219ZM28.8613 7.0957V5.83789H33.5166V7.0957H31.8418V15.4492H30.5771V7.0957H28.8613ZM28.8545 5.0791V3.82129H33.5166V5.0791H28.8545ZM32.4844 15.3809V8.02539H33.5098V15.3809H32.4844ZM34.2617 13.3438V12.0859H37.1807V9.84375H34.3916V8.5791H37.1807V6.33008H34.2617V5.06543H35.1641V3.8418H36.4697V5.06543H39.1084V3.8418H40.4209V5.06543H41.3643V6.33008H38.4658V8.5791H41.2549V9.84375H38.4658V12.0859H41.3643V13.3438H38.4658V15.4219H37.1807V13.3438H34.2617ZM42.6904 15.3877V14.2119C42.7041 14.2119 42.7155 14.2119 42.7246 14.2119C42.8932 14.2119 42.9821 13.9909 42.9912 13.5488L43.0664 8.10059H44.2148L44.1807 13.0498C44.1761 13.6969 44.1396 14.1436 44.0713 14.3896C43.9118 14.9775 43.4515 15.3102 42.6904 15.3877ZM42.8203 7.34863V6.10449H44.707V5.13379H42.8408V3.97852H47.667V5.13379H45.9717V6.10449H47.6807V7.34863H45.9717V15.4355H44.707V7.34863H42.8203ZM46.5322 15.4355V8.07324H47.6055V15.4355H46.5322ZM48.46 13.2002V11.8945H53.1836V3.80762H54.4482V11.8945H55.3232V13.2002H54.4482V15.4561H53.1836V13.2002H48.46ZM48.4805 9.80957V8.4834H52.2539V9.80957H48.4805ZM48.4805 6.22754V4.90137H52.2539V6.22754H48.4805Z" fill="white"/>
<g filter="url(#filter0_i_218_39)">
<path d="M27.3976 27.2643V19C14.9319 19.5381 11.9391 29.6026 12.0009 34.5676C12.5945 47.0216 22.5127 50.7117 27.3976 51V39.8529L24.2441 34.5676C23.0569 31.3387 25.8518 28.3534 27.3976 27.2643Z" fill="url(#paint0_linear_218_39)"/>
<path d="M28.3251 20.7297V19C32.4062 19 34.6013 20.0571 35.1887 20.7297H28.3251Z" fill="#0534AD"/>
<path d="M28.3251 24.7658V22.3634L38.435 22.5556L39.8263 24.0931L28.3251 24.7658Z" fill="#0534AD"/>
<path d="M28.3251 28.6096V26.015L41.5885 26.5916L42.145 27.7447L28.3251 28.6096Z" fill="#0534AD"/>
<path d="M30.0874 32.1652L28.9744 29.8589L43.0725 30.3393L43.7218 31.5886L30.0874 32.1652Z" fill="#0534AD"/>
<path d="M32.0352 35.9129L31.1077 33.991L43.8146 34.4715L44.0001 35.3363L32.0352 35.9129Z" fill="#0534AD"/>
<path d="M31.1077 39.5646L32.0352 37.7387L43.7218 38.4114L43.258 39.1802L31.1077 39.5646Z" fill="#0534AD"/>
<path d="M30.3656 41.4865C28.5106 41.4096 28.2324 42.992 28.3251 43.7928L41.403 43.1201L42.145 42.0631C38.9915 41.9029 32.2207 41.5634 30.3656 41.4865Z" fill="#0534AD"/>
<path d="M28.3251 47.4444L28.6034 45.1381L39.8263 45.7147L38.5278 46.964L28.3251 47.4444Z" fill="#0534AD"/>
<path d="M28.3251 50.9039V48.8859L35.1887 49.3664C32.9627 50.5964 29.6855 50.9039 28.3251 50.9039Z" fill="#0534AD"/>
</g>
<defs>
<filter id="filter0_i_218_39" x="12" y="19" width="32" height="32.2" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="0.2"/>
<feGaussianBlur stdDeviation="2"/>
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.46 0"/>
<feBlend mode="normal" in2="shape" result="effect1_innerShadow_218_39"/>
</filter>
<linearGradient id="paint0_linear_218_39" x1="19.6988" y1="19" x2="19.6988" y2="51" gradientUnits="userSpaceOnUse">
<stop stop-color="#EDB223"/>
<stop offset="0.515625" stop-color="#D60501"/>
<stop offset="1" stop-color="#D60501"/>
</linearGradient>
</defs>
</svg>
gassafetyprogress-web/src/components/bigWindow/Company.vue 0 → 100644
View file @ 27abfa50
<!--
* @Author: your name
* @Date: 2022-01-26 20:07:52
* @LastEditTime: 2022-03-01 16:29:17
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/views/components/deviceA.vue
-->
<template>
<div class="devicea-wrapper">
<div class="title">
{{ deviceData.enterpriseName }}
</div>
<div class="close" @click="close">
<img src="@/assets/mapImages/closeBtn.png" alt="" />
</div>
<div class="top flex">
<div class="group">
<div class="left">企业名称：</div>
<div class="right zzz">{{ deviceData.enterpriseName }}</div>
</div>
<div class="group">
<div class="left">法定代表人：</div>
<div v-unValue class="right zzz">
{{ deviceData.legalRepresentative }}
</div>
</div>
<div class="group">
<div class="left">经营区域：</div>
<div v-unValue :title="deviceData.businessArea" class="right last zzz">
{{ deviceData.businessArea }}
</div>
</div>
</div>
<div class="middle">
<div class="left">
<div>注册地址：</div>
</div>
<div v-unValue title="123" class="right">
{{ deviceData.registerAddress }}
</div>
</div>
<div class="middle">
<div class="left">
<div>备注信息：</div>
</div>
<div v-unValue title="123" class="right">
{{ deviceData.remarks }}
</div>
</div>
】
</div>
</template>
<script>
import { companyType, deviceType } from "@/utils/mapClass/config.js";
export default {
data() {
return {
companyType,
deviceType,
profile: "暂无备注",
};
},
computed: {
prodTest() {
return this.vueRoot.$store.state.user.systemSetting.prod_test;
},
company() {
return this.vueRoot.$store.state.bigWindowCompany.company;
},
},
mounted() {
// 如果不是测试，而是真数据，就要用帧数据的东西
if (this.prodTest != "test") {
this.companyType = {};
this.company.forEach((item) => {
this.companyType[item.conpanyId] = item.companyName;
});
}
console.log(this.deviceData);
},
methods: {
close() {
this.mapClass.infowindowClose();
},
btnClick() {
this.vueRoot.centerDataFunc(this.deviceData.pressureFlows);
},
},
};
</script>
<style lang="scss" scoped>
.devicea-wrapper {
background-color: rgba(9, 18, 32, 0.6);
padding: 10px;
position: relative;
width: 700px;
.title {
// padding-top: 10px;
// padding-left: 10px;
font-size: 14px;
line-height: 14px;
color: #ffffff;
}
.close {
position: absolute;
right: 10px;
top: 5px;
cursor: pointer;
}
.top {
margin-top: 10px;
// margin-bottom: 10px;
border: 1px solid #cccccc;
box-sizing: border-box;
.group {
height: 30px;
flex: 1;
display: flex;
justify-content: space-between;
box-sizing: border-box;
div {
flex: 1;
box-sizing: border-box;
border-right: 1px solid #cccccc;
text-align: center;
font-size: 14px;
color: #ffffff;
line-height: 30px;
padding: 0 5px;
&.last {
border-right: none;
}
}
.left {
text-align: right;
background-color: rgba(255, 255, 255, 0.1);
}
}
}
.middle {
display: flex;
border: 1px solid #cccccc;
border-top: none;
& > div {
box-sizing: border-box;
border-right: 1px solid #cccccc;
text-align: center;
font-size: 14px;
color: #ffffff;
line-height: 30px;
padding: 0 5px;
&.left {
width: 113px;
display: flex;
align-items: center;
background-color: rgba(255, 255, 255, 0.1);
div {
text-align: right;
flex: 1;
}
}
&.right {
border: none;
flex: 1;
text-align: left;
text-indent: 2em;
line-height: normal;
padding: 5px;
}
}
}
.foot {
width: 100%;
padding: 5px;
border: 1px solid #ffffff;
box-sizing: border-box;
font-size: 14px;
color: #ffffff;
text-indent: 2em;
margin-bottom: 10px;
}
.flex {
display: flex;
justify-content: space-between;
}
}
</style>
gassafetyprogress-web/src/components/bigWindow/rightBar.vue
View file @ 27abfa50
......@@ -6,7 +6,7 @@
<span class="dot">
<span class="dot-inner"></span>
</span>
<span>报警信息</span>
<span style="letter-spacing :3px;color:#cddbe4">报警信息</span>
<div class="fong-div" style="width: 8px;height: 12px;background-color: #2c888899;float: right;margin-top: 10px;transform: skewX(-25deg)"></div>
<div class="fong-div" style="width: 8px;height: 12px;background-color: #24b1b1b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
<div class="fong-div" style="width: 8px;height: 12px;background-color: #11e9e9b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
......@@ -89,7 +89,7 @@
<span class="dot">
<span class="dot-inner"></span>
</span>
<span>资源统计</span>
<span style="letter-spacing :3px;color:#cddbe4">资源统计</span>
<div class="fong-div" style="width: 8px;height: 12px;background-color: #2c888899;float: right;margin-top: 10px;transform: skewX(-25deg)"></div>
<div class="fong-div" style="width: 8px;height: 12px;background-color: #24b1b1b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
<div class="fong-div" style="width: 8px;height: 12px;background-color: #11e9e9b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
......@@ -104,7 +104,7 @@
<span class="dot">
<span class="dot-inner"></span>
</span>
<span>用户安全监控设备</span>
<span style="letter-spacing :3px;color:#cddbe4">用户安全监控设备</span>
<div class="fong-div" style="width: 8px;height: 12px;background-color: #2c888899;float: right;margin-top: 10px;transform: skewX(-25deg)"></div>
<div class="fong-div" style="width: 8px;height: 12px;background-color: #24b1b1b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
<div class="fong-div" style="width: 8px;height: 12px;background-color: #11e9e9b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
......@@ -607,10 +607,10 @@
.usernum{
width: 100%;
height: 20px;
display: flex;
justify-content: space-around;
}
.usernumin{
float: left;
margin-left: 15px;
font-size: 15px;
}
.in1{
......
gassafetyprogress-web/src/settings.js
View file @ 27abfa50
/*
* @Author: your name
* @Date: 2022-02-26 22:22:56
* @LastEditTime: 2022-03-01 17:00:50
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /newDev/gassafety-progress/gassafetyprogress-web/src/settings.js
*/
module.exports = {
title: '智慧管网管理系统',
title: '智慧燃气管理系统',
/**
* 侧边栏主题 深色主题theme-dark，浅色主题theme-light
......
gassafetyprogress-web/src/utils/mapClass/config.js
View file @ 27abfa50
/*
* @Author: your name
* @Date: 2022-01-26 10:47:44
* @LastEditTime: 2022-02-28 20:33:47
* @LastEditTime: 2022-03-01 16:07:06
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/utils/config.js
......@@ -26,6 +26,8 @@ export const svgUrl = {
4: require("@/assets/image/changzhan1.svg"),
5: require("@/assets/image/jiankong1.svg"),
6: require("@/assets/image/user1.svg"),
7: require("@/assets/image/zrxk.svg"),
8: require("@/assets/image/zcrq.svg"),
};
export const svgAlarm = {
2: require("@/assets/image/tiaoyaxiang1.svg"),
......
gassafetyprogress-web/src/utils/mapClass/map.js
View file @ 27abfa50
/*
* @Author: your name
* @Date: 2022-01-11 13:45:12
* @LastEditTime: 2022-03-01 10:19:55
* @LastEditTime: 2022-03-01 17:25:23
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/utils/mapClass.js
......@@ -479,11 +479,12 @@ export class EditorMap {
// 设备过滤受到bigwindow页面的的两种制约，companyArr, typeArr 两个数组制约显示隐藏
// 燃气没有公司，所以没有device.companyType不收到公司的控制
const companyHas = companyArr.indexOf(data.companyType + "") >= 0;
// 设备存在
// 设备存在 受到设备按钮限制
const deviceHas = typeArr.indexOf(+data.iconType) >= 0;
console.log(deviceHas);
// 如果是燃气公司的话，不受按钮限制
const enterprise = data.iconType == 7 || data.iconType == 8;
// 必须设备存在数组里，才会显示设备 !data.companyType代表用户不受公司制约
if (deviceHas && (companyHas || !data.companyType)) {
if (enterprise || (deviceHas && (companyHas || !data.companyType))) {
device.show();
} else {
device.hide();
......@@ -506,8 +507,11 @@ export class EditorMap {
// 将旧的值缓存一下
device.oldData = device.getExtData();
device.setExtData(obj);
// 如果infowindow是打开的，就改变里面的数据
if (this.infowindowComponent) {
// 如果infowindow是打开的，就改变里面的数据，必须是用户才行
if (
this.infowindowComponent &&
this.infowindowComponent.deviceData.iconType == 6
) {
this.infowindowComponentChange(obj);
}
if (!this.alarmObj[iconType]) {
......@@ -546,7 +550,10 @@ export class EditorMap {
device.setExtData(deviceData);
device.oldData = null;
// 如果infowindow是打开的
if (this.infowindowComponent) {
if (
this.infowindowComponent &&
this.infowindowComponent.deviceData.iconType == 6
) {
this.infowindowComponentChange(deviceData);
}
// 在arr中删掉
......
gassafetyprogress-web/src/views/bigWindow/index.vue
View file @ 27abfa50
<!--
* @Author: your name
* @Date: 2022-01-11 13:44:17
* @LastEditTime: 2022-03-01 09:51:34
* @LastEditTime: 2022-03-01 16:08:52
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/views/Home.vue
......@@ -152,6 +152,7 @@ import {
getCz,
getVideo,
getUser,
getEnterprise,
userAlarm,
} from "@/api/bigWindow/getDevice";
import Line from "@/components/bigWindow/Line.vue";
......@@ -160,6 +161,7 @@ import DeviceA from "@/components/bigWindow/DeviceA.vue";
import User from "@/components/bigWindow/User.vue";
import Center from "@/components/bigWindow/Center.vue";
import UserCenter from "@/components/bigWindow/UserCenter.vue";
import Company from "@/components/bigWindow/Company.vue";
import PipeColor from "@/components/bigWindow/PipeColor.vue";
// import markerInfoWindow from './components/markerInfoWindow.vue'
......@@ -309,6 +311,9 @@ export default {
this.goMap(getFm, this.addDevice, DeviceA);
this.goMap(getCz, this.addDevice, DeviceA);
this.goMap(getVideo, this.addDevice, VideoView);
this.goMap(getEnterprise, this.addDevice, Company);
// 用户要等一下 因为有报警数据
this.goMap(detectorUserList, this.addDevice, User).then((res) => {
// 先查一下，然后开启定时器
......@@ -356,7 +361,7 @@ export default {
let config = {};
if (Array.isArray(res)) {
config = { data: res };
// 给视频设备的conpanyType变成null
// 给视频设备的conpanyType变成null,因为视频不受企业控制
if (res[0].iconType == 5) {
res.forEach((item) => {
item.companyType = null;
......@@ -380,7 +385,6 @@ export default {
// 看看谁告消警
}
this.map.relieveAlarm(res.data);
});
},
......
gassafetyprogress-web/vue.config.js
View file @ 27abfa50
......@@ -6,7 +6,7 @@ function resolve(dir) {
return path.join(__dirname, dir)
}
const name = defaultSettings.title || '智慧管网管理系统' // 标题
const name = defaultSettings.title || '智慧燃气管理系统' // 标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment