Browse Source

Merge branch 'dev_zxc_work_log'

dev-map-local
wangxianzhang 3 years ago
parent
commit
b92ad764e4
  1. 162
      src/views/modules/communityService/worklog/workLog.vue
  2. 18
      src/views/modules/communityService/worklog/workLogDetail.vue
  3. 465
      src/views/modules/communityService/worklog/workLogForm.vue

162
src/views/modules/communityService/worklog/workLog.vue

@ -2,7 +2,7 @@
<div class="div_main"> <div class="div_main">
<div class="div_search"> <div class="div_search">
<el-form :inline="true" <el-form :inline="true"
:model="formData" :model="workLog"
ref="ref_searchform" ref="ref_searchform"
:label-width="'100px'"> :label-width="'100px'">
<div> <div>
@ -26,9 +26,9 @@
placeholder="请选择" placeholder="请选择"
clearable> clearable>
<el-option v-for="item in serviceTypeList" <el-option v-for="item in serviceTypeList"
:key="item.id" :key="item.serviceType"
:label="item.serviceTypeName" :label="item.serviceTypeName"
:value="item.id"> :value="item.serviceType">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -70,6 +70,18 @@
placeholder="请输入内容"> placeholder="请输入内容">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="服务时间"
prop="serviceTimeArea">
<el-date-picker v-model="serviceTimeArea"
clearable
type="daterange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
class="diy-button--search" class="diy-button--search"
size="small" size="small"
@ -126,7 +138,7 @@
<el-table-column prop="gridName" <el-table-column prop="gridName"
header-align="center" header-align="center"
align="center" align="center"
label="场所名称" label="所属网格"
min-width="100"> min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="serviceTypeName" <el-table-column prop="serviceTypeName"
@ -144,6 +156,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="applicantAddress" <el-table-column prop="applicantAddress"
header-align="center" header-align="center"
show-overflow-tooltip
align="center" align="center"
label="住址" label="住址"
width="80"> width="80">
@ -229,10 +242,10 @@
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="editDiaClose"> @closed="editDiaClose">
<ggfw-form ref="ref_form" <work-log-form ref="ref_form"
:typeList="typeList" :typeList="typeList"
@dialogCancle="addFormCancle" @dialogCancle="addFormCancle"
@dialogOk="addFormOk"></ggfw-form> @dialogOk="addFormOk"></work-log-form>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="detailShow" <el-dialog :visible.sync="detailShow"
@ -243,8 +256,8 @@
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="diaClose"> @closed="diaClose">
<ggfw-detail ref="ref_detail" <work-log-detail ref="ref_detail"
@diaClose="diaClose"></ggfw-detail> @diaClose="diaClose"></work-log-detail>
</el-dialog> </el-dialog>
</div> </div>
@ -264,36 +277,37 @@ export default {
data () { data () {
return { return {
loading: false, loading: false,
serviceTimeArea: '',
total: 0, total: 0,
pageSize: 20, pageSize: 20,
pageNo: 0, pageNo: 0,
tableLoading: false, tableLoading: false,
agencyId: '', agencyId: '',
unitList: [],//list
serviceList: [],//list
typeList: [],//list typeList: [],//list
formData: { formData: {
name: '', gridId: '',
category: '' serviceType: '',
applicantName: '',
applicantAddress: '',
applicantMobile: '',
serviceContent: '',
serviceTimeStart: '',
serviceTimeEnd: ''
}, },
tableData: [], tableData: [],
//form //form
formShow: false, formShow: false,
formTitle: '新增单位', formTitle: '新增',
detailShow: false, detailShow: false,
//
finishDiaTitle: '区域化党建单位完成情况',
finishDiaShow: false, finishDiaShow: false,
//
scoreDiaTitle: '积分记录',
scoreDiaShow: false, scoreDiaShow: false,
files: "", files: "",
fileName: "", fileName: "",
uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/icPublicService/import', uploadUlr: window.SITE_CONFIG['apiURL'] + '/heart/workdiaryService/record/import',
optionsG: [], optionsG: [],
optionsEditG: [], optionsEditG: [],
workLog: { workLog: {
@ -302,7 +316,9 @@ export default {
applicantName: '', applicantName: '',
applicantAddress: '', applicantAddress: '',
applicantMobile: '', applicantMobile: '',
serviceContent: '' serviceContent: '',
serviceTimeStart: '',
serviceTimeEnd: ''
}, },
serviceTypeList: [], serviceTypeList: [],
@ -316,15 +332,8 @@ export default {
this.getServiceTypeList(); this.getServiceTypeList();
}, },
async mounted () { async mounted () {
//
await this.loadService()
//
await this.loadType()
const { user } = this.$store.state const { user } = this.$store.state
this.agencyId = user.agencyId this.agencyId = user.agencyId
await this.loadTable() await this.loadTable()
}, },
@ -354,8 +363,8 @@ export default {
}); });
}, },
async getServiceTypeList () { async getServiceTypeList () {
let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page' // let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
// let url = '/heart/workdiaryService/serviceType/page' let url = '/heart/workdiaryService/serviceType/page'
let params = { let params = {
pageNo: 1, pageNo: 1,
pageSize: 10000 pageSize: 10000
@ -374,8 +383,8 @@ export default {
}); });
}, },
async handleExportModule () { async handleExportModule () {
// let url = "/heart/workdiaryService/record/downloadTemplate"; let url = "/heart/workdiaryService/record/downloadTemplate";
let url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/downloadTemplate"; // let url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/downloadTemplate";
let params = {}; let params = {};
await this.$http({ await this.$http({
@ -385,7 +394,6 @@ export default {
data: params, data: params,
}) })
.then((res) => { .then((res) => {
// this.download(res.data, title + '.xls')
if (res.headers["content-disposition"]) { if (res.headers["content-disposition"]) {
let fileName = window.decodeURI( let fileName = window.decodeURI(
res.headers["content-disposition"].split(";")[1].split("=")[1] res.headers["content-disposition"].split(";")[1].split("=")[1]
@ -411,48 +419,19 @@ export default {
}); });
}, },
//
async loadService () {
const url = "/gov/org/coverage/dict-select-list/public_service"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/public_service"
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 () {
const url = "/sys/dict/data/dictlist"
let params = {
dictType: 'party_unit_type'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.typeList = data
} else {
this.$message.error(msg)
}
},
async loadTable () { async loadTable () {
this.tableLoading = true this.tableLoading = true
// const url = "/gov/org/icPublicService/list" if (Array.isArray(this.serviceTimeArea) && this.serviceTimeArea.length > 0) {
const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/page" this.workLog.serviceTimeStart = this.serviceTimeArea[0];
this.workLog.serviceTimeEnd = this.serviceTimeArea[1];
}else {
this.workLog.serviceTimeStart = '';
this.workLog.serviceTimeEnd = '';
}
const url = "/heart/workdiaryService/record/page"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/page"
let params = { let params = {
pageSize: this.pageSize, pageSize: this.pageSize,
pageNo: this.pageNo, pageNo: this.pageNo,
@ -487,7 +466,6 @@ export default {
// //
handleFinish (row) { handleFinish (row) {
this.finishDiaTitle = row.name + '完成情况'
this.finishDiaShow = true this.finishDiaShow = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_finish.initTable(row) this.$refs.ref_finish.initTable(row)
@ -503,7 +481,7 @@ export default {
handleAdd () { handleAdd () {
this.formTitle = '新增' this.formTitle = '新增'
this.formShow = 'edit' this.formShow = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_form.initForm('add', null) this.$refs.ref_form.initForm('add', null)
}) })
@ -513,7 +491,7 @@ export default {
this.formTitle = '修改' this.formTitle = '修改'
this.formShow = true this.formShow = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_form.initForm('edit', row.icPublicServiceId) this.$refs.ref_form.initForm('edit', row)
}) })
}, },
@ -538,18 +516,15 @@ export default {
}) })
.catch(err => { .catch(err => {
if (err == "cancel") { if (err == "cancel") {
} }
}); });
}, },
async deleteUnit (row) { async deleteUnit (row) {
// const url = "/heart/workdiaryService/record/delete" const url = "/heart/workdiaryService/record/delete"
const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/delete" // const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/delete"
let params = { let params = [row.id]
ids: [row.applicantId]
}
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
this.$message({ this.$message({
@ -564,21 +539,30 @@ export default {
// //
resetSearch () { resetSearch () {
this.formData = { this.optionsG = []
name: '', this.demandUserList = []
category: '' this.workLog = {
gridId: '',
serviceType: '',
applicantName: '',
applicantAddress: '',
applicantMobile: '',
serviceContent: '',
serviceTimeStart: '',
serviceTimeEnd: ''
} }
this.serviceTimeArea = ''
this.pageSize = 10 this.pageSize = 10
this.pageNo = 0 this.pageNo = 0
// this.loadTable() this.loadTable()
}, },
// //
async handleExport () { async handleExport () {
let title = '工作日志' let title = '工作日志'
// const url = "/heart/workdiaryService/record/export" const url = "/heart/workdiaryService/record/export"
const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/export" // const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/export"
let params = { let params = {
...this.workLog ...this.workLog
} }
@ -655,8 +639,8 @@ export default {
// //
this.$refs['upload'].clearFiles() this.$refs['upload'].clearFiles()
// var url = '/heart/workdiaryService/record/import' var url = '/heart/workdiaryService/record/import'
var url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/import' // var url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/import'
let fileFormData = new FormData(); let fileFormData = new FormData();
fileFormData.append('file', this.files);//filenamefiletest.zip fileFormData.append('file', this.files);//filenamefiletest.zip

18
src/views/modules/communityService/worklog/workLogDetail.vue

@ -7,38 +7,40 @@
:model="formData" :model="formData"
class="form"> class="form">
<el-form-item label="服务类型" <el-form-item label="服务类型"
prop="serviceTypeName" prop="serviceTypeName"
label-width="150px" label-width="150px"
style="display: block"> style="display: block"
class="input-width">
<span>{{formData.serviceTypeName}}</span> <span>{{formData.serviceTypeName}}</span>
</el-form-item> </el-form-item>
<el-form-item label="所属网格" <el-form-item label="所属网格"
prop="gridName" prop="gridName"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<span>{{formData.gridName}}</span> <span>{{formData.gridName}}</span>
</el-form-item> </el-form-item>
<el-form-item label="申请人" <el-form-item label="申请人"
prop="applicantName" prop="applicantName"
label-width="150px" label-width="150px"
class="input-width"
style="display: block"> style="display: block">
<span>{{formData.areaCovered}}</span> <span>{{formData.applicantName}}</span>
</el-form-item> </el-form-item>
<el-form-item label="住址" <el-form-item label="住址"
prop="capacity" prop="capacity"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<span>{{formData.applicantAddress}}</span> <span>{{formData.applicantAddress}}</span>
</el-form-item> </el-form-item>
<el-form-item label="服务内容:" <el-form-item label="服务内容:"
prop="principal" prop="serviceContent"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<span>{{formData.applicantContent}}</span> <span>{{formData.serviceContent}}</span>
</el-form-item> </el-form-item>
<el-form-item label="联系电话:" <el-form-item label="联系电话:"
prop="mobile" prop="mobile"

465
src/views/modules/communityService/worklog/workLogForm.vue

@ -9,91 +9,113 @@
:disabled="formType === 'detail'" :disabled="formType === 'detail'"
class="form"> class="form">
<el-form-item label="场所名称" <el-form-item label="所属网格"
prop="name"
label-width="150px" label-width="150px"
style="display: block"> style="display: block"
<el-input class="item_width_1" prop="gridId">
maxlength="50" <el-select v-model="formData.gridId"
show-word-limit
placeholder="请输入场所名称"
v-model="formData.name">
</el-input>
</el-form-item>
<el-form-item label="场所类型"
prop="category"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.category"
placeholder="请选择"
filterable filterable
placeholder="请选择"
@change="handleGridChange"
clearable> clearable>
<el-option v-for="item in serviceList" <el-option v-for="item in optionsG"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="占地面积" <el-form-item label="服务类型"
label-width="150px"
style="display: block" style="display: block"
prop="areaCovered" prop="serviceType">
label-width="150px"> <el-select v-model="formData.serviceType" filterable placeholder="请选择"
<el-input-number class="item_width_4" clearable>
v-model="formData.areaCovered" <el-option v-for="item in serviceTypeList"
:precision="2" :key="item.serviceType"
:step="0.01" :label="item.serviceTypeName"
:min="0" :value="item.serviceType">
:max="9600000" </el-option>
label="占地面积"></el-input-number> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="容纳人数"
<el-form-item label="申请人"
label-width="150px"
style="display: block" style="display: block"
prop="capacity" prop="applicantId">
label-width="150px"> <el-select v-model="formData.applicantId"
<el-input-number class="item_width_4" filterable
v-model="formData.capacity" placeholder="请选择"
:min="0" @change="handleUserChange"
:max="9999" clearable>
label="容纳人数"></el-input-number> <el-option v-for="item in demandUserList"
:key="item.demandUserId"
:label="item.demandUserName + '(' +item.idCard + ')'"
:value="item.demandUserId">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="负责人" <el-form-item label="住址"
style="display: block" style="display: block"
label-width="150px" label-width="150px"
prop="principal"> prop="applicantAddress">
<el-input v-model="formData.principal" <el-input v-model="formData.applicantAddress"
class="item_width_1" class="item_width_1"
placeholder="请输入负责人姓名"></el-input> placeholder="请输入住址"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="服务内容"
style="display: block"
label-width="150px"
prop="serviceContent">
<el-input v-model="formData.serviceContent"
class="item_width_1"
type="textarea"
placeholder="请输入服务内容"></el-input>
</el-form-item>
<el-form-item label="联系电话" <el-form-item label="联系电话"
style="display: block" style="display: block"
label-width="150px" label-width="150px"
prop="mobile"> prop="applicantMobile">
<el-input v-model="formData.mobile" <el-input v-model="formData.applicantMobile"
class="item_width_1" class="item_width_1"
placeholder="请输入联系电话"></el-input> placeholder="请输入联系电话"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="地址"
prop="address" <el-form-item label="负责人"
style="display: block"
label-width="150px" label-width="150px"
style="display: block"> prop="principalName">
<div class="item_width_1"> <el-input v-model="formData.principalName"
<el-input style="width:420px" class="item_width_1"
:placeholder="'请输入所在地址'" placeholder="请输入负责人"></el-input>
v-model="formData.address">
</el-input>
<el-button style="margin-left: 10px"
type="default"
size="small"
@click="handleSearchMap">查询</el-button>
<div id="app"
class="div_map"></div>
</div>
</el-form-item> </el-form-item>
<el-form-item label="服务时间"
style="display: block"
label-width="150px"
prop="serviceTime">
<el-date-picker v-model="formData.serviceTime"
type="date"
class="input-width"
clearable
value-format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="备注"
style="display: block"
label-width="150px"
prop="remark">
<el-input v-model="formData.remark"
class="item_width_1"
type="textarea"
placeholder="请输入备注"></el-input>
</el-form-item>
</el-form> </el-form>
</div> </div>
@ -110,9 +132,9 @@
</template> </template>
<script> <script>
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request' import { requestPost } from '@/js/dai/request'
import {requestGet} from "../../../../js/dai/request";
@ -127,102 +149,140 @@ export default {
data () { data () {
return { return {
formType: 'add', // addeditdetail formType: 'add', // addeditdetail
agencyId: '',
btnDisable: false, btnDisable: false,
disabled: false,
icPublicServiceId: '', applicantId: '',
keyWords: '', keyWords: '',
formData: { formData: {
name: '',// serviceType: '',
category: '', serviceTypeName: '',
areaCovered: '',// gridId: '',
capacity: '',// gridName: '',
address: '', // applicantAddress: '',
longitude: 36.0722275, // applicantName: '',
latitude: 120.38945519, // applicantId: '',
principal: '', serviceContent: '',
mobile: '' applicantMobile: '',
principalName: '',
serviceTime: '',
remark: ''
}, },
serviceList: [],//list optionsG: [],
serviceTypeList: [],
publicServiceData: {}, publicServiceData: {},
demandUserList: [],
} }
}, },
components: {}, components: {},
async created () {
this.getGridList('query')
this.getServiceTypeList()
// this.getDemandUserList()
},
mounted () { mounted () {
}, },
methods: { methods: {
async initForm (type, icPublicServiceId) { async initForm (type, row) {
this.startLoading() this.startLoading()
this.$refs.ref_form.resetFields(); this.$refs.ref_form.resetFields();
// //
await this.loadService() await this.getServiceTypeList()
this.getGridList(type)
this.formType = type this.formType = type
if (icPublicServiceId) { if (type === 'edit'){
this.icPublicServiceId = icPublicServiceId this.formData = row
this.formData.icPublicServiceId = icPublicServiceId this.getDemandUserList(this.formData.gridId)
await this.loadFormData() this.serviceTypeList.forEach(s => {
} else { if (s.serviceType === this.formData.serviceType){
// map.setCenter(new TMap.LatLng(36.0722275, 120.38945519)) this.disabled = s.enabled === 1 ? true : false
// this.setMarker(36.0722275, 120.38945519) }
})
if (!this.disabled){
this.formData.serviceType = ''
}
} }
this.endLoading() this.endLoading()
}, },
// //
async loadService () { async getServiceTypeList () {
const url = "/gov/org/coverage/dict-select-list/public_service" const url = "/heart/workdiaryService/serviceType/avaliableList"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/public_service" // let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
let params = { let params = {
pageNo: 1,
pageSize: 10000
} }
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
this.serviceList = data this.serviceTypeList = data.list
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
}, },
async getDemandUserList (gridId) {
const { user } = await this.$store.state;
const params = {
agencyId: user.agencyId,
gridId: gridId,
name: "",
};
// addorupdate
await this.$http
.post("/epmetuser/icresiuser/demandusers", params)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
this.demandUserList = res.data;
console.log(this.demandUserList)
}
})
.catch(() => {
return this.$message.error("网络错误");
});
},
// //
async loadFormData () { async getGridList (type) {
const url = '/gov/org/icPublicService/detail' const { user } = await this.$store.state;
const url = '/gov/org/customergrid/gridoption'
// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail' // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail'
let params = { let params = {
icPublicServiceId: this.icPublicServiceId agencyId: user.agencyId,
purpose: type,
} }
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
console.log(data) this.optionsG = data;
if (null != data) { } else {
data: this.publicServiceData this.$message.error(msg)
} }
},
this.formData = { ...data } handleGridChange (val) {
// let { latitude, longitude } = this.$store.state.user; this.getDemandUserList(this.formData.gridId);
// const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude; },
// const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude; async handleUserChange () {
if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== '') { let homeId
map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude)) this.demandUserList.forEach(d => {
this.setMarker(this.formData.latitude, this.formData.longitude) if (d.demandUserId === this.formData.applicantId){
homeId = d.houseId
this.formData.applicantMobile = d.demandUserMobile
} }
})
let url = '/gov/org/ichouse/'+homeId
let params = {}
const { data, code, msg } = await requestGet(url)
if (code === 0) {
this.formData.applicantAddress = data.fullName
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
}, },
async handleComfirm () { async handleComfirm () {
this.btnDisable = true this.btnDisable = true
setTimeout(() => { setTimeout(() => {
this.btnDisable = false this.btnDisable = false
@ -234,17 +294,16 @@ export default {
} else { } else {
this.addUnit() this.addUnit()
} }
}) })
}, },
async addUnit () { async addUnit () {
let url = '' let url = ''
if (this.formType === 'add') { if (this.formType === 'add') {
url = '/gov/org/icPublicService/add' url = '/heart/workdiaryService/record/save'
// url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/save'
} else { } else {
url = '/gov/org/icPublicService/edit' url = '/heart/workdiaryService/record/update'
// url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/update'
} }
const { data, code, msg, internalMsg } = await requestPost(url, this.formData) const { data, code, msg, internalMsg } = await requestPost(url, this.formData)
if (code === 0) { if (code === 0) {
@ -257,7 +316,7 @@ export default {
this.btnDisable = false this.btnDisable = false
} else { } else {
this.btnDisable = false this.btnDisable = false
this.$message.error(internalMsg) this.$message.error(msg)
} }
}, },
@ -267,138 +326,21 @@ export default {
this.$emit('dialogCancle') this.$emit('dialogCancle')
}, },
// init
initMap () {
let { latitude, longitude } = this.$store.state.user;
console.log('lat' + latitude + ',lon' + longitude)
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
//
var center = new window.TMap.LatLng(latitude, longitude);
// 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.formData.address,
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) => {
console.log(this.formData)
// this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address
this.formData.address = this.formData.address !== '' && this.formData.address !== null && (this.formData.longitude === '' || this.formData.longitude === null) ? this.formData.address : result.result.address
//
});
},
resetData () { resetData () {
this.icPublicServiceId = '' this.demandUserList = []
this.keyWords = '' this.optionsG = []
this.disabled = false
this.formData = { this.formData = {
name: '', serviceType: 0,
category: '', gridId: '',
areaCovered: '', applicantAddress: '',
capacity: '', applicantName: '',
address: '', // applicantId: '',
longitude: '', // serviceContent: '',
latitude: '' // applicantMobile: '',
principalName: '',
serviceTime: '',
remark: ''
} }
}, },
// //
@ -420,22 +362,27 @@ export default {
computed: { computed: {
dataRule () { dataRule () {
return { return {
gridId: [
name: [ { required: true, message: '所属网格不能为空', trigger: 'blur' },
{ required: true, message: '场所名称不能为空', trigger: 'blur' }, ],
serviceType: [
{ required: true, message: '服务类型不能为空', trigger: 'blur' }
],
applicantAddress: [
{ required: true, message: '住址不能为空', trigger: 'blur' }
], ],
category: [ applicantId: [
{ required: true, message: '场所类别不能为空', trigger: 'blur' } { required: true, message: '申请人不能为空', trigger: 'blur' }
], ],
address: [ serviceContent: [
{ required: true, message: '地址不能为空', trigger: 'blur' } { required: true, message: '服务内容不能为空', trigger: 'blur' }
], ],
/*longitude: [ serviceTime: [
{ required: true, message: '坐标不能为空', trigger: 'blur' } { required: true, message: '服务时间不能为空', trigger: 'blur' }
], ],
latitude: [ applicantMobile: [
{ required: true, message: '坐标不能为空', trigger: 'blur' } { required: true, message: '联系电话不能为空', trigger: 'blur' }
]*/ ]
} }
}, },

Loading…
Cancel
Save