admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flx：修改样式问题

Browse Source
This commit is contained in:
X_Rian 2024-10-11 15:32:42 +08:00
parent b203e6c415
commit 237c8c0277
6 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -4,8 +4,8 @@ NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用)
# 后端本地
# VITE_API_URL = 'http://192.168.34.155:19111'
# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
VITE_API_URL = 'http://192.168.34.221:28890' #雄哥本地
VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
# VITE_API_URL = 'http://192.168.34.221:28890' #雄哥本地
# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程
# VITE_API_URL = 'http://192.168.34.221:28889'
# VITE_API_URL = 'http://121.196.214.246/api'

4
.env.production
View File

@ -8,12 +8,12 @@ NODE_ENV = "production"
# VITE_API_URL = 'http://jxj.zhgdyun.com:100'
# VITE_API_URL = 'http://jxj.zhgdyun.com:33981'
# 沈阳合盈线上
# VITE_API_URL = "http://101.43.164.214:45022"
VITE_API_URL = "http://101.43.164.214:45022"
# 嘉兴王江泾公用码头
# VITE_API_URL = "http://183.249.224.118:9003"
# 百色 新项目通用地址
VITE_API_URL = 'http://101.43.164.214:11111'
# VITE_API_URL = 'http://101.43.164.214:11111'
# 七参数标准版(演示平台)
# VITE_API_URL = 'http://jxj.zhgdyun.com:9809'

4
src/config/config.ts
View File

@ -23,9 +23,9 @@ export const BAIDU_MAP_KEY: string = "";
export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
// 项目环境标识配置 部署时需更改对应的项目
// export const COMPANY: string = ""; //标准版
export const COMPANY: string = ""; //标准版
// export const COMPANY: string = "zhzrf"; //中海·臻如府
export const COMPANY: string = "zsbf"; //中水北方
// export const COMPANY: string = "zsbf"; //中水北方
// export const COMPANY: string = "as"; //鞍山项目
// export const COMPANY: string = "agjt"; //鞍钢集团
// export const COMPANY: string = "tj"; // 同济项目

6
src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue
View File

@ -32,7 +32,7 @@
<div style="width: 5px; height: 5px; background: rgba(130, 251, 234, 1); border-radius: 10px; margin: 1%"></div>
<div><i>里程碑</i></div>
</div>
<el-scrollbar style="width: 94%; margin: 3% 0% 0% 3%; height: 30%" v-if="progressList.length > 0">
<el-scrollbar style="width: 94%; margin: 2% 0% 0% 3%; height: 30%" v-if="progressList.length > 0">
<div class="progressData">
<div class="data" v-for="item in progressList" :key="item.id">
<div v-if="item.status == 0" class="text" :title="item.name">{{ item.name }}</div>
@ -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%;
}
}

26
src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
View File

@ -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;

7
src/views/sevenLargeScreen/videoManagement/index.vue
View File

@ -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%;