Browse Source

页面修改

master
changtong 6 months ago
parent
commit
51f302bfbc
  1. 4
      config/index.js
  2. 17
      src/router/router.js
  3. 13
      src/views/screen/car-warring.vue
  4. 18
      src/views/screen/components/MainTitle.vue
  5. 11
      src/views/screen/components/gisMapOfCounty.vue
  6. 16
      src/views/screen/county-screen.vue
  7. 5
      src/views/screen/museum-center.vue
  8. 222
      src/views/screen/outsideHome.vue
  9. 12
      src/views/screen/person-warring.vue
  10. 8
      static/config.js

4
config/index.js

@ -25,8 +25,8 @@ module.exports = {
changeOrigin: true,
},
'/socket.io': {
target: 'http://localhost:19990/',
// target: 'http://60.255.185.166:9024/',
// target: 'http://localhost:19990/',
target: 'http://60.255.186.185:9024/',
changeOrigin: true,
}
},

17
src/router/router.js

@ -221,22 +221,13 @@ export const screenRouter = [
component: () => import("@/views/screen/perimeter-screen.vue")
},
{
path: "/out-side",
name: "out-side",
title: "户外屏",
path: "/outsideHome",
name: "outsideHome",
title: "交互屏首页",
meta: {
open: true
},
component: () => import("@/views/screen/out-side.vue")
},
{
path: "/out-side-new",
name: "out-side-new",
title: "户外屏-全屏视频",
meta: {
open: true
},
component: () => import("@/views/screen/out-side-new.vue")
component: () => import("@/views/screen/outsideHome.vue")
},
];

13
src/views/screen/car-warring.vue

@ -287,11 +287,16 @@ export default {
//
this.sockets.subscribe("TRAFFIC_ALARM", (data) => {
console.log("车流告警", data);
let trafficData = data.data
if (trafficData.length > 0) {
if (trafficData[0].deviceIp == this.treeItem.deviceIp) {
if (data.deviceIp == this.treeItem.deviceIp) {
this.currentAlarm = data;
if (this.currentAlarm.picture) {
this.currentAlarm.picture = JSON.parse(
this.currentAlarm.picture
);
}
this.alarmShow = true;
this.queryCount([this.treeItem]);
this.queryAlarmRecord([this.treeItem]);
}
});
//

18
src/views/screen/components/MainTitle.vue

@ -247,13 +247,13 @@ export default {
meumItem: "人流预警",
isShowTwon: true,
children: [
{
menuItem: "人流1",
areaCode: "",
{
menuItem: "清华街",
areaCode: "511502000001",
},
{
menuItem: "人流2",
areaCode: "",
menuItem: "合江门",
areaCode: "511502000002",
},
],
},
@ -262,12 +262,12 @@ export default {
isShowTwon: true,
children: [
{
menuItem: "车流1",
areaCode: "",
menuItem: "合江门",
areaCode: "511502000003",
},
{
menuItem: "车流2",
areaCode: "",
menuItem: "盐李路",
areaCode: "511502000004",
},
],
},

11
src/views/screen/components/gisMapOfCounty.vue

@ -198,7 +198,7 @@ export default {
strokeWeight: 5,
path: bound,
fillOpacity: 0.8,
fillColor: "#0c3871",
fillColor: "rgba(67, 112, 122,0.55)",
strokeColor: "#94c4ce",
})
);
@ -210,10 +210,13 @@ export default {
: [new AMap.TileLayer.RoadNet],
zoom: this.zoom,
zooms: [3, 16],
center: this.center,
viewMode: "3D",
resizeEnable: true,
scrollWheel: true,
center: that.center,
// pitch: 10, // 0 - 83
viewMode: "3D", //
resizeEnable: true, //
mapStyle: "amap://styles/darkblue",
features: ["bg", "road", "building", "point"]
});
this.map.on("complete", () => {

16
src/views/screen/county-screen.vue

@ -322,12 +322,12 @@ export default {
isShowTwon: true,
children: [
{
menuItem: "人流1",
areaCode: "",
menuItem: "清华街",
areaCode: "511502000001",
},
{
menuItem: "人流2",
areaCode: "",
menuItem: "合江门",
areaCode: "511502000002",
},
],
},
@ -336,12 +336,12 @@ export default {
isShowTwon: true,
children: [
{
menuItem: "车流1",
areaCode: "",
menuItem: "合江门",
areaCode: "511502000003",
},
{
menuItem: "车流2",
areaCode: "",
menuItem: "盐李路",
areaCode: "511502000004",
},
],
},

5
src/views/screen/museum-center.vue

@ -867,6 +867,11 @@ export default {
(res) => {
if (res.data.code === 200) {
this.collectionList = res.data.data.records
this.collectionList.forEach(item => {
if (item.imageList) {
item.imageList = JSON.parse(item.imageList)
}
})
} else {
this.$Message.error("出错了");
}

222
src/views/screen/outsideHome.vue

@ -0,0 +1,222 @@
<template>
<div class="container" ref="appRef" :class="{ red: name == '一曼村' }">
<div class="main-title">
<outsideTitle :title="title"></outsideTitle>
</div>
<div class="main">
<div class="main-left">
<div class="video">
<LivePlayer
fluent
autoplay
:loop="true"
:videoUrl="videoUrl"
stretch
:hide-big-play-button="true"
:muted="false"
aspect="513:292"
alt="正在加载中..."
></LivePlayer>
</div>
<div class="card" @click="$router.push('out-pbService')">
<img :src="require('@/assets/pbImage/card-icon1.png')" />
<span>公共服务</span>
</div>
</div>
<div class="main-right">
<div
class="card card2"
@click="$router.push('out-organization')"
>
<img :src="require('@/assets/pbImage/card-icon2.png')" />
<span>组织振兴</span>
</div>
<div class="card card3" @click="$router.push('out-travel')">
<img :src="require('@/assets/pbImage/card-icon3.png')" />
<span>文化旅游</span>
</div>
<div class="card card4" @click="$router.push('out-industry')">
<img :src="require('@/assets/pbImage/card-icon4.png')" />
<span>产业发展</span>
</div>
</div>
</div>
</div>
</template>
<script>
import outsideTitle from "./components/outsideTitle.vue";
import { useIndex } from "../../utils/utilsDramAdmin.js";
import LivePlayer from "@liveqing/liveplayer";
export default {
name: "",
components: {
outsideTitle,
LivePlayer
},
data() {
return {
title: "·" + window.$localStorage.getItem("name") + "公服代办点",
name: window.$localStorage.getItem("name"),
areaCode: window.$localStorage.getItem("areaCode"),
videoUrl: ""
};
},
created() {},
mounted() {
const { calcRate, windowDraw } = useIndex(this.$refs.appRef);
calcRate();
windowDraw();
this.initData();
},
beforeDestroy() {},
methods: {
initData() {
let params = {
areaCode: this.areaCode
};
this.$http
.post("/area/info/getById", this.common.request(params))
.then(res => {
if (res.data.code == 200) {
this.videoUrl = res.data.data.map4;
} else {
this.$Message.error("操作失败");
}
});
}
}
};
</script>
<style lang="less" scoped>
/deep/ .video-wrapper {
border-radius: 12px;
}
/deep/ .ivu-page {
color: #fff;
background-color: transparent;
}
/deep/ .ivu-page-next,
/deep/ .ivu-page-prev,
/deep/ .ivu-page-item,
/deep/ .ivu-page-options-elevator input {
background-color: transparent;
color: #fff;
text-align: center;
}
/deep/ .ivu-page-next a,
/deep/ .ivu-page-prev a,
/deep/ .ivu-page-item a {
color: #fff;
}
.red {
background-image: url("../../assets/pbImage/red-bg.png") !important;
}
.container {
width: 1920px;
height: 1080px;
transform: scale(var(--scale)) translate(-50%, -50%);
transform-origin: 0 0;
position: absolute;
left: 50%;
top: 50%;
background-image: url("../../assets/pbImage/out-bg.png");
background-size: 100% 100%;
display: flex;
flex-direction: column;
align-items: center;
.main-title {
width: 1788px;
height: 100px;
position: absolute;
top: 30px;
}
.main {
position: absolute;
top: 152px;
width: 1790px;
height: 890px;
display: flex;
justify-content: space-between;
.main-left {
width: 1026px;
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
.video {
width: 100%;
height: 584px;
}
.card {
width: 100%;
height: 280px;
background: url("../../assets/pbImage/card1.png") no-repeat;
background-size: 100% 100%;
display: flex;
justify-content: center;
align-items: center;
img {
width: 158px;
height: 158px;
}
span {
font-family: ShiShangZhongHeiJianTi;
font-size: 84px;
font-weight: 400;
text-align: center;
color: #ffffff;
margin-left: 45px;
}
}
}
.main-right {
width: 742px;
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
.card {
width: 100%;
height: 280px;
background-color: #fff;
background-size: 100% 100%;
display: flex;
justify-content: center;
align-items: center;
img {
width: 158px;
height: 158px;
}
span {
font-family: ShiShangZhongHeiJianTi;
font-size: 84px;
font-weight: 400;
text-align: center;
color: #ffffff;
margin-left: 45px;
}
}
.card2 {
background: url("../../assets/pbImage/card2.png") no-repeat;
}
.card3 {
background: url("../../assets/pbImage/card3.png") no-repeat;
}
.card4 {
background: url("../../assets/pbImage/card4.png") no-repeat;
}
}
}
}
</style>

12
src/views/screen/person-warring.vue

@ -285,7 +285,17 @@ export default {
//
this.sockets.subscribe("OCCUPANT_DENSITY", (data) => {
console.log("人流密度告警", data);
if (data.deviceIp == this.treeItem.deviceIp) {
this.currentAlarm = data;
if (this.currentAlarm.picture) {
this.currentAlarm.picture = JSON.parse(
this.currentAlarm.picture
);
}
this.alarmShow = true;
this.queryCount([this.treeItem]);
this.queryAlarmRecord([this.treeItem]);
}
});
//
this.sockets.subscribe("OCCUPANT_DENSITY_DATA", (data) => {

8
static/config.js

@ -2,12 +2,12 @@ window.gconfig = {
//接口请求路径配置
baseURL: '/api',
// 缓存命名空间配置
localStorageNamespace: "xuyong",
localStorageNamespace: "cuiping",
socketDebug: false,
socketPath: "/socket.io/xuyong",
// socketServer: "http://60.255.185.166:9030",//上线配置
socketPath: "/socket.io/cuiping",
// socketServer: "http://60.255.185.166:9024",//上线配置
// socketServer: "http://localhost:19990",//本地配置
socketServer: "",//本地配置
// 是否开启socket,本地测试可以不开启,防止界面卡
openSocket: false,
openSocket: true,
};

Loading…
Cancel
Save