diff --git a/dist-2023-12-05.zip b/dist-2023-12-05.zip
new file mode 100644
index 0000000..c2428da
Binary files /dev/null and b/dist-2023-12-05.zip differ
diff --git a/public/index.html b/public/index.html
index dd4ea9f..0ef2ae7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -11,9 +11,9 @@
-
+
diff --git a/public/static/background-img/icon_company_blue.png b/public/static/background-img/icon_company_blue.png
deleted file mode 100644
index 794d9c0..0000000
Binary files a/public/static/background-img/icon_company_blue.png and /dev/null differ
diff --git a/public/static/background-img/icon_company_red.png b/public/static/background-img/icon_company_red.png
deleted file mode 100644
index 41053ae..0000000
Binary files a/public/static/background-img/icon_company_red.png and /dev/null differ
diff --git a/public/static/background-img/icon_company_yellow.png b/public/static/background-img/icon_company_yellow.png
deleted file mode 100644
index 4c8f9a8..0000000
Binary files a/public/static/background-img/icon_company_yellow.png and /dev/null differ
diff --git a/public/static/map.html b/public/static/map.html
deleted file mode 100644
index 2f197b4..0000000
--- a/public/static/map.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
- 自定义点标记内容
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/public/static/popup.css b/public/static/popup.css
deleted file mode 100644
index 094a3f4..0000000
--- a/public/static/popup.css
+++ /dev/null
@@ -1,58 +0,0 @@
-.box {
- display: grid;
- grid-template-columns: repeat(3, 1fr);
- gap: 5px;
- width: 220px;
- height: 100px;
- background-color: #fff;
- border-radius: 5px;
-}
-
-.button_plus,
-.state {
- margin-top: 5px;
- margin-left: 5px;
- width: 60px;
- height: 30px;
- background-color: #2e92f7;
- border-radius: 5px;
- border: none;
- outline: none;
- cursor: pointer;
- font-size: 0.5rem;
- line-height: 30px;
- text-align: center;
-}
-
-.button_plus:active {
- transform: translateY(2px);
-}
-
-.state {
- width: 60px;
- height: 30px;
- border-radius: 5px;
- color: #fff;
- font-size: 0.1rem;
-}
-
-.state_a {
- background-color: #ff6600;
-}
-
-.state_b {
- background-color: #188801;
-}
-
-.state_c {
- background-color: #2278f8;
-}
-
-.state_d {
- background-color: #f74242;
-}
-
-.plus {
- font-size: 2rem;
- color: #fff;
-}
\ No newline at end of file
diff --git a/src/assets/picture/撒点_沿海视频.png b/src/assets/picture/point_sea_video.png
similarity index 100%
rename from src/assets/picture/撒点_沿海视频.png
rename to src/assets/picture/point_sea_video.png
diff --git a/src/components/MapScroll.vue b/src/components/MapScroll.vue
index 6d9e2e3..ed79b93 100644
--- a/src/components/MapScroll.vue
+++ b/src/components/MapScroll.vue
@@ -1,5 +1,5 @@
-
+
.carousel {
- width: 24vw;
- height: 38vh;
+ width: 20vw;
+ height: 39vh;
.carousel_group {
margin: 0;
- height: 36vh;
+ height: 39vh;
.carousel_item {
.carousel_box {
margin-top: 1vh;
display: flex;
- justify-content: space-around;
+ justify-content: space-between;
+ width: 20vw;
height: 11vh;
background-image: url('@/assets/picture/bg_people_nor.png');
@@ -113,14 +114,15 @@ export default {
.carousel_box_left_picture {
flex: 1;
+ width: 4vw;
height: 8vh;
- // background-color: #fcbebe;
background-image: url('@/assets/picture/icon_householder.png');
- background-repeat: no-repeat;
background-size: 100% auto;
+ background-repeat: no-repeat;
}
.carousel_box_left_text {
+ width: 4vw;
color: #ecf4f9;
text-align: center;
font-size: 0.8rem;
@@ -142,9 +144,12 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
- width: 18vw;
+ width: 15vw;
font-size: 0.8rem;
position: relative;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
.carousel_box_right_label {
width: 4vw;
@@ -154,10 +159,13 @@ export default {
}
.carousel_box_right_name {
- width: 14vw;
+ width: 10vw;
color: #edf1f7;
font-family: PingFangSC, PingFang SC;
font-size: 0.8rem;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.people_status {
diff --git a/src/utils/coordinate.js b/src/utils/coordinate.js
deleted file mode 100644
index 34262d6..0000000
--- a/src/utils/coordinate.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// TODO 坐标转换
-const x_PI = (3.14159265358979324 * 3000.0) / 180.0
-const PI = 3.1415926535897932384626
-const a = 6378245.0
-const ee = 0.00669342162296594323
-
-/**
- * 判断是否在国内,不在国内则不偏移
- * @param {*} lng 经度
- * @param {*} lat 纬度
- */
-const outOfChina = (lng, lat) => {
- return (
- lng < 72.004 || lng > 137.8347 || lat < 0.8293 || lat > 55.8271 || false
- )
-}
-
-/**
- * 经度转换
- * @param {Number} lng
- * @param {Number} lat
- */
-function transformlat(lng, lat) {
- let ret =
- -100.0 +
- 2.0 * lng +
- 3.0 * lat +
- 0.2 * lat * lat +
- 0.1 * lng * lat +
- 0.2 * Math.sqrt(Math.abs(lng))
- ret +=
- ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) *
- 2.0) /
- 3.0
- ret +=
- ((20.0 * Math.sin(lat * PI) + 40.0 * Math.sin((lat / 3.0) * PI)) * 2.0) /
- 3.0
- ret +=
- ((160.0 * Math.sin((lat / 12.0) * PI) + 320 * Math.sin((lat * PI) / 30.0)) *
- 2.0) /
- 3.0
- return ret
-}
-
-/**
- * 纬度转换
- * @param {Number} lng 经度
- * @param {Number} lat 纬度
- */
-function transformlng(lng, lat) {
- let ret =
- 300.0 +
- lng +
- 2.0 * lat +
- 0.1 * lng * lng +
- 0.1 * lng * lat +
- 0.1 * Math.sqrt(Math.abs(lng))
- ret +=
- ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) *
- 2.0) /
- 3.0
- ret +=
- ((20.0 * Math.sin(lat * PI) + 40.0 * Math.sin((lat / 3.0) * PI)) * 2.0) /
- 3.0
- ret +=
- ((160.0 * Math.sin((lat / 12.0) * PI) + 320 * Math.sin((lat * PI) / 30.0)) *
- 2.0) /
- 3.0
- return ret
-}
diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue
new file mode 100644
index 0000000..5c671dc
--- /dev/null
+++ b/src/views/Login/index.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/views/map/MapMain.vue b/src/views/map/MapMain.vue
index 36c9e3e..a6b0cf4 100644
--- a/src/views/map/MapMain.vue
+++ b/src/views/map/MapMain.vue
@@ -38,7 +38,7 @@ import {
getAlarmAddressAPI,
getAlarmInfoAPI
} from '@/api/address'
-import { setDeviceLatlng } from '@/utils/latlng'
+// import { setDeviceLatlng } from '@/utils/latlng'
import { setToken } from '@/utils/token'
import bus from '@/utils/bus'
@@ -113,36 +113,11 @@ export default {
return item.Longitude !== 0
})
)
- // TODO 筛选监控类型为 0 的数据
- const deviceTypeByZero = this.deviceData.filter(
- (item) => item.PTZType === 0
- )
- console.log(deviceTypeByZero, '监控类型-未知')
- // TODO 筛选监控类型为 0 的数据
- const deviceTypeByOne = this.deviceData.filter(
- (item) => item.PTZType === 1
- )
- console.log(deviceTypeByOne, '监控类型-球机')
- // TODO 筛选监控类型为 0 的数据
- const deviceTypeByTwo = this.deviceData.filter(
- (item) => item.PTZType === 2
- )
- console.log(deviceTypeByTwo, '监控类型-半球')
- // TODO 筛选监控类型为 0 的数据
- const deviceTypeByThree = this.deviceData.filter(
- (item) => item.PTZType === 3
- )
- console.log(deviceTypeByThree, '监控类型-固定枪机')
- // TODO 筛选监控类型为 0 的数据
- const deviceTypeByFour = this.deviceData.filter(
- (item) => item.PTZType === 4
- )
- console.log(deviceTypeByFour, '监控类型-遥控枪机')
// console.log(this.deviceData, '经纬度信息')
// // todo 获取设备所有数据发送给后端
// await postGbsDataAPI(this.deviceData)
// * 本地存储设备相关信息
- setDeviceLatlng(this.deviceData)
+ // setDeviceLatlng(this.deviceData)
},
// * 获取实际居住地
async onGetRealAddress() {
diff --git a/src/views/sensingDevice/components/carCatch.vue b/src/views/sensingDevice/components/carCatch.vue
new file mode 100644
index 0000000..340681f
--- /dev/null
+++ b/src/views/sensingDevice/components/carCatch.vue
@@ -0,0 +1,339 @@
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
车主姓名
+
证件号码
+
车牌号码
+
抓拍时间
+
滞留时间
+
抓拍地点
+
+
+
{{ item.person_name }}
+
{{ item.id_card }}
+
+ {{ item.car_code }}
+
+
+ {{ item.catch_time }}
+
+
+ {{ item.state_time }}
+
+
+ {{ item.catch_place }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sensingDevice/components/carEcharts.vue b/src/views/sensingDevice/components/carEcharts.vue
deleted file mode 100644
index 13c4b43..0000000
--- a/src/views/sensingDevice/components/carEcharts.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/sensingDevice/components/carLarge.vue b/src/views/sensingDevice/components/carLarge.vue
index 44ffd4d..a3acb1d 100644
--- a/src/views/sensingDevice/components/carLarge.vue
+++ b/src/views/sensingDevice/components/carLarge.vue
@@ -5,30 +5,62 @@
车流量
diff --git a/src/views/sensingDevice/components/mancarStatistics.vue b/src/views/sensingDevice/components/mancarStatistics.vue
index c49f299..8e4babc 100644
--- a/src/views/sensingDevice/components/mancarStatistics.vue
+++ b/src/views/sensingDevice/components/mancarStatistics.vue
@@ -19,11 +19,11 @@ export default {
diff --git a/src/views/sensingDevice/components/peopleLarge.vue b/src/views/sensingDevice/components/peopleLarge.vue
index 92a12c0..532b6d9 100644
--- a/src/views/sensingDevice/components/peopleLarge.vue
+++ b/src/views/sensingDevice/components/peopleLarge.vue
@@ -5,30 +5,31 @@
人流量
diff --git a/src/views/sensingDevice/components/personCatch.vue b/src/views/sensingDevice/components/personCatch.vue
new file mode 100644
index 0000000..3f133a1
--- /dev/null
+++ b/src/views/sensingDevice/components/personCatch.vue
@@ -0,0 +1,326 @@
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+ {{ item.type_text }}
+
+
+ {{ item.type_text }}
+
+
+ {{ item.type_text }}
+
+
+
+
人员姓名
+
证件号码
+
抓拍时间
+
滞留时间
+
抓拍地址
+
+
+
{{ item.person_name }}
+
+ {{ item.id_card }}
+
+
{{ item.catch_time }}
+
+ {{ item.state_time }}
+
+
+ {{ item.catch_address }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sensingDevice/components/publicCatch.vue b/src/views/sensingDevice/components/publicCatch.vue
deleted file mode 100644
index a9c53b6..0000000
--- a/src/views/sensingDevice/components/publicCatch.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/views/sensingDevice/index.vue b/src/views/sensingDevice/index.vue
index e02144c..e336f97 100644
--- a/src/views/sensingDevice/index.vue
+++ b/src/views/sensingDevice/index.vue
@@ -36,12 +36,12 @@
@@ -52,7 +52,8 @@ import MapSearch from './components/mapSearch.vue' // * 搜索组件
import ManCar from './components/mancarStatistics.vue' // * 人车统计
import PeopleLarge from './components/peopleLarge.vue' // * 人流量
import CarLarge from './components/carLarge.vue' // * 车流量
-import PublicCatch from './components/publicCatch.vue' // * 通用抓拍
+import PersonCatch from './components/personCatch.vue' // * 人脸抓拍
+import CarCatch from './components/carCatch.vue' // * 车辆抓拍
import DeviceLive from './components/deviceLive.vue' // * 感知设备弹窗
export default {
components: {
@@ -61,8 +62,9 @@ export default {
ManCar,
PeopleLarge,
CarLarge,
- PublicCatch,
- DeviceLive
+ PersonCatch,
+ DeviceLive,
+ CarCatch
},
data() {
return {
@@ -72,7 +74,7 @@ export default {
{ id: 2, title: '车辆抓拍' }
],
title_text: '射阳沿海治安防控综合平台',
- play: true
+ play: false
}
},
created() {},
@@ -159,31 +161,41 @@ export default {
height: 3.5vh;
text-align: center;
color: #37fdc7;
- font-size: 1.5rem;
- font-weight: 600;
+ font-size: 2.25rem;
+ font-weight: 700;
}
}
}
}
.left {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
position: absolute;
top: 10vh;
left: 1vw;
- width: 18vw;
+ width: 20vw;
height: 89vh;
z-index: 2;
}
.right {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
+ // background-color: #f07474;
position: absolute;
top: 10vh;
right: 1vw;
- width: 24vw;
+ width: 20vw;
height: 89vh;
z-index: 2;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+
+ // .right_scroll {
+ // display: flex;
+ // flex-direction: column;
+ // justify-content: space-between;
+ // }
}
}
diff --git a/src/views/sensingDevice/utils/initEcharts.js b/src/views/sensingDevice/utils/initEcharts.js
new file mode 100644
index 0000000..c15518b
--- /dev/null
+++ b/src/views/sensingDevice/utils/initEcharts.js
@@ -0,0 +1,195 @@
+// * echarts 初始化方法
+import * as echarts from 'echarts'
+import EleResize from '@/utils/esresize'
+export const init_echarts = () => {
+ // * echarts 实例
+ const myChart = echarts.init(document.getElementById('people_chart'))
+ let resize_div = document.getElementById('people_chart')
+ // *echarts表自适应
+ EleResize.on(resize_div, () => {
+ myChart.resize()
+ })
+ // * echarts 选项
+ myChart.setOption({
+ color: ['#80ffa5', '#00ddff', '#37a2ff', '#ffbf00'],
+ title: {
+ // text: '标题'
+ },
+ tooitip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'cross',
+ label: {
+ backgroundColor: '#6a7985'
+ }
+ }
+ },
+ legend: {
+ // data: ['Line 1', 'Line 2', 'Line 3', 'Line 4', 'Line 5']
+ },
+ toolbox: {
+ feature: {
+ saveAsImage: {}
+ }
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: [
+ {
+ type: 'category',
+ boundaryGap: false,
+ data: ['11-26', '11-27', '11-28', '11-29', '11-30', '12-01', '12-02']
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value'
+ }
+ ],
+ series: [
+ {
+ // name: 'Line 1',
+ type: 'line',
+ stack: 'Total',
+ smooth: true,
+ lineStyle: {
+ width: 0
+ },
+ showSymbol: false,
+ areaStyle: {
+ opacity: 0.8,
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: 'rgb(128, 255, 165)'
+ },
+ {
+ offset: 1,
+ color: 'rgb(1, 191, 236)'
+ }
+ ])
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ data: [140, 232, 101, 264, 90, 340, 250]
+ },
+ {
+ // name: 'Line 2',
+ type: 'line',
+ stack: 'Total',
+ smooth: true,
+ lineStyle: {
+ width: 0
+ },
+ showSymbol: false,
+ areaStyle: {
+ opacity: 0.8,
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: 'rgb(0, 221, 255)'
+ },
+ {
+ offset: 1,
+ color: 'rgb(77, 119, 255)'
+ }
+ ])
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ data: [120, 282, 111, 234, 220, 340, 310]
+ },
+ {
+ // name: 'Line 3',
+ type: 'line',
+ stack: 'Total',
+ smooth: true,
+ lineStyle: {
+ width: 0
+ },
+ showSymbol: false,
+ areaStyle: {
+ opacity: 0.8,
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: 'rgb(55, 162, 255)'
+ },
+ {
+ offset: 1,
+ color: 'rgb(116, 21, 219)'
+ }
+ ])
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ data: [320, 132, 201, 334, 190, 130, 220]
+ },
+ {
+ // name: 'Line 4',
+ type: 'line',
+ stack: 'Total',
+ smooth: true,
+ lineStyle: {
+ width: 0
+ },
+ showSymbol: false,
+ areaStyle: {
+ opacity: 0.8,
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: 'rgb(255, 0, 135)'
+ },
+ {
+ offset: 1,
+ color: 'rgb(135, 0, 157)'
+ }
+ ])
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ data: [220, 402, 231, 134, 190, 230, 120]
+ },
+ {
+ // name: 'Line 5',
+ type: 'line',
+ stack: 'Total',
+ smooth: true,
+ lineStyle: {
+ width: 0
+ },
+ showSymbol: false,
+ label: {
+ show: true,
+ position: 'top'
+ },
+ areaStyle: {
+ opacity: 0.8,
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: 'rgb(255, 191, 0)'
+ },
+ {
+ offset: 1,
+ color: 'rgb(224, 62, 76)'
+ }
+ ])
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ data: [220, 302, 181, 234, 210, 290, 150]
+ }
+ ]
+ })
+}
diff --git a/src/views/videoMonitor/components/mapVideo.vue b/src/views/videoMonitor/components/mapVideo.vue
index 3ddafba..c0f7bc4 100644
--- a/src/views/videoMonitor/components/mapVideo.vue
+++ b/src/views/videoMonitor/components/mapVideo.vue
@@ -2,10 +2,14 @@