Browse Source

init

newStyle
lancer 2 years ago
parent
commit
8850990b2b
5 changed files with 20 additions and 14 deletions
  1. +2
    -2
      src/views/Equipment/equipmentDetailList.vue
  2. +6
    -3
      src/views/Statistics/dataScreeAge.vue
  3. +8
    -5
      src/views/Statistics/index.vue
  4. +3
    -3
      src/views/admin/user/info.vue
  5. +1
    -1
      src/views/building/index.vue

+ 2
- 2
src/views/Equipment/equipmentDetailList.vue View File

@@ -53,7 +53,7 @@
</div>
</div>
<el-date-picker
@change="confirmtime()"
@change="confirmtime"
v-model="customtime"
type="daterange"
range-separator="-"
@@ -944,7 +944,7 @@ export default {
this.getTableList();
},
//时间选择
confirmtime() {
confirmtime(e) {
this.timeType = "-1";
// if(this.customtime==''){ }else{
// const d = new Date(this.customtime[0])


+ 6
- 3
src/views/Statistics/dataScreeAge.vue View File

@@ -388,7 +388,8 @@ export default {
dataOverviewWithSystemWithDay() {
this.$api.api
.dataOverviewWithSystemWithDay({
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) => {
@@ -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) => {


+ 8
- 5
src/views/Statistics/index.vue View File

@@ -183,17 +183,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)
}
},



+ 3
- 3
src/views/admin/user/info.vue View File

@@ -39,13 +39,13 @@
<a href="#" class="icon-C" @click="handleClick('osc')"></a>
</el-form-item> -->
<el-form-item label="原密码" prop="password">
<el-input v-model="ruleForm.password" type="password" auto-complete="off" />
<el-input v-model="ruleForm.password" maxlength="18" type="password" auto-complete="off" />
</el-form-item>
<el-form-item label="新密码" prop="newpassword1">
<el-input v-model="ruleForm.newpassword1" type="password" auto-complete="off" />
<el-input v-model="ruleForm.newpassword1" maxlength="18" type="password" auto-complete="off" />
</el-form-item>
<el-form-item label="确认密码" prop="newpassword2">
<el-input v-model="ruleForm.newpassword2" type="password" auto-complete="off" />
<el-input v-model="ruleForm.newpassword2" maxlength="18" type="password" auto-complete="off" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm()">提交</el-button>


+ 1
- 1
src/views/building/index.vue View File

@@ -43,7 +43,7 @@
</div> -->

<div class="div-lab">
<div class="label">合同起止日期:</div>
<div class="label">合同结束日期:</div>
<el-date-picker
v-model="starTime"
class="div-inp"


Loading…
Cancel
Save