feat: 用户中心以及登录增加参数

src/api/login.js

@@ -6,7 +6,8 @@ export function login(username, password, code, uuid) {
     username,
     password,
     code,
-    uuid
+    uuid,
+    type: 1
   }
   return request({
     url: '/login',

src/views/business/comparison/index.vue

@@ -230,7 +230,15 @@ export default {
       const params = { ...this.queryParams, timeBegin, timeEnd };
       delete params.daterange;
       listComparison(params).then(response => {
-        this.comparisonList = response.rows;
+        const whiteList = {
+          xsy1: '#1NO₃⁻',
+          xsy2: '#2NO₃⁻',
+          zlsy: 'PO₄³⁻',
+          nh3: 'NH₃',
+          cod: 'COD',
+          ss: 'SS',
+        }
+        this.comparisonList = response.rows.map(item => ({...item, category: whiteList[item.category]}));
         this.total = response.total;
         this.loading = false;
       });

src/views/system/user/index.vue

@@ -134,6 +134,7 @@
                <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" :show-overflow-tooltip="true" />
                <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="type" prop="type" :show-overflow-tooltip="true" />
                <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
                <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
                <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
@@ -289,6 +290,21 @@
                   </el-form-item>
                </el-col>
             </el-row>
+            <el-row>
+               <el-col :span="12">
+                  <el-form-item label="用户类型">
+                    <el-select v-model="form.type" placeholder="请选择">
+                      <el-option
+                        v-for="item in userTypeOptions"
+                        :key="item.label"
+                        :value="item.val"
+                        :label="item.label"
+                      >
+                    </el-option>
+                    </el-select>
+                  </el-form-item>
+               </el-col>
+            </el-row>
             <el-row>
                <el-col :span="24">
                   <el-form-item label="备注">
@@ -390,6 +406,18 @@ const columns = ref([
   { key: 6, label: `创建时间`, visible: true }
 ]);
 
+const userTypeOptions = [
+  { label: '用户端', val: 0 },
+  { label: '管理端', val: 1 },
+  { label: '小程序', val: 2 }
+]
+
+// {
+//   0 : '用户端',
+//   1 : '管理端',
+//   2 : '小程序'
+// }
+
 const data = reactive({
   form: {},
   queryParams: {
@@ -429,9 +457,16 @@ function getDeptTree() {
 /** 查询用户列表 */
 function getList() {
   loading.value = true;
+  const typeEnum = {
+    0: '用户端',
+    1: '管理端',
+    2: '小程序'
+  }
   listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
     loading.value = false;
-    userList.value = res.rows;
+    userList.value = res.rows.map(item => {
+      return { ...item, type: typeEnum[item.type] }
+    });
     total.value = res.total;
   });
 };