Browse Source

Merge branch 'develop' of ssh://gitlab.frkj.cc:222/php/zhjwxt into develop

# Conflicts:
#	uniapp/pages/market/clue/add_clues.vue
#	uniapp/pages/market/clue/class_arrangement.vue
#	uniapp/pages/market/clue/class_arrangement_detail.vue
#	uniapp/pages/market/clue/clue_info.less
#	uniapp/pages/market/clue/clue_info.vue
#	uniapp/pages/market/clue/clue_table.vue
#	uniapp/pages/market/clue/edit_clues.vue
#	uniapp/pages/market/clue/edit_clues_log.vue
#	uniapp/pages/market/clue/index.vue
#	uniapp/pages/market/data/statistics.vue
#	uniapp/pages/market/index/index.vue
#	uniapp/pages/market/my/campus_data.vue
#	uniapp/pages/market/my/dept_data.vue
#	uniapp/pages/market/my/index.vue
#	uniapp/pages/market/my/info.vue
#	uniapp/pages/market/my/my_data.vue
#	uniapp/pages/market/my/set_up.vue
#	uniapp/pages/market/my/signed_client_list.vue
#	uniapp/pages/market/my/update_pass.vue
#	uniapp/pages/market/reimbursement/add.vue
#	uniapp/pages/market/reimbursement/detail.vue
#	uniapp/pages/market/reimbursement/list.vue

develop

王泽彦 5 months ago

parent

a580c2580a 7c23c2c10d

commit

25e9db780b

10814 changed files with 825257 additions and 1 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Unified View

Diff Options

Show Stats Download Patch File Download Diff File

1. 0
     .gitignore
2. 0
     .user.ini
3. 0
     API接口文档.md
4. 0
     Dashboard业务逻辑文档-校区转化情况统计（校区数据）.md
5. 0
     Dashboard业务逻辑文档.md
6. 0
     LICENSE
7. 0
     admin/.eslintignore
8. 0
     admin/.eslintrc.js
9. 0
     admin/.eslintrc.json
10. 0
      admin/.gitignore
11. 0
      admin/.prettierignore
12. 0
      admin/.prettierrc
13. 0
      admin/index.html
14. 0
      admin/mock/salary.js
15. 0
      admin/package-lock.json
16. 0
      admin/package.json
17. 0
      admin/postcss.config.cjs
18. 0
      admin/public/niucloud.ico
19. 0
      admin/public/pdfjs/LICENSE
20. 0
      admin/public/pdfjs/build/pdf.mjs
21. 0
      admin/public/pdfjs/build/pdf.mjs.map
22. 0
      admin/public/pdfjs/build/pdf.sandbox.mjs
23. 0
      admin/public/pdfjs/build/pdf.sandbox.mjs.map
24. 0
      admin/public/pdfjs/build/pdf.worker.mjs
25. 0
      admin/public/pdfjs/build/pdf.worker.mjs.map
26. 0
      admin/public/pdfjs/web/cmaps/78-EUC-H.bcmap
27. 0
      admin/public/pdfjs/web/cmaps/78-EUC-V.bcmap
28. 0
      admin/public/pdfjs/web/cmaps/78-H.bcmap
29. 0
      admin/public/pdfjs/web/cmaps/78-RKSJ-H.bcmap
30. 0
      admin/public/pdfjs/web/cmaps/78-RKSJ-V.bcmap
31. 0
      admin/public/pdfjs/web/cmaps/78-V.bcmap
32. 0
      admin/public/pdfjs/web/cmaps/78ms-RKSJ-H.bcmap
33. 0
      admin/public/pdfjs/web/cmaps/78ms-RKSJ-V.bcmap
34. 0
      admin/public/pdfjs/web/cmaps/83pv-RKSJ-H.bcmap
35. 0
      admin/public/pdfjs/web/cmaps/90ms-RKSJ-H.bcmap
36. 0
      admin/public/pdfjs/web/cmaps/90ms-RKSJ-V.bcmap
37. 0
      admin/public/pdfjs/web/cmaps/90msp-RKSJ-H.bcmap
38. 0
      admin/public/pdfjs/web/cmaps/90msp-RKSJ-V.bcmap
39. 0
      admin/public/pdfjs/web/cmaps/90pv-RKSJ-H.bcmap
40. 0
      admin/public/pdfjs/web/cmaps/90pv-RKSJ-V.bcmap
41. 0
      admin/public/pdfjs/web/cmaps/Add-H.bcmap
42. 0
      admin/public/pdfjs/web/cmaps/Add-RKSJ-H.bcmap
43. 0
      admin/public/pdfjs/web/cmaps/Add-RKSJ-V.bcmap
44. 0
      admin/public/pdfjs/web/cmaps/Add-V.bcmap
45. 0
      admin/public/pdfjs/web/cmaps/Adobe-CNS1-0.bcmap
46. 0
      admin/public/pdfjs/web/cmaps/Adobe-CNS1-1.bcmap
47. 0
      admin/public/pdfjs/web/cmaps/Adobe-CNS1-2.bcmap
48. 0
      admin/public/pdfjs/web/cmaps/Adobe-CNS1-3.bcmap
49. 0
      admin/public/pdfjs/web/cmaps/Adobe-CNS1-4.bcmap
50. 0
      admin/public/pdfjs/web/cmaps/Adobe-CNS1-5.bcmap
51. 0
      admin/public/pdfjs/web/cmaps/Adobe-CNS1-6.bcmap
52. 0
      admin/public/pdfjs/web/cmaps/Adobe-CNS1-UCS2.bcmap
53. 0
      admin/public/pdfjs/web/cmaps/Adobe-GB1-0.bcmap
54. 0
      admin/public/pdfjs/web/cmaps/Adobe-GB1-1.bcmap
55. 0
      admin/public/pdfjs/web/cmaps/Adobe-GB1-2.bcmap
56. 0
      admin/public/pdfjs/web/cmaps/Adobe-GB1-3.bcmap
57. 0
      admin/public/pdfjs/web/cmaps/Adobe-GB1-4.bcmap
58. 0
      admin/public/pdfjs/web/cmaps/Adobe-GB1-5.bcmap
59. 0
      admin/public/pdfjs/web/cmaps/Adobe-GB1-UCS2.bcmap
60. 0
      admin/public/pdfjs/web/cmaps/Adobe-Japan1-0.bcmap
61. 0
      admin/public/pdfjs/web/cmaps/Adobe-Japan1-1.bcmap
62. 0
      admin/public/pdfjs/web/cmaps/Adobe-Japan1-2.bcmap
63. 0
      admin/public/pdfjs/web/cmaps/Adobe-Japan1-3.bcmap
64. 0
      admin/public/pdfjs/web/cmaps/Adobe-Japan1-4.bcmap
65. 0
      admin/public/pdfjs/web/cmaps/Adobe-Japan1-5.bcmap
66. 0
      admin/public/pdfjs/web/cmaps/Adobe-Japan1-6.bcmap
67. 0
      admin/public/pdfjs/web/cmaps/Adobe-Japan1-UCS2.bcmap
68. 0
      admin/public/pdfjs/web/cmaps/Adobe-Korea1-0.bcmap
69. 0
      admin/public/pdfjs/web/cmaps/Adobe-Korea1-1.bcmap
70. 0
      admin/public/pdfjs/web/cmaps/Adobe-Korea1-2.bcmap
71. 0
      admin/public/pdfjs/web/cmaps/Adobe-Korea1-UCS2.bcmap
72. 0
      admin/public/pdfjs/web/cmaps/B5-H.bcmap
73. 0
      admin/public/pdfjs/web/cmaps/B5-V.bcmap
74. 0
      admin/public/pdfjs/web/cmaps/B5pc-H.bcmap
75. 0
      admin/public/pdfjs/web/cmaps/B5pc-V.bcmap
76. 0
      admin/public/pdfjs/web/cmaps/CNS-EUC-H.bcmap
77. 0
      admin/public/pdfjs/web/cmaps/CNS-EUC-V.bcmap
78. 0
      admin/public/pdfjs/web/cmaps/CNS1-H.bcmap
79. 0
      admin/public/pdfjs/web/cmaps/CNS1-V.bcmap
80. 0
      admin/public/pdfjs/web/cmaps/CNS2-H.bcmap
81. 0
      admin/public/pdfjs/web/cmaps/CNS2-V.bcmap
82. 0
      admin/public/pdfjs/web/cmaps/ETHK-B5-H.bcmap
83. 0
      admin/public/pdfjs/web/cmaps/ETHK-B5-V.bcmap
84. 0
      admin/public/pdfjs/web/cmaps/ETen-B5-H.bcmap
85. 0
      admin/public/pdfjs/web/cmaps/ETen-B5-V.bcmap
86. 0
      admin/public/pdfjs/web/cmaps/ETenms-B5-H.bcmap
87. 0
      admin/public/pdfjs/web/cmaps/ETenms-B5-V.bcmap
88. 0
      admin/public/pdfjs/web/cmaps/EUC-H.bcmap
89. 0
      admin/public/pdfjs/web/cmaps/EUC-V.bcmap
90. 0
      admin/public/pdfjs/web/cmaps/Ext-H.bcmap
91. 0
      admin/public/pdfjs/web/cmaps/Ext-RKSJ-H.bcmap
92. 0
      admin/public/pdfjs/web/cmaps/Ext-RKSJ-V.bcmap
93. 0
      admin/public/pdfjs/web/cmaps/Ext-V.bcmap
94. 0
      admin/public/pdfjs/web/cmaps/GB-EUC-H.bcmap
95. 0
      admin/public/pdfjs/web/cmaps/GB-EUC-V.bcmap
96. 0
      admin/public/pdfjs/web/cmaps/GB-H.bcmap
97. 0
      admin/public/pdfjs/web/cmaps/GB-V.bcmap
98. 0
      admin/public/pdfjs/web/cmaps/GBK-EUC-H.bcmap
99. 0
      admin/public/pdfjs/web/cmaps/GBK-EUC-V.bcmap
100. 0
       admin/public/pdfjs/web/cmaps/GBK2K-H.bcmap

0

.gitignore

View File

0

.user.ini

View File

0

API接口文档.md

View File

0

Dashboard业务逻辑文档-校区转化情况统计（校区数据）.md

View File

0

Dashboard业务逻辑文档.md

View File

0

LICENSE

View File

0

admin/.eslintignore

View File

0

admin/.eslintrc.js

View File

0

admin/.eslintrc.json

View File

0

admin/.gitignore

View File

0

admin/.prettierignore

View File

0

admin/.prettierrc

View File

0

admin/index.html

View File

0

admin/mock/salary.js

View File

0

admin/package-lock.json

View File

0

admin/package.json

View File

0

admin/postcss.config.cjs

View File

0

admin/public/niucloud.ico

View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.7 KiB

0

admin/public/pdfjs/LICENSE

View File

0

admin/public/pdfjs/build/pdf.mjs

View File

0

admin/public/pdfjs/build/pdf.mjs.map

View File

0

admin/public/pdfjs/build/pdf.sandbox.mjs

View File

0

admin/public/pdfjs/build/pdf.sandbox.mjs.map

View File

0

admin/public/pdfjs/build/pdf.worker.mjs

View File

0

admin/public/pdfjs/build/pdf.worker.mjs.map

View File

0

admin/public/pdfjs/web/cmaps/78-EUC-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/78-EUC-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/78-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/78-RKSJ-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/78-RKSJ-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/78-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/78ms-RKSJ-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/78ms-RKSJ-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/83pv-RKSJ-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/90ms-RKSJ-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/90ms-RKSJ-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/90msp-RKSJ-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/90msp-RKSJ-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/90pv-RKSJ-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/90pv-RKSJ-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Add-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Add-RKSJ-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Add-RKSJ-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Add-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-CNS1-0.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-CNS1-1.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-CNS1-2.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-CNS1-3.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-CNS1-4.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-CNS1-5.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-CNS1-6.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-CNS1-UCS2.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-GB1-0.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-GB1-1.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-GB1-2.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-GB1-3.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-GB1-4.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-GB1-5.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-GB1-UCS2.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-Japan1-0.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-Japan1-1.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-Japan1-2.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-Japan1-3.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-Japan1-4.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-Japan1-5.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-Japan1-6.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-Japan1-UCS2.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-Korea1-0.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-Korea1-1.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-Korea1-2.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Adobe-Korea1-UCS2.bcmap

View File

0

admin/public/pdfjs/web/cmaps/B5-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/B5-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/B5pc-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/B5pc-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/CNS-EUC-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/CNS-EUC-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/CNS1-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/CNS1-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/CNS2-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/CNS2-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/ETHK-B5-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/ETHK-B5-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/ETen-B5-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/ETen-B5-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/ETenms-B5-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/ETenms-B5-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/EUC-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/EUC-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Ext-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Ext-RKSJ-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Ext-RKSJ-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/Ext-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/GB-EUC-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/GB-EUC-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/GB-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/GB-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/GBK-EUC-H.bcmap

View File

0

admin/public/pdfjs/web/cmaps/GBK-EUC-V.bcmap

View File

0

admin/public/pdfjs/web/cmaps/GBK2K-H.bcmap

View File

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

Write Preview

Loading…

Cancel

Save