Commit Graph

645 Commits

Author SHA1 Message Date
itcast bb5e3e97f6 工程管理 2025-11-14 18:04:39 +08:00
bb_pan ec5ec1e26b 编码工具管理 2025-11-14 16:26:33 +08:00
bb_pan 313645601c 工具录入审核 2025-11-13 19:29:21 +08:00
bb_pan 819bdd6c25 工具录入申请 2025-11-13 17:51:15 +08:00
bb_pan ef8141e8df 工具台账 2025-11-12 18:10:09 +08:00
itcast 59487663c9 字加搜索框 2025-11-12 18:05:13 +08:00
bb_pan 68b49753a8 工具类型管理 2025-11-12 15:17:33 +08:00
jiang 22230101e1 代码提交 2025-11-07 18:04:49 +08:00
bb_pan a66406528f 优化 2025-11-07 17:10:10 +08:00
bb_pan eb1e28847b 优化 2025-11-07 16:21:45 +08:00
jiang 8c8d127590 代码提交 2025-11-03 09:19:07 +08:00
bb_pan 307997e527 优化 2025-10-30 11:31:26 +08:00
syruan 5f7295c113 Merge remote-tracking branch 'origin/ma-mall-ui' into ma-mall-ui 2025-10-30 11:19:19 +08:00
syruan 5540c4db91 订单卡片之间的阴影和光效增加 2025-10-30 11:19:08 +08:00
jiang 47639b8022 代码提交 2025-10-30 10:18:11 +08:00
bb_pan fa7c2a98fe 装备退库 2025-10-30 10:15:09 +08:00
bb_pan 47243ce237 左侧菜单栏透明 2025-10-30 09:19:46 +08:00
cwchen e9a17d6286 首页 2025-10-29 19:45:46 +08:00
bb_pan 92b6d9b6fd 优化 2025-10-29 19:39:11 +08:00
bb_pan 4948c45382 优化 2025-10-29 19:34:55 +08:00
cwchen ef75a190ea 样式修改 2025-10-29 19:32:46 +08:00
jiang 463c57f135 代码提交 2025-10-29 19:16:54 +08:00
bb_pan f88d4fa80f 优化 2025-10-29 18:58:53 +08:00
itcast e7f903991f 装备台账 2025-10-29 18:40:16 +08:00
cwchen 5d9703e026 按钮样式修改 2025-10-29 18:35:01 +08:00
cwchen 1fbd2daaa8 按钮样式修改 2025-10-29 18:26:13 +08:00
cwchen b8c396db7e 按钮大小修改 2025-10-29 18:11:48 +08:00
jiang 42333b5386 Merge remote-tracking branch 'origin/ma-mall-ui' into ma-mall-ui 2025-10-29 18:07:36 +08:00
jiang ecc9e0ed5f 代码提交 2025-10-29 18:07:27 +08:00
cwchen be225d4015 装备录入按钮大小修改 2025-10-29 18:05:53 +08:00
BianLzhaoMin f6fbd2a219 优化 2025-10-29 18:03:01 +08:00
jiang 8a932b3b63 代码提交 2025-10-29 18:00:41 +08:00
bb_pan f1ba8e3752 大屏优化 2025-10-29 18:00:00 +08:00
cwchen 5c55427eef 装备管理样式修改 2025-10-29 17:56:05 +08:00
cwchen 29df7801bf 装备类型配置 2025-10-29 17:48:32 +08:00
cwchen e2c3721773 装备配置样式修改 2025-10-29 17:30:57 +08:00
cwchen 004018d42e Merge branch 'ma-mall-ui' of http://192.168.0.75:3000/bonus/bonus-ui into ma-mall-ui 2025-10-29 17:22:18 +08:00
cwchen 7523e6c4be 机械化施工装备配置率 2025-10-29 17:22:09 +08:00
BianLzhaoMin 25fdcf7b8e 优化 2025-10-29 17:21:49 +08:00
BianLzhaoMin be5893b8bc 优化 2025-10-29 17:19:25 +08:00
bb_pan f33167d78f 大屏菜单 2025-10-29 17:18:06 +08:00
cwchen 5318ed0ca9 Merge branch 'ma-mall-ui' of http://192.168.0.75:3000/bonus/bonus-ui into ma-mall-ui 2025-10-29 17:14:05 +08:00
cwchen 0b3f4c8429 需求管理页面样式修改 2025-10-29 17:13:57 +08:00
BianLzhaoMin 7959cff07a Merge branch 'ma-mall-ui' of http://192.168.0.75:3000/bonus/bonus-ui into ma-mall-ui 2025-10-29 16:56:58 +08:00
BianLzhaoMin 1a09247604 完善城市大屏 2025-10-29 16:56:49 +08:00
cwchen 620751537c 合同管理表格样式修改 2025-10-29 16:56:45 +08:00
cwchen 9edaa26f63 装备租赁查询样式修改 2025-10-29 16:50:59 +08:00
cwchen cb6231987c 装备信息查询修改 2025-10-29 16:44:29 +08:00
cwchen 436741642c Merge branch 'ma-mall-ui' of http://192.168.0.75:3000/bonus/bonus-ui into ma-mall-ui 2025-10-29 16:37:36 +08:00
cwchen 55820c3208 共享出库记录修改 2025-10-29 16:37:26 +08:00
bb_pan 4aa591cf54 大屏 2025-10-29 16:31:30 +08:00
cwchen 1d04a47adf 共享申请记录修改 2025-10-29 16:30:48 +08:00
cwchen eec65a7452 装备退役表格样式修改 2025-10-29 16:20:18 +08:00
cwchen 292e04eebf 装备维保记录表格修改 2025-10-29 16:13:50 +08:00
cwchen 4f503efbe7 装备台账样式修改 2025-10-29 16:01:58 +08:00
cwchen 2afd2a7686 表格样式修改 2025-10-29 15:53:34 +08:00
cwchen af114d29dd 装备操作记录表格修改 2025-10-29 15:50:14 +08:00
cwchen 37e2b316e3 装备退库记录表格样式修改 2025-10-29 15:32:26 +08:00
cwchen b606797112 装备退库记录表格修改 2025-10-29 15:23:33 +08:00
cwchen f77d66ab3a 装备出库记录表格修改 2025-10-29 15:17:23 +08:00
cwchen 966f6f3557 表格修改 2025-10-29 15:01:10 +08:00
cwchen e3d8446b97 装备出库记录表格修改 2025-10-29 14:31:20 +08:00
cwchen c71407c0ce 装备出库记录表格修改 2025-10-29 14:26:23 +08:00
cwchen 62adf1da12 装备录入申请表格样式修改 2025-10-29 14:14:40 +08:00
cwchen f0b808b6f2 装备录入表格样式修改 2025-10-29 13:42:42 +08:00
cwchen ac7507d9fe 表格样式优化 2025-10-29 13:31:49 +08:00
cwchen 1a7397e2a8 装备录入申请修改 2025-10-29 11:05:22 +08:00
bb_pan caf41f6108 优化 2025-10-29 08:56:04 +08:00
bb_pan 78b907398e 厂家管理 2025-10-27 14:36:54 +08:00
bb_pan 0c538c8e5f 驳回 2025-10-27 14:25:14 +08:00
bb_pan b4c8a27fac 驳回 2025-10-27 14:22:34 +08:00
bb_pan 9c5baa5486 bug 修复 2025-10-24 14:31:17 +08:00
bb_pan e18753c252 台账导出 2025-10-22 17:49:11 +08:00
bb_pan 90c7b90810 台账导出 2025-10-22 17:46:27 +08:00
bb_pan acd5088ac8 优化 2025-10-22 15:10:14 +08:00
bb_pan 97dc2170b3 共享大厅 2025-10-22 13:31:23 +08:00
syruan 27dacd1834 增加产线错误日志打印,分析问题 2025-10-22 11:09:49 +08:00
bb_pan 84ebdd9e14 大屏 2025-10-21 10:02:15 +08:00
bb_pan 53d895161b 大屏 2025-10-20 18:34:54 +08:00
bb_pan fd453eff89 大屏 2025-10-20 18:20:19 +08:00
bb_pan 7ce67a845d 优化 2025-10-20 13:16:51 +08:00
jiang e944152cf6 代码提交 2025-10-20 09:33:51 +08:00
bb_pan fc9202ea14 新增特征值优化 2025-10-16 19:26:47 +08:00
itcast f3c05aa89d 装备类型配置页面 2025-10-16 19:25:09 +08:00
bb_pan b250e14aab 首页跳转 2025-10-16 17:35:35 +08:00
bb_pan 278a2da67f 大屏 2025-10-16 16:37:41 +08:00
bb_pan 08316be6f2 增加超时时间设置 2025-10-16 09:39:28 +08:00
bb_pan 43dfa3a2ef 优化 2025-10-15 18:36:01 +08:00
bb_pan d5310f9c5a 装备录入编辑 2025-10-15 10:46:47 +08:00
bb_pan 2ddea71248 后台优化 2025-10-15 09:05:19 +08:00
syruan 3643e02c6f 首页流程图 2025-10-14 23:01:29 +08:00
itcast 874f797815 Merge remote-tracking branch 'origin/ma-mall-ui' into ma-mall-ui 2025-10-14 22:25:06 +08:00
itcast 3cd86b8df2 装备类型配置页面,特征值部分未完成 2025-10-14 22:24:33 +08:00
jiang baf7cafdbb 代码提交 2025-10-14 20:43:52 +08:00
bb_pan 163923fcc6 详情 2025-10-14 18:21:40 +08:00
bb_pan 43256ea107 优化 2025-10-14 18:18:53 +08:00
bb_pan 65a0dad43a 采购日期 2025-10-14 18:10:21 +08:00
bb_pan d72f62f988 采购日期 2025-10-14 18:09:30 +08:00
bb_pan 360874805a 产权单位 2025-10-14 18:04:31 +08:00
bb_pan d861606971 获取省份 2025-10-14 17:44:41 +08:00
itcast 52cb62467d Merge remote-tracking branch 'origin/ma-mall-ui' into ma-mall-ui
# Conflicts:
#	src/views/EquipmentSharedLease/order/index.vue
#	src/views/EquipmentSharedOrder/order/index.vue
#	src/views/search/lease/index.vue
2025-10-14 17:31:57 +08:00
itcast e2563665c5 装备类型配置页面,特征值未完成 2025-10-14 17:30:27 +08:00
itcast 5c9639b2b3 装备类型配置页面,特征值未完成 2025-10-14 17:28:57 +08:00
syruan d19e1f5964 状态修正,订单卡片调整 2025-10-14 17:24:46 +08:00
bb_pan e7546bbf39 优化 2025-10-14 17:23:57 +08:00
bb_pan 8bbec10d17 申请人申请时间字段更换 2025-10-14 09:29:59 +08:00
syruan 388eb48dc1 状态修正,订单卡片调整 2025-10-13 22:27:41 +08:00
bb_pan e470a4fc56 优化 2025-10-13 21:54:00 +08:00
syruan 560b24b6f0 租赁修改为共享 2025-10-13 19:30:46 +08:00
bb_pan b992fcc0bc 优化 2025-10-13 19:20:43 +08:00
itcast a5e2de9353 Merge remote-tracking branch 'origin/ma-mall-ui' into ma-mall-ui
# Conflicts:
#	src/views/EquipmentEntryApply/index.vue
#	src/views/EquipmentLedger/index.vue
#	src/views/EquipmentRoamRecord/index.vue
2025-10-13 18:35:16 +08:00
syruan 6ca7001cd9 嵌入租赁商城 2025-10-13 18:28:18 +08:00
syruan 8e9cb36ff3 厂家管理 2025-10-13 17:32:50 +08:00
lSun eabddab4a6 Merge remote-tracking branch 'origin/ma-mall-ui' into ma-mall-ui 2025-10-13 09:28:49 +08:00
lSun 451c590c33 代码提交 2025-10-13 09:27:53 +08:00
bb_pan 9283f29cd9 大屏 2025-09-30 16:54:14 +08:00
bb_pan ad5c346c61 大屏样式优化 2025-09-28 15:40:00 +08:00
itcast ac8a0490ca 修改按钮颜色 2025-09-28 14:55:33 +08:00
jiang f6bd288b5e 代码提交 2025-09-27 11:17:05 +08:00
jiang 36ac1a77ef 代码提交 2025-09-25 19:20:00 +08:00
bb_pan d6f7b78587 大屏 2025-09-25 19:19:35 +08:00
bb_pan abceaaf90f 大屏 2025-09-25 19:14:29 +08:00
bb_pan 1ba03331e4 大屏地图 2025-09-24 14:49:58 +08:00
bb_pan 839149f14b 解决报错问题 2025-09-24 09:17:38 +08:00
jiang 4fd9388ae2 Merge remote-tracking branch 'origin/ma-mall-ui' into ma-mall-ui 2025-09-22 18:52:50 +08:00
jiang ebe21dfd11 代码提交 2025-09-22 18:52:41 +08:00
bb_pan 62dd70f50f 大屏二级页面 2025-09-22 17:47:37 +08:00
bb_pan 6823d83ae2 大屏二级页面 2025-09-22 13:13:38 +08:00
jiang 28eb3f2fab 代码提交 2025-09-22 09:59:47 +08:00
bb_pan 217fad62d9 大屏二级页面 2025-09-19 18:01:05 +08:00
bb_pan 0d686ed0c9 装备类型管理 2025-09-18 19:36:01 +08:00
bb_pan cd65de7a9e 大屏二级页面 + 装备类型管理 2025-09-18 19:05:26 +08:00
bb_pan e4271bd4ed 网省地图 2025-09-17 17:56:23 +08:00
bb_pan 6ccc4c1726 网省地图 2025-09-17 17:28:55 +08:00
bb_pan 856f789ae2 用户信息 2025-09-17 17:16:00 +08:00
bb_pan 215853e321 网省地图 2025-09-16 18:09:52 +08:00
zzyuan ef275b7441 地市大屏接口对接3 2025-09-16 00:17:47 +08:00
zzyuan 553892a1f1 Merge branch 'ma-mall-ui' of http://192.168.0.75:3000/bonus/bonus-ui into ma-mall-ui 2025-09-15 23:46:02 +08:00
zzyuan 2429f26b5c 地市大屏接口对2 2025-09-15 23:45:56 +08:00
BianLzhaoMin 61eb8ce32c 优化 2025-09-15 23:19:39 +08:00
BianLzhaoMin 35379a8a48 装备退役页面完善 2025-09-15 23:11:16 +08:00
BianLzhaoMin 44630ec7b6 页面优化 2025-09-15 22:04:04 +08:00
BianLzhaoMin 9424abb3b6 页面完善 2025-09-15 21:53:20 +08:00
zzyuan d766855c3c Merge branch 'ma-mall-ui' of http://192.168.0.75:3000/bonus/bonus-ui into ma-mall-ui 2025-09-15 17:50:07 +08:00
zzyuan 95796fbb84 地市大屏接口对接 2025-09-15 17:50:00 +08:00
BianLzhaoMin 02d08c2e32 装备流转记录页面完善 2025-09-15 11:00:09 +08:00
zzyuan 5853f12ce8 地级大屏页面初始化3 2025-09-15 10:49:50 +08:00
zzyuan 26c4fc819a Merge branch 'ma-mall-ui' of http://192.168.0.75:3000/bonus/bonus-ui into ma-mall-ui 2025-09-15 09:24:07 +08:00
zzyuan 2a92ac163f 地级大屏页面初始化2 2025-09-15 09:23:58 +08:00
BianLzhaoMin b18c8dec29 出库页面搭建以及接口调试 2025-09-14 22:15:53 +08:00
zzyuan 1ee6c36361 地级大屏页面初始化 2025-09-14 19:34:02 +08:00
BianLzhaoMin 883805c498 路由配置 2025-09-14 15:13:42 +08:00
zzyuan fd3f875751 大屏初始化 2025-09-14 15:07:01 +08:00
shengxian 83496cb4c3 feat: 增加大屏文件夹 2025-09-14 14:53:33 +08:00
jiang e6c16c24e7 装备类型管理 2025-08-12 19:15:51 +08:00
jiang 0ecafb4654 装备类型管理 2025-08-12 18:52:05 +08:00
lizhenhua 4dccab085b 基本配置修改 优化 2025-07-04 16:22:14 +08:00
lizhenhua cb18f8232d 基本配置修改 优化 2025-07-03 13:56:56 +08:00
jiang a2c5ceaf41 装备配置管理 2025-07-01 16:24:49 +08:00
lizhenhua 6aaa754c62 装备 2025-07-01 11:04:42 +08:00
lizhenhua b50d71cf11 装备配置管理 2025-06-27 17:46:55 +08:00
syruan 7361779af9 feat(notice): 公告内容使用富文本编辑器替换普通文本域
- 用 Editor 组件替换了原有的 el-input textarea
- 添加了上传配置,支持文件上传
- 对富文本内容进行 URL 编码和解码,确保数据传输的正确性
-优化了表单提交逻辑,增加了错误处理
2025-06-02 16:13:45 +08:00
bb_pan 527a31753f 优化 2025-06-02 15:50:57 +08:00
hongchao 2b43764020 bug修复 2025-05-26 15:45:27 +08:00
bb_pan 36ec4193eb 优化 2025-04-21 13:20:14 +08:00
bb_pan 8f00a8fd70 优化 2025-04-21 11:17:40 +08:00
bb_pan e3d019ec7d 优化 2025-04-17 10:47:43 +08:00
bb_pan 8414d1c2ce 优化 2025-04-16 18:13:53 +08:00
bb_pan e255c670cf bug 修复 2025-04-08 09:43:02 +08:00
bb_pan d9e319d378 图片大小 2025-03-31 12:20:48 +08:00
bb_pan a6e3ca99bb 图片格式 2025-03-31 12:17:46 +08:00
BianLzhaoMin f2a731f9e8 bug修复 2025-03-26 17:31:53 +08:00
BianLzhaoMin 938efea6b4 bug修复 2025-03-26 10:40:27 +08:00
bb_pan a8e4987812 上传地址问题优化 2025-03-25 09:50:32 +08:00
bb_pan 3db2a66c28 去除首页官网信息 2025-03-19 09:26:54 +08:00
BianLzhaoMin 8e9cdbecb8 页面问题修复 2025-03-17 16:09:06 +08:00
bb_pan 0f53867576 公告 2025-03-12 18:12:27 +08:00
bb_pan 1a0a566a4f 跳转优化 2025-02-26 17:02:18 +08:00
bb_pan 74e442730a 出租设备查询 2025-02-24 13:50:46 +08:00
bb_pan 8782263054 打包配置 2025-02-14 18:02:50 +08:00
bb_pan 8915f0081d 宏源打包配置 2025-02-14 11:08:31 +08:00
bb_pan 207865f79a bug修复 2025-02-13 14:46:44 +08:00
bb_pan bb84f4b136 bug修复与登录页内容修改 2025-02-13 14:31:39 +08:00
BianLzhaoMin 4747e467e8 轮播图装修问题修复 2025-01-16 13:17:31 +08:00
BianLzhaoMin 9ee8de8321 冲突合并 2025-01-16 10:42:18 +08:00
BianLzhaoMin 58c6baae4c 轮播图代码优化 2025-01-16 10:39:48 +08:00
BianLzhaoMin 18ca4de3e0 代码优化 2025-01-16 09:49:20 +08:00
BianLzhaoMin 7e30890122 轮播图接口增加 2025-01-16 09:24:53 +08:00
BianLzhaoMin 546f1f4ea1 增加轮播图配置 2025-01-15 13:16:34 +08:00
BianLzhaoMin 28b58646c2 增加配置 2025-01-15 10:09:35 +08:00
BianLzhaoMin d1cab21626 增加上传入口 2025-01-15 10:07:56 +08:00
BianLzhaoMin 24d6b536a2 轮播图配置页面增加以及打包iws修改 2025-01-15 10:05:56 +08:00
BianLzhaoMin 72a93cf695 样式问题优化 2025-01-10 15:54:16 +08:00
BianLzhaoMin e07c237201 代码优化 2025-01-09 17:28:20 +08:00
BianLzhaoMin 1346c150fe 优化 2025-01-09 15:11:12 +08:00
BianLzhaoMin 5f0f633adb 代码优化 2025-01-09 15:10:55 +08:00
BianLzhaoMin 8852031f72 代码修复 2025-01-09 15:08:16 +08:00
BianLzhaoMin bd1b55d4db 问题清单修复 2025-01-08 17:11:53 +08:00
BianLzhaoMin 9b37f1a3fd 权限模板功能调试 2025-01-08 14:51:27 +08:00
BianLzhaoMin 9704d0d055 公司管理功能完善 2025-01-08 13:15:29 +08:00