Browse Source

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

shibei_master
dai 3 years ago
parent
commit
53a6e371e4
  1. 1
      .env.development
  2. 3
      src/views/modules/communityParty/regionalParty/activitys.vue
  3. 2
      src/views/modules/communityParty/regionalParty/activitysForm.vue
  4. 44
      src/views/modules/shequzhili/csgltc/csglDetail.vue
  5. 74
      src/views/modules/shequzhili/csgltc/csglForm.vue
  6. 34
      src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
  7. 73
      src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
  8. 149
      src/views/modules/shequzhili/tuceng/zhonghe/base.vue
  9. 9
      src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

1
.env.development

@ -1,6 +1,7 @@
NODE_ENV=development
# VUE_APP_API_SERVER = http://epmet-dev.elinkservice.cn:41080/api
VUE_APP_API_SERVER = http://192.168.1.140/api
# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api

3
src/views/modules/communityParty/regionalParty/activitys.vue

@ -223,7 +223,6 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
:destroy-on-close="true"
width="950px"
top="5vh"
class="dialog-h"
@ -429,6 +428,7 @@ export default {
diaClose () {
this.$refs.ref_form.resetData()
this.formShow = false
},
@ -449,6 +449,7 @@ export default {
handleAdd () {
this.formTitle = '新增'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('add', null)

2
src/views/modules/communityParty/regionalParty/activitysForm.vue

@ -258,7 +258,7 @@ export default {
latitude: 120.38945519 //
},
serviceList: [],
gridList: [],
// gridList: [],
agencyId: ''
}

44
src/views/modules/shequzhili/csgltc/csglDetail.vue

@ -11,7 +11,7 @@
prop="name"
label-width="150px"
style="display: block">
<span class="detail_span">{{formData.name}}</span>
<span>{{formData.name}}</span>
</el-form-item>
<el-form-item label="场所类别:"
@ -19,51 +19,32 @@
label-width="150px"
style="display: block">
<span class="detail_span">{{formData.categoryName}}</span>
<span>{{formData.categoryName}}</span>
</el-form-item>
<el-form-item label="占地面积:"
prop="areaCovered"
label-width="150px"
style="display: block">
<span class="detail_span">{{formData.areaCovered}}</span>
<span>{{formData.areaCovered}}</span>
</el-form-item>
<el-form-item label="容纳人数:"
prop="capacity"
label-width="150px"
style="display: block">
<span class="detail_span">{{formData.capacity}}</span>
<span>{{formData.capacity}}</span>
</el-form-item>
<el-form-item label="地址:"
style="display: block"
prop="address"
label-width="150px">
<span class="detail_span">{{formData.address}}</span>
</el-form-item>
<el-form-item label="位置坐标"
prop="longitude"
label-width="150px"
style="display: block">
<div style="width: 500px">
<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">
</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 class="item_width_1">
<span>{{formData.address}}</span>
<div id="app" class="div_map"></div>
</div>
</el-form-item>
</el-form>
</div>
@ -118,7 +99,14 @@ export default {
// init
initMap () {
//
var center = new window.TMap.LatLng(36.0722275, 120.38945519)
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, //

74
src/views/modules/shequzhili/csgltc/csglForm.vue

@ -65,7 +65,7 @@
:precision="2"
:step="0.01"
:min="0"
:max="9999"
:max="9600000"
label="占地面积"></el-input-number>
</el-form-item>
<el-form-item label="容纳人数"
@ -82,51 +82,18 @@
prop="address"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder="请输入地址名称"
<div class="item_width_1">
<el-input
style="width:420px"
:placeholder="'请输入所在地址'"
v-model="formData.address">
</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"
<el-button
style="margin-left: 10px"
type="default"
size="small"
@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 id="app" class="div_map"></div>
</div>
</el-form-item>
</el-form>
@ -201,8 +168,8 @@ export default {
this.formData.icCityManagementId = icCityManagementId
await this.loadFormData()
} else {
map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
this.setMarker(36.0722275, 120.38945519)
// map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
// this.setMarker(36.0722275, 120.38945519)
}
this.endLoading()
@ -242,8 +209,9 @@ export default {
data : this.cityManagement
}
this.formData = { ...data }
const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude;
const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude;
let { latitude, longitude } = this.$store.state.user;
const lat = this.formData.latitude === null || this.formData.latitude === '' ? latitude : this.formData.latitude;
const lon = this.formData.longitude === null || this.formData.longitude === '' ? longitude : this.formData.longitude;
map.setCenter(new TMap.LatLng(lat,lon))
this.setMarker(lat,lon)
} else {
@ -302,7 +270,15 @@ export default {
// init
initMap () {
//
var center = new window.TMap.LatLng(36.52799, 120.7553)
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);
// var center = new window.TMap.LatLng(36.52799, 120.7553)
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
center: center, //
@ -352,7 +328,7 @@ export default {
//
search
.searchRectangle({
keyword: this.keyWords,
keyword: this.formData.address,
bounds: map.getBounds()
})
.then((result) => {

34
src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue

@ -11,7 +11,7 @@
prop="name"
label-width="150px"
style="display: block">
<span class="detail_span">{{formData.name}}</span>
<span>{{formData.name}}</span>
</el-form-item>
<el-form-item label="场所类别:"
@ -19,49 +19,29 @@
label-width="150px"
style="display: block">
<span class="detail_span">{{formData.categoryName}}</span>
<span>{{formData.categoryName}}</span>
</el-form-item>
<el-form-item label="占地面积:"
prop="areaCovered"
label-width="150px"
style="display: block">
<span class="detail_span">{{formData.areaCovered}}</span>
<span>{{formData.areaCovered}}</span>
</el-form-item>
<el-form-item label="容纳人数:"
prop="capacity"
label-width="150px"
style="display: block">
<span class="detail_span">{{formData.capacity}}</span>
<span>{{formData.capacity}}</span>
</el-form-item>
<el-form-item label="地址:"
style="display: block"
prop="address"
label-width="150px">
<span class="detail_span">{{formData.address}}</span>
</el-form-item>
<el-form-item label="位置坐标"
prop="longitude"
label-width="150px"
style="display: block">
<div style="width: 500px">
<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">
</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 class="item_width_1">
<span>{{formData.address}}</span>
<div id="app" class="div_map"></div>
</div>
</el-form-item>
</el-form>

73
src/views/modules/shequzhili/ggfwtc/ggfwForm.vue

@ -47,7 +47,7 @@
:precision="2"
:step="0.01"
:min="0"
:max="9999"
:max="9600000"
label="占地面积"></el-input-number>
</el-form-item>
<el-form-item label="容纳人数"
@ -64,48 +64,18 @@
prop="address"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
<div class="item_width_1">
<el-input
style="width:420px"
:placeholder="'请输入所在地址'"
v-model="formData.address">
</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"
<el-button
style="margin-left: 10px"
type="default"
size="small"
@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 id="app" class="div_map"></div>
</div>
</el-form-item>
</el-form>
@ -179,8 +149,8 @@
this.formData.icPublicServiceId = icPublicServiceId
await this.loadFormData()
} else {
map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
this.setMarker(36.0722275, 120.38945519)
// map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
// this.setMarker(36.0722275, 120.38945519)
}
this.endLoading()
@ -220,8 +190,9 @@
}
this.formData = { ...data }
const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude;
const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude;
let { latitude, longitude } = this.$store.state.user;
const lat = this.formData.latitude === null || this.formData.latitude === '' ? latitude : this.formData.latitude;
const lon = this.formData.longitude === null || this.formData.longitude === '' ? longitude : this.formData.longitude;
map.setCenter(new TMap.LatLng(lat, lon))
this.setMarker(lat, lon)
} else {
@ -280,8 +251,14 @@
// 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(36.0722275, 120.38945519)
var center = new window.TMap.LatLng(latitude, longitude);
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
center: center, //
@ -331,7 +308,7 @@
//
search
.searchRectangle({
keyword: this.keyWords,
keyword: this.formData.address,
bounds: map.getBounds()
})
.then((result) => {
@ -432,12 +409,12 @@
address: [
{ required: true, message: '地址不能为空', trigger: 'blur' }
],
longitude: [
/*longitude: [
{ required: true, message: '坐标不能为空', trigger: 'blur' }
],
latitude: [
{ required: true, message: '坐标不能为空', trigger: 'blur' }
]
]*/
}
},

149
src/views/modules/shequzhili/tuceng/zhonghe/base.vue

@ -9,7 +9,19 @@
class="demo-form-inline"
>
<div>
<el-form-item prop="gridId" label="所属网格">
<el-form-item prop="gridId" label="所属组织">
<div class="resi-cell-value">
<el-cascader class="customer_cascader"
ref="myCascader"
clearable
v-model="agencyIdArray"
:options="orgOptions"
:props="orgOptionProps"
:show-all-levels="false"
@change="handleChangeAgency"></el-cascader>
</div>
</el-form-item>
<!-- <el-form-item prop="gridId" label="所属网格">
<div class="resi-cell-value">
<el-select
v-model.trim="fmData.gridId"
@ -28,7 +40,8 @@
</el-option>
</el-select>
</div>
</el-form-item>
</el-form-item> -->
<el-form-item label="所属房屋">
<div class="resi-cell-value">
<div class="resi-cell-col">
@ -331,6 +344,15 @@ export default {
optionsH: [],
optionsD: [],
optionsG: [],
orgOptions: [],
orgOptionProps:{
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
},
agencyIdArray:[],
optionsWelfare: [
{
@ -344,6 +366,7 @@ export default {
],
fmData: {
agencyId:"",
gridId: "",
villageId: "",
buildId: "",
@ -410,6 +433,7 @@ export default {
},
},
mounted() {
this.getOrgTreeList();
this.getGridList();
this.getValiheList();
this.getTableData();
@ -465,6 +489,24 @@ export default {
this.getHouseList();
},
getOrgTreeList() {
const { user } = this.$store.state
this.$http
.post('/gov/org/customeragency/agencygridtree', {})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取组织树成功', res.data)
this.orgOptions=[]
this.orgOptions .push( res.data)
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
getGridList() {
const { user } = this.$store.state;
this.$http
@ -489,7 +531,7 @@ export default {
this.$http
.post("/gov/org/icneighborhood/neighborhoodoption", {
gridId: this.fmData.gridId,
agencyId: "",
agencyId: this.fmData.agencyId,
// agencyId: user.agencyId
})
.then(({ data: res }) => {
@ -579,62 +621,125 @@ export default {
this.handleSearch();
},
handleChangeAgency(val) {
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
if (obj) {
if(obj.level === 'grid'){
this.fmData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.fmData.agencyId=''
}else{
this.fmData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.fmData.gridId = ''
}
}else{
this.fmData.agencyId=''
this.fmData.gridId = ''
}
this.fmData.villageId = ''
this.fmData.buildId = ''
this.fmData.unitId = ''
this.fmData.homeId = ''
this.getValiheList()
},
computeQueryParams() {
const { pageSize, pageNo, elseParams, fmData } = this;
let conditions=[]
if(fmData.agencyId){
conditions.push({
queryType: "like",
tableName: "ic_resi_user",
columnName: "AGENCY_ID",
columnValue: [fmData.agencyId],
},)
}
return {
formCode: "resi_base_info",
pageSize,
pageNo,
conditions: [
if(fmData.gridId){
conditions.push(
{
queryType: "equal",
tableName: "ic_resi_user",
columnName: "GRID_ID",
columnValue: [fmData.gridId],
},
}
)
}
if(fmData.villageId){
conditions.push(
{
queryType: "equal",
tableName: "ic_resi_user",
columnName: "VILLAGE_ID",
columnValue: [fmData.villageId],
},
{
}
)
}
if(fmData.buildId){
conditions.push({
queryType: "equal",
tableName: "ic_resi_user",
columnName: "BUILD_ID",
columnValue: [fmData.buildId],
},
{
})
}
if(fmData.unitId){
conditions.push({
queryType: "equal",
tableName: "ic_resi_user",
columnName: "UNIT_ID",
columnValue: [fmData.unitId],
},
{
})
}
if(fmData.homeId){
conditions.push({
queryType: "equal",
tableName: "ic_resi_user",
columnName: "HOME_ID",
columnValue: [fmData.homeId],
},
{
})
}
if(fmData.name){
conditions.push({
queryType: "like",
tableName: "ic_resi_user",
columnName: "NAME",
columnValue: [fmData.name],
},
{
})
}
if(fmData.mobile){
conditions.push({
queryType: "like",
tableName: "ic_resi_user",
columnName: "MOBILE",
columnValue: [fmData.mobile],
},
{
})
}
if(fmData.idCard){
conditions.push({
queryType: "like",
tableName: "ic_resi_user",
columnName: "ID_CARD",
columnValue: [fmData.idCard],
},
})
}
return {
formCode: "resi_base_info",
pageSize,
pageNo,
conditions: [
...conditions,
...elseParams,
],
};

9
src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

@ -305,7 +305,7 @@
</div>
</div>
<div v-show="selPlaceType==='enterprise_partrol'">
<div v-show="selPlaceType==='enterprise_patrol'">
<div class="popTitle">企事业信息</div>
<div class="popContentTitle">场所类型
<span>{{ selInfo.placeTypeName }}</span>
@ -782,10 +782,11 @@ const vueGis = {
this.loadGroupRent(info)
}
if (info.placeType === 'party_unit') {//
this.loadPartyUnit(info)
}
if (info.placeType === 'enterprise_partrol') {//
if (info.placeType === 'enterprise_patrol') {//
this.loadEnterprisePartrol(info)
}
@ -1009,10 +1010,10 @@ const vueGis = {
},
async loadEnterprisePartrol (info) {
const url = "/gov/org/enterprise/detail"
const url = "/gov/org/enterprise/detail/" + info.id
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail"
const { data, code, msg } = await requestGet(url)
const { data, code, msg } = await requestPost(url)
if (code === 0) {
// debugger

Loading…
Cancel
Save