Browse Source

bug

shibei_master
zhaoyongnian 3 years ago
parent
commit
602cb0a252
  1. 22
      src/views/modules/visual/communityParty/gridParty.vue
  2. 6
      src/views/modules/visual/communityParty/memberInfo.vue
  3. 12
      src/views/modules/visual/components/screen-map/index.vue

22
src/views/modules/visual/communityParty/gridParty.vue

@ -10,8 +10,7 @@
:options="propTree" :options="propTree"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
:show-all-levels="false" :show-all-levels="false"
:getCheckedNodes="getCheckedNodes" :getCheckedNodes="getCheckedNodes"
clearable
@change="handleCascader"> @change="handleCascader">
</el-cascader> </el-cascader>
</div> </div>
@ -166,8 +165,9 @@ export default {
] ]
await this.loadOrgData() await this.loadOrgData()
await this.getWorkUserInfo() await this.getWorkUserInfo()
this.loadMap() // this.loadMap()
this.isfirstInit = false this.getMapData()
// this.isfirstInit = false
// end // end
}, },
methods: { methods: {
@ -189,7 +189,6 @@ export default {
// }; // };
const { data, code, msg } = await requestPost(url); const { data, code, msg } = await requestPost(url);
if (code === 0) { if (code === 0) {
console.log('data-org----o', data)
this.selectAgency = [`${data.agencyId}-${data.level}`] this.selectAgency = [`${data.agencyId}-${data.level}`]
this.orgType = data.level this.orgType = data.level
this.agencyId = data.agencyId this.agencyId = data.agencyId
@ -230,7 +229,6 @@ export default {
}, },
// //
async handleCascader(val) { async handleCascader(val) {
console.log('val-vvv', val)
const _arr = val[val.length - 1].split('-') const _arr = val[val.length - 1].split('-')
const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
this.agencyId = _arr[0] this.agencyId = _arr[0]
@ -238,7 +236,6 @@ export default {
this.orgType = orgType this.orgType = orgType
this.noEduInit = false this.noEduInit = false
this.agencyInfo = { ...this.orgData } this.agencyInfo = { ...this.orgData }
console.log('agencyInfo-----', this.agencyInfo)
this.eduCode = '' this.eduCode = ''
await this.loadOrgData() await this.loadOrgData()
this.getEduCount(_arr[0]) this.getEduCount(_arr[0])
@ -342,7 +339,6 @@ export default {
} }
}; };
console.log('zlcm')
} else { } else {
element.isClick = false element.isClick = false
element.label = { element.label = {
@ -400,7 +396,6 @@ export default {
this.visibleLoading = false this.visibleLoading = false
}, },
pieInitOks (dom) { pieInitOks (dom) {
console.log('pies准备好了', dom)
this.pieEduChartS = dom this.pieEduChartS = dom
// this.pieInitState = true // this.pieInitState = true
}, },
@ -424,7 +419,6 @@ export default {
this.showedUnitMoreInfo = true this.showedUnitMoreInfo = true
this.unitAclist = data.list this.unitAclist = data.list
this.$nextTick(() => { this.$nextTick(() => {
console.log(this.unitAclist[0].demandRecId)
this.$refs['unitdetailInfo'].getDetail(this.unitAclist[0].demandRecId) this.$refs['unitdetailInfo'].getDetail(this.unitAclist[0].demandRecId)
}) })
} else { } else {
@ -511,10 +505,11 @@ export default {
window.app.ajax.post( window.app.ajax.post(
url, url,
params, params,
(data, rspMsg) => { (data, rspMsg) => {
this.unitMapList = data this.unitMapList = data
this.isfirstInit = false
this.loadMap() this.loadMap()
this.isfirstInit = false
this.$refs.map.handleClosePopup()
}, },
(rspMsg, data) => { (rspMsg, data) => {
this.$message.error(rspMsg) this.$message.error(rspMsg)
@ -526,9 +521,7 @@ export default {
this.userId = '' this.userId = ''
const featureInfo = feature.values_.properties.info const featureInfo = feature.values_.properties.info
this.userId = feature.values_.properties.info.id this.userId = feature.values_.properties.info.id
console.log('feature.values_.properties.info:::', JSON.stringify(feature.values_.properties.info))
let coordinate = [featureInfo.longitude, featureInfo.latitude] let coordinate = [featureInfo.longitude, featureInfo.latitude]
console.log(feature.values_.properties.info)
let showData = ` let showData = `
<div style='font-size:16px; color:#FFFFFF;'>个人信息</div> <div style='font-size:16px; color:#FFFFFF;'>个人信息</div>
<div style='font-size:12px; color:#FFFFFF;margin-top:10px'>姓名 <div style='font-size:12px; color:#FFFFFF;margin-top:10px'>姓名
@ -557,7 +550,6 @@ export default {
}, },
lookMore(e) { lookMore(e) {
this.userId = this.userId this.userId = this.userId
console.log('userId:', this.userId)
this.showedMoreInfo = true this.showedMoreInfo = true
} }
}, },

6
src/views/modules/visual/communityParty/memberInfo.vue

@ -29,6 +29,10 @@
<span class="item-field">需求类型</span> <span class="item-field">需求类型</span>
<span v-if="info.categoryName">{{ info.categoryName }}</span> <span v-if="info.categoryName">{{ info.categoryName }}</span>
</div> </div>
<div class="item">
<span class="item-field">上报类型</span>
<span v-if="info.reportTypeName">{{ info.reportTypeName }}</span>
</div>
<div class="item"> <div class="item">
<span class="item-field">上报人</span> <span class="item-field">上报人</span>
<span v-if="info.reportUserName">{{ info.reportUserName }}</span> <span v-if="info.reportUserName">{{ info.reportUserName }}</span>
@ -171,7 +175,7 @@ export default {
margin-bottom: 0; margin-bottom: 0;
.list { .list {
display: block; display: block;
width: 50%; width: auto;
.item { .item {
display: flex; display: flex;
width: 100%; width: 100%;

12
src/views/modules/visual/components/screen-map/index.vue

@ -33,7 +33,8 @@
<div id="popup-content" <div id="popup-content"
class="popup-content"></div> class="popup-content"></div>
<a href="#" <a href="#"
id="popup-goMore">更多>>>></a> id="popup-goMore"
class="popup-goMore">更多>>>></a>
</div> </div>
</div> </div>
</template> </template>
@ -745,6 +746,12 @@ const vueGis = {
// overlay x,y // overlay x,y
}, },
//
handleClosePopup() {
this.overlay.setPosition(undefined);
document.getElementById("popup-closer").blur();
return false;
},
// //
getRndBetween (lowerLimit, upperLimit) { getRndBetween (lowerLimit, upperLimit) {
@ -888,6 +895,9 @@ export default vueGis;
.popup-content { .popup-content {
width: 300px; width: 300px;
} }
.popup-goMore{
margin: 20px 0;
}
.ol-popup-closer:after { .ol-popup-closer:after {
content: "✖"; content: "✖";
// color: rgba(1, 17, 104, 1); // color: rgba(1, 17, 104, 1);

Loading…
Cancel
Save