Browse Source

Merge branch 'dev-fivelayer0725'

master
dai 3 years ago
parent
commit
1012f883e2
  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. 2
      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

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 B

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

@ -81,7 +81,7 @@
box-shadow: 0px 4px 8px 0px rgba(147, 147, 147, 0.26);
> input {
width: 420px;
width: 400px;
border: none;
line-height: 45px;
font-size: 18px;
@ -90,10 +90,17 @@
color: #333333;
}
> img {
.i-search {
margin: 0 16px;
width: 30px;
height: 30px;
width: 24px;
height: 24px;
}
.i-close {
margin-left: 15px;
opacity: 0.2;
width: 20px;
cursor: pointer;
}
.btn {
@ -206,7 +213,11 @@
}
.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

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

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

@ -1,6 +1,6 @@
<template>
<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'"
ref="ref_form"
@ -146,6 +146,7 @@
<el-date-picker v-model="formData.serviceTimeStart"
:picker-options="startPickerOptions"
class="item_width_2"
style="width:220px"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd"
@ -155,6 +156,7 @@
<el-date-picker v-model="formData.serviceTimeEnd"
:picker-options="endPickerOptions"
class="item_width_2 data-tag"
style="width:220px"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd"

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

File diff suppressed because it is too large

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

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

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

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

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

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

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

@ -628,9 +628,7 @@ export default {
},
async setDotMarker(item, posArr) {
if (searchMarker) {
searchMarker.remove();
}
this.removeDotMarker();
const marker = new Marker({
offsets: [0, -20],
}).setLnglat(posArr);
@ -659,6 +657,12 @@ export default {
searchMarker = marker;
},
removeDotMarker() {
if (searchMarker) {
searchMarker.remove();
}
},
//
zoomInABit() {
// let current = scene.getZoom();

2
src/views/modules/visual/command/cpts/popup.vue

@ -794,7 +794,7 @@ export default {
.m-pop {
@include scrollBar2;
width: 380px;
max-width: 380px;
color: #333;
font-size: 14px;
line-height: 20px;

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

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

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

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

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

@ -4,66 +4,81 @@
<div class="m-crumb">
<div class="router_line"></div>
<div class="div_router">
<span class="router_parents"
v-for="(item, index) in runAgencyArray"
@click="handleClickAgency(index)"
:key="index">{{ item.name }}<span class="arrow">></span></span>
<span
class="router_parents"
v-for="(item, index) in runAgencyArray"
@click="handleClickAgency(index)"
:key="index"
>{{ item.name }}<span class="arrow">></span></span
>
<span class="router_child">{{ orgData.name }}</span>
</div>
</div>
<people v-if="orgLevel === 'people'"
:uid="selUserId" />
<div v-show="orgLevel !== 'people'"
class="g-cnt">
<div class="m-map"
@click="handleClickMapBox">
<grid-map ref="map"
v-if="orgData.id"
@clickAgency="clickAgencyItem"
@clickDotBtn="handleClickDotBtn"
:srcGridData="orgData"
:dotList="dotList"
:dotIcoList="dotIcoList"
:dotList2="dotList2"
:dotIcoList2="dotIcoList2"
:gridCountData="gridCountData"
:pitch="0" />
<people v-if="orgLevel === 'people'" :uid="selUserId" />
<div v-show="orgLevel !== 'people'" class="g-cnt">
<div class="m-map" @click="handleClickMapBox">
<grid-map
ref="map"
v-if="orgData.id"
@clickAgency="clickAgencyItem"
@clickDotBtn="handleClickDotBtn"
:srcGridData="orgData"
:dotList="dotList"
:dotIcoList="dotIcoList"
:dotList2="dotList2"
:dotIcoList2="dotIcoList2"
:gridCountData="gridCountData"
:pitch="0"
/>
<div class="m-mapmenu">
<sidemenu-left :orgId="orgId"
@change="handleChangeMenuLeft"></sidemenu-left>
<sidemenu-left
:orgId="orgId"
@change="handleChangeMenuLeft"
></sidemenu-left>
</div>
<div class="m-search">
<div class="input">
<img src="@/assets/img/shuju/command/search.png" />
<input type="text"
placeholder="请输入"
@keyup.enter="handleSearch"
v-model="searchName" />
<div class="btn"
@click="handleSearch">搜索</div>
<img class="i-search" src="@/assets/img/shuju/command/search.png" />
<input
type="text"
placeholder="请输入"
@keyup.enter="handleSearch"
v-model="searchName"
/>
<img
class="i-close"
@click="clearSearch"
src="@/assets/img/shuju/command/close.png"
/>
<div class="btn" @click="handleSearch">搜索</div>
</div>
<div class="result"
v-if="showedSearchResult">
<div class="result" v-if="showedSearchResult">
<template v-for="item in searchResult">
<div :key="'searchResult' + item.type"
class="result-item"
v-show="item.list.length > 0">
<div
:key="'searchResult' + item.type"
class="result-item"
v-show="item.list.length > 0"
>
<div class="result-type">{{ item.title }}</div>
<div class="result-more"
@click.stop="handleClickSearchResultMore(item)"
v-show="item.allList.length > 2">
<div
class="result-more"
@click.stop="handleClickSearchResultMore(item)"
v-show="item.allList.length > 2"
>
更多
</div>
<div class="result-ul">
<div class="result-li z-toe"
:key="item.type + 'li' + index"
v-for="(li, index) in item.list"
@click.stop="handleClickSearchLi(li, item)">
<div
class="result-li z-toe"
:key="item.type + 'li' + index"
v-for="(li, index) in item.list"
@click.stop="handleClickSearchLi(li, item)"
>
<span v-if="item.type == 'position'">{{
li.name + " " + li.address
}}</span>
@ -77,14 +92,15 @@
</div>
</div>
<div class="result-panel"
v-show="item.showedMore">
<div class="result-panel" v-show="item.showedMore">
<div class="result-type">{{ item.title }}</div>
<div class="result-ul">
<div class="result-li z-toe"
:key="item.type + 'li2_' + index"
v-for="(li, index) in item.allList"
@click.stop="handleClickSearchLi(li, item)">
<div
class="result-li z-toe"
:key="item.type + 'li2_' + index"
v-for="(li, index) in item.allList"
@click.stop="handleClickSearchLi(li, item)"
>
<span v-if="item.type == 'position'">{{
li.name + " " + li.address
}}</span>
@ -103,37 +119,38 @@
</div>
</div>
<div class="m-sidebar"
v-show="false">
<div class="wrap"
:class="[{ 'wrap-hidden': !showAgencyList }]">
<div @click="hideAgencyList"
class="arrow_tip">
<img src="@/assets/img/modules/visual/popup.png"
alt />
<div class="m-sidebar" v-show="false">
<div class="wrap" :class="[{ 'wrap-hidden': !showAgencyList }]">
<div @click="hideAgencyList" class="arrow_tip">
<img src="@/assets/img/modules/visual/popup.png" alt />
</div>
<div class="div_agency_list">
<div class="agency_main">
<el-scrollbar style="height: 98%"
wrap-style="overflow-x:hidden">
<div v-if="subAgencyArray.length > 0"
class="agency_list">
<div v-for="(item, index) in subAgencyArray"
:key="index"
@click="clickAgencyItem(item, index)"
:class="[
<el-scrollbar
style="height: 98%"
wrap-style="overflow-x:hidden"
>
<div v-if="subAgencyArray.length > 0" class="agency_list">
<div
v-for="(item, index) in subAgencyArray"
:key="index"
@click="clickAgencyItem(item, index)"
:class="[
'agency_item',
{ agency_item_on: index % 2 == 0 },
]">
]"
>
<div class="agency_item_name">{{ item.name }}</div>
</div>
</div>
<div v-else>
<img src="@/assets/img/modules/visual/noData.png"
alt=""
srcset=""
class="no-data-img" />
<img
src="@/assets/img/modules/visual/noData.png"
alt=""
srcset=""
class="no-data-img"
/>
</div>
</el-scrollbar>
</div>
@ -150,32 +167,43 @@
</div>
<div class="list">
<sidemenu :orgId="orgId"
@change="handleChangeMenu"
:grandIcoList="dotIcoList"></sidemenu>
<sidemenu
:orgId="orgId"
@change="handleChangeMenu"
:grandIcoList="dotIcoList"
></sidemenu>
</div>
</cpt-card>
</div>
</div>
<event-info v-if="pageType==='watch-event'"
ref="ref_event"
:eventId="eventId"
@handleClose="handleClose" />
<service-info v-if="pageType==='create-service'"
ref="ref_service"
@handleClose="handleClose" />
<demand-info v-if="pageType==='create-demand'"
ref="ref_demand"
:icResiUserId="icResiUserId"
@handleClose="handleClose" />
<qsydw v-if="pageType==='watch-xuncha'"
ref="ref_xuncha"
:enterpriseId="enterpriseId"
@handleClose="handleClose" />
<event-info
v-if="pageType === 'watch-event'"
ref="ref_event"
:eventId="eventId"
@handleClose="handleClose"
/>
<service-info
v-if="pageType === 'create-service'"
ref="ref_service"
@handleClose="handleClose"
/>
<demand-info
v-if="pageType === 'create-demand'"
ref="ref_demand"
:icResiUserId="icResiUserId"
:selGridId="selGridId"
@handleClose="handleClose"
/>
<qsydw
v-if="pageType === 'watch-xuncha'"
ref="ref_xuncha"
:enterpriseId="enterpriseId"
@handleClose="handleClose"
/>
<!-- <people v-if="pageType==='watch-resi'"
:uid="icResiUserId"
@ -202,7 +230,7 @@ import qsydw from "@/views/modules/visual/command/cpts/qsydw";
let loading; //
function iniSearchResult () {
function iniSearchResult() {
return [
{
type: "position",
@ -248,7 +276,7 @@ export default {
eventInfo,
serviceInfo,
demandInfo,
qsydw
qsydw,
},
props: {},
@ -257,7 +285,7 @@ export default {
...mapGetters(["clientHeight"]),
},
data () {
data() {
return {
showAgencyList: false,
@ -396,28 +424,28 @@ export default {
showedSearchResult: false,
searchResult: iniSearchResult(),
pageType: '',
icResiUserId: '',
selGridId: '',
eventId: '',
enterpriseId: '',
pageType: "",
icResiUserId: "",
selGridId: "",
eventId: "",
enterpriseId: "",
};
},
watch: {
categoryKeys () {
categoryKeys() {
this.requestMapDot();
},
categoryKeys2 () {
categoryKeys2() {
this.requestMapDot2();
},
searchName () {
searchName() {
this.showedSearchResult = false;
this.searchResult = iniSearchResult();
},
},
async mounted () {
async mounted() {
//
await this.loadOrgData();
await this.requestMapDot();
@ -425,36 +453,35 @@ export default {
},
methods: {
handleClickDotBtn (type, info) {
this.pageType = type
handleClickDotBtn(type, info) {
this.pageType = type;
if (type == "create-service") {
//
} else if (type == "watch-resi") {
this.toSubAgency('people', info.icResiUserId)
this.icResiUserId = info.icResiUserId
this.toSubAgency("people", info.icResiUserId);
this.icResiUserId = info.icResiUserId;
//
} else if (type == "watch-event") {
//
this.eventId = info.icEventId;
} else if (type == "create-demand") {
//
this.icResiUserId = info.icResiUserId
this.selGridId = info.gridId
this.icResiUserId = info.icResiUserId;
this.selGridId = info.gridId;
} else if (type == "watch-xuncha") {
this.enterpriseId = info.enterpriseId
this.enterpriseId = info.enterpriseId;
}
},
handleClose () {
handleClose() {
this.pageType = "";
},
handleClickMapBox () {
handleClickMapBox() {
this.showedSearchResult = false;
},
handleTo (item) {
handleTo(item) {
this.$router.push({
path: `/main-shuju/visual-basicinfo-people-list`,
query: {
@ -465,12 +492,12 @@ export default {
},
});
},
hideAgencyList () {
hideAgencyList() {
this.showAgencyList = !this.showAgencyList;
},
//
async loadOrgData () {
async loadOrgData() {
const url = "/gov/org/agency/maporg";
let params = {
orgId: this.orgId,
@ -493,13 +520,13 @@ export default {
}
},
handleChangeMenuLeft (obj) {
handleChangeMenuLeft(obj) {
this.coverageTypes2 = [obj.coverageType];
this.categoryKeys2 = [obj.categoryKey];
this.placeType2 = obj.placeType;
},
handleChangeMenu (list) {
handleChangeMenu(list) {
console.log("handleChangeMenu", list);
let categoryKeys = [];
let coverageTypes = [];
@ -518,6 +545,7 @@ export default {
subitem.categories.forEach((subitem2) => {
if (subitem2.selected) {
categoryKeys.push(subitem2.categoryKey);
coverageTypes.push(subitem2.coverageType);
}
});
});
@ -527,7 +555,7 @@ export default {
this.requestMapDot();
},
async requestMapDot () {
async requestMapDot() {
if (!this.orgId) return;
const url = "/data/aggregator/coverage/dataList";
let params = {
@ -547,7 +575,7 @@ export default {
}
},
async requestMapDot2 () {
async requestMapDot2() {
if (!this.orgId) return;
this.requestMapDot2Count();
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";
let params = {
orgId: this.orgId,
@ -591,13 +619,13 @@ export default {
},
//list
refreshInfoList (selId, type) {
refreshInfoList(selId, type) {
this.orgId = selId;
this.level = "";
},
//
handleClickAgency (index) {
handleClickAgency(index) {
//
if (this.orgLevel === "neighborHood") {
this.$nextTick(() => {
@ -629,7 +657,7 @@ export default {
},
//
clickAgencyItem (item, index) {
clickAgencyItem(item, index) {
console.log(item);
if (item.level == "grid") {
} else {
@ -646,7 +674,7 @@ export default {
},
// type:polygon / people
async toSubAgency (type, e) {
async toSubAgency(type, e) {
//neighborHood
if (type === "people") {
this.runNum++;
@ -694,7 +722,7 @@ export default {
},
//
async refreshMap (isRefreshView) {
async refreshMap(isRefreshView) {
//
await this.loadOrgData();
@ -702,7 +730,7 @@ export default {
await this.requestMapDot2();
},
async handleSearch () {
async handleSearch() {
const { searchName } = this;
if (!searchName) {
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);
console.log("检索位置", data);
@ -769,9 +802,9 @@ export default {
}
},
handleClickSearchLi (li) {
console.log('handleClickSearchLi', li)
if(!li.longitude){
handleClickSearchLi(li) {
console.log("handleClickSearchLi", li);
if (!li.longitude) {
return this.$message.error("请先设置坐标");
}
this.$refs.map.setDotMarker(li, [
@ -781,7 +814,7 @@ export default {
this.showedSearchResult = false;
},
handleClickSearchResultMore (item) {
handleClickSearchResultMore(item) {
console.log(item);
let res = !item.showedMore;
if (res) {
@ -790,7 +823,7 @@ export default {
item.showedMore = !item.showedMore;
},
//
startLoading () {
startLoading() {
loading = Loading.service({
lock: true, //
text: "正在加载……", //
@ -799,7 +832,7 @@ export default {
},
//
endLoading () {
endLoading() {
//clearTimeout(timer);
if (loading) {
loading.close();

Loading…
Cancel
Save