|
|
7121f317b6
|
修改完善多曲线组件
完成实时采集页面瞬时流量点击查询五分钟存盘数据的历史趋势功能
|
2025-09-16 10:44:36 +08:00 |
|
|
|
92d48433b8
|
更新 src/uni_modules/cxc-szcx-multiLineChart/components/cxc-szcx-multiLineChart/cxc-szcx-multiLineChart.vue
|
2025-09-15 15:05:38 +00:00 |
|
|
|
6bac6dc89d
|
修改生产模块页面，增加顶部标签，新建分包pages-production，将生产页面移动至分包下面。
下一步制作曲线页面，统计页面，继续做好设备，安防等页面。
|
2025-09-15 17:50:48 +08:00 |
|
年泽 闵
|
adcdb86db7
|
Merge branch 'minJeecg' into 'master'
Min jeecg
See merge request cxc/jeecguniapp!37
|
2025-09-11 07:27:26 +00:00 |
|
lagos
|
5477eaebe9
|
1
|
2025-09-11 15:26:23 +08:00 |
|
lagos
|
dd7d3bb64b
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
|
2025-09-09 10:11:58 +08:00 |
|
lagos
|
01292d1f50
|
1
|
2025-09-09 10:11:09 +08:00 |
|
yangzhq68909
|
3e75a37937
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-09-08 13:28:01 +08:00 |
|
yangzhq68909
|
cf7c21a160
|
增加临时劳务登录
|
2025-09-08 13:27:49 +08:00 |
|
年泽 闵
|
ea59b7b564
|
Merge branch 'minJeecg' into 'master'
Min jeecg
See merge request cxc/jeecguniapp!36
|
2025-09-05 00:14:15 +00:00 |
|
lagos
|
4b526dd5b4
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
# env/.env.development
|
2025-09-05 08:13:31 +08:00 |
|
lagos
|
2215b058ab
|
1
|
2025-09-05 08:12:18 +08:00 |
|
yangzhq68909
|
c97b130da9
|
app登录方式修改 增加劳动合同号
|
2025-09-03 15:17:38 +08:00 |
|
闵 年泽
|
8acb78320c
|
Merge branch 'minJeecg' into 'master'
Min jeecg
See merge request cxcxt/jeecguniapp!35
|
2025-08-13 09:37:53 +08:00 |
|
lagos
|
15c86f500a
|
1.修改公务接待
|
2025-08-13 09:36:51 +08:00 |
|
lagos
|
3f622354a6
|
1.修改公务接待
|
2025-08-13 09:26:00 +08:00 |
|
lagos
|
e7dca103ec
|
1.修改app
|
2025-08-09 11:28:51 +08:00 |
|
闵 年泽
|
5e7843d456
|
Merge branch 'minJeecg' into 'master'
1.修改app
See merge request cxcxt/jeecguniapp!34
|
2025-08-09 11:27:18 +08:00 |
|
yangzhq68909
|
3f7b9f5d67
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-08-08 16:44:21 +08:00 |
|
yangzhq68909
|
1fd46fe7ec
|
2.1.1
|
2025-08-08 16:44:08 +08:00 |
|
张 祥瑞
|
66d36a276d
|
Merge branch 'zxrapp' into 'master'
Zxrapp
See merge request cxcxt/jeecguniapp!33
|
2025-08-05 15:04:09 +08:00 |
|
张祥瑞
|
d5ff310858
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-08-05 15:04:19 +08:00 |
|
张祥瑞
|
286dade1e2
|
0805张祥瑞
|
2025-08-05 15:03:47 +08:00 |
|
yangzhq68909
|
d133b539c4
|
1
|
2025-07-28 09:51:19 +08:00 |
|
闵 年泽
|
a7fc0f6135
|
Merge branch 'minJeecg' into 'master'
Min jeecg
See merge request cxcxt/jeecguniapp!32
|
2025-07-25 17:20:31 +08:00 |
|
lagos
|
b49d7e9c50
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
|
2025-07-25 17:21:16 +08:00 |
|
lagos
|
5a3a62dd45
|
1.修改公务接待APP
|
2025-07-25 17:21:01 +08:00 |
|
yangzhq68909
|
a99fe816c1
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# env/.env.development
|
2025-07-25 17:03:06 +08:00 |
|
yangzhq68909
|
16877fbf17
|
1
|
2025-07-25 17:02:39 +08:00 |
|
lagos
|
73634e78ec
|
1.新增计划审核
|
2025-07-24 17:23:59 +08:00 |
|
闵 年泽
|
9e84ee68a4
|
Merge branch 'minJeecg' into 'master'
1.新增计划审核
See merge request cxcxt/jeecguniapp!31
|
2025-07-24 17:23:26 +08:00 |
|
lagos
|
b1bb4553b5
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
# env/.env.development
|
2025-07-24 11:09:53 +08:00 |
|
闵 年泽
|
5247e096b3
|
Merge branch 'minJeecg' into 'master'
Min jeecg
See merge request cxcxt/jeecguniapp!30
|
2025-07-24 11:09:15 +08:00 |
|
lagos
|
e63262c2da
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
# env/.env.development
|
2025-07-24 11:05:53 +08:00 |
|
yangzhq68909
|
8c08c1f3df
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-07-24 11:02:11 +08:00 |
|
yangzhq68909
|
65ac3e6830
|
请销假修改，可显示全部劳资员
|
2025-07-24 11:01:55 +08:00 |
|
张祥瑞
|
7e9629c4dd
|
7.24张祥瑞
|
2025-07-24 09:39:14 +08:00 |
|
张 祥瑞
|
4543e9d5d1
|
Merge branch 'zxrapp' into 'master'
7.24张祥瑞
See merge request cxcxt/jeecguniapp!29
|
2025-07-24 09:39:10 +08:00 |
|
yangzhq68909
|
72420dea52
|
请销假劳资员获取修改，显示全部劳资员，默认显示本单位劳资员
|
2025-07-23 15:30:51 +08:00 |
|
张 祥瑞
|
b47831e2db
|
Merge branch 'zxrapp' into 'master'
7.21张祥瑞
See merge request cxcxt/jeecguniapp!28
|
2025-07-21 10:50:59 +08:00 |
|
张祥瑞
|
8a8fe98ec3
|
7.21张祥瑞
|
2025-07-21 10:50:34 +08:00 |
|
张 祥瑞
|
8f0e1585b2
|
Merge branch 'zxrapp' into 'master'
Zxrapp
See merge request cxcxt/jeecguniapp!27
|
2025-07-18 17:26:53 +08:00 |
|
张祥瑞
|
7e7156bbc4
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-07-18 17:26:37 +08:00 |
|
张祥瑞
|
745e046bf3
|
7.18zxr
|
2025-07-18 17:26:18 +08:00 |
|
yangzhq68909
|
512a83984b
|
请假单位判断修改
|
2025-07-11 08:54:55 +08:00 |
|
lagos
|
1a2752d972
|
1
|
2025-07-04 14:12:32 +08:00 |
|
lagos
|
72cae1ec15
|
1.修改
|
2025-06-30 10:15:12 +08:00 |
|
yangzhq68909
|
8dd460b322
|
1
|
2025-06-27 17:58:10 +08:00 |
|
张 祥瑞
|
bd4582b966
|
Merge branch 'zxrapp' into 'master'
6.27张祥瑞
See merge request cxcxt/jeecguniapp!26
|
2025-06-27 15:15:50 +08:00 |
|
张祥瑞
|
43c8a5f5b2
|
6.27张祥瑞
|
2025-06-27 15:15:15 +08:00 |
|
