diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue index 5cc1bf5..9e83da7 100644 --- a/src/views/Equipment/equipmentDetailList.vue +++ b/src/views/Equipment/equipmentDetailList.vue @@ -53,7 +53,7 @@ { @@ -408,7 +409,8 @@ export default { startDate: this.dateType ? "" : this.customtime[0], endDate: this.dateType ? "" : this.customtime[1], dateType: this.dateType, - agentId: this.selValue == 0 ? this.choicValue : null, + // agentId: this.selValue == 0 ? this.choicValue : null, + agentId: localStorage.getItem('agentId'), orgCode: this.selValue == 1 ? this.choicValue : null, }) .then((res) => { @@ -538,7 +540,8 @@ export default { dataOverViewWithSystem() { this.$api.api .dataOverViewWithSystem({ - agentId: this.selValue == 0 ? this.choicValue : null, + // agentId: this.selValue == 0 ? this.choicValue : null, + agentId: localStorage.getItem('agentId'), orgCode: this.selValue == 1 ? this.choicValue : null, }) .then((res) => { diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue index 578ed72..b4744ee 100644 --- a/src/views/Statistics/index.vue +++ b/src/views/Statistics/index.vue @@ -190,17 +190,20 @@ export default { backTop(){ // console.log(this.$refs.boxcenter.offsetHeight) - console.log($('#avue-view').scrollTop()) - $('#avue-view').scrollTop(800) + // console.log($('#avue-view').scrollTop()) + $('#avue-view').scrollTop(0) }, movePlace(index){ if(index==0){ return }else { var as55=this.objlist[index-1].id; - var shu='#'+as55; - console.log(shu); - // $('body,html').animate({scrollTop: $(shu).offset().top-80}, 500); + var shu='#ids'+as55; + // console.log(shu); + // // $('body,html').animate({scrollTop: $(shu).offset().top-80}, 500); + // console.log($(shu).offset().top); + // console.log($(shu)); + $('#avue-view').scrollTop(($(shu).offset().top)-80) } }, diff --git a/src/views/admin/user/info.vue b/src/views/admin/user/info.vue index 9175399..bffd53d 100644 --- a/src/views/admin/user/info.vue +++ b/src/views/admin/user/info.vue @@ -39,13 +39,13 @@ --> - + - + - + 提交 diff --git a/src/views/building/index.vue b/src/views/building/index.vue index e4ccca2..922e86d 100644 --- a/src/views/building/index.vue +++ b/src/views/building/index.vue @@ -43,7 +43,7 @@ -->
-
合同起止日期:
+
合同结束日期: