Commits · 661121725994f1ae728af500bdef76fd8f564392 · ReactWeb5 / CivWeb

30 Aug, 2023 4 commits
- Merge branch 'dev' of https://g.civnet.cn:8443/ReactWeb5/CivWeb into dev · 66112172
  徐乐 authored Aug 30, 2023
  
  66112172
- feat: 修改集成网站 · a0f1a1bf
  徐乐 authored Aug 30, 2023
  
  a0f1a1bf
- Merge branch 'master' into 'dev' · 54f8c4bc
  杨思琦 authored Aug 30, 2023
```
# Conflicts:
#   package.json
#   src/api/service/base.js
#   src/pages/user/login/login.js
```
  54f8c4bc
- feat: 增加集成登录中间页 · 0c65e1d6
  徐乐 authored Aug 30, 2023
  
  0c65e1d6
25 Aug, 2023 3 commits
- 修改地图版本 · 8fddfec6
  张帆 authored Aug 25, 2023
  
  8fddfec6
- fix: 功能刷新修改 · 96e8033d
  杨思琦 authored Aug 25, 2023
  
  96e8033d
- 随机播放渐入渐出 · 9a0f9a09
  程恺文 authored Aug 25, 2023
  
  9a0f9a09
24 Aug, 2023 4 commits
- 修改地图版本，优化搜索 · fcad09eb
  张帆 authored Aug 24, 2023
  
  fcad09eb
- 登录页 · 1d2d7446
  程恺文 authored Aug 24, 2023
  
  1d2d7446
- 修改 · 892d621a
  程恺文 authored Aug 24, 2023
  
  892d621a
- 修改 · e3c08af6
  程恺文 authored Aug 24, 2023
  
  e3c08af6
23 Aug, 2023 6 commits
- 江西登录页面 · d3608459
  程恺文 authored Aug 23, 2023
  
  d3608459
- fix: 播报语音修改 · 8fabbb42
  杨思琦 authored Aug 23, 2023
  
  8fabbb42
- feat: merge dev · 986e4d25
  张瑶 authored Aug 23, 2023
  
  986e4d25
- fix: 删除平方字体（太大了） · b175aa24
  周宏民 authored Aug 23, 2023
  
  b175aa24
- fix: 去掉平方字体 · 1dc2d877
  周宏民 authored Aug 23, 2023
  
  1dc2d877
- Merge branch 'dev' into 'master' · 5428c055
  张瑶 authored Aug 22, 2023
```
fix: 修改邳州登录页

See merge request !27
```
  5428c055
22 Aug, 2023 6 commits
- fix: 修改邳州登录页 · bf7ae3f1
  周宏民 authored Aug 22, 2023
  
  bf7ae3f1
- fix: 报警推送修改 · 14a03368
  杨思琦 authored Aug 22, 2023
  
  14a03368
- fix: 报警播报修改 · d08f83a1
  杨思琦 authored Aug 22, 2023
  
  d08f83a1
- fix: edit conflict · 0394433d
  张瑶 authored Aug 22, 2023
  
  0394433d
- fix: edit conflict · 73c6bb47
  张瑶 authored Aug 22, 2023
  
  73c6bb47
- feat: 邳州登陆页 · b0c182ea
  周宏民 authored Aug 22, 2023
  
  b0c182ea
21 Aug, 2023 1 commit
- 修改前端出图与服务端出图管网切换问题 · 2c5c1113
  张帆 authored Aug 21, 2023
  
  2c5c1113
18 Aug, 2023 2 commits
- fix: '优化配置' · 58da0b31
  皮倩雯 authored Aug 18, 2023
  
  58da0b31
- fix: '集成登录嵌入web5' · 77b109b9
  皮倩雯 authored Aug 18, 2023
  
  77b109b9
17 Aug, 2023 1 commit
- 修改 · d1717ac2
  程恺文 authored Aug 17, 2023
  
  d1717ac2
16 Aug, 2023 2 commits
- fix: 兼容低版本 · 678a840e
  杨思琦 authored Aug 16, 2023
  
  678a840e
- fix: 修改tab页右键菜单 · f31b13b5
  杨思琦 authored Aug 16, 2023
  
  f31b13b5
15 Aug, 2023 1 commit
- 修改版本路网问题 · 86a79d3c
  张帆 authored Aug 15, 2023
  
  86a79d3c
09 Aug, 2023 2 commits
- 地图版本更换，修改前端出图问题 · 31fdbe9f
  张帆 authored Aug 09, 2023
  
  31fdbe9f
- fix: 确山水利局登录页提交 · 79c4fbe9
  罗剑 authored Aug 09, 2023
  
  79c4fbe9
07 Aug, 2023 3 commits
- feat: 新增演示模式 · cae67984
  杨思琦 authored Aug 07, 2023
  
  cae67984
- Merge branch 'dev' into 'master' · 007d51ae
  杨思琦 authored Aug 07, 2023
```
feat: 确山登录页定制

See merge request !23
```
  007d51ae
- feat: 确山登录页定制 · 9d9968c2
  王万里 authored Aug 07, 2023
  
  9d9968c2
04 Aug, 2023 1 commit
- fix: 缓存修改 · 2664b2cf
  杨思琦 authored Aug 04, 2023
  
  2664b2cf
03 Aug, 2023 2 commits
- fix: util更新 · 060b123a
  杨思琦 authored Aug 03, 2023
  
  060b123a
- fix: 修改江西登录模板4A改为OA · 92bbe8fb
  邓超 authored Aug 03, 2023
  
  92bbe8fb
02 Aug, 2023 1 commit
- feat: 布局升级 · c3fd5d51
  杨思琦 authored Aug 02, 2023
  
  c3fd5d51
27 Jul, 2023 1 commit
- 地图版本修改，修改方案切换问题 · 4d445c65
  张帆 authored Jul 27, 2023
  
  4d445c65