Commits · 49d6da3a0f041170a47f0f8683f817e3fe498631 · 耿迪迪 / gassafety

24 Aug, 2021 1 commit
- 详情 · 49d6da3a
  yaqizhang authored Aug 24, 2021
  
  49d6da3a
20 Aug, 2021 5 commits
- Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master · 53b375e1
  yaqizhang authored Aug 20, 2021
```
# Conflicts:
#	gassafety-web/src/views/deviceInspection/inspectiondetail/index.vue
```
  53b375e1
- 报警信息、设备巡检工单编号跳转 · bca04d1a
  yaqizhang authored Aug 20, 2021
  
  bca04d1a
- 工单关联隐患信息，删除隐患信息坐标 · 9b52062d
  王晓倩 authored Aug 20, 2021
  
  9b52062d
- 隐患信息删除坐标字段 · 3718ada1
  王晓倩 authored Aug 20, 2021
  
  3718ada1
- 报警详情、巡检计划详情、工单详情管道上图 · 8dc91bba
  王晓倩 authored Aug 20, 2021
  
  8dc91bba
19 Aug, 2021 16 commits
- 设备信息维护详情布局优化 · 9ed181ec
  yaqizhang authored Aug 19, 2021
  
  9ed181ec
- 管道新增时单选框默认值问题 · f8bfeac2
  王晓倩 authored Aug 19, 2021
  
  f8bfeac2
- 管道详情地图 · a1236e3c
  王晓倩 authored Aug 19, 2021
  
  a1236e3c
- Merge branch 'develop_jzl' · db28bd7d
  纪泽龙 authored Aug 19, 2021
  
  db28bd7d
- 上图类增加一个onlyline 只能上管道的图，没功能 · 5d8b5187
  纪泽龙 authored Aug 19, 2021
  
  5d8b5187
- 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 9 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