Skip to content

Commit cf0c1ab

Browse files
committed
新增刷新功能与完善文档和指导教程
1 parent 16d7fef commit cf0c1ab

File tree

13 files changed

+510
-32
lines changed

13 files changed

+510
-32
lines changed

LICENSE

+121
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
木兰宽松许可证, 第1版
2+
3+
木兰宽松许可证, 第1版
4+
2019年8月 http://license.coscl.org.cn/MulanPSL
5+
6+
您对“软件”的复制、使用、修改及分发受木兰宽松许可证,第1版(“本许可证”)的如下条款的约束:
7+
8+
0. 定义
9+
10+
“软件”是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。
11+
12+
“贡献者”是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。
13+
14+
“法人实体”是指提交贡献的机构及其“关联实体”。
15+
16+
“关联实体”是指,对“本许可证”下的一方而言,控制、受控制或与其共同受控制的机构,此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
17+
18+
“贡献”是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。
19+
20+
1. 授予版权许可
21+
22+
每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可,您可以复制、使用、修改、分发其“贡献”,不论修改与否。
23+
24+
2. 授予专利许可
25+
26+
每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的(根据本条规定撤销除外)专利许可,供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求,不包括仅因您或他人修改“贡献”或其他结合而将必然会侵犯到的专利权利要求。如您或您的“关联实体”直接或间接地(包括通过代理、专利被许可人或受让人),就“软件”或其中的“贡献”对任何人发起专利侵权诉讼(包括反诉或交叉诉讼)或其他专利维权行动,指控其侵犯专利权,则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。
27+
28+
3. 无商标许可
29+
30+
“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可,但您为满足第4条规定的声明义务而必须使用除外。
31+
32+
4. 分发限制
33+
34+
您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发,不论修改与否,但您必须向接收者提供“本许可证”的副本,并保留“软件”中的版权、商标、专利及免责声明。
35+
36+
5. 免责声明与责任限制
37+
38+
“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下,“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任,不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。
39+
40+
条款结束。
41+
42+
如何将木兰宽松许可证,第1版,应用到您的软件
43+
44+
如果您希望将木兰宽松许可证,第1版,应用到您的新软件,为了方便接收者查阅,建议您完成如下三步:
45+
46+
1, 请您补充如下声明中的空白,包括软件名、软件的首次发表年份以及您作为版权人的名字;
47+
48+
2, 请您在软件包的一级目录下创建以“LICENSE”为名的文件,将整个许可证文本放入该文件中;
49+
50+
3, 请将如下声明文本放入每个源文件的头部注释中。
51+
52+
Copyright (c) [2019] [name of copyright holder]
53+
[Software Name] is licensed under the Mulan PSL v1.
54+
You can use this software according to the terms and conditions of the Mulan PSL v1.
55+
You may obtain a copy of Mulan PSL v1 at:
56+
http://license.coscl.org.cn/MulanPSL
57+
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
58+
IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
59+
PURPOSE.
60+
See the Mulan PSL v1 for more details.
61+
62+
63+
Mulan Permissive Software License,Version 1
64+
65+
Mulan Permissive Software License,Version 1 (Mulan PSL v1)
66+
August 2019 http://license.coscl.org.cn/MulanPSL
67+
68+
Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v1 (this License) with following terms and conditions:
69+
70+
0. Definition
71+
72+
Software means the program and related documents which are comprised of those Contribution and licensed under this License.
73+
74+
Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License.
75+
76+
Legal Entity means the entity making a Contribution and all its Affiliates.
77+
78+
Affiliates means entities that control, or are controlled by, or are under common control with a party to this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity.
79+
80+
Contribution means the copyrightable work licensed by a particular Contributor under this License.
81+
82+
1. Grant of Copyright License
83+
84+
Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not.
85+
86+
2. Grant of Patent License
87+
88+
Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed, excluding of any patent claims solely be infringed by your or others’ modification or other combinations. If you or your Affiliates directly or indirectly (including through an agent, patent licensee or assignee), institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken.
89+
90+
3. No Trademark License
91+
92+
No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in section 4.
93+
94+
4. Distribution Restriction
95+
96+
You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software.
97+
98+
5. Disclaimer of Warranty and Limitation of Liability
99+
100+
The Software and Contribution in it are provided without warranties of any kind, either express or implied. In no event shall any Contributor or copyright holder be liable to you for any damages, including, but not limited to any direct, or indirect, special or consequential damages arising from your use or inability to use the Software or the Contribution in it, no matter how it’s caused or based on which legal theory, even if advised of the possibility of such damages.
101+
102+
End of the Terms and Conditions
103+
104+
How to apply the Mulan Permissive Software License,Version 1 (Mulan PSL v1) to your software
105+
106+
To apply the Mulan PSL v1 to your work, for easy identification by recipients, you are suggested to complete following three steps:
107+
108+
i. Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner;
109+
ii. Create a file named “LICENSE” which contains the whole context of this License in the first directory of your software package;
110+
iii. Attach the statement to the appropriate annotated syntax at the beginning of each source file.
111+
112+
Copyright (c) [2019] [name of copyright holder]
113+
[Software Name] is licensed under the Mulan PSL v1.
114+
You can use this software according to the terms and conditions of the Mulan PSL v1.
115+
You may obtain a copy of Mulan PSL v1 at:
116+
http://license.coscl.org.cn/MulanPSL
117+
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
118+
IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
119+
PURPOSE.
120+
121+
See the Mulan PSL v1 for more details.

README.md

+14-13
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,25 @@
33
#
44

55
#### 微更新
6-
* 最近更新:*2020年10月27日*
7-
* 更新内容:*优化了权限模型和代码冗余*
6+
* 最近更新:*2020年12月28日*
7+
* 更新内容:
8+
* 1.增加了更详细的使用指导与模板
9+
* 2.优化了桌面模块图标
10+
* 3.新增了区域刷新功能
11+
812

913
# vue-web-os
1014
一个基于vue2.6+elementui2.13.0+iview4的仿云桌面系统(Windows10),本项目是在其他脚手架的基础上进行改进的,已经完成了权限模块
1115
、登录验证模块、axios请求模块等所有常用模块。vue-web-os项目可用于开发中大型软件,已经用于实际项目的有云盘系统与企业级OA系统。喜欢的小伙伴可以免费拿去使用。
1216
#
1317
如有对该项目不解的小伙伴可以加我微信:2417978181咨询我哦!
1418

15-
## [文档](./docs/index.md)
16-
17-
文档内提供了详细的功能说明,强烈建议阅读文档后再开始编码。
18-
19-
20-
当前版本:2.0.0
2119
# 求赞
2220
该系统会稳定持续的升级维护,喜欢的小主给个免费的star吧,谢谢❤
2321

22+
## [文档](./docs/index.md)
23+
24+
文档内提供了详细的功能说明,强烈建议阅读文档后再开始编码。
2425
# 启动项目
2526
```Java
2627
# 配置环境
@@ -38,11 +39,11 @@ http-server
3839

3940
```
4041
#
41-
# 2.0.0版本更新摘要
42+
# 2.1.0版本更新摘要
4243
##### 新增桌面墙纸小工具
4344
1. 由于本系统壁纸使用的是网络免费图床保存,响应速度相对较慢,请耐心等待。
44-
2. 本系统免费提供了5种壁纸,通过调用接口获取,可自行修改
45-
![vue-web-os](https://s1.ax1x.com/2020/09/11/wtDh36.jpg "vue-web-os")
45+
2. 区域刷新功能按钮,可局部刷新单一页面
46+
![vue-web-os](https://s3.ax1x.com/2020/12/28/rTUHKK.jpg "vue-web-os")
4647
#
4748

4849

@@ -58,8 +59,8 @@ http-server
5859
![vue-web-os](https://s1.ax1x.com/2020/10/27/BQwF1J.jpg "vue-web-os")
5960
##### 开始菜单与鼠标右键展示
6061
![vue-web-os](https://s1.ax1x.com/2020/10/27/BQwZ0x.jpg "vue-web-os")
61-
##### 模块与页面展示
62-
![vue-web-os](https://s1.ax1x.com/2020/10/27/BQwutO.jpg "vue-web-os")
62+
##### 模块与页面展示 **2020年12月28日更新**
63+
![vue-web-os](https://s3.ax1x.com/2020/12/28/rTwMEF.jpg "vue-web-os")
6364

6465

6566

public/index.html

+199-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,205 @@
1010
<script src="<%= BASE_URL %>libs/echarts.min.js"></script>
1111
<title>vue-web-os</title>
1212
</head>
13+
<style>
14+
html,
15+
body,
16+
#app {
17+
height: 100%;
18+
margin: 0px;
19+
padding: 0px;
20+
background: #f0f1f5;
21+
}
22+
23+
.chromeframe {
24+
margin: 0.2em 0;
25+
background: #ccc;
26+
color: #000;
27+
padding: 0.2em 0;
28+
}
29+
30+
#loader-wrapper {
31+
position: fixed;
32+
top: 0;
33+
left: 0;
34+
width: 100%;
35+
height: 100%;
36+
z-index: 999999;
37+
}
38+
39+
#loader {
40+
display: block;
41+
position: relative;
42+
left: 50%;
43+
top: 50%;
44+
width: 150px;
45+
height: 150px;
46+
margin: -75px 0 0 -75px;
47+
border-radius: 50%;
48+
border: 3px solid transparent;
49+
border-top-color: #FFF;
50+
-webkit-animation: spin 2s linear infinite;
51+
-ms-animation: spin 2s linear infinite;
52+
-moz-animation: spin 2s linear infinite;
53+
-o-animation: spin 2s linear infinite;
54+
animation: spin 2s linear infinite;
55+
z-index: 1001;
56+
}
57+
58+
#loader:before {
59+
content: "";
60+
position: absolute;
61+
top: 5px;
62+
left: 5px;
63+
right: 5px;
64+
bottom: 5px;
65+
border-radius: 50%;
66+
border: 3px solid transparent;
67+
border-top-color: #FFF;
68+
-webkit-animation: spin 3s linear infinite;
69+
-moz-animation: spin 3s linear infinite;
70+
-o-animation: spin 3s linear infinite;
71+
-ms-animation: spin 3s linear infinite;
72+
animation: spin 3s linear infinite;
73+
}
74+
75+
#loader:after {
76+
content: "";
77+
position: absolute;
78+
top: 15px;
79+
left: 15px;
80+
right: 15px;
81+
bottom: 15px;
82+
border-radius: 50%;
83+
border: 3px solid transparent;
84+
border-top-color: #FFF;
85+
-moz-animation: spin 1.5s linear infinite;
86+
-o-animation: spin 1.5s linear infinite;
87+
-ms-animation: spin 1.5s linear infinite;
88+
-webkit-animation: spin 1.5s linear infinite;
89+
animation: spin 1.5s linear infinite;
90+
}
91+
92+
93+
@-webkit-keyframes spin {
94+
0% {
95+
-webkit-transform: rotate(0deg);
96+
-ms-transform: rotate(0deg);
97+
transform: rotate(0deg);
98+
}
99+
100+
100% {
101+
-webkit-transform: rotate(360deg);
102+
-ms-transform: rotate(360deg);
103+
transform: rotate(360deg);
104+
}
105+
}
106+
107+
@keyframes spin {
108+
0% {
109+
-webkit-transform: rotate(0deg);
110+
-ms-transform: rotate(0deg);
111+
transform: rotate(0deg);
112+
}
113+
114+
100% {
115+
-webkit-transform: rotate(360deg);
116+
-ms-transform: rotate(360deg);
117+
transform: rotate(360deg);
118+
}
119+
}
120+
121+
122+
#loader-wrapper .loader-section {
123+
position: fixed;
124+
top: 0;
125+
width: 51%;
126+
height: 100%;
127+
background: #7171C6;
128+
z-index: 1000;
129+
-webkit-transform: translateX(0);
130+
-ms-transform: translateX(0);
131+
transform: translateX(0);
132+
}
133+
134+
#loader-wrapper .loader-section.section-left {
135+
left: 0;
136+
}
137+
138+
#loader-wrapper .loader-section.section-right {
139+
right: 0;
140+
}
141+
142+
143+
.loaded #loader-wrapper .loader-section.section-left {
144+
-webkit-transform: translateX(-100%);
145+
-ms-transform: translateX(-100%);
146+
transform: translateX(-100%);
147+
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
148+
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
149+
}
150+
151+
.loaded #loader-wrapper .loader-section.section-right {
152+
-webkit-transform: translateX(100%);
153+
-ms-transform: translateX(100%);
154+
transform: translateX(100%);
155+
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
156+
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
157+
}
158+
159+
.loaded #loader {
160+
opacity: 0;
161+
-webkit-transition: all 0.3s ease-out;
162+
transition: all 0.3s ease-out;
163+
}
164+
165+
.loaded #loader-wrapper {
166+
visibility: hidden;
167+
-webkit-transform: translateY(-100%);
168+
-ms-transform: translateY(-100%);
169+
transform: translateY(-100%);
170+
-webkit-transition: all 0.3s 1s ease-out;
171+
transition: all 0.3s 1s ease-out;
172+
}
173+
174+
.no-js #loader-wrapper {
175+
display: none;
176+
}
177+
178+
.no-js h1 {
179+
color: #222222;
180+
}
181+
182+
#loader-wrapper .load_title {
183+
font-family: 'Open Sans';
184+
color: #FFF;
185+
font-size: 14.3px;
186+
width: 100%;
187+
text-align: center;
188+
z-index: 9999999999999;
189+
position: absolute;
190+
top: 60%;
191+
opacity: 1;
192+
line-height: 30px;
193+
}
194+
195+
#loader-wrapper .load_title span {
196+
font-weight: normal;
197+
font-style: italic;
198+
font-size: 13px;
199+
color: #FFF;
200+
opacity: 0.5;
201+
}
202+
</style>
203+
13204
<body>
14-
<noscript>
15-
<strong>We're sorry but abc doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
16-
</noscript>
17-
<div id="app"></div>
18-
<!-- built files will be auto injected -->
205+
<div id="app">
206+
<div id="loader-wrapper">
207+
<div id="loader"></div>
208+
<div class="loader-section section-left"></div>
209+
<div class="loader-section section-right"></div>
210+
<div class="load_title">正在加载系统资源,请耐心等待</div>
211+
</div>
212+
</div>
19213
</body>
20214
</html>

0 commit comments

Comments
 (0)