diff --git a/src/api/modules/api.js b/src/api/modules/api.js index 559cc8f..fbbced3 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -510,7 +510,10 @@ export function findByUserName(query) { return request({ url: 'admin/user/findByUserName', method:'post', - params:query + params:{ + orgType:localStorage.getItem('orgType'), + ...query + } }) } // 设备列表获取批次列表 @@ -676,3 +679,11 @@ export function equipReceiveFindByPage(query) { params:query }) } +// 楼盘对比列表 +export function houseStatistics(query) { + return request({ + url: 'autoSR/zkhouse/houseStatistics', + method:'get', + params:query + }) +} diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue index df81730..991f986 100644 --- a/src/views/Equipment/equipmentDetailList.vue +++ b/src/views/Equipment/equipmentDetailList.vue @@ -659,10 +659,10 @@ export default { houseName: "", accountName: "", imei: "", - total:10, + total: 10, recording: "", }, - pickerOptions: { + pickerOptions: { disabledDate(time) { //根据当前日期 --- 禁止选中之后的日期 return time.getTime() > Date.now(); @@ -715,7 +715,7 @@ export default { }, pageSize: "6", pageNum: "1", - total:10, + total: 10, options: [ { value: "0", @@ -734,24 +734,24 @@ export default { }, mounted() { // return; - let theRequest=this.$route.query - // console.log(theRequest,'123') //此时的theRequest就是我们需要的参数； - if (theRequest.houseId) { - this.flag = true; - this.houseId = theRequest.houseId; - this.timeType = theRequest.timeType; - } else { - this.flag = false; - // console.log(1); - this.timeType = 4; - } - if (theRequest.startDate) { - this.page.openTime = theRequest.startDate; - this.page.closeTime = theRequest.endDate; - this.customtime = [theRequest.startDate, theRequest.endDate]; - // console.log(this.customtime) - this.$forceUpdate(); - } + let theRequest = this.$route.query; + // console.log(theRequest,'123') //此时的theRequest就是我们需要的参数； + if (theRequest.houseId) { + this.flag = true; + this.houseId = theRequest.houseId; + this.timeType = theRequest.timeType; + } else { + this.flag = false; + // console.log(1); + this.timeType = 4; + } + if (theRequest.startDate) { + this.page.openTime = theRequest.startDate; + this.page.closeTime = theRequest.endDate; + this.customtime = [theRequest.startDate, theRequest.endDate]; + // console.log(this.customtime); + this.$forceUpdate(); + } this.getHouseList(); // this.customtime=[] ; this.tableData = []; @@ -776,15 +776,15 @@ export default { // row.createTime + // "&flag=" + // idx; - this.$router.push({ - path:'/Equipment/equipmentOnlineRecordList', - query:{ - houseId:this.houseId, - startDate: row.createTime, - endDate:row.createTime, - flag:idx - } - }) + this.$router.push({ + path: "/Equipment/equipmentOnlineRecordList", + query: { + houseId: this.houseId, + startDate: row.createTime, + endDate: row.createTime, + flag: idx, + }, + }); }, compareChange(idx) { this.compareFlag = idx; @@ -894,13 +894,15 @@ export default { if (this.timeType == 6) { num = 24 * 3600 * 1000 * 29; } + if (i != -1) { + this.customtime = [ + this.timestampToTime(new Date().getTime() - num), + this.timestampToTime(new Date().getTime()), + ]; + } - this.customtime = [ - this.timestampToTime(new Date().getTime() - num), - this.timestampToTime(new Date().getTime()), - ]; this.$set(this, "time", null); - console.log(this.customtime); + // console.log(this.customtime); this.getTableList(); this.getdetail(); }, @@ -950,11 +952,11 @@ export default { orgType: localStorage.getItem("orgType"), }) .then((res) => { - // console.log(res.data.obj) + // console.log(res.data.obj) this.houseList = res.data; if (!this.flag) { - console.log(this.flag,'12') + console.log(this.flag, "12"); this.houseId = res.data[0].id; } // console.log(this.flag,'12') @@ -967,8 +969,7 @@ export default { // }) // this.tableData=res.data.obj.results; // this.page.total = res.data.obj.totalRecord; - - }); + }); }, handleSizeChange(val) { console.log("每页条" + val); diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue index 0f6e758..ca9347d 100644 --- a/src/views/Equipment/state.vue +++ b/src/views/Equipment/state.vue @@ -107,7 +107,6 @@
录音状态
上传状态 关机状态
-
筛选相关：
+
筛选 -
-楼盘 -
+
+ + +
+
+
+
时间：
+
+
+ 近七天 +
+
+ 近十五天 +
+
+ 近三十天 +
+
+
+ + +
+
+
+ + + + + + + +
+
+
+
+
城市：
+ +
+
+
运营人：
+ +
+
+
+
+ 筛选 +
+
+ 清空筛选条件 +
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+ this.time = [ + this.timestampToTime(new Date().getTime() - num), + this.timestampToTime(new Date().getTime()), + ]; + }, + timestampToTime(timestamp) { + var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000 + // var date = new Date(timestamp * 1000);//时间戳为10位需*1000，时间戳为13位的话不需乘1000 + + var yyyy = date.getFullYear() + "-"; -