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

1

master
dai 3 years ago
parent
dfa78a1500
commit
2b3014098f
5 changed files with 191 additions and 180 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. 8
      src/views/modules/communityParty/regionalParty/units.vue
  2. 7
      src/views/modules/communityService/sqzzz/index.vue
  3. 41
      src/views/modules/visual/command/cpts/eventInfo.vue
  4. 2
      src/views/modules/visual/command/cpts/popup.vue
  5. 217
      src/views/modules/visual/command/index.vue

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()
} else {
this.$message.error(data.msg)
}
this.loadTable()
} else { } else {
this.$message.error(data.msg) this.$message.error(data.msg)
} }

7
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: "同步成功" 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)

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

@ -4,15 +4,15 @@
<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
v-if="loading"
ref="eleEditForm" ref="eleEditForm"
:pageType="pageType" :pageType="pageType"
:eventId="eventId" :eventId="eventId"
@ -20,8 +20,8 @@
:source="'visiual'" :source="'visiual'"
@handleClose="handleClose" @handleClose="handleClose"
@handleOk="handleOk" @handleOk="handleOk"
@dialogOk="handleEditSuccess" /> @dialogOk="handleEditSuccess"
/>
</cpt-card> </cpt-card>
</div> </div>
</div> </div>
@ -38,7 +38,7 @@ export default {
props: { props: {
eventId: { eventId: {
type: String, type: String,
required: 'true' required: "true",
}, },
}, },
@ -47,25 +47,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 +73,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 +80,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();
}, },
}, },
}; };

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

@ -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;

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

@ -4,23 +4,24 @@
<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
class="router_parents"
v-for="(item, index) in runAgencyArray" v-for="(item, index) in runAgencyArray"
@click="handleClickAgency(index)" @click="handleClickAgency(index)"
:key="index">{{ item.name }}<span class="arrow">></span></span> :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'" <div v-show="orgLevel !== 'people'" class="g-cnt">
class="g-cnt"> <div class="m-map" @click="handleClickMapBox">
<div class="m-map" <grid-map
@click="handleClickMapBox"> ref="map"
<grid-map ref="map"
v-if="orgData.id" v-if="orgData.id"
@clickAgency="clickAgencyItem" @clickAgency="clickAgencyItem"
@clickDotBtn="handleClickDotBtn" @clickDotBtn="handleClickDotBtn"
@ -30,40 +31,49 @@
:dotList2="dotList2" :dotList2="dotList2"
:dotIcoList2="dotIcoList2" :dotIcoList2="dotIcoList2"
:gridCountData="gridCountData" :gridCountData="gridCountData"
:pitch="0" /> :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 src="@/assets/img/shuju/command/search.png" />
<input type="text" <input
type="text"
placeholder="请输入" placeholder="请输入"
@keyup.enter="handleSearch" @keyup.enter="handleSearch"
v-model="searchName" /> v-model="searchName"
<div class="btn" />
@click="handleSearch">搜索</div> <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
:key="'searchResult' + item.type"
class="result-item" class="result-item"
v-show="item.list.length > 0"> 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
class="result-more"
@click.stop="handleClickSearchResultMore(item)" @click.stop="handleClickSearchResultMore(item)"
v-show="item.allList.length > 2"> v-show="item.allList.length > 2"
>
更多 更多
</div> </div>
<div class="result-ul"> <div class="result-ul">
<div class="result-li z-toe" <div
class="result-li z-toe"
:key="item.type + 'li' + index" :key="item.type + 'li' + index"
v-for="(li, index) in item.list" v-for="(li, index) in item.list"
@click.stop="handleClickSearchLi(li, item)"> @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 +87,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
class="result-li z-toe"
:key="item.type + 'li2_' + index" :key="item.type + 'li2_' + index"
v-for="(li, index) in item.allList" v-for="(li, index) in item.allList"
@click.stop="handleClickSearchLi(li, item)"> @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 +114,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">
<div
v-for="(item, index) in subAgencyArray"
:key="index" :key="index"
@click="clickAgencyItem(item, index)" @click="clickAgencyItem(item, index)"
:class="[ :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
src="@/assets/img/modules/visual/noData.png"
alt="" alt=""
srcset="" srcset=""
class="no-data-img" /> class="no-data-img"
/>
</div> </div>
</el-scrollbar> </el-scrollbar>
</div> </div>
@ -150,32 +162,42 @@
</div> </div>
<div class="list"> <div class="list">
<sidemenu :orgId="orgId" <sidemenu
:orgId="orgId"
@change="handleChangeMenu" @change="handleChangeMenu"
:grandIcoList="dotIcoList"></sidemenu> :grandIcoList="dotIcoList"
></sidemenu>
</div> </div>
</cpt-card> </cpt-card>
</div> </div>
</div> </div>
<event-info v-if="pageType==='watch-event'" <event-info
v-if="pageType === 'watch-event'"
ref="ref_event" ref="ref_event"
:eventId="eventId" :eventId="eventId"
@handleClose="handleClose" /> @handleClose="handleClose"
/>
<service-info v-if="pageType==='create-service'" <service-info
v-if="pageType === 'create-service'"
ref="ref_service" ref="ref_service"
@handleClose="handleClose" /> @handleClose="handleClose"
/>
<demand-info v-if="pageType==='create-demand'" <demand-info
v-if="pageType === 'create-demand'"
ref="ref_demand" ref="ref_demand"
:icResiUserId="icResiUserId" :icResiUserId="icResiUserId"
@handleClose="handleClose" /> @handleClose="handleClose"
/>
<qsydw v-if="pageType==='watch-xuncha'" <qsydw
v-if="pageType === 'watch-xuncha'"
ref="ref_xuncha" ref="ref_xuncha"
:enterpriseId="enterpriseId" :enterpriseId="enterpriseId"
@handleClose="handleClose" /> @handleClose="handleClose"
/>
<!-- <people v-if="pageType==='watch-resi'" <!-- <people v-if="pageType==='watch-resi'"
:uid="icResiUserId" :uid="icResiUserId"
@ -202,7 +224,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 +270,7 @@ export default {
eventInfo, eventInfo,
serviceInfo, serviceInfo,
demandInfo, demandInfo,
qsydw qsydw,
}, },
props: {}, props: {},
@ -257,7 +279,7 @@ export default {
...mapGetters(["clientHeight"]), ...mapGetters(["clientHeight"]),
}, },
data () { data() {
return { return {
showAgencyList: false, showAgencyList: false,
@ -396,28 +418,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 +447,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 +486,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 +514,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 = [];
@ -527,7 +548,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 +568,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 +592,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 +612,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 +650,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 +667,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 +715,7 @@ export default {
}, },
//刷新地图 //刷新地图
async refreshMap (isRefreshView) { async refreshMap(isRefreshView) {
//加载组织数据 //加载组织数据
await this.loadOrgData(); await this.loadOrgData();
@ -702,7 +723,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 +769,7 @@ export default {
} }
}, },
async searchPos () { 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 +790,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 +802,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 +811,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 +820,7 @@ export default {
}, },
//结束加载动画 //结束加载动画
endLoading () { endLoading() {
//clearTimeout(timer); //clearTimeout(timer);
if (loading) { if (loading) {
loading.close(); loading.close();

Write Preview
Loading…
Cancel
Save