elink-star
/
epmet-oper-lingshan
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复分支冲突

master
dai_siki 6 years ago
parent
382871c861 a7f4c833c2
commit
102c5a88fb
6 changed files with 34 additions and 46 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. 2
      epmet-oper-web/src/router/index.js
  2. 4
      epmet-oper-web/src/views/main.vue
  3. 9
      epmet-oper-web/src/views/modules/resi/strangeraccessrecord.vue
  4. 27
      epmet-oper-web/src/views/modules/sys/user-add-or-update.vue
  5. 25
      epmet-oper-web/src/views/modules/sys/user.vue
  6. 13
      epmet-oper-web/src/views/pages/login.vue

2
epmet-oper-web/src/router/index.js
View File

@ -85,7 +85,7 @@ router.beforeEach((to, from, next) => {
window.SITE_CONFIG['dictList'] = res.data
}).catch(() => {})
// 获取菜单列表, 添加并全局变量保存
http.get('/sys/menu/nav').then(({ data: res }) => {
http.get('/oper/access/menu/nav').then(({ data: res }) => {
if (res.code !== 0) {
Vue.prototype.$message.error(res.msg)
return next({ name: 'login' })

4
epmet-oper-web/src/views/main.vue
View File

@ -82,7 +82,7 @@ export default {
},
// 获取当前管理员信息
getUserInfo () {
return this.$http.get('/sys/user/info').then(({ data: res }) => {
return this.$http.get('/epmetuser/operuser/queryOperUserDto').then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -94,7 +94,7 @@ export default {
},
// 获取权限
getPermissions () {
return this.$http.get('/sys/menu/permissions').then(({ data: res }) => {
return this.$http.get('/oper/access/menu/permissions').then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}

9
epmet-oper-web/src/views/modules/resi/strangeraccessrecord.vue
View File

@ -16,15 +16,12 @@
</el-form-item>-->
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
<!-- <el-table-column prop="id" label="唯一标识" header-align="center" align="center"></el-table-column>
<el-table-column prop="locationAreaCode" label="定位地区编码 (用户允许获取位置)" header-align="center" align="center"></el-table-column>-->
<el-table-column prop="visitTime" label="访问时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="selectedAreaCode" label="地区码" header-align="center" align="center"></el-table-column>
<el-table-column prop="province" label="省（直辖市）" header-align="center" align="center"></el-table-column>
<el-table-column prop="city" label="市" header-align="center" align="center"></el-table-column>
<el-table-column prop="area" label="区（县）" header-align="center" align="center"></el-table-column>
<el-table-column prop="isAuthorized" label="位置授权(0:是 1:否)" :formatter="typeFormatter" header-align="center" align="center"></el-table-column>
<el-table-column prop="isAuthorized" label="位置授权" :formatter="typeFormatter" header-align="center" align="center"></el-table-column>
<!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button v-if="$hasPermission('customer:strangeraccessrecord:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@ -55,9 +52,9 @@ export default {
data () {
return {
mixinViewModuleOptions: {
getDataListURL: '/resi/guide/stranger/getStrangerAccessRecordPage',
getDataListURL: '/resi/guide/strangerAccessRecord/getStrangerAccessRecordPage',
getDataListIsPage: true,
deleteURL: '/stranger',
deleteURL: '/strangerAccessRecord',
deleteIsBatch: true
},
dataForm: {

27
epmet-oper-web/src/views/modules/sys/user-add-or-update.vue
View File

@ -2,20 +2,20 @@
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form-item prop="username" :label="$t('user.username')">
<el-input v-model="dataForm.username" :placeholder="$t('user.username')"></el-input>
</el-form-item>
<el-form-item prop="deptName" :label="$t('user.deptName')">
<ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :dept-name.sync="dataForm.deptName"></ren-dept-tree>
<el-input v-model="dataForm.realName" :placeholder="$t('user.username')"></el-input>
</el-form-item>
<!-- <el-form-item prop="deptName" :label="$t('user.deptName')">-->
<!-- <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :dept-name.sync="dataForm.deptName"></ren-dept-tree>-->
<!-- </el-form-item>-->
<el-form-item prop="password" :label="$t('user.password')" :class="{ 'is-required': !dataForm.id }">
<el-input v-model="dataForm.password" type="password" :placeholder="$t('user.password')"></el-input>
</el-form-item>
<el-form-item prop="confirmPassword" :label="$t('user.confirmPassword')" :class="{ 'is-required': !dataForm.id }">
<el-input v-model="dataForm.confirmPassword" type="password" :placeholder="$t('user.confirmPassword')"></el-input>
</el-form-item>
<el-form-item prop="realName" :label="$t('user.realName')">
<el-input v-model="dataForm.realName" :placeholder="$t('user.realName')"></el-input>
</el-form-item>
<!-- <el-form-item prop="realName" :label="$t('user.realName')">-->
<!-- <el-input v-model="dataForm.realName" :placeholder="$t('user.realName')"></el-input>-->
<!-- </el-form-item>-->
<el-form-item prop="gender" :label="$t('user.gender')" size="mini">
<el-radio-group v-model="dataForm.gender">
<el-radio :label="0">{{ $t('user.gender0') }}</el-radio>
@ -27,7 +27,7 @@
<el-input v-model="dataForm.email" :placeholder="$t('user.email')"></el-input>
</el-form-item>
<el-form-item prop="mobile" :label="$t('user.mobile')">
<el-input v-model="dataForm.mobile" :placeholder="$t('user.mobile')"></el-input>
<el-input v-model="dataForm.phone" :placeholder="$t('user.mobile')"></el-input>
</el-form-item>
<el-form-item prop="roleIdList" :label="$t('user.roleIdList')" class="role-list">
<el-select v-model="dataForm.roleIdList" multiple :placeholder="$t('user.roleIdList')">
@ -59,15 +59,12 @@ export default {
roleIdListDefault: [],
dataForm: {
id: '',
username: '',
deptId: '0',
deptName: '',
password: '',
confirmPassword: '',
realName: '',
gender: 0,
email: '',
mobile: '',
phone: '',
roleIdList: [],
status: 1
}
@ -147,7 +144,7 @@ export default {
},
// 获取角色列表
getRoleList () {
return this.$http.get('/sys/role/list').then(({ data: res }) => {
return this.$http.get('/oper/access/operrole/list').then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -156,7 +153,7 @@ export default {
},
// 获取信息
getInfo () {
this.$http.get(`/sys/user/${this.dataForm.id}`).then(({ data: res }) => {
this.$http.get(`/epmetuser/operuser/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -181,7 +178,7 @@ export default {
if (!valid) {
return false
}
this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/user', {
this.$http[!this.dataForm.id ? 'post' : 'put']('/epmetuser/operuser', {
...this.dataForm,
roleIdList: [
...this.dataForm.roleIdList,

25
epmet-oper-web/src/views/modules/sys/user.vue
View File

@ -3,13 +3,7 @@
<div class="mod-sys__user">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.username" :placeholder="$t('user.username')" clearable></el-input>
</el-form-item>
<el-form-item>
<ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
</el-form-item>
<el-form-item>
<ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :query="true"></ren-dept-tree>
<el-input v-model="dataForm.realName" :placeholder="$t('user.realName')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
@ -32,10 +26,9 @@
@sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center" align="center"></el-table-column>
<el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center"></el-table-column>
<el-table-column prop="realName" :label="$t('user.username')" sortable="custom" header-align="center" align="center"></el-table-column>
<el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column>
<el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center"></el-table-column>
<el-table-column prop="phone" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center"></el-table-column>
<el-table-column prop="gender" :label="$t('user.gender')" sortable="custom" header-align="center" align="center">
<template slot-scope="scope">
{{ $getDictLabel("gender", scope.row.gender) }}
@ -47,7 +40,7 @@
<el-tag v-else size="small" type="success">{{ $t('user.status1') }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="createDate" :label="$t('user.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="createTime" :label="$t('user.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button v-if="$hasPermission('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@ -78,16 +71,14 @@ export default {
data () {
return {
mixinViewModuleOptions: {
getDataListURL: '/sys/user/page',
getDataListURL: '/epmetuser/operuser/page',
getDataListIsPage: true,
deleteURL: '/sys/user',
deleteURL: '/epmetuser/operuser',
deleteIsBatch: true,
exportURL: '/sys/user/export'
exportURL: '/epmetuser/operuser/export'
},
dataForm: {
username: '',
deptId: '',
gender: ''
realName: ''
}
}
},

13
epmet-oper-web/src/views/pages/login.vue
View File

@ -13,8 +13,8 @@
<el-option v-for="(val, key) in i18nMessages" :key="key" :label="val._lang" :value="key"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="username">
<el-input v-model="dataForm.username" :placeholder="$t('login.username')">
<el-form-item prop="phone">
<el-input v-model="dataForm.phone" placeholder="手机号">
<span slot="prefix" class="el-input__icon">
<svg class="icon-svg" aria-hidden="true"><use xlink:href="#icon-user"></use></svg>
</span>
@ -69,7 +69,10 @@ export default {
i18nMessages: messages,
captchaPath: '',
dataForm: {
app: 'oper',
client: 'web',
username: '',
phone: '',
password: '',
uuid: '',
captcha: ''
@ -79,7 +82,7 @@ export default {
computed: {
dataRule () {
return {
username: [
phone: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
password: [
@ -98,7 +101,7 @@ export default {
// 获取验证码
getCaptcha () {
this.dataForm.uuid = getUUID()
this.captchaPath = `${window.SITE_CONFIG['apiURL']}/auth/captcha?uuid=${this.dataForm.uuid}`
this.captchaPath = `${window.SITE_CONFIG['apiURL']}/auth/login/captcha?uuid=${this.dataForm.uuid}`
},
// 表单提交
dataFormSubmitHandle: debounce(function () {
@ -106,7 +109,7 @@ export default {
if (!valid) {
return false
}
this.$http.post('/auth/login', this.dataForm).then(({ data: res }) => {
this.$http.post('/auth/login/loginbypassword', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
this.getCaptcha()
return this.$message.error(res.msg)

Write Preview
Loading…
Cancel
Save