From 2796c3d64e90ced8b19ac06868b17e68c5944160 Mon Sep 17 00:00:00 2001
From: Mrtangl <1807746833@qq.com>
Date: Mon, 25 Apr 2022 17:27:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=8F=9C=E5=8D=95=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/layout/components/layout-header.vue |  2 +-
 admin/src/views/permission/admin/edit.vue     | 55 ++++++++++---------
 admin/src/views/permission/menu/edit.vue      |  2 +-
 .../permission/menu/select-icon/index.vue     | 16 +-----
 admin/src/views/workbench/index.vue           |  4 +-
 5 files changed, 35 insertions(+), 44 deletions(-)

diff --git a/admin/src/layout/components/layout-header.vue b/admin/src/layout/components/layout-header.vue
index cc07440f..7668f2de 100644
--- a/admin/src/layout/components/layout-header.vue
+++ b/admin/src/layout/components/layout-header.vue
@@ -34,7 +34,7 @@ export default defineComponent({
     setup() {
         const { store, router } = useAdmin()
         const userInfo = computed(() => store.getters.userInfo)
-        console.log(userInfo, 'userInfo')
+        console.log(userInfo, 'userInfo____')
 
         const handleCommand = (command: string) => {
             switch (command) {
diff --git a/admin/src/views/permission/admin/edit.vue b/admin/src/views/permission/admin/edit.vue
index 458cf537..3b321048 100644
--- a/admin/src/views/permission/admin/edit.vue
+++ b/admin/src/views/permission/admin/edit.vue
@@ -34,13 +34,13 @@
                             v-for="(item, index) in roleList"
                             :key="index"
                             :label="item.name"
-                            :value="item.id"
+                            :value="item.id + ''"
                         ></el-option>
                     </el-select>
                 </el-form-item>
 
                 <!-- 密码输入框 -->
-                <el-form-item label="密码：" prop="password" required>
+                <el-form-item label="密码：" prop="password">
                     <el-input
                         v-model="formData.password"
                         show-password
@@ -49,7 +49,7 @@
                 </el-form-item>
 
                 <!-- 确认密码输入框 -->
-                <el-form-item label="确认密码：" prop="password_confirm" required>
+                <el-form-item label="确认密码：" prop="password_confirm">
                     <el-input
                         v-model="formData.password_confirm"
                         show-password
@@ -132,8 +132,29 @@ export default defineComponent({
                             trigger: ['blur']
                         }
                     ],
-                    password: [] as any[],
-                    password_confirm: [] as any[]
+                    password: [
+                        { required: true, message: '请输入密码', trigger: 'blur' },
+                        {
+                            validator: (rule: object, value: string, callback: any) => {
+                                !value ? callback(new Error('请输入密码')) : callback()
+                            },
+                            trigger: 'blur'
+                        }
+                    ] as any[],
+                    password_confirm: [
+                        { required: true, message: '请再次输入密码', trigger: 'blur' },
+                        {
+                            validator: (rule: object, value: string, callback: any) => {
+                                if (formData.value.password) {
+                                    if (!value) callback(new Error('请再次输入密码'))
+                                    if (value !== formData.value.password)
+                                        callback(new Error('两次输入密码不一致!'))
+                                }
+                                callback()
+                            },
+                            trigger: 'blur'
+                        }
+                    ] as any[]
                 }
             })
         )
@@ -143,31 +164,13 @@ export default defineComponent({
                 page_type: 1
             }).then((res: any) => {
                 roleList.value = res.lists
+                console.log('roleList.value', roleList.value)
             })
         }
         const getAdminDetail = () => {
             if (!id.value) {
-                rules.value.password = [
-                    {
-                        required: true,
-                        message: '请输入密码',
-                        trigger: ['blur']
-                    }
-                ]
-                rules.value.password_confirm = [
-                    { required: true, message: '请再次输入密码', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (formData.value.password) {
-                                if (!value) callback(new Error('请再次输入密码'))
-                                if (value !== formData.value.password)
-                                    callback(new Error('两次输入密码不一致！'))
-                            }
-                            callback()
-                        },
-                        trigger: 'blur'
-                    }
-                ]
+                rules.value.password
+                rules.value.password_confirm
                 return
             }
             loading.value = true
diff --git a/admin/src/views/permission/menu/edit.vue b/admin/src/views/permission/menu/edit.vue
index 38ac2b91..6b2602ef 100644
--- a/admin/src/views/permission/menu/edit.vue
+++ b/admin/src/views/permission/menu/edit.vue
@@ -70,7 +70,7 @@
                                     </template>
                                 </el-input> -->
 
-                                <select-icon :icon="formData.menuIcon"></select-icon>
+                                <select-icon v-model:icon="formData.menuIcon"></select-icon>
                             </div>
                         </el-form-item>
                     </div>
diff --git a/admin/src/views/permission/menu/select-icon/index.vue b/admin/src/views/permission/menu/select-icon/index.vue
index acc2fc5d..fa4c0b80 100644
--- a/admin/src/views/permission/menu/select-icon/index.vue
+++ b/admin/src/views/permission/menu/select-icon/index.vue
@@ -2,7 +2,7 @@
     <div class="select-icon">
         <div class="flex">
             <div class="show-icon">
-                <i class="iconfont" :class="iconItemValue"></i>
+                <i class="iconfont" :class="icon"></i>
             </div>
 
             <el-popover placement="bottom" :width="400" trigger="click">
@@ -117,11 +117,9 @@ const selectIcon = ref<any>([
     'icon_gongyingshang'
 ])
 
-const iconItemValue = ref<any>([])
-
 const selectIconItem = (item: string) => {
     console.log(item, 'item____')
-    iconItemValue.value = item
+    emit('update:icon', item)
 }
 
 const emit = defineEmits(['update:icon'])
@@ -134,16 +132,6 @@ const props = withDefaults(
         icon: ''
     }
 )
-
-const iconValue = computed({
-    get: () => {
-        return [props.icon]
-    },
-    set: (value: any) => {
-        emit('update:icon', selectIconItem)
-        console.log(selectIconItem, 'selectIconItem______')
-    }
-})
 </script>
 
 <style lang="scss" scoped>
diff --git a/admin/src/views/workbench/index.vue b/admin/src/views/workbench/index.vue
index 798a8a57..033c0fda 100644
--- a/admin/src/views/workbench/index.vue
+++ b/admin/src/views/workbench/index.vue
@@ -80,7 +80,7 @@
                         </div>
                     </router-link>
 
-                    <router-link to="/setting/website/environment">
+                    <router-link to="/setting/system/environment">
                         <div class="nav-item flex-col m-t-10">
                             <view class="flex flex-center">
                                 <img
@@ -216,7 +216,7 @@ export default defineComponent({
                     res.visitor.date.reverse().forEach((item: any) => {
                         workbenchData.visitorOption.xAxis.data.push(item)
                     })
-                    res.visitor.list[0].data.forEach((item: any) => {
+                    res.visitor.list[0].forEach((item: any) => {
                         workbenchData.visitorOption.series[0].data.push(item)
                     })
                 })