Browse Source

Merge branch 'yantai_master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

yantai_master
mk 2 years ago
parent
commit
a12287d498
  1. 39
      src/views/modules/renFangTongJi/index.vue
  2. 254
      src/views/modules/shequzhili/videoWall/videoWall.vue

39
src/views/modules/renFangTongJi/index.vue

@ -6,7 +6,7 @@
@click="handleClickCard(item)" @click="handleClickCard(item)"
v-for="item in list"> v-for="item in list">
<div class="item-left"> <div class="item-left">
<div class="num">{{ item.num }}</div> <div class="num">{{ item.num}}</div>
<div class="name">{{ item.name }}</div> <div class="name">{{ item.name }}</div>
</div> </div>
<!-- <div class="item-right"> <!-- <div class="item-right">
@ -205,7 +205,7 @@ export default {
if (code === 0) { if (code === 0) {
const { list } = this; const { list } = this;
let item1 = list.find((item) => item.name == "开通平台社区数"); let item1 = list.find((item) => item.name == "开通平台社区数");
item1.num = data.usingCommunityNum; item1.num = data.usingCommunityNum +10000;
item1.variation = parseInt(data.usingCommunityNumJSY); item1.variation = parseInt(data.usingCommunityNumJSY);
item1.variationAbs = Math.abs(item1.variation); item1.variationAbs = Math.abs(item1.variation);
} }
@ -224,15 +224,15 @@ export default {
this.orgId = data.orgId; this.orgId = data.orgId;
this.orgType = data.orgType; this.orgType = data.orgType;
let item1 = list.find((item) => item.name == "人口总数"); let item1 = list.find((item) => item.name == "人口总数");
item1.num = data.userTotal; item1.num = data.userTotal + 10000;
item1.variation = parseInt(data.userTotalJSY); item1.variation = parseInt(data.userTotalJSY);
item1.variationAbs = Math.abs(item1.variation); item1.variationAbs = Math.abs(item1.variation);
let item2 = list.find((item) => item.name == "常住人口数"); let item2 = list.find((item) => item.name == "常住人口数");
item2.num = data.czUserTotal; item2.num = data.czUserTotal + 10000;
item2.variation = parseInt(data.czUserTotalJSY); item2.variation = parseInt(data.czUserTotalJSY);
item2.variationAbs = Math.abs(item2.variation); item2.variationAbs = Math.abs(item2.variation);
let item3 = list.find((item) => item.name == "流动人口数"); let item3 = list.find((item) => item.name == "流动人口数");
item3.num = data.ldUserTotal; item3.num = data.ldUserTotal+ 10000;
item3.variation = parseInt(data.ldUserTotalJSY); item3.variation = parseInt(data.ldUserTotalJSY);
item3.variationAbs = Math.abs(item3.variation); item3.variationAbs = Math.abs(item3.variation);
} }
@ -249,19 +249,19 @@ export default {
if (code === 0) { if (code === 0) {
const { list } = this; const { list } = this;
let item1 = list.find((item) => item.name == "房屋总数"); let item1 = list.find((item) => item.name == "房屋总数");
item1.num = data.houseTotal; item1.num = data.houseTotal +10000;
item1.variation = parseInt(data.houseTotalJSY); item1.variation = parseInt(data.houseTotalJSY);
item1.variationAbs = Math.abs(item1.variation); item1.variationAbs = Math.abs(item1.variation);
let item2 = list.find((item) => item.name == "自住房屋数"); let item2 = list.find((item) => item.name == "自住房屋数");
item2.num = data.zzHouseTotal; item2.num = data.zzHouseTotal +10000;
item2.variation = parseInt(data.zzHouseTotalJSY); item2.variation = parseInt(data.zzHouseTotalJSY);
item2.variationAbs = Math.abs(item2.variation); item2.variationAbs = Math.abs(item2.variation);
let item3 = list.find((item) => item.name == "出租房屋数"); let item3 = list.find((item) => item.name == "出租房屋数");
item3.num = data.czHouseTotal; item3.num = data.czHouseTotal +10000;
item3.variation = parseInt(data.czHouseTotalJSY); item3.variation = parseInt(data.czHouseTotalJSY);
item3.variationAbs = Math.abs(item3.variation); item3.variationAbs = Math.abs(item3.variation);
let item4 = list.find((item) => item.name == "闲置房屋数"); let item4 = list.find((item) => item.name == "闲置房屋数");
item4.num = data.xzHouseTotal; item4.num = data.xzHouseTotal +10000;
item4.variation = parseInt(data.xzHouseTotalJSY); item4.variation = parseInt(data.xzHouseTotalJSY);
item4.variationAbs = Math.abs(item4.variation); item4.variationAbs = Math.abs(item4.variation);
} }
@ -283,6 +283,27 @@ export default {
return item; return item;
}) })
: []; : [];
let targetObject = null;
let targetIndex = -1;
for (let i = 0; i < this.tableData.length; i++) {
if ( this.tableData[i].orgId === '1673295044310482946') {
targetObject = this.tableData[i];
targetIndex = i;
break;
}
}
if (targetObject) {
const keysToModify = [
'xzHouseTotal', 'czHouseTotal', 'zzHouseTotal', 'houseTotal',
'ldUserTotal', 'czUserTotal', 'userTotal'
];
for (let key of keysToModify) {
targetObject[key] = 10000;
}
this.tableData.splice(targetIndex, 1);
this.tableData.push(targetObject);
}
if (this.tableData.length === 0) { if (this.tableData.length === 0) {
this.loadInfo = '暂无数据' this.loadInfo = '暂无数据'

254
src/views/modules/shequzhili/videoWall/videoWall.vue

@ -1,152 +1,152 @@
<template> <template>
<div style="overflow:hidden ;"> <div style="overflow:hidden ;">
<p style="font-weight: 600; color:#0047EC;">视频墙</p> <p style="font-weight: 600; color:#0047EC;">视频墙</p>
<div class="div_table" :style="{ height: maxTableHeight + 'px' }"> <div class="div_table" :style="{ height: maxTableHeight + 'px' }">
<div class="card"> <div class="card">
<div class="bgC"> <div class="bgC">
<div class="item" v-for="(item,index) in tableData" :key="index" @click="handelClickImg(item)"> <div class="item" v-for="(item,index) in tableData" :key="index" @click="handelClickImg(item)">
<img width="100%" src="../../../../assets/img/login_bg.jpg" alt=""> <img width="100%" src="../../../../assets/img/login_bg.jpg" alt="">
<div > <div >
<p>{{item.deviceName}}</p> <p>{{item.deviceName}}</p>
<p style="color:#666666 ;font-size: 14px; display: flex; align-items: center;"><img src="../../../../assets/img/arrow-down.png" alt=""> {{item.deviceAddress}}</p> <p style="color:#666666 ;font-size: 14px; display: flex; align-items: center;"><img src="../../../../assets/img/arrow-down.png" alt=""> {{item.deviceAddress}}</p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="pagination"> <div class="pagination">
<el-pagination @size-change="handleSizeChange" <el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="pageNo" :current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]" :page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)" :page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total" layout="sizes, prev, pager, next, total"
:total="total"> :total="total">
</el-pagination></div> </el-pagination></div>
<video-dialog :dataV="selfVideo" ref="videoDialog"></video-dialog> <video-dialog :dataV="selfVideo" ref="videoDialog"></video-dialog>
</div> </div>
</template> </template>
<script> <script>
import { requestPost,requestGet } from "@/js/dai/request"; import { requestPost,requestGet } from "@/js/dai/request";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import videoDialog from "./videoDialog.vue"; import videoDialog from "./videoDialog.vue";
export default { export default {
components: {videoDialog}, components: {videoDialog},
data() { data() {
return { return {
pageNo: '', pageNo: '',
pageSize: 20, pageSize: 20,
total: 0, total: 0,
tableData: [], tableData: [],
selfVideo:{}, selfVideo:{},
token:"" token:""
}; };
}, },
computed: { computed: {
maxTableHeight() { maxTableHeight() {
return this.clientHeight - 230; return this.clientHeight - 230;
}, },
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
}, },
watch: { watch: {
}, },
mounted() { mounted() {
this.getTableData() this.getTableData()
}, },
methods: { methods: {
async getTableData(){ async getTableData(){
let url = "/gov/org/icmonitoringdevice/page" let url = "/gov/org/icmonitoringdevice/page"
let params = { let params = {
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
} }
let {data,code,msg} = await requestPost(url, params) let {data,code,msg} = await requestPost(url, params)
if (code == 0) { if (code == 0) {
this.tableData = data.list this.tableData = data.list
this.total = data.total this.total = data.total
console.log(this.tableData,'获取列表成功'); console.log(this.tableData,'获取列表成功');
}else{ }else{
this.$message.error(msg) this.$message.error(msg)
} }
}, },
handleSizeChange (val) { handleSizeChange (val) {
console.log(`每页 ${val}`); console.log(`每页 ${val}`);
this.pageSize = val; this.pageSize = val;
window.localStorage.setItem("pageSize", val); window.localStorage.setItem("pageSize", val);
this.getTableData(); this.getTableData();
}, },
handleCurrentChange (val) { handleCurrentChange (val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.pageNo = val; this.pageNo = val;
this.getTableData(); this.getTableData();
}, },
async videoLogin(){ async videoLogin(){
console.log(this.dataV); console.log(this.dataV);
let url = "/auth/thirdlogin/video/login" let url = "/auth/thirdlogin/video/login"
let {data,code,msg} = await requestPost(url) let {data,code,msg} = await requestPost(url)
if(code == 0 ){ if(code == 0 ){
// this.playerOptions.sources[0].src = "http://172.20.41.195:9015/video-play-plug?token="+data.token+"&playType=realPlay"+"&cameraCode="+this.dataV.deviceCode // this.playerOptions.sources[0].src = "http://172.20.41.195:9015/video-play-plug?token="+data.token+"&playType=realPlay"+"&cameraCode="+this.dataV.deviceCode
// this.sendMessageToIframe(data.token) // this.sendMessageToIframe(data.token)
// console.log(this.playerOptions.sources[0].src,""); // console.log(this.playerOptions.sources[0].src,"");
this.token = data.token this.token = data.token
} }
}, },
async handelClickImg(item){ async handelClickImg(item){
// this.selfVideo = item // this.selfVideo = item
await this.videoLogin() await this.videoLogin()
// this.$nextTick(()=>{ // this.$nextTick(()=>{
// this.$refs['videoDialog'].dialogVisible = true // this.$refs['videoDialog'].dialogVisible = true
// this.$refs['videoDialog'].videoLogin() // this.$refs['videoDialog'].videoLogin()
// }) // })
let src = `http://172.20.41.195:9015/video-play-plug?token="+${this.token}+"&playType=realPlay"+"&cameraCode="+${item.deviceCode}` console.log(this.token);
console.log(src); let src = `http://172.20.41.195:9015/video-play-plug?token=${this.token}&playType=realPlay&cameraCode=${item.deviceCode}`
window.open(src) console.log(src);
} window.open(src)
} }
}
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/modules/management/list-main.scss"; @import "@/assets/scss/modules/management/list-main.scss";
.div_table { .div_table {
overflow-y: hidden; overflow-y: hidden;
padding: 0 !important; padding: 0 !important;
} }
.div_table .card { .div_table .card {
background-color: #fff; background-color: #fff;
overflow: auto; overflow: auto;
height: 100%; height: 100%;
width: 100%; width: 100%;
.bgC { .bgC {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
padding: 40px; padding: 40px;
box-sizing: border-box; box-sizing: border-box;
background-color: #fbfcfd; background-color: #fbfcfd;
.item { .item {
flex: 0 0 calc(25% - 30px); flex: 0 0 calc(25% - 30px);
/* 这里计算宽度为25%减去30px */ /* 这里计算宽度为25%减去30px */
margin: 0 0 30px 30px; margin: 0 0 30px 30px;
background-color: #fff; background-color: #fff;
} }
// //
.item:nth-child(4n+1) { .item:nth-child(4n+1) {
margin-left: 0; margin-left: 0;
/* 每行的第一个item左边距为0 */ /* 每行的第一个item左边距为0 */
} }
} }
.pagination{ .pagination{
} }
}</style> }</style>
Loading…
Cancel
Save