|
@@ -68,7 +68,7 @@
|
|
|
:class="item.active ? 'fotter-item-active' : ''"
|
|
|
:key="index + 'nav'"
|
|
|
v-if="index < 3"
|
|
|
- @click="chacgeSpace(item)"
|
|
|
+ @click="changeSpace(item)"
|
|
|
>
|
|
|
<img
|
|
|
v-if="item.active"
|
|
@@ -79,7 +79,11 @@
|
|
|
<span>{{ item.spaceName }} </span>
|
|
|
</div>
|
|
|
</template>
|
|
|
- <div class="fotter-item-end" v-if="spaceData && spaceData.length > 3">
|
|
|
+ <div
|
|
|
+ class="fotter-item-end"
|
|
|
+ @click="moreSpace"
|
|
|
+ v-if="spaceData && spaceData.length > 3"
|
|
|
+ >
|
|
|
<img :src="parseImgUrl('ipdImages', 'rectangle-fotter.svg')" />
|
|
|
<span>…</span>
|
|
|
</div>
|
|
@@ -135,6 +139,7 @@
|
|
|
:projectId="projectId"
|
|
|
/>
|
|
|
</div>
|
|
|
+ <!--加班场景-->
|
|
|
<van-popup
|
|
|
v-model:show="isShowWork"
|
|
|
position="right"
|
|
@@ -147,6 +152,7 @@
|
|
|
:workkArr="workkArr"
|
|
|
></work-overtime>
|
|
|
</van-popup>
|
|
|
+ <!--会议室场景-->
|
|
|
<van-popup
|
|
|
v-model:show="isShowMetting"
|
|
|
position="right"
|
|
@@ -160,6 +166,7 @@
|
|
|
>
|
|
|
</scenario-dailog>
|
|
|
</van-popup>
|
|
|
+ <!--环境数据详情-->
|
|
|
<van-popup
|
|
|
v-model:show="isShowDetail"
|
|
|
position="right"
|
|
@@ -169,6 +176,16 @@
|
|
|
>
|
|
|
<detail :query="detailQuery" v-if="isShowDetail"></detail>
|
|
|
</van-popup>
|
|
|
+ <!--地图数据列表-->
|
|
|
+ <van-popup
|
|
|
+ v-model:show="isShowMap"
|
|
|
+ position="bottom"
|
|
|
+ style="width: 100%; height: 50%"
|
|
|
+ :close-on-click-overlay="true"
|
|
|
+ teleport="#app"
|
|
|
+ >
|
|
|
+ <com-map :spaceData="spaceData" @changeSpace="changeSpace"></com-map>
|
|
|
+ </van-popup>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -186,7 +203,7 @@ import {
|
|
|
import WorkOvertime from "./components/workOvertime/index.vue";
|
|
|
import WorkConfig from "./components/workOvertime/WorkConfig.vue";
|
|
|
import ScenarioConfig from "./components/Scenario/ScenarioConfig.vue";
|
|
|
-import MapBox from "@/views/envmonitor/MapBox.vue";
|
|
|
+import MapBox from "@/views/envmonitor/components/Map/MapBox.vue";
|
|
|
import Header from "@/components/header/Index.vue";
|
|
|
import Comheader from "@/components/header/Comheader.vue";
|
|
|
import Scenario from "@/views/envmonitor/components/Scenario/Scenario.vue";
|
|
@@ -197,6 +214,7 @@ import TimeBox from "@/views/envmonitor/TimeBox.vue";
|
|
|
import NavBar from "@/views/envmonitor/NavBar.vue";
|
|
|
import ScenarioDailog from "@/views/envmonitor/components/Scenario/scenarioDailog.vue";
|
|
|
import Detail from "@/views/envmonitor/detail.vue";
|
|
|
+import ComMap from "@/views/envmonitor/components/Map/index.vue";
|
|
|
import { Icon, Popup, Dialog, Toast } from "vant";
|
|
|
import { useRouter, useRoute } from "vue-router";
|
|
|
import {
|
|
@@ -231,6 +249,7 @@ import { getWorkType } from "@/utils/mapIcon";
|
|
|
export default defineComponent({
|
|
|
components: {
|
|
|
MapBox,
|
|
|
+ ComMap,
|
|
|
ScenarioDailog,
|
|
|
Scenario,
|
|
|
Header,
|
|
@@ -1476,6 +1495,14 @@ export default defineComponent({
|
|
|
//类型:Object 必有字段 备注:无
|
|
|
macAddress: "test", //类型:String 必有字段 备注:mac地址
|
|
|
},
|
|
|
+ orders: [
|
|
|
+ //类型:Array 必有字段 备注:无
|
|
|
+ {
|
|
|
+ //类型:Object 必有字段 备注:无
|
|
|
+ column: "isMajorSpace", //类型:String 必有字段 备注:无
|
|
|
+ asc: false, //类型:Boolean 必有字段 备注:无
|
|
|
+ },
|
|
|
+ ]
|
|
|
};
|
|
|
queryWorkSpace(params).then((res) => {
|
|
|
let resData: any = res;
|
|
@@ -1499,11 +1526,19 @@ export default defineComponent({
|
|
|
item.active = false;
|
|
|
});
|
|
|
},
|
|
|
+ // 更多空间
|
|
|
+ isShowMap: false,
|
|
|
+ moreSpace() {
|
|
|
+ proxyData.isShowMap = true;
|
|
|
+ },
|
|
|
// 切换空间
|
|
|
- chacgeSpace(item: any) {
|
|
|
+ changeSpace(item: any, type: any = 0) {
|
|
|
proxyData.resetSpaceStatus();
|
|
|
proxyData.spaceInfo = item;
|
|
|
proxyData.init();
|
|
|
+ if (type === 1) {
|
|
|
+ proxyData.isShowMap = false;
|
|
|
+ }
|
|
|
item.active = true;
|
|
|
},
|
|
|
timeOutEvent: timeOutEvent,
|