Skip to content

Z
ZiBoYingJI
Commit f4ffb13d authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

定位链接处理

parent cddbf02c
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 24 deletions
public/datav/detail/people-location.html
View file @ f4ffb13d
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
<div class="relative mt20" style="width: 490px;height: calc(100vh - 170px);"> <div class="relative mt20" style="width: 490px;height: calc(100vh - 170px);">
<section> <section>
<div class="list-wrapper" v-show="showMenu4bianpo"> <div class="list-wrapper" v-show="showMenu4bianpo">
<div class="list-item" @click="location.href='people-location.html'"><i class="el-icon-caret-right"></i><span style="margin-left: 10px;">人员数据统计</span></div> <div class="list-item" @click="location.href='people-monitor.html'"><i class="el-icon-caret-right"></i><span style="margin-left: 10px;">人员数据统计</span></div>
<div class="list-item active" @click="location.href='people-monitor.html'"><i class="el-icon-caret-right"></i><span style="margin-left: 10px;">人员定位图</span></div> <div class="list-item active" @click="location.href='people-location.html'"><i class="el-icon-caret-right"></i><span style="margin-left: 10px;">人员定位图</span></div>
</div> </div>
</section> </section>
</div> </div>
......
public/datav/detail/people-monitor.html
View file @ f4ffb13d
...@@ -200,22 +200,26 @@ ...@@ -200,22 +200,26 @@
</div> </div>
<div class="h44 f18 flex-text" <div class="h44 f18 flex-text"
style="background: linear-gradient(to bottom, rgba(171,238,255,.15), rgba(171,238,255,.3));border-bottom: 1px solid #abeeff;"> style="background: linear-gradient(to bottom, rgba(171,238,255,.15), rgba(171,238,255,.3));border-bottom: 1px solid #abeeff;">
<div class="text-center" style="width: 200px;">区域名称</div> <div class="text-center" style="width: 140px;">区域名称</div>
<div class="text-center" style="width: 114px;">定员(人)</div> <div class="text-center" style="width: 140px;">定员(人)</div>
<div class="text-center" style="width: 114px;">当前(人)</div> <div class="text-center" style="width: 140px;">当前(人)</div>
<div class="text-center" style="width: 140px;">状态</div> <div class="text-center" style="width: 140px;">状态</div>
</div> </div>
<div class="" style="height: 247px;overflow-y: scroll;"> <div class="" style="height: 247px;overflow-y: scroll;">
<div class="h44 color-theme flex-text f17 ovh" :class="'bg-list-' + (index % 2)" <div class="h44 color-theme flex-text f17 ovh" :class="'bg-list-' + (index % 2)"
:style="{ marginTop: index == 0 ? '' : '2px' }" v-for="(item,index) in aiList" :style="{ marginTop: index == 0 ? '' : '2px' }" v-for="(item,index) in areaPeople"
:key="index"> :key="index">
<div class="ovh flex-1"> <!-- <div class="ovh flex-1">
<div class="ellipsis ml25">{{ item.videoName }}</div> <div class="ellipsis ml25">{{ item.name }}</div>
</div> </div>
<div class="ovh text-center flex-1 ml30"> <div class="ovh text-center flex-1 ml30">
<div class="ellipsis">{{ item.warnTypeName }}</div> <div class="ellipsis">{{ item.people }}</div>
</div> </div> -->
<div class="text-center" style="width: 300px;">{{ item.warnDatetime }}</div> <div class="text-center" style="width: 140px;">{{ item.name }}</div>
<div class="text-center" style="width: 140px;">{{ item.people }}</div>
<div class="text-center" style="width: 140px;">{{ item.current }}</div>
<div class="text-center" style="width: 140px;" :class="item.status == 0?'':'color-red'">
{{ item.statusTxt }}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -229,23 +233,25 @@ ...@@ -229,23 +233,25 @@
</div> </div>
<div class="h44 f18 flex-text" <div class="h44 f18 flex-text"
style="background: linear-gradient(to bottom, rgba(171,238,255,.15), rgba(171,238,255,.3));border-bottom: 1px solid #abeeff;"> style="background: linear-gradient(to bottom, rgba(171,238,255,.15), rgba(171,238,255,.3));border-bottom: 1px solid #abeeff;">
<div class="text-center" style="width: 140px;">姓名</div> <div class="text-center" style="width: 200px;">姓名</div>
<div class="text-center" style="width: 200px;">基站位置</div> <div class="text-center" style="width: 220px;">基站位置</div>
<div class="text-center" style="width: 200px;">下井时间</div> <div class="text-center" style="width: 200px;">下井时间</div>
<div class="text-center" style="width: 140px;">部门</div> <div class="text-center" style="width: 180px;">部门</div>
</div> </div>
<div class="" style="height: 247px;overflow-y: scroll;"> <div class="" style="height: 247px;overflow-y: scroll;">
<div class="h44 color-theme flex-text f17 ovh" :class="'bg-list-' + (index % 2)" <div class="h44 color-theme flex-text f17 ovh" :class="'bg-list-' + (index % 2)"
:style="{ marginTop: index == 0 ? '' : '2px' }" v-for="(item,index) in aiList" :style="{ marginTop: index == 0 ? '' : '2px' }" v-for="(item,index) in pitPeople"
:key="index"> :key="index">
<div class="ovh flex-1"> <!-- <div class="ovh flex-1">
<div class="ellipsis ml25">{{ item.videoName }}</div> <div class="ellipsis ml25">{{ item.userName }}</div>
</div> </div>
<div class="ovh text-center flex-1 ml30"> <div class="ovh text-center flex-1 ml30">
<div class="ellipsis">{{ item.warnTypeName }}</div> <div class="ellipsis">{{ item.position }}</div>
</div> </div> -->
<div class="text-center" style="width: 300px;">{{ item.warnDatetime }}</div> <div class="text-center" style="width: 200px;">{{ item.userName }}</div>
<div class="flex-text" style="width: 140px;"></div> <div class="flex-text" style="width: 220px;">{{ item.position }}</div>
<div class="flex-text" style="width: 200px;">{{ item.time }}</div>
<div class="flex-text" style="width: 180px;">{{ item.department }}</div>
</div> </div>
</div> </div>
...@@ -283,6 +289,26 @@ ...@@ -283,6 +289,26 @@
// 视频ai报警 列表 // 视频ai报警 列表
aiList: [], aiList: [],
// 区域人数统计
areaPeople: [
{ id: 1, name: '矿石开采加工区', people: '60', current: '30', statusTxt: '正常', status: 0 },
{ id: 2, name: '2号开采区', people: '50', current: '52', statusTxt: '报警', status: 1 },
{ id: 3, name: '矿石开采加工区', people: '60', current: '30', statusTxt: '正常', status: 0 },
{ id: 4, name: '2号开采区', people: '50', current: '52', statusTxt: '报警', status: 1 },
{ id: 5, name: '矿石开采加工区', people: '60', current: '30', statusTxt: '正常', status: 0 },
{ id: 6, name: '2号开采区', people: '50', current: '52', statusTxt: '报警', status: 1 },
],
// 井下人员实时状态
pitPeople: [
{ id: 1, userName: '某某某', position: '青岛豪杰矿业矿区开采区', time: '2023-02-14 09:57', department: '开采部' },
{ id: 2, userName: '某某', position: '青岛豪杰矿业矿区生产区', time: '2023-02-14 09:57', department: '生产部' },
{ id: 3, userName: '某某某', position: '青岛豪杰矿业矿区开采区', time: '2023-02-14 09:57', department: '开采部' },
{ id: 4, userName: '某某', position: '青岛豪杰矿业矿区生产区', time: '2023-02-14 09:57', department: '生产部' },
{ id: 5, userName: '某某某', position: '青岛豪杰矿业矿区开采区', time: '2023-02-14 09:57', department: '开采部' },
{ id: 6, userName: '某某', position: '青岛豪杰矿业矿区生产区', time: '2023-02-14 09:57', department: '生产部' },
],
} }
}, },
watch: { watch: {
......
public/datav/detail/wind-monitor.html
View file @ f4ffb13d
...@@ -216,9 +216,10 @@ ...@@ -216,9 +216,10 @@
lineStyle: { lineStyle: {
color: 'red', // 警戒线颜色 color: 'red', // 警戒线颜色
type: 'solid' // 警戒线样式 type: 'solid' // 警戒线样式
}
}, },
symbol: 'none' // 移除箭头 symbol: 'none' // 移除箭头
},
} }
var chartsOption = { var chartsOption = {
legend: { legend: {
......
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