Explorar el Código

init

newStyle
wangxiaohua hace 2 años
padre
commit
0fd4a782cb
Se han modificado 6 ficheros con 32 adiciones y 11 borrados
  1. +2
    -1
      src/page/wel.vue
  2. +21
    -3
      src/views/Equipment/state.vue
  3. +3
    -0
      src/views/Receive/index.vue
  4. +2
    -2
      src/views/Statistics/dataScreeAge.vue
  5. +2
    -3
      src/views/Statistics/dataScreeSys.vue
  6. +2
    -2
      src/views/Statistics/index.vue

+ 2
- 1
src/page/wel.vue Ver fichero

@@ -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


+ 21
- 3
src/views/Equipment/state.vue Ver fichero

@@ -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("确认批量归还吗?", "提示", {


+ 3
- 0
src/views/Receive/index.vue Ver fichero

@@ -709,6 +709,9 @@ export default {
this.info = getStore({ name: "userInfo" });
this.init()
},
destroyed(){
this.aplayer.destroy()
},
methods: {
//上一首
aplayerChange(str){


+ 2
- 2
src/views/Statistics/dataScreeAge.vue Ver fichero

@@ -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);
});
}


+ 2
- 3
src/views/Statistics/dataScreeSys.vue Ver fichero

@@ -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);
});
}


+ 2
- 2
src/views/Statistics/index.vue Ver fichero

@@ -2,8 +2,8 @@
<div class="box-center" ref="boxcenter" style="cursor:pointer;">
<!-- 头 -->
<div class="app-top">
<div class="app-titel2" style="margin-bottom: 10px">
<div class="titel-text" v-if="orgType!=3">
<div v-if="orgType!=3" class="app-titel2" style="margin-bottom: 10px">
<div class="titel-text" >
楼盘选择: </div>
<div style="margin-left: 26px">
<el-select v-model="houseId" filterable @change="houseChange" placeholder="请选择">


Cargando…
Cancelar
Guardar