diff --git a/src/views/Home.vue b/src/views/Home.vue index 0df5f25..a9082ff 100755 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -2,7 +2,7 @@ <el-row class="container darkmenu" style="margin-top: 0px;"> <el-col :span="24" class="header"> <el-col :span="10" class="logo" :class="collapsed?'logo-collapse-width':'logo-width'"> - {{collapsed?'':sysName}} + 水电集中缴费平台 </el-col> <el-col :span="10"> <div class="tools" @click.prevent="collapse"> diff --git a/src/views/empt/Location.vue b/src/views/empt/Location.vue index 2948a88..2cc6300 100644 --- a/src/views/empt/Location.vue +++ b/src/views/empt/Location.vue @@ -20,6 +20,7 @@ style="width: 100%;margin-bottom: 20px;" row-key="id" border + v-loading = "listLoading" :row-class-name="tableRowClassName" default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> @@ -36,7 +37,7 @@ :formatter="formatType" width="100"> </el-table-column> - <el-table-column :label="$t('table.actions')" align="center" class-name="small-padding fixed-width"> + <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> <!--<el-button type="primary" size="small" @click="handleUpdate(scope.row)">快速编辑</el-button>--> <el-button v-if="scope.row.type=='3'" disabled type="primary" size="small" @click="handleAdd(scope.row)">新增</el-button> @@ -255,7 +256,7 @@ <!--location新增界面--> <el-dialog title="新增" :visible.sync="addFormLocationVisible" :close-on-click-modal="false"> <el-form :model="addLocationForm" label-width="80px" :rules="addLocationFormRules" ref="addLocationForm"> - <el-form-item label="公寓名称" prop="adrName"> + <el-form-item label="名称" prop="adrName"> <el-input v-model="addLocationForm.adrName" auto-complete="off" placeholder="请输入名称"></el-input> </el-form-item> </el-form> @@ -271,7 +272,7 @@ <el-input type="hidden" v-model="editLocationForm.id"></el-input> - <el-form-item label="公寓名称" prop="adrName"> + <el-form-item label="名称" prop="adrName"> <el-input v-model="editLocationForm.adrname" auto-complete="off" placeholder="请输入名称"></el-input> </el-form-item> @@ -555,13 +556,13 @@ }, //获取列表 getList() { + let para = { pageNum: this.pageNum, pageSize: this.pageSize, processName: this.filters.processName }; - this.listLoading = true; - //NProgress.start(); + this.listLoading= true; getList(para).then((res) => { let resData = res.data.data; this.total = resData.total;