Skip to content

H
holo-web
Commit 83a8c291 authored by ninglx's avatar ninglx
Browse files
Options

修复去除私有库后长沙大屏版本bug

parent 17c6fbdb
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 152 deletions
wj-data-vision/public/index.html
View file @ 83a8c291
......@@ -10,7 +10,7 @@
<link href="/cdn/libs/normalize/normalize.css" rel="stylesheet" />
<link href="/cdn/libs/element-ui/element-ui.css" rel="stylesheet" />
<link href="/cdn/libs/example/styles/jsDemo.css" rel="stylesheet" type="text/css" media="all" />
<!-- <link href="/cdn/libs/example/styles/jsDemo.css" rel="stylesheet" type="text/css" media="all" /> -->
<link href="/cdn/libs/mapbox-gl/mapbox-gl.css" rel="stylesheet" />
<link href="/cdn/libs/threebox/threebox.css" rel="stylesheet" />
<link rel="stylesheet" href="/cdn/libs/Cesium/Widgets/widgets.css" />
......@@ -22,15 +22,16 @@
<script src="/cdn/libs/st-dao/st-dao.js"></script>
<script src="/cdn/libs/mapbox-gl/mapbox-gl.js" type="text/javascript"></script>
<script src="/cdn/libs/threebox/threebox.js" type="text/javascript"></script>
<script type="text/javascript" src="/cdn/libs/Cesium/Cesium.js"></script>
<script src="/cdn/libs/cesium/Cesium.js" type="text/javascript"></script>
<script src="/cdn/libs/turf/turf.min.js" type="text/javascript"></script>
<script src="/cdn/libs/flvjs/flv.min.js" type="text/javascript"></script>
<script src='/cdn/libs/reconnectingWebsocket/reconnectingWs.js' type="text/javascript"></script>
<script src='/cdn/libs/reconnecting-websocket/reconnecting-websocket.js' type="text/javascript"></script>
<style>
#app {
#app,body,html {
height: 100%;
width: 100%;
overflow: hidden;
}
</style>
</head>
......
wj-data-vision/src/App.vue
View file @ 83a8c291
<template>
<!-- <stms-framework
id="app"
title="GIS云中台"
wrapperClassName="default"
:menu="menu"
:path="path"
:params="params"
v-if="isInit"
/> -->
<div class="full-h full-w">
<!-- <div v-if="showMenu" id="app" class="stms-framework default">-->
<!-- &lt;!&ndash; 头部 &ndash;&gt;-->
<!-- <Navigator title="全息路段感知平台"/>-->
<!-- <div class="stms-framework-container">-->
<!-- &lt;!&ndash; 左侧 &ndash;&gt;-->
<!-- <leftMenu/>-->
<!-- <div class="stms-framework-content">-->
<!-- <div class="stms-framework-content-flex">-->
<!-- <router-view/>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="full-w full-h" v-else><router-view/></div>-->
<div class="full-w full-h"><router-view/></div>
</div>
</template>
<script>
// import Navigator from "@/components/navigator";
// import leftMenu from "@/components/leftMenu";
export default {
components: {
// Navigator,
// leftMenu,
},
data() {
return {
......@@ -68,9 +40,6 @@ export default {
async init() {
await this.$store.dispatch("QUERY_MENU");
this.isInit = true;
// if (window.location.hash === "#/") {
// this.$route.path === "/" && this.$router.push(this.menu.find(v => !v.parentId).url);
// }
},
},
};
......@@ -78,8 +47,6 @@ export default {
<style lang="less" scoped>
#app {
// font-family: "Avenir", Helvetica, Arial, sans-serif;
//font-family: 'SiYuanHT';
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;
......
wj-data-vision/src/permission.js
View file @ 83a8c291
......@@ -7,17 +7,18 @@ router.beforeEach((to, from, next) => {
// 在免登录白名单，直接进入
next()
} else {
const parentId = map_config.SYS_ID;
AuthDao.queryMenu({
params: {parentId, isRecursion: true}
}).then(res => {
let routes = res.data.content
for (let route of routes) {
if (route.url === to.path) {
next()
}
}
});
next()
// const parentId = map_config.SYS_ID;
// AuthDao.queryMenu({
// params: {parentId, isRecursion: true}
// }).then(res => {
// let routes = res.data.content
// for (let route of routes) {
// if (route.url === to.path) {
// next()
// }
// }
// });
}
})
......
wj-data-vision/src/views/accidentScene/mapPopup/vehicleDetail.vue
View file @ 83a8c291
......@@ -62,27 +62,27 @@ export default {
<style lang="less" scoped>
.vehicleDetail {
background-image: url("../../../assets/images/sc/redBack.png");
font-size: 12px;
font-size: 12PX;
position: absolute;
width: 348px;
height: 254px;
padding: 2px 16px 6px 120px;
width: 348PX;
height: 254PX;
padding: 2PX 16PX 6PX 120PX;
background-size: 100% 100%;
background-repeat: no-repeat;
.head {
height: 25px;
height: 25PX;
color: white;
display: flex;
align-items: center;
span {
display: inline-block;
width: 18px;
height: 18px;
margin-right: 5px;
line-height: 25px;
width: 18PX;
height: 18PX;
margin-right: 5PX;
line-height: 25PX;
background-image: url('../../../assets/images/holo/vehicle_popup_icon.png');
background-position: center;
background-repeat: no-repeat;
......@@ -90,17 +90,17 @@ export default {
}
.content {
height: calc(100% - 25px);
height: calc(100% - 25PX);
display: flex;
padding-top: 12px;
padding-top: 12PX;
flex-direction: column;
.detailItem {
height: 30px;
line-height: 30px;
height: 30PX;
line-height: 30PX;
white-space: nowrap;
color: white;
max-width: 200px;
max-width: 200PX;
overflow: hidden;
text-overflow: ellipsis;
......@@ -110,7 +110,7 @@ export default {
span.left {
text-align: left;
padding-left: 20px;
padding-left: 20PX;
background-image: url("../../../assets/images/acci/arrow-origin.png");
background-size: auto;
background-repeat: no-repeat;
......
wj-data-vision/src/views/accidentScene/mapPopup/vehicleDetailBottom.vue
View file @ 83a8c291
......@@ -58,27 +58,27 @@ export default {
<style lang="less" scoped>
.vehicleDetail {
background-image: url("../../../assets/images/sc/originBack.png");
font-size: 12px;
font-size: 12PX;
position: absolute;
width: 348px;
height: 254px;
padding: 115px 16px 6px 16px;
width: 348PX;
height: 254PX;
padding: 115PX 16PX 6PX 16PX;
background-size: 100% 100%;
background-repeat: no-repeat;
.head {
height: 25px;
height: 25PX;
color: white;
display: flex;
align-items: center;
span {
display: inline-block;
width: 18px;
height: 18px;
margin-right: 5px;
line-height: 25px;
width: 18PX;
height: 18PX;
margin-right: 5PX;
line-height: 25PX;
background-image: url('../../../assets/images/holo/vehicle_popup_icon.png');
background-position: center;
background-repeat: no-repeat;
......@@ -86,17 +86,17 @@ export default {
}
.content {
height: calc(100% - 25px);
height: calc(100% - 25PX);
display: flex;
padding-top: 12px;
padding-top: 12PX;
flex-direction: column;
.detailItem {
height: 30px;
line-height: 30px;
height: 30PX;
line-height: 30PX;
white-space: nowrap;
color: white;
max-width: 200px;
max-width: 200PX;
overflow: hidden;
text-overflow: ellipsis;
......@@ -106,7 +106,7 @@ export default {
span.left {
text-align: left;
padding-left: 20px;
padding-left: 20PX;
background-image: url("../../../assets/images/acci/arrow-origin.png");
background-size: auto;
background-repeat: no-repeat;
......
wj-data-vision/src/views/dangerousDriving/mapPopup/vehicleDetail.vue
View file @ 83a8c291
......@@ -64,19 +64,19 @@ export default {
<style lang="less" scoped>
.vehicleDetail {
font-size: 12px;
font-size: 12PX;
position: absolute;
//bottom: 16px;
//right: 16px;
width: 260px;
//height: 207px;
padding: 2px 16px 6px 16px;
//bottom: 16PX;
//right: 16PX;
width: 260PX;
//height: 207PX;
padding: 2PX 16PX 6PX 16PX;
background-image: url("../../../assets/images/acci/detail-back-red.png");
background-size: 100% 100%;
background-repeat: no-repeat;
.head {
height: 30px;
height: 30PX;
color: white;
display: flex;
align-items: center;
......@@ -86,10 +86,10 @@ export default {
}
.titleBefore {
width: 25px;
height: 30px;
margin-right: 5px;
line-height: 30px;
width: 25PX;
height: 30PX;
margin-right: 5PX;
line-height: 30PX;
background-image: url('../../../assets/images/acci/carIcon-red.png');
background-position: center;
background-repeat: no-repeat;
......@@ -97,15 +97,15 @@ export default {
}
.content {
height: calc(100% - 25px);
height: calc(100% - 25PX);
display: flex;
padding-top: 8px;
padding-top: 8PX;
//flex-flow: row wrap;
flex-direction: column;
.detailItem {
height: 30px;
line-height: 30px;
height: 30PX;
line-height: 30PX;
white-space: nowrap;
color: white;
//width: 50%;
......@@ -119,7 +119,7 @@ export default {
span.left {
text-align: left;
padding-left: 20px;
padding-left: 20PX;
//width: 50%;
background-image: url("../../../assets/images/acci/arrow-red.png");
background-size: auto;
......
wj-data-vision/src/views/intersectionGroups/mapPopup/cameraPopup.vue
View file @ 83a8c291
......@@ -53,25 +53,25 @@ export default {
}
.equip_camera {
width: 314px;
height: 210px;
width: 314PX;
height: 210PX;
background-image: url("../../../assets/images/sc/cameraPopup.png");
background-repeat: no-repeat;
background-size: 100% 100%;
.header {
height: 30px;
line-height: 40px;
padding-left: 10px;
height: 30PX;
line-height: 40PX;
padding-left: 10PX;
color: white;
font-size: 16px;
font-size: 16PX;
font-weight: 700;
}
.main {
position: relative;
padding: 1px;
height: calc(100% - 30px);
padding: 1PX;
height: calc(100% - 30PX);
}
}
......
wj-data-vision/src/views/intersectionGroups/mapPopup/vehicleDetail.vue
View file @ 83a8c291
......@@ -80,18 +80,18 @@ export default {
<style lang="less" scoped>
.vehicleDetail {
font-size: 12px;
font-size: 12PX;
position: absolute;
//bottom: 16px;
//right: 16px;
width: 216px;
//height: 207px;
padding: 2px 16px 6px 16px;
//bottom: 16PX;
//right: 16PX;
width: 216PX;
//height: 207PX;
padding: 2PX 16PX 6PX 16PX;
background: url("../../../assets/images/holo/vehicle_popup_back.png");
background-size: 100% 100%;
background-repeat: no-repeat;
.head {
height: 25px;
height: 25PX;
color: white;
display: flex;
align-items: center;
......@@ -99,28 +99,28 @@ export default {
display: inline-block;
}
.titleBefore {
width: 18px;
height: 18px;
margin-right: 5px;
line-height: 25px;
width: 18PX;
height: 18PX;
margin-right: 5PX;
line-height: 25PX;
background-image:url('../../../assets/images/holo/vehicle_popup_icon.png');
background-position: center;
background-repeat: no-repeat;
}
}
.content {
height: calc(100% - 25px);
height: calc(100% - 25PX);
display: flex;
padding-top: 12px;
padding-top: 12PX;
//flex-flow: row wrap;
flex-direction: column;
.detailItem {
height: 30px;
line-height: 30px;
height: 30PX;
line-height: 30PX;
white-space: nowrap;
color: white;
//width: 50%;
max-width: 200px;
max-width: 200PX;
overflow: hidden;
text-overflow: ellipsis;
span {
......@@ -128,7 +128,7 @@ export default {
}
span.left {
text-align: left;
padding-left: 20px;
padding-left: 20PX;
//width: 50%;
background-image: url("../../../assets/images/holo/vehicle_popup_arrow.png");
background-size: auto;
......
wj-data-vision/src/views/intersectionGroups/messageBoxes.vue
View file @ 83a8c291
<template>
<div class="boxes">
<div class="map-mask" :class="[{ show_bigger: !showMask }]"></div>
<div class="map-mask1" v-show="showMask1"></div>
<!-- <div class="map-mask" :class="[{ show_bigger: !showMask }]"></div>
<div class="map-mask1" v-show="showMask1"></div> -->
<div class="over_data">
<div class="over_item">
<div class="number comm">{{ overDatas.inWayVehicleNum }}<span>辆</span></div>
......@@ -1070,6 +1070,7 @@ export default {
padding-left: 15px;
padding-right: 10px;
transition: 0.5s all ease;
box-shadow: 30px 0px 30px 0px #030b19;
/* x 偏移量 | y 偏移量 | 阴影模糊半径 | 阴影扩散半径 | 阴影颜色 */
// box-shadow: 2px 0px 2px 1px rgba(0, 0, 0, 0.2);
}
......@@ -1085,7 +1086,7 @@ export default {
padding-left: 10px;
transition: 0.5s all ease;
/* x 偏移量 | y 偏移量 | 阴影模糊半径 | 阴影扩散半径 | 阴影颜色 */
// box-shadow: -2px 0px 2px 1px rgba(0, 0, 0, 0.2);
box-shadow: -30px 0px 30px 0px #030b19;
}
.hide_right {
......
wj-data-vision/src/views/slowTraffic/mapPopup/vehicleDetail.vue
View file @ 83a8c291
......@@ -49,26 +49,26 @@ export default {
<style lang="less" scoped>
.vehicleDetail {
font-size: 12px;
font-size: 12PX;
position: absolute;
width: 242px;
padding: 2px 16px 6px 16px;
width: 242PX;
padding: 2PX 16PX 6PX 16PX;
background-image: url("../../../assets/images/acci/detail-back-origin.png");
background-size: 100% 100%;
background-repeat: no-repeat;
.head {
height: 25px;
height: 25PX;
color: white;
display: flex;
align-items: center;
span {
display: inline-block;
width: 18px;
height: 18px;
margin-right: 5px;
line-height: 25px;
width: 18PX;
height: 18PX;
margin-right: 5PX;
line-height: 25PX;
background-image: url('../../../assets/images/holo/vehicle_popup_icon.png');
background-position: center;
background-repeat: no-repeat;
......@@ -76,17 +76,17 @@ export default {
}
.content {
height: calc(100% - 25px);
height: calc(100% - 25PX);
display: flex;
padding-top: 12px;
padding-top: 12PX;
flex-direction: column;
.detailItem {
height: 30px;
line-height: 30px;
height: 30PX;
line-height: 30PX;
white-space: nowrap;
color: white;
max-width: 200px;
max-width: 200PX;
overflow: hidden;
text-overflow: ellipsis;
......@@ -96,7 +96,7 @@ export default {
span.left {
text-align: left;
padding-left: 20px;
padding-left: 20PX;
background-image: url("../../../assets/images/acci/arrow-origin.png");
background-size: auto;
background-repeat: no-repeat;
......
wj-data-vision/src/views/straightLeftConflict/mapPopup/conflictDetail.vue
View file @ 83a8c291
......@@ -39,32 +39,32 @@ export default {
<style lang="less" scoped>
.conflictDetail {
font-size: 16px;
font-size: 16PX;
position: relative;
width: 291px;
height: 235px;
width: 291PX;
height: 235PX;
background-image: url("../../../assets/images/sc/popup_redback.png");
background-size: 100% 100%;
background-repeat: no-repeat;
.conflictDetail_head {
position: absolute;
top: -18px;
top: -18PX;
width: 50%;
background-image: linear-gradient(90deg, rgba(233, 75, 76, 1) 0%, rgba(233, 75, 76, 0) 100%);
height: 35px;
height: 35PX;
color: white;
display: flex;
align-items: center;
font-size: 20px;
font-size: 20PX;
font-weight: 700;
span {
display: inline-block;
width: 18px;
height: 18px;
margin: 0 5px;
line-height: 25px;
width: 18PX;
height: 18PX;
margin: 0 5PX;
line-height: 25PX;
background-image: url('../../../assets/images/holo/vehicle_popup_icon.png');
background-position: center;
background-repeat: no-repeat;
......@@ -72,17 +72,17 @@ export default {
}
.content {
height: calc(100% - 15px);
height: calc(100% - 15PX);
display: flex;
padding: 18px 24px;
padding: 18PX 24PX;
flex-direction: column;
.detailItem {
height: 30px;
line-height: 30px;
height: 30PX;
line-height: 30PX;
white-space: nowrap;
color: white;
max-width: 200px;
max-width: 200PX;
overflow: hidden;
text-overflow: ellipsis;
......@@ -92,7 +92,7 @@ export default {
span.left {
text-align: left;
padding-left: 20px;
padding-left: 20PX;
background-image: url("../../../assets/images/acci/arrow-origin.png");
background-size: auto;
background-repeat: no-repeat;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment