admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,166 Commits 40 Branches 0 Tags
Commit Graph

1166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cjp
a45eb31c20 fix: 修改BUG 2023-07-27 18:28:05 +08:00
cjp
e08280801e Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into shenzhen-dev 2023-07-27 09:08:27 +08:00
cjp
0f5a246e1b fix: BUG 修改 
commit fd120a19497e0533ece7c18b4037d86ef7a5d8a3
Author: cjp <3096114695@qq.com>
Date:   Thu Jul 27 08:55:32 2023 +0800
 2023-07-27 09:01:56 +08:00
cjp
fd120a1949 fix: BUG 修改 2023-07-27 08:55:32 +08:00
cjp
913dc74cb6 fix: BUG修改 2023-07-26 11:07:33 +08:00
cjp
e9862f5245 fix: BUG修改 2023-07-26 09:49:30 +08:00
cjp
386153089d Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-cjp 2023-07-25 16:11:36 +08:00
袁晶琳
b8eacd8868 Merge branch 'dev-yjl' into 'shenzhen-dev' 
成润页面bug修复提交

See merge request !183
 2023-07-24 18:57:19 +08:00
jxj_yjl
7131b2a8bc 成润页面bug修复提交 2023-07-24 18:56:45 +08:00
袁晶琳
89421acf61 Merge branch 'dev-yjl' into 'shenzhen-dev' 
成润项目页面bug修复

See merge request !182
 2023-07-19 09:07:51 +08:00
jxj_yjl
5cf818c441 成润项目页面bug修复 2023-07-19 09:02:56 +08:00
袁晶琳
e8ecb2ccc2 Merge branch 'dev-yjl' into 'shenzhen-dev' 
项目看板-材料管理大屏-数据对接

See merge request !181
 2023-07-17 16:04:49 +08:00
jxj_yjl
3388fb61eb 项目看板-材料管理大屏-数据对接 2023-07-17 16:04:17 +08:00
袁晶琳
3a421c8f64 Merge branch 'dev-yjl' into 'shenzhen-dev' 
上海张江-项目看板-材料管理大屏静态页面

See merge request !180
 2023-07-17 09:07:37 +08:00
jxj_yjl
ee7299eac8 上海张江-项目看板-材料管理大屏静态页面 2023-07-17 09:06:54 +08:00
袁晶琳
b48cb75628 Merge branch 'dev-yjl' into 'shenzhen-dev' 
金林湾/上海张江项目页面调整

See merge request !179
 2023-07-13 18:45:22 +08:00
jxj_yjl
84c90a754b 解决合并冲突 2023-07-13 18:44:26 +08:00
jxj_yjl
c8879fa7e6 金林湾项目/上海张江项目页面调整提交 2023-07-13 18:41:38 +08:00
严妍
6c63d016a3 fix: 78+16个项目验收问题全部解决 2023-07-13 14:41:24 +08:00
严妍
105165fc92 fix：BUG修改 2023-07-13 08:53:09 +08:00
严妍
8e15aaf3e3 fix bug修改 2023-07-12 15:26:10 +08:00
严妍
8a624ce2bc fix: BUG修改 2023-07-12 10:37:44 +08:00
严妍
0fc7d050af fix BUG修改 项目验收（UI）1-20， 项目汇总1-70 2023-07-11 17:02:52 +08:00
严妍
e83f086d71 Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into shenzhen-dev 
# Conflicts:
#	src/assets/js/http.js
 2023-07-11 09:38:01 +08:00
严妍
c36ab4e06e fix BUG修改 2023-07-11 09:29:34 +08:00
袁晶琳
62f4a1037e Merge branch 'dev-yjl' into 'shenzhen-dev' 
金林湾项目（大屏页面bug修复）/中建四局（大屏需求新增）

See merge request !177
 2023-07-07 14:24:00 +08:00
jxj_yjl
045d5fc24b 金林湾项目（大屏页面bug修复）/中建四局（大屏需求新增） 2023-07-07 13:53:05 +08:00
严妍
555847aa78 Squashed commit of the following: 
commit c2c2b1739bed0cf47aa2f3bae6c035704d47a121
Author: 严妍 <3096114695@qq.com>
Date:   Thu Jul 6 21:47:47 2023 +0800

    fix： 验收汇总73个BUG以及优化点修改
 2023-07-06 21:53:07 +08:00
严妍
c2c2b1739b fix： 验收汇总73个BUG以及优化点修改 2023-07-06 21:47:47 +08:00
袁晶琳
0b3c8ac814 Merge branch 'dev-yjl' into 'shenzhen-dev' 
陈锦鹏修改bug提交合并

See merge request !176
 2023-07-06 09:19:36 +08:00
jxj_yjl
bec62601e2 fix: bug修改 2023-07-05 19:19:19 +08:00
jxj_yjl
ff6e91ca29 fix: 修改BUG35-71 2023-07-05 17:54:24 +08:00
jxj_yjl
d60e4a85dd fix: 修改BUG by cjp 2023-07-05 14:17:17 +08:00
jxj_yjl
438e2593db fix: BUG修改 2023-07-04 21:16:23 +08:00
jxj_yjl
753a1d376d fix: BUG修改 2023-07-04 15:13:41 +08:00
袁晶琳
a549b1b2be Merge branch 'dev-yjl' into 'shenzhen-dev' 
成润项目-页面数据校验

See merge request !175
 2023-06-30 17:25:11 +08:00
jxj_yjl
4033993c2b 成润项目-页面数据校验 2023-06-30 17:22:49 +08:00
袁晶琳
b3f77fbe01 Merge branch 'dev-yjl' into 'shenzhen-dev' 
中建四（数据添加）/成润项目(页面金额输入校验)

See merge request !174
 2023-06-27 14:24:45 +08:00
jxj_yjl
e8f00d49b5 中建四（数据添加）/成润项目(页面金额输入校验) 2023-06-27 14:20:11 +08:00
袁晶琳
ede75c6b60 Merge branch 'dev-yjl' into 'shenzhen-dev' 
项目后台滚动条记住位置

See merge request !173
 2023-06-26 16:26:27 +08:00
jxj_yjl
4c353eb5bd 项目后台记住滚动条位置 2023-06-26 16:24:12 +08:00
jxj_yjl
9b2b3ded48 页面问题修复 2023-06-26 15:15:11 +08:00
袁晶琳
ced0ed3956 Merge branch 'dev-yjl' into 'shenzhen-dev' 
金林湾项目/成润项目页面问题整改修复

See merge request !172
 2023-06-19 18:23:43 +08:00
jxj_yjl
f9b11d6f1f 金林湾项目/成润项目页面问题整改修复 2023-06-19 18:22:36 +08:00
jxj_yjl
2c25949a95 坪山沙湖项目页面修改 2023-06-13 10:20:18 +08:00
袁晶琳
1c2aff22fa Merge branch 'dev-yjl' into 'shenzhen-dev' 
成润项目页面修改

See merge request !171
 2023-06-07 18:26:47 +08:00
jxj_yjl
05fbf52874 成润项目页面修改 2023-06-07 18:25:22 +08:00
袁晶琳
0371320c9f Merge branch 'dev-yjl' into 'shenzhen-dev' 
成润项目（页面bug修复）

See merge request !169
 2023-06-01 22:00:45 +08:00
jxj_yjl
a3c8fc9c32 成润项目（页面bug修复） 2023-06-01 21:59:46 +08:00
袁晶琳
372d1a1df9 Merge branch 'dev-yjl' into 'shenzhen-dev' 
成润项目页面修改

See merge request !168
 2023-05-29 13:47:03 +08:00