From 97e3e80319aee85142cc216539f9f0396f110735 Mon Sep 17 00:00:00 2001
From: hh <292475944@qq.com>
Date: Wed, 6 Jan 2021 14:25:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4&=E7=94=A8=E6=88=B7=E7=B1=BB=E5=9E=8B=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/Logo.vue |  2 +-
 src/settings.js                        |  2 +-
 src/views/login.vue                    |  2 +-
 src/views/system/user/index.vue        | 30 ++++++++++++++++++++------
 vue.config.js                          |  2 +-
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 76f70be..809239f 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -26,7 +26,7 @@ export default {
   },
   data() {
     return {
-      title: '锐能管理系统',
+      title: '锐能BMS管理系统',
       logo: logoImg
     }
   }
diff --git a/src/settings.js b/src/settings.js
index e082480..0001c08 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,5 +1,5 @@
 module.exports = {
-  title: '锐能管理系统',
+  title: '锐能BMS管理系统',
 
   /**
    * 是否系统布局配置
diff --git a/src/views/login.vue b/src/views/login.vue
index c473d5b..28e17f1 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -2,7 +2,7 @@
   <div class="login">
     <div class="login-title">
       <img src="../assets/image/logo.png" alt="" />
-      <span>锐能设备管理物联云平台</span>
+      <span>锐能BMS管理系统</span>
     </div>
     <el-form
       ref="loginForm"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e328480..b5b2366 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -28,6 +28,12 @@
               <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
             </el-select>
           </el-form-item>
+          <el-form-item label="用户类型">
+            <el-select v-model="queryParams.userType" placeholder="用户类型" clearable :size="size" style="width: 240px">
+              <el-option v-for="item in userTypeList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="创建时间">
             <el-date-picker v-model="dateRange" :size="size" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
               range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
@@ -73,6 +79,9 @@
               <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
             </template>
           </el-table-column>
+          <el-table-column label="用户类型" align="center">
+            <template slot-scope="scope">{{userTypeList.find(v=> v.value == scope.row.userType).label}}</template>
+          </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -151,11 +160,11 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col v-if="form.userId == undefined" :span="12">
-            <el-form-item label="用户类型">
-              <el-select v-model="form.userType" placeholder="请选择">
-                <el-option label="系统用户" value="00"></el-option>
-                <el-option label="客户" value="01"></el-option>
+          <el-col :span="12">
+            <el-form-item label="用户类型" prop="userType">
+              <el-select :disabled="!!form.userId" v-model="form.userType" placeholder="请选择">
+                <el-option v-for="item in userTypeList" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -319,8 +328,15 @@ export default {
             message: "请输入正确的手机号码",
             trigger: "blur"
           }
-        ]
-      }
+        ],
+        userType: [
+          { required: true, message: "用户类型不能为空", trigger: "blur" }
+        ],
+      },
+      userTypeList: [
+        { 'label': '系统用户', 'value': '00', },
+        { 'label': '客户', 'value': '01', },
+      ],
     };
   },
   watch: {
diff --git a/vue.config.js b/vue.config.js
index cdb1175..98d0ca8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '锐能管理系统' // 标题
+const name = defaultSettings.title || '锐能BMS管理系统' // 标题
 
 const port = process.env.port || process.env.npm_config_port || 8080 // 端口