Merge remote-tracking branch 'origin/master'

src/views/gas/courtyardNetworkManagement/index.vue

@@ -128,7 +128,7 @@
             icon="el-icon-edit"
             @click="openshShow(scope.row)"
             v-show="scope.row.processStatus != 0"
-            v-hasPermi="['gas:emergencyRepair:remove']"
+            v-hasPermi="['gas:courtyardNetworkManagement:edit']"
           >审核
           </el-button>
           <el-button

src/views/gas/pressureRegulatingBox/index.vue

@@ -99,7 +99,12 @@
 
     <el-table v-loading="loading" :data="pressureRegulatingBoxList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="序号" align="center" prop="id" v-if="true"/>
+      <el-table-column label="序号" align="center" prop="id" v-if="false"/>
+      <el-table-column label="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="性质" align="center" prop="nature">
       </el-table-column>
       <el-table-column label="类型" align="center" prop="type">

src/views/gas/valveWellPosition/index.vue

@@ -93,6 +93,11 @@
     <el-table v-loading="loading" :data="valveWellPositionList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="" align="center" prop="id" v-if="false"/>
+      <el-table-column label="序列" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="阀井名称" align="center" prop="valveWellName" />
       <el-table-column label="位置" align="center" prop="position" />
       <el-table-column label="经度" align="center" prop="longitude" />

src/views/system/user/index.vue

@@ -28,10 +28,10 @@
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="userName">
+          <el-form-item label="登录账号" prop="userName">
             <el-input
               v-model="queryParams.userName"
-              placeholder="请输入用户名称"
+              placeholder="请输入登录账号"
               clearable
               size="small"
               style="width: 240px"
@@ -147,9 +147,9 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center"/>
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"/>
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+          <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible"
                            :show-overflow-tooltip="true"/>
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+          <el-table-column label="用户姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
                            :show-overflow-tooltip="true"/>
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
                            :show-overflow-tooltip="true"/>
@@ -226,8 +226,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30"/>
+            <el-form-item label="用户姓名" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入用户姓名" maxlength="30"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -250,8 +250,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30"/>
+            <el-form-item v-if="form.userId == undefined" label="登录账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入登录账号" maxlength="30"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -444,8 +444,8 @@ export default {
       // 列信息
       columns: [
         {key: 0, label: `用户编号`, visible: true},
-        {key: 1, label: `用户名称`, visible: true},
-        {key: 2, label: `用户昵称`, visible: true},
+        {key: 1, label: `登录账号`, visible: true},
+        {key: 2, label: `用户姓名`, visible: true},
         {key: 3, label: `部门`, visible: true},
         {key: 4, label: `手机号码`, visible: true},
         {key: 5, label: `状态`, visible: true},
@@ -454,11 +454,11 @@ export default {
       // 表单校验
       rules: {
         userName: [
-          {required: true, message: "用户名称不能为空", trigger: "blur"},
-          {min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur'}
+          {required: true, message: "登录账号不能为空", trigger: "blur"},
+          {min: 2, max: 20, message: '登录账号长度必须介于 2 和 20 之间', trigger: 'blur'}
         ],
         nickName: [
-          {required: true, message: "用户昵称不能为空", trigger: "blur"}
+          {required: true, message: "用户姓名不能为空", trigger: "blur"}
         ],
         password: [
           {required: true, message: "用户密码不能为空", trigger: "blur"},