From 41e4464224eb324f3420a4d6232fd4ba7abf860d Mon Sep 17 00:00:00 2001
From: TimSpan <cat20201314@163.com>
Date: Tue, 10 Sep 2024 16:47:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/user/user-weapp.vue             | 183 +++++-------------
 .../src/components/iconfont/IconFont.vue      |   9 +-
 .../src/components/layout/MenuItem.vue        |   3 +-
 .../src/components/layout/SystemMenus.vue     |   1 +
 superManagement/src/config/index.ts           |   2 +
 .../src/types/components/iconfont/IconFont.ts |   2 +-
 6 files changed, 64 insertions(+), 136 deletions(-)

diff --git a/policeManagement/src/views/user/user-weapp.vue b/policeManagement/src/views/user/user-weapp.vue
index 2d5ce26..d236c38 100644
--- a/policeManagement/src/views/user/user-weapp.vue
+++ b/policeManagement/src/views/user/user-weapp.vue
@@ -3,16 +3,11 @@
     <!-- 小程序用户 -->
     <TableProMax ref="tableRef" :request-api="reqApi" :columns="columns" :searchFormOptions="searchFormOptions"
                  :scroll="{ x }">
-
     </TableProMax>
-    <a-modal v-model:open="visible" :title="title" @ok="submit" @cancel="closeModal">
-
-    </a-modal>
   </div>
 </template>
 
 <script setup lang="tsx">
-import {storeTreeData, loadTreeFromCache} from '@/utils/DB.ts'
 import api from '@/axios'
 import {ref, reactive} from 'vue'
 import TableProMax from '@/components/table/TableProMax.vue'
@@ -20,9 +15,7 @@ import {TableProMaxProps} from '@/types/components/table/index.ts'
 import {ComponentExposed} from 'vue-component-type-helpers'
 import {dictSelectNodes} from '@/config/dict.ts'
 import {publicUnitPagerQueryParams, FromItem} from '@/types/views/publicUnit.ts'
-import {FormProMaxItemOptions} from '@/types/components/form//index.ts'
 import {FormExpose} from 'ant-design-vue/es/form/Form'
-import {message} from 'ant-design-vue'
 
 const formRef = ref<FormExpose>(null)
 type TableProps = TableProMaxProps<publicUnitPagerQueryParams>
@@ -32,161 +25,87 @@ const reqApi: TableProps['requestApi'] = (params) => api.post('/management/miniP
 const columns: TableProps['columns'] = [
   {
     dataIndex: 'name',
-    title: '单位名称',
-  },
-  // {
-  //   dataIndex: 'code',
-  //   title: '单位代码',
-  // },
-  {
-    dataIndex: 'provinceName',
-    title: '行政区划',
-    customRender: ({record}) => {
-      return `${record?.provinceName}/${record?.cityName}/${record?.districtsName}/${record?.streetName}`
-    },
-  },
-
-  // {
-  //   dataIndex: 'isEnable',
-  //   title: '是否启用',
-  //   customRender: ({ text }) => <a-tag color={text?.extData?.color}>{text?.label}</a-tag>,
-  //   width: 150,
-  // },
-  // {
-  //   dataIndex: 'checkStatus',
-  //   title: '是否审核',
-  //   customRender: ({ record }) => {
-  //     return record.checkStatus?.extData?.color === 'success' ? <a-tag color='green'>{record?.checkStatus?.label}</a-tag> : <a-tag color='#f50'>{record?.checkStatus?.label}</a-tag>
-  //   },
-  // },
-  {
-    dataIndex: 'address',
-    title: '详细地址',
+    title: '用户名',
   },
 
   {
-    dataIndex: 'contactPersonInfo',
-    title: '联系人姓名',
+    dataIndex: 'isEnable',
+    title: '是否启用',
+    customRender: ({text}) => <a-tag color={text?.extData?.color}>{text?.label}</a-tag>,
+
+  },
+  {
+    dataIndex: 'checkStatus',
+    title: '是否审核',
     customRender: ({record}) => {
-      return record?.contactPersonInfo?.name
+      return record.checkStatus?.extData?.color === 'success' ?
+          <a-tag color='green'>{record?.checkStatus?.label}</a-tag> :
+          <a-tag color='#f50'>{record?.checkStatus?.label}</a-tag>
+    },
+  },
+
+  {
+    dataIndex: 'identity',
+    title: '身份',
+    customRender: ({record}) => {
+      return record?.identity?.label
     },
   },
   {
-    dataIndex: 'contactPersonInfo',
-    title: '联系人手机号',
-    customRender: ({record}) => {
-      return record?.contactPersonInfo?.telephone
-    },
+    dataIndex: 'telephone',
+    title: '手机号',
   },
+
   {
     dataIndex: 'createTime',
     title: '创建时间',
   },
-  {
-    dataIndex: 'remark',
-    title: '备注',
-  },
+
 ]
 const x: number = columns.reduce((a, b) => a + (b.width as number), 0)
-const visible = ref(false)
-const title = ref('新增用户')
-const addUserManagement = () => {
-  visible.value = true
-  title.value = ''
-}
-
-const getTree = async () => {
-  // 先尝试从缓存中加载数据
-  const cachedData = await loadTreeFromCache()
-  if (cachedData) {
-    console.log('未发请求')
-    // 如果缓存存在，直接使用缓存数据
-    return cachedData
-  } else {
-    console.log('发起了请求')
-    // 如果缓存不存在，发起 API 请求
-    const res = await api.get<any>('/common/administrativeDivisionTree')
-    await storeTreeData(res.data)
-    return res.data
-  }
-}
-const loadOptions = async () => {
-  const treeData = await getTree()
-  searchFormOptions.treeSelect.options = treeData
-}
-loadOptions()
 const searchFormOptions = reactive<TableProps['searchFormOptions']>({
   name: {
     type: 'input',
-    label: '名称',
-  },
-  treeSelect: {
-    type: 'cascader',
-    label: '行政区划',
+    label: '用户名',
   },
+
   telephone: {
     type: 'input',
     label: '手机号',
   },
-  // isEnable: {
+  isEnable: {
+    type: 'select',
+    label: '是否启用',
+    options: [
+      {
+        value: null,
+        label: '全部',
+      },
+      ...dictSelectNodes('IsEnable'),
+    ],
+  },
+  CheckStatus: {
+    type: 'select',
+    label: '是否审核',
+    options: [
+      {
+        value: null,
+        label: '全部',
+      },
+      ...dictSelectNodes('CheckStatus'),
+    ],
+  },
+  // MiniProgramUserIdentity: {
   //   type: 'select',
-  //   label: '是否启用',
+  //   label: '身份选择',
   //   options: [
   //     {
   //       value: null,
   //       label: '全部',
   //     },
-  //     ...dictSelectNodes('IsEnable'),
+  //     ...dictSelectNodes('MiniProgramUserIdentity'),
   //   ],
   // },
 })
 
-const formParams = ref<{
-  snowFlakeId?: string
-  name: string
-  sex: number
-  telephone: string
-  isEnable: any
-  remark?: string
-}>({
-  name: '',
-  sex: 0,
-  telephone: '',
-  isEnable: 0,
-})
-
-const submit = async () => {
-  // await formRef.value.validate()
-}
-const closeModal = () => {
-  visible.value = false
-}
-const formItemOptions = ref<FormProMaxItemOptions<FromItem>>({
-  name: {
-    type: 'input',
-    label: '姓名',
-    required: true,
-  },
-  sex: {
-    type: 'radioGroup',
-    label: '性别',
-    options: dictSelectNodes('Sex'),
-    required: true,
-  },
-  telephone: {
-    type: 'input',
-    label: '手机号',
-    required: true,
-  },
-  isEnable: {
-    type: 'radioGroup',
-    label: '启用状态',
-    options: dictSelectNodes('IsEnable'),
-    required: true,
-  },
-  remark: {
-    type: 'inputTextArea',
-    label: '备注',
-  },
-})
 </script>
diff --git a/superManagement/src/components/iconfont/IconFont.vue b/superManagement/src/components/iconfont/IconFont.vue
index fc208f1..ad660d4 100644
--- a/superManagement/src/components/iconfont/IconFont.vue
+++ b/superManagement/src/components/iconfont/IconFont.vue
@@ -6,13 +6,18 @@
 </template>
 
 <script setup lang="ts">
+import {onMounted} from "vue";
+
+
 import {IconFontProps} from "@/types/components/iconfont/IconFont";
 
-withDefaults(defineProps<IconFontProps>(), {
+const props = withDefaults(defineProps<IconFontProps>(), {
   size: 25,
   type: "svg"
 });
-
+onMounted(() => {
+  console.log(props.fontClass, props.type);
+});
 </script>
 
 <style scoped lang="scss">
diff --git a/superManagement/src/components/layout/MenuItem.vue b/superManagement/src/components/layout/MenuItem.vue
index 6323222..15d2564 100644
--- a/superManagement/src/components/layout/MenuItem.vue
+++ b/superManagement/src/components/layout/MenuItem.vue
@@ -18,7 +18,8 @@
         @click="router.push(item.path)"
     >
       <template #icon>
-        <icon-font :font-class="item.icon"/>
+        <icon-font :font-class="item.icon" :size="item.size"/>
+        <!--        <icon-font font-class="icon-guanlianbaoan" type="class" size="10"/>-->
       </template>
       <span class="margin-left-xs">{{ item.title }}</span>
     </a-menu-item>
diff --git a/superManagement/src/components/layout/SystemMenus.vue b/superManagement/src/components/layout/SystemMenus.vue
index 8429600..a125600 100644
--- a/superManagement/src/components/layout/SystemMenus.vue
+++ b/superManagement/src/components/layout/SystemMenus.vue
@@ -14,6 +14,7 @@ import {computed} from "vue";
 import {useRoute} from "vue-router";
 import {SYSTEM_MENUS} from "@/config";
 import MenuItem from "@/components/layout/MenuItem.vue";
+import IconFont from "@/components/iconfont/IconFont.vue";
 
 const route = useRoute()
 
diff --git a/superManagement/src/config/index.ts b/superManagement/src/config/index.ts
index b8c0668..3494115 100644
--- a/superManagement/src/config/index.ts
+++ b/superManagement/src/config/index.ts
@@ -25,6 +25,8 @@ export const SYSTEM_MENUS: SystemMenu[] = [
                 name: 'policeUnit',
                 path: '/policeUnit',
                 type: 'menu',
+                // icon: 'icon-policeman-full',
+                // size: '16',
                 component: () => import('@/views/unitManage/policeUnit/index.vue')
             }, {
                 title: '保安单位',
diff --git a/superManagement/src/types/components/iconfont/IconFont.ts b/superManagement/src/types/components/iconfont/IconFont.ts
index 9b3dd6e..501afa8 100644
--- a/superManagement/src/types/components/iconfont/IconFont.ts
+++ b/superManagement/src/types/components/iconfont/IconFont.ts
@@ -1,5 +1,5 @@
 export interface IconFontProps {
     fontClass?: string,
-    size?: number,
+    size?: number | string,
     type?: 'class' | 'svg'
 }
\ No newline at end of file

From 18e7d30b9cdc865098a206189fd8b8db59ff04dd Mon Sep 17 00:00:00 2001
From: TimSpan <cat20201314@163.com>
Date: Tue, 10 Sep 2024 16:48:52 +0800
Subject: [PATCH 2/2] Update IconFont.vue

---
 superManagement/src/components/iconfont/IconFont.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/superManagement/src/components/iconfont/IconFont.vue b/superManagement/src/components/iconfont/IconFont.vue
index ad660d4..b3ecff4 100644
--- a/superManagement/src/components/iconfont/IconFont.vue
+++ b/superManagement/src/components/iconfont/IconFont.vue
@@ -6,7 +6,6 @@
 </template>
 
 <script setup lang="ts">
-import {onMounted} from "vue";
 
 
 import {IconFontProps} from "@/types/components/iconfont/IconFont";
@@ -15,9 +14,10 @@ const props = withDefaults(defineProps<IconFontProps>(), {
   size: 25,
   type: "svg"
 });
-onMounted(() => {
-  console.log(props.fontClass, props.type);
-});
+// import {onMounted} from "vue";
+// onMounted(() => {
+//   console.log(props.fontClass, props.type);
+// });
 </script>
 
 <style scoped lang="scss">