Skip to content

Z
zh-baseversion-project
Commit df97efea authored by 纪泽龙's avatar 纪泽龙
Browse files
Options

更新一下

parent 0f799cc3
Show whitespace changes
Inline Side-by-side
Showing with 359 additions and 2 deletions
zh-baseversion-web/src/components/bigWindow/UserCenter.vue
View file @ df97efea
...@@ -47,7 +47,12 @@ ...@@ -47,7 +47,12 @@
@click.stop="deviceShow(scope.row.safetyDeviceList)" @click.stop="deviceShow(scope.row.safetyDeviceList)"
>设备</el-button >设备</el-button
> >
<el-button disabled type="text">气瓶</el-button> <el-button
:disabled="scope.row.gasBottleTitleList.length == 0"
@click.stop="qipingShow(scope.row.gasBottleTitleList)"
type="text"
>气瓶</el-button
>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -114,6 +119,12 @@ ...@@ -114,6 +119,12 @@
:detcetorList="safetyDeviceList" :detcetorList="safetyDeviceList"
v-if="safetyDeviceList.length > 0" v-if="safetyDeviceList.length > 0"
/> />
<UserCenterQiping
ref="yhqpingrCenter"
:show="true"
:detcetorList="qipingList"
v-if="qipingList.length > 0"
/>
</div> </div>
</div> </div>
</div> </div>
...@@ -125,6 +136,7 @@ ...@@ -125,6 +136,7 @@
// import { listDeviceAlarm } from "@/api/dataMonitoring/deviceAlarm"; // import { listDeviceAlarm } from "@/api/dataMonitoring/deviceAlarm";
import { listDetectorInfo, getUserList } from "@/api/detector/detectorInfo"; import { listDetectorInfo, getUserList } from "@/api/detector/detectorInfo";
import UserCenterDevice from "@/components/bigWindow/UserCenterDevice.vue"; import UserCenterDevice from "@/components/bigWindow/UserCenterDevice.vue";
import UserCenterQiping from "@/components/bigWindow/UserCenterQiping.vue";
export default { export default {
props: { props: {
...@@ -150,6 +162,7 @@ export default { ...@@ -150,6 +162,7 @@ export default {
}, },
components: { components: {
UserCenterDevice, UserCenterDevice,
UserCenterQiping,
}, },
data() { data() {
return { return {
...@@ -165,6 +178,7 @@ export default { ...@@ -165,6 +178,7 @@ export default {
// }, // },
], ],
safetyDeviceList: [], safetyDeviceList: [],
qipingList: [],
yhquserCenterShow: false, yhquserCenterShow: false,
}; };
}, },
...@@ -206,6 +220,10 @@ export default { ...@@ -206,6 +220,10 @@ export default {
this.yhquserCenterShow = true; this.yhquserCenterShow = true;
this.safetyDeviceList = list; this.safetyDeviceList = list;
}, },
qipingShow(list) {
this.yhquserCenterShow = true;
this.qipingList = list;
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(val); console.log(val);
}, },
...@@ -223,6 +241,7 @@ export default { ...@@ -223,6 +241,7 @@ export default {
close() { close() {
// this.fade = "fade"; // this.fade = "fade";
this.safetyDeviceList = []; this.safetyDeviceList = [];
this.qipingList = [];
this.yhquserCenterShow = false; this.yhquserCenterShow = false;
}, },
}, },
...@@ -382,7 +401,7 @@ export default { ...@@ -382,7 +401,7 @@ export default {
right: 0; right: 0;
top: 0; top: 0;
bottom: 0; bottom: 0;
background: rgba(0,0,0,.5); background: rgba(0, 0, 0, 0.5);
z-index: 999999999; z-index: 999999999;
} }
.table-wrapper { .table-wrapper {
......
zh-baseversion-web/src/components/bigWindow/UserCenterQiping.vue 0 → 100644
View file @ df97efea
<template>
<transition>
<div v-show="show" class="wrapper myCenter">
<div class="left">
<!-- <div class="title-wrapper">
<div class="title">{{ title }}报警器列表</div>
<div class="close" @click="close">
<img src="@/assets/mapImages/closeBtn.png" alt="" />
</div>
</div> -->
<div class="bottom right-bottom-data-left">
<el-table
size="mini"
:data="detcetorList"
style="width: 720px"
class="el-bottom"
height="460"
:key="Math.random()"
>
<!-- :height="tableHeight" -->
<el-table-column prop="detectorCode" label="气瓶编号" width="180">
<template slot-scope="scope">
<div :title="scope.row.detectorCode" class="zzz" v-unValue>
{{ scope.row.code }}
</div>
</template>
</el-table-column>
<el-table-column prop="detectorName" label="报警器名称" width="100">
<template slot-scope="scope">
<div :title="scope.row.detectorName" class="zzz" v-unValue>
{{ scope.row.deviceName }}
</div>
</template>
</el-table-column>
<el-table-column prop="medium" label="监测介质" width="100">
<template slot-scope="scope">
<div v-unValue>{{ scope.row.detctionMedium }}</div>
</template>
</el-table-column>
<!-- <el-table-column prop="detectorAddr" label="设备地址" width="100">
<template slot-scope="scope">
<div v-unValue style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" :title="scope.row.address">
{{ scope.row.address }}
</div>
</template>
</el-table-column> -->
<!-- <el-table-column prop="linkman" label="联系人" width="80">
<template slot-scope="scope">
<div v-unValue style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{ scope.row.linkman }}</div>
</template>
</el-table-column>
<el-table-column prop="phone" label="联系电话" width="100">
</el-table-column> -->
<el-table-column prop="detectorStatus" label="状态" width="100">
<template slot-scope="scope">
<div class="detail" v-if="scope.row.status == 0">在线</div>
<div class="detail" v-else-if="scope.row.status == 1">离线</div>
<div class="detail" v-else>-</div>
<!-- <div v-unValue :style="{color:scope.row.detectorStatus==1?'red':''}">{{scope.row.detectorStatus}}</div> -->
</template>
</el-table-column>
<el-table-column prop="alarmTime" label="报警记录" width="140">
<template slot-scope="scope">
<div class="zzz" v-unValue>{{ scope.row.alarmTime }}</div>
</template>
</el-table-column>
<el-table-column prop="alarmTime" label="安装时间" width="140">
<template slot-scope="scope">
<div class="zzz" v-unValue>
{{ scope.row.deviceInstallTime }}
</div>
</template>
</el-table-column>
</el-table>
<div>
<!-- <el-pagination
@current-change="handleCurrentChangvale"
:page-size="pageSize"
layout="prev, pager, next, jumper"
:total="total"
:hide-on-single-page="total <= pageSize"
:key="total + '' + pageSize"
>
</el-pagination> -->
</div>
</div>
</div>
</div>
</transition>
</template>
<script>
// import Velocity from "velocity-animate";
// import { listDeviceAlarm } from "@/api/dataMonitoring/deviceAlarm";
import { yhqlistDetectorInfo } from "@/api/detector/detectorInfo";
import { deviceUserList } from "@/api/bigWindow/getDevice";
export default {
props: {
detcetorList: {
type: Array,
default: () => [],
},
show: {
type: Boolean,
},
title: {
type: String,
},
userId: {
type: [Number, String],
},
total: {
type: Number,
},
pageSize: {
type: Number,
},
},
data() {
return {
// 动画效果的切换
// tableHeight: 600,
tableData: [
// {
// deviceCode: "2016-05-05",
// name: "王小虎",
// province: "上海",
// city: "普陀区",
// address: "上海市普陀区金沙江路",
// },
],
// detectorStatusList: {
// 0: "在线",
// 1: "离线",
// },
};
},
created() {
console.log("2222222============", this.detcetorList);
// this.getList();
},
watch: {
// 当组件显示的时候
detcetorList(newData) {
// console.log(bol);
// if (bol) {
console.log("222222222222222222222222222222222222222222", newData);
this.tableData = [...newData];
console.log(this.tableData);
// }
},
},
mounted() {},
methods: {
handleSizeChange(val) {
console.log(val);
},
handleCurrentChangvale(val) {
this.$parent.getDetectorInfoList(
deviceUserList,
{
userId: this.userId,
pageNum: val,
pageSize: this.pageSize,
},
this.title
);
},
// close() {
// // this.fade = "fade";
// this.$parent.otherCenterShow = false;
// },
},
};
</script>
<style lang="scss" scoped>
.wrapper {
// width: 978px;
// max-height: 600px;
// position: fixed;
// top: 50%;
// left: 50%;
// margin-top: -300px;
// margin-left: -500px;
// // background-color: #fff;
// display: flex;
// justify-content: space-between;
// margin-top: 10px;
z-index: 9999;
& > div {
}
.left {
// width: 100px;
max-height: 598px;
margin-right: 12px;
// box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.16);
// background-color: #fff;
// color: #fff;
font-size: 14px;
font-weight: 400;
.title-wrapper {
width: 100%;
height: 30px;
display: flex;
justify-content: space-between;
background: #1890ff;
padding: 5px;
.title {
width: 100%;
color: #fff;
text-align: center;
}
.close {
box-sizing: border-box;
padding-top: 2px;
padding-right: 5px;
cursor: pointer;
}
}
.el-table__body-wrappe {
height: 140px !important;
}
.top {
height: 19px;
// background-color: #053b6a;
color: #fff;
// line-height: 32px;
// padding-left: 12px;
position: relative;
.title {
position: absolute;
left: 50%;
margin-left: -92px;
top: -5px;
}
.repeat {
position: absolute;
top: -5px;
right: 160px;
color: #fff;
cursor: pointer;
&:hover {
color: #2788ea;
}
}
.repeat2 {
position: absolute;
right: 206px;
color: #67c23a;
}
.more {
position: absolute;
right: 38px;
top: -5px;
color: #fff;
float: right;
margin-right: 20px;
cursor: pointer;
&:hover {
color: #2788ea;
}
}
}
.bottom {
width: 1000px;
margin: 0 auto;
position: relative;
}
}
.right {
width: 740px;
display: flex;
flex-wrap: wrap;
// justify-content: space-between;
align-content: flex-start;
// margin-top: 7px;
& > .right-content {
background-color: #fff;
width: 238px;
height: 82px;
margin-bottom: 29px;
box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.16);
margin-right: 10px;
display: flex;
&.three {
margin-right: 0px;
}
// align-items: center;
.text-icon {
line-height: 82px;
padding-left: 22px;
margin-right: 22px;
i {
color: #053b6a;
font-size: 60px;
}
}
.text {
font-size: 14px;
padding-top: 16px;
.top {
color: #000;
margin-bottom: 10px;
font-weight: 600;
}
.bottom {
color: #2788ea;
}
}
}
}
.iconfont {
cursor: pointer;
}
// 单独调整下最后一个icon的大小
.iconFontSize {
font-size: 50px !important;
}
}
.detail {
text-align: left;
}
</style>
<style lang="scss">
.myCenter {
.left .el-table__body-wrapper {
overflow-y: auto !important;
}
}
</style>
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