Browse Source

Merge branch 'resiguide' of http://121.42.41.42:7070/r/epmet-oper into dev

preview
yinzuomei 6 years ago
parent
commit
f0022fd809
  1. 9
      epmet-oper-web/package-lock.json
  2. 2
      epmet-oper-web/public/index.html
  3. 209
      epmet-oper-web/src/views/modules/customize/homecomponent-add-or-update.vue
  4. 194
      epmet-oper-web/src/views/modules/customize/homecomponent.vue
  5. 8
      epmet-oper-web/src/views/modules/sys/menu-add-or-update.vue
  6. 4
      epmet-oper-web/src/views/modules/sys/menu.vue
  7. 60
      epmet-oper-web/src/views/modules/sys/role-add-or-update.vue
  8. 4
      epmet-oper-web/src/views/modules/sys/role.vue
  9. 12
      epmet-oper-web/src/views/modules/sys/user-add-or-update.vue

9
epmet-oper-web/package-lock.json

@ -5365,6 +5365,15 @@
"integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
"dev": true
},
"dai-js": {
"version": "0.0.12",
"resolved": "https://registry.npm.taobao.org/dai-js/download/dai-js-0.0.12.tgz",
"integrity": "sha1-Yk4eqh6Q5p2bFrYcl3cUDIZoF70=",
"dev": true,
"requires": {
"babel-runtime": "^6.11.6"
}
},
"dashdash": {
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",

2
epmet-oper-web/public/index.html

@ -29,7 +29,7 @@
<!-- 开发环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
<script>window.SITE_CONFIG['apiURL'] = 'http://10.10.10.77:8080/api';</script>
<script>window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/api';</script>
<% } %>
<!-- 集成测试环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>

209
epmet-oper-web/src/views/modules/customize/homecomponent-add-or-update.vue

@ -0,0 +1,209 @@
<template>
<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="$i18n.locale === 'en-US' ? '120px' : '120px'">
<el-form-item label="功能" prop="functionId" v-if="true">
<el-select v-model="dataForm.functionId"
placeholder="请选择" clearable>
<el-option v-for="item in functionList"
:key="item.id"
:label="item.functionName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="组件名称" prop="componentName">
<el-input v-model="dataForm.componentName" placeholder="组件名称"></el-input>
</el-form-item>
<el-form-item label="组件前端标识" prop="componentFrontId">
<el-input v-model="dataForm.componentFrontId" placeholder="例如:gov-titleList-home-gridNameTitle"></el-input>
</el-form-item>
<el-form-item label="所属端" prop="clientType">
<el-select v-model="dataForm.clientType"
placeholder="请选择" clearable>
<el-option v-for="item in clientTypeList"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="组件类型" prop="conponentType">
<el-select v-model="dataForm.conponentType"
placeholder="请选择" clearable>
<el-option v-for="item in conponentTypeList"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="组件的适用区域" prop="region">
<el-select v-model="dataForm.region"
placeholder="请选择" clearable>
<el-option v-for="item in regionList"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="高级配置" prop="configuration">
<el-input v-model="dataForm.configuration" placeholder="高级配置" type="textarea"></el-input>
</el-form-item>
<el-form-item label="配置项说明" prop="configurationDescription">
<el-input v-model="dataForm.configurationDescription" placeholder="配置项说明" type="textarea"></el-input>
</el-form-item>
<el-form-item label="演示数据" prop="demoData">
<el-input v-model="dataForm.demoData" placeholder="演示数据" type="textarea"></el-input>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
</template>
</el-dialog>
</template>
<script>
import debounce from 'lodash/debounce'
export default {
data () {
return {
visible: false,
dataForm: {
id: '',
functionId: '',
componentName: '',
componentFrontId: '',
clientType: '',
conponentType: '',
region: '',
configuration: '',
configurationDescription: '',
demoData: ''
},
clientTypeList: [
{
'dictName': '居民端',
'dictValue': 0
}, {
'dictName': '政府端',
'dictValue': 1
}
],
conponentTypeList: [
{
'dictName': '通用组件',
'dictValue': 0
}, {
'dictName': '功能组件',
'dictValue': 1
}
],
regionList: [
{
'dictName': '标题区',
'dictValue': 'titleList'
}, {
'dictName': '置顶区',
'dictValue': 'topList'
}, {
'dictName': '功能区',
'dictValue': 'functionList'
}, {
'dictName': '悬浮区',
'dictValue': 'floatingList'
}
],
functionList: []
}
},
created () {
this.queryFunctionList()
},
computed: {
dataRule () {
return {
componentName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
componentFrontId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
clientType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
conponentType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
region: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
configuration: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
configurationDescription: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
demoData: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
},
methods: {
init () {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.getInfo()
}
})
},
//
getInfo () {
this.$http.get(`/oper/customize/homecomponent/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.dataForm = {
...this.dataForm,
...res.data
}
}).catch(() => {})
},
//
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$http[!this.dataForm.id ? 'post' : 'put']('/oper/customize/homecomponent/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
}).catch(() => {})
})
}, 1000, { 'leading': true, 'trailing': false }),
queryFunctionList () {
this.$http.get(`/oper/customize/function/queryFunctionList`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.functionList = res.data
}).catch(() => { })
}
}
}
</script>

194
epmet-oper-web/src/views/modules/customize/homecomponent.vue

@ -0,0 +1,194 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-/oper/customize__homecomponent}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="组件名称">
<el-input v-model="dataForm.componentName" placeholder="请输入组件名称模糊匹配" clearable></el-input>
</el-form-item>
<el-form-item label="所属端">
<el-select v-model="dataForm.clientType"
placeholder="全部" clearable>
<el-option v-for="item in clientTypeList"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="组件类型">
<el-select v-model="dataForm.conponentType"
placeholder="全部" clearable>
<el-option v-for="item in conponentTypeList"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="组件适用区域">
<el-select v-model="dataForm.region"
placeholder="全部" clearable>
<el-option v-for="item in regionList"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<br>
<el-form-item label="所属功能">
<el-select v-model="dataForm.functionId"
placeholder="全部" clearable>
<el-option v-for="item in functionList"
:key="item.id"
:label="item.functionName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</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" v-if="false"></el-table-column>
<el-table-column prop="componentName" label="组件名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="functionName" label="所属功能" header-align="center" align="center" v-if="true"></el-table-column>
<el-table-column prop="componentFrontId" label="前端标识" header-align="center" align="center"></el-table-column>
<el-table-column prop="clientType" label="所属端" header-align="center" align="center" :formatter="showClientTypeName"></el-table-column>
<el-table-column prop="conponentType" label="组件类型" header-align="center" align="center" :formatter="showConponentTypeName"></el-table-column>
<el-table-column prop="region" label="组件的“适用区域”" header-align="center" align="center" :formatter="showRegionName"></el-table-column>
<el-table-column prop="configuration" label="高级配置" header-align="center" align="center" v-if="false"></el-table-column>
<el-table-column prop="configurationDescription" label="配置项说明" header-align="center" align="center" v-if="false"></el-table-column>
<el-table-column prop="demoData" label="演示数据" header-align="center" align="center" v-if="false"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</el-card>
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './homecomponent-add-or-update'
export default {
mixins: [mixinViewModule],
data () {
return {
mixinViewModuleOptions: {
getDataListURL: '/oper/customize/homecomponent/page',
getDataListIsPage: true,
deleteURL: '/oper/customize/homecomponent',
deleteIsBatch: true
},
dataForm: {
componentName: '',
clientType: '',
conponentType: '',
region: '',
functionId: ''
},
clientTypeList: [
{
'dictName': '居民端',
'dictValue': '0'
}, {
'dictName': '政府端',
'dictValue': '1'
}
],
conponentTypeList: [
{
'dictName': '通用组件',
'dictValue': '0'
}, {
'dictName': '功能组件',
'dictValue': '1'
}
],
regionList: [
{
'dictName': '标题区',
'dictValue': 'titleList'
}, {
'dictName': '置顶区',
'dictValue': 'topList'
}, {
'dictName': '功能区',
'dictValue': 'functionList'
}, {
'dictName': '悬浮区',
'dictValue': 'floatingList'
}
],
functionList: []
}
},
components: {
AddOrUpdate
},
created () {
this.queryFunctionList()
},
methods: {
showClientTypeName: function (row, column) {
let clientType = row.clientType
if (clientType === 0) {
return '居民端'
} else if (clientType === 1) {
return '政府端'
}
},
showConponentTypeName: function (row, column) {
let conponentType = row.conponentType
if (conponentType === 0) {
return '通用组件'
} else if (conponentType === 1) {
return '功能组件'
}
},
showRegionName: function (row, column) {
let region = row.region
if (region === 'titleList') {
return '标题区'
} else if (region === 'topList') {
return '置顶区'
} else if (region === 'functionList') {
return '功能区'
} else if (region === 'floatingList') {
return '悬浮区'
}
},
queryFunctionList () {
this.$http.get(`/oper/customize/function/queryFunctionList`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.functionList = res.data
}).catch(() => { })
}
}
}
</script>

8
epmet-oper-web/src/views/modules/sys/menu-add-or-update.vue

@ -75,7 +75,7 @@
</el-col>
</el-row>
</el-form-item>
<el-form-item :label="dataForm.resourceList.length <= 0 ? $t('menu.resource') : ''">
<el-form-item :label="dataForm.resourceList==null || dataForm.resourceList.length <= 0 ? $t('menu.resource') : ''">
<el-button @click="resourceAddHandle()" class="aui-button--dashed w-percent-100">{{ $t('menu.resourceAddItem') }}</el-button>
</el-form-item>
</el-form>
@ -145,7 +145,7 @@ export default {
},
//
getMenuList () {
return this.$http.get('/sys/menu/list?type=0').then(({ data: res }) => {
return this.$http.get('/oper/access/menu/list?type=0').then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -154,7 +154,7 @@ export default {
},
//
getInfo () {
this.$http.get(`/sys/menu/${this.dataForm.id}`).then(({ data: res }) => {
this.$http.get(`/oper/access/menu/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -202,7 +202,7 @@ export default {
if (!valid) {
return false
}
this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/menu', this.dataForm).then(({ data: res }) => {
this.$http[!this.dataForm.id ? 'post' : 'put']('/oper/access/menu', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}

4
epmet-oper-web/src/views/modules/sys/menu.vue

@ -43,8 +43,8 @@ export default {
data () {
return {
mixinViewModuleOptions: {
getDataListURL: '/sys/menu/list',
deleteURL: '/sys/menu'
getDataListURL: '/oper/access/menu/list',
deleteURL: '/oper/access/menu'
}
}
},

60
epmet-oper-web/src/views/modules/sys/role-add-or-update.vue

@ -20,18 +20,18 @@
</el-tree>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item size="mini" :label="$t('role.deptList')">
<el-tree
:data="deptList"
:props="{ label: 'name', children: 'children' }"
node-key="id"
ref="deptListTree"
accordion
show-checkbox>
</el-tree>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item size="mini" :label="$t('role.deptList')">-->
<!-- <el-tree-->
<!-- :data="deptList"-->
<!-- :props="{ label: 'name', children: 'children' }"-->
<!-- node-key="id"-->
<!-- ref="deptListTree"-->
<!-- accordion-->
<!-- show-checkbox>-->
<!-- </el-tree>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
</el-form>
<template slot="footer">
@ -48,12 +48,12 @@ export default {
return {
visible: false,
menuList: [],
deptList: [],
// deptList: [],
dataForm: {
id: '',
name: '',
menuIdList: [],
deptIdList: [],
// deptIdList: [],
remark: ''
}
}
@ -73,10 +73,10 @@ export default {
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
this.$refs.menuListTree.setCheckedKeys([])
this.$refs.deptListTree.setCheckedKeys([])
// this.$refs.deptListTree.setCheckedKeys([])
Promise.all([
this.getMenuList(),
this.getDeptList()
this.getMenuList()
// this.getDeptList()
]).then(() => {
if (this.dataForm.id) {
this.getInfo()
@ -86,7 +86,7 @@ export default {
},
//
getMenuList () {
return this.$http.get('/sys/menu/select').then(({ data: res }) => {
return this.$http.get('/oper/access/menu/select').then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -94,17 +94,17 @@ export default {
}).catch(() => {})
},
//
getDeptList () {
return this.$http.get('/sys/dept/list').then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.deptList = res.data
}).catch(() => {})
},
// getDeptList () {
// return this.$http.get('/sys/dept/list').then(({ data: res }) => {
// if (res.code !== 0) {
// return this.$message.error(res.msg)
// }
// this.deptList = res.data
// }).catch(() => {})
// },
//
getInfo () {
this.$http.get(`/sys/role/${this.dataForm.id}`).then(({ data: res }) => {
this.$http.get(`/oper/access/operrole/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -113,7 +113,7 @@ export default {
...res.data
}
this.dataForm.menuIdList.forEach(item => this.$refs.menuListTree.setChecked(item, true))
this.$refs.deptListTree.setCheckedKeys(this.dataForm.deptIdList)
// this.$refs.deptListTree.setCheckedKeys(this.dataForm.deptIdList)
}).catch(() => {})
},
//
@ -126,8 +126,8 @@ export default {
...this.$refs.menuListTree.getCheckedKeys(),
...this.$refs.menuListTree.getHalfCheckedKeys()
]
this.dataForm.deptIdList = this.$refs.deptListTree.getCheckedKeys()
this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/role', this.dataForm).then(({ data: res }) => {
// this.dataForm.deptIdList = this.$refs.deptListTree.getCheckedKeys()
this.$http[!this.dataForm.id ? 'post' : 'put']('/oper/access/operrole', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}

4
epmet-oper-web/src/views/modules/sys/role.vue

@ -56,9 +56,9 @@ export default {
data () {
return {
mixinViewModuleOptions: {
getDataListURL: '/sys/role/page',
getDataListURL: '/oper/access/operrole/page',
getDataListIsPage: true,
deleteURL: '/sys/role',
deleteURL: '/oper/access/operrole',
deleteIsBatch: true
},
dataForm: {

12
epmet-oper-web/src/views/modules/sys/user-add-or-update.vue

@ -26,7 +26,7 @@
<el-form-item prop="email" :label="$t('user.email')">
<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-form-item prop="phone" :label="$t('user.mobile')">
<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">
@ -100,26 +100,20 @@ export default {
callback()
}
return {
username: [
realName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
deptName: [
{ required: true, message: this.$t('validate.required'), trigger: 'change' }
],
password: [
{ validator: validatePassword, trigger: 'blur' }
],
confirmPassword: [
{ validator: validateConfirmPassword, trigger: 'blur' }
],
realName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
email: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' },
{ validator: validateEmail, trigger: 'blur' }
],
mobile: [
phone: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' },
{ validator: validateMobile, trigger: 'blur' }
]

Loading…
Cancel
Save