Browse Source

Merge branch 'dev_analysis' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_analysis

master
李鹏飞 6 years ago
parent
commit
b941cb3bb2
  1. 75
      package-lock.json
  2. 1
      package.json
  3. 18
      src/views/modules/custom/gridoperatorinfo-add-or-update.vue
  4. 22
      src/views/modules/custom/gridoperatorinfo.vue
  5. 16
      src/views/modules/custom/majorfunctionconf-add-or-update.vue
  6. 316
      src/views/modules/user/alluser.vue
  7. 2
      src/views/modules/user/fail-authentication.vue
  8. 2
      src/views/modules/user/pass-authentication.vue
  9. 15
      src/views/modules/user/user-add-or-update.vue
  10. 8
      src/views/modules/user/wait-authentication.vue

75
package-lock.json

@ -6218,8 +6218,7 @@
},
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"optional": true
"bundled": true
},
"aproba": {
"version": "1.2.0",
@ -6237,13 +6236,11 @@
},
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"optional": true
"bundled": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@ -6256,18 +6253,15 @@
},
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"optional": true
"bundled": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"optional": true
"bundled": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"optional": true
"bundled": true
},
"core-util-is": {
"version": "1.0.2",
@ -6370,8 +6364,7 @@
},
"inherits": {
"version": "2.0.3",
"bundled": true,
"optional": true
"bundled": true
},
"ini": {
"version": "1.3.5",
@ -6381,7 +6374,6 @@
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -6394,20 +6386,17 @@
"minimatch": {
"version": "3.0.4",
"bundled": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "0.0.8",
"bundled": true,
"optional": true
"bundled": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@ -6424,7 +6413,6 @@
"mkdirp": {
"version": "0.5.1",
"bundled": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -6497,8 +6485,7 @@
},
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"optional": true
"bundled": true
},
"object-assign": {
"version": "4.1.1",
@ -6508,7 +6495,6 @@
"once": {
"version": "1.4.0",
"bundled": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -6584,8 +6570,7 @@
},
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
"optional": true
"bundled": true
},
"safer-buffer": {
"version": "2.1.2",
@ -6615,7 +6600,6 @@
"string-width": {
"version": "1.0.2",
"bundled": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@ -6633,7 +6617,6 @@
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -6672,13 +6655,11 @@
},
"wrappy": {
"version": "1.0.2",
"bundled": true,
"optional": true
"bundled": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
"optional": true
"bundled": true
}
}
},
@ -9095,6 +9076,24 @@
"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
"dev": true
},
"jsonp": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/jsonp/-/jsonp-0.2.1.tgz",
"integrity": "sha1-pltPoPEL2nGaBUQep7lMVfPhW64=",
"requires": {
"debug": "^2.1.3"
},
"dependencies": {
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"requires": {
"ms": "2.0.0"
}
}
}
},
"jsprim": {
"version": "1.4.1",
"resolved": "http://r.cnpmjs.org/jsprim/download/jsprim-1.4.1.tgz",
@ -16094,6 +16093,22 @@
"vue-style-loader": "^4.1.0"
}
},
"vue-quill-editor": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz",
"integrity": "sha512-g20oSZNWg8Hbu41Kinjd55e235qVWPLfg4NvsLW6d+DhgBTFbEuMpcWlUdrD6qT3+Noim6DRu18VLM9lVShXOQ==",
"requires": {
"object-assign": "^4.1.1",
"quill": "^1.3.4"
},
"dependencies": {
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
}
}
},
"vue-router": {
"version": "3.0.1",
"resolved": "http://r.cnpmjs.org/vue-router/download/vue-router-3.0.1.tgz",

1
package.json

@ -34,6 +34,7 @@
"svg-sprite-loader": "^4.1.1",
"vue": "^2.5.17",
"vue-i18n": "^8.1.0",
"vue-quill-editor": "^3.0.6",
"vue-router": "^3.0.1",
"vuex": "^3.0.1"
},

18
src/views/modules/custom/gridoperatorinfo-add-or-update.vue

@ -35,11 +35,17 @@
placeholder="联系电话"></el-input>
</el-form-item>
<el-form-item label="所属网格"
prop="allDeptIds">
<el-cascader v-model="dataForm.allDeptIds"
v-if="!dataForm.id"
prop="selectedDeptIds">
<el-cascader v-model="dataForm.selectedDeptIds"
:options="options"
:props="{ multiple: true }"
filterable
clearable></el-cascader>
collapse-tags></el-cascader>
</el-form-item>
<el-form-item label="所属机构"
v-if="dataForm.id">
<div>{{dataForm.allDeptNames}}</div>
</el-form-item>
<el-form-item label="网络职责"
prop="dutyCategoryId">
@ -117,7 +123,7 @@ export default {
dutyCategoryId: '',
showFlag: '',
remark: '',
allDeptIds: ''
selectedDeptIds: []
},
sexFlagArr: [
{ dictValue: '1', dictName: '男' },
@ -144,7 +150,7 @@ export default {
dutyCategoryId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
allDeptIds: [
selectedDeptIds: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
faceImg: [
@ -167,7 +173,7 @@ export default {
if (this.dataForm.id) {
this.getInfo()
} else {
this.dataForm.allDeptIds = []
this.dataForm.selectedDeptIds = []
}
})
},

22
src/views/modules/custom/gridoperatorinfo.vue

@ -136,7 +136,10 @@ export default {
deleteIsBatch: true
},
dataForm: {
id: ''
id: '',
streetId: '',
communityId: '',
gridId: ''
},
ids: [],
options: [],
@ -154,25 +157,20 @@ export default {
},
watch: {
'ids': function (val) {
if (val.length === 0 || val.length === 1) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 2) {
this.dataForm.streetId = this.ids[1]
if (val.length == 0 || val.length == 1) {
this.dataForm.streetId = val[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 3) {
if (val.length == 2) {
this.dataForm.streetId = ''
this.dataForm.communityId = this.ids[2]
this.dataForm.communityId = val[1]
this.dataForm.gridId = ''
}
if (val.length === 4) {
if (val.length == 3) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = this.ids[3]
this.dataForm.gridId = val[2]
}
}
},

16
src/views/modules/custom/majorfunctionconf-add-or-update.vue

@ -44,6 +44,15 @@
label="1"></el-radio>
</template>
</el-form-item>
<el-form-item label="需要拼接token"
prop="tokenFlag">
<template>
<el-radio v-model="dataForm.tokenFlag"
label="0"></el-radio>
<el-radio v-model="dataForm.tokenFlag"
label="1"></el-radio>
</template>
</el-form-item>
<el-form-item label="是否访问外链"
prop="externalFlag">
<template>
@ -108,7 +117,8 @@ export default {
createdTime: '',
updatedBy: '',
updatedTime: '',
imgUrl: ''
imgUrl: '',
tokenFlag: '0'
},
codeList: [],
uploadUrl: '',
@ -148,10 +158,10 @@ export default {
createdTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
updatedBy: [
tokenFlag: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
updatedTime: [
imgUrl: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}

316
src/views/modules/user/alluser.vue

@ -0,0 +1,316 @@
<template>
<el-card shadow="never"
class="aui-card--fill">
<div class="mod-epdc__user}">
<el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="昵称">
<el-input v-model="dataForm.nickname"
placeholder="请输入"
clearable></el-input>
</el-form-item>
<el-form-item label="姓名">
<el-input v-model="dataForm.realName"
placeholder="请输入"
clearable></el-input>
</el-form-item>
<el-form-item label="手机号">
<el-input v-model="dataForm.mobile"
placeholder="请输入"
clearable></el-input>
</el-form-item>
<el-form-item label="身份证号">
<el-input v-model="dataForm.identityNo"
placeholder="请输入"
clearable></el-input>
</el-form-item>
<div class="block">
<span class="demonstration">注册时间</span>&nbsp;&nbsp;
<el-date-picker @change='setRegistTime'
v-model="time"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"></el-date-picker>&nbsp;
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
</div>
</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="nickname"
label="昵称"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="faceImg"
label="微信头像"
header-align="center"
align="center">
<template slot-scope="scope">
<img :src="scope.row.faceImg"
width="40"
height="40" />
</template>
</el-table-column>
<el-table-column prop="realName"
label="真实姓名"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="mobile"
label="手机号"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="identityNo"
label="身份证号"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="state"
label="用户认证状态"
header-align="center"
:formatter="formatState"
align="center"></el-table-column>
<el-table-column prop="partyFlag"
label="用户党员状态"
header-align="center"
:formatter="formatPartyFlag"
align="center"></el-table-column>
<el-table-column prop="registerTime"
label="用户认证时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"
label="用户注册时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="address"
label="居住地址"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="allDeptNames"
label="居住网格"
header-align="center"
align="center"></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>
<user-detail v-if="userDetailVisible"
ref="userDetail"
@refreshDataList="getDataList"></user-detail>
<user-grid v-if="userGridVisible"
ref="userGrid"
@refreshDataList="getDataList"></user-grid>
</div>
</el-card>
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './user-add-or-update'
import UserDetail from './user-detail'
import UserGrid from './user-grid'
export default {
mixins: [mixinViewModule],
data () {
return {
mixinViewModuleOptions: {
getDataListURL: 'app-user/user/alluserpage',
getDataListIsPage: true,
deleteURL: '/app-use/user',
deleteIsBatch: true,
exportURL: '/app-user/user/export'
},
dataForm: {
id: '',
nickname: '',
identityNo: '',
gridId: '',
realName: '',
mobile: '',
startTime: '',
endTime: '',
},
deptIdList: [],
options: [],
userDetailVisible: false,
userGridVisible: false,
streetOptions: [],
communityOptions: [],
gridOptions: [],
time: '',
tabFlag: '3',
state: '未认证用户',
partyFlagOptions: [{ id: '1', name: '是' }, { id: '0', name: '否' }]
}
},
created () {
// this.getStreetList()
// this.$http
// .get(`/sys/user/deptOptions/getByLoginUser`)
// .then(({ data: res }) => {
// if (res.code !== 0) {
// return this.$message.error(res.msg)
// }
// this.options = res.data.options
// })
// .catch(() => { })
},
watch: {
'deptIdList': function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 1) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 2) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = this.deptIdList[1]
this.dataForm.gridId = ''
}
if (val.length === 3) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = this.deptIdList[1]
this.dataForm.gridId = this.deptIdList[2]
}
}
},
methods: {
getStreetList () {
this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.streetOptions = res.data
}).catch(() => { })
},
getCommunityList () {
this.communityOptions = this.gridOptions = []
this.dataForm.communityId = this.dataForm.gridId = null
if (this.dataForm.streetId) {
this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.communityOptions = res.data
}).catch(() => { })
}
},
getGridList () {
this.gridOptions = []
this.dataForm.gridId = null
if (this.dataForm.communityId) {
this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.gridOptions = res.data
}).catch(() => { })
}
},
setRegistTime () {
this.dataForm.startTime = this.time[0]
this.dataForm.endTime = this.time[1]
},
formatState: function (row, column) {
let state = row.state
if (state === '1') {
return '待审核'
} else if (state === '2') {
return '审核不通过'
} else if (state === '3') {
return '审核通过'
} else if (state === '0') {
return '已注册'
}
},
formatPartyFlag: function (row, column) {
return row.partyFlag === '1' ? '是' : row.state === '0' ? '未知' : '否'
},
formatState: function (row, column) {
if (row.state == 0) {
return '已注册'
} else if (row.state == 1) {
return '已完善信息待审核'
} else if (row.state == 2) {
return '信息审核不通过'
} else if (row.state == 3) {
return '信息审核通过'
}
},
//
getDataList () {
if (this.time === null) {
this.dataForm.startTime = ''
this.dataForm.endTime = ''
}
this.dataListLoading = true
this.$http.get(
this.mixinViewModuleOptions.getDataListURL,
{
params: {
order: this.order,
orderField: this.orderField,
page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
...this.dataForm
}
}
).then(({ data: res }) => {
this.dataListLoading = false
if (res.code !== 0) {
this.dataList = []
this.total = 0
return this.$message.error(res.msg)
}
this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
}).catch(() => {
this.dataListLoading = false
})
},
userDetailHandle (userId) {
this.userDetailVisible = true
this.$nextTick(() => {
this.$refs.userDetail.dataForm.id = userId
this.$refs.userDetail.init()
})
},
//
userGridHandle (userId) {
this.userGridVisible = true
this.$nextTick(() => {
this.$refs.userGrid.dataForm.id = userId
this.$refs.userGrid.init()
})
}
},
components: {
AddOrUpdate,
UserDetail,
UserGrid
}
}
</script>

2
src/views/modules/user/fail-authentication.vue

@ -156,7 +156,7 @@ export default {
data () {
return {
mixinViewModuleOptions: {
getDataListURL: 'app-user/user/page',
getDataListURL: 'app-user/user/authenticatedpage',
getDataListIsPage: true,
deleteURL: '/app-use/user',
deleteIsBatch: true,

2
src/views/modules/user/pass-authentication.vue

@ -153,7 +153,7 @@ export default {
data () {
return {
mixinViewModuleOptions: {
getDataListURL: 'app-user/user/page',
getDataListURL: 'app-user/user/authenticatedpage',
getDataListIsPage: true,
deleteURL: '/app-use/user',
deleteIsBatch: true,

15
src/views/modules/user/user-add-or-update.vue

@ -18,8 +18,7 @@
<span>{{dataForm.mobile}}</span>
</el-form-item>
<el-form-item label="身份证号"
prop="identityNo"
v-if="false">
prop="identityNo">
<span>{{dataForm.identityNo}}</span>
</el-form-item>
<el-form-item label="认证历史"
@ -27,7 +26,9 @@
v-if="true">
<span>累计提交认证{{dataForm.totalSubmitNum}}&nbsp;&nbsp;&nbsp;通过{{dataForm.totalPassSubmitNum}},&nbsp;不通过{{dataForm.totalFailNum}}</span>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<el-button type="text" size="small" @click="userAuthenticateHistoryListHandle(dataForm.id)">查看详情</el-button>
<el-button type="text"
size="small"
@click="userAuthenticateHistoryListHandle(dataForm.id)">查看详情</el-button>
</el-form-item>
<el-form-item label="居住网格"
prop="allDeptNames">
@ -93,9 +94,10 @@
</el-table-column> -->
<el-table-column prop="allDeptNames"
label="街道-社区-网格">
</el-table-column>
</el-table-column>
<el-table-column prop="grid"
label="网格名称" v-if="false">
label="网格名称"
v-if="false">
</el-table-column>
<el-table-column prop="leaderFlag"
label="是否为网格长"
@ -117,7 +119,8 @@
<el-button type="primary"
@click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
</template>
<authenticate-history v-if="authenticateHistoryVisible" ref="authenticateHistory"></authenticate-history>
<authenticate-history v-if="authenticateHistoryVisible"
ref="authenticateHistory"></authenticate-history>
</el-dialog>
</template>

8
src/views/modules/user/wait-authentication.vue

@ -57,7 +57,7 @@
placeholder="请输入"
clearable></el-input>
</el-form-item>
<!-- <div class="block"> -->
<br>
<span class="demonstration">注册时间</span>&nbsp;&nbsp;
<el-date-picker @change='setRegistTime'
v-model="time"
@ -95,6 +95,10 @@
label="手机号"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="identityNo"
label="身份证号"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"
label="注册时间"
header-align="center"
@ -142,7 +146,7 @@ export default {
data () {
return {
mixinViewModuleOptions: {
getDataListURL: 'app-user/user/page',
getDataListURL: 'app-user/user/authenticatedpage',
getDataListIsPage: true,
deleteURL: '/app-use/user',
deleteIsBatch: true,

Loading…
Cancel
Save