From b7686df7e64f951e718d4fa817d63ab4ed04f008 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 30 Jan 2023 17:46:02 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5mac=E5=9C=B0=E5=9D=80=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/UsersController.php  | 13 ++--
 .../manage/components/TeamManagement.vue      | 62 ++++++++++++++-----
 .../pages/components/team-management.scss     | 13 ++++
 3 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index d1190ad6d..e4bd881a4 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -606,7 +606,7 @@ class UsersController extends AbstractController
         //
         if ($getCheckinMac) {
             $list->transform(function (User $user) {
-                $user->checkin_macs = UserCheckinMac::whereUserid($user->userid)->orderBy('id')->pluck('mac');
+                $user->checkin_macs = UserCheckinMac::select(['id', 'mac', 'remark'])->whereUserid($user->userid)->orderBy('id')->get();
                 return $user;
             });
         }
@@ -673,13 +673,14 @@ class UsersController extends AbstractController
                 break;
 
             case 'checkin_macs':
-                $list = explode(",", $data['checkin_macs']);
+                $list = is_array($data['checkin_macs']) ? $data['checkin_macs'] : [];
                 $array = [];
                 foreach ($list as $item) {
-                    $item = strtoupper($item);
-                    if (Base::isMac($item)) {
-                        $array[$item] = [
-                            'mac' => $item,
+                    $item['mac'] = strtoupper($item['mac']);
+                    if (Base::isMac($item['mac'])) {
+                        $array[$item['mac']] = [
+                            'mac' => $item['mac'],
+                            'remark' => $item['remark'],
                         ];
                     }
                 }
diff --git a/resources/assets/js/pages/manage/components/TeamManagement.vue b/resources/assets/js/pages/manage/components/TeamManagement.vue
index 1ad5b44a8..4a166a294 100644
--- a/resources/assets/js/pages/manage/components/TeamManagement.vue
+++ b/resources/assets/js/pages/manage/components/TeamManagement.vue
@@ -206,9 +206,24 @@
             :title="$L('修改签到MAC地址')">
             <Form :model="checkinMacEditData" label-width="auto" @submit.native.prevent>
                 <Alert type="error" style="margin-bottom:18px">{{$L(`正在进行帐号【ID:${checkinMacEditData.userid}，${checkinMacEditData.nickname}】MAC地址修改。`)}}</Alert>
-                <FormItem :label="$L('MAC地址')">
-                    <TagInput v-model="checkinMacEditData.checkin_macs"/>
-                </FormItem>
+                <Row class="team-department-checkin-item">
+                    <Col span="12">{{$L('设备MAC地址')}}</Col>
+                    <Col span="12">{{$L('备注')}}</Col>
+                </Row>
+                <Row v-for="(item, key) in checkinMacEditData.checkin_macs" :key="key" class="team-department-checkin-item">
+                    <Col span="12">
+                        <Input
+                            v-model="item.mac"
+                            :maxlength="20"
+                            :placeholder="$L('请输入设备MAC地址')"
+                            clearable
+                            @on-clear="delCheckinDatum(key)"/>
+                    </Col>
+                    <Col span="12">
+                        <Input v-model="item.remark" :maxlength="100" :placeholder="$L('备注')"/>
+                    </Col>
+                </Row>
+                <Button type="default" icon="md-add" @click="addCheckinDatum">{{$L('添加设备')}}</Button>
             </Form>
             <div slot="footer" class="adaption">
                 <Button type="default" @click="checkinMacEditShow=false">{{$L('取消')}}</Button>
@@ -222,9 +237,6 @@
             :title="$L('修改部门')">
             <Form :model="departmentEditData" label-width="auto" @submit.native.prevent>
                 <Alert type="error" style="margin-bottom:18px">{{$L(`正在进行帐号【ID:${departmentEditData.userid}，${departmentEditData.nickname}】部门修改。`)}}</Alert>
-                <FormItem :label="$L('原部门')">
-                    <div style="line-height:24px;padding:4px 0" v-html="departmentEditData.old || '-'"></div>
-                </FormItem>
                 <FormItem :label="$L('修改部门')">
                     <Select v-model="departmentEditData.department" multiple :multiple-max="10" :placeholder="$L('留空为默认部门')">
                         <Option v-for="(item, index) in departmentList" :value="item.id" :key="index">{{ item.name }}</Option>
@@ -654,6 +666,11 @@ export default {
 
             dialogLoad: false,
             dialogList: [],
+
+            nullCheckinDatum: {
+                'mac': '',
+                'remark': '',
+            },
         }
     },
     created() {
@@ -667,19 +684,23 @@ export default {
                     if (checkin_macs.length === 0) {
                         return h('div', '-');
                     } else {
-                        const tmp = []
-                        tmp.push(h('span', {
-                            domProps: {
-                                title: checkin_macs[0]
+                        const desc = (item) => {
+                            if (item.remark) {
+                                return `${item.mac} (${item.remark})`
                             }
-                        }, checkin_macs[0]))
+                            return item.mac
+                        }
+                        const tmp = []
+                        tmp.push(h('AutoTip', desc(checkin_macs[0])))
                         if (checkin_macs.length > 1) {
                             checkin_macs = checkin_macs.splice(1)
                             tmp.push(h('ETooltip', [
                                 h('div', {
                                     slot: 'content',
                                     domProps: {
-                                        innerHTML: checkin_macs.join("<br/>")
+                                        innerHTML: checkin_macs.map(item => {
+                                            return desc(item)
+                                        }).join("<br/>")
                                     }
                                 }),
                                 h('div', {
@@ -800,8 +821,11 @@ export default {
                         type: 'checkin_macs',
                         userid: row.userid,
                         nickname: row.nickname,
-                        checkin_macs: (row.checkin_macs || []).join(','),
+                        checkin_macs: row.checkin_macs,
                     };
+                    if (this.checkinMacEditData.checkin_macs.length === 0) {
+                        this.addCheckinDatum();
+                    }
                     this.checkinMacEditShow = true;
                     break;
 
@@ -818,7 +842,6 @@ export default {
                         userid: row.userid,
                         nickname: row.nickname,
                         department: row.department.map(id => parseInt(id)),
-                        old: departments.join("<br/>")
                     };
                     this.departmentEditShow = true;
                     break;
@@ -1036,6 +1059,17 @@ export default {
                 this.dialogList = [];
             }
         },
+
+        addCheckinDatum() {
+            this.checkinMacEditData.checkin_macs.push($A.cloneJSON(this.nullCheckinDatum));
+        },
+
+        delCheckinDatum(key) {
+            this.checkinMacEditData.checkin_macs.splice(key, 1);
+            if (this.checkinMacEditData.checkin_macs.length === 0) {
+                this.addCheckinDatum();
+            }
+        },
     }
 }
 </script>
diff --git a/resources/assets/sass/pages/components/team-management.scss b/resources/assets/sass/pages/components/team-management.scss
index bf851de53..d6f19e4c8 100644
--- a/resources/assets/sass/pages/components/team-management.scss
+++ b/resources/assets/sass/pages/components/team-management.scss
@@ -7,6 +7,7 @@
     padding: 20px;
     display: flex;
     flex-direction: column;
+    overflow: auto;
 
     .management-title {
         color: $primary-title-color;
@@ -34,6 +35,7 @@
     .management-box {
         flex: 1;
         display: flex;
+        min-width: 500px;
         height: 0;
         .management-department {
             width: 239px;
@@ -52,6 +54,7 @@
                     display: flex;
                     align-items: center;
                     cursor: pointer;
+                    overflow: hidden;
                     &:hover,
                     &.active {
                         background-color: #ecf5ff;
@@ -145,6 +148,16 @@
     }
 }
 
+.team-department-checkin-item {
+    margin-bottom: 12px;
+    > div {
+        padding-right: 12px;
+        &:last-child {
+            padding-right: 0;
+        }
+    }
+}
+
 .team-table-department-warp {
     display: flex;
     align-items: center;