huoran
/
FE_huoran_data
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

bug修复

Browse Source
dev
Jo 3 years ago
parent 4abab38f05
commit a434b83e5e
7 changed files with 110 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      src/assets/img/search-white.png
  2. 10
      src/layouts/header/index.vue
  3. 10
      src/layouts/navbar/index.vue
  4. 12
      src/pages/data/list/index.vue
  5. 7
      src/pages/index/list/index.vue
  6. 155
      src/pages/setting/person/info.vue
  7. 2
      src/pages/user/list/index.vue

BIN
src/assets/img/search-white.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 691 B

10
src/layouts/header/index.vue
Unescape View File

@ -115,8 +115,12 @@ export default {
let mg = this.$route.query.mg
if (mg && atob(decodeURI(mg)) === 'true') {
this.showSetting = false
const userName = this.$route.query.userName
userName && this.setInfo({
userName
})
}
// 如果登录了,并且非客户，才调用用户信息的接口（客户是没有用户信息的，也不能进入后台）
// 如果登录了,并且非客户，才调用用户信息的接口（客户是没有用户信息的，但是能进入后台）
setTimeout(() => {
this.token && !this.isCustomer && this.getUserInfo()
}, 1000)
@ -125,6 +129,7 @@ export default {
...mapActions('user', [
'setInfo', 'logout', 'setManager', 'setCustomer'
]),
// 获取个人信息
getUserInfo() {
this.$get(this.api.userInfo).then(res => {
let userInfo = res.userInfo ? res.userInfo : {}
@ -166,7 +171,8 @@ export default {
query: {
mg: btoa(true),
schoolId: btoa(this.schoolId),
customer: btoa(this.isCustomer)
customer: btoa(this.isCustomer),
userName: this.userName
}
})
window.open(route.href)

10
src/layouts/navbar/index.vue
Unescape View File

@ -14,7 +14,7 @@ import util from '@/libs/util'
export default {
data() {
return {
managerStr: this.$route.query.mg,
managerStr: this.$route.query.mg, // 判断是否在后台的标识，只有url上带了mg，并且mg的值为编码后的true，才算进入了后台
isManager: false,
active: this.$route.path,
defaultMenus: [],
@ -62,9 +62,8 @@ export default {
},
mounted() {
if (util.local.get(Setting.tokenKey)) {// 如果是登录状态
setTimeout(() => {
this.isCustomer ? this.getPer() : this.initMenu()
}, 100)
this.getPer()
// 判断是否在后台，并且存到store里
if (this.managerStr && atob(decodeURI(this.managerStr)) === 'true') {
this.isManager = true
this.setManager(false)
@ -78,7 +77,7 @@ export default {
'setManager'
]),
initMenu() {
if (this.isManager) {// 该值为true，则表示当前是在后台（是否是后台是通过url上面的managerStr来判断的）
if (this.isManager) {// 该值为true，则表示当前是在后台（是否是后台是通过url上面的mg来判断的）
this.defaultMenus = this.managerMenus
if (Setting.dynamicRoute) {
let routes = this.routes
@ -106,6 +105,7 @@ export default {
Setting.dynamicRoute && addRoutes(routes)
this.initMenu()
}).catch(err => {
// 被捕获了则显示默认菜单
this.menus = this.defaultMenus
})
},

12
src/pages/data/list/index.vue
Unescape View File

@ -113,8 +113,8 @@
<el-table-column prop="updateTime" label="更新时间" width="170" align="center"></el-table-column>
<el-table-column label="操作" width="140">
<template slot-scope="scope">
<el-button type="text" @click="preview(scope.row)">预览</el-button>
<el-button type="text" @click="download(scope.row)">下载</el-button>
<el-button type="text" @click="preview(scope.row)" v-auth>预览</el-button>
<el-button type="text" @click="download(scope.row)" v-auth>下载</el-button>
</template>
</el-table-column>
</el-table>
@ -549,6 +549,9 @@ export default {
color: #3381d2;
}
}
&>.el-submenu>.el-menu{
background-color: #FAFAFA !important;
}
.el-submenu__title i{
font-size: 14px;
}
@ -571,7 +574,7 @@ export default {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
.is-active{
&.is-active{
color: #fff;
background-color: #0070FF;
}
@ -596,6 +599,9 @@ export default {
}
}
}
/deep/.el-table__body tr.current-row > td{
background-color: #daeaff;
}
.desc{
padding: 9px 12px;
margin: 20px 0 10px;

7
src/pages/index/list/index.vue
Unescape View File

@ -6,6 +6,7 @@
<div class="search">
<input ref="keyword" v-model="keyword" type="text" placeholder="请输入关键词">
<img v-if="keyword" src="../../../assets/img/remove-gray.png" alt="" class="remove" @click="keyword = ''">
<img class="icon-wrap" src="../../../assets/img/search-gray.png" alt="">
</div>
<div class="hot" v-if="hotData.length">
<span class="name">热门下载：</span>
@ -296,6 +297,10 @@ export default {
background-color: #fff;
border-radius: 4px;
overflow: hidden;
.icon-wrap{
width: 20px;
margin: 0 20px;
}
input{
flex: 1;
padding-left: 15px;
@ -312,7 +317,7 @@ export default {
}
}
.remove{
margin: 0 20px;
margin-left: 20px;
cursor: pointer;
}
}

155
src/pages/setting/person/info.vue
Unescape View File

@ -5,70 +5,54 @@
<h6 class="l-title"><img src="@/assets/img/info1.png" alt=""> 用户信息</h6>
<div class="page-content">
<ul class="list">
<div class="line">
<div class="line info">
<li>
<label>姓名：</label>
<div>
<el-input size="small" v-model="form.userName" clearable></el-input>
</div>
<el-input size="small" v-model="form.userName" clearable></el-input>
</li>
<li>
<label>性别：</label>
<div>
<el-select size="small" v-model="form.sex">
<el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"></el-option>
</el-select>
</div>
<el-select size="small" v-model="form.sex">
<el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"></el-option>
</el-select>
</li>
</div>
<div class="line info">
<li>
<label>出生年月日：</label>
<div>
<el-date-picker size="small" v-model="form.dateBirth" :clearable="false" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
</div>
<el-date-picker size="small" v-model="form.dateBirth" :clearable="false" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
</li>
</div>
<div class="line">
<li>
<li class="selects">
<label>所在地：</label>
<div class="mul">
<div class="child">
<div>
<el-select size="small" v-model="form.countries" placeholder>
<el-option v-for="item in countryList" :key="item.value" :label="item.label" :value="item.label"></el-option>
</el-select>
</div>
<el-select size="small" v-model="form.countries" placeholder>
<el-option v-for="item in countryList" :key="item.value" :label="item.label" :value="item.label"></el-option>
</el-select>
</div>
<div class="child">
<div>
<el-select size="small" v-model="form.provinceId" placeholder @change="id => getCity(id,1)">
<el-option v-for="item in provinceList" :key="item.provinceId" :label="item.provinceName" :value="item.provinceId"></el-option>
</el-select>
</div>
<el-select size="small" v-model="form.provinceId" placeholder @change="id => getCity(id,1)">
<el-option v-for="item in provinceList" :key="item.provinceId" :label="item.provinceName" :value="item.provinceId"></el-option>
</el-select>
</div>
<div class="child">
<div>
<el-select size="small" v-model="form.cityId" placeholder :disabled="form.provinceId ? false : true">
<el-option v-for="item in cityList" :key="item.cityId" :label="item.cityName" :value="item.cityId"></el-option>
</el-select>
</div>
<el-select size="small" v-model="form.cityId" placeholder :disabled="form.provinceId ? false : true">
<el-option v-for="item in cityList" :key="item.cityId" :label="item.cityName" :value="item.cityId"></el-option>
</el-select>
</div>
</div>
</li>
</div>
<div class="line">
<div class="line info">
<li>
<label>身份证：</label>
<div>
<el-input size="small" v-model="form.idNumber" clearable></el-input>
</div>
<el-input size="small" v-model="form.idNumber" clearable></el-input>
</li>
<li>
<label>教育程度：</label>
<div>
<el-select size="small" v-model="form.educationDegree" placeholder="请选择教育程度">
<el-option v-for="(item,index) in educationDegreeList" :key="index" :label="item.name" :value="item.value"></el-option>
</el-select>
</div>
<el-select size="small" v-model="form.educationDegree" placeholder="请选择教育程度">
<el-option v-for="(item,index) in educationDegreeList" :key="index" :label="item.name" :value="item.value"></el-option>
</el-select>
</li>
</div>
</ul>
@ -135,36 +119,29 @@
<h6 class="l-title"><img src="@/assets/img/info3.png" alt=""> 账号信息</h6>
<div class="page-content">
<ul class="list">
<div class="line">
<li style="margin-right: 136px">
<div class="line info imp">
<li>
<label>用户账号：</label>
<div>
<el-input size="small" v-model="form.account" clearable></el-input>
</div>
<el-input class="m-r-10" size="small" v-model="form.account" clearable disabled></el-input>
<el-button type="text" size="small" @click="openAccount">更换</el-button>
</li>
<li>
<label>手机号：</label>
<div>
<el-input class="m-r-10" type="text" size="small" v-model="form.phone" disabled></el-input>
<el-button type="text" size="small" @click="bindPhone">更换</el-button>
</div>
<el-input class="m-r-10" type="text" size="small" v-model="form.phone" disabled></el-input>
<el-button type="text" size="small" @click="bindPhone">更换</el-button>
</li>
</div>
<div class="line">
<div class="line info imp">
<li>
<label>邮箱：</label>
<div>
<el-input class="m-r-10" size="small" v-model="form.email" disabled></el-input>
<el-button v-if="form.email" type="text" size="small" @click="bindEmail">更换</el-button>
<el-button v-else type="text" size="small" @click="bindEmail">添加</el-button>
</div>
<el-input class="m-r-10" size="small" v-model="form.email" disabled></el-input>
<el-button v-if="form.email" type="text" size="small" @click="bindEmail">更换</el-button>
<el-button v-else type="text" size="small" @click="bindEmail">添加</el-button>
</li>
<li>
<label>密码：</label>
<div>
<el-input class="m-r-10" size="small" value="xxxxxxxx" disabled></el-input>
<el-button type="text" size="small" @click="bindPassword">更换</el-button>
</div>
<el-input class="m-r-10" size="small" value="xxxxxxxx" disabled></el-input>
<el-button type="text" size="small" @click="bindPassword">更换</el-button>
</li>
</div>
</ul>
@ -229,6 +206,18 @@
<el-button size="small" type="primary" @click="editPassword">确 定</el-button>
</span>
</el-dialog>
<el-dialog title="修改用户账号" :visible.sync="accountVisible" :close-on-click-modal="false" width="30%">
<el-form label-width="82px">
<el-form-item label="用户账号">
<el-input v-model="account" placeholder="请输入用户账号"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="accountVisible = false">取 消</el-button>
<el-button size="small" type="primary" @click="confirmAccount">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
@ -337,7 +326,9 @@ export default {
phoneCode: '',
phoneDisabled: false,
phoneTimer: null,
updateTime: 0
updateTime: 0,
account: '',
accountVisible: false
};
},
watch: {
@ -526,10 +517,13 @@ export default {
this.concatArch()
},
delArchive(i) {
const id = this.archivesList[i].personalFileId
id && this.$post(`${this.api.deleteProfile}?personalFileIds=${id}`).then(res => {
this.$confirm(`此操作不可逆，是否确认删除？`, '提示', {
type: 'warning'
}).then(() => {
const id = this.archivesList[i].personalFileId
this.archivesList.splice(i, 1)
}).catch(err => {})
id && this.$post(`${this.api.deleteProfile}?personalFileIds=${id}`).then(res => {}).catch(err => {})
}).catch(() => {})
},
bindEmail() {
this.email = this.form.email
@ -598,14 +592,6 @@ export default {
this.archivesList[index].professionalClassName = ''
this.archivesList[index].professionalId = ''
this.archivesList[index].professionalName = ''
// this.archivesList.map(e =>{
// if(e.disciplineId == item){
// e.professionalClassId = '',
// e.professionalClassName = '',
// e.professionalId = '',
// e.professionalName = ''
// }
// })
},
getItemProfessionalClass(item,index){
this.clearItemClass(index)
@ -811,6 +797,18 @@ export default {
this.phoneVisible = false
}).catch(res => {})
},
openAccount() {
this.account = this.form.account
this.accountVisible = true
},
confirmAccount() {
if (this.account) {
this.form.account = this.account
this.accountVisible = false
} else {
util.errorMsg('请输入账号')
}
}
}
};
</script>
@ -829,8 +827,17 @@ export default {
.line{
display: flex;
margin-bottom: 24px;
li{
margin-right: 100px;
&.info li:not(.selects){
width: 30%;
.el-input{
flex: 1;
}
&:first-child{
margin-right: 16%;
}
}
&.imp li{
width: calc(30% + 36px) !important;
}
}
li{
@ -874,14 +881,14 @@ export default {
}
.archives{
position: relative;
padding: 16px 30px;
padding: 16px 0;
margin-bottom: 6px;
border-radius: 4px;
background-color: #FAFAFA;
.del{
position: absolute;
top: 48px;
right: 55px;
right: 16px;
cursor: pointer;
}
li{

2
src/pages/user/list/index.vue
Unescape View File

@ -92,7 +92,7 @@
<el-form-item prop="roleIds" label="账号角色">
<el-checkbox-group v-model="form.roleIds">
<template v-for="(item,index) in roleList">
<el-checkbox v-if="item.roleName != '超级管理员'" :key="index" :label="item.id" :disabled="item.roleName === '用户'">{{item.roleName}}</el-checkbox>
<el-checkbox v-if="item.roleName != '超级管理员'" :key="index" :label="item.id">{{item.roleName}}</el-checkbox>
</template>
</el-checkbox-group>
</el-form-item>

Write Preview
Loading…
Cancel
Save