{{ item.name }}
@@ -162,7 +162,8 @@ onMounted( async () => {
.el-scrollbar {
background: url("@/assets/images/comprehensiveManage/project4.png") no-repeat;
background-size: 100% 40%;
- background-position-y: 30%;
+ // background-position-y: 30%;
+ background-position-y: 50%;
}
.leftTop {
@@ -233,6 +234,7 @@ onMounted( async () => {
img {
width: 20px;
margin-top: 18%;
+ // margin-top: 30%;
margin-left: 15%;
}
}
diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
index c181ae7..4307efd 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
@@ -403,6 +403,7 @@ import {
deleteSafehatFence,
addSafeHatPositionFence
} from "@/api/modules/smartSafeHat";
+import { getProjectDetail } from "@/api/modules/projectOverview";
// 围栏相关API
import {
//智能安全帽--查询围栏信息
@@ -557,7 +558,8 @@ let formRules = ref({
onMounted(async () => {
// choiceMonth.value = formatMonthTime(dayValue.value);
// console.log("当前月份", choiceMonth.value);
- initMap();
+ getProjectInfo();
+
// 智能安全帽--查询报警信息
getProgressListData();
// 智能安全帽--分类查询设备列表
@@ -1548,13 +1550,25 @@ function startAnimation() {
}
var placeSearch = ref();
+const projectData = ref(null as any);
+//获取项目信息
+const getProjectInfo = async () => {
+ const res = await getProjectDetail({ projectSn: store.sn }, false);
+ // console.log("获取项目信息", res);
+ // console.log("获取工程类别", projectTypeEnum);
+ projectData.value = res.result;
+ initMap();
+};
// 围栏定位地图
function initMap() {
var that = this;
- //地图加载
+ console.log("初始化地图", projectData.value);
+ //地图加载 longitude latitude
map = new AMap.Map("mapContainer", {
// viewMode: '3D',
- resizeEnable: true
+ resizeEnable: true,
+ zoom: 18,
+ center: [Number(projectData.value.longitude), Number(projectData.value.latitude)],
// center: [116.39, 39.9],
// offset: new AMap.Pixel(-10, -10) // 设置地图偏移量
});
@@ -1592,6 +1606,12 @@ function initMap() {
});
});
});
+ console.log("绘制完成", addForm.value);
+ var lnglatXY = new AMap.LngLat(e.lnglat.getLng(), e.lnglat.getLat());
+ geocoder.getAddress(lnglatXY, function (status, result) {
+ console.log(status, result);
+ addForm.value.addr = result.regeocode.formattedAddress;
+ });
geocoder.getLocation(addForm.value.addr, function (status, result) {
if (status === "complete" && result.geocodes.length) {
var lnglat = result.geocodes[0].location;
diff --git a/src/views/sevenLargeScreen/videoManagement/index.vue b/src/views/sevenLargeScreen/videoManagement/index.vue
index 9003348..5f2c130 100644
--- a/src/views/sevenLargeScreen/videoManagement/index.vue
+++ b/src/views/sevenLargeScreen/videoManagement/index.vue
@@ -221,7 +221,7 @@ const getVideoList = async () => {
} else {
console.log("222");
- if (!res.result.videoList[0].list[0]?.outip) {
+ if (res.result.videoList[0]) {
if (res.result.videoList[0].appId) {
objData.value.appkey = res.result.videoList[0].appId;
objData.value.ip = res.result.videoList[0].account;
@@ -657,7 +657,7 @@ const previewVideo = (data: string | null) => {
}
::v-deep .h-card .content {
background: none;
- position: relative;
+ // position: relative;
}
::v-deep .h-card .title .titltText {
margin-bottom: 0%;
@@ -672,7 +672,8 @@ const previewVideo = (data: string | null) => {
font-size: 14px;
text-align: center;
line-height: 30px;
- right: -15%;
+ right: -12%;
+ // right: -15%;
top: 1%;
.safe-helmet {
padding: 0 6%;