Commit 03013975 authored by “yiyousong”'s avatar “yiyousong”

fix:修改站点id获取方式

parent 2ce36050
...@@ -445,6 +445,7 @@ ...@@ -445,6 +445,7 @@
<script> <script>
import { formatterDate } from "@/assets/utils/index"; import { formatterDate } from "@/assets/utils/index";
import session from "@/assets/utils/session";
export default { export default {
computed: { computed: {
userData() { userData() {
...@@ -468,15 +469,14 @@ export default { ...@@ -468,15 +469,14 @@ export default {
window.removeEventListener("resize", this.adapterEcharts); window.removeEventListener("resize", this.adapterEcharts);
}, },
created() { created() {
// this.siteId = window.sessionStorage.getItem("siteid") || null
this.siteId=window.sessionStorage.getItem('siteid') || null this.siteId = session.getSession("siteid") || null;
let today = new Date(); let today = new Date();
let query = { let query = {
year: today.getFullYear(), year: today.getFullYear(),
month: today.getMonth() + 1, month: today.getMonth() + 1,
day: today.getDate(), day: today.getDate(),
siteId:this.siteId siteId: this.siteId,
}; };
//查询今日设备统计 //查询今日设备统计
this.loading = true; this.loading = true;
...@@ -492,14 +492,10 @@ export default { ...@@ -492,14 +492,10 @@ export default {
}); });
//默认查询15天数据 //默认查询15天数据
let beforeday = new Date(today); let beforeday = new Date(today);
beforeday.setDate(beforeday.getDate() - 15); beforeday.setDate(beforeday.getDate() - 15);
this.findDeviceTotalStat(beforeday); this.findDeviceTotalStat(beforeday);
this.findDeviceStat(beforeday); this.findDeviceStat(beforeday);
this.findDeviceAlarm(beforeday); this.findDeviceAlarm(beforeday);
this.findDevicePush(beforeday); this.findDevicePush(beforeday);
}, },
methods: { methods: {
...@@ -529,7 +525,7 @@ export default { ...@@ -529,7 +525,7 @@ export default {
findDeviceTotalStat(beforeday) { findDeviceTotalStat(beforeday) {
let query = { createTimeStart: this.formatterDate(beforeday) }; let query = { createTimeStart: this.formatterDate(beforeday) };
//当前选择站点id //当前选择站点id
query.siteId=this.siteId query.siteId = this.siteId;
console.log(query); console.log(query);
this.$post("/device/stat/list", query) this.$post("/device/stat/list", query)
.then((res) => { .then((res) => {
...@@ -561,7 +557,7 @@ export default { ...@@ -561,7 +557,7 @@ export default {
findDeviceStat(beforeday) { findDeviceStat(beforeday) {
let query = { createTimeStart: this.formatterDate(beforeday) }; let query = { createTimeStart: this.formatterDate(beforeday) };
query.siteId=this.siteId query.siteId = this.siteId;
this.$post("/device/stat/list", query) this.$post("/device/stat/list", query)
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
...@@ -591,7 +587,7 @@ export default { ...@@ -591,7 +587,7 @@ export default {
findDeviceAlarm(beforeday) { findDeviceAlarm(beforeday) {
let query = { createTimeStart: this.formatterDate(beforeday) }; let query = { createTimeStart: this.formatterDate(beforeday) };
query.siteId=this.siteId query.siteId = this.siteId;
this.$post("/device/stat/list", query) this.$post("/device/stat/list", query)
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
...@@ -620,7 +616,7 @@ export default { ...@@ -620,7 +616,7 @@ export default {
findDevicePush(beforeday) { findDevicePush(beforeday) {
let query = { createTimeStart: this.formatterDate(beforeday) }; let query = { createTimeStart: this.formatterDate(beforeday) };
query.siteId=this.siteId query.siteId = this.siteId;
this.$post("/device/stat/list", query) this.$post("/device/stat/list", query)
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
...@@ -1104,7 +1100,7 @@ export default { ...@@ -1104,7 +1100,7 @@ export default {
}, },
data() { data() {
return { return {
siteId:null, siteId: null,
timer: "", timer: "",
loading: false, loading: false,
indexStatInfo: {}, indexStatInfo: {},
......
...@@ -20,14 +20,15 @@ ...@@ -20,14 +20,15 @@
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
import session from "@/assets/utils/session";
export default { export default {
name: "AlarmSmsSend", name: "AlarmSmsSend",
components: { drawerShow }, components: { drawerShow },
mixins: [table], mixins: [table],
created() { created() {
this.query = Object.assign({}, this.query, {
this.query= Object.assign({}, this.query, {siteId:1}); siteId: session.getSession("siteid") || null,
});
}, },
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
......
...@@ -11,14 +11,15 @@ ...@@ -11,14 +11,15 @@
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
import session from "@/assets/utils/session";
export default { export default {
name: "DeviceLog", name: "DeviceLog",
components: { dialogShow }, components: { dialogShow },
mixins: [table], mixins: [table],
created() { created() {
this.siteId=window.sessionStorage.getItem('siteid') || null // this.siteId=window.sessionStorage.getItem('siteid') || null
this.query= Object.assign({}, this.query, {siteId:this.siteId}); this.siteId = session.getSession("siteid") || null;
this.query = Object.assign({}, this.query, { siteId: this.siteId });
}, },
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
...@@ -36,7 +37,7 @@ export default { ...@@ -36,7 +37,7 @@ export default {
}, },
data() { data() {
return { return {
siteId:null, siteId: null,
config: { config: {
search: [ search: [
{ {
......
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