Compare commits

...

569 Commits

Author SHA1 Message Date
38dcbe7f7a 优化 2025-09-10 11:42:24 +08:00
71ba51772d 优化 2025-09-10 09:58:41 +08:00
Teo
11a3db5b61 修改 2025-09-10 09:23:51 +08:00
Teo
b662da584a 合并 2025-09-10 01:20:22 +08:00
Teo
311623e208 合并 2025-09-10 01:11:46 +08:00
fadbb6a911 大屏合并 2025-09-09 22:14:04 +08:00
ljx
0afefe44ca 大屏提交 2025-09-09 22:07:43 +08:00
71ec027000 优化 2025-09-09 22:00:19 +08:00
c913be2690 合并 2025-09-09 21:57:51 +08:00
217cf85ea4 优化 2025-09-09 21:55:42 +08:00
d5cf2a600e 项目级页面添加漫游、摄像头、定位设备、无人机、摄像头视频播放 2025-09-09 21:52:59 +08:00
tcy
e6f235036e refactor(components): 优化多个组件的样式和布局
- 调整了多个组件的输入框、按钮等元素的样式
- 优化了部分对话框的布局结构
- 统一了表单项的样式
- 调整了部分字体大小和颜色
2025-09-09 21:12:04 +08:00
35a7825759 项目级大屏地球 2025-09-09 19:52:26 +08:00
4bd192dc87 Merge branch 'main' of http://192.168.110.2:3000/taoge/mk_system into fs 2025-09-09 19:18:09 +08:00
dhr
78de3276d3 Merge branch 'ljx' of http://xny.yj-3d.com:3000/taoge/mk_system into dhr 2025-09-09 18:35:52 +08:00
dhr
cabf64088b 0909 2025-09-09 18:35:03 +08:00
a50fbc26d7 优化 2025-09-09 18:18:17 +08:00
d92a540786 金额格式设置 2025-09-09 17:03:01 +08:00
dhr
db6d39e02e 0909 2025-09-09 15:38:38 +08:00
ljx
d01a56d9dc 修改 2025-09-09 15:37:59 +08:00
ljx
16eb852d9d 数字化大屏 2025-09-09 15:26:15 +08:00
Teo
f006ca5a2b 1 2025-09-09 14:45:43 +08:00
ljx
460472b29a Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-09-09 11:47:40 +08:00
ljx
3579ff100f 修改 2025-09-09 11:46:44 +08:00
731c423483 优化 2025-09-09 10:50:32 +08:00
c3a2e68980 合并 2025-09-09 10:48:54 +08:00
dhr
84246a3a61 0909 2025-09-09 10:37:05 +08:00
ljx
23ceb718e9 tijiao 2025-09-09 10:18:28 +08:00
ljx
9cb43687c4 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-09-09 10:18:14 +08:00
fe9c299d64 Merge branch 'main' of http://192.168.110.2:3000/taoge/mk_system into fs 2025-09-09 10:17:02 +08:00
16fda90d96 合并 2025-09-09 10:15:34 +08:00
Teo
e3ff6020ac 1 2025-09-09 10:11:50 +08:00
Teo
32dc012598 合并 2025-09-09 10:07:21 +08:00
f6afa97b2d 合并 2025-09-09 10:03:11 +08:00
ljx
7be3859988 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-09-09 10:00:56 +08:00
ljx
f1339ad082 识别身份证 2025-09-09 09:59:03 +08:00
dhr
ac812246ea Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/mk_system into dhr 2025-09-09 09:42:56 +08:00
dhr
177da7a28a 0909 2025-09-09 09:42:28 +08:00
Teo
4cd7efcfe4 上传 2025-09-09 09:40:08 +08:00
e520f3b581 Merge branch 'main' of http://192.168.110.2:3000/taoge/mk_system into fs 2025-09-09 09:36:29 +08:00
ee849ba62a 合并 2025-09-09 09:12:18 +08:00
Teo
0c3ea8fe73 提交 2025-09-09 09:08:34 +08:00
cd9e00fc33 优化 2025-09-09 09:05:28 +08:00
7738212dd7 优化 2025-09-08 20:08:32 +08:00
ljx
942375b06b 修改提交 2025-09-08 20:07:09 +08:00
cf2b805770 优化 2025-09-08 20:00:59 +08:00
dhr
7e7d21f9ce Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/mk_system into dhr 2025-09-08 15:45:11 +08:00
dhr
dc35cb8354 0908 2025-09-08 15:44:35 +08:00
Teo
4a9a0c4214 设计管理人员任命修复ui 2025-09-08 10:23:39 +08:00
Teo
e377368c41 合并 2025-09-08 10:22:41 +08:00
Teo
f341f08248 1 2025-09-08 10:21:17 +08:00
8eac9bce6c 合并 2025-09-08 09:49:11 +08:00
ljx
2ec6dcd74f 提交 2025-09-08 09:46:27 +08:00
6e33ae2972 优化 2025-09-08 09:41:59 +08:00
8631a697f4 合并 2025-09-06 19:20:55 +08:00
22a1379ca8 合并 2025-09-06 19:20:17 +08:00
38cf536f1b 合并 2025-09-06 19:18:50 +08:00
4f21a81706 优化 2025-09-06 19:18:00 +08:00
178f44a5a3 优化 2025-09-06 19:15:47 +08:00
dhr
4fa4c754f9 0906 2025-09-06 18:51:05 +08:00
tcy
5101dc7657 fix(ctr): 修复收入合同类型切换后未重置合同类型的问题
- 在切换收入合同类型时,确保合同类型被正确重置
- 优化了模板中的代码格式,提高了可读性
2025-09-06 18:26:17 +08:00
ljx
b412e847d4 提交 2025-09-06 18:24:12 +08:00
ljx
e39823db40 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-09-06 18:24:00 +08:00
ljx
e71ec5b9c1 提交 2025-09-06 18:23:14 +08:00
ljx
52342e6623 修改9.06bug 2025-09-06 18:18:31 +08:00
ljx
dd594676ac 台账修改 2025-09-06 17:38:25 +08:00
6380ee505f 优化 2025-09-06 15:58:47 +08:00
Teo
c5dac4fbcc 合并 2025-09-06 15:27:22 +08:00
tcy
d50dbe719d refactor(formalities): 优化手续办理清单模板页面布局
- 调整了多个组件的样式和布局,包括表格、表单、按钮等
- 优化了部分代码结构,提高了代码可读性和维护性
- 添加了文件数量徽章,增强了用户界面的交互性
2025-09-06 15:19:02 +08:00
Teo
3fa3b5b508 1 2025-09-06 15:16:15 +08:00
tcy
dd12f54dc9 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/mk_system into tcy 2025-09-06 15:10:10 +08:00
tcy
d37243af6b refactor(volumeCatalog): 优化卷册目录页面布局和功能
- 调整表格列布局,增加文件数量徽章
- 优化导入按钮位置和样式
- 改进查看文件列表对话框,统一操作按钮样式
- 调整上传图纸和意见的组件样式
- 优化表格样式,增加对齐方式
2025-09-06 15:09:47 +08:00
3e4b85fc48 合并 2025-09-06 14:43:13 +08:00
b4dadc415d 优化 2025-09-06 14:41:47 +08:00
dhr
fff6fb5584 0905 2025-09-06 14:37:46 +08:00
dhr
3d50132338 0906 2025-09-06 13:21:10 +08:00
10538985ce 合并 2025-09-06 12:50:05 +08:00
2696d5cad5 合并 2025-09-06 12:46:03 +08:00
f0af5e47fa 优化 2025-09-06 12:45:15 +08:00
a517e694aa Merge branch 'main' of http://192.168.110.2:3000/taoge/mk_system into fs 2025-09-06 12:40:09 +08:00
ljx
03ec2223aa 提交 2025-09-05 22:17:25 +08:00
c9496f4400 gps 2025-09-05 21:36:48 +08:00
shi
db20b45f78 style:修改用户弹窗样式 2025-09-05 17:28:00 +08:00
shi
78dd437746 Merge branch 'main' of http://192.168.110.2:3000/taoge/mk_system into szq 2025-09-05 16:03:39 +08:00
922af12760 优化 2025-09-05 16:01:49 +08:00
b910c6fee2 Merge branch 'dhr' of http://192.168.110.2:3000/taoge/mk_system into fs 2025-09-05 15:13:10 +08:00
dhr
eb895793dd 0905 2025-09-05 15:11:21 +08:00
19b48371ef 优化 2025-09-05 14:18:26 +08:00
26b2ff2370 优化 2025-09-05 10:53:30 +08:00
b96217b9bb 优化 2025-09-05 10:46:16 +08:00
ljx
f68e5f96f6 修改 2025-09-05 10:44:38 +08:00
dhr
c35a75d030 0904 2025-09-04 22:56:00 +08:00
974b2e7038 优化 2025-09-04 22:02:54 +08:00
f9a6ad7fda 优化 2025-09-04 18:55:48 +08:00
eaaf940960 合并 2025-09-04 18:55:11 +08:00
6f7d7e56c2 合并 2025-09-04 18:53:10 +08:00
0f439c9220 优化 2025-09-04 18:42:45 +08:00
Teo
2b989e1d46 采购设计报表新增tab切换 2025-09-04 18:40:25 +08:00
Teo
26bef3f724 修复bug 2025-09-04 17:56:01 +08:00
shi
e075ce1bfc style 2025-09-04 17:36:13 +08:00
a257068054 打卡范围 2025-09-04 17:11:18 +08:00
Teo
80bb267e7d 合并 2025-09-04 11:11:22 +08:00
Teo
57460d0af1 增加搜索 2025-09-04 11:10:55 +08:00
Teo
910b24019e 1 2025-09-04 11:06:45 +08:00
4dd1f2d6d5 1 2025-09-04 10:56:28 +08:00
17ee714729 11 2025-09-04 10:37:24 +08:00
08556fbf7f 111 2025-09-04 10:36:43 +08:00
23b6551829 合并 2025-09-04 09:04:27 +08:00
9b06c042ef 优化 2025-09-04 09:03:42 +08:00
ljx
ab7d51d3a2 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-09-03 17:31:25 +08:00
ljx
5f6547aeb1 提交 2025-09-03 17:31:16 +08:00
d26db2d321 优化 2025-09-03 17:28:50 +08:00
9d9224d6ad 合并 2025-09-03 15:44:29 +08:00
055811702b 优化 2025-09-03 15:42:10 +08:00
ljx
eb98e8c8c3 修改禅道bug 2025-09-03 15:10:20 +08:00
ljx
288ee14d5e Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-09-03 11:56:52 +08:00
ljx
26e4c899db 修改bug 2025-09-02 20:37:07 +08:00
a95d18906f 优化 2025-09-02 19:34:26 +08:00
2737e579c8 合并 2025-09-02 19:20:07 +08:00
069841ea99 合并 2025-09-02 19:16:42 +08:00
ljx
85e5572e53 修改bug 2025-09-02 19:15:36 +08:00
46f9c0568c 合并 2025-09-02 19:14:34 +08:00
1a476b8ee8 优化 2025-09-02 19:13:43 +08:00
ljx
d06d6a9504 修改禅道bug 2025-09-02 19:09:43 +08:00
ljx
0c81842fd6 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-09-02 19:03:49 +08:00
ljx
2ba08c79ed 修改禅道bug 2025-09-02 19:00:50 +08:00
ddccc64586 工程量清单 2025-09-02 15:08:39 +08:00
0c0e55a383 Merge branch 'main' of http://192.168.110.2:3000/taoge/mk_system into fs 2025-09-02 14:59:06 +08:00
253e395ace 优化 2025-09-02 09:52:36 +08:00
Teo
9d1f96309f Merge projectA into B with conflict resolution 2025-09-01 14:55:09 +08:00
192ffb5091 合并 2025-09-01 09:22:33 +08:00
9cecbeaa20 合并 2025-09-01 09:22:12 +08:00
8a3f338e27 合并 2025-09-01 09:18:21 +08:00
2415c96cf9 优化 2025-09-01 09:15:27 +08:00
Teo
8b57f957b6 优化 2025-08-30 08:18:27 +08:00
Teo
3b1ad5cd05 优化 2025-08-30 07:31:45 +08:00
Teo
81d22d0b69 优化 2025-08-30 07:31:11 +08:00
ljx
856ecd7c43 提交 2025-08-30 07:30:23 +08:00
ljx
a74419c288 提交 2025-08-30 06:39:31 +08:00
Teo
e0a4b1e8fa 优化 2025-08-30 03:48:05 +08:00
Teo
4f2eec9468 优化 2025-08-30 01:16:47 +08:00
Teo
873aecf815 优化 2025-08-30 01:16:18 +08:00
ljx
1eba94076d 工作联系单审核 2025-08-30 01:16:08 +08:00
Teo
76488de0cd 优化 2025-08-30 00:32:52 +08:00
Teo
5c125bc37b 优化 2025-08-30 00:32:03 +08:00
dhr
80e22c8f92 youhua 2025-08-30 00:31:16 +08:00
dhr
c69a91651d hebing 2025-08-30 00:04:01 +08:00
Teo
5b118055c5 优化 2025-08-30 00:01:14 +08:00
ljx
8887392758 修改权限 2025-08-29 22:45:49 +08:00
ljx
a2ea5e5979 提交 2025-08-29 22:10:42 +08:00
ljx
06d111b9e6 修改隐藏表 2025-08-29 21:36:10 +08:00
ljx
897e41c422 提交 2025-08-29 21:04:51 +08:00
2b88c32489 优化 2025-08-29 21:01:20 +08:00
Teo
ba2b8444af 优化 2025-08-29 20:59:59 +08:00
62ab2a4672 优化 2025-08-29 20:57:49 +08:00
dhr
2815b7d6b0 1 2025-08-29 19:54:27 +08:00
203c808fa2 合并 2025-08-29 19:25:18 +08:00
eba51942d7 优化 2025-08-29 19:24:48 +08:00
Teo
8682b0d8b8 优化 2025-08-29 18:58:09 +08:00
Teo
d9662b5e7d 合并 2025-08-29 18:57:27 +08:00
tcy
043d49cb20 style: 优化代码格式和布局
- 调整了多行代码的缩进和换行方式,提高了代码可读性
- 在 Materials 和 QuestionUserAnswer 组件中进行了相似的格式化修改
- 未改变原有功能,仅优化了代码结构
2025-08-29 18:56:51 +08:00
Teo
8ff57e80d8 合并 2025-08-29 18:56:36 +08:00
Teo
b1bc73cddb 合并 2025-08-29 18:55:32 +08:00
Teo
141aa7be4d 优化 2025-08-29 18:54:43 +08:00
ljx
fa46f632d9 新增权限 2025-08-29 18:52:37 +08:00
dhr
15c4ad5484 1 2025-08-29 18:17:19 +08:00
Teo
c1b891b4b2 hse修改接口 2025-08-29 18:06:42 +08:00
ljx
621084cd82 提交 2025-08-29 17:15:35 +08:00
Teo
d3317b0e32 Merge branch 'fs' of http://192.168.110.2:3000/taoge/mk_system into ljj 2025-08-29 16:51:44 +08:00
Teo
b0abb5f47b hse修改接口 2025-08-29 16:51:40 +08:00
43419d52af 优化 2025-08-29 16:51:08 +08:00
99b7183e36 youhua 2025-08-29 16:50:24 +08:00
Teo
e99e27c8d1 解决冲突 2025-08-29 16:34:02 +08:00
ljx
47a8b17061 提交 2025-08-29 16:33:37 +08:00
Teo
bbb105b622 解决冲突 2025-08-29 16:17:24 +08:00
Teo
5e3bd52949 合并 2025-08-29 16:16:47 +08:00
dhr
31b00165cf 1 2025-08-29 16:12:14 +08:00
dhr
6f2b503bd2 Merge branch 'ljj' of http://xny.yj-3d.com:3000/taoge/mk_system into dhr 2025-08-29 15:43:43 +08:00
ljx
dc59ade2b8 Merge branch 'ljj' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-08-29 15:09:01 +08:00
tcy
bfafbc9591 Merge branch 'ljj' of http://xny.yj-3d.com:3000/taoge/mk_system into tcy 2025-08-29 15:08:52 +08:00
Teo
70aa152b1a 设置班组限制请求 2025-08-29 15:08:26 +08:00
ljx
d09db36ed8 Merge branch 'ljj' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-08-29 14:59:24 +08:00
tcy
76d80b23b1 Merge branch 'ljj' of http://xny.yj-3d.com:3000/taoge/mk_system into tcy 2025-08-29 14:58:40 +08:00
ljx
7c2e4d7e14 修改 2025-08-29 14:58:31 +08:00
Teo
5465136879 设置班组限制请求 2025-08-29 14:57:52 +08:00
dhr
b773a2d149 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/mk_system into dhr 2025-08-29 14:55:47 +08:00
tcy
395f6f352a style: 优化代码格式和结构
- 调整了多个组件中的缩进和换行方式
- 优化了部分长代码行的断行逻辑
- 统一了某些属性的格式
- 删除了一些不必要的空格
2025-08-29 14:55:22 +08:00
tcy
2290eb28d7 ci: 更新开发环境 API 地址
- 将 VITE_APP_BASE_API 的值从 'http://192.168.110.180:8899' 修改为 'http://192.168.110.210:8899'
- 此更新是为了适应开发环境的变化,确保开发人员使用正确的 API 地址
2025-08-29 14:55:08 +08:00
dhr
a21bf2f755 0829 2025-08-29 14:47:58 +08:00
468dda51e1 提交 2025-08-29 12:32:49 +08:00
tcy
ac579263b8 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/mk_system into tcy 2025-08-29 10:46:18 +08:00
tcy
2b07329c87 refactor(demo): 重构标题组件布局
- 使用 el-row 和 el-col 组件包裹标题和副标题
- 保持原有样式不变,优化 HTML 结构
2025-08-29 10:45:40 +08:00
ljx
6eed9d9244 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-08-29 10:36:51 +08:00
ljx
09691bdbe6 修改1111 2025-08-29 10:36:16 +08:00
384eb35d84 合并 2025-08-28 23:36:30 +08:00
bf23c8c18f 合并 2025-08-28 23:35:13 +08:00
ade1177294 优化 2025-08-28 23:32:17 +08:00
Teo
b0a05519f0 修改部门获取项目列表 2025-08-28 22:24:49 +08:00
Teo
211b94d76b 修复刷新丢失权限bug 2025-08-28 22:00:23 +08:00
ljx
23313b9645 修改提交 2025-08-28 20:32:12 +08:00
Teo
9ec6b9818c 修复权限以及供应商入库 2025-08-28 20:10:46 +08:00
ljx
c0338033b4 修改 2025-08-28 18:20:24 +08:00
2b25709c14 合并 2025-08-28 15:37:50 +08:00
c9cceb53f7 合并 2025-08-28 15:36:33 +08:00
53d5f677c4 优化 2025-08-28 15:35:19 +08:00
72a8665906 合并 2025-08-28 14:43:23 +08:00
6c96dc2abc 优化 2025-08-28 14:42:14 +08:00
ljx
fdab021ff2 修改 2025-08-28 14:40:28 +08:00
e7cf93f7e4 优化 2025-08-28 10:20:31 +08:00
cb817e47b4 优化 2025-08-28 10:07:35 +08:00
Teo
b59bd89e43 权限重构 2025-08-28 03:35:18 +08:00
6f73a308ba 提交 2025-08-27 22:21:53 +08:00
0c06379ff6 合并 2025-08-27 22:05:39 +08:00
27f95371c5 优化 2025-08-27 22:03:50 +08:00
ljx
46f46a7c75 提交 2025-08-27 20:03:16 +08:00
ljx
8d453efb07 修改 2025-08-27 20:02:31 +08:00
7d6c13e935 优化 2025-08-27 19:50:22 +08:00
ljx
2c9c72d714 合规性手续模版新增 2025-08-27 18:52:12 +08:00
tcy
93c2f6e512 逆变器综合监控 2025-08-27 17:45:27 +08:00
fa1f3215cf 工程量清单添加模板下载 2025-08-27 17:12:52 +08:00
ljx
6e53520a33 修改 2025-08-27 15:01:00 +08:00
tcy
e7dc466c88 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/mk_system into tcy 2025-08-27 15:00:20 +08:00
tcy
e6c92a3b51 逆变器综合监控 2025-08-27 14:59:18 +08:00
ljx
9fb3357c1f 修改切换bug 2025-08-27 14:56:27 +08:00
ljx
ead5b7bd70 修改 2025-08-27 11:42:54 +08:00
ljx
ab68bbcd40 新增一键确定 2025-08-27 11:17:30 +08:00
f637e65635 合并 2025-08-26 21:04:22 +08:00
dc39b5861d 合并 2025-08-26 21:03:23 +08:00
18957eb7a7 测试优化 2025-08-26 21:00:46 +08:00
Teo
cec48c13af 修改进度管理bug 2025-08-26 20:38:35 +08:00
ljx
0b6b578d25 优化资金 2025-08-26 19:35:21 +08:00
ljx
c1d6a8d92c 优化资金 2025-08-26 19:25:15 +08:00
ljx
4e08f7387f Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-08-26 16:07:19 +08:00
ljx
48a72e22cf 修改 2025-08-26 16:06:55 +08:00
Teo
8d7736b3fc 合并 2025-08-26 09:33:53 +08:00
589d21d622 合并 2025-08-25 20:21:21 +08:00
68b43b1246 合并 2025-08-25 20:17:15 +08:00
ljx
5f42c21467 修改审核 2025-08-25 20:15:09 +08:00
ee2f5ec71e 合并 2025-08-25 20:05:34 +08:00
a7f9339eb8 优化 2025-08-25 20:04:07 +08:00
Teo
239c989a26 合规性手续新增,进度类别模板更新 2025-08-25 20:02:38 +08:00
91b7f38f8c 修改bug 2025-08-25 20:01:33 +08:00
shi
290fc16c32 略改样式 2025-08-25 19:59:36 +08:00
70db0367e1 土地流转(地块信息、进场道路(下载模板、) 2025-08-25 19:58:42 +08:00
tcy
46bfa429d3 refactor(ctr): 重新启用合同收入编辑功能
- 恢复了根据路由查询参数 id 获取合同信息的逻辑
- 移除了无用的下载文件代码
- 优化了页面加载时的数据处理流程
2025-08-25 17:31:37 +08:00
369ba1ad20 1 2025-08-25 11:11:17 +08:00
7ea0594610 1 2025-08-25 11:10:45 +08:00
874c04e497 合并 2025-08-25 09:04:49 +08:00
tcy
fceb454b2a 1 2025-08-23 10:22:12 +08:00
7c171e432f 优化 2025-08-23 09:37:58 +08:00
53e1f94c78 1 2025-08-23 09:36:17 +08:00
ljx
6832b91cfd 修改提交 2025-08-23 09:35:44 +08:00
bbbba22ebd 2 2025-08-23 09:16:17 +08:00
tcy
ceabac7fb8 1 2025-08-23 09:14:35 +08:00
ljx
0d180e63f2 提交 2025-08-23 09:13:54 +08:00
446d30ce35 hebing 2025-08-23 09:02:03 +08:00
tcy
0ea88f33b8 优化 2025-08-23 08:58:20 +08:00
Teo
b256eb83f0 产值修改 2025-08-23 08:57:52 +08:00
7f19586b93 合并 2025-08-23 06:40:35 +08:00
tcy
2b339df606 修改 2025-08-23 06:39:03 +08:00
160223bf5f 合并 2025-08-23 06:38:08 +08:00
Teo
4d0845ee53 设计变更审批 2025-08-23 06:36:17 +08:00
5fdb8bdfe3 优化 2025-08-23 06:33:22 +08:00
tcy
cfb6085bbf 产值 2025-08-23 06:31:22 +08:00
ljx
73772f036f 投标成本核算 2025-08-23 06:28:18 +08:00
tcy
dbb649d1ce 产值计划 2025-08-23 04:36:12 +08:00
ljx
f3f8ab0b87 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-08-23 03:31:16 +08:00
ljx
31c21c7bb5 提交 2025-08-23 03:30:54 +08:00
tcy
59d1f881dd 优化 2025-08-23 01:41:19 +08:00
tcy
b84985414a 优化 2025-08-23 00:07:56 +08:00
Teo
5ffe04d20e 合并 2025-08-22 23:31:19 +08:00
Teo
7e15764ba5 合并 2025-08-22 23:30:48 +08:00
1c14669ddf 优化 2025-08-22 23:30:01 +08:00
6eb10c27a4 优化 2025-08-22 23:29:16 +08:00
Teo
bb512fe0f3 审核 2025-08-22 23:27:17 +08:00
6f79e07193 合并 2025-08-22 23:20:39 +08:00
b4113bdf2a 限价 2025-08-22 23:16:19 +08:00
2bbeb83502 1 2025-08-22 22:58:47 +08:00
ljx
38dd85de64 提交 2025-08-22 22:57:59 +08:00
Teo
ea56d292ec 招标一览审核 2025-08-22 22:57:45 +08:00
5258b37d07 优化 2025-08-22 22:52:29 +08:00
ljx
ba037ac2cd 审核 2025-08-22 22:51:22 +08:00
tcy
31963f69c3 feat(ctr): 优化合同提交流程并添加更新功能
- 修改合同提交成功后的步骤重置逻辑,根据合同类型跳转到不同页面
- 更新合同信息页面,添加批量导出功能
- 优化合同信息获取逻辑,提高页面加载速度
2025-08-22 22:24:10 +08:00
shi
e4523299d4 完善项目及大屏 2025-08-22 22:17:57 +08:00
tcy
340954167f refactor(ctr): 调整合同管理页面的查询条件和详情标题
- 注释掉费用合同和收入合同页面的"合同金额"查询条件
- 修改费用合同页面的"分包内容详情"标题为"合同内容详情"
- 修改收入合同页面的"承包内容详情"标题为"合同内容详情"
- 调整收入合同页面"查看分包内容"按钮文字为"查看合同内容"
2025-08-22 21:19:19 +08:00
tcy
169f5ae376 feat(ctr): 优化合同管理功能
- 优化富文本编辑器组件,增加占位符功能
- 在费用合同和收入合同列表中添加支付方式列
- 增加合同内容详情对话框,用于查看分包内容
- 在收入合同列表中添加修改合同功能
- 根据合同类型动态显示承包内容或合同内容
2025-08-22 21:08:56 +08:00
984ec9c4fb 合并 2025-08-22 20:03:33 +08:00
93df563660 合并 2025-08-22 20:01:49 +08:00
dhr
1405857f55 0822 2025-08-22 19:53:59 +08:00
b77d5fe171 合并 2025-08-22 19:53:19 +08:00
Teo
9584ab4baa 提交 2025-08-22 19:53:14 +08:00
00122c93fc 合并 2025-08-22 19:50:19 +08:00
d45bce2ef8 优化 2025-08-22 19:48:09 +08:00
tcy
92d8c52b18 feat(ctr): 调整合同相关功能
- 在费用合同列表中添加预付款比例、尾款比例、质保金比例、付款比例等列
- 修改收入合同列表中承包内容查看按钮,改为详情按钮
- 更新招标信息选择时的数据绑定逻辑
2025-08-22 19:43:55 +08:00
tcy
72577614aa feat(incomeContract): 增加查看承包内容功能并调整操作列宽度
- 在操作列中添加"查看承包内容"按钮
- 调整操作列宽度为200,以适应新增的按钮
2025-08-22 19:32:49 +08:00
tcy
cff2ce34f1 refactor(largeScreen): 优化现金流报表样式
- 调整 legend 位置和样式
- 优化 tooltip 内容和格式
- 调整图表布局和样式
2025-08-22 19:14:27 +08:00
tcy
8f9b042941 123 2025-08-22 19:01:55 +08:00
tcy
26e1493aa7 1111 2025-08-22 19:01:38 +08:00
dhr
e3b4826dce 修改 2025-08-22 18:25:54 +08:00
tcy
fb105b7962 feat(largeScreen): 优化大屏展示效果
- 在折线图中添加图例显示
- 调整柱状图的图例位置和标签显示
- 优化库存图的视觉效果
2025-08-22 18:23:26 +08:00
shi
a712dce2cd 添加屏幕扩展动画 2025-08-22 17:47:58 +08:00
ljx
e182b87f02 提交 2025-08-22 17:32:24 +08:00
tcy
11bded87e4 refactor(largeScreen): 修改月度数据图表的月份标签
- 用固定的中文月份标签替换从 API 获取的月份数据
- 提高了图表的可读性和一致性
2025-08-22 17:29:48 +08:00
tcy
291a5eca02 refactor(largeScreen): 调整图表样式和数据
- 修改 getLineOption 函数中的 axisLabel textStyle 颜色为白色
- 更新 ProgressComponent 组件的 percentageChange 值为 98.11%
- 固定 month 数组为 12
2025-08-22 17:26:18 +08:00
tcy
678f10c96b feat(largeScreen): 添加现金流总和接口并更新右侧面板数据
- 在 api/largeScreen/index.js 中添加 cashTotal 接口
- 在 rightPage.vue 中引入 cashTotal 接口并获取数据
- 更新 rightPage.vue 中的现金流数据显示,使用从接口获取的数据
2025-08-22 17:18:05 +08:00
tcy
cb6ca3f709 refactor(ctr): 注释掉合同内容相关列
- 在 expensesContract 和 incomeContract 视图中,注释掉了"分包内容"和"承包内容"列
2025-08-22 16:47:48 +08:00
tcy
ad04cff917 feat(largeScreen): 大屏展示功能开发
- 新增 RevenueContractCard 组件,用于展示收入、支出等合同数据
- 实现 bottomboxconpoent 组件的通用化,支持自定义标题、数值等
- 在 centerPage 中集成 RevenueContractCard 组件,展示大屏数据
- 更新 rightPage 组件,添加实际数据请求和展示
- 优化 optionList 中的图表配置,提高图表可读性
2025-08-22 16:37:14 +08:00
Teo
9dfa9ee146 Merge branch 'ljx' of http://192.168.110.2:3000/taoge/mk_system into ljj 2025-08-22 16:18:00 +08:00
ljx
f4cbde8ee2 修改bug 2025-08-22 15:57:20 +08:00
Teo
e7558d770c 合并 2025-08-22 15:34:46 +08:00
ljx
c80984cb51 Merge branch 'fs' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-08-22 15:33:10 +08:00
ljx
6c05e20e8d 招标 2025-08-22 15:32:55 +08:00
Teo
91423fdf5c 合并 2025-08-22 15:12:26 +08:00
Teo
d93b0d71a9 修改产值 2025-08-22 15:11:31 +08:00
3588c5d386 合同限价审核 2025-08-22 14:29:26 +08:00
ljx
58cbe1c902 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-08-22 11:43:23 +08:00
ljx
dbc26a3d49 招标 2025-08-22 11:42:12 +08:00
tcy
c1512c5a34 feat(ctr): 优化合同付款比例输入
- 在收入合同列表中添加预付款比例、尾款比例、质保金比例和付款比例列
- 在合同表单中将预付款比例、尾款比例和质保金比例的输入框改为专用的数字输入框
- 新增付款比例计算逻辑,确保四项比例之和为 100%
- 优化表单验证逻辑,确保付款比例之和必须等于 100%
- 修复了一些与输入格式相关的潜在问题
2025-08-22 11:11:19 +08:00
89bd2e6d92 测试 2025-08-22 10:29:00 +08:00
a437d7a485 合并 2025-08-21 21:43:24 +08:00
25786908b7 合并 2025-08-21 21:42:38 +08:00
2e7a72a89a 合并 2025-08-21 21:41:56 +08:00
c6d971392b 合并 2025-08-21 21:41:07 +08:00
ljx
5556264b9e 招标 2025-08-21 21:40:14 +08:00
Teo
65f4191211 合并 2025-08-21 21:39:42 +08:00
594de41607 审核 2025-08-21 21:39:21 +08:00
40cb0589f8 资金看板-完善-数据暂时没有对接 2025-08-21 21:37:32 +08:00
shi
479291d857 初步完善 2025-08-21 20:38:44 +08:00
tcy
5870c66161 refactor(largeScreen): 重构大屏展示组件
- 修改 ProgressComponent 组件,增加 isShowPrice 属性控制是否显示价格
- 更新 rightPage 组件,添加新的 ProgressComponent 实例
- 优化 tender/plan/index.vue 页面结构,简化代码
2025-08-21 20:21:03 +08:00
tcy
ce1665a2c6 1 2025-08-21 20:05:32 +08:00
ljx
f01487dc50 柱状图 2025-08-21 20:03:15 +08:00
tcy
ddf3bcf651 Merge branch 'fs' of http://xny.yj-3d.com:3000/taoge/mk_system into tcy 2025-08-21 18:56:49 +08:00
tcy
5497871ce3 Merge branch 'fs' of http://xny.yj-3d.com:3000/taoge/mk_system into tcy 2025-08-21 18:49:24 +08:00
15a724a5fe 资金看板 2025-08-21 18:45:51 +08:00
1cdd24271c 合并 2025-08-21 18:40:07 +08:00
3469f1e186 合并 2025-08-21 18:38:42 +08:00
dhr
37c914c662 0821 2025-08-21 18:38:02 +08:00
288d7df341 合并 2025-08-21 18:36:11 +08:00
d260f9983d 合并 2025-08-21 18:34:59 +08:00
6018fcc9ba 成本 2025-08-21 18:33:16 +08:00
Teo
e4f2548199 修改bug 2025-08-21 18:32:37 +08:00
75f190907d 合并ljx 2025-08-21 17:35:47 +08:00
3fe1767190 Merge branch 'main' of http://192.168.110.2:3000/taoge/mk_system into fs 2025-08-21 17:34:21 +08:00
48a30fd508 资金看板 2025-08-21 17:34:02 +08:00
ljx
aab67593eb 提交 2025-08-21 17:32:10 +08:00
589422ad0e 修改 2025-08-21 16:54:14 +08:00
67f58089ff 成本 2025-08-21 16:46:01 +08:00
tcy
9f45f2e3b5 refactor(ctr): 优化合同创建页面逻辑
- 添加 active.value 的日志输出,便于调试
- 调整 back 函数,增加日志输出并更新表单步骤
- 简化 resetForm 函数,移除不必要的逻辑
2025-08-21 16:43:00 +08:00
tcy
f0577d7d27 feat(ctr): 优化合同管理功能
- 支出合同和收入合同页面移除项目ID相关字段
- 合同列表页面添加当前项目ID筛选条件
- 合同表单页面禁用某些字段的编辑
- 优化合同类型页面的表单布局和提示信息
- 添加对当前项目变更的监听,自动刷新合同列表
2025-08-21 16:35:24 +08:00
5e162ef59d 提交 2025-08-21 15:56:09 +08:00
tcy
bc0c9e3a90 feat(ctr): 添加选择招标计划功能
- 弹出对话框显示招标计划列表
- 列表包含序号、名称、合同额、分包内容、中标单位等信息
- 添加选择按钮,点击后将招标计划信息回填到合同表单中
- 优化合同表单,增加招标计划相关字段
2025-08-21 15:52:33 +08:00
5c1aca212e 合并 2025-08-21 15:49:42 +08:00
30f53f75e9 合并 2025-08-21 15:48:45 +08:00
2222649770 合并 2025-08-21 15:48:08 +08:00
5454018914 成本核算清单 2025-08-21 15:46:30 +08:00
tcy
396dcd5748 feat(ctr): 添加招标计划选择功能
- 新增获取招标计划的 API 接口
- 在合同创建页面添加招标计划选择功能
- 优化合同类型选择逻辑,增加相关提示
2025-08-21 15:40:59 +08:00
dhr
525733b9e5 合并 2025-08-21 15:28:01 +08:00
dhr
8843763499 合并 2025-08-21 15:24:05 +08:00
Teo
179d9ba6aa 解决bug 2025-08-21 15:22:17 +08:00
Teo
f7ec845a7b tijiao 2025-08-21 15:16:23 +08:00
ljx
297048ab91 Merge branch 'fs' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-08-21 14:19:49 +08:00
b4a023570f title组件、progress组件 2025-08-21 14:18:21 +08:00
ljx
59325f7877 大屏 2025-08-21 14:17:57 +08:00
tcy
3b90f269ae feat(ctr): 优化合同类型展示
- 在费用合同和收入合同列表中,将合同类型列的数据通过字典转换为可读性更强的文本
- 新增 useDict 钩子,用于获取字典数据
- 修复了项目用户列表中的部分样式问题
2025-08-21 12:27:24 +08:00
7933ffbc0e 合并 2025-08-21 12:07:07 +08:00
37e01eda4b 优化 2025-08-21 12:06:03 +08:00
77150924b4 合并 2025-08-21 12:05:00 +08:00
c092650aed 优化 2025-08-21 12:03:34 +08:00
tcy
4c01c0a4a3 style(ctr): 调整费用合同页面布局
- 移除导出按钮旁边的换行符
- 在右上角工具栏上方添加换行符
2025-08-21 11:33:17 +08:00
tcy
6359daba49 feat(ctr): 新增合同附件列表功能并优化合同创建流程
- 在支出合同和收入合同页面添加查看附件列表功能
- 实现合同创建的多步骤流程,包括合同信息填写和付款信息填写
- 增加表单验证,确保合同信息和付款信息的完整性
- 优化合同类型切换逻辑,支持收入合同和支出合同的创建
- 在合同创建过程中添加临时数据保存功能,防止数据丢失
2025-08-21 11:32:31 +08:00
tcy
7c1f07eb7d 合同登记相关 2025-08-21 08:55:51 +08:00
Teo
6dff42a6cb 采购联系单找回 2025-08-21 02:25:39 +08:00
Teo
c414e541c1 合并 2025-08-21 01:41:16 +08:00
Teo
c8cc1a329b 设计任务 2025-08-21 01:39:29 +08:00
dhr
4511145f52 招标 2025-08-21 01:38:57 +08:00
Teo
10ed8585e3 合并 2025-08-21 00:32:23 +08:00
4f6cb30832 合并 2025-08-21 00:22:16 +08:00
4e18057981 成本清算 2025-08-21 00:20:48 +08:00
Teo
aa6de50a78 优化 2025-08-21 00:19:50 +08:00
ljx
1ac6a846ba 修噶 2025-08-21 00:16:44 +08:00
ljx
25e3c62ad9 修噶 2025-08-21 00:03:52 +08:00
0098a9829d 成本核算清单 2025-08-20 22:32:09 +08:00
dhr
acdd8cf467 0820 2025-08-20 21:22:56 +08:00
Teo
dae6c05005 合并 2025-08-20 21:17:16 +08:00
Teo
34d0fee2f6 解决冲突 2025-08-20 21:14:31 +08:00
afd59bc373 合并 2025-08-20 21:12:52 +08:00
d67de58a37 合并 2025-08-20 21:11:39 +08:00
52056dde9d 合并 2025-08-20 21:10:58 +08:00
dhr
1dbde76257 add 2025-08-20 21:10:21 +08:00
388a31dd18 投标管理 2025-08-20 21:09:18 +08:00
ljx
3c476fbba0 修改回显bug 2025-08-20 21:02:24 +08:00
Teo
9f3e150509 add 2025-08-20 20:03:32 +08:00
tcy
314903104c 更新 2025-08-20 19:40:16 +08:00
tcy
c61582c631 提交 2025-08-20 19:32:49 +08:00
1e822facc8 合并 2025-08-20 19:28:35 +08:00
Teo
c98e3f72e1 优化逻辑bug 2025-08-20 19:25:52 +08:00
16caf1b5e6 合并 2025-08-20 19:23:53 +08:00
7e4a5e17cc 设计管理优化 2025-08-20 19:21:52 +08:00
c12fa631e4 工程量清单修改 2025-08-20 19:19:04 +08:00
ljx
4372472769 Merge branch 'ljx' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-08-20 15:17:40 +08:00
ljx
2c7b056405 提交 2025-08-20 15:17:37 +08:00
tcy
18b5df1133 优化input带来的性能问题 2025-08-20 15:15:46 +08:00
ljx
c68bbc7717 修改数据 2025-08-20 14:28:04 +08:00
b8652c084b Merge branch 'main' of http://192.168.110.2:3000/taoge/mk_system into fs 2025-08-20 10:34:40 +08:00
d80fcbf454 工程量清单修改 2025-08-20 10:33:06 +08:00
ljx
30ea9bc1dd Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-08-20 10:29:06 +08:00
ljx
786e7a516f 资金 2025-08-20 10:28:23 +08:00
Teo
6cab291522 批次需求列表新增优化 2025-08-19 22:50:28 +08:00
Teo
f163893ccf Merge branch 'main' into ljj 2025-08-19 22:20:11 +08:00
Teo
d97838a919 获取物资列表 2025-08-19 22:15:00 +08:00
52d4a07204 合并 2025-08-19 21:24:39 +08:00
9049969546 优化 2025-08-19 21:18:43 +08:00
0a790aebb5 投标工程量审批、限价工程量清单、招采工程量清单 2025-08-19 21:16:31 +08:00
616e9fc7b7 优化 2025-08-19 21:15:01 +08:00
adb3ba7123 合并 2025-08-19 20:18:24 +08:00
001adefac7 Merge remote-tracking branch 'origin/ljj' into lt 2025-08-19 20:15:20 +08:00
7ab2e0ae32 工程量清单添加字段 2025-08-19 20:08:27 +08:00
dhr
15742dd235 08/19设计派单和招标管理 2025-08-19 20:05:28 +08:00
271f99fb16 设计管理 2025-08-19 20:01:29 +08:00
Teo
da3a46189e 合并 2025-08-19 19:29:14 +08:00
53309746f5 设计出图修改 2025-08-19 14:56:48 +08:00
3b61e84a7f first commit 2025-08-19 10:19:29 +08:00
ca09a1b326 合并 2025-08-18 20:02:58 +08:00
9e2cf9c73a 设计出图 2025-08-18 20:02:07 +08:00
Teo
806ed029cf 审批重构 2025-08-18 19:59:57 +08:00
Teo
174ef50f6f 合并 2025-08-18 09:32:22 +08:00
12e80c57d3 优化 2025-08-18 09:31:19 +08:00
896ea07fad 优化 2025-08-16 01:26:38 +08:00
12173054e9 图纸管理 2025-08-16 00:28:12 +08:00
Teo
53444ef514 合并 2025-08-16 00:07:34 +08:00
Teo
23e3460853 合并 2025-08-16 00:06:06 +08:00
8f9972343a 权限添加 2025-08-15 23:14:44 +08:00
4cf4efc094 权限添加 2025-08-15 23:14:13 +08:00
65a86571d7 物资使用情况不显示问题 2025-08-15 22:48:31 +08:00
c92db7241e 物资使用情况不显示问题 2025-08-15 22:47:41 +08:00
e1617585ab 合并 2025-08-15 22:00:22 +08:00
Teo
c7e0486528 合并 2025-08-15 21:58:55 +08:00
Teo
faf25cf5a7 优化 2025-08-15 21:58:23 +08:00
4e26581af6 优化 2025-08-15 21:57:59 +08:00
0df7221c10 合并 2025-08-15 19:15:19 +08:00
d5092e7a58 权限设计 2025-08-15 19:14:20 +08:00
Teo
2e24c41b60 合并 2025-08-15 18:29:44 +08:00
Teo
ab1b50e6a0 Merge branch 'lt' of https://gitee.com/TheNightHunters/plus-ui into ljj 2025-08-15 18:28:36 +08:00
f2330cf965 权限 2025-08-15 18:28:06 +08:00
6bfb3364db 权限 2025-08-15 18:27:31 +08:00
094a7ba0f0 工程量清单的展开和折叠 2025-08-15 18:26:36 +08:00
Teo
3f588d0846 修改上传 2025-08-15 17:25:43 +08:00
8cc384cdcb 合并 2025-08-15 17:25:27 +08:00
a43f56def7 默认配置 2025-08-15 17:24:33 +08:00
000689d29d 优化 2025-08-15 17:17:07 +08:00
b555fd4482 合并 2025-08-15 16:56:36 +08:00
1b4b1c0128 优化 2025-08-15 16:54:37 +08:00
Teo
20b5d7d685 合并 2025-08-15 16:54:09 +08:00
Teo
1e87b87bb9 手续 2025-08-15 16:53:31 +08:00
192caba460 合并 2025-08-15 16:35:45 +08:00
c20495785d 优化 2025-08-15 16:34:59 +08:00
359c7ec47f 调整默认值 2025-08-15 15:46:26 +08:00
d325fb2505 物资使用情况优化 2025-08-15 15:27:53 +08:00
a7b148bc96 建立新分支准备 2025-08-15 15:21:07 +08:00
ff2f36e88c 消息 2025-08-15 10:58:12 +08:00
c7b4af704d 合并 2025-08-15 03:10:24 +08:00
Teo
26386882f0 手续 2025-08-15 03:09:20 +08:00
a4d4861ba8 优化 2025-08-15 03:09:17 +08:00
34b4ccfc5f 优化 2025-08-15 03:08:47 +08:00
e6cebe233c 物资使用计划 2025-08-15 03:04:57 +08:00
d09275da0e 物资使用计划 2025-08-15 03:04:40 +08:00
384069ecbf 优化 2025-08-15 02:11:47 +08:00
e1295bdda0 优化 2025-08-15 02:11:07 +08:00
Teo
70d829af6c 消息设置 2025-08-15 01:38:36 +08:00
5e8fc48bc7 优化 2025-08-15 00:22:35 +08:00
b8c9dd5be5 优化 2025-08-15 00:22:06 +08:00
Teo
ae979b47c0 采购单 2025-08-15 00:22:03 +08:00
Teo
802fd82d02 合并冲突 2025-08-14 22:39:46 +08:00
Teo
1d120cde0a 采购单 2025-08-14 22:37:39 +08:00
15a3919ce9 合并 2025-08-14 22:09:58 +08:00
f45389c1a7 接收单 2025-08-14 22:09:19 +08:00
8ececf8c12 物资总计划 2025-08-14 22:08:39 +08:00
3488536489 物资供应总计划 2025-08-14 19:44:07 +08:00
dfd7030de9 物资供应总计划 2025-08-14 19:43:46 +08:00
90e6ddc212 合并版 2025-08-14 18:54:49 +08:00
9184fe6974 图纸 2025-08-14 18:53:50 +08:00
Teo
8acfe27a8d 采购单审核 2025-08-14 18:53:01 +08:00
a6c2df39e2 合并 2025-08-14 16:41:39 +08:00
a305c5bc19 设计完成 2025-08-14 16:40:52 +08:00
Teo
459396080b 采购联系单 2025-08-14 16:40:32 +08:00
6a69798ec6 合并 2025-08-14 10:51:55 +08:00
Teo
062fa5b080 消息配置 2025-08-14 10:50:56 +08:00
a8922c5666 计划出图 2025-08-14 10:50:34 +08:00
b45b57e0ab 计划出图 2025-08-14 10:49:13 +08:00
5e69d5c156 工程清单审批\loading效果 2025-08-14 10:03:11 +08:00
Teo
f6c21bf195 合并 2025-08-14 02:30:58 +08:00
71c1bdcf1c 优化 2025-08-14 02:26:01 +08:00
8f26476c9b 设计出图 2025-08-14 02:07:30 +08:00
Teo
3158dc84f7 合并 2025-08-14 01:58:00 +08:00
0872d4ff68 设计出图 2025-08-14 01:50:21 +08:00
07b5d5238a 合并 2025-08-13 23:43:49 +08:00
6cc64cd59c 合并 2025-08-13 23:43:00 +08:00
759be564fc 设计变更 2025-08-13 23:42:24 +08:00
Teo
606722f19e 修改bug 2025-08-13 23:35:26 +08:00
f33dc4fa39 工程清单审批\loading效果 2025-08-13 22:38:23 +08:00
7ca3fbd439 工程清单审批\是否上传文件 2025-08-13 20:00:48 +08:00
d34324c565 工程清单审批\是否上传文件 2025-08-13 19:59:54 +08:00
b2d2df4fee 合并 2025-08-13 19:49:05 +08:00
9b522cb819 优化 2025-08-13 19:48:33 +08:00
Teo
544cc07862 修改bug 2025-08-13 19:47:46 +08:00
2879a0243e 合并 2025-08-13 19:14:00 +08:00
ffffcaee88 图纸 2025-08-13 19:13:07 +08:00
522652bed7 工程清单审批 2025-08-13 19:12:06 +08:00
f06e1a0197 图纸 优化 2025-08-13 19:11:51 +08:00
d16ef9d948 工程清单审批 2025-08-13 19:10:59 +08:00
Teo
b90b0a457c 采购员任命 2025-08-13 19:10:35 +08:00
6d102306df 合并 2025-08-12 21:07:59 +08:00
92be2998fa 设计变更 2025-08-12 21:07:12 +08:00
f150ce24d2 图纸评审 2025-08-12 21:05:02 +08:00
fbe1dae085 合并 2025-08-12 19:04:07 +08:00
b515fdbe1a 合并 2025-08-12 19:03:23 +08:00
Teo
52db7e00ab 设计方案 2025-08-12 19:02:07 +08:00
8c024e6269 设计资料 2025-08-12 19:01:04 +08:00
a7e78deb57 工程量清单 2025-08-12 19:00:25 +08:00
Teo
aecff98642 物资 2025-08-10 14:21:46 +08:00
1ff2c759dd 合并 2025-08-09 18:04:15 +08:00
c7340572c9 产值计划 2025-08-09 18:02:32 +08:00
Teo
6bbe8a83f7 审核工作流 2025-08-09 18:02:06 +08:00
Teo
b6e4f84570 合并 2025-08-09 09:56:49 +08:00
bebd4e3a2e 合并 2025-08-09 09:55:15 +08:00
8ce6d2877c 分享 2025-08-09 09:54:23 +08:00
Teo
93a3ea764e 材料管理 变更清单 2025-08-08 20:03:00 +08:00
6ef758653e 合并 2025-08-07 19:24:39 +08:00
a02ef2d6b4 合并 2025-08-07 19:23:45 +08:00
4a250f30f2 优化 2025-08-07 19:22:56 +08:00
Teo
f37ca487f6 产值管理审批流 2025-08-07 19:22:17 +08:00
Teo
0223d9d86e 分项工程单价添加数量字段,完善物资-物料设备 2025-08-05 18:35:54 +08:00
Teo
973bff351d 产值管理 2025-08-02 19:09:35 +08:00
Teo
fe872490d5 解决冲突 2025-08-02 16:51:07 +08:00
Teo
7154bbbbcc 材料管理 2025-08-02 16:45:51 +08:00
760b707116 优化 2025-08-02 15:52:24 +08:00
e60c435fa6 优化 2025-08-02 15:31:59 +08:00
Teo
fbf9424960 产值管理 2025-08-02 15:31:28 +08:00
Teo
4a5856f614 进度管理产值管理 2025-08-01 20:09:57 +08:00
Teo
bbc927edba 施工产值 2025-07-31 20:46:40 +08:00
86afe6a30d 合并 2025-07-30 16:28:47 +08:00
3ff2728466 优化 2025-07-30 16:26:34 +08:00
Teo
3d5a77b732 大屏以及质量管理 2025-07-30 16:25:45 +08:00
496adee0b4 合并 2025-07-29 16:26:34 +08:00
78c13c4131 优化 2025-07-29 16:25:47 +08:00
Teo
c069b53636 新增go服务token 2025-07-29 16:24:08 +08:00
7e7e51853d 施工人员添加 2025-07-29 11:33:17 +08:00
Teo
b01d143ea6 最新代码 2025-07-29 11:22:30 +08:00
a97db36e7d 合并 2025-07-29 09:40:02 +08:00
52908e6627 合并 2025-07-29 09:38:43 +08:00
Teo
daff686afc 修改静态资源文件夹位置 2025-07-29 09:37:57 +08:00
Teo
ed996ee7f4 修改班组长请求bug 2025-07-28 19:49:17 +08:00
ab8fb27e23 合并 2025-07-28 18:46:48 +08:00
Teo
09c8cf2333 合并 2025-07-28 09:16:12 +08:00
Teo
0ac3f9da8f 合并 2025-07-26 11:50:39 +08:00
Teo
dd9b5da394 bug 2025-07-26 11:49:39 +08:00
b79936b47b 土地流转 2025-07-26 11:44:09 +08:00
Teo
d503e64098 违规记录 2025-07-23 11:47:11 +08:00
Teo
e7b0b54f01 部门管理修改功能分包单位bug 2025-07-18 19:33:04 +08:00
Teo
5d76471571 部门管理新增分包单位选项 2025-07-18 19:22:36 +08:00
Teo
d03efb8d6f 解决路由bug 2025-07-14 16:10:03 +08:00
Teo
748464b44a 系统管理/部门管理角色管理用户管理 2025-07-11 19:16:57 +08:00
Teo
4a0962b117 工作流路由重构 2025-07-11 11:18:01 +08:00
ff8dd472de 优化 2025-07-11 09:17:08 +08:00
b331d17032 审核 2025-07-10 15:16:44 +08:00
39e239a886 优化 2025-07-08 17:24:35 +08:00
76ae5832c0 优化 2025-07-08 17:23:32 +08:00
Teo
3c9ed824d3 解决404 2025-07-08 17:22:46 +08:00
Teo
8ef37c5a96 重构进度填报 2025-07-08 16:39:42 +08:00
2134 changed files with 137882 additions and 9049 deletions

View File

@ -1,15 +1,19 @@
# 页面标题 # 页面标题
VITE_APP_TITLE = 新能源项目管理平台 VITE_APP_TITLE = 煤科建管平台
# 开发环境配置 # 开发环境配置
VITE_APP_ENV = 'development' VITE_APP_ENV = 'development'
# 开发环境 # 开发环境
VITE_APP_BASE_API = 'http://192.168.110.119:8899' VITE_APP_BASE_API = 'http://192.168.110.209:8899'
# VITE_APP_BASE_API = 'http://58.17.134.85:8899'
# GO开发环境
VITE_APP_BASE_API_GO = 'http://xny.yj-3d.com:7464'
# VITE_APP_BASE_API_GO = 'http://192.168.110.188:8919'
# 无人机接口地址 # 无人机接口地址
VITE_APP_BASE_DRONE_API = 'http://192.168.110.8:9136' VITE_APP_BASE_DRONE_API = 'http://58.17.134.85:9512'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VITE_APP_CONTEXT_PATH = '/' VITE_APP_CONTEXT_PATH = '/'

View File

@ -1,5 +1,5 @@
# 页面标题 # 页面标题
VITE_APP_TITLE = 新能源项目管理平台 VITE_APP_TITLE = 煤科建管平台
# 生产环境配置 # 生产环境配置
VITE_APP_ENV = 'production' VITE_APP_ENV = 'production'
@ -14,12 +14,14 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications'
VITE_APP_SNAILJOB_ADMIN = '/snail-job' VITE_APP_SNAILJOB_ADMIN = '/snail-job'
# 生产环境 # 生产环境
VITE_APP_BASE_API = 'http://192.168.110.2:8899' # GO生产环境
VITE_APP_BASE_API_GO = 'http://58.17.134.85:7464'
VITE_APP_BASE_API = 'http://xny.yj-3d.com:8899'
# 是否在打包时开启压缩,支持 gzip 和 brotli # 是否在打包时开启压缩,支持 gzip 和 brotli
VITE_BUILD_COMPRESS = gzip VITE_BUILD_COMPRESS = gzip
VITE_APP_PORT = 80 VITE_APP_PORT = 8081
# 接口加密功能开关(如需关闭 后端也必须对应关闭) # 接口加密功能开关(如需关闭 后端也必须对应关闭)
VITE_APP_ENCRYPT = true VITE_APP_ENCRYPT = true

View File

@ -0,0 +1 @@

View File

@ -6,7 +6,7 @@
<meta name="renderer" content="webkit" /> <meta name="renderer" content="webkit" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" />
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/favicon.ico" />
<title>新能源项目管理平台</title> <title>煤科建管平台</title>
<!--[if lt IE 11 <!--[if lt IE 11
]><script> ]><script>
window.location.href = '/html/ie.html'; window.location.href = '/html/ie.html';
@ -212,9 +212,12 @@
<script type="text/javascript" <script type="text/javascript"
src="http://58.17.134.85:7363/changxieoffice/web-apps/apps/api/documents/api.js"></script> src="http://58.17.134.85:7363/changxieoffice/web-apps/apps/api/documents/api.js"></script>
<script src="/js/html-docx.js"></script> <script src="/js/html-docx.js"></script>
<script src="/webrtc/adapter-7.4.0.min.js"></script>
<script src="/webrtc/jquery-1.12.2.min.js"></script>
<script src="/webrtc/srs.sdk.js"></script>
<script src="./src/assets/sdk/YJEarth.min.js"></script> <script src="/sdk/YJEarth.min.js"></script>
<script src="./src/utils/reconnecting-websocket.js"></script> <script src="/js/reconnecting-websocket.js"></script>
<script type="module" src="/src/main.ts"></script> <script type="module" src="/src/main.ts"></script>
</body> </body>
</html> </html>

View File

@ -14,7 +14,7 @@
"lint:eslint": "eslint", "lint:eslint": "eslint",
"lint:eslint:fix": "eslint --fix", "lint:eslint:fix": "eslint --fix",
"prettier": "prettier --write .", "prettier": "prettier --write .",
"copy-cesium": "cpy 'src/assets/sdk/Cesium/{Workers,Assets,Widgets}' ./public/Cesium --flat --parents" "copy-cesium": "cpy './public/sdk/Cesium/{Workers,Assets,Widgets}' ./public/Cesium --flat --parents"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -31,11 +31,14 @@
"await-to-js": "3.0.0", "await-to-js": "3.0.0",
"axios": "1.7.8", "axios": "1.7.8",
"crypto-js": "4.2.0", "crypto-js": "4.2.0",
"date-fns": "^4.1.0",
"diagram-js": "12.3.0", "diagram-js": "12.3.0",
"didi": "9.0.2", "didi": "9.0.2",
"echarts": "5.5.0", "echarts": "5.5.0",
"echarts-gl": "^2.0.9",
"element-plus": "2.8.8", "element-plus": "2.8.8",
"esbuild": "^0.25.0", "esbuild": "^0.25.0",
"exceljs": "^4.4.0",
"ezuikit-js": "^8.1.10", "ezuikit-js": "^8.1.10",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"fuse.js": "7.0.0", "fuse.js": "7.0.0",
@ -64,10 +67,12 @@
"vue-json-pretty": "2.4.0", "vue-json-pretty": "2.4.0",
"vue-print-nb": "^1.7.5", "vue-print-nb": "^1.7.5",
"vue-router": "4.4.5", "vue-router": "4.4.5",
"vue-simple-uploader": "^1.0.3",
"vue-types": "5.1.3", "vue-types": "5.1.3",
"vue3-print-nb": "^0.1.4", "vue3-print-nb": "^0.1.4",
"vue3-scroll-seamless": "^1.0.6", "vue3-scroll-seamless": "^1.0.6",
"vxe-table": "4.5.22" "vxe-table": "4.5.22",
"xlsx": "^0.18.5"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "9.15.0", "@eslint/js": "9.15.0",

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
public/assets/demo/back.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 419 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 344 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 428 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
public/assets/demo/rain.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1014 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 993 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
public/assets/demo/sb1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
public/assets/demo/sb2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
public/assets/demo/sb3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
public/assets/demo/sb4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
public/assets/demo/sbi1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
public/assets/demo/sbi2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
public/assets/demo/wcl.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
public/assets/demo/ycl.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
public/assets/demo/yin.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
public/assets/demo/zzcl.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

BIN
public/catalog.xlsx Normal file

Binary file not shown.

BIN
public/daolu.xlsx Normal file

Binary file not shown.

BIN
public/dikuai.xlsx Normal file

Binary file not shown.

BIN
public/enterRoad.xlsx Normal file

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 34 KiB

BIN
public/landBlock.xlsx Normal file

Binary file not shown.

Binary file not shown.

View File

Before

Width:  |  Height:  |  Size: 131 B

After

Width:  |  Height:  |  Size: 131 B

View File

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -0,0 +1,382 @@
// MIT License:
//
// Copyright (c) 2010-2012, Joe Walnes
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
/**
* This behaves like a WebSocket in every way, except if it fails to connect,
* or it gets disconnected, it will repeatedly poll until it successfully connects
* again.
*
* It is API compatible, so when you have:
* ws = new WebSocket('ws://....');
* you can replace with:
* ws = new ReconnectingWebSocket('ws://....');
*
* The event stream will typically look like:
* onconnecting
* onopen
* onmessage
* onmessage
* onclose // lost connection
* onconnecting
* onopen // sometime later...
* onmessage
* onmessage
* etc...
*
* It is API compatible with the standard WebSocket API, apart from the following members:
*
* - `bufferedAmount`
* - `extensions`
* - `binaryType`
*
* Latest version: https://github.com/joewalnes/reconnecting-websocket/
* - Joe Walnes
*
* Syntax
* ======
* var socket = new ReconnectingWebSocket(url, protocols, options);
*
* Parameters
* ==========
* url - The url you are connecting to.
* protocols - Optional string or array of protocols.
* options - See below
*
* Options
* =======
* Options can either be passed upon instantiation or set after instantiation:
*
* var socket = new ReconnectingWebSocket(url, null, { debug: true, reconnectInterval: 4000 });
*
* or
*
* var socket = new ReconnectingWebSocket(url);
* socket.debug = true;
* socket.reconnectInterval = 4000;
*
* debug
* - Whether this instance should log debug messages. Accepts true or false. Default: false.
*
* automaticOpen
* - Whether or not the websocket should attempt to connect immediately upon instantiation. The socket can be manually opened or closed at any time using ws.open() and ws.close().
*
* reconnectInterval
* - The number of milliseconds to delay before attempting to reconnect. Accepts integer. Default: 1000.
*
* maxReconnectInterval
* - The maximum number of milliseconds to delay a reconnection attempt. Accepts integer. Default: 30000.
*
* reconnectDecay
* - The rate of increase of the reconnect delay. Allows reconnect attempts to back off when problems persist. Accepts integer or float. Default: 1.5.
*
* timeoutInterval
* - The maximum time in milliseconds to wait for a connection to succeed before closing and retrying. Accepts integer. Default: 2000.
*
*/
// (function (global, factory) {
// if (typeof define === 'function' && define.amd) {
// define([], factory);
// } else if (typeof module !== 'undefined' && module.exports){
// module.exports = factory();
// } else {
// global.ReconnectingWebSocket = factory();
// }
// })(this, function () {
//
// if (!('WebSocket' in window)) {
// return;
// }
function ReconnectingWebSocket(url, protocols, options) {
// Default settings
var settings = {
/** Whether this instance should log debug messages. */
debug: false,
/** Whether or not the websocket should attempt to connect immediately upon instantiation. */
automaticOpen: true,
/** The number of milliseconds to delay before attempting to reconnect. */
reconnectInterval: 1000,
/** The maximum number of milliseconds to delay a reconnection attempt. */
maxReconnectInterval: 30000,
/** The rate of increase of the reconnect delay. Allows reconnect attempts to back off when problems persist. */
reconnectDecay: 1.5,
/** The maximum time in milliseconds to wait for a connection to succeed before closing and retrying. */
timeoutInterval: 2000,
/** The maximum number of reconnection attempts to make. Unlimited if null. */
maxReconnectAttempts: null,
/** The binary type, possible values 'blob' or 'arraybuffer', default 'blob'. */
binaryType: 'blob'
}
if (!options) {
options = {};
}
// Overwrite and define settings with options if they exist.
for (var key in settings) {
if (typeof options[key] !== 'undefined') {
this[key] = options[key];
} else {
this[key] = settings[key];
}
}
// These should be treated as read-only properties
/** The URL as resolved by the constructor. This is always an absolute URL. Read only. */
this.url = url;
/** The number of attempted reconnects since starting, or the last successful connection. Read only. */
this.reconnectAttempts = 0;
/**
* The current state of the connection.
* Can be one of: WebSocket.CONNECTING, WebSocket.OPEN, WebSocket.CLOSING, WebSocket.CLOSED
* Read only.
*/
this.readyState = WebSocket.CONNECTING;
/**
* A string indicating the name of the sub-protocol the server selected; this will be one of
* the strings specified in the protocols parameter when creating the WebSocket object.
* Read only.
*/
this.protocol = null;
// Private state variables
var self = this;
var ws;
var forcedClose = false;
var timedOut = false;
var eventTarget = document.createElement('div');
// Wire up "on*" properties as event handlers
eventTarget.addEventListener('open', function (event) {
self.onopen(event);
});
eventTarget.addEventListener('close', function (event) {
self.onclose(event);
});
eventTarget.addEventListener('connecting', function (event) {
self.onconnecting(event);
});
eventTarget.addEventListener('message', function (event) {
self.onmessage(event);
});
eventTarget.addEventListener('error', function (event) {
self.onerror(event);
});
// Expose the API required by EventTarget
this.addEventListener = eventTarget.addEventListener.bind(eventTarget);
this.removeEventListener = eventTarget.removeEventListener.bind(eventTarget);
this.dispatchEvent = eventTarget.dispatchEvent.bind(eventTarget);
/**
* This function generates an event that is compatible with standard
* compliant browsers and IE9 - IE11
*
* This will prevent the error:
* Object doesn't support this action
*
* http://stackoverflow.com/questions/19345392/why-arent-my-parameters-getting-passed-through-to-a-dispatched-event/19345563#19345563
* @param s String The name that the event should use
* @param args Object an optional object that the event will use
*/
function generateEvent(s, args) {
var evt = document.createEvent("CustomEvent");
evt.initCustomEvent(s, false, false, args);
return evt;
};
this.open = function (reconnectAttempt) {
ws = new WebSocket(self.url, protocols || []);
ws.binaryType = this.binaryType;
if (reconnectAttempt) {
if (this.maxReconnectAttempts && this.reconnectAttempts > this.maxReconnectAttempts) {
return;
}
} else {
eventTarget.dispatchEvent(generateEvent('connecting'));
this.reconnectAttempts = 0;
}
if (self.debug || ReconnectingWebSocket.debugAll) {
console.debug('ReconnectingWebSocket', 'attempt-connect', self.url);
}
var localWs = ws;
var timeout = setTimeout(function () {
if (self.debug || ReconnectingWebSocket.debugAll) {
console.debug('ReconnectingWebSocket', 'connection-timeout', self.url);
}
timedOut = true;
localWs.close();
timedOut = false;
}, self.timeoutInterval);
ws.onopen = function (event) {
clearTimeout(timeout);
if (self.debug || ReconnectingWebSocket.debugAll) {
console.debug('ReconnectingWebSocket', 'onopen', self.url);
}
self.protocol = ws.protocol;
self.readyState = WebSocket.OPEN;
self.reconnectAttempts = 0;
var e = generateEvent('open');
e.isReconnect = reconnectAttempt;
reconnectAttempt = false;
eventTarget.dispatchEvent(e);
};
ws.onclose = function (event) {
clearTimeout(timeout);
ws = null;
if (forcedClose) {
self.readyState = WebSocket.CLOSED;
eventTarget.dispatchEvent(generateEvent('close'));
} else {
self.readyState = WebSocket.CONNECTING;
var e = generateEvent('connecting');
e.code = event.code;
e.reason = event.reason;
e.wasClean = event.wasClean;
eventTarget.dispatchEvent(e);
if (!reconnectAttempt && !timedOut) {
if (self.debug || ReconnectingWebSocket.debugAll) {
console.debug('ReconnectingWebSocket', 'onclose', self.url);
}
eventTarget.dispatchEvent(generateEvent('close'));
}
var timeout = self.reconnectInterval * Math.pow(self.reconnectDecay, self.reconnectAttempts);
setTimeout(function () {
self.reconnectAttempts++;
self.open(true);
}, timeout > self.maxReconnectInterval ? self.maxReconnectInterval : timeout);
}
};
ws.onmessage = function (event) {
if (self.debug || ReconnectingWebSocket.debugAll) {
console.debug('ReconnectingWebSocket', 'onmessage', self.url, event.data);
}
var e = generateEvent('message');
e.data = event.data;
eventTarget.dispatchEvent(e);
};
ws.onerror = function (event) {
if (self.debug || ReconnectingWebSocket.debugAll) {
console.debug('ReconnectingWebSocket', 'onerror', self.url, event);
}
eventTarget.dispatchEvent(generateEvent('error'));
};
}
// Whether or not to create a websocket upon instantiation
if (this.automaticOpen == true) {
this.open(false);
}
/**
* Transmits data to the server over the WebSocket connection.
*
* @param data a text string, ArrayBuffer or Blob to send to the server.
*/
this.send = function (data) {
if (ws) {
if (self.debug || ReconnectingWebSocket.debugAll) {
console.debug('ReconnectingWebSocket', 'send', self.url, data);
}
return ws.send(data);
} else {
throw 'INVALID_STATE_ERR : Pausing to reconnect websocket';
}
};
/**
* Closes the WebSocket connection or connection attempt, if any.
* If the connection is already CLOSED, this method does nothing.
*/
this.close = function (code, reason) {
// Default CLOSE_NORMAL code
if (typeof code == 'undefined') {
code = 1000;
}
forcedClose = true;
if (ws) {
ws.close(code, reason);
}
};
/**
* Additional public API method to refresh the connection if still open (close, re-open).
* For example, if the app suspects bad data / missed heart beats, it can try to refresh.
*/
this.refresh = function () {
if (ws) {
ws.close();
}
};
}
/**
* An event listener to be called when the WebSocket connection's readyState changes to OPEN;
* this indicates that the connection is ready to send and receive data.
*/
ReconnectingWebSocket.prototype.onopen = function (event) {
};
/** An event listener to be called when the WebSocket connection's readyState changes to CLOSED. */
ReconnectingWebSocket.prototype.onclose = function (event) {
};
/** An event listener to be called when a connection begins being attempted. */
ReconnectingWebSocket.prototype.onconnecting = function (event) {
};
/** An event listener to be called when a message is received from the server. */
ReconnectingWebSocket.prototype.onmessage = function (event) {
};
/** An event listener to be called when an error occurs. */
ReconnectingWebSocket.prototype.onerror = function (event) {
};
/**
* Whether all instances of ReconnectingWebSocket should log debug messages.
* Setting this to true is the equivalent of setting all instances of ReconnectingWebSocket.debug to true.
*/
ReconnectingWebSocket.debugAll = false;
ReconnectingWebSocket.CONNECTING = WebSocket.CONNECTING;
ReconnectingWebSocket.OPEN = WebSocket.OPEN;
ReconnectingWebSocket.CLOSING = WebSocket.CLOSING;
ReconnectingWebSocket.CLOSED = WebSocket.CLOSED;
// return ReconnectingWebSocket;
// });

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