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

fix: 修改特殊情况二级菜单遮住标题栏以及安全帽模块的页面高度异常

Browse Source
This commit is contained in:
Vce 2024-04-20 19:39:03 +08:00
parent 1d3427d1f0
commit 0163cbf5c4
6 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -13,9 +13,9 @@ NODE_ENV = 'development'
# 沈阳合盈线上 # 沈阳合盈线上
# VITE_API_URL = "http://101.43.164.214:45022" # VITE_API_URL = "http://101.43.164.214:45022"
# 演示平台 # 演示平台
VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
# 百色七参数线上地址 # 百色七参数线上地址
# 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:15551' # VITE_API_URL = 'http://jxj.zhgdyun.com:15551'
# 七参数标准版(测试平台) # 七参数标准版(测试平台)

4
.env.production
View File

@ -12,7 +12,7 @@ NODE_ENV = "production"
# VITE_API_URL = "http://183.249.224.118:9003" # 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' # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
@ -21,7 +21,7 @@ NODE_ENV = "production"
# 七参数标准版(测试平台) # 七参数标准版(测试平台)
# VITE_API_URL = 'http://182.90.224.237:15551' # VITE_API_URL = 'http://182.90.224.237:15551'
# agjt # agjt
VITE_API_URL = 'http://47.93.215.234:9809' # VITE_API_URL = 'http://47.93.215.234:9809'
# 苏立信 # 苏立信
# VITE_API_URL = 'http://101.43.164.214:11111' # VITE_API_URL = 'http://101.43.164.214:11111'

4
src/config/config.ts
View File

@ -26,9 +26,9 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
// export const COMPANY: string = ""; //标准版 // export const COMPANY: string = ""; //标准版
// export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "as"; //鞍山项目
// export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjt"; //鞍钢集团
export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
// export const COMPANY: string = "slx"; //苏立信项目 // export const COMPANY: string = "slx"; //苏立信项目
// export const COMPANY: string = "hfqc"; //合肥启程项目 export const COMPANY: string = "hfqc"; //合肥启程项目
// export const COMPANY: string = "jsyc"; // 江苏盐城项目 // export const COMPANY: string = "jsyc"; // 江苏盐城项目
// export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页) // export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页)
// export const COMPANY: string = "jxwjj"; //嘉兴王江泾公用码头项目 (需要去src\routers\modules\staticRouter.ts更换首页) // export const COMPANY: string = "jxwjj"; //嘉兴王江泾公用码头项目 (需要去src\routers\modules\staticRouter.ts更换首页)

4
src/routers/modules/staticRouter.ts
View File

@ -24,8 +24,8 @@ export const staticRouter: RouteRecordRaw[] = [
{ {
path: "/large", path: "/large",
name: "大屏", name: "大屏",
// component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
// component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页)
children: [ children: [
{ {

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

@ -165,7 +165,7 @@
</div> </div>
<div class="right-data"> <div class="right-data">
<div class="map-top" :style="enlarge ? 'height:108%' : ''"> <div class="map-top" :style="enlarge ? 'height:105%' : ''">
<Card title="定位地图" style="width: 100%"> <Card title="定位地图" style="width: 100%">
<div class="map-box" id="mapContainer"></div> <div class="map-box" id="mapContainer"></div>
<div class="wei-lan" v-if="checked === 1"> <div class="wei-lan" v-if="checked === 1">
@ -1980,7 +1980,7 @@ function echoPersonMarker(item) {
height: 100%; height: 100%;
// background-color: black; // background-color: black;
display: flex; display: flex;
justify-content: end; justify-content: flex-end;
align-items: center; align-items: center;
.closeDetail { .closeDetail {
cursor: pointer; cursor: pointer;
@ -2462,7 +2462,7 @@ function echoPersonMarker(item) {
} }
.bottom-data { .bottom-data {
margin-top: 1%; margin-top: 1%;
height: 40.8%; height: 38%;
:deep(.h-card) { :deep(.h-card) {
.content { .content {
margin-top: 4% !important; margin-top: 4% !important;
@ -2471,7 +2471,7 @@ function echoPersonMarker(item) {
.left-content { .left-content {
height: 100%; height: 100%;
width: 100%; width: 100%;
// background-color: #fff;
.tab-list { .tab-list {
display: flex; display: flex;
align-items: center; align-items: center;
@ -2672,7 +2672,7 @@ function echoPersonMarker(item) {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 41%; height: 38%;
.hat-bottom { .hat-bottom {
width: 23%; width: 23%;
margin-top: 20px; margin-top: 20px;
@ -2727,13 +2727,22 @@ function echoPersonMarker(item) {
} }
.week-bottom { .week-bottom {
width: 48.75%; width: 48.75%;
// margin-top: 20px;
// // height: 90%;
// // position: relative;
// :deep(.content) {
// margin-top: 2.1% !important;
// }
// div {
// }
// width: 50%;
margin-top: 20px; margin-top: 20px;
height: 100%; height: 100%;
// position: relative; position: relative;
:deep(.content) { :deep(.h-card) {
margin-top: 2.1% !important; .content {
} margin-top: 2.1% !important;
div { }
} }
} }

2
src/views/sevenLargeScreen/indexL.vue
View File

@ -686,7 +686,7 @@ function jumpBgd() {
font-size: 14px; font-size: 14px;
font-family: none; font-family: none;
background: url("@/assets/images/subTabImg.gif") no-repeat; background: url("@/assets/images/subTabImg.gif") no-repeat;
background-size: 100% 100%; background-size: 100% 35%;
.scrollItem { .scrollItem {
width: 73%; width: 73%;
height: max-content; height: max-content;