Administrator
|
eec20cb5fb
|
Merge branch 'bjxz-dhp' into 'bjxz-dev'
添加项目进度总览页面
See merge request !200
|
2024-04-30 22:37:38 +08:00 |
|
Administrator
|
7eb86b0f8b
|
Merge branch 'bjxz-dev' into 'bjxz-dhp'
# Conflicts:
# src/store/index.js
|
2024-04-30 22:36:41 +08:00 |
|
@wpf
|
d646db9e90
|
添加项目进度总览页面
|
2024-04-30 22:31:21 +08:00 |
|
Vce
|
f3c90cca4b
|
dev:增加组织机构管理下拉框
|
2024-04-30 21:45:40 +08:00 |
|
kun
|
ab87d91fd7
|
Merge branch 'chenH' into bjxz-dev
|
2024-04-30 15:33:24 +08:00 |
|
kun
|
15cb2f89eb
|
fix: BUG修改
|
2024-04-30 15:32:55 +08:00 |
|
cjp
|
649837a6cb
|
Merge branch 'bjxz-dev' into chenH
|
2024-04-30 14:51:09 +08:00 |
|
cjp
|
6ac7f7b754
|
fix: BUG修改
|
2024-04-30 14:50:16 +08:00 |
|
kun
|
06b6fce0ea
|
fix: BUG修改
|
2024-04-30 14:48:17 +08:00 |
|
kun
|
b202c4dc1c
|
fix: BUG修改
|
2024-04-30 14:47:40 +08:00 |
|
kun
|
e041ea2646
|
fix: BUG修改
|
2024-04-30 09:52:47 +08:00 |
|
cjp
|
75a10e619a
|
Merge branch 'bjxz-dev' into chenH
|
2024-04-30 09:42:25 +08:00 |
|
cjp
|
a5240a4ae1
|
4-30 09:39 添加筛选模块
|
2024-04-30 09:40:15 +08:00 |
|
kun
|
db5722adee
|
fix: BUG修改
|
2024-04-30 02:48:28 +08:00 |
|
kun
|
e9a50b47b3
|
fix: BUG修改
|
2024-04-30 02:42:24 +08:00 |
|
kun
|
51fec5e645
|
fix: BUG修改
|
2024-04-30 02:35:31 +08:00 |
|
kun
|
a7c12b8a20
|
fix: BUG修改
|
2024-04-30 01:56:36 +08:00 |
|
kun
|
12a39cf488
|
fix: BUG修改
|
2024-04-30 01:47:07 +08:00 |
|
kun
|
e20af1ad52
|
fix: BUG修改
|
2024-04-30 00:23:48 +08:00 |
|
kun
|
7e4cbf6332
|
fix: BUG修改
|
2024-04-29 23:56:15 +08:00 |
|
kun
|
8e363fd718
|
fix: BUG修改
|
2024-04-29 23:45:42 +08:00 |
|
kun
|
1f8dc76739
|
fix: BUG修改
|
2024-04-29 23:43:59 +08:00 |
|
cjp
|
6bbc412cda
|
23:43
|
2024-04-29 23:43:21 +08:00 |
|
kun
|
20dd62e091
|
fix: BUG修改
|
2024-04-29 23:08:22 +08:00 |
|
cjp
|
6d56422b44
|
Merge branch 'bjxz-dev' into chenH
|
2024-04-29 18:34:41 +08:00 |
|
kun
|
402c7c7b8b
|
fix: BUG修改
|
2024-04-29 18:32:57 +08:00 |
|
cjp
|
a5f8ec11e6
|
复查人筛选监理单位的人
|
2024-04-29 18:09:26 +08:00 |
|
kun
|
4e732e78bf
|
Merge branch 'chenH' into bjxz-dev
|
2024-04-29 16:02:58 +08:00 |
|
kun
|
54e6b6d32f
|
fix: BUG修改
|
2024-04-29 15:58:49 +08:00 |
|
cjp
|
a7c1947d6a
|
feat: 功能新增
|
2024-04-29 15:57:52 +08:00 |
|
Vce
|
1a12f64d40
|
dev
|
2024-04-29 14:00:39 +08:00 |
|
kun
|
c79bc94431
|
fix: BUG修改
|
2024-04-28 23:53:33 +08:00 |
|
kun
|
d5295be7d7
|
fix: BUG修改
|
2024-04-28 21:13:33 +08:00 |
|
kun
|
41826d94e1
|
Merge branch 'bjxz-lk' into bjxz-dev
|
2024-04-28 15:58:48 +08:00 |
|
xiaokangsix
|
c2f82db24b
|
修改布局
|
2024-04-28 15:55:35 +08:00 |
|
kun
|
06cb38776e
|
Merge branch 'bjxz-lk' into bjxz-dev
|
2024-04-28 15:47:19 +08:00 |
|
kun
|
08c219a4fc
|
fix: BUG修改
|
2024-04-28 15:46:36 +08:00 |
|
xiaokangsix
|
f885378707
|
合并冲突解决
|
2024-04-28 10:21:31 +08:00 |
|
xiaokangsix
|
dbf73063d2
|
Merge branch 'bjxz-dev' into bjxz-lk
|
2024-04-28 10:20:52 +08:00 |
|
xiaokangsix
|
0712473161
|
新增背景颜色
|
2024-04-28 10:15:13 +08:00 |
|
kun
|
0be557b435
|
fix: 解决冲突
|
2024-04-28 09:07:45 +08:00 |
|
kun
|
0b23e9e577
|
fix: BUG修改
|
2024-04-28 09:07:10 +08:00 |
|
Vce
|
3e5ca1a401
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev
|
2024-04-28 02:52:04 +08:00 |
|
Vce
|
86fdf54caa
|
dev:跳转指挥部大屏
|
2024-04-28 02:51:56 +08:00 |
|
kun
|
496238c426
|
fix: BUG修改
|
2024-04-27 23:55:56 +08:00 |
|
kun
|
67593aaa95
|
Merge branch 'bjxz-lk' into bjxz-dev
|
2024-04-27 23:13:21 +08:00 |
|
kun
|
297a380880
|
fix: BUG修改
|
2024-04-27 23:12:25 +08:00 |
|
xiaokangsix
|
12ab640886
|
新增所属企业
|
2024-04-27 22:35:33 +08:00 |
|
kun
|
22bada2c14
|
Merge branch 'bjxz-lk' into bjxz-dev
|
2024-04-27 22:00:44 +08:00 |
|
kun
|
3a0ff68792
|
fix: BUG修改
|
2024-04-27 21:59:52 +08:00 |
|