井乐禹 2 years ago
parent
commit
eac5ad7a0f
  1. 23
      src/views/dataBoard/fifteen/components/index.vue
  2. 160
      src/views/modules/visual/command/index.vue

23
src/views/dataBoard/fifteen/components/index.vue

@ -74,6 +74,7 @@ import { METERS_PER_UNIT } from 'ol/proj/Units';
import { Vector as VectorSource, XYZ } from 'ol/source';
import { Fill, Icon, Stroke, Style, Text } from 'ol/style';
import Dialog from "./dialog.vue";
export default {
components: {
Dialog
@ -141,28 +142,6 @@ export default {
//
this.map.addOverlay(this.overlay);
const _this = this;
// let select = new Select({
// style: new Style({
// stroke: new Stroke({
// color: "rgb(0, 153, 255,1)",
// width: 2
// }),
// fill: new Fill({
// color: "rgb(209, 203, 189,0.6)"
// })
// })
// });
// //map
// _this.map.addInteraction(select);
// console.log(99999, select);
// select.on("select", function (e) {
// console.log("");
// // console.log(e.selected[0].get('name')); //Featurename
// let currentRome = e.selected[0]; //
// console.log(e)
// })
// return
_this.map.on("click", function (e) {
_this.featureInfo = {}
let feature = _this.map.forEachFeatureAtPixel(e.pixel, function (feature) {

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

@ -4,22 +4,19 @@
<div class="m-crumb">
<div class="router_line"></div>
<div class="div_router">
<span
class="router_parents"
<span class="router_parents"
v-for="(item, index) in runAgencyArray"
@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>
</div>
</div>
<div class="g-cnt">
<div class="m-map" @click="handleClickMapBox">
<grid-map
ref="map"
<div class="m-map"
@click="handleClickMapBox">
<grid-map ref="map"
v-if="orgData.id"
@clickAgency="clickAgencyItem"
@clickDotBtn="handleClickDotBtn"
@ -29,55 +26,45 @@
:dotList2="dotList2"
:dotIcoList2="dotIcoList2"
:gridCountData="gridCountData"
:pitch="0"
/>
: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 class="i-search" src="@/assets/img/shuju/command/search.png" />
<input
type="text"
<img class="i-search"
src="@/assets/img/shuju/command/search.png" />
<input type="text"
placeholder="请输入"
@keyup.enter="handleSearch"
v-model="searchName"
/>
<img
v-show="searchName"
v-model="searchName" />
<img v-show="searchName"
class="i-close"
@click="clearSearch"
src="@/assets/img/shuju/command/close.png"
/>
<div class="btn" @click="handleSearch">搜索</div>
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"
<div :key="'searchResult' + item.type"
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-more"
<div class="result-more"
@click.stop="handleClickSearchResultMore(item)"
v-show="item.allList.length > 2"
>
v-show="item.allList.length > 2">
更多
</div>
<div class="result-ul">
<div
class="result-li z-toe"
<div class="result-li z-toe"
:key="item.type + 'li' + index"
v-for="(li, index) in item.list"
@click.stop="handleClickSearchLi(li, item)"
>
@click.stop="handleClickSearchLi(li, item)">
<span v-if="item.type == 'position'">{{
li.name + " " + li.address
}}</span>
@ -91,15 +78,14 @@
</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"
<div class="result-li z-toe"
:key="item.type + 'li2_' + index"
v-for="(li, index) in item.allList"
@click.stop="handleClickSearchLi(li, item)"
>
@click.stop="handleClickSearchLi(li, item)">
<span v-if="item.type == 'position'">{{
li.name + " " + li.address
}}</span>
@ -118,38 +104,37 @@
</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"
<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"
<img src="@/assets/img/modules/visual/noData.png"
alt=""
srcset=""
class="no-data-img"
/>
class="no-data-img" />
</div>
</el-scrollbar>
</div>
@ -168,11 +153,9 @@
</div>
<div class="list">
<sidemenu1
:orgId="orgId"
<sidemenu1 :orgId="orgId"
@change="handleChangeMenu1"
:grandIcoList="dotIcoList"
></sidemenu1>
:grandIcoList="dotIcoList"></sidemenu1>
</div>
</div>
@ -183,11 +166,9 @@
</div>
<div class="list">
<sidemenu2
:orgId="orgId"
<sidemenu2 :orgId="orgId"
@change="handleChangeMenu2"
:grandIcoList="dotIcoList"
></sidemenu2>
:grandIcoList="dotIcoList"></sidemenu2>
</div>
</div>
</div>
@ -195,56 +176,46 @@
</div>
</div>
<event-info
v-if="pageType === 'watch-event'"
<event-info v-if="pageType === 'watch-event'"
ref="ref_event"
:eventId="eventId"
@handleClose="handleClose"
/>
@handleClose="handleClose" />
<service-info
v-if="pageType === 'create-service'"
<service-info v-if="pageType === 'create-service'"
ref="ref_service"
:default-data="serviceDefaultData"
@handleClose="handleClose"
/>
@handleClose="handleClose" />
<demand-info
v-if="pageType === 'create-demand'"
<demand-info v-if="pageType === 'create-demand'"
ref="ref_demand"
:icResiUserId="icResiUserId"
:selGridId="selGridId"
@handleClose="handleClose"
/>
@handleClose="handleClose" />
<qsydw
v-if="pageType === 'watch-xuncha'"
<qsydw v-if="pageType === 'watch-xuncha'"
ref="ref_xuncha"
:enterpriseId="enterpriseId"
@handleClose="handleClose"
/>
@handleClose="handleClose" />
</div>
</template>
<script>
import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex";
import { Loading } from "element-ui"; //Loading
import { requestPost } from "@/js/dai/request";
import People from "@/views/modules/visual/basicinfo/people";
import cptCard from "@/views/modules/visual/cpts/card";
import gridMap from "@/views/modules/visual/command/cpts/map";
import gridMapOl from "@/views/modules/visual/command/cpts/map-ol";
import cptCard from "@/views/modules/visual/cpts/card";
import { Loading } from "element-ui"; //Loading
import { mapGetters } from "vuex";
// import gridMapOl from "@/views/modules/visual/command/cpts/map-ol";
import sidemenuLeft from "@/views/modules/visual/command/cpts/sidemenu-left";
import sidemenu1 from "@/views/modules/visual/command/cpts/yantai-sidemenu1";
import sidemenu2 from "@/views/modules/visual/command/cpts/yantai-sidemenu2";
import sidemenuLeft from "@/views/modules/visual/command/cpts/sidemenu-left";
import ScreenLoading from "@/views/modules/visual/cpts/loading";
import eventInfo from "@/views/modules/visual/command/cpts/eventInfo";
import serviceInfo from "@/views/modules/visual/command/cpts/serviceInfo";
import demandInfo from "@/views/modules/visual/command/cpts/demandInfo";
import eventInfo from "@/views/modules/visual/command/cpts/eventInfo";
import qsydw from "@/views/modules/visual/command/cpts/qsydw";
import { mapType } from "@/utils/dai-map";
import serviceInfo from "@/views/modules/visual/command/cpts/serviceInfo";
let loading; //
@ -288,10 +259,7 @@ export default {
People,
cptCard,
ScreenLoading,
gridMap:
mapType == "tdzw" && SITE_CONFIG["nodeEnv"] == "dev_sdtdt"
? gridMapOl
: gridMap,
gridMap: gridMap,
sidemenu1,
sidemenu2,
sidemenuLeft,

Loading…
Cancel
Save