diff --git a/src/views/canteen/accountCenter/account/accountManager/index.vue b/src/views/canteen/accountCenter/account/accountManager/index.vue
index 6aad7f4d..2dffd43d 100644
--- a/src/views/canteen/accountCenter/account/accountManager/index.vue
+++ b/src/views/canteen/accountCenter/account/accountManager/index.vue
@@ -348,7 +348,7 @@
           <div style="height: 30px;padding-left: 10px;line-height: 30px;margin: 20px 0;font-size: 14px;color: #000;background: #e7f0fa;border-left: 3px solid #4b80fd;">第二步：输入金额</div>
             <el-form ref="batchForm" :model="batchForm" :rules="batchRules" label-width="100px">
                 <el-form-item label="补贴金额" prop="amount">
-                    <el-input  v-model="batchForm.amount" placeholder="请输入补贴金额" maxlength="9" clearable style="width: 300px;"
+                    <el-input  v-model="batchForm.amount" placeholder="请输入补贴金额" maxlength="8" clearable style="width: 300px;"
                         @input="(v)=>(batchForm.amount=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))">
                         <template slot="append">元</template>
                     </el-input>
@@ -361,7 +361,7 @@
         </div>
       </el-dialog> 
       <el-dialog title="批量补贴预览" :visible.sync="openResult" width="800px" append-to-body>
-        <div style="margin-bottom: 10px;">总人数： {{resultData.totalUserSum || '--' }} ， 补贴人数：{{resultData.validCount || '--' }}， 补贴总额：{{(resultData.validTotalAmount/100) || '--' }}， 无效人数：{{resultData.invalidCount || '--'}}</div>
+        <div style="margin-bottom: 10px;">总人数： {{resultData.totalUserSum || '--' }} ， 补贴人数：{{resultData.validCount || '--' }}， 补贴总金额：{{(resultData.validTotalAmount/100) || '--' }}， 无效人数：{{resultData.invalidCount || '--'}}</div>
         <div style="font-weight: 600;">无效人数</div>
         <el-table :data="resultData.errVOList" max-height="250">
             <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"  />
@@ -373,7 +373,7 @@
                 <dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
               </template>
             </el-table-column>
-            <el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true">
+            <el-table-column label="补贴金额" align="center" prop="amount" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
                 </template> 
@@ -391,7 +391,7 @@
                 <dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
               </template>
             </el-table-column>
-            <el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true">
+            <el-table-column label="补贴金额" align="center" prop="amount" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
                 </template> 
@@ -735,14 +735,16 @@
         submitSendCard(){
           this.$refs["cardForm"].validate(valid => {
             if (valid) {
-              let param = {
-                ...this.cardForm
-              }
-              accCardApi(param).then(response => {
-                    this.$modal.msgSuccess("发卡成功");
-                    this.openCard = false;
-                    this.getList();
-              }); 
+              this.$modal.confirm('是否确认继续发卡?').then(() => {
+                  let param = {
+                    ...this.cardForm
+                  }
+                  accCardApi(param).then(response => {
+                        this.$modal.msgSuccess("发卡成功");
+                        this.openCard = false;
+                        this.getList();
+                  }); 
+              }).catch(() => {});  
             }
           }); 
         },
@@ -795,17 +797,19 @@
         submitSubsidy(){
           this.$refs["form"].validate(valid => {
             if (valid) {
-              let param = { 
-                userId:this.form.userId,
-                amount:Number(this.form.amount*100)
-              }
-              updateAccRechargeSingleApi(param).then(response => {
-                    this.$modal.msgSuccess("操作成功");
-                    this.openSubsidy = false;
-                    this.getList();
-              }); 
+              this.$modal.confirm('补贴金额:'+this.form.amount+'元，是否确认继续补贴?').then(() => {
+                let param = { 
+                  userId:this.form.userId,
+                  amount:Number(this.form.amount*100)
+                }
+                updateAccRechargeSingleApi(param).then(response => {
+                      this.$modal.msgSuccess("操作成功");
+                      this.openSubsidy = false;
+                      this.getList();
+                }); 
+              }).catch(() => {}); 
             }
-            });
+          });
         },
         //充值按钮操作
         handleRecharge(row){
@@ -818,16 +822,32 @@
         //充值确认操作
         submitRecharge(){
           this.$refs["form"].validate(valid => {
-            if (valid) {
-              let param = { 
-                userId:this.form.userId,
-                amount:Number(this.form.amount*100)
-              }
-              rechargeAccWalletApi(param).then(response => {
-                    this.$modal.msgSuccess("操作成功");
-                    this.openRecharge = false;
-                    this.getList();
-              }); 
+            if (valid) { 
+              if(Number(this.form.walletBal)>300000){
+                this.$modal.confirm('个人钱包余额已超过3000，是否确认继续充值?').then(() => {
+                  let param = { 
+                    userId:this.form.userId,
+                    amount:Number(this.form.amount*100)
+                  }
+                  rechargeAccWalletApi(param).then(response => {
+                        this.$modal.msgSuccess("操作成功");
+                        this.openRecharge = false;
+                        this.getList();
+                  }); 
+                }).catch(() => {});
+              }else{
+                this.$modal.confirm('充值金额:'+this.form.amount+'元，是否确认继续充值?').then(() => {
+                  let param = { 
+                    userId:this.form.userId,
+                    amount:Number(this.form.amount*100)
+                  }
+                  rechargeAccWalletApi(param).then(response => {
+                        this.$modal.msgSuccess("操作成功");
+                        this.openRecharge = false;
+                        this.getList();
+                  }); 
+                }).catch(() => {}); 
+              } 
             }
             });
         },
@@ -843,15 +863,17 @@
         submitTake(){
           this.$refs["form"].validate(valid => {
             if (valid) {
-              let param = { 
-                userId:this.form.userId,
-                amount:Number(this.form.amount*100)
-              }
-              withdrawAccWalletApi(param).then(response => {
-                    this.$modal.msgSuccess("操作成功");
-                    this.openTake = false;
-                    this.getList();
-              }); 
+              this.$modal.confirm('提现金额:'+this.form.amount+'元，是否确认继续提现?').then(() => {
+                let param = { 
+                  userId:this.form.userId,
+                  amount:Number(this.form.amount*100)
+                }
+                withdrawAccWalletApi(param).then(response => {
+                      this.$modal.msgSuccess("操作成功");
+                      this.openTake = false;
+                      this.getList();
+                }); 
+              }).catch(() => {}); 
             }
             });
         },
diff --git a/src/views/canteen/accountCenter/account/wallet/index.vue b/src/views/canteen/accountCenter/account/wallet/index.vue
index aef20811..c1e9760a 100644
--- a/src/views/canteen/accountCenter/account/wallet/index.vue
+++ b/src/views/canteen/accountCenter/account/wallet/index.vue
@@ -508,15 +508,31 @@
         submitForm: function() {
             this.$refs["form"].validate(valid => {
                 if (valid) {
-                    let param = {
-                        userId:this.form.userId,
-                        amount:Number(this.form.amount*100)
-                    }
-                    rechargeAccWalletApi(param).then(response => {
-                            this.$modal.msgSuccess("操作成功");
-                            this.open = false;
-                            this.getList();
-                    }); 
+                    if(Number(this.form.walletBal)>300000){
+                        this.$modal.confirm('个人钱包余额已超过3000，是否确认继续充值?').then(() => {
+                        let param = { 
+                            userId:this.form.userId,
+                            amount:Number(this.form.amount*100)
+                        }
+                        rechargeAccWalletApi(param).then(response => {
+                                this.$modal.msgSuccess("操作成功");
+                                this.openRecharge = false;
+                                this.getList();
+                        }); 
+                        }).catch(() => {});
+                    }else{
+                        this.$modal.confirm('充值金额:'+this.form.amount+'元，是否确认继续充值?').then(() => {
+                        let param = { 
+                            userId:this.form.userId,
+                            amount:Number(this.form.amount*100)
+                        }
+                        rechargeAccWalletApi(param).then(response => {
+                                this.$modal.msgSuccess("操作成功");
+                                this.openRecharge = false;
+                                this.getList();
+                        }); 
+                        }).catch(() => {}); 
+                    }  
                 }
             });
         },
@@ -524,28 +540,32 @@
         submitTakeForm: function() {
             this.$refs["form"].validate(valid => {
                 if (valid) {
-                    let param = {
+                    this.$modal.confirm('提现金额:'+this.form.amount+'元，是否确认继续提现?').then(() => {
+                        let param = { 
                         userId:this.form.userId,
                         amount:Number(this.form.amount*100)
-                    }
-                    withdrawAccWalletApi(param).then(response => {
+                        }
+                        withdrawAccWalletApi(param).then(response => {
                             this.$modal.msgSuccess("操作成功");
                             this.openTake = false;
                             this.getList();
-                    }); 
+                        }); 
+                    }).catch(() => {}); 
                 }
             });
         },
         /** 清空提交按钮 */
         submitClearForm: function() { 
-              let param = {
-                userId:this.form.userId 
-              }
-              clearAccWalletApi(param).then(response => {
-                    this.$modal.msgSuccess("操作成功");
-                    this.openClear = false;
-                    this.getList();
+            this.$modal.confirm('是否确认清空钱包?').then(() => {
+                let param = {
+                    userId:this.form.userId 
+                }
+                clearAccWalletApi(param).then(response => {
+                        this.$modal.msgSuccess("操作成功");
+                        this.openClear = false;
+                        this.getList();
               });
+            }).catch(() => {}); 
         }, 
         
     }
diff --git a/src/views/canteen/accountCenter/butie/butie/index.vue b/src/views/canteen/accountCenter/butie/butie/index.vue
index 1dff992d..4c03f11a 100644
--- a/src/views/canteen/accountCenter/butie/butie/index.vue
+++ b/src/views/canteen/accountCenter/butie/butie/index.vue
@@ -737,19 +737,21 @@
         submitForm: function() {
             this.$refs["form"].validate(valid => {
             if (valid) {
-              let param = {
-                // ...this.form,
-                // remark:this.form.remark,
-                // receiveEndDate:this.form.receiveEndDate,
-                // validateDay:this.form.validateDay,
-                userId:this.form.userId,
-                amount:Number(this.form.amount*100)
-              }
-              updateAccRechargeSingleApi(param).then(response => {
-                    this.$modal.msgSuccess("操作成功");
-                    this.open = false;
-                    this.getList();
-              }); 
+              this.$modal.confirm('补贴金额:'+this.form.amount+'元，是否确认继续补贴?').then(() => {
+                let param = {
+                  // ...this.form,
+                  // remark:this.form.remark,
+                  // receiveEndDate:this.form.receiveEndDate,
+                  // validateDay:this.form.validateDay,
+                  userId:this.form.userId,
+                  amount:Number(this.form.amount*100)
+                }
+                updateAccRechargeSingleApi(param).then(response => {
+                      this.$modal.msgSuccess("操作成功");
+                      this.open = false;
+                      this.getList();
+                }); 
+              }).catch(() => {}); 
             }
             });
         },
@@ -757,17 +759,19 @@
         submitClearForm: function() {
             // this.$refs["form"].validate(valid => {
             // if (valid) {
-              let param = {
-                userId:this.form.userId
-                // ...this.form,
-                // clearType:this.form.clearType,
-                // amount:Number(this.form.amount*100)
-              }
-              clearAccRechargeSingleApi(param).then(response => {
-                    this.$modal.msgSuccess("操作成功");
-                    this.openClear = false;
-                    this.getList();
-              }); 
+             this.$modal.confirm('是否确认清空补贴?').then(() => {
+                let param = {
+                  userId:this.form.userId
+                  // ...this.form,
+                  // clearType:this.form.clearType,
+                  // amount:Number(this.form.amount*100)
+                }
+                clearAccRechargeSingleApi(param).then(response => {
+                      this.$modal.msgSuccess("操作成功");
+                      this.openClear = false;
+                      this.getList();
+                }); 
+              }).catch(() => {}); 
             // }
             // });
         }, 
diff --git a/src/views/canteen/accountCenter/cardManage/cardList/index.vue b/src/views/canteen/accountCenter/cardManage/cardList/index.vue
index 237faa67..d8cf7b6d 100644
--- a/src/views/canteen/accountCenter/cardManage/cardList/index.vue
+++ b/src/views/canteen/accountCenter/cardManage/cardList/index.vue
@@ -195,6 +195,7 @@
               "pageSize": this.queryParams.pageSize,
               "serialNum": this.queryParams.serialNum,
               "userId": this.queryParams.userId,
+              "cardStatus":"1"
             //   "accountStatusList": this.queryParams.accountStatusList,
             //   "deptIdList": this.queryParams.deptIdList,   
             //   "walletType": this.queryParams.walletType, 
diff --git a/src/views/canteen/base/mobile/complaint/index.vue b/src/views/canteen/base/mobile/complaint/index.vue
index 7e8aef8a..5fdbfb66 100644
--- a/src/views/canteen/base/mobile/complaint/index.vue
+++ b/src/views/canteen/base/mobile/complaint/index.vue
@@ -41,7 +41,7 @@
                 <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template> 
         </el-table-column> 
-        <el-table-column label="投诉人" align="center" prop="createBy" :show-overflow-tooltip="true"/>
+        <el-table-column label="投诉人账号" align="center" prop="createBy" :show-overflow-tooltip="true"/>
         <el-table-column label="用户手机号" align="center" prop="contactTel" :show-overflow-tooltip="true"/>
         <el-table-column label="投诉日期" align="center" prop="createTime" :show-overflow-tooltip="true"/>
         <!-- <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/> -->
diff --git a/src/views/canteen/base/mobile/evaManeager/index.vue b/src/views/canteen/base/mobile/evaManeager/index.vue
index 3deaedd3..4fd694db 100644
--- a/src/views/canteen/base/mobile/evaManeager/index.vue
+++ b/src/views/canteen/base/mobile/evaManeager/index.vue
@@ -181,7 +181,7 @@
                     <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"/>
                     <el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true"/> 
                     <el-table-column label="意见和建议" align="center" prop="proposal" :show-overflow-tooltip="true"/>
-                    <el-table-column label="用户姓名" align="center" prop="createBy" :show-overflow-tooltip="true"/>
+                    <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true"/>
                     <el-table-column label="评价日期" align="center" prop="evaluateDate" :show-overflow-tooltip="true"/>
                     <!-- <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
                     <template slot-scope="scope"> 
diff --git a/src/views/canteen/healthCenter/examinationReport/index.vue b/src/views/canteen/healthCenter/examinationReport/index.vue
index 8f48aec1..71550f5b 100644
--- a/src/views/canteen/healthCenter/examinationReport/index.vue
+++ b/src/views/canteen/healthCenter/examinationReport/index.vue
@@ -70,50 +70,36 @@
         @pagination="getList"
         />
         <!-- 体检报告对话框 -->
-        <el-dialog :title="titleAddReport" :visible.sync="openAddReport" custom-class="dialog-right"  append-to-body>
-          <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-            <el-row justify="center">
-              <table  align="center" width="100%" cellspacing="0">
-                <tr >
-                  <td  colspan="4" class="table-title">
-                    <el-col :span="1.5">
-                        <el-button
-                        type="primary"
-                        plain
-                        icon="el-icon-plus"
-                        size="mini"
-                        @click="handleAddReport"
-                        >新增体检报告</el-button>
-                    </el-col>
-                  </td>
-                </tr>
-                <tr >
-                  <td  colspan="4" class="table-title">
-                    <el-table v-loading="loading" :data="reportListData" height="800" ref="multipleTable">
-                        <el-table-column label="体检日期" align="center" prop="medicalDate" :show-overflow-tooltip="true" >
-                        </el-table-column>
-                        <el-table-column label="体检机构" align="center" prop="medicalMechanism" :show-overflow-tooltip="true">
-                        </el-table-column>
-                        <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
-                            <template slot-scope="scope">
-                                <el-button
-                                    size="mini"
-                                    type="text"
-                                    @click="handleViewReport(scope.row)"
-                                >检查报告</el-button>
-                                <el-button
-                                    size="mini"
-                                    type="text"
-                                    @click="handleDeleteReport(scope.row)"
-                                >删除</el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                  </td>
-                </tr>
-              </table>
-            </el-row>
-          </el-form>
+        <el-dialog :title="titleAddReport" :visible.sync="openAddReport" custom-class="dialog-right"  append-to-body> 
+          <div style="margin: 10px;">
+              <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAddReport"
+                >新增体检报告</el-button>
+          </div>
+          <el-table v-loading="loading" :data="reportListData" height="600" ref="multipleTable">
+              <el-table-column label="体检日期" align="center" prop="medicalDate" :show-overflow-tooltip="true" >
+              </el-table-column>
+              <el-table-column label="体检机构" align="center" prop="medicalMechanism" :show-overflow-tooltip="true">
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
+                  <template slot-scope="scope">
+                      <el-button
+                          size="mini"
+                          type="text"
+                          @click="handleViewReport(scope.row)"
+                      >检查报告</el-button>
+                      <el-button
+                          size="mini"
+                          type="text"
+                          @click="handleDeleteReport(scope.row)"
+                      >删除</el-button>
+                  </template>
+              </el-table-column>
+          </el-table> 
         </el-dialog>
         <!-- 新增-体检报告对话框 -->
         <el-dialog :title="titleAddReportModel" :visible.sync="openAddReportModel" append-to-body>
@@ -142,10 +128,10 @@
           </div>
         </el-dialog>
         <!-- 体检报告详情-对话框 -->
-        <el-dialog :title="titleReportDetail" :visible.sync="openReportDetail" width="1330px" append-to-body :close-on-click-modal="false">
+        <el-dialog :title="titleReportDetail" :visible.sync="openReportDetail" width="80%" append-to-body :close-on-click-modal="false">
           <el-tabs v-model="activeName">
             <!-- 体检报告 -->
-            <el-tab-pane label="体检报告" name="1" style="height: 650px;overflow-y: auto;">
+            <el-tab-pane label="体检报告" name="1" style="height: 600px;overflow-y: auto;">
               <el-form  label-width="90px">
                 <div class="box box-content">
                   <div class="title">体检报告单</div>
@@ -211,7 +197,7 @@
               </el-form>
             </el-tab-pane>
             <!-- 个人信息 -->
-            <el-tab-pane label="个人信息" name="2" style="height: 650px;overflow-y: auto;" >
+            <el-tab-pane label="个人信息" name="2" style="height: 600px;overflow-y: auto;" >
               <el-form  label-width="90px">
                 <div class="box box-content">
                   <div class="tabledata" style="width: 75%;border-spacing: 0px;">
@@ -239,7 +225,7 @@
                       </tr>
                       <tr>
                         <td style="width:12% ;">位置信息</td>
-                        <td style="width:48% ;" colspan="4">{{personData.nickName}}</td>
+                        <td style="width:48% ;" colspan="4">{{personData.placeFullName}}</td>
                         <td style="width:12% ;">出生日期	</td>
                         <td style="width:24% ;" colspan="2">{{personData.birthday}}</td>
                       </tr>
@@ -316,7 +302,7 @@
 
 <script>
   import { deptTreeSelect } from '@/api/system/user'
-  import { dictHealthChronicApi,getHealthSciencePageApi,addHealthScienceApi,editHealthScienceApi,delHealthScienceApi,getHealthInfoPageApi
+  import { dictHealthChronicApi,addHealthScienceApi,editHealthScienceApi,delHealthScienceApi,getHealthInfoPageApi
     ,getModelListApi,getHealthInfoDetailApi,getModelByIdApi,addReportApi,getReportApi,delReportListApi,getReportByIdApi  } from "@/api/healthCenter/index";
   import { imgUpLoadTwo } from '@/api/system/upload'
   import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
diff --git a/src/views/canteen/reportCenter/tradedDetail/index.vue b/src/views/canteen/reportCenter/tradedDetail/index.vue
index a4cac449..51c9d5f7 100644
--- a/src/views/canteen/reportCenter/tradedDetail/index.vue
+++ b/src/views/canteen/reportCenter/tradedDetail/index.vue
@@ -48,7 +48,7 @@
                 </template>
         </el-table-column>
         <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120" fixed="left"/>
-        <el-table-column label="用户姓名" align="center" prop="userName" :show-overflow-tooltip="true" width="120" fixed="left"/>
+        <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" fixed="left"/>
         <el-table-column label="用户手机号" align="center" prop="phonenumber" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="组织全称" align="center" prop="deptFullName" :show-overflow-tooltip="true" width="180"/>
         <el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
diff --git a/src/views/company-manage/components/add-form.vue b/src/views/company-manage/components/add-form.vue
index 62b31c0b..9d31b874 100644
--- a/src/views/company-manage/components/add-form.vue
+++ b/src/views/company-manage/components/add-form.vue
@@ -168,7 +168,7 @@
                     <template slot="label">
                         <div class="custom-label">
                             <span>手机号码：</span>
-                            <span>（登录账号）</span>
+                            <span>（用户账号）</span>
                         </div>
                     </template>
                     <el-input v-model="addOrEditForm.phonenumber" clearable />
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index ca7cc8d6..d5304d33 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -9,10 +9,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="用户名称" prop="userName">
+      <el-form-item label="用户姓名" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入用户名称"
+          placeholder="请输入用户姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
diff --git a/src/views/system/logininfor/index.vue b/src/views/system/logininfor/index.vue
index d94c2186..2d1baf77 100644
--- a/src/views/system/logininfor/index.vue
+++ b/src/views/system/logininfor/index.vue
@@ -10,10 +10,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="用户名称" prop="userName">
+      <el-form-item label="用户姓名" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入用户名称"
+          placeholder="请输入用户姓名"
           clearable
           style="width: 240px;"
           @keyup.enter.native="handleQuery"
@@ -107,7 +107,7 @@
     >
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="访问编号" align="center" prop="infoId"/>
-      <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom"
+      <el-table-column label="用户姓名" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom"
                        :sort-orders="['descending', 'ascending']"
       />
       <el-table-column label="地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true"/>
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 135c4f17..e16d2d0d 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="用户名称" prop="userName">
+      <el-form-item label="用户账号" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入用户名称"
+          placeholder="请输入用户账号"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
@@ -61,8 +61,8 @@
 
     <el-table v-loading="loading" height="650" :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-      <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+      <el-table-column label="用户账号" prop="userName" :show-overflow-tooltip="true" />
+      <el-table-column label="用户姓名" prop="nickName" :show-overflow-tooltip="true" />
       <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
       <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center" prop="status">
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index b2b072f9..8d9baafd 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -2,10 +2,10 @@
   <!-- 授权用户 -->
   <el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
-      <el-form-item label="用户名称" prop="userName">
+      <el-form-item label="用户账号" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入用户名称"
+          placeholder="请输入用户账号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -26,8 +26,8 @@
     <el-row>
       <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-        <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+        <el-table-column label="用户账号" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="用户姓名" prop="nickName" :show-overflow-tooltip="true" />
         <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
         <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
         <el-table-column label="状态" align="center" prop="status">
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index 666ca77a..4206a71e 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -4,12 +4,12 @@
     <el-form ref="form" :model="form" label-width="80px">
       <el-row>
         <el-col :span="8" :offset="2">
-          <el-form-item label="用户昵称" prop="nickName">
+          <el-form-item label="用户姓名" prop="nickName">
             <el-input v-model="form.nickName" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8" :offset="2">
-          <el-form-item label="登录账号" prop="userName">
+          <el-form-item label="用户账号" prop="userName">
             <el-input  v-model="form.userName" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f659e235..fe7e351e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -37,10 +37,19 @@
                     v-show="showSearch"
                     label-width="68px"
                 >
-                    <el-form-item label="用户名称" prop="userName">
+                    <!-- <el-form-item label="用户姓名" prop="nickName">
+                        <el-input
+                            v-model="queryParams.nickName"
+                            placeholder="请输入用户姓名"
+                            clearable
+                            style="width: 240px"
+                            @keyup.enter.native="handleQuery"
+                        />
+                    </el-form-item> -->
+                    <el-form-item label="用户账号" prop="userName">
                         <el-input
                             v-model="queryParams.userName"
-                            placeholder="请输入用户名称"
+                            placeholder="请输入用户账号"
                             clearable
                             style="width: 240px"
                             @keyup.enter.native="handleQuery"
@@ -203,7 +212,7 @@
                         v-if="columns[0].visible"
                     />
                     <el-table-column
-                        label="用户名称"
+                        label="用户账号"
                         align="center"
                         key="userName"
                         prop="userName"
@@ -211,7 +220,7 @@
                         :show-overflow-tooltip="true"
                     />
                     <el-table-column
-                        label="用户昵称"
+                        label="用户姓名"
                         align="center"
                         key="nickName"
                         prop="nickName"
@@ -397,10 +406,10 @@
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="用户昵称" prop="nickName">
+                        <el-form-item label="用户姓名" prop="nickName">
                             <el-input
                                 v-model="form.nickName"
-                                placeholder="请输入用户昵称"
+                                placeholder="请输入用户姓名"
                                 maxlength="30"
                             />
                         </el-form-item>
@@ -450,12 +459,12 @@
                     <el-col :span="12">
                         <el-form-item
                             v-if="form.userId == undefined"
-                            label="用户名称"
+                            label="用户账号"
                             prop="userName"
                         >
                             <el-input
                                 v-model="form.userName"
-                                placeholder="请输入用户名称"
+                                placeholder="请输入用户账号"
                                 maxlength="30"
                             />
                         </el-form-item>
@@ -841,8 +850,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 },
@@ -854,20 +863,20 @@ export default {
                 userName: [
                     {
                         required: true,
-                        message: '用户名称不能为空',
+                        message: '用户账号不能为空',
                         trigger: 'blur',
                     },
                     {
                         min: 2,
                         max: 20,
-                        message: '用户名称长度必须介于 2 和 20 之间',
+                        message: '用户账号长度必须介于 2 和 20 之间',
                         trigger: 'blur',
                     },
                 ],
                 nickName: [
                     {
                         required: true,
-                        message: '用户昵称不能为空',
+                        message: '用户姓名不能为空',
                         trigger: 'blur',
                     },
                 ],
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index c230c32f..9bc9ef14 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -12,7 +12,7 @@
             </div>
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
-                <svg-icon icon-class="user" />用户名称
+                <svg-icon icon-class="user" />用户姓名
                 <div class="pull-right">{{ user.userName }}</div>
               </li>
               <li class="list-group-item">
diff --git a/vue.config.js b/vue.config.js
index ef8f33b1..3b84d152 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,7 +37,7 @@ module.exports = {
             [process.env.VUE_APP_BASE_API]: {
                 // target: `http://192.168.2.75:48380`,//旭
                 target: `http://192.168.0.244:48380`,//测试
-                // target: `http://192.168.1.176:48380`,//测试
+                // target: `http://192.168.2.108:48380`,//测试
                 // target: `http://192.168.0.34:48380`,//测试
                 // target: `http://192.168.0.176:48380`,//
                 changeOrigin: true,