Skip to content

W
web-project
Commit 21d6ee04 authored by moonby's avatar moonby
Browse files
Options

240728

parent 2c29b21d
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 66 deletions
src/views/HeatUserPage/HeatUserPage.vue
View file @ 21d6ee04
...@@ -2,17 +2,24 @@ ...@@ -2,17 +2,24 @@
<el-card class="card-contianer" :body-style="{ 'padding': '0px 0px 0px 0px', 'height': '110px' }"> <el-card class="card-contianer" :body-style="{ 'padding': '0px 0px 0px 0px', 'height': '110px' }">
<div class="div-header"> <div class="div-header">
<el-row> <el-row>
<el-col :span="2"> <el-col :span="4">
<div class="div-button">
<el-button class="el-button-button" type="primary" :span="6" @click="SearchData" icon="Search"> <div class="div-button" style="display: flex;">
搜&nbsp;&nbsp;索</el-button> <div class="div-autoRefresh">
</div> <el-switch v-model="isHisData" class="switch-autoRefresh" active-text="历史数据"
inactive-text="实时数据"
style="--el-switch-on-color: #13ce66; --el-switch-off-color: rgb(64, 158, 255)"
@change="changeData" />
</div>
</div>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="9">
<div class="div-dropdown text-center"> <div class="div-dropdown text-center">
<span>小区名称&nbsp;:&nbsp;</span> <span>小区名称&nbsp;:&nbsp;</span>
<el-cascader :options="DataInfo.tree" v-model="DataInfo.name" :props="props" collapse-tags <el-cascader :options="DataInfo.tree" v-model="DataInfo.name" :props="props" collapse-tags
clearable :show-all-levels="false" filterable placeholder="请选择" style="min-width: 200px;" /> clearable :show-all-levels="false" filterable placeholder="请选择" style="min-width: 310px;" />
</div> </div>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
...@@ -32,27 +39,23 @@ ...@@ -32,27 +39,23 @@
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div class="div-button"> <div class="div-button">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="3"> <el-col :span="3">
</el-col> </el-col>
<el-col :span="3">
</el-col>
<el-col :span="15"> <el-col :span="15">
<div style="display: flex;">
<div class="div-autoRefresh"> <el-button class="el-button-button" type="primary" :span="6" @click="SearchData" icon="Search">
<el-switch v-model="isHisData" class="switch-autoRefresh" active-text="历史数据" 搜&nbsp;&nbsp;索</el-button>
inactive-text="实时数据"
style="--el-switch-on-color: #13ce66; --el-switch-off-color: rgb(64, 158, 255)" </el-col>
@change="changeData" /> <el-col :span="3">
</div>
</div>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</el-col> </el-col>
...@@ -261,6 +264,7 @@ var dateArr = [ ...@@ -261,6 +264,7 @@ var dateArr = [
date.getHours(), date.getHours(),
date.getMinutes(), date.getMinutes(),
date.getSeconds(), date.getSeconds(),
date.getMonth() - 1
]; ];
for (var i = 0; i < dateArr.length; i++) { for (var i = 0; i < dateArr.length; i++) {
if (dateArr[i] >= 1 && dateArr[i] <= 9) { if (dateArr[i] >= 1 && dateArr[i] <= 9) {
...@@ -277,12 +281,12 @@ if (day >= 1 && day <= 9) { ...@@ -277,12 +281,12 @@ if (day >= 1 && day <= 9) {
// var startTime = year + "-" + dateArr[0] + "-" + day + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4]; // var startTime = year + "-" + dateArr[0] + "-" + day + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4];
var startTimeValue = sessionStorage.getItem("DeviceQueryStart"); var startTimeValue = sessionStorage.getItem("DeviceQueryStart");
if(!startTimeValue){ if(!startTimeValue){
startTimeValue = year + "-" + dateArr[0] + "-"+ dateArr[1] + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4]; startTimeValue = (year-1) + "-" + dateArr[0] + "-"+ dateArr[1] + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4];
sessionStorage.setItem("DeviceQueryStart", startTimeValue); sessionStorage.setItem("DeviceQueryStart", startTimeValue);
} }
var endTimeValue = sessionStorage.getItem("DeviceQueryEnd"); var endTimeValue = sessionStorage.getItem("DeviceQueryEnd");
if(!endTimeValue){ if(!endTimeValue){
endTimeValue = (year+1) + "-" + dateArr[0] + "-" + dateArr[1] + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4]; endTimeValue = (year) + "-" + dateArr[5] + "-" + dateArr[1] + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4];
sessionStorage.setItem("DeviceQueryEnd", endTimeValue); sessionStorage.setItem("DeviceQueryEnd", endTimeValue);
} }
...@@ -290,11 +294,11 @@ startTime.value = startTimeValue; ...@@ -290,11 +294,11 @@ startTime.value = startTimeValue;
endTime.value = endTimeValue; endTime.value = endTimeValue;
console.log(endTime) console.log(endTime)
const props = { emitPath: false } const props = { multiple: true,emitPath: false }
const DataInfo = reactive({ const DataInfo = reactive({
"enterpriseId": enterpriseId.value, "enterpriseId": enterpriseId.value,
tree: [], tree: [],
"name": "", "name": [],
"interval": 2, "interval": 2,
"sort": "", "sort": "",
"pageIndex": 0, "pageIndex": 0,
...@@ -409,7 +413,6 @@ async function initHis() { ...@@ -409,7 +413,6 @@ async function initHis() {
tableInfo.hisData.length = 0; tableInfo.hisData.length = 0;
await getHisData(); await getHisData();
//设置总页数 //设置总页数
total.value = tableInfo.hisData.length;
var list = []; var list = [];
// console.log(tableInfo) // console.log(tableInfo)
tableInfo.hisData.forEach(data => { tableInfo.hisData.forEach(data => {
...@@ -436,13 +439,12 @@ async function getRealData() { ...@@ -436,13 +439,12 @@ async function getRealData() {
async function getHisData() { async function getHisData() {
loading.value = true loading.value = true
await http.post(dataUrl, { name: "", startTime: startTime.value, endTime: endTime.value, start: currentPage.value - 1, count: pageSize.value, sort: "" }).then((result) => { await http.post(dataUrl, { name: [], startTime: startTime.value, endTime: endTime.value, start: currentPage.value - 1, count: pageSize.value, sort: "" }).then((result) => {
if (result.status === 0) { if (result.status === 0) {
//处理返回数据 //处理返回数据;
// makeFormsTitle(result.data.title); tableInfo.hisData = result.data.dataInfoList;
tableInfo.hisData = result.data; total.value = result.data.rowCount;
setshowData(); setshowData();
// makeFormsData(result.data.realData);
} else { } else {
tableInfo.tableData.length = 0; tableInfo.tableData.length = 0;
} }
...@@ -456,15 +458,15 @@ async function getHisDataByInfo(name, start, end, startPage, pagesCount, sort) { ...@@ -456,15 +458,15 @@ async function getHisDataByInfo(name, start, end, startPage, pagesCount, sort) {
await http.post(dataUrl, { name: name, startTime: start, endTime: end, start: startPage, count: pagesCount, sort: sort }).then((result) => { await http.post(dataUrl, { name: name, startTime: start, endTime: end, start: startPage, count: pagesCount, sort: sort }).then((result) => {
if (result.status === 0) { if (result.status === 0) {
//处理返回数据 //处理返回数据
// makeFormsTitle(result.data.title); tableInfo.hisData = result.data.dataInfoList;
tableInfo.hisData = result.data; total.value = result.data.rowCount;
setshowData(); setshowData();
// makeFormsData(result.data.realData);
} else { } else {
tableInfo.tableData.length = 0; tableInfo.tableData.length = 0;
} }
}) })
loading.value = false loading.value = false
total.value = tableInfo.tableData.length;
} }
function setshowData() { function setshowData() {
...@@ -503,8 +505,13 @@ function SearchData() { ...@@ -503,8 +505,13 @@ function SearchData() {
//实时数据，本地搜索 //实时数据，本地搜索
function SearchRealData() { function SearchRealData() {
var data = tableInfo.realData.filter((current, index) => { var data = tableInfo.realData.filter((current, index) => {
console.log(current) if(DataInfo.name.length==0){
return DataInfo.name ? current.name == DataInfo.name : true return true;
}
if(DataInfo.name.includes(current.name)){
return true;
}
return false;
}) })
console.log(DataInfo) console.log(DataInfo)
// console.log(data) // console.log(data)
......
src/views/HeatUserPage/TapPage.vue
View file @ 21d6ee04
...@@ -2,17 +2,24 @@ ...@@ -2,17 +2,24 @@
<el-card class="card-contianer" :body-style="{ 'padding': '0px 0px 0px 0px', 'height': '110px' }"> <el-card class="card-contianer" :body-style="{ 'padding': '0px 0px 0px 0px', 'height': '110px' }">
<div class="div-header"> <div class="div-header">
<el-row> <el-row>
<el-col :span="2"> <el-col :span="4">
<div class="div-button">
<el-button class="el-button-button" type="primary" :span="6" @click="SearchData" icon="Search"> <div class="div-button" style="display: flex;">
搜&nbsp;&nbsp;索</el-button> <div class="div-autoRefresh">
</div> <el-switch v-model="isHisData" class="switch-autoRefresh" active-text="历史数据"
inactive-text="实时数据"
style="--el-switch-on-color: #13ce66; --el-switch-off-color: rgb(64, 158, 255)"
@change="changeData" />
</div>
</div>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="9">
<div class="div-dropdown text-center"> <div class="div-dropdown text-center">
<span>小区名称&nbsp;:&nbsp;</span> <span>小区名称&nbsp;:&nbsp;</span>
<el-cascader :options="DataInfo.tree" v-model="DataInfo.name" :props="props" collapse-tags <el-cascader :options="DataInfo.tree" v-model="DataInfo.name" :props="props" collapse-tags
clearable :show-all-levels="false" filterable placeholder="请选择" style="min-width: 200px;" /> clearable :show-all-levels="false" filterable placeholder="请选择" style="min-width: 310px;" />
</div> </div>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
...@@ -32,27 +39,23 @@ ...@@ -32,27 +39,23 @@
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div class="div-button"> <div class="div-button">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="3"> <el-col :span="3">
</el-col> </el-col>
<el-col :span="3">
</el-col>
<el-col :span="15"> <el-col :span="15">
<div style="display: flex;">
<div class="div-autoRefresh"> <el-button class="el-button-button" type="primary" :span="6" @click="SearchData" icon="Search">
<el-switch v-model="isHisData" class="switch-autoRefresh" active-text="历史数据" 搜&nbsp;&nbsp;索</el-button>
inactive-text="实时数据"
style="--el-switch-on-color: #13ce66; --el-switch-off-color: rgb(64, 158, 255)" </el-col>
@change="changeData" /> <el-col :span="3">
</div>
</div>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</el-col> </el-col>
...@@ -277,12 +280,12 @@ if (day >= 1 && day <= 9) { ...@@ -277,12 +280,12 @@ if (day >= 1 && day <= 9) {
// var startTime = year + "-" + dateArr[0] + "-" + day + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4]; // var startTime = year + "-" + dateArr[0] + "-" + day + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4];
var startTimeValue = sessionStorage.getItem("DeviceQueryStart"); var startTimeValue = sessionStorage.getItem("DeviceQueryStart");
if(!startTimeValue){ if(!startTimeValue){
startTimeValue = year + "-" + dateArr[0] + "-"+ dateArr[1] + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4]; startTimeValue = (year-1) + "-" + dateArr[0] + "-"+ dateArr[1] + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4];
sessionStorage.setItem("DeviceQueryStart", startTimeValue); sessionStorage.setItem("DeviceQueryStart", startTimeValue);
} }
var endTimeValue = sessionStorage.getItem("DeviceQueryEnd"); var endTimeValue = sessionStorage.getItem("DeviceQueryEnd");
if(!endTimeValue){ if(!endTimeValue){
endTimeValue = (year+1) + "-" + dateArr[0] + "-" + dateArr[1] + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4]; endTimeValue = year + "-" + (dateArr[0]-1) + "-" + dateArr[1] + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4];
sessionStorage.setItem("DeviceQueryEnd", endTimeValue); sessionStorage.setItem("DeviceQueryEnd", endTimeValue);
} }
...@@ -290,11 +293,11 @@ startTime.value = startTimeValue; ...@@ -290,11 +293,11 @@ startTime.value = startTimeValue;
endTime.value = endTimeValue; endTime.value = endTimeValue;
console.log(endTime) console.log(endTime)
const props = { emitPath: false } const props = { multiple: true,emitPath: false }
const DataInfo = reactive({ const DataInfo = reactive({
"enterpriseId": enterpriseId.value, "enterpriseId": enterpriseId.value,
tree: [], tree: [],
"name": "", "name": [],
"interval": 2, "interval": 2,
"sort": "", "sort": "",
"pageIndex": 0, "pageIndex": 0,
...@@ -412,7 +415,7 @@ async function initHis() { ...@@ -412,7 +415,7 @@ async function initHis() {
tableInfo.hisData.length = 0; tableInfo.hisData.length = 0;
await getHisData(); await getHisData();
//设置总页数 //设置总页数
total.value = tableInfo.hisData.length;
var list = []; var list = [];
// console.log(tableInfo) // console.log(tableInfo)
tableInfo.hisData.forEach(data => { tableInfo.hisData.forEach(data => {
...@@ -439,13 +442,13 @@ async function getRealData() { ...@@ -439,13 +442,13 @@ async function getRealData() {
async function getHisData() { async function getHisData() {
loading.value = true loading.value = true
await http.post(dataUrl, { name: "", startTime: startTime.value, endTime: endTime.value, start: currentPage.value - 1, count: pageSize.value, sort: "" }).then((result) => { await http.post(dataUrl, { name: [], startTime: startTime.value, endTime: endTime.value, start: currentPage.value - 1, count: pageSize.value, sort: "" }).then((result) => {
if (result.status === 0) { if (result.status === 0) {
//处理返回数据 //处理返回数据
// makeFormsTitle(result.data.title); // makeFormsTitle(result.data.title);
tableInfo.hisData = result.data; tableInfo.hisData = result.data.dataInfoList;
total.value = result.data.rowCount;
setshowData(); setshowData();
// makeFormsData(result.data.realData);
} else { } else {
tableInfo.tableData.length = 0; tableInfo.tableData.length = 0;
} }
...@@ -460,7 +463,8 @@ async function getHisDataByInfo(name, start, end, startPage, pagesCount, sort) { ...@@ -460,7 +463,8 @@ async function getHisDataByInfo(name, start, end, startPage, pagesCount, sort) {
if (result.status === 0) { if (result.status === 0) {
//处理返回数据 //处理返回数据
// makeFormsTitle(result.data.title); // makeFormsTitle(result.data.title);
tableInfo.hisData = result.data; tableInfo.hisData = result.data.dataInfoList;
total.value = result.data.rowCount;
setshowData(); setshowData();
// makeFormsData(result.data.realData); // makeFormsData(result.data.realData);
} else { } else {
...@@ -468,6 +472,7 @@ async function getHisDataByInfo(name, start, end, startPage, pagesCount, sort) { ...@@ -468,6 +472,7 @@ async function getHisDataByInfo(name, start, end, startPage, pagesCount, sort) {
} }
}) })
loading.value = false loading.value = false
total.value = tableInfo.tableData.length;
} }
function setshowData() { function setshowData() {
...@@ -505,11 +510,14 @@ function SearchData() { ...@@ -505,11 +510,14 @@ function SearchData() {
//实时数据，本地搜索 //实时数据，本地搜索
function SearchRealData() { function SearchRealData() {
var data = tableInfo.realData.filter((current, index) => { var data = tableInfo.realData.filter((current, index) => {
console.log(current) if(DataInfo.name.length==0){
return DataInfo.name ? current.name == DataInfo.name : true return true;
}
if(DataInfo.name.includes(current.name)){
return true;
}
return false;
}) })
console.log(DataInfo)
// console.log(data)
setShowThisData(data); setShowThisData(data);
} }
......
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