Browse Source

Merge branch 'dev-jichu' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-jichu

shibei_prod
13176889840 4 years ago
parent
commit
c2f3d06cfa
  1. BIN
      src/assets/img/staff-default-avatar.png
  2. 2
      src/assets/scss/modules/visual/basicInfoMain.scss
  3. 4
      src/views/main-navbar.vue
  4. 8
      src/views/main-shuju/main-navbar.vue
  5. 2
      src/views/modules/base/community/buildTable.vue
  6. 2
      src/views/modules/base/community/communityTable.vue
  7. 2
      src/views/modules/base/community/roomTable.vue
  8. 10
      src/views/modules/communityParty/regionalParty/units.vue
  9. 8
      src/views/modules/communityParty/regionalParty/unitsForm.vue
  10. 334
      src/views/modules/communityService/ninePlaces/places/places.vue
  11. 394
      src/views/modules/communityService/ninePlaces/places/placesForm.vue
  12. 390
      src/views/modules/communityService/ninePlaces/team/team.vue
  13. 440
      src/views/modules/communityService/ninePlaces/team/teamForm.vue
  14. 544
      src/views/modules/communityService/shzz/cpts/edit.vue
  15. 551
      src/views/modules/communityService/shzz/index.vue
  16. 262
      src/views/modules/visual/basicinfo/basicInfoCommunity.vue
  17. 2
      src/views/modules/visual/basicinfo/basicInfoMain.vue
  18. 1
      src/views/modules/visual/basicinfo/people.vue
  19. 11
      src/views/modules/visual/basicinfo/peopleSearch.vue
  20. 366
      src/views/modules/visual/warning/components/screen-table/index.vue

BIN
src/assets/img/staff-default-avatar.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

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;

4
src/views/main-navbar.vue

@ -8,10 +8,10 @@
<div class="aui-navbar__header">
<h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })">
<a class="aui-navbar__brand-lg" href="javascript:;">{{
userType === 'work' ? customerName : $t('brand.lg')
customerName
}}</a>
<a class="aui-navbar__brand-mini" href="javascript:;">{{
$t('brand.mini')
customerName.slice(0, 2)
}}</a>
</h1>
</div>

8
src/views/main-shuju/main-navbar.vue

@ -10,7 +10,7 @@
userType === 'work' ? customerName : $t('brand.lg')
}}</a>
<a class="navbar__brand-mini" href="javascript:;">{{
$t('brand.mini')
customerName.slice(0, 2)
}}</a>
</h1>
</div>
@ -94,11 +94,7 @@
<el-menu-item index="4" class="navbar__avatar">
<el-dropdown placement="bottom" :show-timeout="0">
<span class="el-dropdown-link">
<img
v-if="$store.state.user.gender === '2'"
src="~@/assets/img/staff-default-avatar-girl.png"
/>
<img v-else src="~@/assets/img/staff-default-avatar-boy.png" />
<img src="~@/assets/img/staff-default-avatar.png" />
<span>{{ $store.state.user.realName }}</span>
<i class="el-icon-arrow-down"></i>
</span>

2
src/views/modules/base/community/buildTable.vue

@ -118,7 +118,7 @@
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[10, 20, 50]"
:page-sizes="[20, 50, 100, 200]"
:page-size="pageSize"
layout="sizes, prev, pager, next, total"
:total="total">

2
src/views/modules/base/community/communityTable.vue

@ -119,7 +119,7 @@
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[10, 20, 50]"
:page-sizes="[20, 50, 100, 200]"
:page-size="pageSize"
layout="sizes, prev, pager, next, total"
:total="total">

2
src/views/modules/base/community/roomTable.vue

@ -129,7 +129,7 @@
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[10, 20, 50]"
:page-sizes="[20, 50, 100, 200]"
:page-size="pageSize"
layout="sizes, prev, pager, next, total"
:total="total">

10
src/views/modules/communityParty/regionalParty/units.vue

@ -151,7 +151,7 @@
label="分类"
width="180">
</el-table-column>
<el-table-column prop="serviceMatter"
<el-table-column prop="serviceMatterShow"
header-align="center"
align="center"
label="服务事项"
@ -404,6 +404,14 @@ export default {
if (code === 0) {
this.total = data.total
this.tableData = data.list
this.tableData.forEach(item => {
item.serviceMatterShow = ''
if (item.serviceMatterList.length > 0) {
item.serviceMatterShow = item.serviceMatterList.jone('')
}
});
} else {
this.$message.error(msg)
}

8
src/views/modules/communityParty/regionalParty/unitsForm.vue

@ -54,12 +54,12 @@
</el-form-item>
<el-form-item label="服务事项"
prop="serviceMatter"
prop="serviceMatterList"
label-width="150px"
style="display: block">
<el-checkbox-group class="item_width_1"
style="display:flex;flex-wrap:wrap"
v-model="formData.serviceMatter">
v-model="formData.serviceMatterList">
<el-checkbox v-for="item in serviceList"
:key="item.value"
:label="item.value">{{item.label}}</el-checkbox>
@ -197,7 +197,7 @@ export default {
formData: {
gridId: '',
unitName: '',
serviceMatter: [],
serviceMatterList: [],
type: '',
contact: '',
contactMobile: '',
@ -429,7 +429,7 @@ export default {
this.formData = {
gridId: '',
unitName: '',
serviceMatter: [],
serviceMatterList: [],
type: '',
contact: '',
contactMobile: '',

334
src/views/modules/communityService/ninePlaces/places/places.vue

@ -6,7 +6,30 @@
ref="ref_searchform"
:label-width="'100px'">
<div>
<el-form-item label="所属网格"
<el-form-item label="场所名称"
prop="placeOrgName">
<el-input v-model="formData.placeOrgName"
class="item_width_1"
size="small"
clearable
placeholder="请输入九小场所名称">
</el-input>
</el-form-item>
<el-form-item label="联系电话"
prop="mobile">
<el-input v-model="formData.mobile"
class="item_width_1"
size="small"
clearable
placeholder="请输入电话">
</el-input>
</el-form-item>
<el-form-item label="场所区域"
prop="gridId">
<el-select class="item_width_1"
v-model="formData.gridId"
@ -20,20 +43,13 @@
</el-select>
</el-form-item>
<el-form-item label="单位名称"
prop="unitName">
<el-input v-model="formData.unitName"
class="item_width_1"
size="small"
clearable
placeholder="请输入内容">
</el-input>
</el-form-item>
<el-form-item label="服务事项"
prop="serviceMatter">
</div>
<div>
<el-form-item label="规模"
prop="scale">
<el-select class="item_width_1"
v-model="formData.serviceMatter"
v-model="formData.scale"
placeholder="请选择"
clearable>
<el-option v-for="item in scaleList"
@ -44,12 +60,10 @@
</el-select>
</el-form-item>
</div>
<div>
<el-form-item label="分类"
prop="type">
<el-form-item label="场所类型"
prop="ninePlacsVal">
<el-select class="item_width_1"
v-model="formData.type"
v-model="formData.ninePlacsVal"
placeholder="请选择"
clearable>
<el-option v-for="item in placeTypeList"
@ -59,27 +73,6 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="联系人"
prop="contact">
<el-input v-model="formData.contact"
class="item_width_1"
size="small"
clearable
placeholder="请输入内容">
</el-input>
</el-form-item>
<el-form-item label="联系电话"
prop="contactMobile">
<el-input v-model="formData.contactMobile"
class="item_width_1"
size="small"
clearable
placeholder="请输入内容">
</el-input>
</el-form-item>
<el-button style="margin-left:10px"
@ -94,32 +87,9 @@
</el-form>
</div>
<div class="div_table">
<div class="div_btn">
<el-button style="float:left"
type="green"
size="small"
@click="handleAdd">新增</el-button>
<el-upload ref="upload"
:multiple='false'
:show-file-list='false'
:before-upload="beforeUpload"
action=""
accept=".xls,.xlsx"
:limit="1"
:on-exceed="handleExceed"
:http-request="uploadFile">
<el-button style="margin-left:10px"
size="small"
type="red">导入</el-button>
<el-button style="float:left"
type="yellow"
size="small"
@click="handleExport">导出</el-button>
</el-upload>
</div>
<el-button type="green"
size="small"
@click="handleAdd">新增</el-button>
<el-table class="table"
:data="tableData"
@ -133,61 +103,43 @@
align="center"
type="index"
width="50"></el-table-column>
<el-table-column prop="gridName"
<el-table-column prop="placeOrgName"
header-align="center"
align="center"
label="所属网格"
width="180">
label="场所名称"
min-width="280">
</el-table-column>
<el-table-column prop="unitName"
<el-table-column prop="address"
header-align="center"
align="center"
label="单位名称"
width="180">
label="场所地址"
min-width="280">
</el-table-column>
<el-table-column prop="type"
<el-table-column prop="ninePlaceName"
header-align="center"
align="center"
label="分类"
width="180">
label="场所类型"
min-width="180">
</el-table-column>
<el-table-column prop="serviceMatter"
<el-table-column prop="scale"
header-align="center"
align="center"
label="服务事项"
width="180">
label="规模"
min-width="180">
</el-table-column>
<el-table-column prop="contact"
<el-table-column prop="personInCharge"
header-align="center"
align="center"
label="联系人"
width="100">
label="负责人"
min-width="100">
</el-table-column>
<el-table-column prop="contactMobile"
<el-table-column prop="mobile"
header-align="center"
align="center"
label="联系电话"
width="110">
</el-table-column>
<el-table-column prop="memberCount"
header-align="center"
align="center"
label="在职党员数"
width="150">
</el-table-column>
<el-table-column prop="satisfaction"
header-align="center"
align="center"
label="群众满意度"
width="150">
</el-table-column>
<el-table-column prop="remark"
header-align="center"
align="center"
label="备注"
:show-overflow-tooltip="true"
width="150">
min-width="110">
</el-table-column>
<el-table-column label="操作"
fixed="right"
width="140"
@ -196,10 +148,6 @@
class="operate">
<template slot-scope="scope">
<el-button type="text"
style="color:#1C6AFD;text-decoration: underline;"
size="small"
@click="handleDetail(scope.row)">查看</el-button>
<el-button type="text"
style="color:#00A7A9;text-decoration: underline;"
size="small"
@ -216,7 +164,7 @@
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[10, 20, 50]"
:page-sizes="[20, 50, 100, 200]"
:page-size="pageSize"
layout="sizes, prev, pager, next, total"
:total="total">
@ -266,25 +214,20 @@ export default {
scaleList: [],//list
placeTypeList: [],//list
unitId: '',
formData: {
gridId: '',
unitName: '',
serviceMatter: '',
type: '',
contact: '',
contactMobile: ''
placeOrgName: '',//
mobile: '',//
scale: '',// 0:10 1:10-20 2:21-40 3:41-100 4:100
gridId: '',//Id
ninePlacsVal: '',//Value
isPage: true,//(:true :false)
},
tableData: [],
//form
formShow: false,
formTitle: '新增单位',
files: "",
fileName: "",
uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import'
formTitle: '新增场所',
}
},
@ -295,11 +238,11 @@ export default {
},
async mounted () {
//
await this.loadService()
//
await this.loadScale()
//
await this.loadType()
//
await this.loadPlaceType()
const { user } = this.$store.state
this.agencyId = user.agencyId
@ -332,13 +275,12 @@ export default {
},
//
async loadService () {
// const url = "/heart/icresidemanddict/subcodelist"
const url = "http://yapi.elinkservice.cn/mock/245/heart/icresidemanddict/subcodelist"
//
async loadScale () {
const url = "/sys/dict/data/dictlist"
let params = {
parentCategoryCode: '1010'
dictType: 'scale'
}
const { data, code, msg } = await requestPost(url, params)
@ -351,12 +293,12 @@ export default {
}
},
//
async loadType () {
//
async loadPlaceType () {
const url = "/sys/dict/data/dictlist"
let params = {
dictType: 'party_unit_type'
dictType: 'nine_small_places'
}
const { data, code, msg } = await requestPost(url, params)
@ -373,12 +315,11 @@ export default {
async loadTable () {
this.tableLoading = true
// const url = "/heart/icpartyunit/list"
const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
// const url = "/gov/org/placeorg/getlist"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
let params = {
pageSize: this.pageSize,
pageNo: this.pageNo,
agencyId: this.agencyId,
...this.formData
}
@ -420,7 +361,7 @@ export default {
this.formTitle = '修改'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('edit', row.id)
this.$refs.ref_form.initForm('edit', row.placeOrgId)
})
},
@ -441,7 +382,7 @@ export default {
type: "warning"
})
.then(() => {
this.deleteUnit(row)
this.deletePlace(row)
})
.catch(err => {
if (err == "cancel") {
@ -451,12 +392,12 @@ export default {
});
},
async deleteUnit (row) {
// const url = "/heart/icpartyunit/delete"
const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
async deletePlace (row) {
// const url = "/gov/org/placeorg/del"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/del"
let params = {
id: row.id
placeOrgId: row.placeOrgId
}
const { data, code, msg } = await requestPost(url, params)
@ -476,118 +417,15 @@ export default {
//
resetSearch () {
this.formData = {
gridId: '',
unitName: '',
serviceMatter: '',
type: '',
contact: '',
contactMobile: ''
}
},
//
async handleExport () {
let title = '联建单位列表'
const url = "/partyunit/export"
let params = {
ownerName: this.ownerName,
ownerPhone: this.ownerPhone,
level: this.agencyObj.level,
id: this.agencyObj.id
placeOrgName: '',//
mobile: '',//
scale: '',// 0:10 1:10-20 2:21-40 3:41-100 4:100
gridId: '',//Id
ninePlacsVal: '',//Value
isPage: true,//(:true :false)
}
app.ajax.exportFilePost(
url,
params,
(data, rspMsg) => {
this.download(data, title + '.xls')
},
(rspMsg, data) => {
this.$message.error(rspMsg);
}
);
},
//
download (data, fileName) {
if (!data) {
return
}
var csvData = new Blob([data])
if (window.navigator && window.navigator.msSaveOrOpenBlob) {
window.navigator.msSaveOrOpenBlob(csvData, fileName);
}
// for Non-IE (chrome, firefox etc.)
else {
var a = document.createElement('a');
document.body.appendChild(a);
a.style = 'display: none';
var url = window.URL.createObjectURL(csvData);
a.href = url;
a.download = fileName;
a.click();
a.remove();
window.URL.revokeObjectURL(url);
}
},
//
beforeUpload (file) {
this.files = file;
const isText = file.type === 'application/vnd.ms-excel'
const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
if (!isText && !isTextComputer) {
this.$message.error('请选择正确格式的文件')
return false
} else {
this.fileName = file.name;
return true
}
},
//
handleExceed (files, fileList) {
this.$message.warning(`当前限制选择 1 个文件,请删除后继续上传`)
},
async uploadFile () {
this.loading = true
if (this.fileName == "") {
this.$message.warning('请选择要上传的文件!')
return false
}
//
this.$refs['upload'].clearFiles()
var url = '/partyunit/import'
let fileFormData = new FormData();
fileFormData.append('file', this.files);//filenamefiletest.zip
const { data, code, msg } = await requestPost(url, fileFormData)
if (code === 0) {
this.$message({
type: "success",
message: "导入成功"
});
this.loadTable()
} else {
this.$message.error(msg)
}
},
handleSizeChange (val) {
this.pageSize = val

394
src/views/modules/communityService/ninePlaces/places/placesForm.vue

@ -9,7 +9,23 @@
:disabled="formType === 'detail'"
class="form">
<el-form-item label="所属网格"
<el-form-item label="场所类型"
label-width="150px"
prop="ninePlacsVal">
<el-select class="item_width_1"
v-model="formData.ninePlacsVal"
placeholder="请选择"
clearable>
<el-option v-for="item in placeTypeList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所区域"
prop="gridId"
label-width="150px"
style="display: block">
@ -25,27 +41,35 @@
</el-select>
</el-form-item>
<el-form-item label="单位名称"
prop="unitName"
<el-form-item label="场所名称"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder="请输入单位名称"
v-model="formData.unitName">
prop="placeOrgName">
<el-input v-model="formData.placeOrgName"
class="item_width_1"
clearable
placeholder="请输入九小场所名称">
</el-input>
</el-form-item>
<el-form-item label="分类"
prop="type"
<el-form-item label="场所地址"
label-width="150px"
style="display: block">
prop="address">
<el-input v-model="formData.address"
class="item_width_1"
clearable
placeholder="请输入场所地址">
</el-input>
</el-form-item>
<el-form-item label="规模"
label-width="150px"
prop="scale">
<el-select class="item_width_1"
v-model="formData.type"
v-model="formData.scale"
placeholder="请选择"
filterable
clearable>
<el-option v-for="item in typeList"
<el-option v-for="item in scaleList"
:key="item.value"
:label="item.label"
:value="item.value">
@ -53,107 +77,24 @@
</el-select>
</el-form-item>
<el-form-item label="服务事项"
prop="serviceMatter"
<el-form-item label="负责人"
label-width="150px"
style="display: block">
<el-checkbox-group class="item_width_1"
style="display:flex;flex-wrap:wrap"
v-model="formData.serviceMatter">
<el-checkbox v-for="item in serviceList"
:key="item.value"
:label="item.value">{{item.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="联系人"
prop="contact"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入联系人姓名"
v-model="formData.contact">
prop="personInCharge">
<el-input v-model="formData.personInCharge"
class="item_width_1"
clearable
placeholder="请输入负责人姓名">
</el-input>
</el-form-item>
<el-form-item label="联系电话"
prop="contactMobile"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入联系人电话"
v-model="formData.contactMobile">
</el-input>
</el-form-item>
<el-form-item label="在职党员"
style="display: block"
prop="memberCount"
label-width="150px">
<el-input-number class="item_width_1"
v-model="formData.memberCount"
:min="1"
label="单元数"></el-input-number>
</el-form-item>
<el-form-item label="备注"
prop="remark"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
show-word-limit
:rows="3"
placeholder="请输入备注,不超过500字"
v-model="formData.remark"></el-input>
</el-form-item>
<el-form-item label="位置坐标"
prop="longitude"
label-width="150px"
style="display: block">
<div style="width:500px">
<div class="div_map">
<div id="app">
</div>
<div class="div_searchmap">
<el-input class="item_width_4"
maxlength="50"
size="mini"
placeholder="请输入关键字"
v-model="keyWords">
</el-input>
<el-button style="margin-left: 10px"
type="primary"
size="mini"
@click="handleSearchMap">查询</el-button>
</div>
</div>
<div style="margin-top: 10px">
<span>经度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入经度"
v-model="formData.longitude">
</el-input>
<span style="margin-left: 20px">纬度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入纬度"
v-model="formData.latitude">
</el-input>
</div>
</div>
</el-form-item>
<el-form-item label="地理位置"
prop="address"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
v-model="formData.address">
prop="mobile">
<el-input v-model="formData.mobile"
class="item_width_1"
type='number'
clearable
placeholder="请输入电话">
</el-input>
</el-form-item>
@ -176,14 +117,6 @@ import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
var map
var search
var markers
var infoWindowList
var geocoder //
let loading //
export default {
data () {
@ -192,41 +125,33 @@ export default {
btnDisable: false,
unitId: '',
keyWords: '',
placeOrgId: '',
formData: {
gridId: '',
unitName: '',
serviceMatter: [],
type: '',
contact: '',
contactMobile: '',
memberCount: 0,
remark: '', //500
address: '', //
longitude: 36.0722275, //
latitude: 120.38945519 //
ninePlacsVal: '',
placeOrgName: '',
address: '',
scale: '',
personInCharge: '',
mobile: ''
},
}
},
components: {},
mounted () {
this.initMap()
},
methods: {
async initForm (type, unitId) {
async initForm (type, placeOrgId) {
this.$refs.ref_form.resetFields();
// debugger
// map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
this.formType = type
if (unitId) {
this.unitId = unitId
this.formData.id = unitId
if (placeOrgId) {
this.placeOrgId = placeOrgId
this.formData.placeOrgId = placeOrgId
await this.loadFormData()
}
@ -234,10 +159,10 @@ export default {
//
async loadFormData () {
// const url = '/heart/icpartyunit/detail'
const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
// const url = '/gov/org/placeorg/detail'
const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/detail'
let params = {
id: this.unitId
placeOrgId: this.placeOrgId
}
const { data, code, msg } = await requestPost(url, params)
@ -263,16 +188,16 @@ export default {
app.util.validateRule(messageObj)
this.btnDisable = false
} else {
this.addUnit()
this.addPlace()
}
})
},
async addUnit () {
async addPlace () {
// const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //
// if (regPhone.test(this.formData.contactMobile) === false) {
// if (regPhone.test(this.formData.mobile) === false) {
// this.btnDisable = false
// this.$message({
// type: 'warning',
@ -281,18 +206,23 @@ export default {
// return false;
// }
// let url = '/heart/icpartyunit/save'
let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
// if (this.formType === 'edit') {
// this.formData.id = this.unitId
// }
let url = ''
if (this.formType === 'edit') {
// url = '/gov/org/placeorg/edit'
url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/edit'
} else {
// url = "/gov/org/placeorg/add"
url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/add"
}
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
type: 'success',
message: '新增联建单位成功'
message: '操作成功'
})
this.resetData()
this.$emit('dialogOk')
@ -311,133 +241,16 @@ export default {
},
// init
initMap () {
//
var center = new window.TMap.LatLng(36.0722275, 120.38945519)
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
center: center, //
zoom: 17.2, //
pitch: 43.5, //
rotation: 45 //
})
search = new window.TMap.service.Search({ pageSize: 10 })
//
markers = new TMap.MultiMarker({
map: map,
geometries: []
})
infoWindowList = Array(10)
geocoder = new TMap.service.Geocoder(); //
//
map.on('panend', () => {
this.handleMoveCenter()
})
this.handleMoveCenter()
this.convert()
},
setMarker (lat, lng) {
markers.setGeometries([])
markers.add([
{
id: '4',
styleId: 'marker',
position: new TMap.LatLng(lat, lng),
properties: {
title: 'marker4'
}
}
])
},
handleSearchMap () {
infoWindowList.forEach((infoWindow) => {
infoWindow.close()
})
infoWindowList.length = 0
markers.setGeometries([])
//
search
.searchRectangle({
keyword: this.keyWords,
bounds: map.getBounds()
})
.then((result) => {
let { data } = result
if (Array.isArray(data) && data.length > 0) {
const {
location: { lat, lng }
} = data[0]
map.setCenter(new TMap.LatLng(lat, lng))
this.setMarker(lat, lng)
this.formData.latitude = lat
this.formData.longitude = lng
this.convert()
} else {
this.$message.error('未检索到相关位置坐标')
}
})
},
handleMoveCenter () {
//
const center = map.getCenter()
const lat = center.getLat()
const lng = center.getLng()
this.formData.latitude = lat
this.formData.longitude = lng
this.setMarker(lat, lng)
this.convert(lat, lng)
},
convert (lat, lng) {
markers.setGeometries([]);
// var input = document.getElementById('location').value.split(',');
let location
if (lat && lng) {
location = new TMap.LatLng(lat, lng);
} else {
location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
}
// map.setCenter(location);
markers.updateGeometries([
{
id: 'main', //
position: location,
},
]);
geocoder
.getAddress({ location: location }) //
.then((result) => {
this.formData.address = result.result.address
//
});
},
resetData () {
this.unitId = ''
this.keyWords = ''
this.placeOrgId = ''
this.formData = {
gridId: '',
unitName: '',
serviceMatter: [],
type: '',
contact: '',
contactMobile: '',
memberCount: 0,
remark: '', //500
address: '', //
longitude: '', //
latitude: '' //
ninePlacsVal: '',
placeOrgName: '',
address: '',
scale: '',
personInCharge: '',
mobile: ''
}
},
//
@ -462,27 +275,24 @@ export default {
gridId: [
{ required: true, message: '所属网格不能为空', trigger: 'blur' }
],
unitName: [
{ required: true, message: '单位名称不能为空', trigger: 'blur' },
ninePlacsVal: [
{ required: true, message: '场所类型不能为空', trigger: 'blur' },
],
type: [
{ required: true, message: '分类不能为空', trigger: 'blur' }
placeOrgName: [
{ required: true, message: '场所名称不能为空', trigger: 'blur' }
],
contact: [
{ required: true, message: '联系人不能为空', trigger: 'blur' }
],
contactMobile: [
{ required: true, message: '联系电话不能为空', trigger: 'blur' }
address: [
{ required: true, message: '场所地址不能为空', trigger: 'blur' }
],
memberCount: [
{ required: true, message: '在职党员数不能为空', trigger: 'blur' }
scale: [
{ required: true, message: '场所规模不能为空', trigger: 'blur' }
],
address: [
{ required: true, message: '详细地址不能为空', trigger: 'blur' }
personInCharge: [
{ required: true, message: '负责人不能为空', trigger: 'blur' }
],
longitude: [
{ required: true, message: '坐标不能为空', trigger: 'blur' }
mobile: [
{ required: true, message: '联系电话不能为空', trigger: 'blur' }
]
}
},
@ -494,11 +304,11 @@ export default {
type: Array,
default: []
},
typeList: {
scaleList: {
type: Array,
default: []
},
serviceList: {
placeTypeList: {
type: Array,
default: []
},

390
src/views/modules/communityService/ninePlaces/team/team.vue

@ -6,37 +6,37 @@
ref="ref_searchform"
:label-width="'100px'">
<div>
<el-form-item label="所属网格"
prop="gridId">
<el-select class="item_width_1"
v-model="formData.gridId"
placeholder="全部"
clearable>
<el-option v-for="item in gridList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-form-item label="负责人"
prop="personInCharge">
<el-input v-model="formData.personInCharge"
class="item_width_1"
size="small"
clearable
placeholder="请输入负责人姓名">
</el-input>
</el-form-item>
<el-form-item label="单位名称"
prop="unitName">
<el-input v-model="formData.unitName"
<el-form-item label="联系电话"
prop="mobile">
<el-input v-model="formData.mobile"
class="item_width_1"
size="small"
clearable
placeholder="请输入内容">
placeholder="请输入电话">
</el-input>
</el-form-item>
<el-form-item label="服务事项"
prop="serviceMatter">
</div>
<div>
<el-form-item label="负责区域"
prop="gridId">
<el-select class="item_width_1"
v-model="formData.serviceMatter"
placeholder="请选择"
v-model="formData.gridId"
placeholder="全部"
clearable>
<el-option v-for="item in serviceList"
<el-option v-for="item in gridList"
:key="item.value"
:label="item.label"
:value="item.value">
@ -44,42 +44,20 @@
</el-select>
</el-form-item>
</div>
<div>
<el-form-item label="分类"
prop="type">
<el-form-item label="场所类型"
prop="ninePlacsVal">
<el-select class="item_width_1"
v-model="formData.type"
v-model="formData.ninePlacsVal"
placeholder="请选择"
clearable>
<el-option v-for="item in typeList"
<el-option v-for="item in placeTypeList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="联系人"
prop="contact">
<el-input v-model="formData.contact"
class="item_width_1"
size="small"
clearable
placeholder="请输入内容">
</el-input>
</el-form-item>
<el-form-item label="联系电话"
prop="contactMobile">
<el-input v-model="formData.contactMobile"
class="item_width_1"
size="small"
clearable
placeholder="请输入内容">
</el-input>
</el-form-item>
<el-button style="margin-left:10px"
@ -94,32 +72,9 @@
</el-form>
</div>
<div class="div_table">
<div class="div_btn">
<el-button style="float:left"
type="green"
size="small"
@click="handleAdd">新增</el-button>
<el-upload ref="upload"
:multiple='false'
:show-file-list='false'
:before-upload="beforeUpload"
action=""
accept=".xls,.xlsx"
:limit="1"
:on-exceed="handleExceed"
:http-request="uploadFile">
<el-button style="margin-left:10px"
size="small"
type="red">导入</el-button>
<el-button style="float:left"
type="yellow"
size="small"
@click="handleExport">导出</el-button>
</el-upload>
</div>
<el-button type="green"
size="small"
@click="handleAdd">新增</el-button>
<el-table class="table"
:data="tableData"
@ -133,61 +88,49 @@
align="center"
type="index"
width="50"></el-table-column>
<el-table-column prop="gridName"
header-align="center"
align="center"
label="所属网格"
width="180">
</el-table-column>
<el-table-column prop="unitName"
header-align="center"
align="center"
label="单位名称"
width="180">
</el-table-column>
<el-table-column prop="type"
<el-table-column prop="placeOrgName"
header-align="center"
align="center"
label="分"
width="180">
label="分队名称"
min-width="180">
</el-table-column>
<el-table-column prop="serviceMatter"
<el-table-column prop="address"
header-align="center"
align="center"
label="服务事项"
width="180">
label="负责人"
min-width="180">
</el-table-column>
<el-table-column prop="contact"
<el-table-column prop="ninePlaceName"
header-align="center"
align="center"
label="联系"
width="100">
label="联系电话"
min-width="110">
</el-table-column>
<el-table-column prop="contactMobile"
<el-table-column prop="scale"
header-align="center"
align="center"
label="联系电话"
width="110">
label="负责区域"
min-width="280">
</el-table-column>
<el-table-column prop="memberCount"
<el-table-column prop="personInCharge"
header-align="center"
align="center"
label="在职党员数"
width="150">
label="负责场所类型"
min-width="180">
</el-table-column>
<el-table-column prop="satisfaction"
<el-table-column prop="mobile"
header-align="center"
align="center"
label="群众满意度"
width="150">
label="监察计划"
min-width="180">
</el-table-column>
<el-table-column prop="remark"
<el-table-column prop="mobile"
header-align="center"
align="center"
label="备注"
:show-overflow-tooltip="true"
width="150">
label="创建时间"
min-width="120">
</el-table-column>
<el-table-column label="操作"
fixed="right"
width="140"
@ -216,7 +159,7 @@
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[10, 20, 50]"
:page-sizes="[20, 50, 100, 200]"
:page-size="pageSize"
layout="sizes, prev, pager, next, total"
:total="total">
@ -232,12 +175,11 @@
width="850px"
top="5vh"
@closed="diaClose">
<units-form ref="ref_form"
:gridList="gridList"
:serviceList="serviceList"
:typeList="typeList"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></units-form>
<team-form ref="ref_form"
:gridList="gridList"
:placeTypeList="placeTypeList"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></team-form>
</el-dialog>
</div>
@ -245,7 +187,7 @@
<script>
import unitsForm from './unitsForm'
import teamForm from './teamForm'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
@ -260,63 +202,37 @@ export default {
pageSize: 10,
pageNo: 0,
tableLoading: false,
agencyId: '',
gridList: [],//list
unitList: [],//list
serviceList: [
{
id: "1",
name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。'
},
{
id: "2",
name: '积极配合'
},
{
id: "3",
name: '积极配合社区安全巡查员进行'
},
{
id: "4",
name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。并具备安全意识及设备设施'
},
],//list
typeList: [],//list
unitId: '',
gridList: [],//list--
scaleList: [],//list
placeTypeList: [],//list
formData: {
gridId: '',
unitName: '',
serviceMatter: '',
type: '',
contact: '',
contactMobile: ''
personInCharge: '',//
mobile: '',//
gridId: '',//Id
ninePlacsVal: '',//Value
isPage: true,//(:true :false)
},
tableData: [],
//form
formShow: false,
formTitle: '新增单位',
files: "",
fileName: "",
uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import'
formTitle: '新增巡查人员',
}
},
components: {
unitsForm
teamForm
},
async created () {
},
async mounted () {
//
await this.loadService()
//
await this.loadType()
//
await this.loadPlaceType()
const { user } = this.$store.state
this.agencyId = user.agencyId
@ -349,37 +265,18 @@ export default {
},
//
async loadService () {
// const url = "/heart/icresidemanddict/subcodelist"
const url = "http://yapi.elinkservice.cn/mock/245/heart/icresidemanddict/subcodelist"
let params = {
parentCategoryCode: '1010'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.serviceList = data
} else {
this.$message.error(msg)
}
},
//
async loadType () {
//
async loadPlaceType () {
const url = "/sys/dict/data/dictlist"
let params = {
dictType: 'party_unit_type'
dictType: 'nine_small_places'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.typeList = data
this.placeTypeList = data
} else {
this.$message.error(msg)
@ -390,12 +287,11 @@ export default {
async loadTable () {
this.tableLoading = true
// const url = "/heart/icpartyunit/list"
const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
// const url = "/gov/org/placeorg/getlist"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
let params = {
pageSize: this.pageSize,
pageNo: this.pageNo,
agencyId: this.agencyId,
...this.formData
}
@ -421,7 +317,7 @@ export default {
this.formTitle = '详情'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('detail', row.id)
this.$refs.ref_form.initForm('detail', row.teamId, this.agencyId)
})
},
@ -429,7 +325,7 @@ export default {
this.formTitle = '新增'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('add', null)
this.$refs.ref_form.initForm('add', null, this.agencyId)
})
},
@ -437,7 +333,7 @@ export default {
this.formTitle = '修改'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('edit', row.id)
this.$refs.ref_form.initForm('edit', row.teamId, this.agencyId)
})
},
@ -458,7 +354,7 @@ export default {
type: "warning"
})
.then(() => {
this.deleteUnit(row)
this.deleteTeam(row)
})
.catch(err => {
if (err == "cancel") {
@ -468,12 +364,12 @@ export default {
});
},
async deleteUnit (row) {
// const url = "/heart/icpartyunit/delete"
const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
async deleteTeam (row) {
// const url = "/gov/org/placepatrolteam/del"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
let params = {
id: row.id
teamId: row.teamId
}
const { data, code, msg } = await requestPost(url, params)
@ -493,118 +389,14 @@ export default {
//
resetSearch () {
this.formData = {
gridId: '',
unitName: '',
serviceMatter: '',
type: '',
contact: '',
contactMobile: ''
personInCharge: '',//
mobile: '',//
gridId: '',//Id
ninePlacsVal: '',//Value
isPage: true,//(:true :false)
}
},
//
async handleExport () {
let title = '联建单位列表'
const url = "/partyunit/export"
let params = {
ownerName: this.ownerName,
ownerPhone: this.ownerPhone,
level: this.agencyObj.level,
id: this.agencyObj.id
}
app.ajax.exportFilePost(
url,
params,
(data, rspMsg) => {
this.download(data, title + '.xls')
},
(rspMsg, data) => {
this.$message.error(rspMsg);
}
);
},
//
download (data, fileName) {
if (!data) {
return
}
var csvData = new Blob([data])
if (window.navigator && window.navigator.msSaveOrOpenBlob) {
window.navigator.msSaveOrOpenBlob(csvData, fileName);
}
// for Non-IE (chrome, firefox etc.)
else {
var a = document.createElement('a');
document.body.appendChild(a);
a.style = 'display: none';
var url = window.URL.createObjectURL(csvData);
a.href = url;
a.download = fileName;
a.click();
a.remove();
window.URL.revokeObjectURL(url);
}
},
//
beforeUpload (file) {
this.files = file;
const isText = file.type === 'application/vnd.ms-excel'
const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
if (!isText && !isTextComputer) {
this.$message.error('请选择正确格式的文件')
return false
} else {
this.fileName = file.name;
return true
}
},
//
handleExceed (files, fileList) {
this.$message.warning(`当前限制选择 1 个文件,请删除后继续上传`)
},
async uploadFile () {
this.loading = true
if (this.fileName == "") {
this.$message.warning('请选择要上传的文件!')
return false
}
//
this.$refs['upload'].clearFiles()
var url = '/partyunit/import'
let fileFormData = new FormData();
fileFormData.append('file', this.files);//filenamefiletest.zip
const { data, code, msg } = await requestPost(url, fileFormData)
if (code === 0) {
this.$message({
type: "success",
message: "导入成功"
});
this.loadTable()
} else {
this.$message.error(msg)
}
},
handleSizeChange (val) {
this.pageSize = val

440
src/views/modules/communityService/ninePlaces/team/teamForm.vue

@ -0,0 +1,440 @@
<template>
<div>
<div>
<div>
<el-form ref="ref_form"
:inline="true"
:model="formData"
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="分队名称"
label-width="150px"
prop="teamName">
<el-input v-model="formData.teamName"
class="item_width_1"
clearable
placeholder="请输入分队名称">
</el-input>
</el-form-item>
<el-form-item label="负责区域"
prop="gridIdArray"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.gridIdArray"
placeholder="全部"
multiple
clearable>
<el-option v-for="item in gridList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="负责场所类型"
prop="ninePlacsArray"
label-width="150px"
style="display: block">
<el-checkbox-group class="item_width_1"
style="display:flex;flex-wrap:wrap"
v-model="formData.ninePlacsArray">
<el-checkbox v-for="item in placeTypeList"
:key="item.value"
:label="item.value">{{item.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="巡查计划"
prop="plan"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
show-word-limit
:rows="3"
placeholder="请输入备注,不超过500字"
v-model="formData.plan"></el-input>
</el-form-item>
<el-form-item label="创建时间"
style="display: block"
prop="time"
label-width="150px">
<el-date-picker v-model="formData.time"
value-format="yyyyMMdd"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="负责人"
label-width="150px"
prop="personInCharge">
<el-input v-model="formData.personInCharge"
class="item_width_1"
clearable
placeholder="请输入负责人姓名">
</el-input>
</el-form-item>
<el-form-item label="联系电话"
label-width="150px"
prop="mobile">
<el-input v-model="formData.mobile"
class="item_width_1"
type='number'
clearable
placeholder="请输入电话">
</el-input>
</el-form-item>
<el-form-item label="成员"
label-width="150px"
prop="member">
<el-button v-if="formType != 'detail'"
type="primary"
:disabled="btnDisable"
size="mini"
icon="el-icon-plus"
@click="handleAddPerson"></el-button>
<div v-for="(item,index) in memberList"
:key="index"
class="div_person_list">
<span style="font-weight: bold">姓名</span>
<el-input v-if="item.isEdit"
v-model="item.name"
class="item_width_3"
clearable
placeholder="请输入电话">
</el-input>
<span class="item_width_span_3"
v-if="!item.isEdit">{{item.name}}</span>
<span style="font-weight: bold;margin-left:20px">联系电话</span>
<el-input v-if="item.isEdit"
v-model="item.mobile"
class="item_width_4"
clearable
placeholder="请输入电话">
</el-input>
<span class="item_width_span_4"
v-if="!item.isEdit">{{item.mobile}}</span>
<el-button style="margin-left:30px"
type="red"
size="mini"
@click="handleDelPerson(index)">删除</el-button>
</div>
</el-form-item>
</el-form>
</div>
</div>
<div class="div_btn">
<el-button @click="handleCancle"> </el-button>
<el-button v-if="formType != 'detail'"
type="primary"
:disabled="btnDisable"
@click="handleComfirm"> </el-button>
</div>
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
let loading //
export default {
data () {
return {
formType: 'add', // addeditdetail
btnDisable: false,
teamId: '',
formData: {
agencyId: '',//Id
teamName: '',//
gridIds: '',//
gridIdArray: [],
ninePlacsVals: '',//
ninePlacsArray: [],
plan: '',//
time: '',//
personInCharge: '',//
mobile: '',//
memberList: ''//
},
memberList: [
{
name: '成吉思汗',
mobile: '19999999999',
isEdit: false,
},
{
name: '成吉思汗',
mobile: '17465666567',
isEdit: true,
}
],
}
},
components: {},
mounted () {
},
methods: {
async initForm (type, teamId, agencyId) {
this.$refs.ref_form.resetFields();
this.formData.agencyId = agencyId
this.formType = type
if (teamId) {
this.teamId = teamId
this.formData.teamId = teamId
await this.loadFormData()
}
},
//
async loadFormData () {
// const url = '/gov/org/placepatrolteam/detail'
const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/detail'
let params = {
placePatrolTeamId: this.teamId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.formData = data
} else {
this.$message.error(msg)
}
},
async handleComfirm () {
this.btnDisable = true
setTimeout(() => {
this.btnDisable = false
}, 10000)
this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) {
app.util.validateRule(messageObj)
this.btnDisable = false
} else {
this.addTeam()
}
})
},
handleAddPerson () {
let obj = {
name: '',
mobile: '',
isEdit: true
}
this.memberList.push(obj)
},
handleDelPerson (index) {
this.memberList.splice(index, 1)
},
async addTeam () {
// const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //
// if (regPhone.test(this.formData.mobile) === false) {
// this.btnDisable = false
// this.$message({
// type: 'warning',
// message: ''
// })
// return false;
// }
if (this.formData.gridIdArray.length > 0) {
this.formData.gridIds = this.formData.gridIdArray.join(',')
} else {
return false
}
if (this.formData.ninePlacsArray.length > 0) {
this.formData.ninePlacsVals = this.formData.ninePlacsArray.join(',')
} else {
return false
}
let url = ''
if (this.formType === 'edit') {
// url = '/gov/org/placeorg/edit'
url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/edit'
} else {
// url = "/gov/org/placepatrolteam/add"
url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/add"
}
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
type: 'success',
message: '操作成功'
})
this.resetData()
this.$emit('dialogOk')
this.btnDisable = false
} else {
this.btnDisable = false
this.$message.error(msg)
}
},
handleCancle () {
this.resetData()
this.$emit('dialogCancle')
},
resetData () {
this.teamId = ''
this.formData = {
agencyId: '',//Id
teamName: '',//
gridIds: '',//
gridIdArray: [],
ninePlacsVals: '',//
ninePlacsArray: [],
plan: '',//
time: '',//
personInCharge: '',//
mobile: '',//
member: '1'//
}
},
//
startLoading () {
loading = Loading.service({
lock: true, //
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
})
},
//
endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
computed: {
dataRule () {
return {
teamName: [
{ required: true, message: '分队名称不能为空', trigger: 'blur' }
],
gridIdArray: [
{ required: true, message: '负责区域不能为空', trigger: 'blur' },
],
ninePlacsArray: [
{ required: true, message: '场所类型不能为空', trigger: 'blur' }
],
plan: [
{ required: true, message: '巡查计划 不能为空', trigger: 'blur' }
],
personInCharge: [
{ required: true, message: '负责人不能为空', trigger: 'blur' }
],
mobile: [
{ required: true, message: '联系电话不能为空', trigger: 'blur' }
],
member: [
{ required: true, message: '成员不能为空', trigger: 'blur' }
]
}
},
},
props: {
gridList: {
type: Array,
default: []
},
placeTypeList: {
type: Array,
default: []
},
}
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/buttonstyle.scss";
.item_width_1 {
width: 500px;
}
.item_width_2 {
width: 400px;
}
.item_width_3 {
margin-left: 10px;
width: 120px;
}
.item_width_4 {
margin-left: 10px;
width: 150px;
}
.item_width_span_3 {
margin-left: 10px;
width: 120px;
}
.item_width_span_4 {
margin-left: 10px;
width: 150px;
}
.div_btn {
display: flex;
justify-content: flex-end;
}
.form {
margin-top: 30px;
}
.div_person_list {
margin-top: 10px;
width: 500px;
display: flex;
}
</style>
<style lang=scss>
.el-dialog__body {
padding: 0 10px 20px !important;
}
</style>

544
src/views/modules/communityService/ninePlaces/team/unitsForm.vue → src/views/modules/communityService/shzz/cpts/edit.vue

@ -1,99 +1,78 @@
<template>
<div>
<div>
<div>
<div v-show="!propertyFormShow">
<el-form ref="ref_form"
:inline="true"
:model="formData"
:model="dataForm"
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="所属组织"
label-width="150px"
style="display: block">
<span>{{ dataForm.agencyName }}</span>
</el-form-item>
<el-form-item label="所属网格"
prop="gridId"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.gridId"
placeholder="全部"
v-model="dataForm.gridId"
placeholder="请选择"
clearable>
<el-option v-for="item in gridList"
:key="item.value"
:label="item.label"
:value="item.value">
:key="item.gridId"
:label="item.gridName"
:value="item.gridId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="单位名称"
prop="unitName"
<el-form-item label="小区名称"
prop="neighborHoodName"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder="请输入单位名称"
v-model="formData.unitName">
placeholder="请输入小区名称"
v-model="dataForm.neighborHoodName">
</el-input>
</el-form-item>
<el-form-item label="分类"
prop="type"
<el-form-item label="关联物业"
prop="propertyId"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.type"
<el-select class="item_width_2"
v-model="dataForm.propertyId"
placeholder="请选择"
filterable
clearable>
<el-option v-for="item in typeList"
:key="item.value"
:label="item.label"
:value="item.value">
<el-option v-for="item in propertyList"
:key="item.propertyId"
:label="item.propertyName"
:value="item.propertyId">
</el-option>
</el-select>
<el-button style="margin-left: 10px"
type="primary"
size="small"
@click="handleAddProperty">添加物业</el-button>
</el-form-item>
<el-form-item label="服务事项"
prop="serviceMatter"
label-width="150px"
style="display: block">
<el-checkbox-group class="item_width_1"
style="display:flex;flex-wrap:wrap"
v-model="formData.serviceMatter">
<el-checkbox v-for="item in serviceList"
:key="item.value"
:label="item.value">{{item.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="联系人"
prop="contact"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入联系人姓名"
v-model="formData.contact">
</el-input>
</el-form-item>
<el-form-item label="联系电话"
prop="contactMobile"
<el-form-item label="详细地址"
prop="address"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入联系人电话"
v-model="formData.contactMobile">
maxlength="50"
show-word-limit
placeholder="请输入详细地址"
v-model="dataForm.address">
</el-input>
</el-form-item>
<el-form-item label="在职党员"
style="display: block"
prop="memberCount"
label-width="150px">
<el-input-number class="item_width_1"
v-model="formData.memberCount"
:min="1"
label="单元数"></el-input-number>
</el-form-item>
<el-form-item label="备注"
prop="remark"
label-width="150px"
@ -104,62 +83,60 @@
show-word-limit
:rows="3"
placeholder="请输入备注,不超过500字"
v-model="formData.remark"></el-input>
v-model="dataForm.remark"></el-input>
</el-form-item>
<el-form-item label="位置坐标"
prop="longitude"
label-width="150px"
style="display: block">
<div style="width:500px">
<div class="div_map">
<div id="app">
</div>
<div class="div_searchmap">
<el-input class="item_width_4"
maxlength="50"
size="mini"
placeholder="请输入关键字"
v-model="keyWords">
</el-input>
<el-button style="margin-left: 10px"
type="primary"
size="mini"
@click="handleSearchMap">查询</el-button>
</div>
</div>
<el-input class="item_width_4"
maxlength="50"
placeholder="请输入关键字"
v-model="keyWords">
</el-input>
<el-button style="margin-left: 10px"
type="primary"
size="small"
@click="handleSearchMap">查询</el-button>
<div id="app"
class="div_map"></div>
<div style="margin-top: 10px">
<span>经度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入经度"
v-model="formData.longitude">
v-model="dataForm.longitude">
</el-input>
<span style="margin-left: 20px">纬度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入纬度"
v-model="formData.latitude">
v-model="dataForm.latitude">
</el-input>
</div>
</div>
</el-form-item>
</el-form>
</div>
<el-form-item label="地理位置"
prop="address"
<div v-show="propertyFormShow">
<el-form :inline="false"
:model="propertyForm"
:rules="propertyRule"
class="form">
<el-form-item label="物业名称"
prop="name"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
v-model="formData.address">
maxlength="10"
placeholder="请输入小区名称"
v-model="propertyForm.name">
</el-input>
</el-form-item>
</el-form>
</div>
</div>
<div class="div_btn">
<el-button @click="handleCancle"> </el-button>
@ -175,39 +152,41 @@
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
var map
var search
var markers
var infoWindowList
var geocoder //
let loading //
export default {
data () {
return {
formType: 'add', // addeditdetail
gridList: [],
propertyList: [],
btnDisable: false,
unitId: '',
keyWords: '',
formData: {
gridId: '',
unitName: '',
serviceMatter: [],
type: '',
contact: '',
contactMobile: '',
memberCount: 0,
remark: '', //500
neighborHoodId: '', //ID
dataForm: {
neighborHoodName: '', // 50
agencyId: '', // ID
agencyName: '',
gridId: '', //ID
propertyId: '', //
address: '', //
longitude: 36.0722275, //
latitude: 120.38945519 //
remark: '', //500
location: '', //
longitude: '', //
latitude: '' //
},
propertyFormShow: false,
propertyForm: {
name: ''
},
keyWords: '',
agencyObj: {}
}
},
components: {},
@ -216,101 +195,6 @@ export default {
},
methods: {
async initForm (type, unitId) {
this.$refs.ref_form.resetFields();
// debugger
// map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
this.formType = type
if (unitId) {
this.unitId = unitId
this.formData.id = unitId
await this.loadFormData()
}
},
//
async loadFormData () {
// const url = '/heart/icpartyunit/detail'
const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
let params = {
id: this.unitId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.formData = data
} else {
this.$message.error(msg)
}
},
async handleComfirm () {
this.btnDisable = true
setTimeout(() => {
this.btnDisable = false
}, 10000)
this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) {
app.util.validateRule(messageObj)
this.btnDisable = false
} else {
this.addUnit()
}
})
},
async addUnit () {
// const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //
// if (regPhone.test(this.formData.contactMobile) === false) {
// this.btnDisable = false
// this.$message({
// type: 'warning',
// message: ''
// })
// return false;
// }
// let url = '/heart/icpartyunit/save'
let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
// if (this.formType === 'edit') {
// this.formData.id = this.unitId
// }
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
type: 'success',
message: '新增联建单位成功'
})
this.resetData()
this.$emit('dialogOk')
this.btnDisable = false
} else {
this.btnDisable = false
this.$message.error(msg)
}
},
handleCancle () {
this.resetData()
this.$emit('dialogCancle')
},
// init
initMap () {
//
@ -331,14 +215,11 @@ export default {
})
infoWindowList = Array(10)
geocoder = new TMap.service.Geocoder(); //
//
map.on('panend', () => {
this.handleMoveCenter()
})
this.handleMoveCenter()
this.convert()
},
setMarker (lat, lng) {
@ -373,13 +254,10 @@ export default {
const {
location: { lat, lng }
} = data[0]
map.setCenter(new TMap.LatLng(lat, lng))
this.setMarker(lat, lng)
this.formData.latitude = lat
this.formData.longitude = lng
this.convert()
this.dataForm.latitude = lat
this.dataForm.longitude = lng
} else {
this.$message.error('未检索到相关位置坐标')
}
@ -391,54 +269,185 @@ export default {
const center = map.getCenter()
const lat = center.getLat()
const lng = center.getLng()
this.formData.latitude = lat
this.formData.longitude = lng
this.dataForm.latitude = lat
this.dataForm.longitude = lng
this.setMarker(lat, lng)
this.convert(lat, lng)
},
convert (lat, lng) {
markers.setGeometries([]);
// var input = document.getElementById('location').value.split(',');
let location
if (lat && lng) {
location = new TMap.LatLng(lat, lng);
async initForm (type, row, agencyObj) {
this.$refs.ref_form.resetFields();
this.agencyObj = agencyObj
// debugger
map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
this.formType = type
if (row) {
this.dataForm = JSON.parse(JSON.stringify(row))
this.neighborHoodId = this.dataForm.neighborHoodId
}
await this.loadAgency()
await this.loadGrid()
await this.loadProperty()
},
//
async loadAgency () {
const url = '/epmetuser/customerstaff/staffbasicinfo'
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.dataForm.agencyId = data.agencyId
this.dataForm.agencyName = data.agencyName
} else {
this.$message.error(msg)
}
},
//
async loadGrid () {
const url = '/gov/org/grid/allgridsnopermission '
// const url = "https://epmet-dev.elinkservice.cn:7082/api/apimock-v2/95518686fa128a53f64c678906848062/gov/org/grid/allgrids"
let params = {
agencyId: this.dataForm.agencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.gridList = data
} else {
location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
this.$message.error(msg)
}
},
//
async loadProperty () {
const url = '/gov/org/propertymanagement/list'
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/list"
let params = {}
// map.setCenter(location);
markers.updateGeometries([
{
id: 'main', //
position: location,
},
]);
geocoder
.getAddress({ location: location }) //
.then((result) => {
this.formData.address = result.result.address
//
});
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.propertyList = data
} else {
this.$message.error(msg)
}
},
handleAddProperty () {
this.propertyForm.name = ''
this.propertyFormShow = true
},
async handleComfirm () {
if (this.propertyFormShow) {
this.addProperty()
} else {
this.btnDisable = true
setTimeout(() => {
this.btnDisable = false
}, 10000)
this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) {
app.util.validateRule(messageObj)
this.btnDisable = false
} else {
this.addCommunity()
}
})
}
},
async addCommunity () {
let url = ''
if (this.formType === 'add') {
url = '/gov/org/neighborhood/neighborhoodadd'
// url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
} else {
url = '/gov/org/neighborhood/neighborhoodupdate'
this.dataForm.neighborHoodId = this.neighborHoodId
}
const { data, code, msg } = await requestPost(url, this.dataForm)
if (code === 0) {
this.$message({
type: 'success',
message: '添加小区成功'
})
this.resetData()
this.$emit('dialogOk')
this.btnDisable = false
} else {
this.btnDisable = false
this.$message.error(msg)
}
},
async addProperty () {
if (!this.propertyForm.name || this.propertyForm.name === '') {
this.$message({
type: 'error',
message: '物业名称不能为空'
})
return false
}
const url = '/gov/org/propertymanagement/add'
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/add"
let params = {
name: this.propertyForm.name
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.$message({
type: 'success',
message: '操作成功'
})
this.dataForm.propertyId = data.propertyId
this.propertyForm.name = ''
this.propertyFormShow = false
this.loadProperty()
} else {
this.$message.error(msg)
}
},
handleCancle () {
if (this.propertyFormShow) {
this.propertyForm.name = ''
this.propertyFormShow = false
} else {
this.resetData()
this.$emit('dialogCancle')
}
},
resetData () {
this.unitId = ''
this.keyWords = ''
this.formData = {
gridId: '',
unitName: '',
serviceMatter: [],
type: '',
contact: '',
contactMobile: '',
memberCount: 0,
remark: '', //500
this.neighborHoodId = '' //ID
this.dataForm = {
neighborHoodName: '', // 50
agencyId: '', // ID
agencyName: '',
gridId: '', //ID
propertyId: '', //
address: '', //
remark: '', //500
location: '', //
longitude: '', //
latitude: '' //
}
this.propertyFormShow = false
},
//
startLoading () {
@ -459,24 +468,20 @@ export default {
computed: {
dataRule () {
return {
gridId: [
{ required: true, message: '所属网格不能为空', trigger: 'blur' }
],
unitName: [
{ required: true, message: '单位名称不能为空', trigger: 'blur' },
],
type: [
{ required: true, message: '分类不能为空', trigger: 'blur' }
],
contact: [
{ required: true, message: '联系人不能为空', trigger: 'blur' }
neighborHoodName: [
{ required: true, message: '小区名称不能为空', trigger: 'blur' },
{
min: 1,
max: 50,
message: '小区名称长度在 1 到 50个字符',
trigger: 'blur'
}
],
contactMobile: [
{ required: true, message: '联系电话不能为空', trigger: 'blur' }
agencyId: [
{ required: true, message: '所属组织不能为空', trigger: 'blur' }
],
memberCount: [
{ required: true, message: '在职党员数不能为空', trigger: 'blur' }
gridId: [
{ required: true, message: '所属网格不能为空', trigger: 'blur' }
],
address: [
{ required: true, message: '详细地址不能为空', trigger: 'blur' }
@ -486,23 +491,14 @@ export default {
]
}
},
propertyRule () {
name: [
{ required: true, message: '物业名称不能为空', trigger: 'blur' }
// { min: 1, max: 50, message: ' 1 50', trigger: 'blur' }
]
}
},
props: {
gridList: {
type: Array,
default: []
},
typeList: {
type: Array,
default: []
},
serviceList: {
type: Array,
default: []
},
}
props: {}
}
</script>
<style scoped>
@ -521,13 +517,7 @@ export default {
}
.div_map {
position: relative;
}
.div_searchmap {
z-index: 5000;
position: absolute;
top: 5px;
left: 5px;
margin-top: 10px;
}
.div_btn {
@ -546,7 +536,7 @@ export default {
}
</style>
<style lang=scss>
<style>
.el-dialog__body {
padding: 0 10px 20px !important;
}

551
src/views/modules/communityService/shzz/index.vue

@ -0,0 +1,551 @@
<template>
<div>
<div class="resi-container">
<el-card class="resi-card">
<el-row class="resi-row-box" :class="openSearch && 'resi-row-more'">
<el-row class="resi-row" :gutter="20">
<el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">组织名称</div>
<div class="resi-cell-value" :class="'resi-cell-value-radio'">
<el-input
v-model="fmData.societyName"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
</el-input>
</div>
</div>
</el-col>
<el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">负责人</div>
<div class="resi-cell-value" :class="'resi-cell-value-radio'">
<el-input
v-model="fmData.personInCharge"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
</el-input>
</div>
</div>
</el-col>
<el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">联系电话</div>
<div class="resi-cell-value" :class="'resi-cell-value-radio'">
<el-input
v-model="fmData.mobile"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
</el-input>
</div>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="resi-cell">
<div class="resi-cell-label">服务时间</div>
<div class="resi-cell-value" :class="'resi-cell-value-radio'">
<el-date-picker
v-model="fmData.serviceTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</div>
</div>
</el-col>
</el-row>
</el-row>
<el-row class="resi-search">
<el-col :span="24">
<el-button type="primary" size="small" @click="handleSearch"
>查询</el-button
>
</el-col>
</el-row>
</el-card>
</div>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button type="success" size="small" @click="handleAdd"
>新增</el-button
>
<el-button @click="handleRu" type="warning" size="small"
>excel导入</el-button
>
<el-button @click="handleChu" type="danger" size="small"
>excel导出</el-button
>
</div>
<el-table
:data="tableData"
border
style="width: 100%"
class="resi-table"
:max-height="maxTableHeight"
>
<el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column prop="societyName" label="社会组织名称">
</el-table-column>
<el-table-column prop="serviceMatters" label="服务事项">
</el-table-column>
<el-table-column prop="personInCharge" label="负责人">
</el-table-column>
<el-table-column prop="mobile" label="负责人电话"> </el-table-column>
<el-table-column prop="serviceTime" label="服务时间"> </el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="120">
<template slot-scope="scope">
<el-button
@click="handleWatch(scope.row, scope.$index)"
type="text"
size="small"
>查看</el-button
>
<el-button
@click="handleEdit(scope.row)"
type="text"
size="small"
style="margin-right: 10px; color: #00a7a9"
>编辑</el-button
>
<el-popconfirm
title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row, scope.$index)"
@confirm="handleDel(scope.row, scope.$index)"
>
<el-button
slot="reference"
type="text"
size="small"
style="color: #d51010"
>删除</el-button
>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next"
:total="total"
>
</el-pagination>
</div>
</el-card>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="850px"
top="5vh"
@closed="handleClose"
>
<edit-form
ref="ref_form"
@dialogCancle="handleClose"
@dialogOk="handleEditSuccess"
></edit-form>
</el-dialog>
</div>
</template>
<script>
import { requestPost } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex";
import editForm from "./cpts/edit";
export default {
components: { editForm },
data() {
return {
openSearch: false,
formShow: false,
formTitle: "",
formShow: false,
pageNo: 1,
pageSize: window.localStorage.getItem("pageSize") || 20,
total: 1,
tableData: [
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
{
societyName: "亿联科技",
personInCharge: "嘻嘻",
serviceMatters: "1111111111111",
mobile: "13512345678",
serviceTime: "2001-1-1至2022-2-2",
},
],
fmData: {
societyName: "",
personInCharge: "",
mobile: "",
serviceStartTime: "",
serviceEndTime: "",
serviceTime: "",
},
};
},
computed: {
maxTableHeight() {
return this.clientHeight - 450;
},
...mapGetters(["clientHeight"]),
},
watch: {
"fmData.serviceTime": function (val) {
if (Array.isArray(val) && val.length == 2) {
this.fmData.serviceStartTime = val[0];
this.fmData.serviceEndTime = val[1];
}
},
},
mounted() {
this.getTableData();
},
methods: {
handleSizeChange(val) {
console.log(`每页 ${val}`);
this.pageSize = val;
window.localStorage.setItem("pageSize", val);
this.getTableData();
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.getTableData();
},
handleClose() {
this.formShow = false;
},
handleSearch(val) {
console.log(this.fmData);
this.pageNo = 1;
this.getTableData();
},
handleAdd() {
this.formShow = true;
},
handleRu() {},
handleChu() {},
handleWatch(rowData, rowIndex) {
console.log(rowData, rowIndex);
this.formShow = true;
},
handleEdit(rowData, rowIndex) {
this.formShow = true;
},
handleEditSuccess() {
this.handleClose();
this.getTableData();
},
async handleDel(rowData, rowIndex) {
console.log(rowData, rowIndex);
const url = "/heart/societyorg/del";
const { tableData } = this;
const { data, code, msg } = await requestPost(url, {
societyId: tableData[rowIndex].societyId,
});
if (code === 0) {
this.$message.success("删除成功!");
this.getTableData();
} else {
this.$message.success("操作失败!");
}
},
async getTableData() {
const url = "/heart/societyorg/getlist";
const { pageSize, pageNo, fmData } = this;
const { data, code, msg } = await requestPost(url, {
pageSize,
pageNo,
...fmData,
});
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
this.total = data.total;
this.tableData = data.list.map((item) => {
item.serviceTime = item.serviceStartTime + "至" + item.serviceEndTime;
return item;
});
} else {
}
},
},
};
</script>
<style lang="scss" scoped>
.tabs-other-info {
.el-tabs__item {
// width: 50px;
height: 20px;
box-sizing: border-box;
margin-right: 7px;
padding: 0 10px !important;
font-size: 8px;
font-weight: 500;
color: #666666;
line-height: 20px;
background: #ebecf1;
border-radius: 2px;
}
.el-tabs__nav-wrap::after,
.el-tabs__active-bar {
display: none;
}
.el-tabs__nav-next,
.el-tabs__nav-prev {
line-height: 20px;
}
}
.resi-card-table {
margin-top: 20px;
}
.resi-row-btn {
margin-bottom: 13px;
}
.resi-other {
width: 100%;
display: flex;
.resi-other-title {
width: 100px;
box-sizing: border-box;
margin-bottom: 10px;
// padding: 6px 12px 0 0;
font-size: 16px;
font-weight: 500;
color: #333;
text-align: center;
}
.tabs-other-info {
// padding-left: 60px;
}
}
.resi-btns {
margin-top: 20px;
text-align: center;
}
.resi-container .resi-card {
position: relative;
overflow: visible;
}
.resi-down {
position: absolute;
left: 50%;
bottom: -10px;
display: flex;
justify-content: center;
align-items: center;
width: 46px;
height: 12px;
box-sizing: border-box;
margin-left: -23rpx;
cursor: pointer;
background: #ffffff;
border-radius: 0 0 10px 10px;
img {
display: block;
}
}
.resi-row-box {
height: 104px;
overflow: hidden;
transition: height 0.5s;
}
.resi-row-more {
height: max-content;
transition: height 0.5s;
}
.resi-row {
margin-bottom: 20px;
}
.resi-search {
.el-col {
text-align: right;
}
}
.resi-cell {
display: flex;
align-items: center;
.resi-cell-label {
width: 70px;
box-sizing: border-box;
margin-right: 15px;
text-align: right;
// line-height: 32;
}
.resi-cell-value-radio {
display: flex;
align-items: center;
min-height: 32px;
}
.resi-cell-input {
width: 180px;
}
.resi-cell-select {
width: 180px;
box-sizing: border-box;
margin-right: 10px;
&-middle {
width: 130px;
}
&-small {
width: 88px;
}
}
.resi-cell-select:last-child {
margin-right: 0;
}
}
</style>

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 {

1
src/views/modules/visual/basicinfo/people.vue

@ -353,6 +353,7 @@ export default {
},
userId() {
this.getApiData();
window.scrollTo(0, 0);
},
},

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>

366
src/views/modules/visual/warning/components/screen-table/index.vue

@ -1,62 +1,101 @@
<template>
<div class="warning-table">
<div class="table">
<div class="table-header">
<div class="table-header-th" v-for="(item,index) in headerList" :key='item.title' :style="headerStyle[index]">{{item.title}}</div>
<div class="table">
<div class="table-header">
<div
class="table-header-th"
v-for="(item, index) in headerList"
:key="item.title"
:style="headerStyle[index]"
>
{{ item.title }}
</div>
<div class="table-body">
<div class="table-body-tr" v-for="(value,index) in tableData" :key='index'>
<div class="td" v-for="(item,indexs) in value" :key="indexs" :style="tableContentStyle[indexs]">{{item}}
<span v-if="(indexs+1==value.length) && item.length>8" class="more" @click="onClickMorePop(index)" ref='morePop'>
更多>
<span class="more-pop" v-if="visiblePopList[index]">
<!-- 李佳琪刘阳赵欣丁一嘉敏李岩何嘉慧
</div>
<div class="table-body">
<div
class="table-body-tr"
v-for="(value, index) in tableData"
:key="index"
>
<div
class="td"
v-for="(item, indexs) in value"
:key="indexs"
:style="tableContentStyle[indexs]"
>
{{ item }}
<span
v-if="indexs + 1 == value.length && item.length > 8"
class="more"
@click.stop="onClickMorePop(index)"
ref="morePop"
>
更多>
<span class="more-pop" v-if="visiblePopList[index]">
<!-- 李佳琪刘阳赵欣丁一嘉敏李岩何嘉慧
李易峰赵敏何军曲树惠 -->
{{item}}
</span>
{{ item }}
</span>
</div>
</div>
<screen-loading v-if="visibleLoading">加载中</screen-loading>
<div class="no-data" v-if="tableData.length==0 && !visibleLoading">
<img src="../../../../../../assets/img/modules/visual/noData.png" alt="" srcset="" class="no-data-img">
</span>
</div>
</div>
<screen-loading v-if="visibleLoading">加载中</screen-loading>
<div class="no-data" v-if="tableData.length == 0 && !visibleLoading">
<img
src="../../../../../../assets/img/modules/visual/noData.png"
alt=""
srcset=""
class="no-data-img"
/>
</div>
</div>
</div>
</div>
</template>
<script>
import ScreenLoading from '../screen-loading/index'
import Vue from 'vue'
import ScreenLoading from "../screen-loading/index";
import Vue from "vue";
export default {
name: 'warning-table',
components:{
ScreenLoading
},
props: {
name: "warning-table",
components: {
ScreenLoading,
},
props: {
headerList: {
type: Array,
required: false,
default: () => {
return [
{ title: '序号' },
{ title: '所属网格'},
{ title: '所属小区'},
{ title: '楼号'},
{ title: '姓名' },
]
}
{ title: "序号" },
{ title: "所属网格" },
{ title: "所属小区" },
{ title: "楼号" },
{ title: "姓名" },
];
},
},
tableData: {
type: Array,
required: false,
default: () => {
return [
[1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
[2,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
]
}
// [
// 1,
// "",
// "",
// "2",
// "",
// ],
// [
// 2,
// "",
// "",
// "2",
// "",
// ],
];
},
},
//
headerStyle: {
@ -70,8 +109,8 @@ props: {
// {
// width:'200px'
// }
]
}
];
},
},
//
tableContentStyle: {
@ -85,13 +124,13 @@ props: {
// {
// width:'200px'
// }
]
}
];
},
},
visibleLoading: {
type: Boolean,
default: true,
},
visibleLoading:{
type:Boolean,
default:true
}
// //
// ava: {
// type: Number,
@ -110,145 +149,162 @@ props: {
},
data() {
return {
visiblePopList:[false,false,false,false,false,false,false,false,false,false],
visiblePopList: [
false,
false,
false,
false,
false,
false,
false,
false,
false,
false,
],
};
},
mounted () {
// window.addEventListener('click', e => {
// if (this.$refs.morePop && !this.$refs.morePop.contains(e.target)) {
// this.visiblePopList.forEach((item,indexs)=>{
// Vue.set(this.visiblePopList, indexs, false)
// })
// }
// })
watch: {
tableData(arr) {
if (Array.isArray(arr)) {
this.visiblePopList = new Array(arr.length).fill(false);
}
},
},
created(){
mounted() {
window.addEventListener("click", (e) => {
this.visiblePopList = new Array(this.visiblePopList.length).fill(false);
});
},
created() {},
methods: {
onClickMorePop(index) {
this.visiblePopList.forEach((item,indexs)=>{
if(index==indexs){
Vue.set(this.visiblePopList, index, true)
}else{
Vue.set(this.visiblePopList, indexs, false)
}
})
}
onClickMorePop(index) {
this.visiblePopList.forEach((item, indexs) => {
if (index == indexs) {
Vue.set(this.visiblePopList, index, true);
} else {
Vue.set(this.visiblePopList, indexs, false);
}
});
},
},
};
</script>
<style lang="scss" scoped>
.warning-table{
box-sizing: border-box;
width: 100%;
height: 100%;
.table {
.warning-table {
box-sizing: border-box;
width: 100%;
height: 100%;
.table {
width: 100%;
height: 100%;
&-header {
width: 100%;
height: 50px;
display: flex;
justify-content: space-around;
align-items: center;
background: rgba(8, 37, 134, 0.85);
font-size: 16px;
font-weight: 400;
color: #ffffff;
&-th {
text-align: center;
width: calc(100% / 5);
}
}
&-body {
box-sizing: border-box;
width: 100%;
height: 100%;
&-header {
height: calc(100% - 50px);
font-size: 18px;
font-weight: 400;
color: #ffffff;
&-tr {
width: 100%;
height: 50px;
// height: calc(100% / 10);
display: flex;
justify-content: space-around;
align-items: center;
background: rgba(8, 37, 134, 0.85);
font-size: 16px;
font-weight: 400;
color: #FFFFFF;
&-th {
.td {
text-align: center;
width: calc(100% / 5);
}
}
.more {
font-size: 18px;
font-weight: 400;
color: #e4dc00;
position: relative;
cursor: pointer;
&-body {
box-sizing: border-box;
width: 100%;
height: calc(100% - 50px);
font-size: 18px;
font-weight: 400;
color: #FFFFFF;
&-tr {
width: 100%;
height: 50px;
// height: calc(100% / 10);
display: flex;
justify-content: space-around;
align-items: center;
.td {
text-align: center;
width: calc(100% / 5);
.more {
font-size: 18px;
&-pop {
box-sizing: border-box;
display: block;
box-sizing: border-box;
width: 215px;
height: auto;
line-height: 20px;
border: 1px solid red;
position: absolute;
right: -100%;
top: 150%;
background: #06186d;
border: 1px solid #1a64cc;
border-radius: 5px;
font-size: 9px;
font-weight: 400;
color: #E4DC00;
position: relative;
&-pop{
box-sizing: border-box;
display: block;
box-sizing: border-box;
width: 215px;
height: auto;
line-height: 20px;
border: 1px solid red;
position: absolute;
left: -100%;
top: 150%;
background: #06186D;
border: 1px solid #1A64CC;
border-radius: 5px;
font-size: 9px;
font-weight: 400;
color: #FFFFFF;
padding:16px 8px 10px 9px;
z-index: 1;
// &::after{
// position: absolute;
// left: 30%;
// top: -30%;
// display: flex;
// content:'';
// width: 0;
// height: 0;
// border-width: 13px;
// border-style: solid;
// border-color: transparent transparent rgba(26, 100, 204,0.5) transparent;
// // border-color: transparent transparent red transparent;
// transform: translate(-50%,0);
// }
}
color: #ffffff;
padding: 16px 8px 10px 9px;
z-index: 1;
cursor: default;
// &::after{
// position: absolute;
// left: 30%;
// top: -30%;
// display: flex;
// content:'';
// width: 0;
// height: 0;
// border-width: 13px;
// border-style: solid;
// border-color: transparent transparent rgba(26, 100, 204,0.5) transparent;
// // border-color: transparent transparent red transparent;
// transform: translate(-50%,0);
// }
}
}
}
}
&-tr:nth-child(2n) {
background: rgba(16, 75, 164, 0.24);
}
&-tr:nth-child(2n) {
background: rgba(16, 75, 164, 0.24);
}
&-tr:hover {
background: url('../../../../../../assets/img/modules/visual/hover-bac.png') no-repeat center;
background-size: 100% 100%;
}
//
.no-data{
width: 100%;
height: calc(100% - 50px);
display: flex;
align-items: center;
justify-content: center;
&-img{
width: 249px;
height: 172px;
}
&-tr:hover {
background: url("../../../../../../assets/img/modules/visual/hover-bac.png")
no-repeat center;
background-size: 100% 100%;
}
//
.no-data {
width: 100%;
height: calc(100% - 50px);
display: flex;
align-items: center;
justify-content: center;
&-img {
width: 249px;
height: 172px;
}
}
}
}
}
</style>
</style>

Loading…
Cancel
Save