 sunjie
|
42d43de220
|
1. 整理 只处理 oo_list_manager 在视图中增加字段,不显示问题.
2. 调整方案: 如果字段名和 视图的字段名不一致,则重置已经通过oo_list_manger 设置的方案.
原因: oo_l 模块 设置保存了方案, 不会再通过 视图去取字段.
|
2025-08-04 00:37:44 +08:00 |
|
|
sunjie
|
7c0b3383e3
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-08-01 14:15:06 +08:00 |
|
|
sunjie
|
5763ea58bd
|
处理 js reduce 初始值问题
|
2025-08-01 14:14:54 +08:00 |
|
|
sunjie
|
5ef1eace9d
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-31 23:46:56 +08:00 |
|
|
sunjie
|
33032fd8b6
|
1. 微信小程序提交的wifi mac(bssid)参数
|
2025-07-31 23:46:36 +08:00 |
|
|
sunjie
|
857b2b3877
|
1. 优化js报错
|
2025-07-31 16:16:25 +08:00 |
|
|
sunjie
|
89ad62f91d
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-31 15:54:29 +08:00 |
|
|
sunjie
|
9f6cb0fa0c
|
1. 由于视图已经使用了 js_class,无法重复使用(重复使用会导致序号覆盖)
2. 通过在 tree 视图添加 class形式进行了特殊判断.
|
2025-07-31 15:54:17 +08:00 |
|
|
sunjie
|
fed2776155
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-29 23:05:01 +08:00 |
|
|
sunjie
|
a7250135d8
|
忽略 **/.DS_Store
|
2025-07-28 11:27:59 +08:00 |
|
|
sunjie
|
10f566e00f
|
去掉模板
|
2025-07-27 19:36:32 +08:00 |
|
|
sunjie
|
46e79114fa
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-27 19:29:38 +08:00 |
|
|
sunjie
|
d1b95cec8d
|
去掉模板
|
2025-07-27 19:29:17 +08:00 |
|
|
sunjie
|
150b1b21a7
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-27 17:40:10 +08:00 |
|
|
sunjie
|
d0908958d4
|
去掉模板
|
2025-07-27 17:39:55 +08:00 |
|
|
sunjie
|
7b7db016db
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
# Conflicts:
# yuthon_maintain/wizard/__init__.py
|
2025-07-27 17:33:35 +08:00 |
|
|
sunjie
|
b2de5861dc
|
去掉模板
|
2025-07-27 17:32:57 +08:00 |
|
|
sunjie
|
e3244a3d16
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-27 17:12:51 +08:00 |
|
|
sunjie
|
a33132f703
|
标签打印功能.完善
|
2025-07-27 17:12:29 +08:00 |
|
|
sunjie
|
d0038b0b1c
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-25 09:27:03 +08:00 |
|
|
sunjie
|
823fc37fef
|
优化图像
|
2025-07-25 09:26:52 +08:00 |
|
|
sunjie
|
e6c43fa947
|
优化图像
|
2025-07-25 08:54:00 +08:00 |
|
|
sunjie
|
511437850f
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-25 08:50:14 +08:00 |
|
|
sunjie
|
51125e492d
|
优化图像
|
2025-07-25 08:49:59 +08:00 |
|
|
sunjie
|
e7f9437b24
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-24 22:37:16 +08:00 |
|
|
sunjie
|
5ca01dd0d5
|
优化图像
|
2025-07-24 22:21:13 +08:00 |
|
|
sunjie
|
69efc924ba
|
1. 增加批量初始化设备功能
|
2025-07-24 16:37:35 +08:00 |
|
|
sunjie
|
fa187dbd2e
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
# Conflicts:
# attendance_iot/views/attendance_iot_user_views.xml
|
2025-07-24 16:05:22 +08:00 |
|
|
sunjie
|
3a39e510dc
|
1. 增加 iot.user 的唯一性.
2. 增加批量拷贝功能
|
2025-07-24 16:04:36 +08:00 |
|
|
sunjie
|
ecd6fae618
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-23 21:40:18 +08:00 |
|
|
sunjie
|
1a3195dc8c
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:40:05 +08:00 |
|
|
sunjie
|
c2f94f24c0
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-23 21:37:09 +08:00 |
|
|
sunjie
|
9622cf81f5
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:36:52 +08:00 |
|
|
sunjie
|
b5929443dc
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:25:14 +08:00 |
|
|
sunjie
|
ee76aa5f3e
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:20:22 +08:00 |
|
|
sunjie
|
319bf2eab7
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:16:48 +08:00 |
|
|
sunjie
|
4acc85684f
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:12:48 +08:00 |
|
|
sunjie
|
da32680603
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:09:05 +08:00 |
|
|
sunjie
|
36f4a18bdd
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:07:27 +08:00 |
|
|
sunjie
|
89619c9140
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 20:24:42 +08:00 |
|
|
sunjie
|
caa5a8eb52
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-23 20:22:49 +08:00 |
|
|
sunjie
|
dcff509b8e
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 20:22:15 +08:00 |
|
|
sunjie
|
0bae50aab6
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-23 19:54:31 +08:00 |
|
|
sunjie
|
c0df220686
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 19:53:32 +08:00 |
|
|
sunjie
|
739dfa8306
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 16:41:44 +08:00 |
|
|
sunjie
|
7182c14f02
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 16:31:37 +08:00 |
|
|
sunjie
|
5e54381c3c
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 16:24:01 +08:00 |
|
|
sunjie
|
ae881f4249
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 15:14:29 +08:00 |
|
|
sunjie
|
3b584d14a8
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-23 14:23:13 +08:00 |
|
|
sunjie
|
8ab5bc1cb4
|
1.增加iot 设备更新用户数据功能.
|
2025-07-23 11:08:18 +08:00 |
|
|
sunjie
|
71806a8c6c
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-23 11:06:50 +08:00 |
|
|
sunjie
|
baa303fb19
|
1.增加iot 设备更新用户数据功能.
|
2025-07-23 11:06:40 +08:00 |
|
|
sunjie
|
babea81be8
|
1. mqtt 单独服务更新到gzth中
|
2025-07-22 13:34:21 +00:00 |
|
|
sunjie
|
21b1ca5ec4
|
1. mqtt 单独服务更新到gzth中
|
2025-07-22 13:34:21 +00:00 |
|
|
sunjie
|
9d6b4f1a3f
|
1. mqtt 单独服务更新到gzth中
|
2025-07-22 13:34:21 +00:00 |
|
|
sunjie
|
097945275f
|
1. mqtt 单独服务更新到gzth中
|
2025-07-22 13:34:21 +00:00 |
|
|
sunjie
|
5563f0cbd9
|
1. mqtt 单独服务更新到gzth中
|
2025-07-22 19:48:58 +08:00 |
|
|
sunjie
|
da79f876cd
|
1. mqtt 单独服务更新到gzth中
|
2025-07-22 19:45:46 +08:00 |
|
|
sunjie
|
cc6f1ba562
|
1. mqtt 单独服务更新到gzth中
|
2025-07-22 19:09:03 +08:00 |
|
|
sunjie
|
79238729a5
|
1. mqtt 单独服务更新到gzth中
|
2025-07-22 18:39:29 +08:00 |
|
|
sunjie
|
400d6a0ddb
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-22 09:53:30 +08:00 |
|
|
sunjie
|
7574e1c629
|
1. 增加了 iot_message iot 数据下发功能
2. 优化了 上传头像的问题
|
2025-07-22 09:53:11 +08:00 |
|
|
sunjie
|
a5e43e18b7
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-16 10:15:54 +08:00 |
|
|
sunjie
|
f3f907e259
|
调整 form 表单的 只读模式下的 状态.
1. 去掉部分只读的字段的样式.
2. 右上角的 ribbon 背景透明度改 0.7
3. 修改了打开无记录的公告报错问题.js没有判空.
|
2025-07-16 10:15:32 +08:00 |
|
|
sunjie
|
32511e53f3
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-15 23:48:34 +08:00 |
|
|
sunjie
|
f15104d054
|
调整 form 表单的 只读模式下的 状态.
|
2025-07-15 23:48:18 +08:00 |
|
|
sunjie
|
093f211ba7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-14 17:03:58 +08:00 |
|
|
sunjie
|
cdda146422
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-14 17:03:33 +08:00 |
|
|
sunjie
|
1c1b53823d
|
1. oo_list_manager 模块的 displayOpitionalFields 被 web_enterprise 模块重写.
2. 调整 oo_list_manager 依赖 web_enterprise
保证 displayOptionalFields 先被调用.
|
2025-07-14 17:01:38 +08:00 |
|
|
sunjie
|
6fe6e35561
|
1. oo_list_manager 模块的 displayOpitionalFields 被 web_enterprise 模块重写.
2. 调整 oo_list_manager 依赖 web_enterprise
保证 displayOptionalFields 先被调用.
|
2025-07-14 16:56:49 +08:00 |
|