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. 29
      src/views/modules/visual/command/cpts/eventInfo.vue
  4. 2
      src/views/modules/visual/command/cpts/popup.vue
  5. 159
      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)

29
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",
}, },
}, },
@ -51,21 +51,20 @@ export default {
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 {
@ -84,18 +82,17 @@ 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;

159
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"
@ -248,7 +270,7 @@ export default {
eventInfo, eventInfo,
serviceInfo, serviceInfo,
demandInfo, demandInfo,
qsydw qsydw,
}, },
props: {}, props: {},
@ -396,11 +418,11 @@ export default {
showedSearchResult: false, showedSearchResult: false,
searchResult: iniSearchResult(), searchResult: iniSearchResult(),
pageType: '', pageType: "",
icResiUserId: '', icResiUserId: "",
selGridId: '', selGridId: "",
eventId: '', eventId: "",
enterpriseId: '', enterpriseId: "",
}; };
}, },
@ -426,23 +448,22 @@ 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
} }
}, },
@ -770,7 +791,7 @@ 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("请先设置坐标");
} }

Write Preview
Loading…
Cancel
Save