 crushing1111
|
f438b4d253
|
测试
|
2025-08-13 10:24:24 +08:00 |
Mr.j
|
bac2e99f0d
|
实现设备中心添加设备类型弹窗页面以及另外搭建完成设备盘库页面
|
2025-08-13 10:17:19 +08:00 |
|
crushing1111
|
daad25838b
|
任务管理
|
2025-08-13 10:07:11 +08:00 |
Maple
|
7dbd6f1d2e
|
fix:111
|
2025-08-13 09:45:39 +08:00 |
|
Maple
|
d2b70943d1
|
Merge remote-tracking branch 'origin/devlopment' into devlopment
# Conflicts:
# src/types/components.d.ts
|
2025-08-13 09:37:18 +08:00 |
|
Maple
|
7fd44d4b10
|
fix: 按照要求修复了一下菜单栏
|
2025-08-13 09:33:54 +08:00 |
 马诗敏
|
e526e80de3
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-13 09:31:36 +08:00 |
|
Mr.j
|
b1b34e630f
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-13 09:30:16 +08:00 |
|
Mr.j
|
513e050622
|
修复设备管理相关功能分页查询表格无法顺利下拉和分页条不固定问题
|
2025-08-13 09:30:09 +08:00 |
|
马诗敏
|
0e11328392
|
更新项目中控台布局
|
2025-08-13 08:59:20 +08:00 |
何德超
|
79bd72febb
|
CircularProgress
|
2025-08-12 21:21:53 +08:00 |
|
何德超
|
9d6086726d
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-12 17:59:35 +08:00 |
|
Mr.j
|
05f09ad207
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-12 17:49:48 +08:00 |
|
何德超
|
eba5e68e2f
|
净空前端，在原数据管理右边标签页，后端需同步配置才有用
|
2025-08-12 17:49:00 +08:00 |
|
Mr.j
|
8631ead0b1
|
修复设备管理相关功能分页查询无法分页和正确获取总页数的问题
|
2025-08-12 17:48:54 +08:00 |
|
马诗敏
|
7c455f59eb
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-12 17:34:37 +08:00 |
|
Maple
|
cc525c45b7
|
fix: 合同页面的日期优化，然后合同结算的时候也进行了优化
|
2025-08-12 17:28:17 +08:00 |
|
马诗敏
|
848eb02ec6
|
补交
|
2025-08-12 17:05:33 +08:00 |
|
马诗敏
|
25f57a4adb
|
项目筛选由两个增加至八个，增加质量管理，安全管理，现场管理
|
2025-08-12 17:02:50 +08:00 |
chabai
|
3fb4cc0950
|
智能商务模块适配主题切换
|
2025-08-12 15:50:05 +08:00 |
|
Maple
|
f1da2f0077
|
add: 订单管理的前端页面添加了，但是因为暂时不清楚订单的字段那些，后端也没有相对应的接口。
|
2025-08-12 14:51:23 +08:00 |
|
Maple
|
7fa5beee2f
|
add: 订单管理的前端页面添加了，但是因为暂时不清楚订单的字段那些，后端也没有相对应的接口。
|
2025-08-12 14:43:44 +08:00 |
|
Mr.j
|
a790551325
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-12 14:26:05 +08:00 |
|
Mr.j
|
6a531706e1
|
把审批信息放在个人中心所在下拉框消息中心里，铃铛图标处改为聊天消息
|
2025-08-12 14:25:58 +08:00 |
|
chabai
|
b6cb51a5e9
|
商务数据库信息模块更名为智能商务，初步实现文件排序功能
|
2025-08-12 14:18:00 +08:00 |
|
Maple
|
3657b1914c
|
fix:合同功能修复，添加产品服务字段
|
2025-08-12 10:50:04 +08:00 |
|
Maple
|
baef368840
|
fix:支出合同和收入合同的完善，修复了一些bug
|
2025-08-12 10:27:00 +08:00 |
|
Mr.j
|
33eb03121d
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-11 17:10:58 +08:00 |
|
Mr.j
|
9933ad7206
|
修复设备采购状态图无法顺利依据流程变化的问题
|
2025-08-11 17:10:52 +08:00 |
|
马诗敏
|
60b164f0c8
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-11 15:55:50 +08:00 |
|
马诗敏
|
e60e4cf095
|
实现团队成员更新功能和筛选功能
|
2025-08-11 15:54:44 +08:00 |
|
Maple
|
e4141a05cc
|
fix:支出合同和收入合同的完善
|
2025-08-11 15:42:21 +08:00 |
|
Maple
|
80353e44bf
|
fix:合同功能的完善，完成了合同的功能，可以通过时间段进行合同的查询，在新增或者修改合同的时候，项目和部门以及人员可以调用接口进行查询
|
2025-08-11 15:20:44 +08:00 |
|
Mr.j
|
80f174e9a4
|
修复合并后没有闪烁和红点信息提示的bug
|
2025-08-11 14:49:48 +08:00 |
|
Mr.j
|
e3ec37fa79
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-11 11:14:16 +08:00 |
|
Mr.j
|
48632707cc
|
实现了消息中心显示最新申请消息，并可以查看消息然后点击跳转到具体的审批台
|
2025-08-11 10:54:45 +08:00 |
|
chabai
|
ff2c80e1e8
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-11 10:44:10 +08:00 |
|
chabai
|
40ae745dfb
|
商务模块的文件夹结构优化成树形层级结构
|
2025-08-11 10:24:17 +08:00 |
|
马诗敏
|
a80a23fd74
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-10 20:46:42 +08:00 |
|
马诗敏
|
3fc298de9b
|
完善团队成员明细展示
|
2025-08-10 20:41:24 +08:00 |
|
何德超
|
a1966feef6
|
视频监测原数据管理原型
|
2025-08-10 20:23:18 +08:00 |
|
何德超
|
b3778ec7c2
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-10 20:19:57 +08:00 |
|
何德超
|
3dd794d7f0
|
形变接口原型
|
2025-08-10 20:10:47 +08:00 |
|
Maple
|
16743cfc7f
|
fix:支出合同的编辑功能实现
|
2025-08-08 17:59:38 +08:00 |
|
Mr.j
|
d5929bdc2d
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-08 17:49:24 +08:00 |
|
Mr.j
|
a0912edc6a
|
实现申请采购推送信息到审批台出现语音提示和闪烁提示
|
2025-08-08 17:35:49 +08:00 |
|
chabai
|
0401a28037
|
完善商务模块文件上传功能
|
2025-08-08 17:02:32 +08:00 |
|
chabai
|
196a5d864a
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-08 16:40:10 +08:00 |
|
chabai
|
099b3ee406
|
实现商务模块可以选择多个文件上传
|
2025-08-08 16:40:05 +08:00 |
|
Mr.j
|
37d2d21318
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-08 16:37:46 +08:00 |
|
Mr.j
|
f7641f6439
|
完善审批台接收推送信息
|
2025-08-08 16:37:36 +08:00 |
|
Maple
|
f870f50be0
|
fix:收入合同的编辑功能实现
|
2025-08-08 15:51:17 +08:00 |
|
Mr.j
|
5a13911694
|
实现审批台接收到采购申请信息
|
2025-08-08 15:44:56 +08:00 |
|
马诗敏
|
ae29bb661f
|
修改团队成员管理bug
|
2025-08-08 15:23:57 +08:00 |
|
mashimin
|
a79c4f3489
|
项目中控台
|
2025-08-08 14:26:22 +08:00 |
|
chabai
|
aa3e6c732c
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-08 13:51:36 +08:00 |
|
chabai
|
fdd20e9a9b
|
开发商务模块的文件预览功能
|
2025-08-08 13:51:32 +08:00 |
|
Maple
|
348c0396eb
|
fix:收入合同的详情以及显示，以及完成和后端api的调用。
|
2025-08-08 10:49:58 +08:00 |
|
Mr.j
|
0d515ab87f
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-08 10:28:17 +08:00 |
|
chabai
|
e098cfd8fa
|
开发商务模块文件预览功能
|
2025-08-08 10:26:36 +08:00 |
|
Mr.j
|
478aaf4a0a
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-08 10:24:59 +08:00 |
|
Mr.j
|
68b98eea7b
|
优化有两个资产管理菜单
|
2025-08-08 10:21:37 +08:00 |
|
Mr.j
|
d6f87cd0db
|
优化审批台的搜索框看不清的问题
|
2025-08-07 17:38:41 +08:00 |
|
Mr.j
|
e83579dc57
|
完成审批台基础页面搭建并实现查询功能
|
2025-08-07 16:46:44 +08:00 |
|
Maple
|
19cdc0998f
|
fix:收入合同
|
2025-08-07 16:15:23 +08:00 |
|
chabai
|
7efb1fa115
|
商务模块更改位置
|
2025-08-07 16:05:06 +08:00 |
|
chabai
|
66f6cce01b
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-07 15:26:43 +08:00 |
|
chabai
|
53a81f0b01
|
完善商务模块重命名功能，修复文件上传bug
|
2025-08-07 15:26:29 +08:00 |
|
Maple
|
946c965935
|
Merge remote-tracking branch 'origin/devlopment' into devlopment
|
2025-08-07 14:14:50 +08:00 |
|
Mr.j
|
36db98a343
|
实现设备采购新增功能，并规范设备状态，添加未入库状态
|
2025-08-07 12:01:46 +08:00 |
|
Maple
|
4d4e6fdc2c
|
Merge remote-tracking branch 'origin/devlopment' into devlopment
# Conflicts:
# src/router/route.ts
|
2025-08-07 11:51:25 +08:00 |
|
chabai
|
e9d68d7ae3
|
制度管理模块功能修复
|
2025-08-07 09:15:20 +08:00 |
|
chabai
|
9a4d9232fc
|
优化商务数据库信息模块
|
2025-08-06 17:31:05 +08:00 |
|
Maple
|
895bfcbeaf
|
fix:将岗位与服务器的内容匹配（目前是岗位中的部门/所属部门）
|
2025-08-06 16:02:00 +08:00 |
|
Mr.j
|
9be59bee8a
|
优化完成设备管理和培训模块的加入到devlopment
|
2025-08-06 15:35:51 +08:00 |
|
Maple
|
7f654625aa
|
fix:修改了一部分菜单栏的问题，但是更多的还没有修复
|
2025-08-06 15:20:23 +08:00 |
|
Mr.j
|
b44bcebf0f
|
解决冲突并合并
|
2025-08-06 14:59:01 +08:00 |
|
Mr.j
|
45d54c50d5
|
把设备管理和培训模块加入到devlopment分支
|
2025-08-06 14:53:27 +08:00 |
|
chabai
|
817a709639
|
商务信息库修复
|
2025-08-06 10:55:54 +08:00 |
|
Maple
|
864f926f2e
|
fix:菜单栏问题
|
2025-08-06 10:05:40 +08:00 |
wuxueyu
|
69b4bf86bd
|
修复各种打包错误
|
2025-08-06 01:01:43 +08:00 |
|
wuxueyu
|
48f4020fc8
|
Merge branch 'main' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web
# Conflicts:
# .env.development
# src/views/project-management/bidding/information-retrieval/index.vue
|
2025-08-06 00:05:20 +08:00 |
|
wuxueyu
|
0eb12b4df9
|
信息检索模块新增爬虫设置、检索信息列表展示、信息详情查看
|
2025-08-06 00:03:43 +08:00 |
|
chabai
|
77238c3d03
|
route 商务添加
|
2025-08-05 22:50:37 +08:00 |
|
chabai
|
7e006acaa6
|
business
|
2025-08-05 22:44:39 +08:00 |
|
chabai
|
2065389094
|
Merge remote-tracking branch 'origin/main'
|
2025-08-05 21:37:05 +08:00 |
|
chabai
|
4972dcaf4d
|
fix
|
2025-08-05 21:36:46 +08:00 |
|
Mr.j
|
c7043dbdb1
|
备注
|
2025-08-05 21:21:06 +08:00 |
|
Maple
|
02c705ae3d
|
fix:优化了岗位详情信息
|
2025-08-05 17:16:45 +08:00 |
|
Maple
|
69ff1bba7d
|
add：添加了岗位信息，实现了通过岗位查询到该岗位的角色的功能
|
2025-08-05 15:40:37 +08:00 |
wangna0328
|
c47c8e48aa
|
制度代码修改版
|
2025-08-04 22:15:48 +08:00 |
|
Maple
|
c64166a7c0
|
add：添加了岗位信息，实现了通过岗位查询到该岗位的角色的功能
|
2025-08-04 17:27:42 +08:00 |
|
wxy
|
1307eaf651
|
Revert "Merge remote-tracking branch 'origin/jgqweb'"
This reverts commit 1648f3df96, reversing
changes made to c76d6beeb0.
|
2025-08-04 17:10:11 +08:00 |
|
wxy
|
d25a34e579
|
Revert "add：添加了岗位信息，实现了通过岗位查询到该岗位的角色的功能"
This reverts commit a72aaafdfb.
|
2025-08-04 17:07:06 +08:00 |
|
wxy
|
fcd9604272
|
Revert "Merge branch 'ljy/master'"
This reverts commit 2492a57b88, reversing
changes made to 1648f3df96.
|
2025-08-04 16:59:54 +08:00 |
|
wxy
|
4ca2696896
|
Revert "信息检索、爬虫设置相关组件提交"
This reverts commit 11c9d33f94.
|
2025-08-04 16:57:59 +08:00 |
|
wxy
|
11c9d33f94
|
信息检索、爬虫设置相关组件提交
|
2025-08-04 16:25:43 +08:00 |
|
Maple
|
2492a57b88
|
Merge branch 'ljy/master'
# Conflicts:
# src/apis/system/post.ts
|
2025-08-04 14:55:23 +08:00 |
|
Maple
|
a72aaafdfb
|
add：添加了岗位信息，实现了通过岗位查询到该岗位的角色的功能
|
2025-08-04 14:50:06 +08:00 |
|
Mr.j
|
1648f3df96
|
Merge remote-tracking branch 'origin/jgqweb'
|
2025-08-04 11:54:12 +08:00 |