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

1180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jxj_yjl
f15c7227f3 页面bug修改提交 2023-09-08 17:45:24 +08:00
jxj_yjl
378af1bd71 修改 演示平台/成润项目页面bug 2023-08-31 18:16:18 +08:00
jxj_yjl
53a5b893cb 系统设置登录模块区分 2023-08-18 19:24:28 +08:00
jxj_yjl
f1ea06327d 系统设置/巡检点/页面问题修复等 2023-08-18 18:46:24 +08:00
jxj_yjl
fcc491257c 修改演示平台页面bug 2023-08-14 09:19:39 +08:00
jxj_yjl
a9ad2dbcaa 调整企业管理页面 2023-08-10 14:00:02 +08:00
jxj_yjl
ffc5be0375 管理员账号界面：企业管理新增功能开发/新开发字典管理页面 2023-08-09 17:43:01 +08:00
jxj_yjl
158f2b9d08 修改金林湾/临边/有毒气体/智能烟感页面bug 2023-08-08 10:21:04 +08:00
jxj_yjl
d1ee0ea4a7 上海项目页面模块开发：临边防护/有毒气体监测/无线智能烟感报警系统 2023-08-04 18:31:22 +08:00
jxj_yjl
e279114c11 Merge branches 'dev-yjl' and 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-yjl 2023-07-31 09:15:57 +08:00
jxj_yjl
4d4d832aef 中建四大屏数据新增 2023-07-31 09:14:58 +08:00
cjp
36db040b7d fix: BUG修改 2023-07-28 09:21:27 +08:00
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
jxj_yjl
58807f1fdb Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-yjl 2023-07-26 13:52:06 +08:00
jxj_yjl
c7790a80c2 中建四局数据天机 2023-07-26 13:50:36 +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