Commits · 4f7943842f4c82bc69745c29873121a650f366ee · 耿迪迪 / gassafety-progress

01 Mar, 2022 7 commits
- Merge remote-tracking branch 'origin/master' · 4f794384
  zhangjianqian authored Mar 01, 2022
  
  4f794384
- 大屏基本信息以及任务完成数据对接 · 9a96849e
  zhangjianqian authored Mar 01, 2022
  
  9a96849e
- 2022-3-1 吴卿华 · cb66c9f3
  wuqinghua authored Mar 01, 2022
  
  cb66c9f3
- 优化 · 118fbd49
  纪泽龙 authored Mar 01, 2022
  
  118fbd49
- Merge branch 'develop_jzl' · bafc4fd5
  纪泽龙 authored Mar 01, 2022
  
  bafc4fd5
- 报警功能 · 0c4f8267
  纪泽龙 authored Mar 01, 2022
  
  0c4f8267
- 大屏用户列表接口、用户报警接口、泽宏云推送调用查询用户接口 · bd3ebb9f
  王晓倩 authored Mar 01, 2022
  
  bd3ebb9f
28 Feb, 2022 33 commits
- 报警功能 · c6d1490e
  纪泽龙 authored Feb 28, 2022
  
  c6d1490e
- Merge remote-tracking branch 'origin/master' · 35db2bd1
  王晓倩 authored Feb 28, 2022
  
  35db2bd1
- 大屏用户列表接口调整 · e1477e75
  王晓倩 authored Feb 28, 2022
  
  e1477e75
- Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress into master · 375900c4
  yaqizhang authored Feb 28, 2022
  
  375900c4
- 头部修改 · 6ca261fd
  yaqizhang authored Feb 28, 2022
  
  6ca261fd
- 修复 · 0715ba09
  纪泽龙 authored Feb 28, 2022
  
  0715ba09
- 优化center样式 · edf3efac
  纪泽龙 authored Feb 28, 2022
  
  edf3efac
- 点全部的时候过滤方法更改 · 03248b62
  纪泽龙 authored Feb 28, 2022
  
  03248b62
- Merge branch 'develop_jzl' · b5293459
  纪泽龙 authored Feb 28, 2022
  
  b5293459
- 优化样式 · 9b030d07
  纪泽龙 authored Feb 28, 2022
  
  9b030d07
- Merge remote-tracking branch 'origin/master' · 763980ae
  wuqinghua authored Feb 28, 2022
  
  763980ae
- Merge remote-tracking branch 'origin/master' · 0105484b
  wuqinghua authored Feb 28, 2022
```
# Conflicts:
#	gassafetyprogress-web/src/views/regulation/pipe/index.vue
```
  0105484b
- 合并jzl · 17c3e24d
  纪泽龙 authored Feb 28, 2022
  
  17c3e24d
- 优化样式 · be4bad9d
  纪泽龙 authored Feb 28, 2022
  
  be4bad9d
- Merge remote-tracking branch 'origin/master' · 7af23906
  王晓倩 authored Feb 28, 2022
  
  7af23906
- 设备类型 · 86f7f9de
  王晓倩 authored Feb 28, 2022
  
  86f7f9de
- 2022-2-28 吴 · c6426f6e
  wuqinghua authored Feb 28, 2022
  
  c6426f6e
- Merge remote-tracking branch 'origin/master' · 17e2926a
  wuqinghua authored Feb 28, 2022
  
  17e2926a
- 2022-2-28 吴卿华 · 031cc36d
  wuqinghua authored Feb 28, 2022
  
  031cc36d
- Merge branch 'develop_jzl' · 722bdfc9
  纪泽龙 authored Feb 28, 2022
  
  722bdfc9
- 优化样式 · 42e1cd12
  纪泽龙 authored Feb 28, 2022
  
  42e1cd12
- 大屏监控修改H5player 缩放 · 4148f35d
  zhangjianqian authored Feb 28, 2022
  
  4148f35d
- Merge remote-tracking branch 'origin/master' · 70c500f7
  zhangjianqian authored Feb 28, 2022
  
  70c500f7
- 大屏监控修改H5player 缩放 · 98cec309
  zhangjianqian authored Feb 28, 2022
  
  98cec309
- Merge branch 'develop_jzl' · c502a691
  纪泽龙 authored Feb 28, 2022
  
  c502a691
- Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress into master · 0ad18f63
  yaqizhang authored Feb 28, 2022
  
  0ad18f63
- 右上角样式 · f04ee7b4
  yaqizhang authored Feb 28, 2022
  
  f04ee7b4
- Merge remote-tracking branch 'origin/master' · 44462a7b
  zhangjianqian authored Feb 28, 2022
  
  44462a7b
- 大屏监控修改H5player · eebc4e26
  zhangjianqian authored Feb 28, 2022
  
  eebc4e26
- 增加label · c4cb4965
  纪泽龙 authored Feb 28, 2022
  
  c4cb4965
- 样式 · 7afc16be
  yaqizhang authored Feb 28, 2022
  
  7afc16be
- 样式修改 · 74aa0155
  yaqizhang authored Feb 28, 2022
  
  74aa0155
- Merge branch 'develop_jzl' · fac29628
  纪泽龙 authored Feb 28, 2022
  
  fac29628