Compare commits

...

523 Commits
main ... dev

Author SHA1 Message Date
wangpeng 3851711c06 从业人员显示信息优化 2024-07-14 07:09:16 +08:00
xiepeng f2e506b300 BUG优化 2024-07-12 19:27:21 +08:00
xiepeng bad300b152 BUG优化 2024-07-11 18:33:06 +08:00
wangpeng 126c2f048e 更换开发和测试环境 2024-07-09 14:40:42 +08:00
xiepeng c8e57d376e BUG优化 2024-07-08 18:00:07 +08:00
xiepeng 45c87b896e BUG优化 2024-07-08 08:27:52 +08:00
xiepeng 261bcdf3d5 BUG优化 2024-07-03 10:51:16 +08:00
xiepeng 56b3e8f052 BUG优化 2024-07-02 10:19:32 +08:00
WL f06cc86d7f 修复试卷草稿管理按钮显示样式 2024-06-28 16:09:42 +08:00
WL a841c66aa0 Merge branch 'dev' of http://47.92.113.182:3000/wangpeng/integrated_traffic_vue into dev 2024-06-27 15:41:06 +08:00
WL d927b68044 修复一企一档-年度安全培训教育计划导出失败问题 2024-06-27 15:41:00 +08:00
wangpeng 5eaa8dc509 app更新 2024-06-25 18:04:20 +08:00
wangpeng dc7bd92ac7 代码格式化 2024-06-25 11:50:37 +08:00
xiepeng 454dfcf300 BUG优化 2024-06-21 17:58:29 +08:00
WL 27b5c216c9 修复bug:#16407 清单排查后发现隐患,隐患整改未看到数据。 2024-06-21 15:40:27 +08:00
WL 174e504780 修复bug:#16405 风险分级数据未显示。 2024-06-21 09:24:39 +08:00
WL 0e82b667fd 修复bug:#16375 列表增加培训类型显示。 2024-06-21 08:57:03 +08:00
WL 78d6c9f6b2 Merge branch 'dev' of http://47.92.113.182:3000/wangpeng/integrated_traffic_vue into dev 2024-06-21 08:37:41 +08:00
WL d1dd0c0ab9 修复bug:#16374 列表拉长给班级名称显示全了。 2024-06-21 08:37:35 +08:00
xiepeng 37cf516678 BUG优化 从业人员 新增选人 功能 2024-06-20 17:18:53 +08:00
WL 636f192253 修复bug:#16251 把课件名称显示全了,因为导入试卷的时候需要提供课件名称。 在别的地方无法查看课件名称 2024-06-20 09:51:52 +08:00
wangpeng 67ddfa2cfd 修改三项制度库 2024-06-17 18:06:37 +08:00
wangpeng b622567973 代码格式化 2024-06-14 13:01:08 +08:00
xiepeng 3420e2b965 BUG优化 2024-06-06 18:00:27 +08:00
xiepeng db462d943f BUG优化 2024-06-05 18:00:28 +08:00
xiepeng 7681bd4a5a BUG优化 2024-06-04 18:03:22 +08:00
xiepeng d0a75a5ea1 BUG优化 2024-06-03 18:01:11 +08:00
LiuJiaNan 85ae613eb8 bug:15741、15743 2024-05-31 08:56:00 +08:00
xiepeng def2819255 BUG优化 2024-05-29 14:06:05 +08:00
xiepeng 7c7f5fda26 BUG优化 人员类型不显示 2024-05-24 16:28:53 +08:00
wangpeng 328200bfa6 代码格式化 2024-05-23 16:37:30 +08:00
xiepeng 6c6086a63d BUG优化 人员类型不显示 2024-05-23 15:57:05 +08:00
xiepeng ad35c2cf4c BUG优化 人员类型不显示 2024-05-23 10:39:58 +08:00
xiepeng 49038e5d1e BUG优化 人员类型不显示 2024-05-23 10:33:11 +08:00
xiepeng 8e764eecbb BUG优化 2024-05-21 17:56:48 +08:00
zhangyanli 1aba082ea7 交通班级一人一档修改 2024-05-20 17:58:11 +08:00
xiepeng 7e2fdc7acc BUG优化 2024-05-17 17:57:27 +08:00
wangpeng bf3311254e 代码格式化 2024-05-17 09:57:43 +08:00
xiepeng 057d019e4e BUG优化 2024-05-16 18:01:29 +08:00
xiepeng fd40d59ede BUG优化 2024-05-15 18:08:36 +08:00
wangpeng 274b58f12f 代码格式化 2024-05-15 09:51:40 +08:00
zhangyanli 861cef7aa5 交通类型档案生成 2024-05-15 09:03:59 +08:00
zhangyanli b4fa582fdc Merge remote-tracking branch 'origin/dev' into dev 2024-05-15 09:03:13 +08:00
xiepeng 7874734e31 营运车辆修改同步行车三检 2024-05-13 18:01:12 +08:00
277151821@qq.com 46487fb9c1 罐检管理 2024-05-13 17:55:54 +08:00
zhangyanli 98ea81ede4 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/enterprise_management/information/edit.vue
2024-05-13 08:58:36 +08:00
xiepeng aacd9b0881 BUG优化
行车三检 状态调整
机务档案 的到期日期显示不正确
2024-05-11 18:00:41 +08:00
xiepeng 7c9aa8603d BUG优化
行车三检 详情 添加安全承诺记录
2024-05-10 17:51:33 +08:00
xiepeng b23d40a502 BUG优化 2024-05-09 18:08:56 +08:00
xiepeng 0ed592689f BUG优化
电子运单 添加详情 删除判断
客户管理的新增运单存在的联系人无法删除
地点管理的新增运单存在的联系人无法删除
2024-05-08 17:58:00 +08:00
wangpeng 3fbef6ce57 应急资源模块
代码格式化
2024-05-08 09:50:53 +08:00
xiepeng 6f0b136a2f BUG优化 2024-05-07 18:03:26 +08:00
xiepeng b1f3b11945 BUG 优化 营运车辆和货运挂车的部门显示ID
事故人员显示ID
2024-05-06 17:42:14 +08:00
xiepeng 9f7a11dd3b BUG 优化 2024-04-30 17:54:33 +08:00
xiepeng df25c3b3f8 BUG 优化 2024-04-29 17:54:44 +08:00
277151821@qq.com db6c4bfaea 用户管理、从业人员 2024-04-29 09:23:04 +08:00
xiepeng 77c6a36092 BUG 优化 2024-04-28 17:58:01 +08:00
xiepeng 51756106a2 BUG 优化 2024-04-26 18:03:07 +08:00
LiuJiaNan c9e9f71e54 安全生产费用提取和使用管理合计 2024-04-26 11:03:06 +08:00
xiepeng 9a445bc29b BUG 优化 2024-04-25 18:01:55 +08:00
xiepeng d291a9b98e BUG 优化 2024-04-25 09:52:34 +08:00
wangpeng 202edf8c8e 代码格式化
车辆颜色改为车牌颜色
自编号改为编号
2024-04-23 22:17:15 +08:00
xiepeng 629e17a48f BUG 优化 2024-04-23 18:04:08 +08:00
xiepeng 143c0e5c96 BUG 优化 2024-04-22 17:56:27 +08:00
xiepeng 4fd3727c49 BUG 优化 2024-04-19 12:07:50 +08:00
xiepeng 6e324752fe Merge remote-tracking branch 'origin/dev' into dev 2024-04-18 17:50:38 +08:00
xiepeng a0780144ca BUG 优化 2024-04-18 17:49:12 +08:00
wangpeng 2be771dd52 行业培训类型组件编辑bug修改 2024-04-18 11:50:11 +08:00
鲁洪霞 afcf3545dd 2024-04-18 09:11:49 +08:00
xiepeng 18a5889e1f Merge remote-tracking branch 'origin/dev' into dev 2024-04-17 13:03:56 +08:00
xiepeng ddf52fc4ca BUG 优化 2024-04-17 13:02:05 +08:00
鲁洪霞 266c069378 2024-04-17 09:28:48 +08:00
wangpeng be4df46323 修改正式环境
代码格式化
2024-04-17 00:27:03 +08:00
xiepeng 16ae293b11 BUG 优化 2024-04-16 17:30:12 +08:00
xiepeng 8b8eab7b72 BUG 优化 2024-04-16 16:19:55 +08:00
xiepeng 258e02c2b6 BUG 优化 2024-04-16 11:23:07 +08:00
xiepeng 7b37c0fcf1 BUG 优化 2024-04-16 09:47:06 +08:00
xiepeng f4518ef360 BUG 优化 2024-04-15 18:00:07 +08:00
xiepeng 57487151d6 BUG 优化 2024-04-12 18:04:26 +08:00
wangpeng 9eab7f33e8 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	.env
#	.env.production
2024-04-12 11:21:59 +08:00
wangpeng ea258a8e3b 修改启动后台配置 2024-04-12 11:21:20 +08:00
LiuJiaNan 9b8ad27e57 环境变量 2024-04-12 11:08:15 +08:00
LiuJiaNan f2e8d02867 环境变量 2024-04-12 10:26:05 +08:00
LiuJiaNan f77aa17083 登录页 2024-04-12 09:26:48 +08:00
wangpeng 426ed0b6a2 地点管理修改行政区域必填 2024-04-11 20:36:00 +08:00
xiepeng a9ae574aff BUG 优化 2024-04-11 18:29:01 +08:00
wangpeng d51784a22d Merge remote-tracking branch 'origin/dev' into dev 2024-04-11 16:12:24 +08:00
wangpeng 8267ffda49 js方法替换 2024-04-11 16:12:17 +08:00
LiuJiaNan d03a7f2a76 登录页 2024-04-11 15:25:53 +08:00
wangpeng a7b28c8e3d 课程管理编辑异常处理 2024-04-11 12:39:44 +08:00
wangpeng 30be7bc705 培训行业类型编辑异常 2024-04-11 11:26:01 +08:00
wangpeng 14a8be1d8d 调试安全通知选择人员回调问题 2024-04-11 10:38:24 +08:00
wangpeng edb4fc5c1a 调试安全通知选择人员回调问题 2024-04-10 19:54:11 +08:00
xiepeng ae3cba5fb8 BUG 优化 2024-04-10 16:53:36 +08:00
wangpeng 30c65501a6 安全费用投入 2024-04-09 21:58:03 +08:00
wangpeng db057467b2 补充替换CORPINFO_ID通用标识 2024-04-09 21:52:02 +08:00
xiepeng 680b3cc994 BUG 优化 2024-04-09 19:08:35 +08:00
wangpeng ba03a2fa12 删除统一样式
修复安全体系管理
2024-04-09 16:07:52 +08:00
wangpeng 02d7364a6e 代码格式化 2024-04-09 10:27:59 +08:00
鲁洪霞 ad790b4ce9 2024-04-09 10:09:47 +08:00
wangpeng ce38a19607 优化人员选择 2024-04-08 20:11:06 +08:00
xiepeng df72d06332 BUG 优化 2024-04-08 18:02:34 +08:00
wangpeng cabb170582 合并菜单 2024-04-08 17:08:01 +08:00
xiepeng edc013140f BUG 优化 2024-04-07 18:51:27 +08:00
LiuJiaNan 3171a705a0 修改useListData函数签名 2024-04-07 15:04:03 +08:00
xiepeng c57edc5b22 BUG 优化 2024-04-03 17:57:47 +08:00
LiuJiaNan d669e371a0 14962 2024-04-03 09:26:05 +08:00
xiepeng 43b9287721 BUG 优化 2024-04-02 18:52:04 +08:00
xiepeng a090f54ecf Merge remote-tracking branch 'origin/dev' into dev 2024-04-02 08:26:09 +08:00
wangpeng 57dfe8f8c5 批量屏蔽经营企业和经营类型
消除代码编译的警告、错误
2024-04-02 08:23:59 +08:00
xiepeng 83faf65bb4 BUG 优化 2024-04-01 18:55:28 +08:00
鲁洪霞 456855000a 2024-04-01 17:25:09 +08:00
xiepeng 1306882ed0 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
#	src/views/mechanical_files/inspect_annually/index.vue
2024-04-01 10:44:15 +08:00
xiepeng 3de96ec2c2 BUG 优化 2024-04-01 10:37:47 +08:00
wangpeng 8619753b0a 消除代码编译的警告、错误 2024-04-01 10:04:41 +08:00
wangpeng f2d72723ef 从危化版同步隐患排查所有功能 2024-04-01 09:21:56 +08:00
zhangyanli d7dd618c8a 档案管理和效果评估bug 2024-04-01 08:32:32 +08:00
WenShiJun 287ca601e4 Merge remote-tracking branch 'origin/dev' into dev 2024-03-30 17:42:42 +08:00
WenShiJun e7e07310bc 页面控制台警告优化 2024-03-30 17:42:01 +08:00
WenShiJun 6e8d9f4154 点击编辑附件名称没有回显bug优化 2024-03-30 16:01:37 +08:00
zhangyanli b2813297c6 档案管理和效果评估bug 2024-03-30 14:57:28 +08:00
xiepeng f96eb0701c Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 18:07:14 +08:00
xiepeng 328b76dcde BUG 优化 2024-03-29 18:07:08 +08:00
WenShiJun c60f698ef5 Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 18:06:42 +08:00
WenShiJun adf753755b bug优化 2024-03-29 18:06:37 +08:00
xiepeng 3e709eb383 Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 13:38:52 +08:00
xiepeng d77a118fc8 BUG 优化 2024-03-29 13:38:39 +08:00
WenShiJun 88b97b8037 生成安全事故档案bug优化 2024-03-29 10:48:10 +08:00
WenShiJun c57033a56f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/mechanical_files/taxation_manage/index.vue
#	src/views/production_course_regulate/violation_registration/index.vue
2024-03-28 18:39:17 +08:00
WenShiJun 0369b0a784 bug优化 2024-03-28 18:36:17 +08:00
xiepeng 0fc9cd9a76 BUG 优化 2024-03-28 18:31:58 +08:00
xiepeng 5f167d98da Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/mechanical_files/production_accident/add.vue
2024-03-27 18:17:57 +08:00
xiepeng 3b29fb05fc BUG 优化 2024-03-27 18:09:02 +08:00
WenShiJun 5cfc44479c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/mechanical_files/beidou/index.vue
#	src/views/mechanical_files/taxation_manage/index.vue
2024-03-27 18:08:03 +08:00
WenShiJun 301b97d4f4 bug优化 2024-03-27 18:05:30 +08:00
zhangyanli 3cb8221676 教培功能bug修复 2024-03-27 15:53:32 +08:00
xiepeng 40a5fd2496 提醒天数 下拉 2024-03-27 10:02:58 +08:00
xiepeng 25680c9e26 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/assets/js/constant.js
2024-03-26 18:04:58 +08:00
xiepeng cfec695c81 修改车牌号、车架号、发动机号校验
图片显示
2024-03-26 18:04:04 +08:00
WenShiJun cf7e5686e4 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/enterprise_management/basics_info_management/freight_trailer/add.vue
#	src/views/enterprise_management/basics_info_management/freight_trailer/index.vue
2024-03-26 18:03:19 +08:00
WenShiJun 558799d0c9 bug优化 2024-03-26 18:02:32 +08:00
wangpeng ab68b10197 修改 名称 2024-03-25 19:02:07 +08:00
WenShiJun 6c1000d5f9 页面样式优化,输入框内容清除 2024-03-25 14:27:52 +08:00
WenShiJun 4c69d2f8a7 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/mechanical_files/inspect_annually/index.vue
#	src/views/mechanical_files/insure/index.vue
#	src/views/mechanical_files/taxation_manage/add.vue
2024-03-25 11:42:37 +08:00
WenShiJun 8cfa203273 保险管理,运营管理,维保管理,北斗管理优化 2024-03-25 11:39:42 +08:00
xiepeng 0e10930e28 Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 10:17:49 +08:00
wangpeng 097433eaf4 Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 09:41:59 +08:00
zhangyanli 5e1b790772 教培建班 2024-03-25 09:37:38 +08:00
wangpeng b098bf7dcd 部署异常修复 2024-03-25 09:27:54 +08:00
鲁洪霞 9684793f2d 2024-03-25 09:22:27 +08:00
LiuJiaNan 6df0f3f247 企业用户管理、档案管理、效果评估 2024-03-25 09:13:10 +08:00
xiepeng 8a90839b14 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/assets/js/constant.js
#	src/request/assigned_manage.js
#	src/request/enterprise_management.js
#	src/request/operation_vehicle.js
#	src/request/scrap_manage.js
#	src/request/taxation_manage.js
#	src/views/enterprise_management/basics_info_management/freight_trailer/index.vue
#	src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
#	src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
#	src/views/mechanical_files/inspect_annually/index.vue
#	src/views/mechanical_files/insure/index.vue
#	src/views/mechanical_files/scrap_manage/add.vue
#	src/views/mechanical_files/taxation_manage/add.vue
#	src/views/mechanical_files/taxation_manage/edit.vue
2024-03-25 08:52:36 +08:00
xiepeng 70f430b6b6 修改车船税过户显示 营运车辆车牌号唯一 2024-03-25 08:47:41 +08:00
chenxinying 2d1eb54c60 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 17:43:42 +08:00
chenxinying d7cccbed87 行车三检检查日志 2024-03-22 17:29:59 +08:00
WenShiJun 037e723d71 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 17:18:20 +08:00
WenShiJun cd5110f5c5 年检管理,保险管理优化 2024-03-22 17:18:08 +08:00
鲁洪霞 7ed209f82a Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 16:47:40 +08:00
chenxinying 55677507ac 行车三检承诺问询,排查类别检查项 2024-03-22 15:08:24 +08:00
鲁洪霞 7b110927c4 2024-03-22 15:02:41 +08:00
wangpeng 3213c25bc1 从业人员管理 2024-03-22 14:59:41 +08:00
WenShiJun 6c66a00624 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 14:36:07 +08:00
WenShiJun deaa659d2b 运单登记,地点管理,客户管理模块优化 2024-03-22 14:35:55 +08:00
zhangyanli 4663e598b2 档案管理和效果评估 2024-03-21 16:22:25 +08:00
LiuJiaNan f6e8a66857 班级管理/课程 2024-03-21 16:21:13 +08:00
LiuJiaNan 82f7c1709b dialog的:on-close换成@close 2024-03-21 11:49:21 +08:00
LiuJiaNan ea9800791a 班级管理/课程 2024-03-20 17:46:54 +08:00
chenxinying e803f8bf41 行车三检承诺问询,排查类别检查项 2024-03-20 17:04:34 +08:00
WenShiJun 02a0c7fcae Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/enterprise_management/department/components/add.vue
2024-03-20 16:58:48 +08:00
WenShiJun f4606dfdde 安全生产月活动,安全知识手册模块开发
运单登记,地点管理模块优化,
2024-03-20 16:58:12 +08:00
LiuJiaNan 80f0ffbbe1 element新版本api弃用警告 2024-03-20 15:45:42 +08:00
zhangyanli 1ffbba0de9 档案管理和效果评估 2024-03-20 10:02:16 +08:00
LiuJiaNan 8156e84bff axios 2024-03-20 08:31:26 +08:00
LiuJiaNan 3bb1832d68 班级管理/学员 2024-03-19 18:00:48 +08:00
LiuJiaNan 39ccafdc17 班级管理/学员 2024-03-19 17:43:42 +08:00
LiuJiaNan 6699355494 班级管理/学员 2024-03-19 16:17:08 +08:00
xiepeng abafba83fb Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/assets/js/constant.js
#	src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
#	src/views/mechanical_files/assigned_manage/add.vue
2024-03-19 14:08:38 +08:00
xiepeng 6419d6c50c 过户管理
报废管理
企业安全生产值班记录
生产设备设施台账
劳动防护用品发放记录
消防设备设施台账
上报事件处理台账
2024-03-19 14:04:17 +08:00
LiuJiaNan 54916b2756 element新版本dialog样式问题 2024-03-19 13:54:13 +08:00
LiuJiaNan fa41f42465 班级管理 2024-03-18 18:01:48 +08:00
LiuJiaNan f0c4ec11bb 试卷管理 2024-03-15 17:59:16 +08:00
LiuJiaNan ab93425d83 试卷管理 2024-03-15 17:56:45 +08:00
WenShiJun 375021971d Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/assets/js/constant.js
#	src/views/safety_production_related/things_check/index.vue
2024-03-15 17:55:34 +08:00
WenShiJun 9472c26770 生产安全事故档案模块开发 2024-03-15 17:54:28 +08:00
277151821@qq.com 5d9aba7426 删除console 2024-03-15 15:57:47 +08:00
277151821@qq.com a411f039ab 运营管理 2024-03-15 11:13:20 +08:00
277151821@qq.com 290a7a0d4c 维保管理 2024-03-15 11:12:49 +08:00
277151821@qq.com 98f433b37e 保险管理 2024-03-15 11:12:14 +08:00
277151821@qq.com 93e40741ad 北斗管理 2024-03-15 11:11:12 +08:00
zhangyanli da60a2c7c8 教培档案管理 2024-03-15 10:01:08 +08:00
LiuJiaNan a6a2fbc88b 视频播放增加去掉倍速和进度条 2024-03-15 09:23:39 +08:00
LiuJiaNan 2efc75601a 教育培训 2024-03-15 08:32:31 +08:00
LiuJiaNan 4a5dcf8b1f 教育培训 2024-03-15 08:19:56 +08:00
LiuJiaNan 1ad0b76160 删除console和禁止使用Object.assign 2024-03-14 10:46:49 +08:00
xiepeng c28033032f Merge remote-tracking branch 'origin/dev' into dev 2024-03-14 09:03:33 +08:00
xiepeng 5e3468343a 过户管理 报废管理 2024-03-14 09:03:11 +08:00
WenShiJun 3ec021ff30 Merge remote-tracking branch 'origin/dev' into dev 2024-03-13 18:06:07 +08:00
WenShiJun 68a22f3702 岗位安全承诺书、责任书,职业危害告知书,管理人员配备,安全生产目标,安全责任制考核模块开发,优化 2024-03-13 18:05:42 +08:00
LiuJiaNan 566eee266e 教育培训 2024-03-13 13:47:04 +08:00
zhangyanli f570e9dcc6 用户管理和企业管理修改 2024-03-12 09:15:23 +08:00
WenShiJun 3db91701d0 安全例会优化
岗位安全承诺书开发
岗位安全责任书开发
2024-03-11 18:09:41 +08:00
WenShiJun a1c8e248d6 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 18:06:25 +08:00
WenShiJun 4f57a393b1 新增劳务聘用合同,岗位安全责任书,职业危害告知书
安全例会优化
2024-03-08 18:06:21 +08:00
xiepeng f9bf755912 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 17:46:51 +08:00
xiepeng 2c7b50cc36 过户管理 2024-03-08 17:45:29 +08:00
277151821@qq.com c0944ad180 年检管理 2024-03-08 08:39:12 +08:00
WenShiJun 908f306f80 Merge remote-tracking branch 'origin/dev' into dev 2024-03-07 13:23:39 +08:00
xiepeng 09e9820603 运营车辆 修改 车船税 2024-03-07 10:26:07 +08:00
LiuJiaNan 33626cab78 删除没用的代码 2024-03-07 10:02:37 +08:00
LiuJiaNan 01cbe545c4 删除没用的代码 2024-03-07 10:00:45 +08:00
LiuJiaNan 0b7f1f65df 环境变量增加提示 2024-03-07 09:59:58 +08:00
277151821@qq.com 327a999598 撤回本地启动配置 2024-03-07 09:38:16 +08:00
277151821@qq.com 3a54b4ffdf 货运挂车 2024-03-07 09:33:21 +08:00
WenShiJun a3b0cded3f 安全例会模块优化->参会人员页,详情页 2024-03-06 16:11:13 +08:00
277151821@qq.com 3accb1e683 货运挂车 增加校验 2024-03-06 12:02:19 +08:00
xiepeng 4b724f5560 运营车辆 2024-03-06 09:26:27 +08:00
WenShiJun 043e071b64 安全例会模块优化 2024-03-05 18:13:53 +08:00
277151821@qq.com 0bd143e47d 货运挂车 2024-03-05 11:00:34 +08:00
WenShiJun fa170fe4d0 Merge remote-tracking branch 'origin/dev' into dev 2024-03-04 11:57:44 +08:00
WenShiJun 42e79f21be 功能优化 2024-03-04 11:57:38 +08:00
wangpeng bd44a63496 代码合并后当前项目配置信息修改 2024-03-04 11:32:03 +08:00
wangpeng e7f2af2492 Merge pull request 'dev' (#3) from integrated_whb/integrated_whb_vue:dev into dev
Reviewed-on: #3
2024-03-04 11:20:53 +08:00
wangpeng 3a29de3267 临时修改,代码合并完后再改回 2024-03-04 11:19:52 +08:00
xiepeng cb7561603b Merge remote-tracking branch 'origin/dev' into dev 2024-03-04 09:32:27 +08:00
xiepeng a9ee3e6942 运营车辆 2024-03-04 09:31:17 +08:00
鲁洪霞 94feeeb9bf 样式修改 2024-03-04 09:05:22 +08:00
LiuJiaNan 89c446c291 BI页 2024-03-04 08:30:58 +08:00
WenShiJun 37f176bd1a 新增从业人员相关页面 2024-03-01 18:05:17 +08:00
LiuJiaNan df1dcef265 实时追踪 2024-03-01 17:58:20 +08:00
LiuJiaNan b7727b0f5e 实时追踪 2024-03-01 17:51:02 +08:00
fangjiakai 3ad5910d14 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/BI/js/trajectory.js
2024-03-01 17:14:34 +08:00
LiuJiaNan b6ba08a005 人员定位区域人员统计增加自动滚动 2024-03-01 16:26:47 +08:00
fangjiakai 5fef270f7e 人员实时追踪 2024-03-01 16:21:19 +08:00
LiuJiaNan ece4403288 人员定位区域人员统计增加自动滚动 2024-03-01 15:49:32 +08:00
dearlin cf1c3bbc13 告警类型统计与 区域人员统计 2024-03-01 15:34:00 +08:00
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 0821bb98bd 人员移动增加楼层显示,解决中定点偏移,替换地图JS 2024-03-01 12:04:59 +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
LiuJiaNan 939817eff8 取消三项制度库代理 2024-02-27 16:02:06 +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
fangjiakai 5122d11abb Merge remote-tracking branch 'origin/dev' into dev 2024-02-27 10:47:15 +08:00
fangjiakai 848b623cf3 三项制度库代理 2024-02-27 10:47:03 +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 4976baad59 签字背景色改成白色 2024-02-21 09:05:40 +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 a643da6979 BI地图页 2024-01-31 09:18:20 +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 e1f1e462a8 init 2024-01-24 18:06:49 +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
z 82f63b7698 init 2024-01-10 18:01:56 +08:00
z f74c51cbb7 init 2024-01-10 13:52:16 +08:00
duhang 6124a37116 🔥 移除无用todo 2024-01-10 11:18:04 +08:00
duhang 3ef14d2406 🐜 教育培训-平台资源库-课程管理-课件预览 2024-01-10 10:58:32 +08:00
duhang 24387955fe 视频课件 2024-01-10 10:42:12 +08:00
duhang 43298dfa07 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb_vue into dev 2024-01-10 10:05:36 +08:00
z 8ca5d0b105 init 2024-01-10 10:04:26 +08:00
z bab6fe50b8 init 2024-01-10 10:03:17 +08:00
duhang dccf6f8d49 🐜 教育培训-平台资源库-试卷管理-调整题目 2024-01-10 09:12:29 +08:00
duhang eb5cd17c49 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb_vue into dev 2024-01-09 19:51:34 +08:00
duhang d200851bc9 教育培训-档案管理 2024-01-09 19:51:01 +08:00
z 0bba51d4d9 init 2024-01-09 18:02:04 +08:00
z f8b71eccbf init 2024-01-09 16:20:28 +08:00
duhang faeb08ff24 教育培训-档案管理-一期一档/一企一档-剩余档案编辑 2024-01-08 20:21:32 +08:00
duhang 382f6fa062 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb_vue into dev 2024-01-08 18:27:07 +08:00
duhang c9b83bc968 平台资源库-试卷管理、档案管理-一人一档 2024-01-08 18:26:39 +08:00
z 0525bed574 init 2024-01-08 18:04:31 +08:00
z 88bcda5eea init 2024-01-08 17:48:35 +08:00
z fb75396024 init 2024-01-08 17:47:50 +08:00
z 079e4c17b9 init 2024-01-08 14:31:18 +08:00
z 3ad49a0620 init 2024-01-06 17:44:23 +08:00
duhang b9f0889fed 🐛 课件资源管理路由 2024-01-05 18:35:33 +08:00
duhang f9aa36fc15 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb_vue into dev 2024-01-05 18:23:29 +08:00
duhang b2d75a5b86 教育培训-平台资源库-课件资源管理(视频、资料)、课程管理 2024-01-05 18:23:04 +08:00
z b5861440f2 init 2024-01-05 18:02:22 +08:00
z 1fc7e96f0d init 2024-01-05 17:33:18 +08:00
z 29b4c7d2ba init 2024-01-05 15:49:15 +08:00
z bff8547433 init 2024-01-05 14:42:51 +08:00
z 474c5ee580 init 2024-01-05 14:32:49 +08:00
liujianan 0180e34d6e init 2024-01-04 09:26:49 +08:00
liujianan 38e615ca83 init 2024-01-04 09:23:56 +08:00
726 changed files with 89133 additions and 2118 deletions

3
.env
View File

@ -1,4 +1,3 @@
VITE_BASE_URL=http://192.168.0.17:8001/
VITE_PROXY=/api
VITE_FILE_URL=https://file.zcloudchina.com/YTHFile
VITE_TEMPLATE_URL=https://qaaq.qhdsafety.com/file/

View File

@ -0,0 +1,3 @@
VITE_BASE_URL=http://192.168.0.16:7082/
VITE_ON_LINE_WEB_SOCKET_URL=ws://192.168.20.240:8869
VITE_LEARNING_WEB_SOCKET_URL=ws://192.168.20.240:8899

View File

@ -0,0 +1,16 @@
#测试
VITE_BASE_URL=http://192.168.20.240:8412/integrated_traffic/
#websocket t掉线
VITE_ON_LINE_WEB_SOCKET_URL=ws://192.168.20.240:8869
#websocket 在线学习
VITE_LEARNING_WEB_SOCKET_URL=ws://192.168.20.240:8899
##正式
#VITE_BASE_URL=http://39.101.166.211:8073/integrated_traffic/
##websocket t掉线
#VITE_ON_LINE_WEB_SOCKET_URL=ws://39.101.166.211:8869
## VITE_ON_LINE_WEB_SOCKET_URL=wss://qaaqjt.qhdsafety.com/disconnected/
##websocket 在线学习
#VITE_LEARNING_WEB_SOCKET_URL=ws://39.101.166.211:8899
## VITE_LEARNING_WEB_SOCKET_URL=wss://qaaqjt.qhdsafety.com/onlinelearning/

View File

@ -2,3 +2,4 @@ public
dist
package.json
!.prettierrc.cjs
env.d.ts

View File

@ -5,7 +5,7 @@ module.exports = {
node: true
},
extends: [
"plugin:vue/vue3-essential",
"plugin:vue/vue3-recommended",
"standard",
"@vue/prettier",
"eslint:recommended"
@ -18,9 +18,23 @@ module.exports = {
rules: {
"no-console": "warn",
"vue/multi-word-component-names": "off",
camelcase: "off",
eqeqeq: "error",
"vue/no-v-html": "off",
"vue/require-default-prop": "off",
"camelcase": "off",
"eqeqeq": "error",
"vue/no-template-shadow": "error",
"vue/attribute-hyphenation": "error",
"vue/html-end-tags": "error",
"vue/eqeqeq": "error",
"vue/component-name-in-template-casing": ["error", "kebab-case"],
"vue/enforce-style-attribute": [
"error",
{ "allow": ["scoped", "module"] }
],
"vue/v-on-event-hyphenation": ["error", "always",{
"autofix": true,
}],
"vue/require-explicit-emits": "error",
"no-unused-vars": [
"error",
{ vars: "all", args: "after-used", ignoreRestSiblings: false }
@ -30,5 +44,7 @@ module.exports = {
globals: {
BMapGL: "readonly",
JSEncrypt: "readonly",
Aliplayer: "readonly",
AliyunUpload: "readonly",
}
};

27
env.d.ts vendored Normal file
View File

@ -0,0 +1,27 @@
interface ImportMetaEnv {
// Auto generate by env-parse
/**
* undefined
*/
readonly VITE_PROXY: string
/**
* undefined
*/
readonly VITE_FILE_URL: string
/**
* undefined
*/
readonly VITE_TEMPLATE_URL: string
/**
* undefined
*/
readonly VITE_BASE_URL: string
/**
* undefined
*/
readonly VITE_ON_LINE_WEB_SOCKET_URL: string
/**
* undefined
*/
readonly VITE_LEARNING_WEB_SOCKET_URL: string
}

View File

@ -2,9 +2,10 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no" />
<title>管理平台</title>
<title>交通运输安全生产综合管理系统</title>
</head>
<body>
<div id="app"></div>
@ -15,5 +16,10 @@
src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"></script>
<script type="text/javascript" src="/jsencrypt.min.js"></script>
<script type="module" src="/src/main.js"></script>
<link rel="stylesheet" href="https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/skins/default/aliplayer-min.css" />
<script charset="utf-8" type="text/javascript" src="https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/aliplayer-min.js"></script>
<script src="/aliyun-upload-sdk-1.5.6/lib/es6-promise.min.js"></script>
<script src="/aliyun-upload-sdk-1.5.6/lib/aliyun-oss-sdk-6.17.1.min.js"></script>
<script src="/aliyun-upload-sdk-1.5.6/aliyun-upload-sdk-1.5.6.min.js"></script>
</body>
</html>

289
node_modules/vue-esign/src/index.vue generated vendored Normal file
View File

@ -0,0 +1,289 @@
<template>
<canvas ref="canvas" @mousedown="mouseDown" @mousemove="mouseMove" @mouseup="mouseUp"
@touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd"></canvas>
</template>
<script>
export default {
props: {
width: {
type: Number,
default: 800
},
height: {
type: Number,
default: 300
},
lineWidth: {
type: Number,
default: 4
},
lineColor: {
type: String,
default: '#000000'
},
bgColor: {
type: String,
default: ''
},
isCrop: {
type: Boolean,
default: false
},
isClearBgColor: {
type: Boolean,
default: true
},
format: {
type: String,
default: 'image/png'
},
quality: {
type: Number,
default: 1
}
},
data () {
return {
hasDrew: false,
resultImg: '',
points: [],
canvasTxt: null,
startX: 0,
startY: 0,
isDrawing: false,
sratio: 1
}
},
computed: {
ratio () {
return this.height / this.width
},
stageInfo () {
return this.$refs.canvas.getBoundingClientRect()
},
myBg () {
return this.bgColor ? this.bgColor : 'rgba(255, 255, 255, 0)'
}
},
watch: {
'myBg': function (newVal) {
this.$refs.canvas.style.background = newVal
}
},
beforeMount () {
window.addEventListener('resize', this.$_resizeHandler)
},
beforeDestroy () {
window.removeEventListener('resize', this.$_resizeHandler)
},
mounted () {
const canvas = this.$refs.canvas
canvas.height = this.height
canvas.width = this.width
canvas.style.background = this.myBg
this.$_resizeHandler()
//
document.onmouseup = () => {
this.isDrawing = false
}
},
methods: {
$_resizeHandler () {
const canvas = this.$refs.canvas
canvas.style.width = this.width + "px"
const realw = parseFloat(window.getComputedStyle(canvas).width)
canvas.style.height = this.ratio * realw + "px";
this.canvasTxt = canvas.getContext('2d')
this.canvasTxt.scale(1 * this.sratio, 1 * this.sratio)
this.sratio = realw / this.width
this.canvasTxt.scale(1 / this.sratio, 1 / this.sratio)
},
// pc
mouseDown (e) {
e = e || event
e.preventDefault()
this.isDrawing = true
this.hasDrew = true
let obj = {
x: e.offsetX,
y: e.offsetY
}
this.drawStart(obj)
},
mouseMove (e) {
e = e || event
e.preventDefault()
if (this.isDrawing) {
let obj = {
x: e.offsetX,
y: e.offsetY
}
this.drawMove(obj)
}
},
mouseUp (e) {
e = e || event
e.preventDefault()
let obj = {
x: e.offsetX,
y: e.offsetY
}
this.drawEnd(obj)
this.isDrawing = false
},
// mobile
touchStart (e) {
e = e || event
e.preventDefault()
this.hasDrew = true
if (e.touches.length === 1) {
let obj = {
x: e.targetTouches[0].clientX - this.$refs.canvas.getBoundingClientRect().left,
y: e.targetTouches[0].clientY - this.$refs.canvas.getBoundingClientRect().top
}
this.drawStart(obj)
}
},
touchMove (e) {
e = e || event
e.preventDefault()
if (e.touches.length === 1) {
let obj = {
x: e.targetTouches[0].clientX - this.$refs.canvas.getBoundingClientRect().left,
y: e.targetTouches[0].clientY - this.$refs.canvas.getBoundingClientRect().top
}
this.drawMove(obj)
}
},
touchEnd (e) {
e = e || event
e.preventDefault()
if (e.touches.length === 1) {
let obj = {
x: e.targetTouches[0].clientX - this.$refs.canvas.getBoundingClientRect().left,
y: e.targetTouches[0].clientY - this.$refs.canvas.getBoundingClientRect().top
}
this.drawEnd(obj)
}
},
//
drawStart (obj) {
this.startX = obj.x
this.startY = obj.y
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.lineCap = 'round'
this.canvasTxt.lineJoin = 'round'
this.canvasTxt.lineWidth = this.lineWidth * this.sratio
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.points.push(obj)
},
drawMove (obj) {
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.strokeStyle = this.lineColor
this.canvasTxt.lineWidth = this.lineWidth * this.sratio
this.canvasTxt.lineCap = 'round'
this.canvasTxt.lineJoin = 'round'
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.startY = obj.y
this.startX = obj.x
this.points.push(obj)
},
drawEnd (obj) {
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.lineCap = 'round'
this.canvasTxt.lineJoin = 'round'
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.points.push(obj)
this.points.push({x: -1, y: -1})
},
//
generate (options) {
let imgFormat = options && options.format ? options.format: this.format
let imgQuality = options && options.quality ? options.quality: this.quality
const pm = new Promise((resolve, reject) => {
if (!this.hasDrew) {
reject(`Warning: Not Signned!`)
return
}
var resImgData = this.canvasTxt.getImageData(0, 0, this.$refs.canvas.width, this.$refs.canvas.height)
this.canvasTxt.globalCompositeOperation = "destination-over"
this.canvasTxt.fillStyle = this.myBg
this.canvasTxt.fillRect(0,0,this.$refs.canvas.width ,this.$refs.canvas.height)
this.resultImg = this.$refs.canvas.toDataURL(imgFormat, imgQuality)
var resultImg = this.resultImg
this.canvasTxt.clearRect(0, 0, this.$refs.canvas.width ,this.$refs.canvas.height)
this.canvasTxt.putImageData(resImgData, 0, 0)
this.canvasTxt.globalCompositeOperation = "source-over"
if (this.isCrop) {
const crop_area = this.getCropArea(resImgData.data)
var crop_canvas = document.createElement('canvas')
const crop_ctx = crop_canvas.getContext('2d')
crop_canvas.width = crop_area[2] - crop_area[0]
crop_canvas.height = crop_area[3] - crop_area[1]
const crop_imgData = this.canvasTxt.getImageData(...crop_area)
crop_ctx.globalCompositeOperation = "destination-over"
crop_ctx.putImageData(crop_imgData, 0, 0)
crop_ctx.fillStyle = this.myBg
crop_ctx.fillRect(0, 0, crop_canvas.width , crop_canvas.height)
resultImg = crop_canvas.toDataURL(imgFormat, imgQuality)
crop_canvas = null
}
resolve(resultImg)
})
return pm
},
reset () {
this.canvasTxt.clearRect(
0,
0,
this.$refs.canvas.width,
this.$refs.canvas.height
)
if (this.isClearBgColor) {
this.$emit('update:bgColor', '')
this.$refs.canvas.style.background = 'rgba(255, 255, 255, 0)'
}
this.points = []
this.hasDrew = false
this.resultImg = ''
},
getCropArea (imgData) {
var topX = this.$refs.canvas.width; var btmX = 0; var topY = this.$refs.canvas.height; var btnY = 0
for (var i = 0; i < this.$refs.canvas.width; i++) {
for (var j = 0; j < this.$refs.canvas.height; j++) {
var pos = (i + this.$refs.canvas.width * j) * 4
if (imgData[pos] > 0 || imgData[pos + 1] > 0 || imgData[pos + 2] || imgData[pos + 3] > 0) {
btnY = Math.max(j, btnY)
btmX = Math.max(i, btmX)
topY = Math.min(j, topY)
topX = Math.min(i, topX)
}
}
}
topX++
btmX++
topY++
btnY++
const data = [topX, topY, btmX, btnY]
return data
}
}
}
</script>
<style scoped>
canvas {
max-width: 100%;
display: block;
}
</style>

3420
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -10,51 +10,69 @@
"lint": "eslint --ext .js,.vue --fix src .prettierrc.cjs"
},
"dependencies": {
"@element-plus/icons-vue": "^2.1.0",
"@element-plus/icons-vue": "^2.3.1",
"@icon-park/vue-next": "^1.4.2",
"@vueuse/core": "^9.13.0",
"@vueuse/integrations": "^10.7.0",
"@vueuse/integrations": "^10.7.1",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"animate.css": "^4.1.1",
"autofit.js": "^3.0.7",
"axios": "^1.6.3",
"dayjs": "^1.11.10",
"element-plus": "^2.4.4",
"echarts": "^5.4.3",
"element-plus": "^2.6.1",
"html2canvas": "^1.4.1",
"jspdf": "^2.5.1",
"lodash-es": "^4.17.21",
"mitt": "^3.0.1",
"nanoid": "^5.0.4",
"normalize.css": "^8.0.1",
"pako": "^2.1.0",
"pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.0",
"pinia-plugin-persistedstate": "^3.2.1",
"qrcode": "^1.5.3",
"qs": "^6.11.2",
"relation-graph": "^2.1.24",
"throttle-debounce": "^5.0.0",
"v-viewer": "^3.0.11",
"vue": "^3.3.13",
"vant": "^4.8.4",
"viewerjs": "^1.11.6",
"vue": "^3.4.3",
"vue-countup-v3": "^1.4.1",
"vue-draggable-plus": "^0.3.4",
"vue-esign": "^1.1.4",
"vue-router": "^4.2.5",
"vue3-pdfjs": "^0.1.6",
"vue3-print-nb": "^0.1.4",
"vue3-puzzle-vcode": "^1.0.16"
"vue3-puzzle-vcode": "^1.1.5",
"vue3-seamless-scroll": "^2.0.1",
"xlsx": "^0.18.5"
},
"devDependencies": {
"@our-patches/postcss-px-to-viewport": "^1.2.0",
"@types/node": "^18.18.4",
"@vitejs/plugin-basic-ssl": "^1.0.1",
"@vitejs/plugin-vue": "^4.4.0",
"@types/node": "^18.19.4",
"@vitejs/plugin-basic-ssl": "^1.0.2",
"@vitejs/plugin-vue": "^4.6.2",
"@vue/eslint-config-prettier": "^7.1.0",
"autoprefixer": "^10.4.16",
"eslint": "^8.51.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^8.10.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-vue": "^9.17.0",
"eslint-plugin-vue": "^9.19.2",
"prettier": "^2.8.8",
"sass": "^1.69.0",
"unplugin-auto-import": "^0.12.2",
"unplugin-vue-components": "^0.22.12",
"vite": "^4.4.11",
"vite": "^4.5.1",
"vite-plugin-enhance-log": "^0.5.2",
"vite-plugin-env-parse": "^1.0.10",
"vite-plugin-eslint": "^1.8.1",
"vite-plugin-remove-console": "^2.1.1",
"vue-eslint-parser": "^9.3.1"
"vite-plugin-remove-console": "^2.2.0",
"vue-eslint-parser": "^9.3.2"
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

BIN
public/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

Before

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -15,4 +15,4 @@
import zhCn from "element-plus/dist/locale/zh-cn.mjs";
</script>
<style lang="scss"></style>
<style scoped lang="scss"></style>

View File

@ -6,11 +6,13 @@ import { cloneDeep } from "lodash-es";
import pinia from "./pinia";
import children from "@/components/children/index";
import { MODEL } from "@/assets/js/constant";
import asyncRouter from "@/assets/js/asyncRouter";
// import asyncRouter from "@/assets/js/asyncRouter";
import { getAsyncRouter } from "@/request/api";
// import { getRouteTreeAll } from "@/request/system_management.js";
const modules = import.meta.glob("./views/**/*.vue"); // 获取到views下所有的vue文件
const modules = import.meta.glob([
"./views/**/*.vue",
"!./views/**/components/*.vue",
]); // 获取到views下所有的vue文件
let storageRouter = null; // 用来获取后台拿到的路由
router.beforeEach(async (to, from, next) => {
@ -27,10 +29,9 @@ router.beforeEach(async (to, from, next) => {
// 变量里没有储存路由
// pinia里没有储存路由去后台获取路由
if (routerStore.getRouters.length === 0) {
await getAsyncRouter();
// const resData = await getRouteTreeAll();
// storageRouter = resData.menuList; // 后台请求得到的路由数据
storageRouter = asyncRouter; // 死路由
const resData = await getAsyncRouter();
storageRouter = resData.routeList; // 后台请求得到的路由数据
// storageRouter = asyncRouter; // 死路由
routerStore.setRouters(storageRouter); // 存储路由
routerGo(to, next); // 执行路由跳转方法
} else {
@ -73,6 +74,7 @@ function routerGo(to, next) {
function filterAsyncRouter(asyncRouterMap) {
// 遍历后台传来的路由字符串,转换为组件对象
return asyncRouterMap.filter((route) => {
route.meta = JSON.parse(route.meta);
if (route.component) {
if (route.component === "children") {
route.component = children;

View File

@ -115,7 +115,6 @@
* {
box-sizing: border-box;
font-size: 14px;
&:not(dd,dl,dt) {
margin: 0;
@ -127,11 +126,10 @@ h1, h2, h3, h4, h5, h6 {
font-size: revert;
}
#app {
background-color: #030f2f;
.layout-container {
background-color: #051a55;
min-height: 100vh;
background-image: url("/src/assets/images/public/bg.jpg");
background-repeat: no-repeat;
}
a {
@ -161,6 +159,14 @@ a {
display: none;
}
.mb {
margin-bottom: 10px;
}
.mt {
margin-top: 16px;
}
.text-blue {
color: #3b3bff;
}
@ -185,6 +191,38 @@ a {
display: none;
}
@mixin table($tdTextAlign,$titleTextAlign) {
border-collapse: collapse;
width: 100%;
display: table;
font-size: 12px;
tr {
page-break-inside: avoid;
}
td, th {
border: 1px solid var(--el-border-color);
padding: 8px;
line-height: 1.6;
text-align: $tdTextAlign;
}
.title {
background: var(--el-fill-color-light);
width: 200px;
text-align: $titleTextAlign;
}
}
.print_table {
@include table(center,left);
}
.archive_print_table {
@include table(left,center);
}
img.ml-10:first-child {
margin-left: 0;
}
@ -199,6 +237,7 @@ input:-webkit-autofill:active {
div::-webkit-scrollbar {
width: 4px;
height: 4px;
}
div::-webkit-scrollbar-thumb {
@ -256,14 +295,6 @@ div::-webkit-scrollbar-track {
border-bottom: 1px dashed var(--el-border-color-darker);
}
.w-e-bar-item:has([data-menu-key="group-video"]) {
display: none !important;
}
.w-e-bar-item-menus-container .w-e-bar-item:has([data-menu-key="insertImage"]) {
display: none !important;
}
.vue-auth-box_ {
background: #020f3a !important;
border: 1px solid #223765 !important;
@ -289,7 +320,7 @@ div::-webkit-scrollbar-track {
margin: 3mm;
}
.page_break{
.page_break {
page-break-after: always;
}
@ -297,6 +328,7 @@ div::-webkit-scrollbar-track {
.el-descriptions__label.el-descriptions__cell.is-bordered-label {
color: #000 !important;
}
.el-descriptions {
--el-text-color-primary: #000 !important;
}
@ -306,19 +338,16 @@ div::-webkit-scrollbar-track {
}
.print_use {
border-collapse: collapse;
width: 100%;
display: table;
td, th {
border: 1px solid var(--el-border-color);
padding: 8px;
line-height: 1.6;
text-align: center;
}
@include table(center,left);
}
.print_no_use {
display: none;
}
}
.mobile {
padding: 10px;
background-color: #fafafa;
min-height: 100vh;
}

View File

@ -1,16 +1,17 @@
:root {
--el-header-height: 69px;
--el-aside-scrollbar-height: calc(100vh - var(--el-header-height));
--el-main-scrollbar-height: calc(100vh - var(--el-header-height) - 60px);
--el-main-scrollbar-height: calc(100vh - var(--el-header-height) - 40px);
--el-border-color: #273868 !important; //
--el-text-color-regular: #fff !important;
--el-fill-color-light: #0e1d44 !important; //hover
--el-color-check: #14affe !important; //hover
--el-aside-bg-color: #081e42 !important;
--el-aside-bg-color: #08277e !important;
--el-input-bg-color: #081435 !important;
--el-fill-color-blank: #081435 !important; //
--el-border-color-lighter: var(--el-border-color) !important;
--el-bullet-frame-bg-color: #08163b !important;
--el-text-color-primary: #fff !important;
}
.el-button:focus, .el-button:hover {
@ -89,9 +90,8 @@
.el-menu-item {
&:hover, &.is-active {
background-image: url("/src/assets/images/public/list_on.png");
background-repeat: no-repeat;
background-size: 100% 100%;
//background: #1d3f77;
background-image: linear-gradient(to right, #2c6ee9, rgba(0, 0, 0, 0));
}
}
@ -118,10 +118,14 @@
}
}
.el-select, .el-cascader, .el-date-editor.el-input, .el-date-editor.el-input__wrapper, .el-input__wrapper, .el-input-number {
.el-select, .el-cascader, .el-date-editor.el-input, .el-date-editor.el-input__wrapper, .el-input__wrapper, .el-input-number, .el-select-v2 {
width: 100% !important;
}
.el-textarea.is-disabled .el-textarea__inner, .el-select {
--el-disabled-border-color: var(--el-border-color);
}
.el-table {
--el-table-bg-color: #071a43 !important;
--el-bg-color: #071a43 !important;
@ -149,6 +153,14 @@
--el-pagination-bg-color: var(--el-fill-color-blank) !important;
}
.el-pagination .el-select {
width: 128px !important;
}
.el-pagination--small .el-select {
width: 100px !important;
}
.el-radio {
--el-radio-input-bg-color: #091839 !important;
}
@ -188,7 +200,7 @@
--el-checkbox-disabled-border-color: var(--el-border-color);
}
.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner, .el-checkbox__input.is-disabled.is-indeterminate .el-checkbox__inner {
--el-checkbox-disabled-checked-input-fill: var(--el-checkbox-bg-color);
--el-checkbox-disabled-checked-input-border-color: var(--el-color-check);
}
@ -239,11 +251,19 @@
color: var(--el-text-color-regular) !important;
}
.el-date-table.is-week-mode .el-date-table__row {
&.current, &:hover {
.el-date-table-cell {
--el-datepicker-inrange-bg-color: var(--el-fill-color-light) !important;
}
}
}
.el-input.is-disabled .el-input__wrapper {
box-shadow: 0 0 0 1px var(--el-border-color) inset !important;
}
.el-select__tags .el-tag--info {
.el-select .el-tag.el-tag--info {
background-color: #214082 !important;
--el-tag-text-color: var(--el-text-color-regular) !important;
}
@ -275,14 +295,10 @@
--el-border-color-light: var(--el-border-color);
}
.el-divider__text {
font-size: 16px !important;
font-weight: 700 !important;
}
.el-dialog {
background: transparent !important;
--el-dialog-margin-top: 50px !important;
padding: 0 !important;
.el-dialog__header {
background-image: url("/src/assets/images/public/tctitlebg.png");
@ -306,8 +322,14 @@
}
}
.el-dialog__body, .el-dialog__footer {
.el-dialog__body {
background-color: var(--el-bullet-frame-bg-color);
padding: calc(var(--el-dialog-padding-primary) + 10px) var(--el-dialog-padding-primary);
}
.el-dialog__footer {
background-color: var(--el-bullet-frame-bg-color);
padding: var(--el-dialog-padding-primary);
}
}
@ -336,6 +358,8 @@
}
.el-divider__text {
font-size: 16px !important;
font-weight: 700 !important;
background-color: var(--el-fill-color-blank) !important;
color: var(--el-text-color-regular) !important;
}
@ -380,6 +404,28 @@
color: var(--el-text-color-regular) !important;
}
.el-step__title{
font-size: 14px !important;;
.el-step__title, .el-select-dropdown__option-item {
font-size: 14px !important;
}
.el-step__description {
* {
font-size: 12px !important;
}
}
.el-notification {
--el-notification-title-color: #000 !important;
.el-notification__closeBtn:hover {
--el-notification-close-hover-color: #000 !important;
}
}
.el-color-predefine__color-selector.selected {
--el-color-primary: #fff !important;
}
.el-input-number.is-disabled .el-input-number__decrease, .el-input-number.is-disabled .el-input-number__increase{
border-color: var(--el-border-color) !important;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 423 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

BIN
src/assets/images/bi/bg.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/assets/images/bi/ri.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 850 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Some files were not shown because too many files have changed in this diff Show More