Commits · 54e22055a263baa069f8d8a799ed299b996d4203 · 耿迪迪 / gassafety

19 Aug, 2021 11 commits
- Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master · 54e22055
  yaqizhang authored Aug 19, 2021
  
  54e22055
- 详情布局优化 · e1d1679a
  yaqizhang authored Aug 19, 2021
  
  e1d1679a
- Merge remote-tracking branch 'origin/master' · 444b3437
  王晓倩 authored Aug 19, 2021
  
  444b3437
- 设备信息获取经纬度、管道信息获取坐标 · 74a73389
  王晓倩 authored Aug 19, 2021
  
  74a73389
- gis地图的路由跳转完成 · 6a83ae88
  纪泽龙 authored Aug 19, 2021
  
  6a83ae88
- Merge remote-tracking branch 'origin/master' · ae570df8
  王晓倩 authored Aug 19, 2021
```
# Conflicts:
#	gassafety-web/src/views/device/deviceInfo/index.vue
```
  ae570df8
- 设备信息详情、管道详情 · 565013a7
  王晓倩 authored Aug 19, 2021
  
  565013a7
- Merge branch 'develop_jzl' · 2e3171ca
  纪泽龙 authored Aug 19, 2021
  
  2e3171ca
- Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety · 1b36e54c
  耿迪迪 authored Aug 19, 2021
  
  1b36e54c
- 管线设备坐标拾取 gengdidi · 5b078f81
  耿迪迪 authored Aug 19, 2021
  
  5b078f81
- 基本完成，准备修改设备路径 · 40f47753
  纪泽龙 authored Aug 19, 2021
  
  40f47753
18 Aug, 2021 9 commits
- margin-right=10px · 370a644d
  yaqizhang authored Aug 18, 2021
  
  370a644d
- form · 43099f7d
  yaqizhang authored Aug 18, 2021
  
  43099f7d
- 详情布局优化 · f747ed7b
  yaqizhang authored Aug 18, 2021
  
  f747ed7b
- 详情样式优化 · 928bd1ab
  yaqizhang authored Aug 18, 2021
  
  928bd1ab
- Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety · ee8f7bd4
  耿迪迪 authored Aug 18, 2021
  
  ee8f7bd4
- 坐标拾取 gengdidi · b1cb5b8e
  耿迪迪 authored Aug 18, 2021
  
  b1cb5b8e
- 管道详情，设备信息详情 · dafae2ab
  王晓倩 authored Aug 18, 2021
  
  dafae2ab
- 报警详情页整理 · fbef3d99
  王晓倩 authored Aug 18, 2021
  
  fbef3d99
- 管道列表获取包含的设备，删除管道提示修改 · bd66120d
  王晓倩 authored Aug 18, 2021
  
  bd66120d
17 Aug, 2021 20 commits
- 还原代码修改 · 170d3916
  耿迪迪 authored Aug 17, 2021
  
  170d3916
- 代码还原 gengdidi · a426793f
  耿迪迪 authored Aug 17, 2021
  
  a426793f
- 接口查询管道类型、管道压力，设备类型 · e9e89cc2
  王晓倩 authored Aug 17, 2021
  
  e9e89cc2
- Merge remote-tracking branch 'origin/master' · 7a059a08
  王晓倩 authored Aug 17, 2021
  
  7a059a08
- 管道列表页、设备信息列表页 · 4ca0eff7
  王晓倩 authored Aug 17, 2021
  
  4ca0eff7
- 合并jzl · 76fe364a
  纪泽龙 authored Aug 17, 2021
  
  76fe364a
- 目录样式调整，生成线条的颜色调整，值班人员列表增加电话，主页改成gis地图 · 12125056
  纪泽龙 authored Aug 17, 2021
  
  12125056
- 设备列表查询问题 · 26d35ba5
  王晓倩 authored Aug 17, 2021
  
  26d35ba5
- Merge remote-tracking branch 'origin/master' · 85a4ff55
  王晓倩 authored Aug 17, 2021
  
  85a4ff55
- 设备所属管道关联id · 3e3f2147
  王晓倩 authored Aug 17, 2021
  
  3e3f2147
- Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master · 482744ae
  yaqizhang authored Aug 17, 2021
  
  482744ae
- 全部详情 · 3b49275b
  yaqizhang authored Aug 17, 2021
  
  3b49275b
- 实时数据设备状态修改 gengdidi · a4c08983
  耿迪迪 authored Aug 17, 2021
  
  a4c08983
- 优化gis地图的抽屉进入的时机 · 496049e1
  纪泽龙 authored Aug 17, 2021
  
  496049e1
- socket 配置修改 gengdidi · b8e9aa0a
  耿迪迪 authored Aug 17, 2021
  
  b8e9aa0a
- Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety · 9bed3bc3
  耿迪迪 authored Aug 17, 2021
  
  9bed3bc3
- 隐患接口 gengdidi · f78f467d
  耿迪迪 authored Aug 17, 2021
  
  f78f467d
- Merge remote-tracking branch 'origin/master' · 45388b5a
  王晓倩 authored Aug 17, 2021
  
  45388b5a
- 设备和管道新增is_del字段，标记是否删除 · f07f0e5c
  王晓倩 authored Aug 17, 2021
  
  f07f0e5c
- 值班人员接口返回手机号及搜索查询修改 · 500ba214
  耿迪迪 authored Aug 17, 2021
  
  500ba214