1557 Commits

Author SHA1 Message Date
kun
2f8967a956 fix: 冲突解决 2024-05-05 14:08:28 +08:00
kun
01384f20ee fix: BUG修改 2024-05-05 14:08:03 +08:00
Vce
b2e34ab570 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-05 14:07:36 +08:00
Vce
6fc150b2e7 fix: BUG修改 2024-05-05 14:07:31 +08:00
6c519bb13e 添加两个字段,外网IP和外网端口 2024-05-04 22:24:41 +08:00
e79ae17367 修改视频配置 2024-05-04 21:55:13 +08:00
Vce
6d71c469f0 dev添加鞍钢最新地址 2024-05-04 15:25:27 +08:00
kun
2c9f5d0216 feat: 车辆以及花名册新功能添加 2024-05-03 22:58:18 +08:00
kun
427728f211 fix: 冲突解决 2024-05-03 09:51:51 +08:00
kun
6f042c68f6 fix: BUG修改 2024-05-03 09:51:05 +08:00
Vce
7ecff2b10b dev:添加error打印日志 2024-05-03 00:13:56 +08:00
kun
0b3cd8bd42 fix: BUG修改 2024-05-02 22:47:36 +08:00
kun
398989a331 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-02 21:35:17 +08:00
kun
2ce8290ad3 fix: BUG修改 2024-05-02 21:35:13 +08:00
光头强
2f4f530c2a fix: 人员管理页面优化 2024-05-02 19:36:07 +08:00
光头强
894997564b fix: 样式优化 2024-05-02 19:35:44 +08:00
光头强
ac04d47465 feat: 添加控制台插件 2024-05-02 19:34:47 +08:00
光头强
7ed38f2daf fix: 修复培训考试h5页面样式问题 2024-05-02 19:33:56 +08:00
光头强
f36e9261c4 fix: 解决车辆黑白名单页面权限问题 2024-05-02 19:31:25 +08:00
光头强
893c9509ac fix: 取消h5端缩放 2024-05-02 19:29:56 +08:00
光头强
534c08d6eb feat: 添加控制台 2024-05-02 19:28:45 +08:00
光头强
341c3e1886 修改只有一个企业的时候直接选择第一个企业 2024-05-02 11:55:48 +08:00
kun
9006102434 fix: BUG修改 2024-05-01 23:42:04 +08:00
cjp
cb0028b0b6 fix:按钮权限补充 21:35 2024-05-01 21:36:00 +08:00
cjp
6d4b224e3b 18:59 2024-05-01 18:59:23 +08:00
cjp
36ae9a559c fix:新增按钮权限-17:19 2024-05-01 17:19:25 +08:00
cjp
1c912ca23c Merge branch 'bjxz-dev' into chenH 2024-05-01 02:40:21 +08:00
cjp
fa7c283964 02:39 2024-05-01 02:39:15 +08:00
kun
66161a2fa9 fix: BUG修改 2024-05-01 02:34:11 +08:00
kun
8b4e7bdc57 fix: BUG修改 2024-05-01 02:33:41 +08:00
cjp
5ba368e9fb fix:功能补写-0:34 2024-05-01 00:34:33 +08:00
cjp
f697ed569a Merge branch 'bjxz-dev' into chenH 2024-05-01 00:07:55 +08:00
cjp
dc700f6ebb fix:BUG修改 2024-05-01 00:06:15 +08:00
Vce
101d561a4c Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-04-30 23:05:45 +08:00
Vce
fb72b10f76 dev 2024-04-30 23:05:38 +08:00
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