Merge remote-tracking branch 'origin/master'

gassafety-admin/src/main/java/com/zehong/web/controller/dataMonitoring/TDeviceAlarmController.java

@@ -40,7 +40,7 @@ public class TDeviceAlarmController extends BaseController
     /**
      * 查询报警信息列表
      */
-    @PreAuthorize("@ss.hasPermi('dataMonitoring:deviceAlarm:list')")
+    //@PreAuthorize("@ss.hasPermi('dataMonitoring:deviceAlarm:list')")
     @GetMapping("/list")
     public TableDataInfo list(DeviceAlarmForm deviceAlarmForm) throws Exception
     {

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

@@ -141,7 +141,7 @@ public class TDeviceInfoController extends BaseController
     /**
      * 统计各设备类型的设备总数
      */
-    @PreAuthorize("@ss.hasPermi('device:deviceInfo:countDeviceByType')")
+    //@PreAuthorize("@ss.hasPermi('device:deviceInfo:countDeviceByType')")
     @GetMapping("/countDeviceByType")
     public AjaxResult countDeviceByType()
     {

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

@@ -112,7 +112,7 @@ public class TPipeController extends BaseController
     /**
      * 统计管道总长度
      */
-    @PreAuthorize("@ss.hasPermi('device:pipe:countPipeLength')")
+    //@PreAuthorize("@ss.hasPermi('device:pipe:countPipeLength')")
     @GetMapping("/countPipeLength")
     public AjaxResult countPipeLength()
     {

gassafety-admin/src/main/java/com/zehong/web/controller/system/SysUserController.java

@@ -82,7 +82,7 @@ public class SysUserController extends BaseController
     /**
      * 获取巡检员列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:inspectorList')")
+    //@PreAuthorize("@ss.hasPermi('system:user:inspectorList')")
     @GetMapping("/inspectorList")
     public AjaxResult inspectorList()
     {

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

+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://36.148.23.59:3306/gas_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: root@123
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: zehong
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+    # redis 配置
+    redis:
+      # 地址
+      host: localhost
+      # 端口，默认为6379
+      port: 6379
+      # 数据库索引
+      database: 0
+      # 密码
+      password: 1qaz2wsx3edc
+      # 连接超时时间
+      timeout: 10s
+      lettuce:
+        pool:
+          # 连接池中的最小空闲连接
+          min-idle: 0
+          # 连接池中的最大空闲连接
+          max-idle: 8
+          # 连接池的最大数据库连接数
+          max-active: 8
+          # #连接池最大阻塞等待时间（使用负值表示没有限制）
+          max-wait: -1ms
+
+
+# 项目相关配置
+zehong:
+  # 名称
+  name: GasSafety
+  # 版本
+  version: 3.5.0
+  # 版权年份
+  copyrightYear: 2021
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例（ Windows配置D:/zehong/uploadPath，Linux配置 /data/zehong/uploadPath）
+  profile: /data/zehong/uploadPath
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数组计算 char 字符验证
+  captchaType: math

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

+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://36.148.23.59:3306/gas_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: root@123
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: zehong
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+    # redis 配置
+    redis:
+      # 地址
+      host: localhost
+      # 端口，默认为6379
+      port: 6379
+      # 数据库索引
+      database: 0
+      # 密码
+      password: 1qaz2wsx3edc
+      # 连接超时时间
+      timeout: 10s
+      lettuce:
+        pool:
+          # 连接池中的最小空闲连接
+          min-idle: 0
+          # 连接池中的最大空闲连接
+          max-idle: 8
+          # 连接池的最大数据库连接数
+          max-active: 8
+          # #连接池最大阻塞等待时间（使用负值表示没有限制）
+          max-wait: -1ms
+
+
+# 项目相关配置
+zehong:
+  # 名称
+  name: GasSafety
+  # 版本
+  version: 3.5.0
+  # 版权年份
+  copyrightYear: 2021
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例（ Windows配置D:/zehong/uploadPath，Linux配置 /data/zehong/uploadPath）
+  profile: /data/zehong/uploadPath
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数组计算 char 字符验证
+  captchaType: math
+

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

@@ -54,4 +54,46 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
\ No newline at end of file
+    # redis 配置
+    redis:
+      # 地址
+      host: localhost
+      # 端口，默认为6379
+      port: 6379
+      # 数据库索引
+      database: 0
+      # 密码
+      password:
+      # 连接超时时间
+      timeout: 10s
+      lettuce:
+        pool:
+          # 连接池中的最小空闲连接
+          min-idle: 0
+          # 连接池中的最大空闲连接
+          max-idle: 8
+          # 连接池的最大数据库连接数
+          max-active: 8
+          # #连接池最大阻塞等待时间（使用负值表示没有限制）
+          max-wait: -1ms
+
+
+# 项目相关配置
+zehong:
+  # 名称
+  name: GasSafety
+  # 版本
+  version: 3.5.0
+  # 版权年份
+  copyrightYear: 2021
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例（ Windows配置D:/zehong/uploadPath，Linux配置 /data/zehong/uploadPath）
+  profile: C:/Temp/zehong
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数组计算 char 字符验证
+  captchaType: math
+
+

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

-# 项目相关配置
-zehong:
-  # 名称
-  name: GasSafety
-  # 版本
-  version: 3.5.0
-  # 版权年份
-  copyrightYear: 2021
-  # 实例演示开关
-  demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/zehong/uploadPath，Linux配置 /data/zehong/uploadPath）
-  profile: /data/zehong/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-  # 验证码类型 math 数组计算 char 字符验证
-  captchaType: math
-
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
@@ -43,7 +26,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles: 
-    active: druid
+    active: test
   # 文件上传
   servlet:
      multipart:
@@ -56,28 +39,6 @@ spring:
     restart:
       # 热部署开关
       enabled: true
-  # redis 配置
-  redis:
-    # 地址
-    host: localhost
-    # 端口，默认为6379
-    port: 6379
-    # 数据库索引
-    database: 0
-    # 密码
-    password: 
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
 
 # token配置
 token:

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

@@ -41,8 +41,9 @@ public class TDeviceReportDataServiceImpl implements ITDeviceReportDataService
         DeviceReportDataVo deviceReportDataVo = new DeviceReportDataVo();
         TDeviceInfo tDeviceInfo = tDeviceInfoMapper.selectTDeviceInfoById(deviceId);
         TDeviceReportData tDeviceReportData = tDeviceReportDataMapper.selectTDeviceReportDataByDeviceNum(tDeviceInfo.getIotNo());
-
-        BeanUtils.copyProperties(tDeviceReportData, deviceReportDataVo);
+        if(null != tDeviceReportData){
+            BeanUtils.copyProperties(tDeviceReportData, deviceReportDataVo);
+        }
         deviceReportDataVo.setDeviceId(tDeviceInfo.getDeviceId());
         deviceReportDataVo.setDeviceCode(tDeviceInfo.getDeviceCode());
         deviceReportDataVo.setDeviceName(tDeviceInfo.getDeviceName());

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

@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="countPipeLength" resultType="double">
-        select sum(pipe_length) from t_pipe
+        select COALESCE(sum(pipe_length), 0) from t_pipe
         where is_del = '0'
     </select>
         

gassafety-web/public/index.html

@@ -8,7 +8,8 @@
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
-    <script src="https://webapi.amap.com/maps?v=2.0&key=eed7ca3167f765467aa377fa78e61ece&plugin=Map3D,AMap.DistrictSearch,AMap.Scale,AMap.OverView,AMap.ToolBar,AMap.MouseTool,AMap.ControlBar,AMap.CircleEditor,AMap.PolyEditor"></script>
+    <script src="https://webapi.amap.com/maps?v=2.0&key=49fcb156d466062435d7d33437099582&plugin=Map3D,AMap.DistrictSearch,AMap.Scale,AMap.OverView,AMap.ToolBar,AMap.MouseTool,AMap.ControlBar,AMap.CircleEditor,AMap.PolyEditor"></script>
+    <script src="./EasyWasmPlayer.js"></script>
     <style>
     html,
     body,

gassafety-web/src/assets/styles/element-ui.scss

@@ -78,19 +78,7 @@
   display: inline-flex !important;
 }
 
-// gis地图里抽屉的搜索样式
-.search-input {
-  .el-input__inner {
-    height: 28px;
-    min-height: 28px;
-    outline: #053b6a;
-    &:focus {
-      // outline: #053b6a;
-      border-color: #053b6a;
-    }
 
-  }
-}
 // to fix el-date-picker css style
 .el-range-separator {
   box-sizing: content-box;

gassafety-web/src/assets/styles/gassafety.scss

@@ -103,61 +103,95 @@
   }
 }
 
-
-
-
 // gis地图中底部table样式
 .right-bottom-data-left {
   .el-table {
+    background-color: rgba(0, 0, 0, 0) !important;
+
+    &::before {
+      height: 0px !important;
+    }
+    td {
+      border-bottom: none !important;
+    }
+
     .el-table__header-wrapper,
     .el-table__fixed-header-wrapper {
+      tr {
+        background-color: #213b5260 !important;
+      }
       th {
         word-break: break-word;
-        background-color: #fff;
-        color: #525252;
+        background-color: #213b5260 !important;
+        color: rgba(123, 248, 244, 1);
         height: 30px;
         font-size: 13px;
         padding: 0;
+        &.is-leaf {
+          border-bottom: none;
+        }
       }
     }
     .el-table__body-wrapper {
       .el-table__row:nth-child(2n + 1) {
-        background-color: #e6e6e6;
+        // background-color: #e6e6e6;
+        background-color: #213b5260;
         // &:hover {
         //   td {
         //     background-color: #f4f4f4;
         //   }
         // }
+        &:hover td {
+          background-color: #7bf8f430 !important;
+        }
         td {
           .cell {
-            color: #525252;
+            // color: #525252;
+            color: rgba(123, 248, 244, 1);
           }
         }
       }
       .el-table__row:nth-child(2n) {
-        background-color: #f4f4f4;
+        // background-color: #213b52;
+        background-color: #06315760;
+
         // &:hover {
         //   td {
         //     background-color: #e6e6e6;
         //   }
         // }
+        &:hover td {
+          background-color: #7bf8f430 !important;
+        }
         td {
           .cell {
-            color: #053b6a;
+            // color: #053b6a;
+            color: #fff;
           }
         }
       }
     }
     .el-table__body-wrapper {
       .el-button [class*="el-icon-"] + span {
-        margin-left: 1px;
+        // margin-left: 1px;
       }
     }
   }
 }
-
-
-
+// gis地图里抽屉的搜索样式
+.search-input {
+  .el-input__inner {
+    height: 28px;
+    min-height: 28px;
+    outline: #053b6a;
+    background: none !important;
+    color: #fff;
+    &:focus {
+      // outline: #053b6a;
+      border-color: #fff;
+    }
+  }
+}
 /** 表单布局 **/
 .form-header {
   font-size: 15px;
@@ -346,3 +380,10 @@
   }
   // background-color: ;
 }
+
+// gis地图内的bottom列表，如果隐藏在出现会有一个bug，这样可以解决
+.el-bottom {
+  .el-table__body-wrapper {
+    height: 140px !important;
+  }
+}

gassafety-web/src/assets/styles/gassafety1.scss

- /**
+/**
  * 通用css样式布局处理
  * Copyright (c) 2019 gassafety
  */
 
- /** 基础通用 **/
+/** 基础通用 **/
 .pt5 {
-	padding-top: 5px;
+  padding-top: 5px;
 }
 .pr5 {
-	padding-right: 5px;
+  padding-right: 5px;
 }
 .pb5 {
-	padding-bottom: 5px;
+  padding-bottom: 5px;
 }
 .mt5 {
-	margin-top: 5px;
+  margin-top: 5px;
 }
 .mr5 {
-	margin-right: 5px;
+  margin-right: 5px;
 }
 .mb5 {
-	margin-bottom: 5px;
+  margin-bottom: 5px;
 }
 .mb8 {
-	margin-bottom: 8px;
+  margin-bottom: 8px;
 }
 .ml5 {
-	margin-left: 5px;
+  margin-left: 5px;
 }
 .mt10 {
-	margin-top: 10px;
+  margin-top: 10px;
 }
 .mr10 {
-	margin-right: 10px;
+  margin-right: 10px;
 }
 .mb10 {
-	margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 .ml0 {
-	margin-left: 10px;
+  margin-left: 10px;
 }
 .mt20 {
-	margin-top: 20px;
+  margin-top: 20px;
 }
 .mr20 {
-	margin-right: 20px;
+  margin-right: 20px;
 }
 .mb20 {
-	margin-bottom: 20px;
+  margin-bottom: 20px;
 }
 .m20 {
-	margin-left: 20px;
+  margin-left: 20px;
 }
 
-.el-dialog:not(.is-fullscreen){
-	margin-top: 6vh !important;
+.el-dialog:not(.is-fullscreen) {
+  margin-top: 6vh !important;
 }
 
 .el-table {
-	.el-table__header-wrapper, .el-table__fixed-header-wrapper {
-		th {
-			word-break: break-word;
-			background-color: #f8f8f9;
-			color: #515a6e;
-			height: 40px;
-			font-size: 13px;
-		}
-	}
-	.el-table__body-wrapper {
-		.el-button [class*="el-icon-"] + span {
-			margin-left: 1px;
-		}
-	}
+  .el-table__header-wrapper,
+  .el-table__fixed-header-wrapper {
+    th {
+      word-break: break-word;
+      background-color: #f8f8f9;
+      color: #515a6e;
+      height: 40px;
+      font-size: 13px;
+    }
+  }
+  .el-table__body-wrapper {
+    .el-button [class*="el-icon-"] + span {
+      margin-left: 1px;
+    }
+  }
 }
 
 /** 表单布局 **/
 .form-header {
-    font-size:15px;
-	color:#6379bb;
-	border-bottom:1px solid #ddd;
-	margin:8px 10px 25px 10px;
-	padding-bottom:5px
+  font-size: 15px;
+  color: #6379bb;
+  border-bottom: 1px solid #ddd;
+  margin: 8px 10px 25px 10px;
+  padding-bottom: 5px;
 }
 
 /** 表格布局 **/
 .pagination-container {
-	position: relative;
-	height: 25px;
-	margin-bottom: 10px;
-	margin-top: 15px;
-	padding: 10px 20px !important;
+  position: relative;
+  height: 25px;
+  margin-bottom: 10px;
+  margin-top: 15px;
+  padding: 10px 20px !important;
 }
 
 /* tree border */
 .tree-border {
-    margin-top: 5px;
-    border: 1px solid #e5e6e7;
-    background: #FFFFFF none;
-    border-radius:4px;
+  margin-top: 5px;
+  border: 1px solid #e5e6e7;
+  background: #ffffff none;
+  border-radius: 4px;
 }
 
 .pagination-container .el-pagination {
-	right: 0;
-	position: absolute;
+  right: 0;
+  position: absolute;
 }
 
 .el-table .fixed-width .el-button--mini {
-	padding-left: 0;
-	padding-right: 0;
-	width: inherit;
+  padding-left: 0;
+  padding-right: 0;
+  width: inherit;
 }
 
 .el-tree-node__content > .el-checkbox {
-	margin-right: 8px;
+  margin-right: 8px;
 }
 
 .list-group-striped > .list-group-item {
-	border-left: 0;
-	border-right: 0;
-	border-radius: 0;
-	padding-left: 0;
-	padding-right: 0;
+  border-left: 0;
+  border-right: 0;
+  border-radius: 0;
+  padding-left: 0;
+  padding-right: 0;
 }
 
 .list-group {
-	padding-left: 0px;
-	list-style: none;
+  padding-left: 0px;
+  list-style: none;
 }
 
 .list-group-item {
-	border-bottom: 1px solid #e7eaec;
-	border-top: 1px solid #e7eaec;
-	margin-bottom: -1px;
-	padding: 11px 0px;
-	font-size: 13px;
+  border-bottom: 1px solid #e7eaec;
+  border-top: 1px solid #e7eaec;
+  margin-bottom: -1px;
+  padding: 11px 0px;
+  font-size: 13px;
 }
 
 .pull-right {
-	float: right !important;
+  float: right !important;
 }
 
 .el-card__header {
-	padding: 14px 15px 7px;
-	min-height: 40px;
+  padding: 14px 15px 7px;
+  min-height: 40px;
 }
 
 .el-card__body {
-	padding: 15px 20px 20px 20px;
+  padding: 15px 20px 20px 20px;
 }
 
 .card-box {
-	padding-right: 15px;
-	padding-left: 15px;
-	margin-bottom: 10px;
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-bottom: 10px;
 }
 
 /* button color */
 .el-button--cyan.is-active,
 .el-button--cyan:active {
-  background: #20B2AA;
-  border-color: #20B2AA;
-  color: #FFFFFF;
+  background: #20b2aa;
+  border-color: #20b2aa;
+  color: #ffffff;
 }
 
 .el-button--cyan:focus,
 .el-button--cyan:hover {
-  background: #48D1CC;
-  border-color: #48D1CC;
-  color: #FFFFFF;
+  background: #48d1cc;
+  border-color: #48d1cc;
+  color: #ffffff;
 }
 
 .el-button--cyan {
-  background-color: #20B2AA;
-  border-color: #20B2AA;
-  color: #FFFFFF;
+  background-color: #20b2aa;
+  border-color: #20b2aa;
+  color: #ffffff;
 }
 
 /* text color */
 .text-navy {
-	color: #1ab394;
+  color: #1ab394;
 }
 
 .text-primary {
-	color: inherit;
+  color: inherit;
 }
 
 .text-success {
-	color: #1c84c6;
+  color: #1c84c6;
 }
 
 .text-info {
-	color: #23c6c8;
+  color: #23c6c8;
 }
 
 .text-warning {
-	color: #f8ac59;
+  color: #f8ac59;
 }
 
 .text-danger {
-	color: #ed5565;
+  color: #ed5565;
 }
 
 .text-muted {
-	color: #888888;
+  color: #888888;
 }
 
 /* image */
 .img-circle {
-	border-radius: 50%;
+  border-radius: 50%;
 }
 
 .img-lg {
-	width: 120px;
-	height: 120px;
+  width: 120px;
+  height: 120px;
 }
 
 .avatar-upload-preview {
-	position: absolute;
-	top: 50%;
-	transform: translate(50%, -50%);
-	width: 200px;
-	height: 200px;
-	border-radius: 50%;
-	box-shadow: 0 0 4px #ccc;
-	overflow: hidden;
+  position: absolute;
+  top: 50%;
+  transform: translate(50%, -50%);
+  width: 200px;
+  height: 200px;
+  border-radius: 50%;
+  box-shadow: 0 0 4px #ccc;
+  overflow: hidden;
 }
 
 /* 拖拽列样式 */
-.sortable-ghost{
-	opacity: .8;
-	color: #fff!important;
-	background: #42b983!important;
+.sortable-ghost {
+  opacity: 0.8;
+  color: #fff !important;
+  background: #42b983 !important;
 }
 
 .top-right-btn {
-	position: relative;
-	float: right;
+  position: relative;
+  float: right;
 }
+

gassafety-web/src/components/FileUpload/index.vue

@@ -71,12 +71,13 @@
       // 文件类型, 例如['png', 'jpg', 'jpeg']
       fileType: {
         type: Array,
-        default: () => ["doc", "xls", "ppt", "txt", "pdf", "png", "jpg", "jpeg"],
+        // default: () => ["doc", "xls", "ppt", "txt", "pdf", "png", "jpg", "jpeg"],
+        default: () => ["png", "jpg", "jpeg", "gif"],
       },
       // 是否显示提示
       isShowTip: {
         type: Boolean,
-        default: false,
+        default: true,
       },
     },
     data() {

gassafety-web/src/components/MyFileUpload/index.vue

@@ -15,7 +15,7 @@
       :show-file-list="true"
       :headers="headers"
       class="upload-file-uploader"
-      :class="{ hide: addShow }"
+      :class="{ hide: fileArr.length>0 ||addShow }"
       ref="upload"
     >
       <!-- 上传按钮 -->
@@ -32,7 +32,7 @@
         </template>
         的文件
       </div>
-     
+
     </el-upload>
      <el-image v-show="false"
         id="img"
@@ -87,12 +87,13 @@ export default {
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "txt", "pdf", "png", "jpg", "jpeg"],
+      // default: () => ["doc", "xls", "ppt", "txt", "pdf", "png", "jpg", "jpeg"],
+      default: () => ["png", "jpg", "jpeg", "gif"],
     },
     // 是否显示提示
     isShowTip: {
       type: Boolean,
-      default: false,
+      default: true,
     },
   },
   data() {
@@ -232,6 +233,8 @@ export default {
     // this.fileList = this.list;
     this.addShow = this.fileArr.length > 0 ? true : false;
   },
+
+
 };
 </script>
 

gassafety-web/src/components/PopWindow/flowMeter.vue

@@ -7,7 +7,7 @@
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
-          <el-col :span="11">
+          <el-col :span="22">
             <el-form-item label="所属管道" prop="pipeId">
               <el-select
                 v-model="form.pipeId"
@@ -151,12 +151,11 @@ export default {
     return {
       form: {
         deviceType: "3",
+        iconUrl:"",
       },
       type: DEVICE_TYPE.FLOWMETER,
       dialogVisible: false,
       fileList: [],
-      // 表单校验
-      rules: {},
       map: null,
       obj: null,
       gaoMap: null,
@@ -255,7 +254,7 @@ export default {
                   this.gaoMap.view.pipeList();
                 });
                 //this.gaoMap.placeSearch.clear();
-                this.gaoMap.closeAddMarker();
+                //this.gaoMap.closeAddMarker();
                 this.msgSuccess("新增成功");
               } else {
                 // this.msgSuccess("新增失败");
@@ -270,6 +269,7 @@ export default {
     },
     listRemove(e) {
       this.form.url = "";
+      this.form.iconUrl="";
       this.fileArr = [];
     },
     getPipeInfos() {

gassafety-web/src/components/PopWindow/pipelineView.vue

@@ -3,6 +3,7 @@
     :title="myTitle"
     :visible.sync="dialogVisible"
     :before-close="handleClose"
+    ref="dialog"
   >
     <el-row>
       <el-form
@@ -146,7 +147,7 @@
       <el-button :loading="okLoading" type="primary" @click="ok"
         >确 定</el-button
       >
-      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button @click="handleCloseBtn">取 消</el-button>
     </span>
   </el-dialog>
 </template>
@@ -271,14 +272,19 @@ export default {
               if (res.code == 200) {
                 this.dialogVisible = false;
                 data.pipeId = data.pipeId ? data.pipeId : res.data;
-                this.lineOkCallBack.call(this.gaodeMap, this.target, data,()=>{
-                  const arr= this.gaodeMap.polyLines.map(item=>{
-                    return item.getExtData().lineData
-                  })
-                  console.log("arr===================",arr)
-                  this.gaodeMap.view.pipeClassify(arr)
-                  this.gaodeMap.view.pipeList();
-                });
+                this.lineOkCallBack.call(
+                  this.gaodeMap,
+                  this.target,
+                  data,
+                  () => {
+                    const arr = this.gaodeMap.polyLines.map((item) => {
+                      return item.getExtData().lineData;
+                    });
+                    console.log("arr===================", arr);
+                    this.gaodeMap.view.pipeClassify(arr);
+                    this.gaodeMap.view.pipeList();
+                  }
+                );
                 if (!this.editForm.pipeId) {
                   this.gaodeMap.newLineObj = null;
                   this.gaodeMap.createNewLine();
@@ -321,7 +327,9 @@ export default {
       options.lineData = { ...this.editForm };
       this.target.setExtData(options);
       // 把值带出去
-      done();
+      if (done) {
+        done();
+      }
 
       // this.$confirm("确认关闭？")
       //   .then((_) => {
@@ -329,6 +337,10 @@ export default {
       //   })
       //   .catch((_) => {});
     },
+    handleCloseBtn() {
+      this.handleClose();
+      this.dialogVisible = false;
+    },
     // 图片上传成功
     fileFinshed(e) {
       this.editForm.iconUrl = e.url;

gassafety-web/src/components/PopWindow/pressureGage.vue

@@ -7,7 +7,7 @@
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
-          <el-col :span="11">
+          <el-col :span="22">
             <el-form-item label="所属管道" prop="pipeId">
               <el-select
                 v-model="form.pipeId"
@@ -151,6 +151,8 @@ export default {
     return {
       form: {
         deviceType: "4",
+        iconUrl:"",
+
       },
       type: DEVICE_TYPE.PRESSUREGAGE,
       dialogVisible: false,
@@ -253,7 +255,7 @@ export default {
                   this.gaoMap.view.pipeList();
                 });
                 //this.gaoMap.placeSearch.clear();
-                this.gaoMap.closeAddMarker();
+                //this.gaoMap.closeAddMarker();
                 this.msgSuccess("新增成功");
               } else {
                 // this.msgSuccess("新增失败");
@@ -268,6 +270,7 @@ export default {
     },
     listRemove(e) {
       this.form.url = "";
+      this.form.iconUrl="";
       this.fileArr = [];
     },
     getPipeInfos() {

gassafety-web/src/components/PopWindow/regulatorBox.vue

@@ -7,7 +7,7 @@
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
-          <el-col :span="11">
+          <el-col :span="22">
             <el-form-item label="所属管道" prop="pipeId">
               <el-select
                 v-model="form.pipeId"
@@ -151,6 +151,8 @@ export default {
     return {
       form: {
         deviceType: "1",
+        iconUrl:"",
+
       },
       type: DEVICE_TYPE.REGEULATORBOX,
       dialogVisible: false,
@@ -253,7 +255,7 @@ export default {
                   this.gaoMap.view.pipeList();
                 });
                 //this.gaoMap.placeSearch.clear();
-                this.gaoMap.closeAddMarker();
+                //this.gaoMap.closeAddMarker();
                 this.msgSuccess("新增成功");
               } else {
                 // this.msgSuccess("新增失败");
@@ -265,6 +267,7 @@ export default {
     },
     listRemove(e) {
       this.form.url = "";
+      this.form.iconUrl="";
       this.fileArr = [];
     },
     handleClose(done) {

gassafety-web/src/components/PopWindow/valveWell.vue

@@ -7,7 +7,7 @@
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
-          <el-col :span="11">
+          <el-col :span="22">
             <el-form-item label="所属管道" prop="pipeId">
               <el-select
                 v-model="form.pipeId"
@@ -150,6 +150,7 @@ export default {
     return {
       form: {
         deviceType: "2",
+        iconUrl:"",
       },
       type: DEVICE_TYPE.VALUEWELL,
       dialogVisible: false,
@@ -251,7 +252,7 @@ export default {
                   this.gaoMap.view.pipeList();
                 });
                 //this.gaoMap.placeSearch.clear();
-                this.gaoMap.closeAddMarker();
+               // this.gaoMap.closeAddMarker();
                 this.msgSuccess("新增成功");
               } else {
                 // this.msgSuccess("新增失败");
@@ -266,6 +267,7 @@ export default {
     },
     listRemove(e) {
       this.form.url = "";
+      this.form.iconUrl="";
       this.fileArr = [];
     },
     getPipeInfos() {

gassafety-web/src/components/PopWindowGis/lineInfoWindow.vue

@@ -134,9 +134,10 @@ export default {
     deviceMore() {
       console.log(this.obj.polyline.getExtData().lineData);
       this.obj.polyline.getExtData().class.view.$router.push({
-        path: "/dataMonitoring/realtimedetail",
+        // path: "/dataMonitoring/realtimedetail",
+        path: "/device/pipeDetail",
         query: {
-          deviceId: this.obj.polyline.getExtData().lineData.pipeId,
+          pipeId: this.obj.polyline.getExtData().lineData.pipeId,
           //这里是传数字
           deviceType: "0",
         },

gassafety-web/src/components/PopWindowGis/markerInfoWindow.vue

@@ -87,10 +87,11 @@ export default {
     moment,
     deviceMore() {
       this.data.class.view.$router.push({
-        path: "/dataMonitoring/realtimedetail",
+        // path: "/dataMonitoring/realtimedetail",
+        path: "/device/deviceInfoDetail",
         query: {
           deviceId: this.data.deviceId,
-          deviceType: this.data.deviceType,
+          // deviceType: this.data.deviceType,
         },
       });
     },

gassafety-web/src/components/TopNav/index.vue

@@ -7,7 +7,6 @@
     <template v-for="(item, index) in topMenus">
       <!-- <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber" -->
       <el-menu-item
-        :style=""
         :index="item.path"
         :key="index"
         v-if="index < visibleNumber"
@@ -22,7 +21,7 @@
     <!-- 顶部菜单超出数量折叠 -->
     <!-- <div> -->
     <el-submenu
-      class="onlyNavTio"
+      class="onlyNavTio moreLise"
       index="more"
       v-if="topMenus.length > visibleNumber"
     >
@@ -308,4 +307,20 @@ export default {
   color: rgb(5 59 106) !important;
   font-weight: 900 !important;
 }
+.moreLise {
+  // background-image: url("../../assets/logo/item-background.png") !important;
+  // background-size: 100% 123% !important;
+  &.is-active {
+    // background-image: url("../../assets/logo/item-background.png") !important;
+    background-size: 100% 123% !important;
+  }
+  .el-submenu__title {
+    background-image: none !important;
+  }
+  &:hover {
+    background-image: url("../../assets/logo/item-background.png");
+    background-size: 100% 123%;
+  }
+  // height: 100px;
+}
 </style>

gassafety-web/src/components/mapDialog/checkPipeLineLocation.vue

@@ -16,6 +16,7 @@
       <el-button size="small" @click="$emit('dialogcancelFun')">取消</el-button>
     </el-row>
 
+
   </el-dialog>
 </template>
 <script>

gassafety-web/src/store/modules/permission.js

@@ -31,11 +31,11 @@ const permission = {
       const index = [
         {
           path: "",
-          meta: { title: "Gis地图", icon: "dashboard" },
+          meta: { title: "GIS地图", icon: "dashboard" },
           children: [
             {
               path: "enterprise/mapView",
-              meta: { title: "Gis地图", icon: "dashboard" }
+              meta: { title: "GIS地图", icon: "dashboard" }
             }
           ]
         }

gassafety-web/src/utils/gaodeMap.js

@@ -41,7 +41,7 @@ class gaodeMap {
   leftListClick = false;
 
   //构造函数中设置中央点默认值
-  constructor(center) {
+  constructor(center, latlng) {
     this.markers = [];
     this.center = center ? center : defaultCenter;
     map = new AMap.Map("container", {
@@ -53,8 +53,8 @@ class gaodeMap {
       showLabel: true,
       // labelzIndex: 110,
       pitch: 8,
-      zoom: 9
-      //mapStyle: 'amap://styles/darkblue',
+      zoom: 9,
+      // mapStyle: 'amap://styles/darkblue',
       // mapStyle: 'amap://styles/3b679a15f448a4740ba2ff7524e1a4ae',
     });
     this.myMap = map;
@@ -77,7 +77,7 @@ class gaodeMap {
             this.createNewLine();
             console.log("map点击事件新建");
           })
-          .catch(() => {});
+          .catch(() => { });
       }
       // console.log("抬起来了");
     });
@@ -116,9 +116,10 @@ class gaodeMap {
       let options = this.myMap.getStatus();
       options.scrollWheel = true;
       this.myMap.setStatus(options);
+      console.log("飞行结束")
     });
 
-    this.districtBoundaries();
+    this.districtBoundaries(latlng);
   }
   panTo(lnglat) {
     this.myMap.panTo(lnglat);
@@ -148,7 +149,7 @@ class gaodeMap {
    * 设置城市边界
    */
 
-  districtBoundaries() {
+  districtBoundaries(latlng) {
     let that = this;
     let opts = {
       subdistrict: 0,
@@ -156,12 +157,20 @@ class gaodeMap {
       level: "city"
     };
     let district = new AMap.DistrictSearch(opts);
-    district.search(that.center, function(status, result) {
+    district.search(that.center, function (status, result) {
       if (status == "complete") {
+
         let defaultCenter = [];
         defaultCenter.push(result.districtList[0].center.lng);
         defaultCenter.push(result.districtList[0].center.lat);
-        map.setCenter(defaultCenter);
+        if (latlng) {
+          map.setCenter(latlng);
+        } else {
+          map.setCenter(defaultCenter);
+        }
+
+        console.log("defaultCenter", defaultCenter)
+
         let bounds = result.districtList[0].boundaries;
         for (let i = 0; i < bounds.length; i += 1) {
           new AMap.Polyline({
@@ -190,12 +199,12 @@ class gaodeMap {
       offset: new AMap.Pixel(24, -38),
       anchor: "left-top"
     });
-    infoWindow.on("mouseover", function() {
+    infoWindow.on("mouseover", function () {
       let options = map.getStatus();
       options.scrollWheel = false;
       map.setStatus(options);
     });
-    infoWindow.on("mouseout", function() {
+    infoWindow.on("mouseout", function () {
       let options = map.getStatus();
       options.scrollWheel = true;
       map.setStatus(options);
@@ -225,7 +234,7 @@ class gaodeMap {
       editWindow.obj = marker;
       editWindow.gaoMap = that;
       editWindow.map = map;
-      marker.on("click", function(e) {
+      marker.on("click", function (e) {
         if ("edit" == that.mapOperateType) {
           editWindow.form = e.target.getExtData();
           editWindow.show();
@@ -239,10 +248,10 @@ class gaodeMap {
           vue
             .$confirm(
               '是否删除名称为"' +
-                e.target.getExtData().deviceName +
-                '"的' +
-                diviceType[markerType] +
-                " ?",
+              e.target.getExtData().deviceName +
+              '"的' +
+              diviceType[markerType] +
+              " ?",
               "提示",
               {
                 type: "warning"
@@ -287,19 +296,19 @@ class gaodeMap {
           infoWindow.open(map, e.target.getPosition());
         }*/
       });
-      marker.on("dragend", function(e) {
+      marker.on("dragend", function (e) {
         editWindow.form.longitude = e.lnglat.lng;
         editWindow.form.latitude = e.lnglat.lat;
       });
     } else {
-      marker.on("mouseover", function() {
+      marker.on("mouseover", function () {
         marker.setLabel({
           offset: new AMap.Pixel(0, -10), //设置文本标注偏移量
           content: "<div class='info'>" + data.deviceName + "</div>", //设置文本标注内容
           direction: "top" //设置文本标注方位
         });
       });
-      marker.on("mouseout", function() {
+      marker.on("mouseout", function () {
         marker.setLabel({
           content: null
         });
@@ -943,14 +952,14 @@ class gaodeMap {
     this.overlays = [];
     let that = this;
     this.markerOverlays = [];
-    this.mouseTool.on("draw", function(e) {
+    this.mouseTool.on("draw", function (e) {
       if (e.obj.getExtData().type != "newLine") {
         map.remove(that.markerOverlays);
         const device = that.createInfowindow("新增");
         device.map = map;
         device.obj = e.obj;
         device.gaoMap = that;
-        e.obj.on("click", function(aa) {
+        e.obj.on("click", function (aa) {
           let postion = aa.target._position;
           //兼容拖拽后单击事件，拖拽后点击事件返回位置为数组
           if (postion instanceof Array) {
@@ -962,11 +971,11 @@ class gaodeMap {
           }
           device.show();
         });
-        e.obj.on("mouseover", function() {
+        e.obj.on("mouseover", function () {
           that.mouseTool.close();
         });
 
-        e.obj.on("mouseout", function() {
+        e.obj.on("mouseout", function () {
           that.draw(that.deviceType);
         });
 
@@ -1077,7 +1086,7 @@ class gaodeMap {
         "AMap.MapType",
         "AMap.Geolocation"
       ],
-      function() {
+      function () {
         // 在图面添加工具条控件，工具条控件集成了缩放、平移、定位等功能按钮在内的组合控件
         //map.addControl(new AMap.ToolBar());
 
@@ -1100,7 +1109,7 @@ class gaodeMap {
 
   searchTips(inputId) {
     let that = this;
-    AMap.plugin(["AMap.AutoComplete", "AMap.PlaceSearch"], function() {
+    AMap.plugin(["AMap.AutoComplete", "AMap.PlaceSearch"], function () {
       //输入提示
       // var autoOptions = {
       //   input: inputId
@@ -1141,7 +1150,7 @@ class gaodeMap {
     });
     let infoWindow = new AMap.InfoWindow({
       isCustom: true,
-      content: `<span style='border:1px solid #80d8ff;background:#fff'>${pipeName}</span>`,
+      content: `<div style='max-width:150px;border:1px solid #80d8ff;background:#fff'>${pipeName}</div>`,
       anchor: "left-top",
       offset: new AMap.Pixel(20, -20)
     });
@@ -1158,9 +1167,11 @@ class gaodeMap {
       infoWindow.close();
     });
     map.add(polyline);
-    const path = eval(coordinates)[0];
+    const path1 = eval(coordinates)[0];
+    const path2 = eval(coordinates)[1];
     // map.setFitView();
-    map.setCenter([+path[0], +path[1]], false);
+    const path3 = [(Number(path1[0])+Number(path2[0]) )/2 ,(Number(path1[1])+Number(path2[1]) )/2];
+    map.setCenter(path3, false);
 
     // const lntlat = eval(coordinates)[0];
     // map.panTo(lntlat)

gassafety-web/src/utils/gaodeMapView.js

@@ -69,9 +69,9 @@ class gaodeMap {
       showLabel: true,
       // labelzIndex: 110,
       pitch: 8,
-      zoom: 9
+      zoom: 9,
       //mapStyle: 'amap://styles/darkblue',
-      // mapStyle: 'amap://styles/3b679a15f448a4740ba2ff7524e1a4ae',
+      mapStyle: 'amap://styles/1c84d2203793b0f622df2cda53db1afd',
     });
     this.myMap = map;
     this.myMap.on("mousedown", e => {
@@ -117,7 +117,7 @@ class gaodeMap {
       if (this.handleInfoWindowOpenFunc) {
         this.handleInfoWindowOpenFunc();
         this.handleInfoWindowOpenFunc = null;
-        this.leftListClick=false;
+        this.leftListClick = false;
       }
 
       // 刚进入页面的时候只调用一次，让左侧的抽屉在地图移动完之后显示
@@ -216,6 +216,8 @@ class gaodeMap {
       options.scrollWheel = true;
       map.setStatus(options);
     });
+    // this.infoWindowMove(infoWindow);
+
     let marker = new AMap.Marker({
       position: [data.longitude, data.latitude],
       map: map,
@@ -953,7 +955,7 @@ class gaodeMap {
   boxCollision(infowindowDom) {
     // gis地图页面的bottomdata组件
     const {
-      RightBototmData: { $el: pageDom }
+      Bottom: { $el: pageDom }
     } = this.view.$refs;
     let {
       offsetTop: ay,
@@ -1011,6 +1013,29 @@ class gaodeMap {
     this.markerPassedPolylineInfoWindow &&
       this.markerPassedPolylineInfoWindow.close();
   }
+  // infoWindow的拖拽
+  infoWindowMove(infoWindow) {
+    let disX, disY, dom;
+    infoWindow.on("mousedown", e => {
+      dom = e.target.dom;
+      disX = e.originEvent.clientX - dom.offsetLeft;
+      disY = e.originEvent.clientY - dom.offsetTop;
+      console.log(disX,disY);
+      window.addEventListener("mousemove", windowMove);
+    });
+    const windowMove = e => {
+      const mouseX = e.clientX;
+      const mouseY = e.clientY
+      const domTop = mouseY -disY;
+      const domLeft = mouseX- disX;
+      // console.log(domTop,domLeft)
+      dom.style.top = domTop + "px";
+      dom.style.left = domLeft + "px";
+    };
+    infoWindow.on("mouseup", () => {
+      window.removeEventListener("mousemove", windowMove);
+    });
+  }
   // 关闭转化到vue的dom
   removeCloneDom() {
     // 线

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

@@ -2,7 +2,7 @@
   <div class="app-container detail" style="background-color: rgb(238, 241, 245);">
     <div style="padding-top: 10px;background: #fff;height: 100%;">
       <el-row>
-        <el-col :span="24" style="padding-left: 15px;">
+        <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
           <div style="height: 45px;" @click="$router.go(-1)">
             <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
             </el-button>
@@ -11,8 +11,15 @@
         </el-col>
       </el-row>
 
-
-      <el-row style="padding-left: 50px;">
+      <el-row style="width: 100%;height: 40px;">
+        <el-col :span="24">
+          <div style="">
+            <ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">报警信息管理详情</li></ul>
+          </div>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+      <el-row style="padding-left: 50px;margin-top: -10px;margin-bottom: -10px;">
         <el-col :span="6">
           <el-form ref="form" v-model="form" style="width: 100%;">
             <el-form-item label="设备类型:" prop="deviceType">
@@ -64,7 +71,13 @@
         </el-col>
       </el-row>
       <el-divider></el-divider>
-
+      <el-row style="width: 100%;height: 45px;margin-top: -15px;">
+        <el-col :span="24" style="margin-bottom: -10px;">
+          <div style="color: #31EAEA;">
+            <ul><li>设备详情</li></ul>
+          </div>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="16" style="padding: 10px;">
           <div style="width: 100%;float: left;height: 100%;" v-if="form.deviceType != '管道'">
@@ -268,8 +281,8 @@ export default {
       this.getDetail();
     },
     mounted() {
-      let gaoMap = new gaodeMap("石家庄");
-      this.gaoMap = gaoMap;
+      // let gaoMap = new gaodeMap("石家庄");
+      // this.gaoMap = gaoMap;
     },
     methods: {
       initData(getData1, getData2, getData3) {
@@ -650,6 +663,13 @@ export default {
 
           if(this.form.pipeList != null){
             let pipe = this.form.pipeList[0];
+
+            const {coordinates} = this.form.pipeList[0];
+            const path1 = eval(coordinates)[0];
+            const path2 = eval(coordinates)[1];
+            const path3 = [(Number(path1[0]) + Number(path2[0])) / 2, (Number(path1[1]) + Number(path2[1])) / 2];
+            let gaoMap = new gaodeMap("石家庄",path3);
+            this.gaoMap=gaoMap;
             console.log("pipe", pipe);
             this.dataListdetail.push(pipe);
             this.gaoMap.onlyLine(pipe);
@@ -659,8 +679,11 @@ export default {
             let device = this.form.deviceList[0];
             console.log("device", device);
             this.dataListdetail.push(device);
-            this.gaoMap.resetMapCenter([device.longitude, device.latitude]);
+            let gaoMap = new gaodeMap("石家庄",[device.longitude, device.latitude]);
+            this.gaoMap = gaoMap;
             this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, device);
+
+            // this.gaoMap.resetMapCenter([device.longitude, device.latitude]);
           }
 
           var getData1 = [];

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

 <template>
   <div class="app-container">
+    <el-row v-if="$route.query.back">
+      <el-col :span="24" style="padding-left: 15px">
+        <div style="height: 45px" @click="$router.go(-1)">
+          <el-button
+            size="medium"
+            type="text"
+            style="font-size: 18px; color: rgb(7, 63, 112); float: left"
+            >返回
+          </el-button>
+          <div style="float: left; margin-top: 8px; margin-left: 5px">
+            <img
+              src="../../../assets/logo/fanhui.png"
+              style="width: 25px"
+              alt=""
+            />
+          </div>
+        </div>
+      </el-col>
+    </el-row>
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -71,30 +90,80 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="deviceAlarmList" @selection-change="handleSelectionChange" >
-      <el-table-column label="设备名称" align="center" prop="deviceName" width="280px"/>
-      <el-table-column label="设备编号" align="center" prop="deviceCode" width="240px"/>
-      <el-table-column label="设备类型" align="center" prop="deviceType"/>
+    <el-table
+      v-loading="loading"
+      :data="deviceAlarmList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        label="设备名称"
+        align="center"
+        prop="deviceName"
+        width="280px"
+      />
+      <el-table-column
+        label="设备编号"
+        align="center"
+        prop="deviceCode"
+        width="240px"
+      />
+      <el-table-column label="设备类型" align="center" prop="deviceType" />
       <el-table-column label="报警类型" align="center" prop="alarmType" />
-      <el-table-column label="报警值" align="center" prop="alarmValue" width="150px"/>
-      <el-table-column label="报警开始时间" align="center" prop="startTime" width="220px"/>
-      <el-table-column label="报警结束时间" align="center" prop="endTime" width="220px">
+      <el-table-column
+        label="报警值"
+        align="center"
+        prop="alarmValue"
+        width="150px"
+      />
+      <el-table-column
+        label="报警开始时间"
+        align="center"
+        prop="startTime"
+        width="220px"
+      />
+      <el-table-column
+        label="报警结束时间"
+        align="center"
+        prop="endTime"
+        width="220px"
+      >
         <template slot-scope="scope">
-          <span v-if="scope.row.endTime == null || scope.row.endTime == ''">-</span>
-          <span v-if="scope.row.endTime != null && scope.row.endTime != ''">{{scope.row.endTime}}</span>
+          <span v-if="scope.row.endTime == null || scope.row.endTime == ''"
+            >-</span
+          >
+          <span v-if="scope.row.endTime != null && scope.row.endTime != ''">{{
+            scope.row.endTime
+          }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="处理状态" align="center" prop="dealStatus" width="150px">
+      <el-table-column
+        label="处理状态"
+        align="center"
+        prop="dealStatus"
+        width="150px"
+      >
         <template slot-scope="scope">
-          <span v-if="scope.row.orderId == null || scope.row.orderId == ''">未生成工单</span>
-          <span v-if="(scope.row.dealStatus == null || scope.row.dealStatus == '') &&
-              scope.row.orderId != null && scope.row.orderId != ''">暂未处理</span>
+          <span v-if="scope.row.orderId == null || scope.row.orderId == ''"
+            >未生成工单</span
+          >
+          <span
+            v-if="
+              (scope.row.dealStatus == null || scope.row.dealStatus == '') &&
+              scope.row.orderId != null &&
+              scope.row.orderId != ''
+            "
+            >暂未处理</span
+          >
           <span v-if="scope.row.dealStatus == 1">不需处理</span>
           <span v-if="scope.row.dealStatus == 2">已处理完成</span>
           <span v-if="scope.row.dealStatus == 3">未处理完成</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="normal"
@@ -102,7 +171,8 @@
             icon="el-icon-edit"
             @click="handleIssue(scope.row)"
             v-hasPermi="['workOrder:basicsInfo:add']"
-            v-if="scope.row.orderId == '' || scope.row.orderId == null">
+            v-if="scope.row.orderId == '' || scope.row.orderId == null"
+          >
             生成工单
           </el-button>
           <el-button
@@ -110,7 +180,8 @@
             type="text"
             icon="el-icon-edit"
             @click="showDetail(scope.row)"
-            v-hasPermi="['dataMonitoring:deviceAlarm:query']">
+            v-hasPermi="['dataMonitoring:deviceAlarm:query']"
+          >
             详情
           </el-button>
         </template>
@@ -118,11 +189,12 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+      @pagination="getList"
+    />
 
     <!-- 添加工单信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
@@ -137,10 +209,22 @@
           <font>{{ form.alarmValue }}</font>
         </el-form-item>
         <el-form-item label="工单名称" prop="orderName">
-          <el-input v-model="form.orderName" placeholder="请输入工单名称" style="width: 590px" />
+          <el-input
+            v-model="form.orderName"
+            placeholder="请输入工单名称"
+            style="width: 590px"
+          />
         </el-form-item>
         <el-form-item label="指定执行人员" prop="appointInspector">
-          <el-select v-model="form.appointInspector" placeholder="请选择执行人员" clearable filterable size="small" @change="setUserId" style="width: 590px">
+          <el-select
+            v-model="form.appointInspector"
+            placeholder="请选择执行人员"
+            clearable
+            filterable
+            size="small"
+            @change="setUserId"
+            style="width: 590px"
+          >
             <el-option
               v-for="item in inspector"
               :key="item.userId"
@@ -150,7 +234,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="工单描述" prop="remarks">
-          <el-input type="textarea" v-model="form.remarks" placeholder="请输入工单描述" style="width: 590px" />
+          <el-input
+            type="textarea"
+            v-model="form.remarks"
+            placeholder="请输入工单描述"
+            style="width: 590px"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -162,9 +251,12 @@
 </template>
 
 <script>
-  import { listDeviceAlarm, getDeviceAlarm } from "@/api/dataMonitoring/deviceAlarm";
-  import { addBasicsInfo } from "@/api/workOrder/basicsInfo";
-  import { inspectorList } from "@/api/system/user";
+import {
+  listDeviceAlarm,
+  getDeviceAlarm,
+} from "@/api/dataMonitoring/deviceAlarm";
+import { addBasicsInfo } from "@/api/workOrder/basicsInfo";
+import { inspectorList } from "@/api/system/user";
 
 export default {
   name: "DeviceAlarm",
@@ -172,7 +264,7 @@ export default {
   data() {
     return {
       // 判断是从哪里来的，如果是地图里来的，则可以返回
-      fromGisMap:false,
+      fromGisMap: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -241,11 +333,11 @@ export default {
   beforeRouteEnter: (to, from, next) => {
     next((vm) => {
       // 如果是从地图里来的
-      if(from.path=="/enterprise/mapView"){
+      if (from.path == "/enterprise/mapView") {
         // console.log(123)
-        vm.fromGisMap=true;
-      }else{
-        vm.fromGisMap=false;
+        vm.fromGisMap = true;
+      } else {
+        vm.fromGisMap = false;
       }
     });
   },
@@ -302,9 +394,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.alarmId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.alarmId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 下发按钮操作 */
     handleIssue(row) {
@@ -334,12 +426,12 @@ export default {
     /** 详细信息跳转 */
     showDetail(row) {
       this.$router.push({
-        path: '/dataMonitoring/alarmdetail',
+        path: "/dataMonitoring/alarmdetail",
         query: {
           alarmId: row.alarmId,
-          deviceType:row.deviceType
-        }
-      }) //带参跳转
+          deviceType: row.deviceType,
+        },
+      }); //带参跳转
     },
   },
 };

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

@@ -3,7 +3,7 @@
     <div style="padding-top: 10px;background: #fff;height: 100%;">
 
       <el-row>
-        <el-col :span="24" style="padding-left: 15px;">
+        <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
           <div style="height: 45px;" @click="$router.go(-1)">
             <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
             </el-button>
@@ -11,7 +11,13 @@
           </div>
         </el-col>
       </el-row>
-
+      <el-row style="width: 100%;height: 40px;">
+        <el-col :span="24" style="margin-bottom: -10px;">
+          <div style="">
+            <ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">实时数据详情</li></ul>
+          </div>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="16" style="padding: 10px;">
           <div style="height: 100%;">
@@ -209,8 +215,8 @@
       // this.getData();
     },
     mounted() {
-      let gaoMap = new gaodeMap("石家庄");
-      this.gaoMap = gaoMap;
+      // let gaoMap = new gaodeMap("石家庄");
+      // this.gaoMap = gaoMap;
       this.getData();
     },
     methods: {
@@ -579,9 +585,11 @@
           this.dataListdetail3.push(obj3);
           this.form = response.data;
           this.active = parseInt(response.data.orderStatus) + 1;
-          this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);
+          let gaoMap = new gaodeMap("石家庄",[this.form.longitude, this.form.latitude]);
+          this.gaoMap = gaoMap;
           this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form)
-            console.log("this.form.longitude",this.form.longitude)
+          // this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);
+          console.log("this.form.longitude",this.form.longitude)
           console.log("this.form", this.form)
 
           // if (this.form.length > 0) {

gassafety-web/src/views/device/deviceInfo/index.vue

@@ -139,7 +139,7 @@
     />
 
     <!-- 添加或修改设备信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" append-to-body @close="cancel">
+    <el-dialog destroy-on-close :title="title" :visible.sync="open" append-to-body @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-col :span="11">
           <el-form-item label="所属管道" prop="pipeId">

gassafety-web/src/views/device/pipe/index.vue

@@ -144,7 +144,7 @@
     />
 
     <!-- 添加或修改管道信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" append-to-body @close="cancel">
+    <el-dialog destroy-on-close :title="title" :visible.sync="open" append-to-body @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-col :span="23">
           <el-form-item label="管道名称" prop="pipeName">

gassafety-web/src/views/enterprise/mapView/components/RightBototmData.vue → gassafety-web/src/views/enterprise/mapView/components/Bottom.vue

@@ -2,14 +2,14 @@
   <div class="wrapper">
     <div class="left">
       <div class="top">
-        <span>设备报警最新记录</span>
+        <span class="title">设备报警最新记录</span>
         <span @click="repeatClick" class="repeat">刷新</span>
 
         <transition name="fade">
           <span v-show="repeatFinshed" class="repeat2"> 数据刷新成功</span>
         </transition>
 
-        <span @click="moreClick" class="more">更多>></span>
+        <span @click="moreClick" class="more">更多</span>
       </div>
 
       <div class="bottom right-bottom-data-left">
@@ -22,28 +22,43 @@
         </div> -->
         <!-- <div class="one">设备编号:<span>1123123123</span></div>
         <div class="two">报警时间:<span>34523452345</span></div> -->
+
         <el-table
           size="mini"
           :data="tableData"
           style="width: 100%"
-          height="170"
+          :height="tableHeight"
+          class="el-bottom"
         >
-        
           <el-table-column prop="deviceCode" label="设备编号" width="100">
           </el-table-column>
-          <el-table-column prop="deviceName" label="设备名称" width="">
+          <el-table-column prop="deviceName" label="设备名称" width="150">
+          </el-table-column>
+          <el-table-column prop="alarmType" label="报警类型" width="">
           </el-table-column>
-          <el-table-column prop="alarmType" label="报警类型" width="80">
+          <el-table-column prop="createTime" label="报警开始时间" width="">
           </el-table-column>
-          <el-table-column prop="createTime" label="报警开始时间" width="170">
+          <el-table-column label="处理状态" align="center" prop="dealStatus">
+            <template slot-scope="scope">
+              <span v-if="scope.row.orderId == null || scope.row.orderId == ''"
+                >未生成工单</span
+              >
+              <span v-else-if="!scope.row.dealStatus && scope.row.orderId"
+                >暂未处理</span
+              >
+              <span v-else-if="scope.row.dealStatus == 1">不需处理</span>
+              <span v-else-if="scope.row.dealStatus == 2">已处理完成</span>
+              <span v-else-if="scope.row.dealStatus == 3">未处理完成</span>
+              <span v-else> - </span>
+            </template>
           </el-table-column>
           <el-table-column prop="alarmValue" label="报警内容" width="100">
           </el-table-column>
         </el-table>
       </div>
     </div>
-    
-    <div class="right">
+
+    <!-- <div class="right">
       <template v-for="(item, index) in list">
         <div
           class="right-content"
@@ -64,7 +79,7 @@
           </div>
         </div>
       </template>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -95,6 +110,7 @@ export default {
         4: "icon-ylbgs",
         99: "icon-gdcd",
       },
+      tableHeight: 170,
       tableData: [
         {
           deviceCode: "2016-05-03",
@@ -158,12 +174,12 @@ export default {
       return this.iconList[item.type];
     },
     moreClick() {
-      this.$router.push("/dataMonitoring/deviceAlarm");
+      this.$router.push("/dataMonitoring/deviceAlarm?back=1");
       // route.push(`dataMonitoring/deviceAlarm`)
     },
     repeatClick() {
       // this.tableData=[];
-      if(this.repeatFinshed) return;
+      if (this.repeatFinshed) return;
       this.getList(true);
     },
     getList(bool) {
@@ -176,14 +192,18 @@ export default {
               deviceName,
               alarmType,
               createTime,
+              dealStatus,
               alarmValue,
+              orderId,
             } = item;
             return {
               deviceCode,
               deviceName,
               alarmType,
               createTime,
+              dealStatus,
               alarmValue,
+              orderId,
             };
           });
           this.tableData = arr;
@@ -208,43 +228,62 @@ export default {
   position: fixed;
   right: 10px;
   bottom: 10px;
-  overflow: hidden;
   // background-color: #fff;
   display: flex;
   justify-content: space-between;
+
   & > div {
   }
   .left {
-    width: 680px;
+    width: 716px;
+    height: 198px;
     margin-right: 12px;
     box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.16);
     // background-color: #fff;
     // color: #fff;
     font-size: 14px;
     font-weight: 400;
+    background-image: url(../../../../assets/images/bottomBg.png);
+
+    .el-table__body-wrappe {
+      height: 140px !important;
+    }
     .top {
-      height: 32px;
-      background-color: #053b6a;
+      height: 19px;
+      // background-color: #053b6a;
       color: #fff;
-      line-height: 32px;
-      padding-left: 12px;
-      // position: relative;
+      // line-height: 32px;
+      // padding-left: 12px;
+      position: relative;
 
-      span {
-        display: inline-block;
+
+      .title{
+        position: absolute;
+        left:50%;
+        margin-left:-92px;
+        top:-5px;
       }
       .repeat {
-        margin-left: 20px;
+        position: absolute;
+        top:-5px;
+        right: 160px;
+        color: #fff;
         cursor: pointer;
         &:hover {
           color: #2788ea;
         }
+      
       }
       .repeat2 {
-        margin-left: 20px;
-        color:#67c23a;
+        position: absolute;
+        right: 206px;
+        color: #67c23a;
       }
       .more {
+        position: absolute;
+        right: 38px;
+        top: -5px;
+        color: #fff;
         float: right;
         margin-right: 20px;
         cursor: pointer;
@@ -254,15 +293,8 @@ export default {
       }
     }
     .bottom {
-      .table-top {
-        // background-color: red;
-        // display: flex;
-        // justify-content: space-between;
-        // div {
-        //   width: 100%;
-        //   text-align: center;
-        // }
-      }
+      width: 680px;
+      margin: 0 auto;
     }
   }
   .right {

gassafety-web/src/views/enterprise/mapView/components/Right.vue

+<template>
+  <div class="wrapper">
+    <!-- <img src="/static/img/rightWrapperBg.25536016.png" alt=""> -->
+    <div class="right">
+      <template v-for="(item, index) in list">
+        <div
+          class="right-content"
+          :class="{ three: index == 2 }"
+          :key="item.type"
+        >
+          <div class="text-icon">
+            <i
+              class="iconfont"
+              :class="[iconClass(item), { iconFontSize: item.type == 4 }]"
+            ></i>
+          </div>
+          <div class="text">
+            <div class="top">{{ typeName[item.type] }}</div>
+            <div class="bottom">
+              {{ item.number }}{{ item.type == 99 ? "M" : "个" }}
+            </div>
+          </div>
+        </div>
+      </template>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listDeviceAlarm } from "@/api/dataMonitoring/deviceAlarm";
+
+export default {
+  props: {
+    list: {
+      type: Array,
+    },
+  },
+  data() {
+    return {
+      timer: null,
+      repeatFinshed: false,
+      typeName: {
+        1: "调压箱",
+        2: "阀门井",
+        3: "流量计",
+        4: "压力表",
+        99: "管线长度",
+      },
+      iconList: {
+        1: "icon-tyxgs",
+        2: "icon-fmjgs",
+        3: "icon-lljgs",
+        4: "icon-ylbgs",
+        99: "icon-gdcd",
+      },
+    };
+  },
+  created() {},
+  methods: {
+    iconClass(item) {
+      return this.iconList[item.type];
+    },
+  },
+};
+</script>
+
+<style lang="scss"  scoped>
+.wrapper {
+  width: 300px;
+  height: 800px;
+  position: absolute;
+  top: 40px;
+  right: 0;
+  overflow-x: hidden;
+  // right: 10px;
+  // top: 131px;
+  // background-image: url(/static/img/rightWrapperBg.25536016.png);
+  // background-position-x: -72px;
+  // background-position-y: center;
+  // background-size: 193% 137%;
+  // background-repeat: no-repeat;
+  img {
+    // width: 300px;
+    // height: 800px;
+    // position: absolute;
+    // top:0;
+    // left:0;
+  }
+
+  & > div {
+  }
+  .right {
+    position: absolute;
+    right: 10px;
+    top: 51px;
+    & > .right-content {
+      // background-color: #fff;
+      width: 247px;
+      height: 104px;
+      margin-bottom: 29px;
+      box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.16);
+      background-image: url(../../../../assets/images/listBg.png);
+      margin-right: 10px;
+      display: flex;
+      &.three {
+        margin-right: 0px;
+      }
+      // align-items: center;
+      .text-icon {
+        line-height: 102px;
+        padding-left: 28px;
+        margin-right: 22px;
+        margin-left: 30px;
+        i {
+          color: #7bf8f4;
+          font-size: 60px;
+        }
+      }
+      .text {
+        font-size: 14px;
+        padding-top: 16px;
+        .top {
+          color: #fff;
+          margin-top: 7px;
+          margin-bottom: 10px;
+          font-weight: 600;
+        }
+        .bottom {
+          color: #7bf8f4;
+        }
+      }
+    }
+  }
+  // 单独调整下最后一个icon的大小
+  .iconFontSize {
+    font-size: 50px !important;
+  }
+  .fade-enter-to,
+  .fade-leave {
+    opacity: 1;
+  }
+  .fade-leave-active {
+    transition: opacity 0.5s;
+  }
+  .fade-enter-active {
+    transition: opacity 0s;
+  }
+  .fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
+    opacity: 0;
+  }
+}
+</style>
\ No newline at end of file

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

@@ -84,7 +84,7 @@
       </el-table-column>
       <el-table-column label="图片" align="center" prop="pictureUrl" style="text-align:center;">
         <template slot-scope="scope">
-          <img :src="scope.row.pictureUrl" style="width: 20%;vertical-align:middle" @click="showPicture(scope.row)"/>
+          <img :src="scope.row.pictureUrl" style="width: 20%;vertical-align:middle;cursor:pointer;" @click="showPicture(scope.row)"/>
           <el-image :ref="'a'+scope.row.troubleId" :src="scope.row.pictureUrl" v-show="false" :preview-src-list="[scope.row.pictureUrl]" v-if="scope.row.pictureUrl != '' && scope.row.pictureUrl != null"></el-image>
         </template>
       </el-table-column>
@@ -148,7 +148,7 @@
     />
 
     <!-- 添加或修改隐患信息对话框 -->
-    <el-dialog :title="title1" :visible.sync="open1" width="800px" append-to-body @close="cancel">
+    <el-dialog destroy-on-close :title="title1" :visible.sync="open1" width="800px" append-to-body @close="cancel">
       <el-form ref="form1" :model="form1" :rules="rules" label-width="120px">
         <el-col :span="23">
           <el-form-item label="隐患名称" prop="troubleName">
@@ -406,7 +406,7 @@ export default {
           { required: true, message: "请输入地址", trigger: "blur" }
         ],
         pictureUrl: [
-          { required: true, message: "请上传图片", trigger: "blur" }
+          { required: true, message: "请上传图片", trigger: ['blur', 'change']  }
         ],
         longitude: [
           { required: true, message: "请输入经纬度", trigger: "blur" }
@@ -449,11 +449,14 @@ export default {
       })
     },
     getFileInfo(res){
+      console.log ("res",res  )
       this.form1.pictureUrl = res.url;
+
     },
     listRemove(e) {
       this.form1.pictureUrl = "";
       this.fileList = [];
+      console.log("删除了")
     },
     confirmFun(res) {
       //确认选择经纬度
@@ -588,6 +591,7 @@ export default {
         }
         this.open1 = true;
         this.title1 = "修改隐患信息";
+        console.log("this.form1.pictureUrl",this.form1.pictureUrl)
         if (this.form1.pictureUrl) {
           this.fileList.push({
             url: this.form1.pictureUrl,

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

@@ -3,7 +3,7 @@
       <!-- 巡检计划信息 -->
       <div style="padding-top: 10px;background: #fff;height: 100%;">
         <el-row>
-          <el-col :span="24" style="padding-left: 15px;">
+          <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
             <div style="height: 45px;" @click="$router.go(-1)">
               <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
               </el-button>
@@ -11,9 +11,16 @@
             </div>
           </el-col>
         </el-row>
+        <el-row style="width: 100%;height: 40px;">
+          <el-col :span="24">
+            <div style="">
+              <ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">隐患管理详情</li></ul>
+            </div>
+          </el-col>
+        </el-row>
         <el-divider></el-divider>
 
-        <el-row style="width: 100%;">
+        <el-row style="width: 100%;margin-top: -15px;margin-bottom: -5px;">
           <el-col :span="24">
             <div style="color: #31EAEA;height: 25px;">
               <ul><li>详细信息</li></ul>
@@ -21,10 +28,10 @@
           </el-col>
         </el-row>
 
-        <el-row style="width: 100%;padding: 10px;padding-left: 40px;">
+        <el-row style="width: 100%;padding: 10px;margin-bottom: -20px;">
           <el-col :span="12">
             <el-col :span="12">
-              <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="width: 100%;margin-left: 25px;margin-bottom: 25px;">
+              <el-form ref="form" v-model="form" label-width="100px" style="width: 100%;margin-bottom: 25px;">
                 <el-form-item label="隐患名称:" prop="troubleName">
                   <font>{{form.troubleName}}</font>
                 </el-form-item>
@@ -37,15 +44,13 @@
                   <font v-if="form.troubleLevel == 2">Ⅱ级</font>
                   <font v-if="form.troubleLevel == 3">Ⅲ级</font>
                 </el-form-item>
-                <el-form-item label="隐患描述:" prop="remarks">
-                  <div style="height: 90px;width: 200%; border: 1px solid rgb(187, 183, 183);margin-top: 10px;overflow-y: auto;padding: 5px;border-radius: 5px;">
+                <el-form-item label="隐患描述:" prop="remarks" style="width: 170%;">
                     <font>{{form.remarks}}</font>
-                  </div>
                 </el-form-item>
               </el-form>
             </el-col>
             <el-col :span="12">
-              <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="width: 100%;">
+              <el-form ref="form" v-model="form" label-width="100px" style="width: 100%;">
                 <el-form-item label="上报人:" prop="reportManName">
                   <font>{{form.reportManName}}</font>
                 </el-form-item>
@@ -73,44 +78,46 @@
         </el-row>
 
         <!-- 接单信息 -->
-        <el-row v-if="form.orderId != null && form.orderId != ''">
+        <el-row v-if="form.orderId != null && form.orderId != ''" style="width: 100%;">
           <el-divider></el-divider>
-          <el-col :span="24">
+          <el-col :span="24" style="margin-top: -15px;margin-bottom: -10px;">
             <div style="color: #31EAEA;width: 100%;height: 40px;">
               <ul><li>接单信息</li></ul>
             </div>
           </el-col>
-          <el-col :span="5" style="margin-left: 50px;">
-            <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
-              <el-form-item label="下发人员:" prop="appointInspectorName">
-                <font>{{form.appointInspectorName}}</font>
-              </el-form-item>
-            </el-form>
-          </el-col>
-          <el-col :span="6">
-            <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
-              <el-form-item label="下发时间:" prop="allotTime">
-                <font>{{form.allotTime}}</font>
-              </el-form-item>
-            </el-form>
-          </el-col>
-          <el-col :span="6">
-            <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
-              <el-form-item label="工单编号:" prop="orderId">
-                <template slot-scope="scope">
-                  <el-button type="text" @click="showDetail(form.orderId)">{{form.orderId}}</el-button>
-                </template>
-              </el-form-item>
-            </el-form>
-          </el-col>
+          <el-row style="width: 100%;padding-left: 10px;margin-bottom: 10px;">
+            <el-col :span="5">
+              <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
+                <el-form-item label="下发人员:" prop="appointInspectorName">
+                  <font>{{form.appointInspectorName}}</font>
+                </el-form-item>
+              </el-form>
+            </el-col>
+            <el-col :span="6">
+              <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
+                <el-form-item label="下发时间:" prop="allotTime">
+                  <font>{{form.allotTime}}</font>
+                </el-form-item>
+              </el-form>
+            </el-col>
+            <el-col :span="6">
+              <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
+                <el-form-item label="工单编号:" prop="orderId">
+                  <template slot-scope="scope">
+                    <el-button type="text" @click="showDetail(form.orderId)">{{form.orderId}}</el-button>
+                  </template>
+                </el-form-item>
+              </el-form>
+            </el-col>
+          </el-row>
         </el-row>
-        <el-divider></el-divider>
         <!-- 处置信息 -->
-        <div style="width: 100%;font-weight: 600;" v-if="form.feedbackList != null">
+        <div style="width: 100%;font-weight: 600;margin-top: -15px;" v-if="form.feedbackList != null">
+          <el-divider></el-divider>
           <div style="color: #31EAEA;width: 100%;height: 40px;">
             <ul><li>处置信息</li></ul>
           </div>
-          <div class="block" style="width: 95%;margin-left: 2%;">
+          <div class="block" style="width: 95%;">
             <el-timeline ref="timeline">
               <el-timeline-item v-for="(activity, index) in form.feedbackList"  v-show='index>1?false:true' :key="index" :timestamp="activity.feedbackTime">
                 <el-card>
@@ -164,16 +171,16 @@
             </el-timeline>
           </div>
           <div style="width: 95%;position: relative;" @click="changeDisplay(scope)">
-            <i class="el-icon-arrow-down" v-if="isDisplay==false" style="margin-left: 100px;color: #909399;font-size: 14px;">
-              <span style="text-decoration:underline">显示全部</span>
+            <i class="el-icon-arrow-down" v-if="isDisplay==false" style="margin-left: 100px;color: #909399;font-size: 14px;margin-bottom: 15px;">
+              <span style="text-decoration:underline;">显示全部</span>
             </i>
-            <i class="el-icon-arrow-up" v-else style="color: #909399;font-size: 14px;margin-left: 100px;">
-              <span style="text-decoration:underline">收起</span>
+            <i class="el-icon-arrow-up" v-else style="color: #909399;font-size: 14px;margin-left: 100px;margin-bottom: 15px;">
+              <span style="text-decoration:underline;">收起</span>
             </i>
           </div>
         </div>
 
-        <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;" v-if="form.orderId == '' || form.orderId == null">
+        <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;margin-top: 20px;" v-if="form.orderId == '' || form.orderId == null">
           <el-button
             size="normal"
             type="primary"

gassafety-web/src/views/videoMonitoring/video/index.vue

+<template>
+  <div class="app-container">
+    <el-row :gutter="5" type="flex" justify="space-around">
+      <el-col :lg="4" :xl="4">
+        <div class="head-container">
+          <el-input
+            v-model="videoTree"
+            placeholder="请输入监控名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+                   :data="treeData"
+                   :props="treeProps"
+                   :expand-on-click-node="false"
+                   :filter-node-method="filterNode"
+                   ref="tree"
+                   default-expand-all
+                   @node-click="nodeClick"
+                   style="background-color: white; color: #606266"
+          >
+            <template slot-scope="{ node, data }" class="custom-tree-node">
+              <span>
+                <i class="iconfont" :class="[data.icon, 'tree-icon']" />
+                {{ node.label }}
+              </span>
+            </template>
+          </el-tree>
+        </div>
+      </el-col>
+
+      <el-col :lg="20" :xl="20">
+        <el-row class="row">
+          <div class="box" :class="[flag == 1 ? 'boxred' : 'boxblack']">
+            <div id="newplay1" style="width:100%; height:100%;" @click="chooseWindow(1)">
+              <span class="novideo">无信号</span>
+            </div>
+          </div>
+          <div class="box" :class="[flag == 2 ? 'boxred' : 'boxblack']">
+            <div id="newplay2" style="width:100%; height:100%;" @click="chooseWindow(2)">
+              <span class="novideo">无信号</span>
+            </div>
+          </div>
+        </el-row>
+
+        <el-row class="row">
+          <div class="box" :class="[flag == 3 ? 'boxred' : 'boxblack']">
+            <div id="newplay3" style="width:100%; height:100%;" @click="chooseWindow(3)">
+              <span class="novideo">无信号</span>
+            </div>
+          </div>
+          <div class="box" :class="[flag == 4 ? 'boxred' : 'boxblack']">
+            <div id="newplay4" style="width:100%; height:100%;" @click="chooseWindow(4)">
+              <span class="novideo">无信号</span>
+            </div>
+          </div>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<style lang="scss" scped>
+  .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+    background-color: white;
+  }
+  .el-tree--highlight-current .el-tree-node > .el-tree-node__content:hover {
+    background-color: white;
+    color: #454547;
+  }
+  main > div {
+    background: #ffffff;
+    height: calc(100vh - 110px) !important;
+    padding: 0px 0px 0px 10px !important;
+  }
+  .row{
+    display: flex;
+    .box{
+      width: 100%;
+      text-align: center;
+      background-color: black;
+    }
+  }
+  .boxred{
+    border: 1px solid red;
+  }
+  .boxblack{
+    border: 1px solid white;
+  }
+  .novideo{
+    /*padding: 147px 0px 147px 0px;
+    display: block;*/
+    line-height: calc((100vh - 130px)/2);
+    color: white;
+  }
+  .el-icon-video-camera{
+    background-repeat: no-repeat;
+    background-position: center;
+    background-image: url("../../../assets/images/video1.png");
+    background-size: 20px;
+  }
+  .el-icon-video-play{
+    background-repeat: no-repeat;
+    background-position: center;
+    background-image: url("../../../assets/images/video2.png");
+    background-size: 20px;
+  }
+</style>
+
+<script>
+  export default {
+    name: "Video",
+    components: {
+    },
+    data() {
+      return {
+        videoTree: undefined,
+        loading: false,
+        playerWindow: "newplay1",
+        flag: 1,
+        treeData: [
+          {
+            name: "企业视频监控",
+            level: 0,
+            icon: "el-icon-video-camera",
+            childList: []
+          }
+        ],
+        treeProps: {
+          children: "childList",
+          label: "name"
+        },
+        treecheckedObj: {},
+        ideoController: {},
+      }
+    },
+    watch: {
+      // 根据名称筛选视频监控
+      videoTree(val) {
+        console.log("val", val)
+        this.$refs.tree.filter(val);
+      }
+    },
+    methods: {
+      getTreeData() {
+        let that = this;
+        that.treeData[0].childList = [
+          {
+            name: "视频监控1",
+            icon: "el-icon-video-play",
+            deviceCode: "34020000001110000003_0200000004",
+          },{
+            name: "视频监控2",
+            icon: "el-icon-video-play",
+            deviceCode: "34020000001110000003_0200000005",
+          },{
+            name: "视频监控3",
+            icon: "el-icon-video-play",
+            deviceCode: "stream_36_0",
+          },{
+            name: "视频监控4",
+            icon: "el-icon-video-play",
+            deviceCode: "stream_37_0",
+          }
+        ];
+      },
+      // 筛选节点
+      filterNode(value, data) {
+        console.log(value, data)
+        if (!value) return true;
+        return data.name.indexOf(value) !== -1;
+      },
+      nodeClick(data, node, target) {
+        let that = this;
+        that.treecheckedObj = node.data;
+
+        if (node.level == "2") {
+          that.playerWindow = 'newplay' + that.flag;
+          var player = new WasmPlayer(null, that.playerWindow, null, {Height: true});
+          console.log(that.playerWindow, node.data.deviceCode)
+          player.play('http://27.128.189.137:18000/flv/hls/' + that.treecheckedObj.deviceCode + '.flv', 1);
+          if (that.flag < 4) {
+            that.flag++;
+          }
+        }
+      },
+      chooseWindow(data) {
+        this.flag = data;
+        this.playerWindow = 'newplay' + this.flag;
+      },
+    },
+    created() {
+      let that = this;
+      that.getTreeData();
+    }
+  }
+</script>

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

@@ -3,13 +3,20 @@
       <!-- 工单信息 -->
       <div style="padding-top: 10px;background: #fff;height: 100%;">
         <el-row>
-          <el-col :span="24" style="padding-left: 15px;">
+          <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
             <div style="height: 45px;" @click="$router.go(-1)">
               <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
               </el-button>
               <div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png" style="width: 25px;" alt=""></div>
             </div>
           </el-col>
+        </el-row>
+        <el-row style="width: 100%;height: 40px;">
+          <el-col :span="24">
+            <div style="">
+              <ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">工单反馈详情</li></ul>
+            </div>
+          </el-col>
         </el-row>
           <el-steps :active="active" finish-status="success" simple prop="orderStatus" style="margin-top: 5px">
               <el-step title="未接收" ></el-step>
@@ -20,14 +27,14 @@
           </el-steps>
 
           <el-divider></el-divider>
-          <el-row style="width: 100%;">
+          <el-row style="width: 100%;margin-top: -15px;">
             <el-col :span="24">
               <div style="color: #31EAEA;height: 25px;">
                 <ul><li>详细信息</li></ul>
               </div>
             </el-col>
           </el-row>
-          <el-row style="width: 100%;padding: 10px;padding-left: 40px;">
+          <el-row style="width: 100%;padding: 10px;padding-left: 40px;margin-bottom: -10px;">
             <el-col :span="6">
               <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="width: 100%;">
                 <el-form-item label="工单类型:" prop="orderType">
@@ -50,7 +57,7 @@
                 <el-form-item label="指定执行人员:" prop="appointInspectorName">
                   <font>{{form.appointInspectorName}}</font>
                 </el-form-item>
-                <el-form-item label="工单描述:" prop="remarks">
+                <el-form-item label="工单描述:" prop="remarks" style="width: 170%;">
                   <font>{{form.remarks}}</font>
                 </el-form-item>
             </el-form>
@@ -101,7 +108,7 @@
         <!-- 接单信息 -->
         <div v-if="form.actualTime != '' && form.actualTime != null">
           <el-divider></el-divider>
-          <el-row>
+          <el-row style="margin-top: -15px;">
             <el-col :span="24">
               <div style="color: #31EAEA;width: 100%;height: 40px;">
                 <ul><li>接单信息</li></ul>
@@ -125,13 +132,13 @@
             </el-col>
           </el-row>
         </div>
-        <el-divider></el-divider>
         <!-- 反馈信息 -->
         <div style="width: 100%;font-weight: 600;" v-if="form.feedbackList != null">
+          <el-divider></el-divider>
           <div style="color: #31EAEA;width: 100%;height: 40px;">
             <ul><li>反馈信息</li></ul>
           </div>
-              <div class="block" style="width: 95%;margin-left: 2%;">
+              <div class="block" style="width: 95%;">
                 <el-timeline ref="timeline">
                   <el-timeline-item v-for="(activity, index) in form.feedbackList"  v-show='index>1?false:true' :key="index" :timestamp="activity.feedbackTime">
                     <el-card>
@@ -167,13 +174,13 @@
                         <el-col :span="12">
                           <div class="feedbackTime-div">
                             <div class="feedbackTime">
-                              <el-image :src="activity.pictureUrl1" :preview-src-list="[activity.pictureUrl1]" v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 90px;"></el-image>
+                              <el-image :src="activity.pictureUrl1" :preview-src-list="[activity.pictureUrl1]" v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 100%;"></el-image>
                             </div>
                             <div class="feedbackTime">
-                              <el-image :src="activity.pictureUrl2" :preview-src-list="[activity.pictureUrl2]"  v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 90px;"></el-image>
+                              <el-image :src="activity.pictureUrl2" :preview-src-list="[activity.pictureUrl2]"  v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 100%;"></el-image>
                             </div>
                             <div class="feedbackTime">
-                              <el-image :src="activity.pictureUrl3" :preview-src-list="[activity.pictureUrl3]"  v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 90px;"></el-image>
+                              <el-image :src="activity.pictureUrl3" :preview-src-list="[activity.pictureUrl3]"  v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 100%;"></el-image>
                             </div>
                           </div>
                         </el-col>
@@ -194,11 +201,12 @@
 
         <!-- 归档 -->
 
-        <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;">
+        <div class="" style="width: 95%;margin-left: 50px;text-align: center;margin-top: 10px;">
           <el-button
             type="primary"
             size="normal"
             icon="el-icon-edit"
+            style="margin-bottom: 15px;"
             @click="handleFeedback(form.orderId)"
             v-hasPermi="['workOrder:basicsInfo:editStatus']"
             v-if="form.orderStatus == 1 || form.orderStatus == 2"
@@ -269,7 +277,7 @@
   import FileUpload from '@/components/FileUpload';
   import Cookie from 'js-cookie';
   import { deviceTree } from "@/api/device/deviceInfo";
-  import gaodeMap from "utils/gaodeMap.js";
+  import c from "utils/gaodeMap.js";
   import {map, DEVICE_TYPE} from "utils/gaodeMap.js";
   import { inspectorList } from "@/api/system/user";
 
@@ -547,15 +555,17 @@ export default {
       margin: 20px 0;
     }
     .feedbackTime-div{
-      float: left;margin-left: 150px;margin-top: 10px;
+      width: 100%;
+      float: left;
+      margin-left: 150px;
+      margin-top: 10px;
     }
     .feedbackTime{
-      height: 120px;
-      width: 120px;
+      width: 15%;
       float: left;
       margin-left: 15px;
       margin-top: 5px;
-      margin-bottom: 15px;
+      margin-bottom: 5px;
       display: flex;
       justify-content: center;
       align-items: center;