jxj_yjl
|
632b912abc
|
顶部左上角标题图片添加
|
2023-09-19 18:47:23 +08:00 |
|
cjp
|
14b7cb5896
|
fix: 编写基坑监测页面
|
2023-09-19 18:40:38 +08:00 |
|
cjp
|
72487bbe04
|
fix: 完成有毒气体监测页面静态，调整优化AI预警，地磅管理，标养室。
|
2023-09-15 17:40:49 +08:00 |
|
cjp
|
6c62ea7cd7
|
fix: 编写临边防护页面
|
2023-09-13 17:09:45 +08:00 |
|
cjp
|
1674d97e51
|
fix: AI预警，地磅管理页面调整，温度计优化。
|
2023-09-13 11:08:38 +08:00 |
|
cjp
|
72ff136b83
|
fix: 调整弹窗，标养室检测页面静态完成
|
2023-09-12 10:14:05 +08:00 |
|
cjp
|
5dc419d39f
|
fix: 完成智慧党建页面及其弹窗（6个）
|
2023-09-09 17:02:19 +08:00 |
|
chenjingpeng
|
7a2deeb334
|
fix: 编写智慧党建页面
|
2023-09-08 18:02:03 +08:00 |
|
袁晶琳
|
e98cb326d1
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
大屏整体页面调整
See merge request !19
|
2023-09-08 16:55:31 +08:00 |
|
jxj_yjl
|
984c2668a3
|
大屏整体页面调整
|
2023-09-08 16:53:53 +08:00 |
|
袁晶琳
|
3f30387882
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
调整大屏顶部标题栏
See merge request !18
|
2023-09-08 10:00:52 +08:00 |
|
jxj_yjl
|
ea7ae93cf9
|
调整大屏顶部标题栏
|
2023-09-08 09:59:15 +08:00 |
|
chenjingpeng
|
fc7bf35111
|
fix: 测试提交
|
2023-09-08 09:19:19 +08:00 |
|
cjp
|
df60bc3976
|
fix: 编写地磅管理页面
|
2023-09-07 18:55:51 +08:00 |
|
袁晶琳
|
b3dedd304c
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
综合管理-工程概况页面布局
See merge request !15
|
2023-09-07 11:28:07 +08:00 |
|
jxj_yjl
|
005f95e8c7
|
综合管理-工程概况页面布局
|
2023-09-07 11:27:21 +08:00 |
|
cjp
|
6d4e4a58fc
|
fix： 编写AI预警页面
|
2023-09-06 17:20:23 +08:00 |
|
cjp
|
28b05cc0a8
|
fix: 同步代码，并解决冲突
|
2023-09-06 14:05:12 +08:00 |
|
袁晶琳
|
03831e7407
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
新建综合管理-工程概况/智慧党建页面
See merge request !14
|
2023-09-06 11:29:09 +08:00 |
|
jxj_yjl
|
72bd743d95
|
新建综合管理-工程概况/智慧党建页面
|
2023-09-06 11:28:22 +08:00 |
|
袁晶琳
|
6475a1b85b
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
安全管理页面样式布局提交
See merge request !13
|
2023-09-06 10:36:00 +08:00 |
|
jxj_yjl
|
a456a7b0b0
|
安全管理页面样式布局提交
|
2023-09-06 10:34:27 +08:00 |
|
袁晶琳
|
247a8f86a0
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
统一标题调整
See merge request !12
|
2023-09-05 14:56:24 +08:00 |
|
jxj_yjl
|
8705ff6022
|
统一标题调整
|
2023-09-05 14:55:58 +08:00 |
|
袁晶琳
|
cebadc084e
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
标题封装
See merge request !11
|
2023-09-05 14:40:07 +08:00 |
|
jxj_yjl
|
cee35ab6d3
|
标题
|
2023-09-05 14:38:58 +08:00 |
|
jxj_yjl
|
0064f8362e
|
大屏标题组件封装
|
2023-09-05 14:35:22 +08:00 |
|
袁晶琳
|
0025e26c27
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
大屏可视化页面自动适配调整
See merge request !10
|
2023-09-05 10:37:34 +08:00 |
|
jxj_yjl
|
665b6a49f1
|
大屏可视化页面自动适配调整
|
2023-09-05 10:36:23 +08:00 |
|
袁晶琳
|
7d699ddae5
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
七参数页面调整提交
See merge request !8
|
2023-09-04 14:44:55 +08:00 |
|
jxj_yjl
|
b244ea805e
|
七参数页面调整提交
|
2023-09-04 14:43:33 +08:00 |
|
袁晶琳
|
492a99ba1c
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
扬尘噪声页面：晴雨表图片显示修复，大屏其他页面调整
See merge request !6
|
2023-08-10 15:27:52 +08:00 |
|
jxj_yjl
|
31f1fe1ecf
|
扬尘噪声页面：晴雨表图片显示修复，大屏其他页面调整
|
2023-08-10 15:26:14 +08:00 |
|
袁晶琳
|
68c7c3c8f2
|
Merge branch 'yjl_dev' into 'master'
七参数大屏页面整改/bug修复
See merge request !5
|
2023-08-01 18:14:27 +08:00 |
|
jxj_yjl
|
8a37a72e90
|
七参数大屏页面整改/bug修复
|
2023-08-01 18:12:39 +08:00 |
|
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 |
|