Skip to content

T
template_pda_Web
Commit f4c5f211 authored by 高宇's avatar 高宇
Browse files
Options

修改样式

parent 383d71b3
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 37 deletions
.env.production
View file @ f4c5f211
...@@ -3,7 +3,7 @@ ENV = 'production' ...@@ -3,7 +3,7 @@ ENV = 'production'
# 私有环境 # 私有环境
# base api # base api
#VUE_APP_BASE_API = 'http://zt.51newsoftware.com:10184' #VUE_APP_BASE_API = 'http://49.232.167.247:20014'
# workFlow链接地址 # workFlow链接地址
#VUE_APP_WORKFLOW = 'http://zt.51newsoftware.com:10184/workFlow' #VUE_APP_WORKFLOW = 'http://zt.51newsoftware.com:10184/workFlow'
# internal链接地址 # internal链接地址
...@@ -21,7 +21,7 @@ ENV = 'production' ...@@ -21,7 +21,7 @@ ENV = 'production'
# 生产环境 # 生产环境
# base api # base api
VUE_APP_BASE_API = 'http://zt.cebitic.com:10184' VUE_APP_BASE_API = 'http://49.232.167.247:20014'
# workFlow链接地址 # workFlow链接地址
VUE_APP_WORKFLOW = 'http://zt.cebitic.com:10184/workFlow' VUE_APP_WORKFLOW = 'http://zt.cebitic.com:10184/workFlow'
# internal链接地址 # internal链接地址
......
README.md
View file @ f4c5f211
...@@ -902,7 +902,7 @@ ENV = 'production' ...@@ -902,7 +902,7 @@ ENV = 'production'
# 生产环境 # 生产环境
# base api # base api
VUE_APP_BASE_API = 'http://zt.cebitic.com:10184'// 配置生产环境打包地址（后端的请求接口地址） VUE_APP_BASE_API = 'http://49.232.167.247:20014'// 配置生产环境打包地址（后端的请求接口地址）
``` ```
打包时运行： 打包时运行：
......
public/index.html
View file @ f4c5f211
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<link rel="icon" href="<%= BASE_URL %>liulanqi_logo.png"> <link rel="icon" href="<%= BASE_URL %>liulanqi_logo.png">
<!-- <link rel="stylesheet" href="//at.alicdn.com/t/font_2011217_f70ptj9y4oc.css">--> <!-- <link rel="stylesheet" href="//at.alicdn.com/t/font_2011217_f70ptj9y4oc.css">-->
<title><%= webpackConfig.name %></title> <title><%= webpackConfig.name %></title>
`` <script src="./vconsole.min.js"></script> <script src="./vconsole.min.js"></script>
<script>new VConsole()</script> <script>new VConsole()</script>
</head> </head>
<body> <body>
......
src/api/login.js
View file @ f4c5f211
...@@ -4,39 +4,39 @@ import Qs from 'qs' ...@@ -4,39 +4,39 @@ import Qs from 'qs'
// 登录方法 // 登录方法
// 登录方法 // 登录方法
export function login(username, password, code, uuid) {
const data = {
username,
password
// code,
// uuid
}
return request({
url: '/auth/login',
method: 'post',
params: data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// export function login(username, password, code, uuid) { // export function login(username, password, code, uuid) {
// const data = { // const data = {
// username, // username,
// password, // password
// code, // // code,
// uuid // // uuid
// } // }
// console.log('加密前数据', data)
// return request({ // return request({
// url: '/auth/login', // url: '/auth/login',
// method: 'post', // method: 'post',
// data: Qs.stringify({ // params: data,
// sign: encrypt(data) // headers: {
// }), // 'Content-Type': 'application/x-www-form-urlencoded'
// headers: {} // }
// }) // })
// } // }
export function login(username, password, code, uuid) {
const data = {
username,
password,
code,
uuid
}
console.log('加密前数据', data)
return request({
url: '/auth/login',
method: 'post',
data: Qs.stringify({
sign: encrypt(data)
}),
headers: {}
})
}
// 刷新token // 刷新token
export function refreshToken(params) { export function refreshToken(params) {
return request({ return request({
......
src/layout/components/TagsView/index.vue
View file @ f4c5f211
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
@click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''" @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
@contextmenu.prevent.native="openMenu(tag,$event)" @contextmenu.prevent.native="openMenu(tag,$event)"
> >
{{ tag.title }} <span class="title">{{ tag.title }}</span>
<span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" /> <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
</router-link> </router-link>
</scroll-pane> </scroll-pane>
......
src/layout/components/header.vue
View file @ f4c5f211
...@@ -51,9 +51,9 @@ ...@@ -51,9 +51,9 @@
修改密码 修改密码
</router-link> </router-link>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="setting = true"> <!-- <el-dropdown-item @click.native="setting = true">-->
<span>布局设置</span> <!-- <span>布局设置</span>-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item divided @click.native="logout"> <el-dropdown-item divided @click.native="logout">
<span style="display:block;">退出</span> <span style="display:block;">退出</span>
</el-dropdown-item> </el-dropdown-item>
......
src/styles/element-ui.scss
View file @ f4c5f211
...@@ -381,6 +381,7 @@ label { ...@@ -381,6 +381,7 @@ label {
padding: 8px 15px; padding: 8px 15px;
} }
.el-message-box { .el-message-box {
width: 300px;
.el-message-box__content { .el-message-box__content {
padding: 15px; padding: 15px;
} }
......
src/styles/themeA/tagsView.scss
View file @ f4c5f211
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
margin-right: 15px; margin-right: 15px;
} }
&.active { &.active {
width: 138px;
background-color: #fff; background-color: #fff;
color: $color-theme; color: $color-theme;
border-color: transparent; border-color: transparent;
...@@ -66,12 +67,16 @@ ...@@ -66,12 +67,16 @@
} }
.tags-view-wrapper { .tags-view-wrapper {
.tags-view-item { .tags-view-item {
.title{
margin-left: 35px;
}
.el-icon-close { .el-icon-close {
float: right;
width: 16px; width: 16px;
height: 16px; height: 16px;
vertical-align: 2px; vertical-align: 2px;
border-radius: 50%; border-radius: 50%;
text-align: center; //text-align: center;
transition: all .3s cubic-bezier(.645, .045, .355, 1); transition: all .3s cubic-bezier(.645, .045, .355, 1);
transform-origin: 100% 50%; transform-origin: 100% 50%;
&:before { &:before {
......
src/styles/themeB/tagsView.scss
View file @ f4c5f211
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
height: 16px; height: 16px;
vertical-align: 2px; vertical-align: 2px;
border-radius: 50%; border-radius: 50%;
text-align: center; //text-align: center;
transition: all .3s cubic-bezier(.645, .045, .355, 1); transition: all .3s cubic-bezier(.645, .045, .355, 1);
transform-origin: 100% 50%; transform-origin: 100% 50%;
&:before { &:before {
......
src/views/login/login.vue
View file @ f4c5f211
...@@ -150,7 +150,7 @@ export default { ...@@ -150,7 +150,7 @@ export default {
} }
}, },
created() { created() {
this.getCode() // this.getCode()
this.getCookie() this.getCookie()
}, },
methods: { methods: {
......
vue.config.js
View file @ f4c5f211
...@@ -86,9 +86,10 @@ module.exports = { ...@@ -86,9 +86,10 @@ module.exports = {
// target: `http://192.168.1.31:8082/`, // target: `http://192.168.1.31:8082/`,
// target: `http://192.168.1.12:8082/`, // 孙浩 // target: `http://192.168.1.12:8082/`, // 孙浩
// target: `http://192.168.1.41:8082/`, // target: `http://192.168.1.41:8082/`,
// target: `http://49.232.167.247:20014/`, // 线上 target: `http://49.232.167.247:20014/`, // 线上
// target: `http://192.168.1.30:8082/`, // target: `http://192.168.1.30:8082/`,
target: `http://localhost:8088/`, // target: `http://localhost:8088/`,
// target: `http://localhost:8082/`,
// target: `http://49.232.167.247:20014/`, // target: `http://49.232.167.247:20014/`,
// changeOrigin: true, // changeOrigin: true,
pathRewrite: { pathRewrite: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment