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

修改智慧建造部分样式

Browse Source
This commit is contained in:
Luck-Xiaomi 2022-06-15 14:40:05 +08:00
parent 817fdfb6c7
commit 86ef8538a4
6 changed files with 84 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/images/dataBoard/wisdomBuild/map.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 416 KiB

BIN
src/assets/images/dataBoard/wisdomBuild/menu-active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 750 B

BIN
src/assets/images/dataBoard/wisdomBuild/menu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 912 B

5
src/assets/js/http.js
View File

@ -35,11 +35,12 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://14.29.220.211:6023/' // axios.defaults.baseURL = 'http://14.29.220.211:6023/'
// axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光 // axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光
// axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/' // axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/'
axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789 // axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789
// axios.defaults.baseURL = 'http://124.71.178.44:100/' // axios.defaults.baseURL = 'http://124.71.178.44:100/'
// tag: 本地 // tag: 本地
// axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1 axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
// axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
// axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西 // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西

97
src/router/index.js
View File

@ -1361,7 +1361,6 @@ const routes2 = [{
{ {
path: '/project/dataBoard/', path: '/project/dataBoard/',
name: '数据看板', name: '数据看板',
component: resolve => require(['@/views/projectAdmin/dataBoardTwo/dataBoard.vue'], resolve),
// component: resolve => require(['@/views/projectAdmin/dataBoard/dataBoard.vue'], resolve), // component: resolve => require(['@/views/projectAdmin/dataBoard/dataBoard.vue'], resolve),
// children: [{ // children: [{
// path: 'index', // path: 'index',
@ -1411,54 +1410,56 @@ const routes2 = [{
// component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'), // component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'),
// } // }
// ] // ]
component: resolve => require(['@/views/projectAdmin/dataBoardTwo/dataBoard.vue'], resolve),
children: [{ children: [{
path: 'index', path: 'index',
name: '数据看板-首页概览', name: '数据看板-首页概览',
component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'), component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'),
}, { }, {
path: 'digitalSite', path: 'digitalSite',
name: '数据看板-数字工地', name: '数据看板-数字工地',
component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite.vue'), component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite'),
}, { }, {
path: 'laborManage', path: 'laborManage',
name: '数据看板-劳务管理', name: '数据看板-劳务管理',
component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'), component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'),
}, { }, {
path: 'environment', path: 'environment',
name: '数据看板-环境监测', name: '数据看板-环境监测',
component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'), component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'),
}, },
{ {
path: 'material', path: 'material',
name: '数据看板-材料管理', name: '数据看板-材料管理',
component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'), component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'),
}, },
{ {
path: 'plan', path: 'plan',
name: '数据看板-进度计划', name: '数据看板-进度计划',
component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'), component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'),
}, },
{ {
path: 'secure', path: 'secure',
name: '数据看板-安全管理', name: '数据看板-安全管理',
component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'), component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'),
}, },
{ {
path: 'quality', path: 'quality',
name: '数据看板-质量管理', name: '数据看板-质量管理',
component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'), component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'),
}, },
{ {
path: 'SixHundred', path: 'SixHundred',
name: '数据看板-六个百分百', name: '数据看板-六个百分百',
component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'), component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'),
}, },
{ {
path: 'AiAnalysis', path: 'AiAnalysis',
name: '数据看板-AI数据分析', name: '数据看板-AI数据分析',
component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'), component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'),
} }
] ]
}, },
{ {
path: '/equipmentCenter/', path: '/equipmentCenter/',

61
src/views/projectAdmin/dataBoardTwo/digitalSite.vue → src/views/projectAdmin/dataBoardTwo/digitalSite/index.vue
View File

@ -205,8 +205,12 @@
</div> </div>
</div> </div>
<div class="mapContent" :class="company == 'longguang'?'lgMapContent':''"> <div class="mapContent" :class="company == 'longguang'?'lgMapContent':''">
<vue-scroll v-show="!showVideoDialog"> <!-- TODO: 开发中 -->
<el-image style="width: 100%; height: 100%" :src="require('@/assets/images/dataBoard/wisdomBuild/map.jpg')" ></el-image>
<!-- tag: 去掉 -->
<vue-scroll v-if="false" v-show="!showVideoDialog">
<div <div
v-if="false"
class="mapUrl" class="mapUrl"
style="width: 100%; height: 100%; overflow: hidden;" style="width: 100%; height: 100%; overflow: hidden;"
> >
@ -217,15 +221,6 @@
ref="bgPackImg" ref="bgPackImg"
@load="countBoxSize" @load="countBoxSize"
/> />
<!-- <el-image
style="width: 100%; height: auto;position: relative;"
:src="bgUrl"
class="bgPackImg"
ref="bgPackImg"
></el-image> -->
<!-- <img class="bgPackImg" src="@/assets/images/longguang2/bg.jpg" alt="" style="width: auto; height: auto;position:absolute"
ref="bgPackImg">
<!-- 点位 -->
<div <div
v-for="(item, index) in pointList" v-for="(item, index) in pointList"
class="point" class="point"
@ -2555,7 +2550,7 @@
<div class="operationInfo_towercrane"> <div class="operationInfo_towercrane">
<img <img
class="imgGantry" class="imgGantry"
src="../../projectLevel/assets/images/gantryCrane/gantry2.png" src="../../../projectLevel/assets/images/gantryCrane/gantry2.png"
/> />
<div ref="hookBox" class="hookBox"> <div ref="hookBox" class="hookBox">
<!-- imgHeight:0,//照片升降高度--> <!-- imgHeight:0,//照片升降高度-->
@ -2564,18 +2559,18 @@
<img <img
class="imgHead" class="imgHead"
ref="imgHead" ref="imgHead"
src="../../projectLevel/assets/images/gantryCrane/head.png" src="../../../projectLevel/assets/images/gantryCrane/head.png"
alt="" alt=""
/> />
<img <img
:style="{ height: imgHeight + 45 + 'px' }" :style="{ height: imgHeight + 45 + 'px' }"
class="imgMid" class="imgMid"
src="../../projectLevel/assets/images/gantryCrane/mid.png" src="../../../projectLevel/assets/images/gantryCrane/mid.png"
alt="" alt=""
/> />
<img <img
class="imgBottom" class="imgBottom"
src="../../projectLevel/assets/images/gantryCrane/bottom.png" src="../../../projectLevel/assets/images/gantryCrane/bottom.png"
alt="" alt=""
/> />
</div> </div>
@ -3161,7 +3156,7 @@ import {
getAiVideoInfo, getAiVideoInfo,
getAIDangerList, getAIDangerList,
} from "@/assets/js/api/dataBoard"; } from "@/assets/js/api/dataBoard";
import { selectCarTotal } from "../../../assets/js/api/carManage.js"; import { selectCarTotal } from "@/assets/js/api/carManage.js";
import { import {
getSelectTowerBySnApi, getSelectTowerBySnApi,
getTowerCurrentDataApi, getTowerCurrentDataApi,
@ -3520,6 +3515,8 @@ export default {
clearInterval(this.timer1); clearInterval(this.timer1);
}, },
methods: { methods: {
/** 初始化地图Echarts TODO: */
initMapEcharts() {},
// 计算点位的缩小比 // 计算点位的缩小比
countBoxSize() { countBoxSize() {
this.$nextTick(() => { this.$nextTick(() => {
@ -5175,30 +5172,36 @@ img {
.lgMapContent { .lgMapContent {
text-align: left !important; text-align: left !important;
} }
// TODO: 地图
.pointTabBox { .pointTabBox {
display: flex;
align-items: center;
justify-content: center;
margin-top: 30px; margin-top: 30px;
position: absolute; position: absolute;
top: 90%; bottom: 30px;
left: 25%; left: 50%;
transform: translate(-50%);
ul {
width: 700px;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
li { li {
margin-right: 35px; margin-bottom: 15px;
width: 120px; width: 120px;
height: 39px; height: 39px;
background-image: url("../../../assets/images/dataBoard/tabBG.png"); background-image: url("../../../../assets/images/dataBoard/wisdomBuild/menu.png");
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
color: #5ce2f6;
font-size: 18px; font-size: 18px;
cursor: pointer; cursor: pointer;
&:last-child { &:last-child {
margin-right: 0; margin-right: 0;
} }
&.active { &.active {
background-image: url("../../../assets/images/dataBoard/tabBG-active.png"); background-image: url("../../../../assets/images/dataBoard/wisdomBuild/menu.png");
color: #f7d300; color: #fff;
} }
} }
} }
@ -5824,10 +5827,10 @@ img {
.dataBoardPage_blue { .dataBoardPage_blue {
.pointTabBox { .pointTabBox {
li { li {
background-image: url("../../../assets/images/dataBoard/blueTheme/tabBG.png"); background-image: url("../../../../assets/images/dataBoard/blueTheme/tabBG.png");
color: rgba(255, 255, 254, 0.8); color: rgba(255, 255, 254, 0.8);
&.active { &.active {
background-image: url("../../../assets/images/dataBoard/blueTheme/tabBG-active.png"); background-image: url("../../../../assets/images/dataBoard/blueTheme/tabBG-active.png");
color: #ffffff; color: #ffffff;
} }
} }
@ -5847,10 +5850,10 @@ img {
.dataBoardPage_blue2 { .dataBoardPage_blue2 {
.pointTabBox { .pointTabBox {
li { li {
background-image: url("../../../assets/images/dataBoard/blueTheme2/tabBG.png"); background-image: url("../../../../assets/images/dataBoard/blueTheme2/tabBG.png");
color: rgba(255, 255, 254, 0.8); color: rgba(255, 255, 254, 0.8);
&.active { &.active {
background-image: url("../../../assets/images/dataBoard/blueTheme2/tabBG-active.png"); background-image: url("../../../../assets/images/dataBoard/blueTheme2/tabBG-active.png");
color: #ffffff; color: #ffffff;
} }
} }
@ -5893,7 +5896,7 @@ img {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-image: url("../../../assets/images/dataBoard/blockBG.png"); background-image: url("../../../../assets/images/dataBoard/blockBG.png");
background-position: bottom center; background-position: bottom center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;