lingling
/
welfare-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 

# Conflicts:
#	package.json
#	public/index.html
#	src/App.vue
#	src/main.js
#	src/router/index.js
#	vue.config.js
This commit is contained in:
aoli.qu 2021-08-11 16:04:42 +08:00
parent 778c9d514e 6dbed30ef7
commit 333d2c25ba
3 changed files with 100 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@ -11,6 +11,7 @@
"lint:nofix": "vue-cli-service lint --no-fix" "lint:nofix": "vue-cli-service lint --no-fix"
}, },
"dependencies": { "dependencies": {
<<<<<<< HEAD
"@ant-design-vue/pro-layout": "^0.3.4", "@ant-design-vue/pro-layout": "^0.3.4",
"@antv/data-set": "^0.10.2", "@antv/data-set": "^0.10.2",
"ant-design-vue": "^1.6.2", "ant-design-vue": "^1.6.2",
@ -35,6 +36,15 @@
"vue-svg-component-runtime": "^1.0.1", "vue-svg-component-runtime": "^1.0.1",
"vuex": "^3.1.1", "vuex": "^3.1.1",
"wangeditor": "^3.1.1" "wangeditor": "^3.1.1"
=======
"axios": "^0.21.1",
"core-js": "^3.6.5",
"element-ui": "^2.15.5",
"vue": "^2.6.11",
"vue-router": "^3.2.0",
"vue-wechat-title": "^2.0.7",
"vuex": "^3.4.0"
>>>>>>> 6dbed30ef7551a27673167f7e2e193c5e648b348
}, },
"devDependencies": { "devDependencies": {
"@ant-design/colors": "^3.2.1", "@ant-design/colors": "^3.2.1",

77
src/views/login/index.vue Normal file
View File

@ -0,0 +1,77 @@
<template>
<div class="login_main">
<div class="login">
<div class="login_title">安全培训系统登录</div>
<div class="login_form">
<el-input placeholder="用户名" v-model="loginForm.username">
<template slot="prepend">
<icon class="el-icon-user" style="font-size: 20px;" />
</template>
</el-input>
<el-input placeholder="密码" show-password v-model="loginForm.password">
<template slot="prepend">
<icon class="el-icon-goods" style="font-size: 20px;" />
</template>
</el-input>
<el-link href="javascript:void(0)" :underline="false" icon="el-icon-edit">忘记密码</el-link>
<el-button type="primary">登 录</el-button>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
loginForm: {
username: "",
password: ""
}
}
}
}
</script>
<style scoped>
.login_main {
width: 100%;
height: 100%;
background-color: #f2f6fc;
position: absolute;
}
.login {
width: 500px;
height: auto;
margin: 100px auto;
border-radius: 4px;
background-color: #fff;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
}
.login_title {
width: 100%;
height: 60px;
font-size: 24px;
font-weight: bold;
text-align: center;
line-height: 60px;
margin-bottom: 10px;
}
/* border-bottom: 1px solid #ccc; */
.login_form {
width: 90%;
margin: 0 auto;
}
.el-input {
margin-top: 20px;
}
.el-link {
margin-top: 20px;
float: right;
}
.el-button {
width: 100%;
margin-top: 20px;
margin-bottom: 20px;
}
</style>

13
vue.config.js
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
const path = require('path') const path = require('path')
const webpack = require('webpack') const webpack = require('webpack')
const GitRevisionPlugin = require('git-revision-webpack-plugin') const GitRevisionPlugin = require('git-revision-webpack-plugin')
@ -120,3 +121,15 @@ if (process.env.VUE_APP_PREVIEW === 'true') {
} }
module.exports = vueConfig module.exports = vueConfig
=======
module.exports = {
devServer: {
disableHostCheck: false,
host: "localhost",
port: "8999",
https: false,
hotOnly: false,
proxy: null
}
}
>>>>>>> 6dbed30ef7551a27673167f7e2e193c5e648b348