Commits · 82277d36792b6564f3fe3645b0ce99b1b35c373d · 融通安全管理系统 / rongtong-app

03 Aug, 2023 3 commits
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf' · 82277d36
  yf authored Aug 03, 2023
  
  82277d36
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop · 14b8cb46
  p-wanping.song authored Aug 03, 2023
  
  14b8cb46
- 修改禅道bug(添加搜索功能，优化相关联字段) · fb278052
  p-wanping.song authored Aug 03, 2023
  
  fb278052
02 Aug, 2023 7 commits
- Merge branch 'dev-yf'' into 'develop' · 46af6280
  杨帆 authored Aug 02, 2023
```
Dev yf'

See merge request !32
```
  46af6280
- Dev yf' · 3fc1d71e
  杨帆 authored Aug 02, 2023
  
  3fc1d71e
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf' · 3e889850
  yf authored Aug 02, 2023
  
  3e889850
- 按照列表修改bug · 890d7515
  yf authored Aug 02, 2023
  
  890d7515
- Merge branch 'dev-yf'' into 'develop' · 341c3c2f
  杨帆 authored Aug 02, 2023
```
Dev yf'

See merge request !31
```
  341c3c2f
- Dev yf' · 972b8e8c
  杨帆 authored Aug 02, 2023
  
  972b8e8c
- 合并冲突 · d4f53fd9
  yf authored Aug 02, 2023
  
  d4f53fd9
01 Aug, 2023 1 commit
- 添加项目、添加楼层 · ea53da41
  p-wanping.song authored Aug 01, 2023
  
  ea53da41
28 Jul, 2023 2 commits
- 添加修改任务和删除任务接口 · 499e5d1c
  p-wanping.song authored Jul 28, 2023
  
  499e5d1c
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-swp · 541a11ae
  p-wanping.song authored Jul 28, 2023
  
  541a11ae
27 Jul, 2023 4 commits
- Merge branch 'dev-swp' into develop · 5ac68b7d
  p-wanping.song authored Jul 27, 2023
  
  5ac68b7d
- 任务单添加筛选 · cc374d2c
  p-wanping.song authored Jul 27, 2023
  
  cc374d2c
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-swp · f6db7daf
  p-wanping.song authored Jul 27, 2023
  
  f6db7daf
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop · 307001b1
  p-wanping.song authored Jul 27, 2023
  
  307001b1
26 Jul, 2023 15 commits
- Merge branch 'dev-yf'' into 'develop' · 007def98
  杨帆 authored Jul 26, 2023
```
Dev yf'

See merge request !30
```
  007def98
- Dev yf' · 19329335
  杨帆 authored Jul 26, 2023
  
  19329335
- . · 24568544
  yf authored Jul 26, 2023
  
  24568544
- 合并冲突 · fcb0c9f8
  yf authored Jul 26, 2023
  
  fcb0c9f8
- 所有提交增加加载中状态防止多次提交 · e3d0eaa7
  yf authored Jul 26, 2023
  
  e3d0eaa7
- Merge branch 'dev-yf'' into 'develop' · 089370e8
  杨帆 authored Jul 26, 2023
```
Dev yf'

See merge request !29
```
  089370e8
- Dev yf' · 2d1c9c05
  杨帆 authored Jul 26, 2023
  
  2d1c9c05
- 按照列表修改问题 · 4026f8f3
  yf authored Jul 26, 2023
  
  4026f8f3
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf' · 377ccd22
  yf authored Jul 26, 2023
  
  377ccd22
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop · dc70a264
  周昊 authored Jul 26, 2023
  
  dc70a264
- 1、修改四色图颜色关联固有风险颜色 · 6207f6df
  周昊 authored Jul 26, 2023
  
  6207f6df
- Merge branch 'xjchen' into 'develop' · 91a1f7e0
  陈晓晋 authored Jul 26, 2023
```
风险按照风险等级显示不同背景色20230726

See merge request !28
```
  91a1f7e0
- 风险按照风险等级显示不同背景色20230726 · a70129b7
  陈晓晋 authored Jul 26, 2023
  
  a70129b7
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf' · 06ea8d50
  yf authored Jul 26, 2023
  
  06ea8d50
- 管控责任单位，管控责任人添加搜索框 · feeb85f6
  p-wanping.song authored Jul 26, 2023
  
  feeb85f6
24 Jul, 2023 1 commit
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf' · 81def004
  yf authored Jul 24, 2023
  
  81def004
21 Jul, 2023 7 commits
- 修改重大危险源描述 · 4e02b7b4
  p-wanping.song authored Jul 21, 2023
  
  4e02b7b4
- 去掉管控措施等标题，合并组 · 54405545
  p-wanping.song authored Jul 21, 2023
  
  54405545
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-swp · 431f9184
  p-wanping.song authored Jul 21, 2023
  
  431f9184
- 解决vant v-if后图片不显示问题 · 028c02d6
  p-wanping.song authored Jul 21, 2023
  
  028c02d6
- Merge branch 'dev-swp' into develop · 73ff35a6
  p-wanping.song authored Jul 21, 2023
  
  73ff35a6
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop · 35958ac2
  p-wanping.song authored Jul 21, 2023
  
  35958ac2
- 修改固有和现有 · ea725f9e
  p-wanping.song authored Jul 21, 2023
  
  ea725f9e