瀏覽代碼

优化地图视角与功能

彭宇 3 周之前
父節點
當前提交
86ab9a69bf
共有 6 個文件被更改,包括 47 次插入29 次删除
  1. 2 2
      src/api/sentinel.js
  2. 1 1
      src/components/supermap-2.5d.vue
  3. 1 1
      src/router/index.js
  4. 3 1
      src/views/SenEquipmentCenter.vue
  5. 2 0
      src/views/homePage.vue
  6. 38 24
      src/views/lookall.vue

+ 2 - 2
src/api/sentinel.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询监测设备列表(所有)
 export function listDeviceAll(params) {
   return request({
-    url: `/center-monitor/device/listDeviceAll?brand=${params.brand}&pageNum=${params.pageNum}&deviceName=${params.deviceName}&pageSize=${params.pageSize}`,
+    url: `/center-monitor/device/listDeviceAll?brand=${params.brand}&deviceType=10&pageNum=${params.pageNum}&deviceName=${params.deviceName}&pageSize=${params.pageSize}`,
     method: 'get'
   })
 }
@@ -30,4 +30,4 @@ export function selectByDeviceId({id}) {
     url: `/center-monitor/device/selectByDeviceId/${id}`,
     method: 'get'
   })
-}
+}

+ 1 - 1
src/components/supermap-2.5d.vue

@@ -1418,7 +1418,7 @@ export default {
     dropLocation(lat, lng, index,radius) {
       this.viewer.scene.globe.depthTestAgainstTerrain = true;
       this.viewer.camera.flyTo({
-        destination: new SuperMap3D.Cartesian3.fromDegrees(Number(lng), Number(lat)-Number(1.3), Number(140000)),
+        destination: new SuperMap3D.Cartesian3.fromDegrees(Number(lng), Number(lat)-Number(0.003), Number(500)),
         orientation: {
           heading:  SuperMap3D.Math.toRadians(0),
           pitch:  SuperMap3D.Math.toRadians(-45),

+ 1 - 1
src/router/index.js

@@ -53,7 +53,7 @@ export const constantRoutesNew = [{
     }
   },
 	{
-		//驾驶舱
+		//生命线驾驶舱
 		path: '/Cockpit',
 		name: 'Cockpit',
 		component: () => import('@/views/Cockpit'),

+ 3 - 1
src/views/SenEquipmentCenter.vue

@@ -55,7 +55,7 @@
 					layout="prev, pager, next"
 					:current-page.sync="listParams.pageNum"
 					@current-change="pageNumHasChanged"
-					:total="100">
+					:total="deviceTotal">
 			</el-pagination>
 		</div>
 		<div class="visual-body">
@@ -158,6 +158,7 @@
 				title:'四平市智慧哨兵监管平台',
 				deviceList:[],       		 	// 设备列表
 				deviceListSearch:[],        	// 设备列表检索
+        deviceTotal:0,
 				listParams:{
 					brand:'',
 					deviceName:'',
@@ -186,6 +187,7 @@
 				listDeviceAll(this.listParams).then(res => {
 					this.deviceList = res.rows
 					this.deviceListSearch = res.rows
+          this.deviceTotal = res.total
 					let deviceMarkersList = []
 					// hz_qy
 					if (res.rows != null && res.rows.length > 0) {

+ 2 - 0
src/views/homePage.vue

@@ -104,8 +104,10 @@
 					</router-link>
 				</div>
 				<div class="btn-span2">
+          <router-link to="/lookall">
 					<img src="../assets/index_img/yyzx.png" alt="" />
 					<span>运营中心</span>
+          </router-link>
 				</div>
 			</div>
 			<!-- 底部按钮 -->

+ 38 - 24
src/views/lookall.vue

@@ -22,12 +22,14 @@
 			<div class="right-content">
 				<div v-for="(item,index) in section" :id="'section'+computedIndex(index)" class="con-box">
 					<div class="tit">
-						{{item.name}}
+              {{item.name}}
 					</div>
 					<div class="btm-btn3">
-						<div class="btn-span2" v-for="(item,index) in item.btn">
-							<img :src="item.btnSrc" alt="" />
-							<span>{{item.btnName}}</span>
+						<div class="btn-span2" v-for="(item,index) in item.btn" >
+              <a :href="item.src">
+                <img :src="item.btnSrc" alt=""/>
+              </a>
+                <span>{{item.btnName}}</span>
 						</div>
 					</div>
 				</div>
@@ -84,15 +86,18 @@
 						btn:[
 							{
 								btnName:'监管中心',
-								btnSrc:require("@/assets/lookall/jgzx-icon.png")
+								btnSrc:require("@/assets/lookall/jgzx-icon.png"),
+                src:''
 							},
 							{
 								btnName:'驾驶舱',
-								btnSrc:require("@/assets/lookall/jsc-icon.png")
+								btnSrc:require("@/assets/lookall/jsc-icon.png"),
+                src:'/Cockpit'
 							},
 							{
 								btnName:'运营中心',
-								btnSrc:require("@/assets/lookall/yyzx-icon.png")
+								btnSrc:require("@/assets/lookall/yyzx-icon.png"),
+                src:''
 							}
 						]
 					},
@@ -101,19 +106,23 @@
 						btn:[
 							{
 								btnName:'一张图',
-								btnSrc:require("@/assets/lookall/yzw-icon.png")
+								btnSrc:require("@/assets/lookall/yzw-icon.png"),
+                src:''
 							},
 							{
 								btnName:'瓶安四平',
-								btnSrc:require("@/assets/lookall/pan-icon.png")
+								btnSrc:require("@/assets/lookall/pan-icon.png"),
+                src:''
 							},
 							{
 								btnName:'智慧哨兵',
-								btnSrc:require("@/assets/lookall/sb-icon.png")
+								btnSrc:require("@/assets/lookall/sb-icon.png"),
+                src:'/SenEquipmentCenter'
 							},
 							{
 								btnName:'城市生命线',
-								btnSrc:require("@/assets/lookall/smx-icon.png")
+								btnSrc:require("@/assets/lookall/smx-icon.png"),
+                src:''
 							}
 						]
 					},
@@ -122,9 +131,10 @@
 						btn:[
 							{
 								btnName:'监管中心',
-								btnSrc:require("@/assets/lookall/jgzx-icon.png")
+								btnSrc:require("@/assets/lookall/jgzx-icon.png"),
+                src:''
 							},
-							
+
 						]
 					},
 					{
@@ -132,9 +142,10 @@
 						btn:[
 							{
 								btnName:'监管中心',
-								btnSrc:require("@/assets/lookall/jgzx-icon.png")
+								btnSrc:require("@/assets/lookall/jgzx-icon.png"),
+                src:''
 							},
-							
+
 						]
 					},
 					{
@@ -142,9 +153,10 @@
 						btn:[
 							{
 								btnName:'监管中心',
-								btnSrc:require("@/assets/lookall/jgzx-icon.png")
+								btnSrc:require("@/assets/lookall/jgzx-icon.png"),
+                src:''
 							},
-							
+
 						]
 					},
 					{
@@ -152,9 +164,10 @@
 						btn:[
 							{
 								btnName:'监管中心',
-								btnSrc:require("@/assets/lookall/jgzx-icon.png")
+								btnSrc:require("@/assets/lookall/jgzx-icon.png"),
+                src:''
 							},
-							
+
 						]
 					},
 					{
@@ -162,9 +175,10 @@
 						btn:[
 							{
 								btnName:'监管中心',
-								btnSrc:require("@/assets/lookall/jgzx-icon.png")
+								btnSrc:require("@/assets/lookall/jgzx-icon.png"),
+                src:''
 							},
-							
+
 						]
 					},
 				]
@@ -194,7 +208,7 @@
 				if (element) {
 					element.scrollIntoView({
 						behavior: 'smooth'
-						
+
 					});
 				}
 				console.log(index)
@@ -482,7 +496,7 @@
 							align-items: center;
 							transition: all 0.3s;
 							margin: 0 20px;
-					
+
 							img{
 								width: 160px;
 								height: 160px;
@@ -512,4 +526,4 @@
 
 
 	}
-</style>
+</style>