wuhongjian
/
qd-changjing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.124.50:80/wuhongjian/qd-changjing

This commit is contained in:
chenchenzai 2022-11-28 14:04:46 +08:00
parent 316933d9c5 51f219b9bf
commit 1b470195a6
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
public/static/json/warning.json
View File

@ -3,6 +3,7 @@
{ {
"name":"台东商圈", "name":"台东商圈",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -23,6 +24,7 @@
{ {
"name":"五四广场", "name":"五四广场",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"公园广场",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -43,6 +45,7 @@
{ {
"name":"第一海水浴场", "name":"第一海水浴场",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"海水浴场",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -63,6 +66,7 @@
{ {
"name":"李村商圈", "name":"李村商圈",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -83,6 +87,7 @@
{ {
"name":"石老人海水浴场", "name":"石老人海水浴场",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"海水浴场",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -103,6 +108,7 @@
{ {
"name":"第二海水浴场", "name":"第二海水浴场",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"海水浴场",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -123,6 +129,7 @@
{ {
"name":"五四广场7", "name":"五四广场7",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -143,6 +150,7 @@
{ {
"name":"五四广场8", "name":"五四广场8",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -163,6 +171,7 @@
{ {
"name":"五四广场9", "name":"五四广场9",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -183,6 +192,7 @@
{ {
"name":"五四广场10", "name":"五四广场10",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -203,6 +213,7 @@
{ {
"name":"五四广场", "name":"五四广场",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -223,6 +234,7 @@
{ {
"name":"五四广场5", "name":"五四广场5",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -243,6 +255,7 @@
{ {
"name":"五四广场6", "name":"五四广场6",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -263,6 +276,7 @@
{ {
"name":"五四广场7", "name":"五四广场7",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -283,6 +297,7 @@
{ {
"name":"五四广场8", "name":"五四广场8",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -303,6 +318,7 @@
{ {
"name":"五四广场9", "name":"五四广场9",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -323,6 +339,7 @@
{ {
"name":"五四广场10", "name":"五四广场10",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -343,6 +360,7 @@
{ {
"name":"五四广场", "name":"五四广场",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -363,6 +381,7 @@
{ {
"name":"五四广场5", "name":"五四广场5",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -383,6 +402,7 @@
{ {
"name":"五四广场6", "name":"五四广场6",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -403,6 +423,7 @@
{ {
"name":"五四广场7", "name":"五四广场7",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -423,6 +444,7 @@
{ {
"name":"五四广场8", "name":"五四广场8",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -443,6 +465,7 @@
{ {
"name":"五四广场9", "name":"五四广场9",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -463,6 +486,7 @@
{ {
"name":"五四广场10", "name":"五四广场10",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",
@ -483,6 +507,7 @@
{ {
"name":"五四广场", "name":"五四广场",
"type":"数据智能监控", "type":"数据智能监控",
"areaType":"商业街区",
"address":"城市广场", "address":"城市广场",
"type2":"已下发", "type2":"已下发",
"cameraName": "夏庄路李村公交站北行[177938]", "cameraName": "夏庄路李村公交站北行[177938]",

2
src/views/pages/areaMonitor/components/EarlyWarning.vue
View File

@ -68,7 +68,7 @@
<div class="event-details-title"> <div class="event-details-title">
<p>{{item.value.name||''}}</p> <p>{{item.value.name||''}}</p>
<span>{{item.value.type||''}}</span> <span>{{item.value.type||''}}</span>
<span>{{item.value.name||''}}</span> <span>{{item.value.areaType||''}}</span>
<span>{{item.value.type2||''}}</span> <span>{{item.value.type2||''}}</span>
</div> </div>
<div class="event-details-des"> <div class="event-details-des">

6
src/views/pages/civilizedCity/components/EventListDetailsPopNew.vue
View File

@ -98,7 +98,7 @@
</div> </div>
<div class="video-content"> <div class="video-content">
<div class="video-title"> <div class="video-title">
<div class="title-name"><span>周边图片</span></div> <div class="title-name"><span>周边视频</span></div>
<!-- <div class="check-more">查看更多</div> --> <!-- <div class="check-more">查看更多</div> -->
</div> </div>
<div class="video-play-content"> <div class="video-play-content">
@ -240,7 +240,7 @@ export default {
}, },
xAxis: { xAxis: {
type: "category", type: "category",
data: ["2022.11.01", "2022.11.02", "2022.11.03", "2022.11.04", "2022.11.05","2022.11.06","2022.11.07"], data: ["10:45", "11.00", "11:15", "11:30", "11:45","12:00","12:15","12:30","12:45","13:00"],
axisLine: { axisLine: {
show: false, // 不显示坐标轴线 show: false, // 不显示坐标轴线
lineStyle: { lineStyle: {
@ -284,7 +284,7 @@ export default {
{ {
type: "line", type: "line",
yAxisIndex: 0, yAxisIndex: 0,
data: [60, 80, 100, 100, 150, 126,100,160], data: [4568, 4689, 5602, 5500, 5700, 6592,7890,6500,6300,5600],
itemStyle: { itemStyle: {
normal: { normal: {
color: "#08e715", //圆点颜色 color: "#08e715", //圆点颜色