diff --git a/src/page/wel.vue b/src/page/wel.vue index 10be7ab..8b96421 100644 --- a/src/page/wel.vue +++ b/src/page/wel.vue @@ -1034,7 +1034,8 @@ export default { // dateType: 1, orderBy:1, startDate: this.statDateStart, - endDate:this.statDateEnd + endDate:this.statDateEnd, + orgType: localStorage.getItem("orgType"), } if(this.role==1){ obj.agentId=localStorage.getItem('agentId')/1 diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue index bc872b5..d1b461e 100644 --- a/src/views/Equipment/state.vue +++ b/src/views/Equipment/state.vue @@ -749,8 +749,6 @@ export default { id, }) .then((res) => { - // console.log(res); - // this.wifiForm=res.data this.wifiForm = { imei: res.data.imei, masterWifiName: res.data.masterWifiName, @@ -814,13 +812,33 @@ export default { }) .then((res) => { // console.log(res); - this.tableData = res.data.list.records; + let newlist=res.data.list.records; + newlist.map(item=>{ + let num=this.ascformatDate(item.updateTime) + if(num>12){ + item.electricity=0; + item.signalDevice=0; + } + }) + this.tableData = newlist; this.onLineCount = res.data.onLineCount; this.offLineCount = res.data.offLineCount; this.workingCount = res.data.workingCount; this.total = res.data.list.total; }); }, + ascformatDate(dateTimeStamp){ + let newDate = new Date(dateTimeStamp.replace(/-/g, '/')).getTime(); + let minute = 1000 * 60; + let hour = minute * 60; + let day = hour * 24; + let halfamonth = day * 15; + let month = day * 30; + let now = new Date().getTime(); + let diffValue = now - newDate; + let result =diffValue/hour; + return result; + }, //批量 Batchreturn() { this.$confirm("确认批量归还吗?", "提示", { diff --git a/src/views/Receive/index.vue b/src/views/Receive/index.vue index e65f9f9..b8dc7a8 100644 --- a/src/views/Receive/index.vue +++ b/src/views/Receive/index.vue @@ -709,6 +709,9 @@ export default { this.info = getStore({ name: "userInfo" }); this.init() }, + destroyed(){ + this.aplayer.destroy() + }, methods: { //上一首 aplayerChange(str){ diff --git a/src/views/Statistics/dataScreeAge.vue b/src/views/Statistics/dataScreeAge.vue index f227cda..50ca437 100644 --- a/src/views/Statistics/dataScreeAge.vue +++ b/src/views/Statistics/dataScreeAge.vue @@ -321,11 +321,11 @@ export default { // console.log(timeDate); if (idx == 1 ) { // 接待量 - this.secondTab.yesterdayReceptionList.map((item) => { + this.secondTab.todayReceptionList.map((item) => { timeDate.push(item.time.substring(11, 16)); arr2.push(item.data); }); - this.secondTab.todayReceptionList.map((item) => { + this.secondTab.yesterdayReceptionList.map((item) => { arr1.push(item.data); }); } diff --git a/src/views/Statistics/dataScreeSys.vue b/src/views/Statistics/dataScreeSys.vue index 6a199ab..c7dbf6c 100644 --- a/src/views/Statistics/dataScreeSys.vue +++ b/src/views/Statistics/dataScreeSys.vue @@ -406,7 +406,6 @@ export default { dateType: this.dateType, agentId: this.selValue == 0 ? this.choicValue : null, orgCode: this.selValue == 1 ? this.choicValue : null, - orgType: localStorage.getItem("orgType"), }) .then((res) => { // console.log(res); @@ -426,11 +425,11 @@ export default { // console.log(timeDate); if (idx == 1 ) { // 接待量 - this.secondTab.yesterdayReceptionList.map((item) => { + this.secondTab.todayReceptionList.map((item) => { timeDate.push(item.time.substring(11, 16)); arr2.push(item.data); }); - this.secondTab.todayReceptionList.map((item) => { + this.secondTab.yesterdayReceptionList.map((item) => { arr1.push(item.data); }); } diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue index ee5a6d5..2269121 100644 --- a/src/views/Statistics/index.vue +++ b/src/views/Statistics/index.vue @@ -2,8 +2,8 @@
-
-
+
+
楼盘选择: