dearlin
|
7145e51ebb
|
告警类型统计与 区域人员统计
|
2024-03-01 15:08:30 +08:00 |
WenShiJun
|
c2c9d83777
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-01 14:37:48 +08:00 |
xiepeng
|
845c162aad
|
运营车辆
|
2024-03-01 14:32:47 +08:00 |
WenShiJun
|
4376e3a942
|
安全通知,运单登记,客户管理,地点管理功能优化
|
2024-03-01 13:53:42 +08:00 |
LiuJiaNan
|
481750be3f
|
更改历史轨迹组件引入位置
|
2024-03-01 13:52:31 +08:00 |
fangjiakai
|
75c44cf1ef
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-01 12:05:07 +08:00 |
fangjiakai
|
5cd0408124
|
人员移动增加楼层显示,解决中定点偏移
|
2024-03-01 12:03:28 +08:00 |
dearlin
|
7da60f0fbb
|
八项作业扎点与弹窗
|
2024-03-01 11:38:49 +08:00 |
LiuJiaNan
|
3aef4d21fe
|
修改电子围栏添加样式
|
2024-03-01 10:53:50 +08:00 |
LiuJiaNan
|
09618493c1
|
修复关系图警告、电子围栏和组织机构共用一个关系图组件
|
2024-03-01 10:49:18 +08:00 |
LiuJiaNan
|
cfd0f1ae63
|
bug:14355、14342、14333
|
2024-03-01 10:37:52 +08:00 |
xiepeng
|
62597aa135
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# .env
|
2024-03-01 10:27:32 +08:00 |
xiepeng
|
b3dd58b4ce
|
运营车辆
|
2024-03-01 10:27:00 +08:00 |
LiuJiaNan
|
0167dfcd75
|
人员报警增加动画
|
2024-03-01 09:53:41 +08:00 |
dearlin
|
0f14838296
|
八项作业与部分bug
|
2024-03-01 09:05:21 +08:00 |
WenShiJun
|
2a719a791e
|
客户管理模块->新增列表,添加页面功能
地点管理模块->新增列表,添加页面功能
|
2024-02-29 18:28:57 +08:00 |
LiuJiaNan
|
30233b73bd
|
去除rules用ref包装
|
2024-02-29 16:03:04 +08:00 |
LiuJiaNan
|
077432b715
|
修复清单管理table的row-key写成变量报错
|
2024-02-29 10:37:01 +08:00 |
LiuJiaNan
|
13b86add48
|
修复一人一档左侧树跳转链接错误
|
2024-02-29 09:57:20 +08:00 |
chenxinying
|
3915c76463
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-29 08:47:15 +08:00 |
chenxinying
|
305800c71a
|
PC端八项作业
|
2024-02-29 08:46:56 +08:00 |
WenShiJun
|
a11e809c8c
|
安全通知功能优化
新增运单登记列表页,添加页
|
2024-02-28 19:30:39 +08:00 |
dearlin
|
a350dc1b26
|
14328 地图BI页显示优化建议:1.特殊作业图标修改优化例如动火是红色火苗依次类推 2.显示作业添加特殊作业简称
|
2024-02-28 17:14:37 +08:00 |
wangpeng
|
69cfc999a2
|
企业信息编辑
|
2024-02-28 16:45:10 +08:00 |
dearlin
|
32a110bdf3
|
14132 这几种隐患来源的显示不正确 需要统一
|
2024-02-28 14:26:13 +08:00 |
zhangqihang
|
a63696c5e7
|
修复bug
|
2024-02-28 13:45:17 +08:00 |
dearlin
|
55d7356a8b
|
展示本月工作
|
2024-02-28 11:52:03 +08:00 |
fangjiakai
|
dfd1a6dd1a
|
人员聚集告警地图显示
|
2024-02-28 10:50:02 +08:00 |
fangjiakai
|
c33eaadd63
|
Revert "1"
This reverts commit 858e2ff33d .
|
2024-02-28 10:49:36 +08:00 |
fangjiakai
|
858e2ff33d
|
1
|
2024-02-28 10:49:12 +08:00 |
fangjiakai
|
3e43c731bb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-28 10:44:30 +08:00 |
fangjiakai
|
ab5d7f4378
|
人员聚集告警地图显示
|
2024-02-28 10:44:18 +08:00 |
LiuJiaNan
|
a863a386e0
|
跳转到BI页关闭持证作业人员到期提示
|
2024-02-28 10:27:08 +08:00 |
LiuJiaNan
|
f0590c087c
|
修复echarts警告
|
2024-02-28 10:15:13 +08:00 |
fangjiakai
|
46f099a696
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-28 09:57:53 +08:00 |
dearlin
|
aa529766d9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-28 09:56:53 +08:00 |
dearlin
|
0ddaedd8bb
|
聚集告警记录
|
2024-02-28 09:56:46 +08:00 |
LiuJiaNan
|
fb94683b9b
|
bug14305
|
2024-02-28 09:49:13 +08:00 |
LiuJiaNan
|
5024a89dbe
|
bug14306
|
2024-02-28 09:48:39 +08:00 |
LiuJiaNan
|
a4ce310e83
|
更改logo
|
2024-02-28 09:47:49 +08:00 |
zhangqihang
|
3c7c37d7f2
|
修复bug
|
2024-02-28 09:02:04 +08:00 |
fangjiakai
|
abd9830dfd
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/views/BI/components/rightico.vue
|
2024-02-28 08:42:37 +08:00 |
fangjiakai
|
e92fd99252
|
历史轨迹增加计算移动速度逻辑
|
2024-02-28 08:41:42 +08:00 |
dearlin
|
4bce1b3a71
|
解决了 Bug 添加人应该是中文名称 不是登录账号 14304
|
2024-02-27 17:28:24 +08:00 |
LiuJiaNan
|
ac61aad982
|
增加动画
|
2024-02-27 17:02:54 +08:00 |
LiuJiaNan
|
d7200aba12
|
增加动画
|
2024-02-27 17:02:30 +08:00 |
LiuJiaNan
|
92c577a110
|
去除圆角
|
2024-02-27 16:38:36 +08:00 |
LiuJiaNan
|
8d91edbab0
|
BI页面四色图
|
2024-02-27 16:33:44 +08:00 |
鲁洪霞
|
14c5bcc617
|
样式修改
|
2024-02-27 16:21:41 +08:00 |
LiuJiaNan
|
9f58dbdd9c
|
纯净地图和增加动画
|
2024-02-27 16:02:35 +08:00 |
wangpeng
|
52dd3e36e7
|
同步危化版已修复bug
修改系统名称
|
2024-02-27 15:44:17 +08:00 |
wangpeng
|
348f673286
|
Merge pull request 'dev' (#1) from integrated_whb/integrated_whb_vue:dev into dev
Reviewed-on: #1
|
2024-02-27 14:21:32 +08:00 |
LiuJiaNan
|
d50245b985
|
logo
|
2024-02-27 12:00:42 +08:00 |
dearlin
|
5ee12913dd
|
ai视频报警 移除告警来源。因为与实时告警监控冗余
|
2024-02-27 10:32:38 +08:00 |
LiuJiaNan
|
60eae2d306
|
axios
|
2024-02-27 09:28:08 +08:00 |
LiuJiaNan
|
57c0b9a589
|
bug14199
|
2024-02-27 09:27:50 +08:00 |
zhangqihang
|
539c10309a
|
修复bug
|
2024-02-27 08:47:24 +08:00 |
LiuJiaNan
|
3bed69c2c3
|
element样式
|
2024-02-27 08:37:48 +08:00 |
WenShiJun
|
83cc22ebf8
|
安全例会->新增列表、新增、详情页面
|
2024-02-26 18:30:21 +08:00 |
LiuJiaNan
|
5751d75241
|
修改echarts警告、数字增加滚动效果
|
2024-02-26 17:59:52 +08:00 |
dearlin
|
cb1f9bae82
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-26 17:25:15 +08:00 |
dearlin
|
53175a7546
|
修改地图图层
|
2024-02-26 17:25:08 +08:00 |
LiuJiaNan
|
fbc858cdef
|
首页公告增加滚动
|
2024-02-26 17:17:20 +08:00 |
dearlin
|
15e017eda5
|
修改地图图层
|
2024-02-26 16:42:30 +08:00 |
LiuJiaNan
|
28e6e12999
|
选点样式
|
2024-02-26 16:15:58 +08:00 |
LiuJiaNan
|
da2dfa5f67
|
通知公告、通知模板配置
|
2024-02-26 15:53:09 +08:00 |
fangjiakai
|
1fa8b0a609
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-26 15:37:56 +08:00 |
fangjiakai
|
d9308c7fad
|
摄像头摆放
|
2024-02-26 15:37:47 +08:00 |
zhangqihang
|
503061f7aa
|
修复bug
|
2024-02-26 15:32:44 +08:00 |
dearlin
|
691796b63b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-26 11:38:30 +08:00 |
dearlin
|
6bdbeaf4b4
|
允许进入部门,允许进入人员
|
2024-02-26 11:38:17 +08:00 |
LiuJiaNan
|
2f7623585f
|
聚集告警记录、聚集概览
|
2024-02-26 11:27:02 +08:00 |
zhangyanli
|
47dd8dffb6
|
bug:14263修复
|
2024-02-26 11:17:37 +08:00 |
fangjiakai
|
97b43e070f
|
人员路径和绘制电子围栏
|
2024-02-26 08:47:12 +08:00 |
WenShiJun
|
f025e90a0a
|
安全通知模块->新增列表、新增、详情页面
|
2024-02-23 19:07:36 +08:00 |
zhangqihang
|
626c1a4bb9
|
修复bug
|
2024-02-23 18:03:26 +08:00 |
LiuJiaNan
|
ff65a74e6d
|
定位管理
|
2024-02-23 16:54:19 +08:00 |
LiuJiaNan
|
dd513a4120
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-23 15:06:15 +08:00 |
LiuJiaNan
|
e988d6014d
|
定位管理
|
2024-02-23 15:05:53 +08:00 |
zhangyanli
|
df7071258f
|
bug:14267修复
|
2024-02-23 14:54:46 +08:00 |
LiuJiaNan
|
af9cdad62e
|
bug14254
|
2024-02-23 11:22:53 +08:00 |
LiuJiaNan
|
c5f137a2f1
|
bug14255
|
2024-02-23 11:12:47 +08:00 |
zhangqihang
|
8e436724ae
|
修复bug
|
2024-02-23 09:07:12 +08:00 |
LiuJiaNan
|
2e172df365
|
地图设置
|
2024-02-23 09:06:53 +08:00 |
dearlin
|
d977e8e4cb
|
部门新加外来人员部门属性,摄像头定位接口
|
2024-02-22 17:31:14 +08:00 |
LiuJiaNan
|
10eb0933dd
|
element样式
|
2024-02-22 16:32:49 +08:00 |
LiuJiaNan
|
8f8efc7a42
|
首页
|
2024-02-22 16:30:07 +08:00 |
wangpeng
|
d3be2a8f2a
|
更换系统主菜单
|
2024-02-22 16:18:58 +08:00 |
zhangyanli
|
31f1afa126
|
bug:14232修复
|
2024-02-22 16:14:38 +08:00 |
LiuJiaNan
|
5311ae417d
|
历史轨迹
|
2024-02-22 13:52:52 +08:00 |
LiuJiaNan
|
55ccefb142
|
历史轨迹
|
2024-02-22 11:57:42 +08:00 |
dearlin
|
4a5bd7df58
|
人员卡管理
|
2024-02-22 09:16:01 +08:00 |
zhangqihang
|
1125d63044
|
修复bug
|
2024-02-22 08:41:26 +08:00 |
zhangyanli
|
58bd9444ca
|
bug修复
|
2024-02-21 18:09:05 +08:00 |
LiuJiaNan
|
b82fce61b9
|
pdf导出改为打印
|
2024-02-21 17:31:16 +08:00 |
LiuJiaNan
|
8bf89a3736
|
历史轨迹
|
2024-02-21 16:35:31 +08:00 |
LiuJiaNan
|
f7a81d10f3
|
历史轨迹
|
2024-02-21 16:32:24 +08:00 |
LiuJiaNan
|
96b7ae4aaf
|
历史轨迹
|
2024-02-21 16:18:58 +08:00 |
zhangyanli
|
2530d035c5
|
隐患治理和清单统计bug修复
|
2024-02-21 16:14:40 +08:00 |
wangpeng
|
91457d22d4
|
特种作业人员证件临期提醒(迁表)
|
2024-02-21 11:45:23 +08:00 |
chenxinying
|
7e8ac114fe
|
特种作业人员
|
2024-02-21 11:18:02 +08:00 |
fangjiakai
|
f645b8fbe8
|
八项作业流程图
|
2024-02-21 10:48:25 +08:00 |
dearlin
|
287201927d
|
人员定位菜单
|
2024-02-21 10:41:40 +08:00 |
dearlin
|
0b5ab067fd
|
人员定位告警
|
2024-02-21 10:16:35 +08:00 |
LiuJiaNan
|
e0450b2e11
|
更改eslint规则
|
2024-02-21 09:42:49 +08:00 |
LiuJiaNan
|
83dd3a57a9
|
提示当前路由文件位置
|
2024-02-21 09:09:20 +08:00 |
dearlin
|
480013c3d2
|
地图上报警信息
|
2024-02-21 09:04:28 +08:00 |
wangpeng
|
2bb72fc628
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-21 08:39:34 +08:00 |
wangpeng
|
f5fda138c3
|
特种作业人员证件临期提醒
|
2024-02-21 08:39:20 +08:00 |
LiuJiaNan
|
93790e999a
|
element样式
|
2024-02-21 08:38:23 +08:00 |
zhangyanli
|
b6bc893c88
|
隐患排查bug修复
|
2024-02-20 17:25:15 +08:00 |
fangjiakai
|
35efe19638
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-20 17:03:04 +08:00 |
fangjiakai
|
a443986e7d
|
修改流程图
|
2024-02-20 17:02:53 +08:00 |
LiuJiaNan
|
42002585a4
|
init
|
2024-02-20 16:39:30 +08:00 |
LiuJiaNan
|
6b17aa7db0
|
BI
|
2024-02-20 14:57:09 +08:00 |
fangjiakai
|
4315877414
|
修改流程图
|
2024-02-20 14:29:49 +08:00 |
zhangqihang
|
935f7d6c9e
|
重点工程流程修复
|
2024-02-20 14:27:37 +08:00 |
zhangyanli
|
847b82afbf
|
隐患查看报错
|
2024-02-20 13:51:01 +08:00 |
zhangyanli
|
a42da670f0
|
查看隐患信息报错
|
2024-02-20 11:12:06 +08:00 |
dearlin
|
450426dff8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-20 11:11:00 +08:00 |
dearlin
|
de4b84b501
|
安全例会打印
|
2024-02-20 11:10:49 +08:00 |
fangjiakai
|
b2e0e1fd9f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-20 09:50:26 +08:00 |
fangjiakai
|
976d62cfaf
|
动火作业流程图
|
2024-02-20 09:50:15 +08:00 |
dearlin
|
4a84899838
|
安全例会,14082bug
|
2024-02-20 08:39:01 +08:00 |
zhangqihang
|
273c90be57
|
修复bug
|
2024-02-19 17:05:46 +08:00 |
dearlin
|
dd91ce3a28
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-06 15:40:50 +08:00 |
dearlin
|
1744e25b89
|
安全例会
|
2024-02-06 15:40:39 +08:00 |
chenxinying
|
bd6d6d2947
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-06 15:39:52 +08:00 |
chenxinying
|
6df7f671c4
|
查看验收视频
|
2024-02-06 15:39:39 +08:00 |
zhangyanli
|
9a6b2ea3a0
|
bug修复
|
2024-02-06 14:27:22 +08:00 |
zhangyanli
|
6dcd12b952
|
bug修复
|
2024-02-06 09:15:44 +08:00 |
zhangyanli
|
91f0d30d74
|
删除清单管理bug修复
|
2024-02-05 16:22:46 +08:00 |
LiuJiaNan
|
f3fe3cf185
|
init
|
2024-02-05 15:56:25 +08:00 |
dearlin
|
dfc19df839
|
安全隐患清单检查标准的bug问题
|
2024-02-05 15:20:30 +08:00 |
dearlin
|
357924a7c0
|
操作类型是选择的,点合格后上传照片,检查结果变空了。
操作类型是填写,点合格后最好是把合格项数据传过来。
|
2024-02-05 14:52:00 +08:00 |
zhangyanli
|
855daed2ab
|
bug修复
|
2024-02-05 14:29:54 +08:00 |
zhangqihang
|
065523c0aa
|
路由修改
|
2024-02-05 14:18:39 +08:00 |
LiuJiaNan
|
aefcd3d4e3
|
init
|
2024-02-05 14:12:24 +08:00 |
dearlin
|
34dd98ed80
|
批量打印清单
|
2024-02-05 11:48:29 +08:00 |
LiuJiaNan
|
3fbaa951bd
|
init
|
2024-02-05 10:18:41 +08:00 |
LiuJiaNan
|
0bed8dcef9
|
init
|
2024-02-05 10:11:12 +08:00 |
fangjiakai
|
aade1f3c01
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-05 09:28:04 +08:00 |
fangjiakai
|
4a56fab4d8
|
地图改为天地图
|
2024-02-05 09:27:49 +08:00 |
zhangyanli
|
4e3d69b9e4
|
导入
|
2024-02-04 17:39:17 +08:00 |
dearlin
|
375b8ed5cb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-04 17:11:56 +08:00 |
dearlin
|
0f59aa83d4
|
清单排查中无定位信息 禁止提交
|
2024-02-04 17:11:50 +08:00 |
zhangyanli
|
c2047f0e97
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-04 17:07:19 +08:00 |
zhangyanli
|
863092ccb7
|
隐患排查清单管理导入
|
2024-02-04 17:06:50 +08:00 |
chenxinying
|
47da726664
|
排查計劃
|
2024-02-04 17:06:41 +08:00 |
chenxinying
|
284407c8f9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-04 17:05:38 +08:00 |
dearlin
|
07f2a683b5
|
清单排查
|
2024-02-04 17:00:00 +08:00 |
LiuJiaNan
|
2da5e720d3
|
init
|
2024-02-04 16:18:49 +08:00 |
LiuJiaNan
|
c91e38adb9
|
init
|
2024-02-04 14:06:09 +08:00 |
zhangyanli
|
35d912e707
|
隐患排查清单管理
|
2024-02-04 14:03:35 +08:00 |
zhangyanli
|
76af1d175e
|
隐患排查清单管理
|
2024-02-04 14:02:30 +08:00 |
dearlin
|
f5690e4056
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-04 13:56:34 +08:00 |
dearlin
|
1b06549a31
|
清单排查
|
2024-02-04 13:56:28 +08:00 |
LiuJiaNan
|
55a5470adc
|
init
|
2024-02-04 13:50:28 +08:00 |
dearlin
|
2dfe2e9ee7
|
隐患清单排查状态变更
|
2024-02-04 11:42:56 +08:00 |
chenxinying
|
1ed77eabd0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-04 11:09:47 +08:00 |
fangjiakai
|
ecf918bc38
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-04 09:16:51 +08:00 |
fangjiakai
|
0a52cca78b
|
地图电子围栏
|
2024-02-04 09:16:40 +08:00 |
chenxinying
|
9b4fc4fa0d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-04 09:10:58 +08:00 |
zhangyanli
|
c950b86ceb
|
路由
|
2024-02-04 09:00:23 +08:00 |
zhangyanli
|
592d8716ab
|
隐患排查检查清单
|
2024-02-04 08:55:43 +08:00 |
dearlin
|
a1eca8d05d
|
地图相关展示默认值为0,清单检查情况完善隐患排查清单
|
2024-02-04 08:50:52 +08:00 |
LiuJiaNan
|
eb43ac1e95
|
init
|
2024-02-03 18:00:44 +08:00 |
zhangqihang
|
baca47e4cf
|
重点工程
|
2024-02-03 17:56:17 +08:00 |
chenxinying
|
3097645a25
|
刪除清單管理隱患排查清單
|
2024-02-03 17:04:07 +08:00 |
fangjiakai
|
f0a6339a7d
|
添加隐患发现部门
|
2024-02-03 15:55:45 +08:00 |
LiuJiaNan
|
4ee2018f16
|
init
|
2024-02-03 14:07:23 +08:00 |
chenxinying
|
fe685942cf
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-03 14:02:34 +08:00 |
chenxinying
|
ff680ec1de
|
刪除清單管理
|
2024-02-03 14:02:14 +08:00 |
dearlin
|
f4b61c1003
|
bi页统计数值默认0,ai视频分所有摄像头扎点
|
2024-02-03 11:37:05 +08:00 |
fangjiakai
|
f4490f70b7
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/request/map.js
# src/views/BI/components/bottom_options.vue
# src/views/BI/js/map.js
|
2024-02-03 10:19:12 +08:00 |
fangjiakai
|
c6eec67e71
|
作业票地图显示
|
2024-02-03 10:17:02 +08:00 |
dearlin
|
0a53421386
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-03 09:43:12 +08:00 |
dearlin
|
c9e14d6fcf
|
八项作业摄像头播放相关
|
2024-02-03 09:42:50 +08:00 |
chenxinying
|
8c7cb413fe
|
八项作业受限空间和高处作业PC端显示
|
2024-02-03 08:46:43 +08:00 |
chenxinying
|
d699e3472f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-02 14:09:20 +08:00 |
chenxinying
|
f6d550ab3e
|
受限空间,高处作业
|
2024-02-02 14:08:57 +08:00 |
fangjiakai
|
998b8413b7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-01 17:38:58 +08:00 |
fangjiakai
|
6fdd4126c5
|
取消地图entity贴地限制
|
2024-02-01 17:38:43 +08:00 |
LiuJiaNan
|
2324d1110d
|
init
|
2024-02-01 17:37:47 +08:00 |
zhangyanli
|
5ea9fb929d
|
隐患排查批量删除
|
2024-02-01 16:41:45 +08:00 |
zhangyanli
|
e24a7c48aa
|
隐患排查清单
|
2024-02-01 15:35:37 +08:00 |
fangjiakai
|
92e98ffa1b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-01 15:06:35 +08:00 |
fangjiakai
|
7a55d48a18
|
BI地图页 动火作业标点
|
2024-02-01 15:05:31 +08:00 |
LiuJiaNan
|
632b540938
|
init
|
2024-02-01 08:21:01 +08:00 |
dearlin
|
42a75014e0
|
辨别部位里电子围栏名称字段修改
|
2024-01-31 17:19:49 +08:00 |
LiuJiaNan
|
6884d11144
|
init
|
2024-01-31 16:57:16 +08:00 |
LiuJiaNan
|
440a1bd252
|
init
|
2024-01-31 16:44:17 +08:00 |
LiuJiaNan
|
62798bee5f
|
init
|
2024-01-31 15:38:40 +08:00 |
fangjiakai
|
b45a400b91
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/views/BI/components/work_safely.vue
# src/views/BI/index.vue
|
2024-01-31 09:05:24 +08:00 |
fangjiakai
|
fdc7d02735
|
BI地图页
|
2024-01-31 09:03:02 +08:00 |
LiuJiaNan
|
9169935d67
|
init
|
2024-01-30 17:36:49 +08:00 |
dearlin
|
11d8a5f2e6
|
辨别部位里电子围栏名称字段修改
|
2024-01-30 15:41:48 +08:00 |
dearlin
|
307b9fcc4d
|
电子围栏必选,电子围栏区域名称 必填项
|
2024-01-30 15:24:17 +08:00 |
dearlin
|
253e5ae799
|
电子围栏
|
2024-01-30 15:22:17 +08:00 |
LiuJiaNan
|
71eea9850c
|
init
|
2024-01-29 17:43:23 +08:00 |
dearlin
|
3e489b86f3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-29 17:35:26 +08:00 |
dearlin
|
aa5c41e8ba
|
bi页人员定位,ai视频分析完成
|
2024-01-29 17:35:09 +08:00 |
LiuJiaNan
|
47b58382ab
|
init
|
2024-01-27 17:41:00 +08:00 |
LiuJiaNan
|
07eb6d8306
|
init
|
2024-01-26 18:04:18 +08:00 |
LiuJiaNan
|
7724a93c30
|
init
|
2024-01-26 16:16:02 +08:00 |
dearlin
|
04f28b4acc
|
ai视频报警
|
2024-01-26 15:52:00 +08:00 |
LiuJiaNan
|
41f08a759e
|
init
|
2024-01-26 10:24:28 +08:00 |
chenxinying
|
bd76ab2a39
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/assets/js/asyncRouter.js
|
2024-01-26 08:59:59 +08:00 |
zhangqihang
|
ca7eadbb19
|
重点工程(不包括AI报警和视频监控)
|
2024-01-25 18:05:58 +08:00 |
LiuJiaNan
|
3c06405a40
|
init
|
2024-01-25 18:00:08 +08:00 |
chenxinying
|
486fea5b03
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/assets/js/asyncRouter.js
|
2024-01-25 17:54:39 +08:00 |
dearlin
|
659469ec58
|
清单检查要有电子围栏禁止排查
|
2024-01-25 17:35:13 +08:00 |
dearlin
|
f7859bdb34
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-25 14:22:20 +08:00 |
dearlin
|
53b63fabc1
|
人员与辨别部位对接第三方
|
2024-01-25 14:22:04 +08:00 |
鲁洪霞
|
b8006fa5ec
|
样式修改
|
2024-01-25 11:35:41 +08:00 |
鲁洪霞
|
919644d1dd
|
样式修改
|
2024-01-25 11:23:48 +08:00 |
鲁洪霞
|
added38399
|
BI页面
|
2024-01-25 10:28:53 +08:00 |
LiuJiaNan
|
70f10de762
|
init
|
2024-01-24 18:08:04 +08:00 |
LiuJiaNan
|
0a76bcbdf0
|
init
|
2024-01-22 17:15:27 +08:00 |
LiuJiaNan
|
1812d05ec3
|
init
|
2024-01-22 16:18:39 +08:00 |
z
|
6db2c2cb03
|
init
|
2024-01-22 15:55:37 +08:00 |
z
|
ec267cc310
|
init
|
2024-01-20 17:18:25 +08:00 |
z
|
9b837c85c9
|
init
|
2024-01-20 14:13:41 +08:00 |
z
|
41a4ee6edd
|
init
|
2024-01-20 09:19:27 +08:00 |
z
|
7166ee57d8
|
init
|
2024-01-20 08:48:10 +08:00 |
z
|
4bd0189616
|
init
|
2024-01-19 17:41:26 +08:00 |
z
|
daa59776e3
|
init
|
2024-01-19 08:21:45 +08:00 |
z
|
e181a0ef35
|
init
|
2024-01-17 17:56:46 +08:00 |
z
|
7ed384d478
|
init
|
2024-01-17 10:48:18 +08:00 |
chenxinying
|
63be3b2f81
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-17 10:23:18 +08:00 |
z
|
9bd8936773
|
init
|
2024-01-16 18:03:59 +08:00 |
chenxinying
|
fcb5dd3908
|
视频监控列表
|
2024-01-16 15:15:52 +08:00 |
z
|
4f53bd7e81
|
init
|
2024-01-15 18:00:19 +08:00 |
chenxinying
|
ae9707dc6c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-15 17:20:29 +08:00 |
z
|
6184e2c723
|
init
|
2024-01-15 15:11:17 +08:00 |
z
|
fee5d6f786
|
init
|
2024-01-15 13:51:54 +08:00 |
chenxinying
|
b3055a31fd
|
八项作业添加监控播放
|
2024-01-15 10:09:11 +08:00 |
z
|
fef033926e
|
init
|
2024-01-13 17:35:14 +08:00 |
z
|
a46297da57
|
init
|
2024-01-13 13:46:40 +08:00 |
z
|
6216d08511
|
init
|
2024-01-13 09:50:30 +08:00 |
z
|
2fe776a3f6
|
init
|
2024-01-12 18:21:07 +08:00 |
chenxinying
|
f9b2c57e26
|
八项作业添加监控
|
2024-01-12 14:38:08 +08:00 |
chenxinying
|
8dd359b08f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-12 09:56:35 +08:00 |
z
|
b30aaf9f34
|
init
|
2024-01-12 09:51:58 +08:00 |
z
|
f12ae4a5bc
|
init
|
2024-01-11 18:01:45 +08:00 |
chenxinying
|
bc637b6fce
|
八项作业添加监控
|
2024-01-11 17:15:52 +08:00 |
duhang
|
461d5e31e7
|
✨ 在线学习与考试-课件管理-视频/资料课件维护-新增/修改未做
|
2024-01-11 14:57:20 +08:00 |
z
|
20a8d64ea1
|
init
|
2024-01-11 14:40:34 +08:00 |
duhang
|
5db9c3f30a
|
Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb_vue into dev
|
2024-01-10 19:17:17 +08:00 |
duhang
|
405c6c296d
|
🎨 教育培训-统一调整已完成功能的样式(含打印)
|
2024-01-10 19:17:03 +08:00 |