Merge branch 'dev_xll' of http://111.203.232.171:8888/qzhxx/national_museum_vod

src/page/accounts/components/checkTable.vue

@@ -8,7 +8,7 @@
     >
       <el-table-column label="序号" align="center" width="100">
         <template slot-scope="scope">
-          <span>{{ (currentPage - 1) * 10 * scope.$index + 1 }}</span>
+           <span>{{ (currentPage - 1) * 10 + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
       <el-table-column

src/page/accounts/statistical.vue

@@ -41,7 +41,7 @@
     </div>
     <div class="table-content">
       <div class="btn-group">
-        <el-button type="primary" @click="handleAdd">新建统计账户</el-button>
+        <el-button type="primary" @click="handleAdd">新建统计账号</el-button>
       </div>
       <account-table
         :feildList="feildList"

src/page/accounts/stbAdmin.vue

@@ -42,7 +42,7 @@
     </div>
     <div class="table-content">
       <div class="btn-group">
-        <el-button type="primary" @click="handleAdd()">新建运维账户</el-button>
+        <el-button type="primary" @click="handleAdd()">新建运维账号</el-button>
       </div>
       <account-table
         :feildList="feildList"
@@ -110,6 +110,7 @@ export default {
     },
     handleReset() {
       this.form.userName = "";
+      this.form.status = ""
       this.getFirstPageList();
     },
     getPageList() {

src/page/accounts/unitAdmin.vue

@@ -52,7 +52,7 @@
     </div>
     <div class="table-content">
       <div class="btn-group">
-        <el-button type="primary" @click="handleAdd()">新建账户</el-button>
+        <el-button type="primary" @click="handleAdd()">新建账号</el-button>
       </div>
       <account-table
         :feildList="feildList"

src/page/accounts/users.vue

@@ -27,7 +27,7 @@
     </div>
     <div class="table-content">
       <div class="btn-group">
-        <el-button type="primary" @click="handleAdd()">新建账户</el-button>
+        <el-button type="primary" @click="handleAdd()">新建账号</el-button>
       </div>
       <account-table
         :feildList="feildList"