1275 Commits

Author SHA1 Message Date
严妍
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
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
jxj_yjl
4033993c2b 成润项目-页面数据校验 2023-06-30 17:22:49 +08:00
jxj_yjl
e8f00d49b5 中建四(数据添加)/成润项目(页面金额输入校验) 2023-06-27 14:20:11 +08:00
jxj_yjl
4c353eb5bd 项目后台记住滚动条位置 2023-06-26 16:24:12 +08:00
jxj_yjl
9b2b3ded48 页面问题修复 2023-06-26 15:15:11 +08:00
jxj_yjl
f9b11d6f1f 金林湾项目/成润项目页面问题整改修复 2023-06-19 18:22:36 +08:00
jxj_yjl
2c25949a95 坪山沙湖项目页面修改 2023-06-13 10:20:18 +08:00
jxj_yjl
05fbf52874 成润项目页面修改 2023-06-07 18:25:22 +08:00
jxj_yjl
a3c8fc9c32 成润项目(页面bug修复) 2023-06-01 21:59:46 +08:00
jxj_yjl
dbb71de4cd 成润项目页面修改 2023-05-29 13:46:02 +08:00
jxj_yjl
71d388f402 成润项目页面开发/页面修复 2023-05-26 10:02:02 +08:00
jxj_yjl
a345267885 成润项目页面bug修改 2023-05-17 15:58:05 +08:00
jxj_yjl
b93c2d64a8 升降机设备/塔吊设备页面日期查询 2023-05-16 14:40:49 +08:00
jxj_yjl
077c31437e 成润项目/中建四局-无人机视频播放功能 2023-05-16 13:47:36 +08:00
jxj_yjl
8e12e0fdd4 成润页面修改 2023-05-15 21:48:02 +08:00
jxj_yjl
0f6b5c0c11 成润页面bug修复 -02 2023-05-15 17:56:38 +08:00
jxj_yjl
5421cb3a94 Merge branch 'yanyan_dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-yjl 2023-05-15 16:34:26 +08:00
严妍
1497ceac83 修改瑞士恒通大屏 2023-05-15 16:29:36 +08:00
jxj_yjl
0591bc6c50 四川成润-页面bug修复 2023-05-15 16:28:59 +08:00
严妍
6e0d3b017a Merge branch 'dev-yjl' of http://139.9.66.234:18023/dhp/zhgdyun into yanyan_dev 2023-05-15 10:37:48 +08:00
jxj_yjl
2e8ce3a2f8 演示平台-大屏页面调整 2023-05-13 18:37:30 +08:00
jxj_yjl
18177b6e3e 成润页面bug修复 2023-05-13 17:01:23 +08:00
jxj_yjl
e613f96bbc 成润项目-页面bug修改 2023-05-13 17:00:19 +08:00
严妍
3ae6819f07 地磅录入 2023-05-13 14:55:10 +08:00
严妍
f34ccca1a0 Merge branch 'dev-yjl' of http://139.9.66.234:18023/dhp/zhgdyun into yanyan_dev 2023-05-12 16:45:36 +08:00
严妍
8095089f7c 修复地磅 2023-05-12 16:42:51 +08:00
jxj_yjl
b561145f18 港投项目-发票记录开发/中建四-大屏监控图片修改 2023-05-11 17:24:57 +08:00
jxj_yjl
999c4cbf06 港投项目-页面bug修复 2023-05-08 18:23:59 +08:00
jxj_yjl
a369220164 Merge branch 'yanyan_dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-yjl 2023-05-08 15:16:47 +08:00
jxj_yjl
bc0c880698 港投项目-智慧党建-文章管理-暂无数据显示 2023-05-08 15:12:00 +08:00
jxj_yjl
eb318b6eb2 港投项目-智慧党建-文章管理页面 2023-05-08 13:52:04 +08:00
jxj_yjl
c1bace0848 中建四局-大屏页面调整 2023-05-06 17:04:34 +08:00
jxj_yjl
df7d8cba9c 港投项目-检验检测/质量监管/智慧党建模块 2023-05-06 16:11:59 +08:00
严妍
5d5108953e Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into yanyan_dev 2023-04-28 18:08:32 +08:00
严妍
d3ca8f5584 Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into yanyan_dev 2023-04-28 18:08:06 +08:00
jxj_yjl
b4fa567591 材料管理-日期清除bug修复 2023-04-28 18:06:38 +08:00
严妍
43d739fcb9 修复地磅 2023-04-28 18:05:59 +08:00
jxj_yjl
c1c3cdd81e 材料管理,页面bug修复 2023-04-28 09:49:33 +08:00
严妍
0561947009 Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into yanyan_dev 2023-04-27 16:04:01 +08:00
严妍
92c5606a5a Merge branch 'shenzhen-dev' into yanyan_dev 2023-04-27 16:02:59 +08:00