Commit caa6c212 authored by forevertyler's avatar forevertyler

fix:企业管理,电子档案pdf

parents 3cfc4f6e f4ffb13d
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj.ecosystem.menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj.ecosystem.menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</div> </div>
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" :class="{active: bigScreenDetailMenu===item.name}"> <li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</div> </div>
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" :class="{active: bigScreenDetailMenu===item.name}"> <li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
...@@ -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>
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</div> </div>
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" :class="{active: bigScreenDetailMenu===item.name}"> <li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
...@@ -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: {
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj.watersystem.menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj.watersystem.menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj.ecosystem.menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj.ecosystem.menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -83,6 +83,9 @@ var gemhoUtil = { ...@@ -83,6 +83,9 @@ var gemhoUtil = {
location.reload() location.reload()
} }
this.bigScreenDetailMenu = window.location.pathname
localStorage.setItem('bigScreenDetailMenu', this.bigScreenDetailMenu)
if (!token) { if (!token) {
window.open(host + '/#/login', '_self') window.open(host + '/#/login', '_self')
return return
...@@ -100,15 +103,22 @@ var gemhoUtil = { ...@@ -100,15 +103,22 @@ var gemhoUtil = {
} }
}, },
methods: { methods: {
goPrePage(url) { goPrePage() {
// history.back() // history.back()
if(url === 'emergency'){ const type = localStorage.getItem('bigScreenDetailMenuModel')
if(type === 'emergency'){
window.open('/datav/index.html')
}else if(type === 'natural'){
window.open('/datav/natural.html')
}else if(type === 'watersystem'){
window.open('/datav/watersource.html')
}else if(type === 'ecosystem'){
window.open('/datav/index.html') window.open('/datav/index.html')
} }
}, },
changeMenu(item) { changeMenu(item) {
localStorage.setItem('bigScreenDetailMenu', item.name) localStorage.setItem('bigScreenDetailMenu', item.url)
localStorage.setItem('bigScreenDetailMenuModel', item.model) localStorage.setItem('bigScreenDetailMenuModel', item.model)
this.bigScreenDetailMenu = item.name this.bigScreenDetailMenu = item.name
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</div> </div>
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" :class="{active: bigScreenDetailMenu===item.name}"> <li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj.natural.menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj.ecosystem.menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj.ecosystem.menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</div> </div>
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" :class="{active: bigScreenDetailMenu===item.name}"> <li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</div> </div>
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" :class="{active: bigScreenDetailMenu===item.name}"> <li v-for="(item, index) in menuObj[bigScreenDetailMenuModel].menuList" @click="changeMenu(item)" :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
...@@ -211,14 +211,15 @@ ...@@ -211,14 +211,15 @@
silent: true, silent: true,
data: [ data: [
{ name: '最高值', yAxis: 400 }, { name: '最高值', yAxis: 400 },
{ name: '最低值', yAxis: -50 } { name: '最低值', yAxis: -50 }
], ],
lineStyle: { lineStyle: {
color: 'red', // 警戒线颜色 color: 'red', // 警戒线颜色
type: 'solid' // 警戒线样式 type: 'solid' // 警戒线样式
} },
symbol: 'none' // 移除箭头
}, },
symbol: 'none' // 移除箭头
} }
var chartsOption = { var chartsOption = {
legend: { legend: {
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj.ecosystem.menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj.ecosystem.menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<div class="menuInfo"> <div class="menuInfo">
<ul> <ul>
<li v-for="(item, index) in menuObj.ecosystem.menuList" @click="changeMenu(item)" <li v-for="(item, index) in menuObj.ecosystem.menuList" @click="changeMenu(item)"
:class="{active: bigScreenDetailMenu===item.name}"> :class="{active: bigScreenDetailMenu===item.url}">
{{item.name}} {{item.name}}
</li> </li>
</ul> </ul>
......
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
<div class="topTitle"> <div class="topTitle">
<div class="floating-text">中和地信有限公司欢迎您!</div> <div class="floating-text">中和地信有限公司欢迎您!</div>
</div> </div>
<div class="foots_logo">
<img
src="@/assets/images/foot_logo1.png"
alt="logo"
/>
</div>
<el-form <el-form
ref="loginForm" ref="loginForm"
:model="loginForm" :model="loginForm"
...@@ -100,17 +106,13 @@ ...@@ -100,17 +106,13 @@
</div> --> </div> -->
<div class="foots"> <div class="foots">
<div class="foots_logo">
<img
src="@/assets/images/foot_logo.png"
alt="logo"
/>
</div>
<div class="foots_con"> <div class="foots_con">
<div class="foots_info" style="float: left"> <div class="foots_info" style="float: left">
<p>网址: http://zhidcLcomy</p> <p>网址: http://zhidcl.com</p>
<p>地址: 淄博市张店区潘南西路8号院</p> <!-- <p>地址: 淄博市张店区潘南西路8号院</p> -->
<p>电话/传真: 0533-3338333</p> <p>电话/传真: 0533-3338333</p>
<p>邮箱: zhidcl@163.com</p>
</div> </div>
<div <div
class="r foots_ewm" class="r foots_ewm"
...@@ -322,22 +324,28 @@ export default { ...@@ -322,22 +324,28 @@ export default {
</script> </script>
<style rel="stylesheet/scss" lang="scss" scoped> <style rel="stylesheet/scss" lang="scss" scoped>
.foots_logo{
position: absolute;
top: 40px;
left: 40px;
color: #fff;
}
.foots { .foots {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
padding: 0.8rem 0 0.2rem 0; padding: 0.8rem 0 0.2rem 0;
background: rgba(4,38,75, 0.9); background: rgba(4,38,75, 0.9);
.foots_logo { // .foots_logo {
width: 1140px; // width: 1140px;
padding-bottom: 0.2rem; // padding-bottom: 0.2rem;
margin: 0 auto; // margin: 0 auto;
font-size: 0; // font-size: 0;
// border-bottom: 1px solid #4a637e; // // border-bottom: 1px solid #4a637e;
img { // img {
height: 48px; // height: 48px;
} // }
} // }
.foots_con { .foots_con {
width: 1140px; width: 1140px;
margin: 2px auto 15px; margin: 2px auto 15px;
...@@ -345,7 +353,7 @@ export default { ...@@ -345,7 +353,7 @@ export default {
.foots_info { .foots_info {
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
color: #adb2ba; color: #f7f7f7;
letter-spacing: 1px; letter-spacing: 1px;
} }
.foots_ewm { .foots_ewm {
......
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