From a9a5222771acd51d401b7d4ec9e4adf0f2ff48cb Mon Sep 17 00:00:00 2001
From: cxw <1056036578@qq.com>
Date: Tue, 3 Jan 2023 09:32:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=81=E6=AD=A2=E4=BF=AE=E6=94=B9=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                   |  4 ++--
 .env.production                    |  4 ++--
 .env.staging                       |  4 ++--
 src/components/UserForm/index.vue  |  6 +++---
 src/views/reagent/client/index.vue |  2 +-
 src/views/user/index.vue           | 19 +++++++++++++++----
 6 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/.env.development b/.env.development
index 8971a6a..9db14b9 100644
--- a/.env.development
+++ b/.env.development
@@ -2,5 +2,5 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://127.0.0.1:9001'
-VUE_APP_FACE_API =  'http://127.0.0.1:5000'
+VUE_APP_BASE_API = 'http://192.168.1.114:9001'
+VUE_APP_FACE_API =  'http://192.168.1.114:5000'
diff --git a/.env.production b/.env.production
index 03db484..b33d4a4 100644
--- a/.env.production
+++ b/.env.production
@@ -2,6 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'http://127.0.0.1:9001'
-VUE_APP_FACE_API ='http://127.0.0.1:5000'
+VUE_APP_BASE_API = 'http://192.168.1.114:9001'
+VUE_APP_FACE_API ='http://192.168.1.114:5000'
 
diff --git a/.env.staging b/.env.staging
index c1452c1..5f4a155 100644
--- a/.env.staging
+++ b/.env.staging
@@ -4,6 +4,6 @@ NODE_ENV = production
 ENV = 'staging'
 
 # base api
-VUE_APP_BASE_API = 'http://127.0.0.1:9001'
-VUE_APP_FACE_API='http://127.0.0.1:5000'
+VUE_APP_BASE_API = 'http://192.168.1.114:9001'
+VUE_APP_FACE_API='http://192.168.1.114:5000'
 
diff --git a/src/components/UserForm/index.vue b/src/components/UserForm/index.vue
index 398aa42..8c4ed85 100644
--- a/src/components/UserForm/index.vue
+++ b/src/components/UserForm/index.vue
@@ -40,7 +40,7 @@
             <el-input v-model="formData.qq" placeholder="请输入QQ号码" clearable :style="{width: '100%'}" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="title !='编辑用户'">
           <el-form-item label="角色" prop="role_id">
             <el-select v-model="formData.role_id" placeholder="请选择角色" clearable :style="{width: '100%'}">
               <el-option
@@ -71,7 +71,7 @@ export default {
   name: 'UserForm',
   components: {},
   // eslint-disable-next-line vue/require-prop-types
-  props: ['handlecancel', 'propsformdata', 'handlesubmit', 'roledata'],
+  props: ['handlecancel', 'propsformdata', 'handlesubmit', 'roledata','title'],
   data() {
     return {
       formData: {
@@ -82,7 +82,7 @@ export default {
         user_code: undefined,
         qq: undefined,
         role_id: undefined,
-        is_enabled: false
+        is_enabled: true
       },
       rules: {
         real_name: [{
diff --git a/src/views/reagent/client/index.vue b/src/views/reagent/client/index.vue
index 51498ee..71d8d7b 100644
--- a/src/views/reagent/client/index.vue
+++ b/src/views/reagent/client/index.vue
@@ -204,7 +204,7 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column type="index" width="50" />
         <el-table-column align="center" property="real_name" label="用户名称" />
-        <el-table-column align="center" property="user_code" label="工号" />
+        <el-table-column align="center" property="user_code" label="账号" />
         <el-table-column align="center" label="禁用状态">
           <template slot-scope="scope">
             <el-tag :type="scope.row.drawer_type === 1?'danger':'success'">
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 913213b..e012a0a 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -2,9 +2,9 @@
   <div class="main-container-text">
     <div class="title">用户管理</div>
     <div class="header">
-      <el-input v-model="user_code" clearable placeholder="请输入工号" />
+      <el-input v-model="user_code" clearable placeholder="请输入账号" />
       <el-input v-model="real_name" clearable placeholder="请输入姓名" />
-      <el-select v-model="role_id" clearable placeholder="请输入角色" :value="manageer">
+      <el-select v-model="role_id" clearable placeholder="请输入角色" :value="manageer"> 
         <el-option
           v-for="item in roleData"
           :key="item.role_id"
@@ -38,7 +38,7 @@
       />
       <el-table-column
         prop="user_code"
-        label="工号"
+        label="账号"
         align="center"
       />
       <el-table-column
@@ -132,6 +132,7 @@
       <UserForm
         :propsformdata="userFormData"
         :roledata="roleData"
+        :title="userFormTitle"
         @handlesubmit="handleUserSubmit"
         @handlecancel="handleUserFormCancel"
       />
@@ -257,7 +258,7 @@
           <img v-if="play" id="video" ref="img" width="200px" height="200px" :src="play" alt="">
         </div>
         <div class="name">{{ opt_current_user.real_name }}</div>
-        <div class="code">工号：{{ opt_current_user.user_code }}</div>
+        <div class="code">账号：{{ opt_current_user.user_code }}</div>
         <div class="result">
           请稍后，<br>
           正在为您录入人脸信息..
@@ -468,6 +469,16 @@ export default {
     handleAddUser() {
       this.userFormTitle = '新增用户'
       this.dialogVisible = true
+      this.userFormData = {
+        real_name: undefined,
+        mobile: undefined,
+        sex: undefined,
+        email: undefined,
+        user_code: undefined,
+        qq: undefined,
+        role_id: undefined,
+        is_enabled: true
+      }
     },
     handleEdit(index, row) {
       this.userFormTitle = '编辑用户'