Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

归并-team6 #3

Merged
merged 47 commits into from
Mar 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
ede0219
Create 新建文本文档.txt
Kuzzzlin Mar 27, 2021
4969176
html文件夹
Mar 27, 2021
2f47b3d
Create login.html
Kuzzzlin Mar 27, 2021
66de965
create login.css
Kuzzzlin Mar 27, 2021
bb2bf93
导包、主席界面
Mar 27, 2021
be72358
一些美化改进
Mar 27, 2021
6473e39
add a user.java
ppzy123 Mar 27, 2021
3774f2f
Merge branch 'dev' of https://github.com/FZUSESPR21W/meeting-system-t…
ppzy123 Mar 27, 2021
c6227ba
注册界面
Kuzzzlin Mar 27, 2021
0ac68b5
add a subform.java
ppzy123 Mar 27, 2021
5f8a403
秘书界面html和css
Fino123 Mar 27, 2021
1b0790e
Md:erge branch 'dev' of https://github.com/FZUSESPR21W/meeting-system…
ppzy123 Mar 27, 2021
68c3b3e
add a message.java
ppzy123 Mar 27, 2021
c6b5d7f
主页优化+轮播图
Mar 27, 2021
37885af
Merge branch 'dev' of https://github.com/FZUSESPR21W/meeting-system-t…
Mar 27, 2021
28e34ba
Revert "Merge branch 'dev' of https://github.com/FZUSESPR21W/meeting-…
Mar 27, 2021
be526ac
基本内容
zfy0719 Mar 27, 2021
7c3783d
完善
zfy0719 Mar 27, 2021
fdbcd6a
css
zfy0719 Mar 27, 2021
1d5a8cc
Create meeting1.html
zfy0719 Mar 27, 2021
c490b6a
Update meeting.html
Mar 27, 2021
c571bb0
Merge branch 'dev' of https://github.com/FZUSESPR21W/meeting-system-t…
Mar 27, 2021
42c81a4
Merge branch 'dev' of https://github.com/FZUSESPR21W/meeting-system-t…
Mar 27, 2021
0e8844f
tp
Mar 27, 2021
1c1a4f3
议程+论坛信息
1219007597 Mar 27, 2021
e2d39cf
更新消息处理工具类、子会议实体类、用户实体类
Fino123 Mar 27, 2021
7746599
实现统计人数动画插件
Fino123 Mar 27, 2021
ebdb00c
完成数据库模型类的设计
YangZX1428 Mar 27, 2021
a431cfa
完成Repository接口和Service类
YangZX1428 Mar 27, 2021
9dabb51
完成辅助类工具和常量类的定义
YangZX1428 Mar 27, 2021
185b8b4
完成控制器类的设计以及数据传送模型类
YangZX1428 Mar 27, 2021
1d5850f
Merge pull request #2 from Fino123/dev
1219007597 Mar 27, 2021
8eff8dc
Merge pull request #1 from 1219007597/main
1219007597 Mar 27, 2021
8b25b94
Create 团队作业二.md
lauhiukwan Mar 27, 2021
f862f76
Update 团队作业二.md
lauhiukwan Mar 27, 2021
f181cee
Update 团队作业二.md
lauhiukwan Mar 27, 2021
a910d56
Vue_项目0.1
sujieyang Mar 27, 2021
9c22be0
添加用户表单组件
sujieyang Mar 27, 2021
498cbf0
添加首页模板
sujieyang Mar 27, 2021
951aee5
Create Java代码规范.md
Augustus0619 Mar 27, 2021
b32e30d
Create vue文档规范.md
Augustus0619 Mar 27, 2021
262de29
Merge branch 'dev' of https://github.com/FZUSESPR21W/meeting-system-t…
Augustus0619 Mar 27, 2021
1f29386
Revert "Merge branch 'dev' of https://github.com/FZUSESPR21W/meeting-…
Augustus0619 Mar 27, 2021
e2f6700
更新
sujieyang Mar 27, 2021
29b8973
Update vue文档规范.md
Augustus0619 Mar 27, 2021
9bafdf7
更新,不写死数据
sujieyang Mar 27, 2021
84cffc4
Merge remote-tracking branch 'upstream/dev' into main
sujieyang Mar 27, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions Java代码规范.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
## 代码规范(Java)

- 缩进

缩进使用4个空格(Tab)

- 变量命名

变量名采用lowerCamelCase风格,使用驼峰命名法,变量名只包含字母和数字,首个单词首字母大写,后面单词首字母小写,有数字的话在最后。使用有意义的名字作为变量名方便阅读代码(作用域很小的临时变量使用 i、j、k....等命名方式),命名使用英文单词不使用拼音

- 每行最多字符数

一行最多只有一个语句,一行最多不超过100个字符

- 函数最大行数

单个函数最多包含50行代码

- 函数、类命名

函数命名采用lowerCamelCase风格,使用驼峰命名法,首个单词首字母大写,后面单词首字母小写,取有函数的功能作为函数名;类名采用UpperCamelCase风格,使用驼峰命名法,首字母大写,类名包含具体含义,可以指明一类事物。

- 常量

常量命名全部使用大写,单词之间使用‘ _ ’分隔

- 空行规则

不同的功能模块之间会留有空行,如函数之间,或函数内部不同部分之间会空行便于阅读。

- 注释规则

单行注释用//,短的注释直接跟在语句后面,长的注释另起一行

多行注释使用/**/

- 操作符前后空格

操作符前后均留有一个空格

- 其他规则

...
1 change: 0 additions & 1 deletion Vue_ 前端/README.md

This file was deleted.

3 changes: 3 additions & 0 deletions Vue_ 前端/metting/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
> 1%
last 2 versions
not dead
23 changes: 23 additions & 0 deletions Vue_ 前端/metting/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
.DS_Store
node_modules
/dist


# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
19 changes: 19 additions & 0 deletions Vue_ 前端/metting/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# metting

## Project setup
```
npm install
```

### Compiles and hot-reloads for development
```
npm run serve
```

### Compiles and minifies for production
```
npm run build
```

### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/).
5 changes: 5 additions & 0 deletions Vue_ 前端/metting/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
]
}
Loading