Commits · 5bb3214a76a315e4f65fcfca09ed01ebe2caf1d0 · 耿迪迪 / gassafety

17 Sep, 2021 1 commit
- BASE · 5bb3214a
  jianqian authored Sep 17, 2021
  
  5bb3214a
16 Sep, 2021 14 commits
- Merge remote-tracking branch 'origin/master' · c5b82d84
  jianqian authored Sep 16, 2021
  
  c5b82d84
- BASE · d1f2aeee
  jianqian authored Sep 16, 2021
  
  d1f2aeee
- Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety · e369de19
  耿迪迪 authored Sep 16, 2021
  
  e369de19
- 配置修改 gengdidi · 2aca4270
  耿迪迪 authored Sep 16, 2021
  
  2aca4270
- Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master · 80e3bedd
  yaqizhang authored Sep 16, 2021
```
# Conflicts:
#	gassafety-web/src/views/workOrder/detail/index.vue
```
  80e3bedd
- 间隙 · 144af8ef
  yaqizhang authored Sep 16, 2021
  
  144af8ef
- 分环境配置及详情地图图标 gengdidi · ff57d83b
  耿迪迪 authored Sep 16, 2021
  
  ff57d83b
- 报警查看工单 gengdidi · f1dd56f1
  耿迪迪 authored Sep 16, 2021
  
  f1dd56f1
- Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety · 114b0c9e
  耿迪迪 authored Sep 16, 2021
  
  114b0c9e
- 地图中心及工单 gengdidi · b619ccfa
  耿迪迪 authored Sep 16, 2021
  
  b619ccfa
- Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master · 98133db3
  yaqizhang authored Sep 16, 2021
  
  98133db3
- 管道管理 · a2faf2df
  yaqizhang authored Sep 16, 2021
  
  a2faf2df
- Merge remote-tracking branch 'origin/master' · d19a64a2
  jianqian authored Sep 16, 2021
  
  d19a64a2
- 修改待办 · 9e821a91
  jianqian authored Sep 16, 2021
  
  9e821a91
15 Sep, 2021 10 commits
- Merge branch 'develop_jzl' · 53aad3ff
  纪泽龙 authored Sep 15, 2021
  
  53aad3ff
- 优化 · feb16aa6
  纪泽龙 authored Sep 15, 2021
  
  feb16aa6
- 优化 · 0759b71c
  纪泽龙 authored Sep 15, 2021
  
  0759b71c
- 优化了一下值班人员时间选择 · 5d67f2c2
  纪泽龙 authored Sep 15, 2021
  
  5d67f2c2
- 值班人员移动轨迹时间点选择修改 · 4362cd33
  纪泽龙 authored Sep 15, 2021
  
  4362cd33
- Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety · 525e7f91
  耿迪迪 authored Sep 15, 2021
  
  525e7f91
- 管道联想物联网编号校验 gengdidi · b9e9de79
  耿迪迪 authored Sep 15, 2021
  
  b9e9de79
- 隐患生成工单无标题问题解决，gis下边表格透明度问题解决 · f2372b27
  纪泽龙 authored Sep 15, 2021
  
  f2372b27
- Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master · 0de38c9b
  yaqizhang authored Sep 15, 2021
  
  0de38c9b
- 生成工单后刷新 · 882ac674
  yaqizhang authored Sep 15, 2021
  
  882ac674
14 Sep, 2021 7 commits
- Merge branch 'develop_jzl' · 35c86091
  纪泽龙 authored Sep 14, 2021
  
  35c86091
- gis地图修改管道的颜色 · 5bdd931d
  纪泽龙 authored Sep 14, 2021
  
  5bdd931d
- 卫星地图跟全景地图的切换 · e04bb723
  纪泽龙 authored Sep 14, 2021
  
  e04bb723
- 设备录入上图页面的样式修改完毕 · 4697fb41
  纪泽龙 authored Sep 14, 2021
  
  4697fb41
- table · 397fa9e0
  yaqizhang authored Sep 14, 2021
  
  397fa9e0
- Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master · f18f10ed
  yaqizhang authored Sep 14, 2021
```
# Conflicts:
#	gassafety-web/src/assets/styles/gassafety.scss
```
  f18f10ed
- table样式 · 7521d86a
  yaqizhang authored Sep 14, 2021
  
  7521d86a
13 Sep, 2021 8 commits
- 优化一小下隐患top颜色 · c2269b3d
  纪泽龙 authored Sep 13, 2021
  
  c2269b3d
- Merge branch 'develop_jzl' · 512b154e
  纪泽龙 authored Sep 13, 2021
  
  512b154e
- gis地图样式以及功能全部调整完毕 · bbdc2c9d
  纪泽龙 authored Sep 13, 2021
  
  bbdc2c9d
- gis地图样式修改的差不多了，要把功能完善一下 · 6ef6b7b8
  纪泽龙 authored Sep 13, 2021
  
  6ef6b7b8
- Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety · 60cbf9e6
  耿迪迪 authored Sep 13, 2021
  
  60cbf9e6
- 值班人员昵称 gengdidi · 781e7320
  耿迪迪 authored Sep 13, 2021
  
  781e7320
- Merge remote-tracking branch 'origin/master' · 032ae59c
  jianqian authored Sep 13, 2021
  
  032ae59c
- BASE · e25bf7b0
  jianqian authored Sep 13, 2021
  
  e25bf7b0