Browse Source

合并更改冲突

shibei_master
dai 4 years ago
parent
commit
c3817f122d
  1. 2
      src/assets/scss/modules/visual/basicInfoMain.scss
  2. 1
      src/views/main.vue
  3. 2
      src/views/modules/base/resi.vue
  4. 612
      src/views/modules/communityParty/elegant/index.vue
  5. 1152
      src/views/modules/communityService/measure/index.vue
  6. 262
      src/views/modules/visual/basicinfo/basicInfoCommunity.vue
  7. 2
      src/views/modules/visual/basicinfo/basicInfoMain.vue
  8. 11
      src/views/modules/visual/basicinfo/peopleSearch.vue
  9. 4
      src/views/modules/workSys/demandCate.vue
  10. 2
      src/views/modules/workSys/resiCate.vue

2
src/assets/scss/modules/visual/basicInfoMain.scss

@ -37,7 +37,7 @@
width: 100%;
// padding: 10px 5px 13px;
// margin-top: 8px;
height: calc(88vh);
height: calc(88vh - 5px);
color: #fff;
// background: url('../../../img/modules/visual/warning-box.png') no-repeat
// center;

1
src/views/main.vue

@ -166,6 +166,7 @@ export default {
params,
(data, rspMsg) => {
this.$store.state.user = { ...data }
console.log('user---hahha', this.$store.state.user)
// this.$store.state.user.id = data.id
// this.$store.state.user.realName = data.realName
// this.$store.state.user.superAdmin = data.superAdmin

2
src/views/modules/base/resi.vue

@ -867,7 +867,7 @@ export default {
::v-deep .el-table th {
color: #fff;
background-color: rgba(33, 149, 254, 1);
border-right: 1px solid rgba(33, 149, 254, 1);;
// border-right: 1px solid rgba(33, 149, 254, 1);
}
}
.resi-table {

612
src/views/modules/communityParty/elegant/index.vue

@ -0,0 +1,612 @@
<template>
<div v-if="pageLoading" class="resi-container">
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-form ref="searchForm" :inline="true" :model="searchForm" class="demo-form-inline">
<el-form-item label="所属网格">
<el-select v-model="searchForm.gridId" filterable placeholder="请选择" clearable>
<el-option
v-for="item in demandOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="党员姓名">
<el-select v-model="searchForm.name" filterable placeholder="请选择" clearable>
<el-option
v-for="item in demandOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="主要事迹">
<el-input v-model="searchForm.mainDeed" placeholder="请输入" class="input-width" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button @click="resetForm('searchForm')">重置</el-button>
</el-form-item>
</el-form>
</div>
<div class="resi-row-btn">
<el-button type="success" @click="handleAdd">新增</el-button>
<el-button type="warning" size="small" @click="handleExport">导出</el-button>
<el-upload
ref="upload"
class="upload-demo"
action="uploadUlr"
:limit="1"
:with-credentials="true"
:show-file-list="false"
:auto-upload="true"
:on-progress="handleProgress"
:on-success="handleExcelSuccess"
:before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest"
>
<el-button type="danger" :loading="importLoading">{{importBtnTitle}}</el-button>
</el-upload>
</div>
<el-table
:data="tableData"
row-key="categoryId"
v-loading="tableLoading"
border
max-height="800"
style="width: 100%"
class="resi-table"
>
<el-table-column label="序号" type="index" align="center" width="50">
</el-table-column>
<el-table-column
v-for="item in tableHeader"
:key="item.columnName"
:prop="item.columnName"
:label="item.label"
:align="item.align"
:width="item.width"
>
<template slot-scope="scope">
<span>{{ handleFilterSpan(scope.row, item) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="200">
<template slot-scope="scope">
<el-button
@click="handleLook(scope.row)"
type="text"
size="small"
class="btn-color-look"
>查看</el-button
>
<el-button
@click="handleEdit(scope.row, 'edit')"
type="text"
size="small"
class="btn-color-edit"
>编辑</el-button
>
<el-popconfirm
title="删除之后无法恢复,确认删除?"
@onConfirm="handleDel(scope.row)"
>
<el-button
slot="reference"
type="text"
size="small"
class="btn-color-del"
>删除</el-button
>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
:page-sizes="[20, 50, 100, 200]"
:page-size="pageSize"
layout="sizes, prev, pager, next"
:total="total"
>
</el-pagination>
</div>
</el-card>
<el-dialog
title="居民需求分类"
:visible.sync="dialogVisible"
width="40%"
append-to-body
:close-on-click-modal="false"
:before-close="handlerCancle"
>
<el-form label-width="100px" :model="form" :rules="rules" ref="ruleForm" class="form-wr">
<el-form-item label="所属网格" prop="gridId">
<el-select v-model="form.gridId" filterable placeholder="请选择" class="input-width" clearable>
<el-option
v-for="item in demandOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="党员姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入" class="input-width" clearable></el-input>
</el-form-item>
<el-form-item label="主要事迹" prop="mainDeed">
<el-input v-model="form.mainDeed" :autosize="{ minRows: 2, maxRows: 10}" type="textarea" clearable class="input-width-textarea" placeholder="请输入内容"></el-input>
</el-form-item>
<!-- <el-form-item label="状态">
<el-switch v-model="form.usableFlag"></el-switch>
</el-form-item> -->
<el-form-item label="照片">
<el-input-number v-model="form.awardPoint" :min="0" size="small" label="描述文字"></el-input-number>
</el-form-item>
</el-form>
<div class="resi-btns">
<el-button size="small" @click="handlerCancle">取消</el-button>
<el-button
type="primary"
size="small"
:loading="btnLoading"
@click="handleSUbmit"
>提交</el-button
>
</div>
</el-dialog>
</div>
</template>
<script>
import axios from 'axios'
export default {
data() {
return {
importBtnTitle: '导入人员数据',
importLoading: false,
tableLoading: false,
btnLoading: false,
disabled: false,
pageLoading: false,
dialogVisible: false,
currentPage: 1,
pageSize: 20,
total: null,
tableData: [],
addLevel: '1',
addType: 'add',
value: '',
options: [
{
label: '是',
value: 1
},{
label: '否',
value: 2
}
],
demandOptions: [],
tableHeader: [
{
label: '党员姓名',
columnName: 'name',
align: 'center',
width: '160',
options: []
}, {
label: '所属网格',
align: 'center',
columnName: 'gridName',
width: '300',
options: []
}, {
label: '主要事迹',
columnName: 'mainDeed',
align: 'center',
width: '',
options: []
}
],
customerId: '',
searchForm: {
gridId: '',
agencyId: '',
mainDeed: '',
name: ''
},
form: {
agencyId: '',
gridId: '',
name: '',
mainDeed: '',
imageList: []
},
rules: {
categoryName: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }]
}
}
},
async created() {
this.customerId = localStorage.getItem('customerId')
this.getTableData()
this.getOptions()
this.pageLoading = true
},
mounted() {
},
methods: {
handleSizeChange(val) {
console.log(`每页 ${val}`)
this.pageSize = val
this.getTableData()
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`)
this.currentPage = val
this.getTableData()
},
handleFilterSpan(row, item) {
let _val = ''
if (item.options && item.options.length > 0) {
item.options.forEach((n) => {
if (n.value === row[item.columnName]) _val = n.label
})
}
return _val || row[item.columnName]
},
//
handleExcelSuccess (res, file) {
if (res.code === 0 && res.msg === 'success') {
console.log('resss---ppp', res)
} else {
this.$message.error(res.msg)
}
},
handleProgress(event, file, fileList) {
console.log('percentage', file.percentage)
},
beforeExcelUpload (file) {
console.log('file', file)
const isType = file.type === 'application/vnd.ms-excel'
const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
const fileType = isType || isTypeComputer
const isLt1M = (file.size / 1024 / 1024) < 10
if(!fileType) {
this.$message.error('上传文件只能是xls/xlsx格式!')
}
// if (!isLt1M) {
// this.$message.error(' 10MB!')
// }
return fileType
},
uploadHttpRequest(file) {
this.importLoading = true
this.importBtnTitle = '正在上传中...'
const formData = new FormData() //FormDataappend('key', value)
formData.append('file', file.file) //
axios({
url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/import',
method: 'post',
data: formData,
responseType: 'blob'
})
.then((res) => {
this.importLoading = false
this.importBtnTitle = '导入人员数据'
let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
console.log('filename', fileName)
let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
var url = window.URL.createObjectURL(blob)
var aLink = document.createElement('a')
aLink.style.display = 'none'
aLink.href = url
aLink.setAttribute('download', fileName)
document.body.appendChild(aLink)
aLink.click()
document.body.removeChild(aLink) //
window.URL.revokeObjectURL(url) //blob
this.getTableData()
})
.catch( err => {
console.log('失败', err)
param.onError() //
})
},
handleExport() {
let params = {
formCode: 'resi_base_info',
conditions: this.conditions
}
// .post('epmetuser/icresiuser/exportExcel', params)
axios({
url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/export',
// url: 'epmetuser/icresiuser/exportExcel',
method: 'post',
data: params,
responseType: 'blob'
})
.then(res => {
console.log('resllll', res)
let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
console.log('filename', fileName)
let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
var url = window.URL.createObjectURL(blob)
var aLink = document.createElement('a')
aLink.style.display = 'none'
aLink.href = url
aLink.setAttribute('download', fileName)
document.body.appendChild(aLink)
aLink.click()
document.body.removeChild(aLink) //
window.URL.revokeObjectURL(url) //blob
})
.catch((err) => {
console.log('获取导出情失败', err)
return this.$message.error('网络错误')
})
},
handleSearch(val) {
console.log('searchhh--', val)
this.currentPage = 1
this.getTableData()
},
resetForm(formName) {
this.$refs[formName].resetFields()
},
handleAdd() {
this.dialogVisible = true
},
handlerCancle() {
this.dialogVisible = false
},
async handleLook(row) {
const params = {
categoryId: row.categoryId,
usableFlag: !row.usableFlag
}
this.$http
.post('/heart/icresidemanddict/updatestatus', params)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
this.getTableData()
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
async handleEdit(row, addType) {
this.form = { ...row }
this.dialogVisible = true
},
async addNew() {
const _form = {
...this.form
}
await this.$http
.post('/resi/partymember/icpartymemberstyle/save', _form)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
this.dialogVisible = false
this.getTableData()
}
})
.catch(() => {
return this.$message.error('网络错误')
})
this.btnLoading = false
},
handleSUbmit() {
this.$refs.ruleForm.validate(async (valid) => {
if (valid) {
this.btnLoading = true
this.addNew()
} else {
console.log('error submit!!');
return false;
}
});
},
handleDel(row) {
let params = {
id: row.id
}
console.log('row1', row)
this.$http
.post('/resi/partymember/icpartymemberstyle/delete', params)
.then(({ data: res }) => {
console.log('row2', row)
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('row3', row)
this.$message.success('删除成功')
this.getTableData()
}
})
.catch((err) => {
console.log('row4', err)
return this.$message.error('网络错误')
})
},
sortData() {
const _data = this.tableData.map((item, index)=> {
return {
id: item.id,
sort: index
}
})
this.$http
.post('/oper/customize/resicategorystatsconfig/updatesort', _data)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
// this.getTableData()
}
})
.catch((err) => {
console.log('row4', err)
return this.$message.error('网络错误')
})
},
async getOptions() {
const params = {
parentCategoryCode: 0
}
this.$http
.post('/heart/icresidemanddict/subcodelist', params)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
this.demandOptions = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
async getTableData() {
this.tableLoading = true
let params = {
// formCode: 'resi_base_info',
...this.searchForm,
pageNo: this.currentPage,
pageSize: this.pageSize
}
await this.$http
.post('/resi/partymember/icpartymemberstyle/list', params)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
this.tableData = res.data.list
this.total = res.data.total
}
})
.catch(() => {
return this.$message.error('网络错误')
})
this.tableLoading = false
}
}
}
</script>
<style lang="scss" scoped>
.resi-container .resi-card-table {
::v-deep .el-table th {
color: #fff;
background-color: rgba(33, 149, 254, 1);
// border-right: 1px solid rgba(33, 149, 254, 1);
}
}
.resi-table {
::v-deep .el-button--text {
text-decoration: underline;
}
::v-deep .btn-color-del {
margin-left: 10px;
color: rgba(213, 16, 16, 1);
}
::v-deep .btn-color-edit {
color: rgba(0, 167, 169, 1);
}
}
.form-wr {
.input-width {
width: 260px;
}
.input-width-textarea {
width: 400px;
}
}
</style>
<style lang="scss" scoped>
.resi-row-btn {
display: flex;
margin-bottom: 13px;
::v-deep .el-button {
// margin-left: 10px;
border: 0;
}
::v-deep .el-select {
margin-right: 10px;
}
.el-button--success {
background: rgba(34, 193, 195, 1);
}
.el-button {
margin-left: 10px;
border: 0;
}
.el-button--success {
background: rgba(34, 193, 195, 1);
}
.el-button--warning {
background: rgba(254, 179, 73, 1);
}
.el-button--danger {
background: rgba(254, 98, 82, 1);
}
}
.avatar-uploader {
::v-deep
.el-upload {
cursor: pointer;
position: relative;
overflow: hidden;
}
.el-upload:hover {
border-color: #409EFF;
}
.avatar {
width: 70px;
height: 70px;
display: block;
}
.avatar-uploader-icon {
border: 1px dashed #d9d9d9;
border-radius: 6px;
font-size: 28px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
}
.resi-btns {
margin-top: 20px;
text-align: center;
}
</style>

1152
src/views/modules/communityService/measure/index.vue

File diff suppressed because it is too large

262
src/views/modules/visual/basicinfo/basicInfoCommunity.vue

@ -95,264 +95,7 @@ export default {
selBuildingName: '',
roomLoaded: false,
roomArray: [
{
houseId: "1",
houseName: "101室",
categoryList: [
{
name: '党员',
iconUrl: require('../../../../assets/img/shuju/dangyuan.png'),
isSpecial: '1',
},
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "2",
houseName: "102室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
},
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
},
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
},
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "3",
houseName: "103室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "4",
houseName: "104室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "5",
houseName: "105室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "6",
houseName: "106室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
}, {
houseId: "1",
houseName: "101室",
categoryList: [
{
name: '党员',
iconUrl: require('../../../../assets/img/shuju/dangyuan.png'),
isSpecial: '1',
},
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "2",
houseName: "102室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
},
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
},
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
},
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "3",
houseName: "103室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "4",
houseName: "104室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "5",
houseName: "105室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "6",
houseName: "106室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
}, {
houseId: "1",
houseName: "101室",
categoryList: [
{
name: '党员',
iconUrl: require('../../../../assets/img/shuju/dangyuan.png'),
isSpecial: '1',
},
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "2",
houseName: "102室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
},
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
},
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
},
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "3",
houseName: "103室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "4",
houseName: "104室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "5",
houseName: "105室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
},
{
houseId: "6",
houseName: "106室",
categoryList: [
{
name: '低保',
iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
isSpecial: '0',
}
]
}
],
roomArray: [],
selHouseId: '',
selHouseName: '',
selHouseIndex: 0,
@ -414,6 +157,7 @@ export default {
//
async handleShowAllUser (selIndex) {
// this.startLoading()
await this.loadUser(this.roomArray[selIndex].houseId, selIndex)
this.roomArray.forEach((element, index) => {
let obj = JSON.parse(JSON.stringify(element))
@ -422,7 +166,7 @@ export default {
obj.showAllUser = !obj.showAllUser
this.$set(this.roomArray, selIndex, obj)
this.loadUser(element.houseId, selIndex)
} else {
obj.showAllUser = false
this.$set(this.roomArray, index, obj)

2
src/views/modules/visual/basicinfo/basicInfoMain.vue

@ -316,7 +316,7 @@ const vueGis = {
name: '搜索'
}
this.$nextTick(() => {
this.$refs.ref_search.loadList();
this.$refs.ref_search.reset();
});
} else {

11
src/views/modules/visual/basicinfo/peopleSearch.vue

@ -97,7 +97,10 @@ export default {
}
},
reset () {
this.searchName = ''
this.tableData = []
},
async loadList () {
if (this.searchName) {
const url = "/epmetuser/icresiuser/searchbyname"
@ -130,7 +133,11 @@ export default {
this.pageNo = val
this.loadList()
},
}
},
destroyed () {
console.log("我已经离开了!");
},
};
</script>

4
src/views/modules/workSys/demandCate.vue

@ -122,8 +122,6 @@
</template>
<script>
import axios from 'axios'
import Sortable from 'sortablejs'
export default {
data() {
return {
@ -433,7 +431,7 @@ export default {
::v-deep .el-table th {
color: #fff;
background-color: rgba(33, 149, 254, 1);
border-right: 1px solid rgba(33, 149, 254, 1);;
// border-right: 1px solid rgba(33, 149, 254, 1);
}
}
.resi-table {

2
src/views/modules/workSys/resiCate.vue

@ -519,7 +519,7 @@ export default {
::v-deep .el-table th {
color: #fff;
background-color: rgba(33, 149, 254, 1);
border-right: 1px solid rgba(33, 149, 254, 1);;
// border-right: 1px solid rgba(33, 149, 254, 1);;
}
}
.resi-table {

Loading…
Cancel
Save