Merge remote-tracking branch 'origin/master'

gassafety-admin/src/main/java/com/zehong/web/controller/device/TVideoManagerController.java

+package com.zehong.web.controller.device;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TVideoManager;
+import com.zehong.system.service.ITVideoManagerService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 视频管理Controller
+ * 
+ * @author zehong
+ * @date 2021-09-18
+ */
+@RestController
+@RequestMapping("/device/manager")
+public class TVideoManagerController extends BaseController
+{
+    @Autowired
+    private ITVideoManagerService tVideoManagerService;
+
+    /**
+     * 查询视频管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('device:manager:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TVideoManager tVideoManager)
+    {
+        startPage();
+        List<TVideoManager> list = tVideoManagerService.selectTVideoManagerList(tVideoManager);
+        return getDataTable(list);
+    }
+
+
+    @GetMapping("/videoList")
+    public TableDataInfo videoList(TVideoManager tVideoManager)
+    {
+        return getDataTable(tVideoManagerService.selectTVideoManagerList(tVideoManager));
+    }
+
+    /**
+     * 导出视频管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('device:manager:export')")
+    @Log(title = "视频管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TVideoManager tVideoManager)
+    {
+        List<TVideoManager> list = tVideoManagerService.selectTVideoManagerList(tVideoManager);
+        ExcelUtil<TVideoManager> util = new ExcelUtil<TVideoManager>(TVideoManager.class);
+        return util.exportExcel(list, "视频管理数据");
+    }
+
+    /**
+     * 获取视频管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('device:manager:query')")
+    @GetMapping(value = "/{videoManagerId}")
+    public AjaxResult getInfo(@PathVariable("videoManagerId") String videoManagerId)
+    {
+        return AjaxResult.success(tVideoManagerService.selectTVideoManagerById(videoManagerId));
+    }
+
+    /**
+     * 新增视频管理
+     */
+    @PreAuthorize("@ss.hasPermi('device:manager:add')")
+    @Log(title = "视频管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TVideoManager tVideoManager)
+    {
+        return toAjax(tVideoManagerService.insertTVideoManager(tVideoManager));
+    }
+
+    /**
+     * 修改视频管理
+     */
+    @PreAuthorize("@ss.hasPermi('device:manager:edit')")
+    @Log(title = "视频管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TVideoManager tVideoManager)
+    {
+        return toAjax(tVideoManagerService.updateTVideoManager(tVideoManager));
+    }
+
+    /**
+     * 删除视频管理
+     */
+    @PreAuthorize("@ss.hasPermi('device:manager:remove')")
+    @Log(title = "视频管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{videoManagerIds}")
+    public AjaxResult remove(@PathVariable String[] videoManagerIds)
+    {
+        return toAjax(tVideoManagerService.deleteTVideoManagerByIds(videoManagerIds));
+    }
+}

gassafety-admin/src/main/resources/application-test.yml

@@ -58,13 +58,13 @@ spring:
     # redis 配置
     redis:
       # 地址
-      host: localhost
+      host: 36.148.23.59
       # 端口，默认为6379
       port: 6379
       # 数据库索引
       database: 0
       # 密码
-      password:
+      password: 1qaz2wsx3edc
       # 连接超时时间
       timeout: 10s
       lettuce:

gassafety-system/src/main/java/com/zehong/system/domain/TVideoManager.java

+package com.zehong.system.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 视频管理对象 t_video_manager
+ * 
+ * @author zehong
+ * @date 2021-09-22
+ */
+public class TVideoManager extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 视频管理id */
+    private Long videoManagerId;
+
+    /** 视频名称 */
+    @Excel(name = "视频名称")
+    private String videoName;
+
+    /** 视频资源id */
+    @Excel(name = "视频资源id")
+    private String resourceId;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    /** 视频地址 */
+    @Excel(name = "视频地址")
+    private String videoAddress;
+
+    /** 视频类型 */
+    @Excel(name = "视频类型")
+    private String type;
+
+    public void setVideoManagerId(Long videoManagerId) 
+    {
+        this.videoManagerId = videoManagerId;
+    }
+
+    public Long getVideoManagerId() 
+    {
+        return videoManagerId;
+    }
+    public void setVideoName(String videoName) 
+    {
+        this.videoName = videoName;
+    }
+
+    public String getVideoName() 
+    {
+        return videoName;
+    }
+    public void setResourceId(String resourceId) 
+    {
+        this.resourceId = resourceId;
+    }
+
+    public String getResourceId() 
+    {
+        return resourceId;
+    }
+    public void setLongitude(BigDecimal longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLongitude() 
+    {
+        return longitude;
+    }
+    public void setLatitude(BigDecimal latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getLatitude() 
+    {
+        return latitude;
+    }
+    public void setVideoAddress(String videoAddress) 
+    {
+        this.videoAddress = videoAddress;
+    }
+
+    public String getVideoAddress() 
+    {
+        return videoAddress;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("videoManagerId", getVideoManagerId())
+            .append("videoName", getVideoName())
+            .append("resourceId", getResourceId())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("videoAddress", getVideoAddress())
+            .append("type", getType())
+            .toString();
+    }
+}

gassafety-system/src/main/java/com/zehong/system/mapper/TVideoManagerMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TVideoManager;
+
+/**
+ * 视频管理Mapper接口
+ * 
+ * @author zehong
+ * @date 2021-09-18
+ */
+public interface TVideoManagerMapper 
+{
+    /**
+     * 查询视频管理
+     * 
+     * @param videoManagerId 视频管理ID
+     * @return 视频管理
+     */
+    public TVideoManager selectTVideoManagerById(String videoManagerId);
+
+    /**
+     * 查询视频管理列表
+     * 
+     * @param tVideoManager 视频管理
+     * @return 视频管理集合
+     */
+    public List<TVideoManager> selectTVideoManagerList(TVideoManager tVideoManager);
+
+    /**
+     * 新增视频管理
+     * 
+     * @param tVideoManager 视频管理
+     * @return 结果
+     */
+    public int insertTVideoManager(TVideoManager tVideoManager);
+
+    /**
+     * 修改视频管理
+     * 
+     * @param tVideoManager 视频管理
+     * @return 结果
+     */
+    public int updateTVideoManager(TVideoManager tVideoManager);
+
+    /**
+     * 删除视频管理
+     * 
+     * @param videoManagerId 视频管理ID
+     * @return 结果
+     */
+    public int deleteTVideoManagerById(String videoManagerId);
+
+    /**
+     * 批量删除视频管理
+     * 
+     * @param videoManagerIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTVideoManagerByIds(String[] videoManagerIds);
+}

gassafety-system/src/main/java/com/zehong/system/service/ITVideoManagerService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TVideoManager;
+
+/**
+ * 视频管理Service接口
+ * 
+ * @author zehong
+ * @date 2021-09-18
+ */
+public interface ITVideoManagerService 
+{
+    /**
+     * 查询视频管理
+     * 
+     * @param videoManagerId 视频管理ID
+     * @return 视频管理
+     */
+    public TVideoManager selectTVideoManagerById(String videoManagerId);
+
+    /**
+     * 查询视频管理列表
+     * 
+     * @param tVideoManager 视频管理
+     * @return 视频管理集合
+     */
+    public List<TVideoManager> selectTVideoManagerList(TVideoManager tVideoManager);
+
+    /**
+     * 新增视频管理
+     * 
+     * @param tVideoManager 视频管理
+     * @return 结果
+     */
+    public int insertTVideoManager(TVideoManager tVideoManager);
+
+    /**
+     * 修改视频管理
+     * 
+     * @param tVideoManager 视频管理
+     * @return 结果
+     */
+    public int updateTVideoManager(TVideoManager tVideoManager);
+
+    /**
+     * 批量删除视频管理
+     * 
+     * @param videoManagerIds 需要删除的视频管理ID
+     * @return 结果
+     */
+    public int deleteTVideoManagerByIds(String[] videoManagerIds);
+
+    /**
+     * 删除视频管理信息
+     * 
+     * @param videoManagerId 视频管理ID
+     * @return 结果
+     */
+    public int deleteTVideoManagerById(String videoManagerId);
+}

gassafety-system/src/main/java/com/zehong/system/service/impl/TVideoManagerServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TVideoManagerMapper;
+import com.zehong.system.domain.TVideoManager;
+import com.zehong.system.service.ITVideoManagerService;
+
+/**
+ * 视频管理Service业务层处理
+ * 
+ * @author zehong
+ * @date 2021-09-18
+ */
+@Service
+public class TVideoManagerServiceImpl implements ITVideoManagerService 
+{
+    @Autowired
+    private TVideoManagerMapper tVideoManagerMapper;
+
+    /**
+     * 查询视频管理
+     * 
+     * @param videoManagerId 视频管理ID
+     * @return 视频管理
+     */
+    @Override
+    public TVideoManager selectTVideoManagerById(String videoManagerId)
+    {
+        return tVideoManagerMapper.selectTVideoManagerById(videoManagerId);
+    }
+
+    /**
+     * 查询视频管理列表
+     * 
+     * @param tVideoManager 视频管理
+     * @return 视频管理
+     */
+    @Override
+    public List<TVideoManager> selectTVideoManagerList(TVideoManager tVideoManager)
+    {
+        return tVideoManagerMapper.selectTVideoManagerList(tVideoManager);
+    }
+
+    /**
+     * 新增视频管理
+     * 
+     * @param tVideoManager 视频管理
+     * @return 结果
+     */
+    @Override
+    public int insertTVideoManager(TVideoManager tVideoManager)
+    {
+        return tVideoManagerMapper.insertTVideoManager(tVideoManager);
+    }
+
+    /**
+     * 修改视频管理
+     * 
+     * @param tVideoManager 视频管理
+     * @return 结果
+     */
+    @Override
+    public int updateTVideoManager(TVideoManager tVideoManager)
+    {
+        return tVideoManagerMapper.updateTVideoManager(tVideoManager);
+    }
+
+    /**
+     * 批量删除视频管理
+     * 
+     * @param videoManagerIds 需要删除的视频管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTVideoManagerByIds(String[] videoManagerIds)
+    {
+        return tVideoManagerMapper.deleteTVideoManagerByIds(videoManagerIds);
+    }
+
+    /**
+     * 删除视频管理信息
+     * 
+     * @param videoManagerId 视频管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTVideoManagerById(String videoManagerId)
+    {
+        return tVideoManagerMapper.deleteTVideoManagerById(videoManagerId);
+    }
+}

gassafety-system/src/main/resources/mapper/system/TVideoManagerMapper.xml

+<?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.zehong.system.mapper.TVideoManagerMapper">
+    
+    <resultMap type="TVideoManager" id="TVideoManagerResult">
+        <result property="videoManagerId"    column="video_manager_id"    />
+        <result property="videoName"    column="video_name"    />
+        <result property="resourceId"    column="resource_id"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="videoAddress"    column="video_address"    />
+        <result property="type"    column="type"    />
+    </resultMap>
+
+    <sql id="selectTVideoManagerVo">
+        select video_manager_id, video_name, resource_id, longitude, latitude, video_address, type from t_video_manager
+    </sql>
+
+    <select id="selectTVideoManagerList" parameterType="TVideoManager" resultMap="TVideoManagerResult">
+        <include refid="selectTVideoManagerVo"/>
+        <where>  
+            <if test="videoName != null  and videoName != ''"> and video_name like concat('%', #{videoName}, '%')</if>
+            <if test="resourceId != null  and resourceId != ''"> and resource_id = #{resourceId}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="videoAddress != null  and videoAddress != ''"> and video_address = #{videoAddress}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+        </where>
+    </select>
+    
+    <select id="selectTVideoManagerById" parameterType="Long" resultMap="TVideoManagerResult">
+        <include refid="selectTVideoManagerVo"/>
+        where video_manager_id = #{videoManagerId}
+    </select>
+        
+    <insert id="insertTVideoManager" parameterType="TVideoManager" useGeneratedKeys="true" keyProperty="videoManagerId">
+        insert into t_video_manager
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="videoName != null">video_name,</if>
+            <if test="resourceId != null">resource_id,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="videoAddress != null">video_address,</if>
+            <if test="type != null">type,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="videoName != null">#{videoName},</if>
+            <if test="resourceId != null">#{resourceId},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="videoAddress != null">#{videoAddress},</if>
+            <if test="type != null">#{type},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTVideoManager" parameterType="TVideoManager">
+        update t_video_manager
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="videoName != null">video_name = #{videoName},</if>
+            <if test="resourceId != null">resource_id = #{resourceId},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="videoAddress != null">video_address = #{videoAddress},</if>
+            <if test="type != null">type = #{type},</if>
+        </trim>
+        where video_manager_id = #{videoManagerId}
+    </update>
+
+    <delete id="deleteTVideoManagerById" parameterType="Long">
+        delete from t_video_manager where video_manager_id = #{videoManagerId}
+    </delete>
+
+    <delete id="deleteTVideoManagerByIds" parameterType="String">
+        delete from t_video_manager where video_manager_id in 
+        <foreach item="videoManagerId" collection="array" open="(" separator="," close=")">
+            #{videoManagerId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafety-web/src/api/device/videoManager.js

+import request from '@/utils/request'
+
+// 查询视频管理列表
+export function listManager(query) {
+  return request({
+    url: '/device/manager/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function videoList() {
+  return request({
+    url: '/device/manager/videoList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询视频管理详细
+export function getManager(videoManagerId) {
+  return request({
+    url: '/device/manager/' + videoManagerId,
+    method: 'get'
+  })
+}
+
+// 新增视频管理
+export function addManager(data) {
+  return request({
+    url: '/device/manager',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改视频管理
+export function updateManager(data) {
+  return request({
+    url: '/device/manager',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除视频管理
+export function delManager(videoManagerId) {
+  return request({
+    url: '/device/manager/' + videoManagerId,
+    method: 'delete'
+  })
+}
+
+// 导出视频管理
+export function exportManager(query) {
+  return request({
+    url: '/device/manager/export',
+    method: 'get',
+    params: query
+  })
+}

gassafety-web/src/assets/images/famenjing.svg

+<svg id="组_2447" data-name="组 2447" xmlns="http://www.w3.org/2000/svg" width="23.304" height="34.295" viewBox="0 0 23.304 34.295">
+  <path id="路径_168" data-name="路径 168" d="M-1603.123-57.691a9.445,9.445,0,0,0-9.234-8.255,9.5,9.5,0,0,0-9.333,9.663,9.5,9.5,0,0,0,9.333,9.663,9.445,9.445,0,0,0,9.234-8.255h.76v-2.817Zm-16.383.73a7.312,7.312,0,0,1,6.469-6.722v1.475a5.871,5.871,0,0,0-5.045,5.246Zm6.469,8.079a7.311,7.311,0,0,1-6.465-6.67h1.425a5.869,5.869,0,0,0,5.039,5.2Zm-.242-6.99v3.214h-1.149v-7.262h4.784V-58.9h-3.635v2.014h3.429v1.017Zm1.6,6.99v-1.475a5.869,5.869,0,0,0,5.039-5.2h1.425A7.311,7.311,0,0,1-1611.677-48.883Zm5.045-8.079a5.871,5.871,0,0,0-5.045-5.246v-1.475a7.313,7.313,0,0,1,6.469,6.722Z" transform="translate(1624.104 68.362)" fill="#7bf8f4"/>
+  <g id="路径_185" data-name="路径 185" fill="none">
+    <path d="M11.652,0A11.652,11.652,0,0,1,23.3,11.652c0,6.435-11.75,18.467-11.652,18.545S0,18.087,0,11.652A11.652,11.652,0,0,1,11.652,0Z" stroke="none"/>
+    <path d="M 11.65185546875 0.9999942779541016 C 5.77839469909668 0.9999942779541016 0.9999961853027344 5.778413772583008 0.9999961853027344 11.65188407897949 C 0.9999961853027344 15.65063667297363 6.374073028564453 22.94361305236816 11.62834739685059 28.69588470458984 C 12.84814071655273 27.33243751525879 15.5371789932251 24.3126106262207 17.89928436279297 21.01001358032227 C 19.90856552124023 18.20073509216309 22.3037052154541 14.29677486419678 22.3037052154541 11.65188407897949 C 22.3037052154541 5.778413772583008 17.52530479431152 0.9999942779541016 11.65185546875 0.9999942779541016 M 11.65185546875 -5.7220458984375e-06 C 18.08699607849121 -5.7220458984375e-06 23.3037052154541 5.216724395751953 23.3037052154541 11.65188407897949 C 23.3037052154541 18.06309509277344 11.64087867736816 30.02925682067871 11.65124988555908 30.19523429870605 C 11.5146951675415 30.02953720092773 -3.814697265625e-06 18.02224731445312 -3.814697265625e-06 11.65188407897949 C -3.814697265625e-06 5.216724395751953 5.216714859008789 -5.7220458984375e-06 11.65185546875 -5.7220458984375e-06 Z M 11.65124988555908 30.19523429870605 C 11.65263366699219 30.19691467285156 11.65285301208496 30.19738388061523 11.65185546875 30.19659423828125 C 11.6514892578125 30.19630432128906 11.65128803253174 30.19585609436035 11.65124988555908 30.19523429870605 Z" stroke="none" fill="#7bf8f4"/>
+  </g>
+  <path id="多边形_32" data-name="多边形 32" d="M4.53,0l4.53,6.039H0Z" transform="translate(16.306 30.197) rotate(180)" fill="#7bf8f4"/>
+</svg>

gassafety-web/src/assets/images/liuliangji.svg

+<svg id="组_2445" data-name="组 2445" xmlns="http://www.w3.org/2000/svg" width="23" height="34.049" viewBox="0 0 23 34.049">
+  <path id="路径_169" data-name="路径 169" d="M-2160.2,287.287a9.537,9.537,0,0,1,9.538,9.537,9.537,9.537,0,0,1-9.538,9.537,9.538,9.538,0,0,1-9.537-9.537A9.538,9.538,0,0,1-2160.2,287.287Zm0,1.467a8.069,8.069,0,0,0-8.069,8.07,8.069,8.069,0,0,0,8.069,8.07,8.069,8.069,0,0,0,8.07-8.07A8.069,8.069,0,0,0-2160.2,288.754Zm-.109,1.485a6.691,6.691,0,0,1,6.681,6.68,6.691,6.691,0,0,1-6.681,6.68,6.691,6.691,0,0,1-6.68-6.68A6.691,6.691,0,0,1-2160.309,290.239Zm.144,11.685h-.276v1.1h.276Zm-3.65-1.433-.771.772.2.2.772-.772-.2-.2Zm6.748,0-.2.2.771.772.2-.2Zm-1.874-6.328-1.808,2.094a.671.671,0,0,0-.265.286.825.825,0,0,0,.375,1.081.831.831,0,0,0,1.08-.375.723.723,0,0,0,.089-.375l.529-2.711Z" transform="translate(2171.7 -284.903)" fill="#7bf8f4"/>
+  <g id="路径_188" data-name="路径 188" fill="none">
+    <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
+    <path d="M 11.5 0.9999980926513672 C 5.71027946472168 0.9999980926513672 1 5.710289001464844 1 11.50002861022949 C 1 15.44052600860596 6.295671463012695 22.62869071960449 11.47669506072998 28.3024730682373 C 12.68497657775879 26.95182228088379 15.33078575134277 23.97880554199219 17.65543937683105 20.72857856750488 C 19.63740921020508 17.95747756958008 22 14.10697841644287 22 11.50002861022949 C 22 5.710289001464844 17.28972053527832 0.9999980926513672 11.5 0.9999980926513672 M 11.5 -1.9073486328125e-06 C 17.85127067565918 -1.9073486328125e-06 23 5.148738861083984 23 11.50002861022949 C 23 17.82768249511719 11.48916530609131 29.63789749145508 11.49940204620361 29.80171585083008 C 11.36462783813477 29.63818168640137 0 17.7873649597168 0 11.50002861022949 C 0 5.148738861083984 5.14872932434082 -1.9073486328125e-06 11.5 -1.9073486328125e-06 Z M 11.49940204620361 29.80171585083008 C 11.50076866149902 29.80337524414062 11.50098419189453 29.8038387298584 11.5 29.80305862426758 C 11.49963855743408 29.80277252197266 11.49944019317627 29.80232810974121 11.49940204620361 29.80171585083008 Z" stroke="none" fill="#7bf8f4"/>
+  </g>
+  <path id="多边形_35" data-name="多边形 35" d="M4.524,0,9.049,6.033H0Z" transform="translate(16.59 29.951) rotate(180)" fill="#7bf8f4"/>
+</svg>

gassafety-web/src/assets/images/tiaoyaxiang.svg

+<svg id="组_2448" data-name="组 2448" xmlns="http://www.w3.org/2000/svg" width="23" height="33.9" viewBox="0 0 23 33.9">
+  <path id="路径_173" data-name="路径 173" d="M-1877.09-49.461a9.537,9.537,0,0,0-9.537,9.537,9.537,9.537,0,0,0,9.537,9.537,9.537,9.537,0,0,0,9.537-9.537A9.537,9.537,0,0,0-1877.09-49.461Zm5.722,12.875h-.954v1.431h-1.43v.954h-1.907v-.954h-2.384v.954h-1.907v-.954h-1.431v-1.431h-.954v-6.676h.954v-1.431h1.431v-.477h1.431v.477h.953v-.477h1.431v.477h.954v-.477h1.431v.477h1.43v1.431h.954Zm-9.537,0h8.107v-7.153h-8.107Zm7.153-6.676h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Zm-.953,0h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Zm-.953,0h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Z" transform="translate(1888.59 51.845)" fill="#7bf8f4"/>
+  <g id="路径_186" data-name="路径 186" fill="none">
+    <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
+    <path d="M 11.5 0.9999942779541016 C 5.71027946472168 0.9999942779541016 1 5.710294723510742 1 11.50003433227539 C 1 15.44047451019287 6.295700073242188 22.62868881225586 11.47670364379883 28.30246925354004 C 12.68497562408447 26.95181846618652 15.33078575134277 23.97880172729492 17.65543937683105 20.72857475280762 C 19.63740921020508 17.95747375488281 22 14.10698509216309 22 11.50003433227539 C 22 5.710294723510742 17.28972053527832 0.9999942779541016 11.5 0.9999942779541016 M 11.5 -5.7220458984375e-06 C 17.85128021240234 -5.7220458984375e-06 23 5.148744583129883 23 11.50003433227539 C 23 17.82767868041992 11.48916530609131 29.63789367675781 11.49940204620361 29.80171203613281 C 11.36462783813477 29.63816833496094 0 17.78736114501953 0 11.50003433227539 C 0 5.148744583129883 5.14872932434082 -5.7220458984375e-06 11.5 -5.7220458984375e-06 Z M 11.49940204620361 29.80171203613281 C 11.50076866149902 29.80337142944336 11.50098419189453 29.80383491516113 11.5 29.80305480957031 C 11.49963855743408 29.80276870727539 11.49944019317627 29.80232429504395 11.49940204620361 29.80171203613281 Z" stroke="none" fill="#7bf8f4"/>
+  </g>
+  <path id="多边形_33" data-name="多边形 33" d="M4.471,0,8.941,5.961H0Z" transform="translate(16.094 29.803) rotate(180)" fill="#7bf8f4"/>
+</svg>

gassafety-web/src/assets/images/yalibiao.svg

+<svg id="组_2449" data-name="组 2449" xmlns="http://www.w3.org/2000/svg" width="23" height="33.9" viewBox="0 0 23 33.9">
+  <g id="路径_186" data-name="路径 186" fill="none">
+    <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
+    <path d="M 11.5 0.9999942779541016 C 5.71027946472168 0.9999942779541016 1 5.710294723510742 1 11.50003433227539 C 1 15.44047451019287 6.295700073242188 22.62868881225586 11.47670364379883 28.30246925354004 C 12.68497562408447 26.95181846618652 15.33078575134277 23.97880172729492 17.65543937683105 20.72857475280762 C 19.63740921020508 17.95747375488281 22 14.10698509216309 22 11.50003433227539 C 22 5.710294723510742 17.28972053527832 0.9999942779541016 11.5 0.9999942779541016 M 11.5 -5.7220458984375e-06 C 17.85127067565918 -5.7220458984375e-06 23 5.148744583129883 23 11.50003433227539 C 23 17.82767868041992 11.48916530609131 29.63789367675781 11.49940204620361 29.80171203613281 C 11.36462783813477 29.63816833496094 0 17.78736114501953 0 11.50003433227539 C 0 5.148744583129883 5.14872932434082 -5.7220458984375e-06 11.5 -5.7220458984375e-06 Z M 11.49940204620361 29.80171203613281 C 11.50076866149902 29.80337142944336 11.50098419189453 29.80383491516113 11.5 29.80305480957031 C 11.49963855743408 29.80276870727539 11.49944019317627 29.80232429504395 11.49940204620361 29.80171203613281 Z" stroke="none" fill="#7bf8f4"/>
+  </g>
+  <path id="多边形_33" data-name="多边形 33" d="M4.471,0,8.941,5.961H0Z" transform="translate(16.094 29.804) rotate(180)" fill="#7bf8f4"/>
+  <path id="路径_966" data-name="路径 966" d="M99.476,156.616a6.028,6.028,0,0,1-1.622,2.267.9.9,0,0,1-.583.252.8.8,0,0,1-.567-.236.765.765,0,0,1-.236-.535.705.705,0,0,1,.236-.535,6.035,6.035,0,0,0,1.748-4.377A5.726,5.726,0,0,0,96.7,149.2a6.645,6.645,0,0,0-9.085.016,5.836,5.836,0,0,0-1.763,4.283,6.134,6.134,0,0,0,1.952,4.346.765.765,0,0,1,.236.535.705.705,0,0,1-.236.535.748.748,0,0,1-.567.236.8.8,0,0,1-.567-.236,7.414,7.414,0,0,1-2.047-2.724,7.528,7.528,0,0,1,1.748-8.266,7.836,7.836,0,0,1,2.629-1.685,9.392,9.392,0,0,1,6.361-.063,6.113,6.113,0,0,1,2.141,1.26c2.866,2.425,3.023,5.9,2.047,8.943Zm-7.337-7.684a4.366,4.366,0,0,0-4.377,4.267.5.5,0,0,1-.236.5.527.527,0,0,1-.567,0,.513.513,0,0,1-.236-.5,5.254,5.254,0,0,1,1.575-3.684,5.533,5.533,0,0,1,7.7,0,5.208,5.208,0,0,1,1.606,3.732.5.5,0,0,1-.236.5.527.527,0,0,1-.567,0,.513.513,0,0,1-.236-.5,4.382,4.382,0,0,0-4.424-4.314Zm.913,5.4a1.113,1.113,0,0,1-1.559-.047,1.054,1.054,0,0,1-.268-1.149l-1.212-1.2a.418.418,0,0,1,0-.6.479.479,0,0,1,.63,0l1.228,1.2a1.162,1.162,0,0,1,1.2.268,1.024,1.024,0,0,1,.331.771A1.093,1.093,0,0,1,93.052,154.333Zm.016-.016" transform="translate(-80.582 -142.727)" fill="#7bf8f4"/>
+</svg>

gassafety-web/src/assets/images/zhibanrenyuan.svg

+<svg id="组_2446" data-name="组 2446" xmlns="http://www.w3.org/2000/svg" width="23" height="33.9" viewBox="0 0 23 33.9">
+  <path id="路径_170" data-name="路径 170" d="M-1583.57,295.955a3.719,3.719,0,0,0-3.714,3.713,3.719,3.719,0,0,0,3.714,3.713,3.719,3.719,0,0,0,3.713-3.713,3.719,3.719,0,0,0-3.713-3.713Zm2.287,4.15a.608.608,0,0,1-.437.184h-1.862a.618.618,0,0,1-.621-.621V297.2a.618.618,0,0,1,.621-.621.608.608,0,0,1,.437.184.608.608,0,0,1,.184.437v1.862h1.242a.618.618,0,0,1,.621.621.6.6,0,0,1-.184.425Zm-8.966-5.047a4.143,4.143,0,0,0,4.161,0,4.166,4.166,0,0,0,2.081-3.61,4.161,4.161,0,0,0-4.162-4.161,4.16,4.16,0,0,0-4.161,4.161A4.179,4.179,0,0,0-1590.249,295.058Zm1.724,4.61a4.872,4.872,0,0,1,.391-1.931,5.639,5.639,0,0,1,.54-.966,4.67,4.67,0,0,1-.575.035,5.145,5.145,0,0,1-2.081-.425,5.006,5.006,0,0,1-.943-.517,1.2,1.2,0,0,0-1.345-.011,7.8,7.8,0,0,0-3.414,6.265v.069a.6.6,0,0,0,.6.575h7.92a5.215,5.215,0,0,1-.7-1.161,5.035,5.035,0,0,1-.391-1.931Z" transform="translate(1599.528 -284.903)" fill="#7bf8f4" opacity="0.996"/>
+  <g id="路径_190" data-name="路径 190" fill="none">
+    <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
+    <path d="M 11.5 1.000003814697266 C 5.71027946472168 1.000003814697266 1 5.710294723510742 1 11.50003433227539 C 1 15.44052124023438 6.295677185058594 22.62869262695312 11.47670078277588 28.30246353149414 C 12.68496322631836 26.95182609558105 15.33070659637451 23.97891044616699 17.65538024902344 20.72865295410156 C 19.63738059997559 17.95753479003906 22 14.10700416564941 22 11.50003433227539 C 22 5.710294723510742 17.28972053527832 1.000003814697266 11.5 1.000003814697266 M 11.5 3.814697265625e-06 C 17.85128021240234 3.814697265625e-06 23 5.148744583129883 23 11.50003433227539 C 23 17.82767677307129 11.48916530609131 29.63790130615234 11.49940204620361 29.80170249938965 C 11.36462783813477 29.63816833496094 0 17.78736114501953 0 11.50003433227539 C 0 5.148744583129883 5.14872932434082 3.814697265625e-06 11.5 3.814697265625e-06 Z M 11.49940204620361 29.80170249938965 C 11.50076866149902 29.80335998535156 11.50098419189453 29.80382347106934 11.5 29.80304336547852 C 11.49963855743408 29.80275726318359 11.49944019317627 29.80231475830078 11.49940204620361 29.80170249938965 Z" stroke="none" fill="#7bf8f4"/>
+  </g>
+  <path id="多边形_37" data-name="多边形 37" d="M4.471,0,8.941,5.961H0Z" transform="translate(16.094 29.803) rotate(180)" fill="#7bf8f4"/>
+</svg>

gassafety-web/src/utils/gaodeMap.js

@@ -468,7 +468,7 @@ class gaodeMap {
       case DEVICE_TYPE.REGEULATORBOX: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/tiaoyaxiang.png")
+          image: require("../assets/images/tiaoyaxiang.svg")
         });
         marker.setIcon(icon);
         break;
@@ -476,7 +476,7 @@ class gaodeMap {
       case DEVICE_TYPE.VALUEWELL: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/famenjing.png")
+          image: require("../assets/images/famenjing.svg")
         });
         marker.setIcon(icon);
         break;
@@ -484,7 +484,7 @@ class gaodeMap {
       case DEVICE_TYPE.FLOWMETER: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/liuliangji.png")
+          image: require("../assets/images/liuliangji.svg")
         });
         marker.setIcon(icon);
         break;
@@ -492,7 +492,7 @@ class gaodeMap {
       case DEVICE_TYPE.DUTYPERSON: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/zhibanrenyuan.png")
+          image: require("../assets/images/zhibanrenyuan.svg")
         });
         marker.setIcon(icon);
         break;
@@ -500,7 +500,7 @@ class gaodeMap {
       case DEVICE_TYPE.WORKORDER: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/zhibanrenyuan.png")
+          image: require("../assets/images/zhibanrenyuan.svg")
         });
         marker.setIcon(icon);
         break;
@@ -508,7 +508,7 @@ class gaodeMap {
       case DEVICE_TYPE.PRESSUREGAGE: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/yalibiao.png")
+          image: require("../assets/images/yalibiao.svg")
         });
         marker.setIcon(icon);
         break;
@@ -516,7 +516,7 @@ class gaodeMap {
       case DEVICE_TYPE.INSPECTOR: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/zhibanrenyuan.png")
+          image: require("../assets/images/zhibanrenyuan.svg")
         });
         marker.setIcon(icon);
         break;

gassafety-web/src/utils/gaodeMapView.js

@@ -605,12 +605,11 @@ class gaodeMap {
    * @param marker
    */
   setMarkerIcon(marker) {
-    console.log(this.markerType);
     switch (this.markerType) {
       case DEVICE_TYPE.REGEULATORBOX: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/tiaoyaxiang.png")
+          image: require("../assets/images/tiaoyaxiang.svg")
         });
         marker.setIcon(icon);
         break;
@@ -618,7 +617,7 @@ class gaodeMap {
       case DEVICE_TYPE.VALUEWELL: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/famenjing.png")
+          image: require("../assets/images/famenjing.svg")
         });
         marker.setIcon(icon);
         break;
@@ -626,7 +625,7 @@ class gaodeMap {
       case DEVICE_TYPE.FLOWMETER: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/liuliangji.png")
+          image: require("../assets/images/liuliangji.svg")
         });
         marker.setIcon(icon);
         break;
@@ -634,7 +633,7 @@ class gaodeMap {
       case DEVICE_TYPE.DUTYPERSON: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/zhibanrenyuan.png")
+          image: require("../assets/images/zhibanrenyuan.svg")
         });
         marker.setIcon(icon);
         break;
@@ -642,7 +641,7 @@ class gaodeMap {
       case DEVICE_TYPE.WORKORDER: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/zhibanrenyuan.png")
+          image: require("../assets/images/zhibanrenyuan.svg")
         });
         marker.setIcon(icon);
         break;
@@ -650,7 +649,7 @@ class gaodeMap {
       case DEVICE_TYPE.PRESSUREGAGE: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/yalibiao.png")
+          image: require("../assets/images/yalibiao.svg")
         });
         marker.setIcon(icon);
         break;
@@ -666,7 +665,7 @@ class gaodeMap {
       case DEVICE_TYPE.SMALLINSPECTOR: {
         let icon = new AMap.Icon({
           opacity: 0.1,
-          image: require("../assets/images/zhibanrenyuan.png")
+          image: require("../assets/images/zhibanrenyuan.svg")
         });
         marker.workerPoint = true;
         marker.setIcon(icon);

gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue

@@ -258,13 +258,12 @@
   import { map, DEVICE_TYPE } from "utils/gaodeMap.js";
   import { inspectorList } from "@/api/system/user";
   import echarts from 'echarts';
-  import workOrder from "../../workOrder/detail/index.vue"
 
 export default {
   props:["resourceId"],
   name: "DeviceAlarm",
   components: {
-    workOrder
+    workOrder: ()=> import('../../workOrder/detail/index.vue')
   },
   data() {
     return {

gassafety-web/src/views/deviceInspection/inspectiondetail/index.vue

@@ -232,13 +232,12 @@
   import { inspectorList } from "@/api/system/user";
   import { deviceTree } from "@/api/device/deviceInfo";
   import { deviceNodeTree } from "@/api/device/deviceInfo";
-  import workOrder from "../../workOrder/detail/index.vue"
 
   export default {
     props: ["resourceId"],
     name: "InspectionPlanDetail",
     components: {
-      workOrder
+      workOrder: ()=> import('../../workOrder/detail/index.vue')
     },
     data() {
       return {

gassafety-web/src/views/enterprise/mapView/index.vue

@@ -406,9 +406,18 @@ export default {
           maxPage: 99,
           list: [],
         },
+        {
+          type: "7",
+          value: 10,
+          icon: "icon-zhibanrenyuan",
+          label: "摄像头",
+          nowPage: 1,
+          maxPage: 99,
+          list: [],
+        },
       ],
       // 这是图上所有的点
-      allList: [[], [], [], [], [], [], []],
+      allList: [[], [], [], [], [], [], [],[]],
       keyWord: "",
       // 右下角的数据data
       rightBototmData: [],

gassafety-web/src/views/riskManagement/hiddenTroubleDetail/index.vue

@@ -71,7 +71,7 @@
           <el-col :span="12" >
             <el-form ref="form" v-model="form" :rules="rules" label-width="100px" >
               <el-form-item label="照片:" prop="pictureUrl">
-                <el-image :src="form.pictureUrl" :preview-src-list="[form.pictureUrl]" style="width: 300px;height: 300px;"></el-image>
+                <el-image :src="form.pictureUrl" :preview-src-list="[form.pictureUrl]" :z-index="9999" style="width: 300px;height: 300px;"></el-image>
               </el-form-item>
             </el-form>
           </el-col>
@@ -373,7 +373,7 @@ import { inspectorList, allListUser } from "@/api/system/user";
 import { deviceNodeTree } from "@/api/device/deviceInfo";
 import MyFileUpload from '@/components/MyFileUpload';
 import Mapdialog from "@/components/mapDialog/checkDeviceLoaction.vue";
-import workOrder from "../../workOrder/detail/index.vue"
+// import workOrder from "../../workOrder/detail/index.vue"
 
 export default {
     props:["resourceId"],
@@ -381,7 +381,8 @@ export default {
     components: {
       MyFileUpload,
       Mapdialog,
-      workOrder
+      // workOrder
+      workOrder: () => import('../../workOrder/detail/index.vue')
     },
     data() {
       return {

gassafety-web/src/views/workOrder/detail/index.vue

@@ -329,17 +329,14 @@
   import gaodeMap from "utils/gaodeMap.js";
   import { map, DEVICE_TYPE } from "utils/gaodeMap.js";
   import { inspectorList } from "@/api/system/user";
-  import inspection from "../../deviceInspection/inspectiondetail/index.vue";
-  import hiddenTrouble from "../../riskManagement/hiddenTroubleDetail/index.vue";
-  import alarm from "../../dataMonitoring/alarmdetail/index.vue";
 
   export default {
     props: ["linkOrderId"],
     name: "BasicsInfo",
     components: {
-      inspection,
-      hiddenTrouble,
-      alarm
+      inspection: () => import('../../deviceInspection/inspectiondetail/index.vue'),
+      alarm: () => import('../../dataMonitoring/alarmdetail/index.vue'),
+      hiddenTrouble: () => import('../../riskManagement/hiddenTroubleDetail/index.vue')
     },
     data() {
       return {