elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-fivelayer0725'

master
dai 3 years ago
parent
e572c76812 366636f0da
commit
1012f883e2
13 changed files with 695 additions and 557 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      src/assets/img/shuju/command/close.png
  2. 21
      src/assets/scss/modules/visual/command.scss
  3. 8
      src/views/modules/communityParty/regionalParty/units.vue
  4. 4
      src/views/modules/communityService/fuwujilu/addForm.vue
  5. 773
      src/views/modules/communityService/measure/info.vue
  6. 15
      src/views/modules/communityService/sqzzz/index.vue
  7. 1
      src/views/modules/visual/command/cpts/demandInfo.vue
  8. 56
      src/views/modules/visual/command/cpts/eventInfo.vue
  9. 10
      src/views/modules/visual/command/cpts/map.vue
  10. 4
      src/views/modules/visual/command/cpts/popup.vue
  11. 55
      src/views/modules/visual/command/cpts/serviceInfo.vue
  12. 2
      src/views/modules/visual/command/cpts/sidemenu-left.vue
  13. 303
      src/views/modules/visual/command/index.vue

BIN
src/assets/img/shuju/command/close.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 425 B

21
src/assets/scss/modules/visual/command.scss
View File

@ -81,7 +81,7 @@
box-shadow: 0px 4px 8px 0px rgba(147, 147, 147, 0.26); box-shadow: 0px 4px 8px 0px rgba(147, 147, 147, 0.26);
> input { > input {
width: 420px; width: 400px;
border: none; border: none;
line-height: 45px; line-height: 45px;
font-size: 18px; font-size: 18px;
@ -90,10 +90,17 @@
color: #333333; color: #333333;
} }
> img { .i-search {
margin: 0 16px; margin: 0 16px;
width: 30px; width: 24px;
height: 30px; height: 24px;
}
.i-close {
margin-left: 15px;
opacity: 0.2;
width: 20px;
cursor: pointer;
} }
.btn { .btn {
@ -206,7 +213,11 @@
} }
.list { .list {
min-height: 780px; margin-right: -8px;
height: calc(825px - 120px);
overflow-y: auto;
overflow-x: hidden;
@include scrollBar;
} }
} }

8
src/views/modules/communityParty/regionalParty/units.vue
View File

@ -574,16 +574,12 @@ export default {
if (code === 0) { if (code === 0) {
if (data.type) { if (data.type) {
if (data.msg) {
this.$message({ this.$message({
type: "success", type: "success",
message: "同步成功" message: data.msg || "同步成功"
}); });
this.loadTable() this.loadTable()
} else {
this.$message.error(data.msg)
}
} else { } else {
this.$message.error(data.msg) this.$message.error(data.msg)
} }

4
src/views/modules/communityService/fuwujilu/addForm.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<div :class="{'visiual-form':source==='visiual'}"> <div class="dialog-h-content scroll-h" :class="{'visiual-form':source==='visiual'}">
<el-form v-if="formType==='add'" <el-form v-if="formType==='add'"
ref="ref_form" ref="ref_form"
@ -146,6 +146,7 @@
<el-date-picker v-model="formData.serviceTimeStart" <el-date-picker v-model="formData.serviceTimeStart"
:picker-options="startPickerOptions" :picker-options="startPickerOptions"
class="item_width_2" class="item_width_2"
style="width:220px"
type="date" type="date"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd" value="yyyy-MM-dd"
@ -155,6 +156,7 @@
<el-date-picker v-model="formData.serviceTimeEnd" <el-date-picker v-model="formData.serviceTimeEnd"
:picker-options="endPickerOptions" :picker-options="endPickerOptions"
class="item_width_2 data-tag" class="item_width_2 data-tag"
style="width:220px"
type="date" type="date"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd" value="yyyy-MM-dd"

773
src/views/modules/communityService/measure/info.vue
View File

File diff suppressed because it is too large

15
src/views/modules/communityService/sqzzz/index.vue
View File

@ -520,15 +520,12 @@ export default {
if (code === 0) { if (code === 0) {
if (data.type) { if (data.type) {
if (data.msg) { this.$message({
this.$message({ type: "success",
type: "success", message: data.msg || "同步成功"
message: "同步成功" });
});
this.loadTable() this.loadTable()
} else {
this.$message.error(data.msg)
}
} else { } else {
this.$message.error(data.msg) this.$message.error(data.msg)

1
src/views/modules/visual/command/cpts/demandInfo.vue
View File

@ -17,6 +17,7 @@
:formType="'add'" :formType="'add'"
:icResiUserId="icResiUserId" :icResiUserId="icResiUserId"
:selGridId="selGridId" :selGridId="selGridId"
@close="handleClose"
@handleClose="handleClose" @handleClose="handleClose"
@handleOk="handleOk" @handleOk="handleOk"
@dialogOk="handleEditSuccess" /> @dialogOk="handleEditSuccess" />

56
src/views/modules/visual/command/cpts/eventInfo.vue
View File

@ -4,24 +4,25 @@
<cpt-card> <cpt-card>
<div class="title"> <div class="title">
<img src="@/assets/img/shuju/title-tip.png" /> <img src="@/assets/img/shuju/title-tip.png" />
<span>需求详情</span> <span>事件详情</span>
</div> </div>
<div class="btn-close" <div class="btn-close" @click="handleClose">
@click="handleClose">
<img src="@/assets/img/shuju/people/close.png" /> <img src="@/assets/img/shuju/people/close.png" />
</div> </div>
<event-info v-if="loading" <event-info
ref="eleEditForm" v-if="loading"
:pageType="pageType" ref="eleEditForm"
:eventId="eventId" :pageType="pageType"
:eventDetailData="eventDetailData" :eventId="eventId"
:source="'visiual'" :eventDetailData="eventDetailData"
@handleClose="handleClose" :source="'visiual'"
@handleOk="handleOk" @close="handleClose"
@dialogOk="handleEditSuccess" /> @handleClose="handleClose"
@handleOk="handleOk"
@dialogOk="handleEditSuccess"
/>
</cpt-card> </cpt-card>
</div> </div>
</div> </div>
@ -38,7 +39,7 @@ export default {
props: { props: {
eventId: { eventId: {
type: String, type: String,
required: 'true' required: "true",
}, },
}, },
@ -47,25 +48,24 @@ export default {
eventInfo, eventInfo,
}, },
data () { data() {
return { return {
loading: false, loading: false,
pageType: 'dispose', pageType: "dispose",
// eventId: '', // eventId: '',
eventDetailData: {}, eventDetailData: {},
}; };
}, },
async mounted () { async mounted() {
this.loading = false this.loading = false;
await this.handleSearch() await this.handleSearch();
this.loading = true this.loading = true;
}, },
methods: { methods: {
async handleSearch () { async handleSearch() {
const url = "/gov/project/icEvent/detail"; const url = "/gov/project/icEvent/detail";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
@ -74,7 +74,6 @@ export default {
}); });
if (code === 0) { if (code === 0) {
this.eventDetailData = { ...data }; this.eventDetailData = { ...data };
this.pageType = "dispose"; this.pageType = "dispose";
} else { } else {
@ -82,20 +81,19 @@ export default {
} }
}, },
handleClose () { handleClose() {
this.pageType = ""; this.pageType = "";
this.$emit("handleClose") this.$emit("handleClose");
// this.eventId = "" // this.eventId = ""
}, },
handleOk () { handleOk() {
this.pageType = ""; this.pageType = "";
// this.eventId = "" // this.eventId = ""
this.pageNo = 1 this.pageNo = 1;
}, },
handleEditSuccess () { handleEditSuccess() {
this.handleClose(); this.handleClose();
}, },
}, },
}; };

10
src/views/modules/visual/command/cpts/map.vue
View File

@ -628,9 +628,7 @@ export default {
}, },
async setDotMarker(item, posArr) { async setDotMarker(item, posArr) {
if (searchMarker) { this.removeDotMarker();
searchMarker.remove();
}
const marker = new Marker({ const marker = new Marker({
offsets: [0, -20], offsets: [0, -20],
}).setLnglat(posArr); }).setLnglat(posArr);
@ -659,6 +657,12 @@ export default {
searchMarker = marker; searchMarker = marker;
}, },
removeDotMarker() {
if (searchMarker) {
searchMarker.remove();
}
},
// 把地图缩放等级在原来基础上大一点 // 把地图缩放等级在原来基础上大一点
zoomInABit() { zoomInABit() {
// let current = scene.getZoom(); // let current = scene.getZoom();

4
src/views/modules/visual/command/cpts/popup.vue
View File

@ -120,7 +120,7 @@
<div class="item"> <div class="item">
地址： 地址：
<span>{{ info.address || "--" }}</span> <span>{{ info.address || "--" }}</span>
</div> </div>
<div class="item"> <div class="item">
负责人： 负责人：
<span>{{ info.principal || "--" }}</span> <span>{{ info.principal || "--" }}</span>
@ -794,7 +794,7 @@ export default {
.m-pop { .m-pop {
@include scrollBar2; @include scrollBar2;
width: 380px; max-width: 380px;
color: #333; color: #333;
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;

55
src/views/modules/visual/command/cpts/serviceInfo.vue
View File

@ -7,18 +7,19 @@
<span>发起服务</span> <span>发起服务</span>
</div> </div>
<div class="btn-close" <div class="btn-close" @click="handleClose">
@click="handleClose">
<img src="@/assets/img/shuju/people/close.png" /> <img src="@/assets/img/shuju/people/close.png" />
</div> </div>
<add-form ref="demandEditForm" <add-form
:source="'visiual'" ref="demandEditForm"
:formType="'add'" :source="'visiual'"
@handleClose="handleClose" :formType="'add'"
@handleOk="handleOk" @close="handleClose"
@dialogOk="handleEditSuccess" /> @handleClose="handleClose"
@handleOk="handleOk"
@dialogOk="handleEditSuccess"
/>
</cpt-card> </cpt-card>
</div> </div>
</div> </div>
@ -33,34 +34,31 @@ import addForm from "@/views/modules/communityService/fuwujilu/addForm";
export default { export default {
name: "dialogInfo", name: "dialogInfo",
props: { props: {},
},
components: { components: {
cptCard, cptCard,
addForm addForm,
}, },
data () { data() {
return { return {
loading: false, loading: false,
pageType: 'dispose', pageType: "dispose",
eventId: '1529724450524061698', eventId: "1529724450524061698",
eventDetailData: {}, eventDetailData: {},
}; };
}, },
async mounted () { async mounted() {
this.loading = false this.loading = false;
await this.handleSearch() await this.handleSearch();
this.loading = true this.loading = true;
}, },
methods: { methods: {
async handleSearch () { async handleSearch() {
const url = "/gov/project/icEvent/detail"; const url = "/gov/project/icEvent/detail";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
@ -69,7 +67,6 @@ export default {
}); });
if (code === 0) { if (code === 0) {
this.eventDetailData = { ...data }; this.eventDetailData = { ...data };
this.pageType = "dispose"; this.pageType = "dispose";
} else { } else {
@ -77,20 +74,20 @@ export default {
} }
}, },
handleClose () { handleClose() {
this.pageType = ""; this.pageType = "";
this.$emit("handleClose") this.$emit("handleClose");
// this.eventId = "" // this.eventId = ""
}, },
handleOk () { handleOk() {
this.pageType = ""; this.pageType = "";
// this.eventId = "" // this.eventId = ""
this.pageNo = 1 this.pageNo = 1;
this.handleClose();
}, },
handleEditSuccess () { handleEditSuccess() {
this.handleClose(); this.handleClose();
}, },
}, },
}; };

2
src/views/modules/visual/command/cpts/sidemenu-left.vue
View File

@ -156,6 +156,8 @@ export default {
//加载组织数据 //加载组织数据
async requestList() { async requestList() {
if (!this.orgId) return;
const url = "/data/aggregator/coverage/analysis/governedTargetCategories"; const url = "/data/aggregator/coverage/analysis/governedTargetCategories";
let params = { let params = {
agencyId: this.orgId, agencyId: this.orgId,

303
src/views/modules/visual/command/index.vue
View File

@ -4,66 +4,81 @@
<div class="m-crumb"> <div class="m-crumb">
<div class="router_line"></div> <div class="router_line"></div>
<div class="div_router"> <div class="div_router">
<span class="router_parents" <span
v-for="(item, index) in runAgencyArray" class="router_parents"
@click="handleClickAgency(index)" v-for="(item, index) in runAgencyArray"
:key="index">{{ item.name }}<span class="arrow">></span></span> @click="handleClickAgency(index)"
:key="index"
>{{ item.name }}<span class="arrow">></span></span
>
<span class="router_child">{{ orgData.name }}</span> <span class="router_child">{{ orgData.name }}</span>
</div> </div>
</div> </div>
<people v-if="orgLevel === 'people'" <people v-if="orgLevel === 'people'" :uid="selUserId" />
:uid="selUserId" />
<div v-show="orgLevel !== 'people'" class="g-cnt">
<div v-show="orgLevel !== 'people'" <div class="m-map" @click="handleClickMapBox">
class="g-cnt"> <grid-map
<div class="m-map" ref="map"
@click="handleClickMapBox"> v-if="orgData.id"
<grid-map ref="map" @clickAgency="clickAgencyItem"
v-if="orgData.id" @clickDotBtn="handleClickDotBtn"
@clickAgency="clickAgencyItem" :srcGridData="orgData"
@clickDotBtn="handleClickDotBtn" :dotList="dotList"
:srcGridData="orgData" :dotIcoList="dotIcoList"
:dotList="dotList" :dotList2="dotList2"
:dotIcoList="dotIcoList" :dotIcoList2="dotIcoList2"
:dotList2="dotList2" :gridCountData="gridCountData"
:dotIcoList2="dotIcoList2" :pitch="0"
:gridCountData="gridCountData" />
:pitch="0" />
<div class="m-mapmenu"> <div class="m-mapmenu">
<sidemenu-left :orgId="orgId" <sidemenu-left
@change="handleChangeMenuLeft"></sidemenu-left> :orgId="orgId"
@change="handleChangeMenuLeft"
></sidemenu-left>
</div> </div>
<div class="m-search"> <div class="m-search">
<div class="input"> <div class="input">
<img src="@/assets/img/shuju/command/search.png" /> <img class="i-search" src="@/assets/img/shuju/command/search.png" />
<input type="text" <input
placeholder="请输入" type="text"
@keyup.enter="handleSearch" placeholder="请输入"
v-model="searchName" /> @keyup.enter="handleSearch"
<div class="btn" v-model="searchName"
@click="handleSearch">搜索</div> />
<img
class="i-close"
@click="clearSearch"
src="@/assets/img/shuju/command/close.png"
/>
<div class="btn" @click="handleSearch">搜索</div>
</div> </div>
<div class="result" <div class="result" v-if="showedSearchResult">
v-if="showedSearchResult">
<template v-for="item in searchResult"> <template v-for="item in searchResult">
<div :key="'searchResult' + item.type" <div
class="result-item" :key="'searchResult' + item.type"
v-show="item.list.length > 0"> class="result-item"
v-show="item.list.length > 0"
>
<div class="result-type">{{ item.title }}</div> <div class="result-type">{{ item.title }}</div>
<div class="result-more" <div
@click.stop="handleClickSearchResultMore(item)" class="result-more"
v-show="item.allList.length > 2"> @click.stop="handleClickSearchResultMore(item)"
v-show="item.allList.length > 2"
>
更多 更多
</div> </div>
<div class="result-ul"> <div class="result-ul">
<div class="result-li z-toe" <div
:key="item.type + 'li' + index" class="result-li z-toe"
v-for="(li, index) in item.list" :key="item.type + 'li' + index"
@click.stop="handleClickSearchLi(li, item)"> v-for="(li, index) in item.list"
@click.stop="handleClickSearchLi(li, item)"
>
<span v-if="item.type == 'position'">{{ <span v-if="item.type == 'position'">{{
li.name + " " + li.address li.name + " " + li.address
}}</span> }}</span>
@ -77,14 +92,15 @@
</div> </div>
</div> </div>
<div class="result-panel" <div class="result-panel" v-show="item.showedMore">
v-show="item.showedMore">
<div class="result-type">{{ item.title }}</div> <div class="result-type">{{ item.title }}</div>
<div class="result-ul"> <div class="result-ul">
<div class="result-li z-toe" <div
:key="item.type + 'li2_' + index" class="result-li z-toe"
v-for="(li, index) in item.allList" :key="item.type + 'li2_' + index"
@click.stop="handleClickSearchLi(li, item)"> v-for="(li, index) in item.allList"
@click.stop="handleClickSearchLi(li, item)"
>
<span v-if="item.type == 'position'">{{ <span v-if="item.type == 'position'">{{
li.name + " " + li.address li.name + " " + li.address
}}</span> }}</span>
@ -103,37 +119,38 @@
</div> </div>
</div> </div>
<div class="m-sidebar" <div class="m-sidebar" v-show="false">
v-show="false"> <div class="wrap" :class="[{ 'wrap-hidden': !showAgencyList }]">
<div class="wrap" <div @click="hideAgencyList" class="arrow_tip">
:class="[{ 'wrap-hidden': !showAgencyList }]"> <img src="@/assets/img/modules/visual/popup.png" alt />
<div @click="hideAgencyList"
class="arrow_tip">
<img src="@/assets/img/modules/visual/popup.png"
alt />
</div> </div>
<div class="div_agency_list"> <div class="div_agency_list">
<div class="agency_main"> <div class="agency_main">
<el-scrollbar style="height: 98%" <el-scrollbar
wrap-style="overflow-x:hidden"> style="height: 98%"
<div v-if="subAgencyArray.length > 0" wrap-style="overflow-x:hidden"
class="agency_list"> >
<div v-for="(item, index) in subAgencyArray" <div v-if="subAgencyArray.length > 0" class="agency_list">
:key="index" <div
@click="clickAgencyItem(item, index)" v-for="(item, index) in subAgencyArray"
:class="[ :key="index"
@click="clickAgencyItem(item, index)"
:class="[
'agency_item', 'agency_item',
{ agency_item_on: index % 2 == 0 }, { agency_item_on: index % 2 == 0 },
]"> ]"
>
<div class="agency_item_name">{{ item.name }}</div> <div class="agency_item_name">{{ item.name }}</div>
</div> </div>
</div> </div>
<div v-else> <div v-else>
<img src="@/assets/img/modules/visual/noData.png" <img
alt="" src="@/assets/img/modules/visual/noData.png"
srcset="" alt=""
class="no-data-img" /> srcset=""
class="no-data-img"
/>
</div> </div>
</el-scrollbar> </el-scrollbar>
</div> </div>
@ -150,32 +167,43 @@
</div> </div>
<div class="list"> <div class="list">
<sidemenu :orgId="orgId" <sidemenu
@change="handleChangeMenu" :orgId="orgId"
:grandIcoList="dotIcoList"></sidemenu> @change="handleChangeMenu"
:grandIcoList="dotIcoList"
></sidemenu>
</div> </div>
</cpt-card> </cpt-card>
</div> </div>
</div> </div>
<event-info v-if="pageType==='watch-event'" <event-info
ref="ref_event" v-if="pageType === 'watch-event'"
:eventId="eventId" ref="ref_event"
@handleClose="handleClose" /> :eventId="eventId"
@handleClose="handleClose"
<service-info v-if="pageType==='create-service'" />
ref="ref_service"
@handleClose="handleClose" /> <service-info
v-if="pageType === 'create-service'"
<demand-info v-if="pageType==='create-demand'" ref="ref_service"
ref="ref_demand" @handleClose="handleClose"
:icResiUserId="icResiUserId" />
@handleClose="handleClose" />
<demand-info
<qsydw v-if="pageType==='watch-xuncha'" v-if="pageType === 'create-demand'"
ref="ref_xuncha" ref="ref_demand"
:enterpriseId="enterpriseId" :icResiUserId="icResiUserId"
@handleClose="handleClose" /> :selGridId="selGridId"
@handleClose="handleClose"
/>
<qsydw
v-if="pageType === 'watch-xuncha'"
ref="ref_xuncha"
:enterpriseId="enterpriseId"
@handleClose="handleClose"
/>
<!-- <people v-if="pageType==='watch-resi'" <!-- <people v-if="pageType==='watch-resi'"
:uid="icResiUserId" :uid="icResiUserId"
@ -202,7 +230,7 @@ import qsydw from "@/views/modules/visual/command/cpts/qsydw";
let loading; //加载动画 let loading; //加载动画
function iniSearchResult () { function iniSearchResult() {
return [ return [
{ {
type: "position", type: "position",
@ -248,7 +276,7 @@ export default {
eventInfo, eventInfo,
serviceInfo, serviceInfo,
demandInfo, demandInfo,
qsydw qsydw,
}, },
props: {}, props: {},
@ -257,7 +285,7 @@ export default {
...mapGetters(["clientHeight"]), ...mapGetters(["clientHeight"]),
}, },
data () { data() {
return { return {
showAgencyList: false, showAgencyList: false,
@ -396,28 +424,28 @@ export default {
showedSearchResult: false, showedSearchResult: false,
searchResult: iniSearchResult(), searchResult: iniSearchResult(),
pageType: '', pageType: "",
icResiUserId: '', icResiUserId: "",
selGridId: '', selGridId: "",
eventId: '', eventId: "",
enterpriseId: '', enterpriseId: "",
}; };
}, },
watch: { watch: {
categoryKeys () { categoryKeys() {
this.requestMapDot(); this.requestMapDot();
}, },
categoryKeys2 () { categoryKeys2() {
this.requestMapDot2(); this.requestMapDot2();
}, },
searchName () { searchName() {
this.showedSearchResult = false; this.showedSearchResult = false;
this.searchResult = iniSearchResult(); this.searchResult = iniSearchResult();
}, },
}, },
async mounted () { async mounted() {
//加载组织数据 //加载组织数据
await this.loadOrgData(); await this.loadOrgData();
await this.requestMapDot(); await this.requestMapDot();
@ -425,36 +453,35 @@ export default {
}, },
methods: { methods: {
handleClickDotBtn (type, info) { handleClickDotBtn(type, info) {
this.pageType = type;
this.pageType = type
if (type == "create-service") { if (type == "create-service") {
// 点击网格发起服务 // 点击网格发起服务
} else if (type == "watch-resi") { } else if (type == "watch-resi") {
this.toSubAgency('people', info.icResiUserId) this.toSubAgency("people", info.icResiUserId);
this.icResiUserId = info.icResiUserId this.icResiUserId = info.icResiUserId;
// 查看居民详情 // 查看居民详情
} else if (type == "watch-event") { } else if (type == "watch-event") {
// 查看事件 // 查看事件
this.eventId = info.icEventId;
} else if (type == "create-demand") { } else if (type == "create-demand") {
// 发起需求 // 发起需求
this.icResiUserId = info.icResiUserId this.icResiUserId = info.icResiUserId;
this.selGridId = info.gridId this.selGridId = info.gridId;
} else if (type == "watch-xuncha") { } else if (type == "watch-xuncha") {
this.enterpriseId = info.enterpriseId;
this.enterpriseId = info.enterpriseId
} }
}, },
handleClose () { handleClose() {
this.pageType = ""; this.pageType = "";
}, },
handleClickMapBox () { handleClickMapBox() {
this.showedSearchResult = false; this.showedSearchResult = false;
}, },
handleTo (item) { handleTo(item) {
this.$router.push({ this.$router.push({
path: `/main-shuju/visual-basicinfo-people-list`, path: `/main-shuju/visual-basicinfo-people-list`,
query: { query: {
@ -465,12 +492,12 @@ export default {
}, },
}); });
}, },
hideAgencyList () { hideAgencyList() {
this.showAgencyList = !this.showAgencyList; this.showAgencyList = !this.showAgencyList;
}, },
//加载组织数据 //加载组织数据
async loadOrgData () { async loadOrgData() {
const url = "/gov/org/agency/maporg"; const url = "/gov/org/agency/maporg";
let params = { let params = {
orgId: this.orgId, orgId: this.orgId,
@ -493,13 +520,13 @@ export default {
} }
}, },
handleChangeMenuLeft (obj) { handleChangeMenuLeft(obj) {
this.coverageTypes2 = [obj.coverageType]; this.coverageTypes2 = [obj.coverageType];
this.categoryKeys2 = [obj.categoryKey]; this.categoryKeys2 = [obj.categoryKey];
this.placeType2 = obj.placeType; this.placeType2 = obj.placeType;
}, },
handleChangeMenu (list) { handleChangeMenu(list) {
console.log("handleChangeMenu", list); console.log("handleChangeMenu", list);
let categoryKeys = []; let categoryKeys = [];
let coverageTypes = []; let coverageTypes = [];
@ -518,6 +545,7 @@ export default {
subitem.categories.forEach((subitem2) => { subitem.categories.forEach((subitem2) => {
if (subitem2.selected) { if (subitem2.selected) {
categoryKeys.push(subitem2.categoryKey); categoryKeys.push(subitem2.categoryKey);
coverageTypes.push(subitem2.coverageType);
} }
}); });
}); });
@ -527,7 +555,7 @@ export default {
this.requestMapDot(); this.requestMapDot();
}, },
async requestMapDot () { async requestMapDot() {
if (!this.orgId) return; if (!this.orgId) return;
const url = "/data/aggregator/coverage/dataList"; const url = "/data/aggregator/coverage/dataList";
let params = { let params = {
@ -547,7 +575,7 @@ export default {
} }
}, },
async requestMapDot2 () { async requestMapDot2() {
if (!this.orgId) return; if (!this.orgId) return;
this.requestMapDot2Count(); this.requestMapDot2Count();
const url = "/data/aggregator/coverage/dataList-left"; const url = "/data/aggregator/coverage/dataList-left";
@ -571,7 +599,7 @@ export default {
} }
}, },
async requestMapDot2Count () { async requestMapDot2Count() {
const url = "/data/aggregator/coverage/dataList-left-subtotal"; const url = "/data/aggregator/coverage/dataList-left-subtotal";
let params = { let params = {
orgId: this.orgId, orgId: this.orgId,
@ -591,13 +619,13 @@ export default {
}, },
//子组件点击房间，刷新右侧list //子组件点击房间，刷新右侧list
refreshInfoList (selId, type) { refreshInfoList(selId, type) {
this.orgId = selId; this.orgId = selId;
this.level = ""; this.level = "";
}, },
//返回所选组织 //返回所选组织
handleClickAgency (index) { handleClickAgency(index) {
//如果是从小区返回，清空一下小区的人员显示列表 //如果是从小区返回，清空一下小区的人员显示列表
if (this.orgLevel === "neighborHood") { if (this.orgLevel === "neighborHood") {
this.$nextTick(() => { this.$nextTick(() => {
@ -629,7 +657,7 @@ export default {
}, },
//点击组织列表数据 //点击组织列表数据
clickAgencyItem (item, index) { clickAgencyItem(item, index) {
console.log(item); console.log(item);
if (item.level == "grid") { if (item.level == "grid") {
} else { } else {
@ -646,7 +674,7 @@ export default {
}, },
//下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） people 点击详情 //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） people 点击详情
async toSubAgency (type, e) { async toSubAgency(type, e) {
//点击小区neighborHood显示楼栋，点击非小区，进入下一级地图 //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图
if (type === "people") { if (type === "people") {
this.runNum++; this.runNum++;
@ -694,7 +722,7 @@ export default {
}, },
//刷新地图 //刷新地图
async refreshMap (isRefreshView) { async refreshMap(isRefreshView) {
//加载组织数据 //加载组织数据
await this.loadOrgData(); await this.loadOrgData();
@ -702,7 +730,7 @@ export default {
await this.requestMapDot2(); await this.requestMapDot2();
}, },
async handleSearch () { async handleSearch() {
const { searchName } = this; const { searchName } = this;
if (!searchName) { if (!searchName) {
return this.$message.error("请输入搜索内容"); return this.$message.error("请输入搜索内容");
@ -748,7 +776,12 @@ export default {
} }
}, },
async searchPos () { clearSearch() {
this.searchName = "";
this.$refs.map.removeDotMarker();
},
async searchPos() {
let data = await this.$refs.map.searchPos(this.searchName); let data = await this.$refs.map.searchPos(this.searchName);
console.log("检索位置", data); console.log("检索位置", data);
@ -769,9 +802,9 @@ export default {
} }
}, },
handleClickSearchLi (li) { handleClickSearchLi(li) {
console.log('handleClickSearchLi', li) console.log("handleClickSearchLi", li);
if(!li.longitude){ if (!li.longitude) {
return this.$message.error("请先设置坐标"); return this.$message.error("请先设置坐标");
} }
this.$refs.map.setDotMarker(li, [ this.$refs.map.setDotMarker(li, [
@ -781,7 +814,7 @@ export default {
this.showedSearchResult = false; this.showedSearchResult = false;
}, },
handleClickSearchResultMore (item) { handleClickSearchResultMore(item) {
console.log(item); console.log(item);
let res = !item.showedMore; let res = !item.showedMore;
if (res) { if (res) {
@ -790,7 +823,7 @@ export default {
item.showedMore = !item.showedMore; item.showedMore = !item.showedMore;
}, },
//开启加载动画 //开启加载动画
startLoading () { startLoading() {
loading = Loading.service({ loading = Loading.service({
lock: true, //是否锁定 lock: true, //是否锁定
text: "正在加载……", //加载中需要显示的文字 text: "正在加载……", //加载中需要显示的文字
@ -799,7 +832,7 @@ export default {
}, },
//结束加载动画 //结束加载动画
endLoading () { endLoading() {
//clearTimeout(timer); //clearTimeout(timer);
if (loading) { if (loading) {
loading.close(); loading.close();

Write Preview
Loading…
Cancel
Save