cjp
|
e06e7cbc4a
|
fix: BUG修改
|
2023-07-29 18:49:39 +08:00 |
|
cjp
|
37db6d303e
|
fix: 修改七参数大屏25个BUG
|
2023-07-29 17:59:01 +08:00 |
|
cjp
|
f66d62bd3f
|
fix: BUG修改
|
2023-07-29 11:56:50 +08:00 |
|
cjp
|
c93d47bd28
|
fix: BUG修改
|
2023-07-28 19:43:56 +08:00 |
|
袁晶琳
|
25f65a08e1
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
七参数大屏-塔吊监测-升降机监测监控对接
See merge request !4
|
2023-07-21 14:52:33 +08:00 |
|
jxj_yjl
|
212dee3e70
|
七参数大屏-塔吊监测-升降机监测监控对接
|
2023-07-21 14:52:03 +08:00 |
|
袁晶琳
|
facb190d4b
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
七参数大屏-塔吊监测/升降机监测/视频管理页面接口对接
See merge request !3
|
2023-07-20 17:27:55 +08:00 |
|
jxj_yjl
|
67f6aea684
|
七参数大屏-塔吊监测/升降机监测/视频管理页面接口对接
|
2023-07-20 17:27:13 +08:00 |
|
严妍
|
728eca0ad9
|
对接车辆管理入场车辆，出场车辆，当日出入场记录，对接塔吊监测左上角今日塔机工作情况，中间塔吊信息详情。
|
2023-07-15 17:10:55 +08:00 |
|
严妍
|
44138c463f
|
对接劳务管理右下角今日-实时数据。
|
2023-07-14 17:44:33 +08:00 |
|
严妍
|
3c22e2e7cc
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2023-07-14 17:03:17 +08:00 |
|
严妍
|
7e9264aa01
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into dev-cjp
提交获取设备下拉框接口
对接配电箱监测五个模块的接口，优化事件总线的使用，避免内存浪费。
|
2023-07-14 17:01:04 +08:00 |
|
严妍
|
b406a64ddf
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into dev-cjp
# Conflicts:
# src/views/sevenLargeScreen/distributionMonitoring/topCenter.vue
# src/views/sevenLargeScreen/distributionMonitoring/topLeft.vue
|
2023-07-14 16:57:45 +08:00 |
|
严妍
|
cd42581325
|
提交获取设备下拉框接口
|
2023-07-14 16:53:26 +08:00 |
|
严妍
|
3f0884ffba
|
对接配电箱监测五个模块的接口，优化事件总线的使用，避免内存浪费。
|
2023-07-14 16:46:12 +08:00 |
|
严妍
|
4738525138
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into dev-cjp
commit 1ff0303729b46e2aa362a2a521182f80e68e14df
Author: 严妍 <3096114695@qq.com>
Date: Fri Jul 14 11:18:53 2023 +0800
对接配电箱监测大屏，左上实时数据，右上报警列表，中间配电箱实时数据接口，计算右上角实时时间
|
2023-07-14 11:24:26 +08:00 |
|
严妍
|
8c1d165e40
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into dev-cjp
|
2023-07-14 11:20:19 +08:00 |
|
严妍
|
1ff0303729
|
对接配电箱监测大屏，左上实时数据，右上报警列表，中间配电箱实时数据接口，计算右上角实时时间。
|
2023-07-14 11:18:53 +08:00 |
|
严妍
|
1a7b013ff9
|
Squashed commit of the following:
commit eaaf9cdd86a967c876407b7d4e4954d4a06f42ad
Merge: 4ac3dd4 43b5d3c
Author: 严妍 <3096114695@qq.com>
Date: Thu Jul 13 18:04:04 2023 +0800
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into dev-cjp
commit 4ac3dd47beb94c4d29300ec149734d4bf2afa8cd
Author: 严妍 <3096114695@qq.com>
Date: Thu Jul 13 18:03:45 2023 +0800
对接 七参数大屏视频列表接口
|
2023-07-14 09:05:43 +08:00 |
|
严妍
|
eaaf9cdd86
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into dev-cjp
|
2023-07-13 18:04:04 +08:00 |
|
严妍
|
4ac3dd47be
|
对接 七参数大屏接口
|
2023-07-13 18:03:45 +08:00 |
|
严妍
|
43b5d3cd23
|
Squashed commit of the following:
commit 31df8dcfd2b73fbd4d5cdd872e7f4d5ccf264ad3
Author: 严妍 <3096114695@qq.com>
Date: Thu Jul 13 16:51:58 2023 +0800
对接劳务班组出勤分析，右侧图
|
2023-07-13 16:58:10 +08:00 |
|
严妍
|
31df8dcfd2
|
对接劳务班组出勤分析，右侧图
|
2023-07-13 16:51:58 +08:00 |
|
严妍
|
ecd1c51e30
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into dev-cjp
# Conflicts:
# src/api/modules/labor.ts
# src/views/sevenLargeScreen/laborManagement/rightTop.vue
|
2023-07-13 15:49:35 +08:00 |
|
严妍
|
106a65de66
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2023-07-13 15:42:56 +08:00 |
|
严妍
|
3e549b2d06
|
对接劳务管理部门管理人员出勤分析、按分包单位分析、劳务班组出勤分析接口。
|
2023-07-13 15:42:07 +08:00 |
|
袁晶琳
|
194d75438e
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
大屏页面调整
See merge request !2
|
2023-07-13 15:38:20 +08:00 |
|
袁晶琳
|
8f4eeaffb6
|
Merge branch 'yjl_dev' into 'master'
大屏页面调整
See merge request !1
|
2023-07-13 15:37:46 +08:00 |
|
jxj_yjl
|
b98b1d6e41
|
大屏页面调整
|
2023-07-13 15:37:02 +08:00 |
|
严妍
|
99ca32c600
|
Squashed commit of the following:
commit 2e062b9a6c69068108575c2787a723e44679c749
Author: 严妍 <3096114695@qq.com>
Date: Wed Jul 12 16:46:53 2023 +0800
对接右上按工种分析接口
|
2023-07-12 17:17:20 +08:00 |
|
jxj_yjl
|
f738f8fcfb
|
测试代码提交
|
2023-07-12 16:50:21 +08:00 |
|
严妍
|
2e062b9a6c
|
对接右上按工种分析接口
|
2023-07-12 16:46:53 +08:00 |
|
jxj_yjl
|
1d0e7b9720
|
大屏项目初始化
|
2023-07-12 09:56:31 +08:00 |
|
袁晶琳
|
42e75e316c
|
添加 readme.md
|
2023-07-12 09:23:38 +08:00 |
|