Commits · b47b0a6aceff0bed8379a8edf9ad613319642da4 · 耿迪迪 / gassafety

25 Aug, 2021 12 commits
- 工单详情地图显示设备标点和管线 · b47b0a6a
  王晓倩 authored Aug 25, 2021
  
  b47b0a6a
- Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master · 24b5c403
  yaqizhang authored Aug 25, 2021
  
  24b5c403
- 判断 · d7c64f1e
  yaqizhang authored Aug 25, 2021
  
  d7c64f1e
- Merge remote-tracking branch 'origin/master' · 637ec492
  王晓倩 authored Aug 25, 2021
  
  637ec492
- 工单详情接口和工单反馈信息新增接口调整、工单反馈表增加deviceType字段 · 7bbb2e67
  王晓倩 authored Aug 25, 2021
  
  7bbb2e67
- Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master · 9c2f6836
  yaqizhang authored Aug 25, 2021
  
  9c2f6836
- 工单详情反馈信息 · 3b702688
  yaqizhang authored Aug 25, 2021
  
  3b702688
- Merge remote-tracking branch 'origin/master' · 03e2844b
  王晓倩 authored Aug 25, 2021
  
  03e2844b
- 地图隐患信息列表接口设置参数、列表页空白字段占位符、详情页权限标识 · 64c22520
  王晓倩 authored Aug 25, 2021
  
  64c22520
- Merge branch 'develop_jzl' · 30ae471f
  纪泽龙 authored Aug 25, 2021
  
  30ae471f
- 隐患列表完成 · e8b1b87c
  纪泽龙 authored Aug 25, 2021
  
  e8b1b87c
- 隐患信息生成工单隐患类型和隐患级别的显示问题 · a7460605
  王晓倩 authored Aug 25, 2021
  
  a7460605
24 Aug, 2021 14 commits
- 图标 · a9fc4a6b
  yaqizhang authored Aug 24, 2021
  
  a9fc4a6b
- 左侧导航栏背景 · 29a86624
  yaqizhang authored Aug 24, 2021
  
  29a86624
- 左侧导航栏背景 · a65e69c4
  yaqizhang authored Aug 24, 2021
  
  a65e69c4
- 工单列表、巡检计划列表、隐患信息列表、历史数据列表按时间倒序 · 93d7f175
  王晓倩 authored Aug 24, 2021
  
  93d7f175
- 解决列表页的分页问题 · 889143bd
  王晓倩 authored Aug 24, 2021
  
  889143bd
- 隐患信息接口和页面调整 · c182677a
  王晓倩 authored Aug 24, 2021
  
  c182677a
- 报警信息详情冲突还原 · 0f83c59c
  王晓倩 authored Aug 24, 2021
  
  0f83c59c
- 合并冲突 · 7017e306
  yaqizhang authored Aug 24, 2021
  
  7017e306
- 详情 · 49d6da3a
  yaqizhang authored Aug 24, 2021
  
  49d6da3a
- 修复一下 · 15c9e30b
  纪泽龙 authored Aug 24, 2021
  
  15c9e30b
- 优化一下 · 1d096feb
  纪泽龙 authored Aug 24, 2021
  
  1d096feb
- 隐患信息详情显示处理状态问题、实时数据详情字段名显示单位 · ce0cd38b
  王晓倩 authored Aug 24, 2021
  
  ce0cd38b
- 报警信息详情页面 · 8edec1e3
  王晓倩 authored Aug 24, 2021
  
  8edec1e3
- 报警信息详情展示设备或管道详情 · 8de0c153
  王晓倩 authored Aug 24, 2021
  
  8de0c153
23 Aug, 2021 13 commits
- Merge branch 'develop_jzl' · b651ddc3
  纪泽龙 authored Aug 23, 2021
  
  b651ddc3
- gis地图样式根地图模式的抽屉样式都已经调整完成 · 5295048e
  纪泽龙 authored Aug 23, 2021
  
  5295048e
- 隐患信息详情 · 77e76c21
  王晓倩 authored Aug 23, 2021
  
  77e76c21
- 地图隐患信息列表接口调整 · 844789d2
  王晓倩 authored Aug 23, 2021
  
  844789d2
- Merge remote-tracking branch 'origin/master' · 7a637053
  王晓倩 authored Aug 23, 2021
  
  7a637053
- 修改地图显示隐患信息列表接口 · 96a98bbd
  王晓倩 authored Aug 23, 2021
  
  96a98bbd
- Merge branch 'develop_jzl' · 6e6c9741
  纪泽龙 authored Aug 23, 2021
  
  6e6c9741
- gis地图抽屉样式调整 · 01628a86
  纪泽龙 authored Aug 23, 2021
  
  01628a86
- 修改隐患信息图片回显 · e4cd6844
  王晓倩 authored Aug 23, 2021
  
  e4cd6844
- 隐患信息生成工单和巡检计划生成工单调整 · f1949978
  王晓倩 authored Aug 23, 2021
  
  f1949978
- 隐患信息列表显示图片 · 2e081e63
  王晓倩 authored Aug 23, 2021
  
  2e081e63
- Merge remote-tracking branch 'origin/master' · eb4b2117
  王晓倩 authored Aug 23, 2021
  
  eb4b2117
- 隐患信息 · b1e2d4b3
  王晓倩 authored Aug 23, 2021
  
  b1e2d4b3
20 Aug, 2021 1 commit
- 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