diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 1134152..fda42b3 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -239,5 +239,9 @@ export enum DICT_TYPE {
   IOT_PRODUCT_FUNCTION_TYPE = 'iot_product_function_type', // IOT 产品功能类型
   IOT_DATA_TYPE = 'iot_data_type', // IOT 数据类型
   IOT_UNIT_TYPE = 'iot_unit_type', // IOT 单位类型
-  IOT_RW_TYPE = 'iot_rw_type' // IOT 读写类型
+  IOT_RW_TYPE = 'iot_rw_type', // IOT 读写类型
+
+  // ========== PORTAL - 门户网站模块  ==========
+  PORTAL_NEWS_TYPE = 'portal_news_type' // IOT 联网方式
+
 }
diff --git a/src/views/portal/city/CityForm.vue b/src/views/portal/city/CityForm.vue
deleted file mode 100644
index 94d1cd8..0000000
--- a/src/views/portal/city/CityForm.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="城市名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入城市名称" />
-      </el-form-item>
-      <el-form-item label="城市编码" prop="code">
-        <el-input v-model="formData.code" placeholder="请输入城市编码" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import { CityApi, CityVO } from '@/api/portal/city'
-
-/** 城市 表单 */
-defineOptions({ name: 'CityForm' })
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  name: undefined,
-  code: undefined
-})
-const formRules = reactive({
-  name: [{ required: true, message: '城市名称不能为空', trigger: 'blur' }],
-  code: [{ required: true, message: '城市编码不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await CityApi.getCity(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as CityVO
-    if (formType.value === 'create') {
-      await CityApi.createCity(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await CityApi.updateCity(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    name: undefined,
-    code: undefined
-  }
-  formRef.value?.resetFields()
-}
-</script>
\ No newline at end of file
diff --git a/src/views/portal/city/index.vue b/src/views/portal/city/index.vue
deleted file mode 100644
index f258f87..0000000
--- a/src/views/portal/city/index.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="城市名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入城市名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="城市编码" prop="code">
-        <el-input
-          v-model="queryParams.code"
-          placeholder="请输入城市编码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['portal:city:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['portal:city:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="城市名称" align="center" prop="name" />
-      <el-table-column label="城市编码" align="center" prop="code" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center" min-width="120px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['portal:city:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['portal:city:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <CityForm ref="formRef" @success="getList" />
-</template>
-
-<script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
-import download from '@/utils/download'
-import { CityApi, CityVO } from '@/api/portal/city'
-import CityForm from './CityForm.vue'
-
-/** 城市 列表 */
-defineOptions({ name: 'City' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const list = ref<CityVO[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  name: undefined,
-  code: undefined,
-  createTime: []
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await CityApi.getCityPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await CityApi.deleteCity(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await CityApi.exportCity(queryParams)
-    download.excel(data, '城市.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>
\ No newline at end of file
diff --git a/src/views/portal/jobcategory/JobCategoryForm.vue b/src/views/portal/jobcategory/JobCategoryForm.vue
deleted file mode 100644
index 84c148b..0000000
--- a/src/views/portal/jobcategory/JobCategoryForm.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="类别名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入类别名称" />
-      </el-form-item>
-      <el-form-item label="父类别ID" prop="parentId">
-        <el-input v-model="formData.parentId" placeholder="请输入父类别ID" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import { JobCategoryApi, JobCategoryVO } from '@/api/portal/jobcategory'
-
-/** 职位类别 表单 */
-defineOptions({ name: 'JobCategoryForm' })
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  name: undefined,
-  parentId: undefined
-})
-const formRules = reactive({
-  name: [{ required: true, message: '类别名称不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await JobCategoryApi.getJobCategory(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as JobCategoryVO
-    if (formType.value === 'create') {
-      await JobCategoryApi.createJobCategory(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await JobCategoryApi.updateJobCategory(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    name: undefined,
-    parentId: undefined
-  }
-  formRef.value?.resetFields()
-}
-</script>
\ No newline at end of file
diff --git a/src/views/portal/jobcategory/index.vue b/src/views/portal/jobcategory/index.vue
deleted file mode 100644
index d37a271..0000000
--- a/src/views/portal/jobcategory/index.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="类别名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入类别名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="父类别ID" prop="parentId">
-        <el-input
-          v-model="queryParams.parentId"
-          placeholder="请输入父类别ID"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['portal:job-category:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['portal:job-category:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="类别名称" align="center" prop="name" />
-      <el-table-column label="父类别ID" align="center" prop="parentId" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center" min-width="120px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['portal:job-category:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['portal:job-category:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <JobCategoryForm ref="formRef" @success="getList" />
-</template>
-
-<script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
-import download from '@/utils/download'
-import { JobCategoryApi, JobCategoryVO } from '@/api/portal/jobcategory'
-import JobCategoryForm from './JobCategoryForm.vue'
-
-/** 职位类别 列表 */
-defineOptions({ name: 'JobCategory' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const list = ref<JobCategoryVO[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  name: undefined,
-  parentId: undefined,
-  createTime: []
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await JobCategoryApi.getJobCategoryPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await JobCategoryApi.deleteJobCategory(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await JobCategoryApi.exportJobCategory(queryParams)
-    download.excel(data, '职位类别.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>
\ No newline at end of file
diff --git a/src/views/portal/jobpost/JobPostForm.vue b/src/views/portal/jobpost/JobPostForm.vue
index e689eeb..bdebebb 100644
--- a/src/views/portal/jobpost/JobPostForm.vue
+++ b/src/views/portal/jobpost/JobPostForm.vue
@@ -16,11 +16,26 @@
       <el-form-item label="职位要求" prop="requirement">
         <el-input v-model="formData.requirement" placeholder="请输入职位要求" />
       </el-form-item>
-      <el-form-item label="城市ID" prop="cityId">
-        <el-input v-model="formData.cityId" placeholder="请输入城市ID" />
+      <el-form-item label="城市" prop="cityId">
+        <el-cascader
+          v-model="formData.cityId"
+          :options="areaList"
+          :props="defaultProps"
+          class="w-1/1"
+          clearable
+          filterable
+          placeholder="请选择城市"
+        />
       </el-form-item>
-      <el-form-item label="职位类别ID" prop="jobCategoryId">
-        <el-input v-model="formData.jobCategoryId" placeholder="请输入职位类别ID" />
+      <el-form-item label="职位类别ID">
+        <el-select v-model="formData.jobCategoryId" placeholder="请选择">
+          <el-option
+            v-for="item in postList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id!"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="发布时间" prop="publishTime">
         <el-date-picker
@@ -39,12 +54,17 @@
 </template>
 <script setup lang="ts">
 import { JobPostApi, JobPostVO } from '@/api/portal/jobpost'
+import * as PostApi from "@/api/system/post";
+import {defaultProps} from "@/utils/tree";
+import * as AreaApi from "@/api/system/area";
 
 /** 职位 表单 */
 defineOptions({ name: 'JobPostForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
+const postList = ref([] as PostApi.PostVO[]) // 岗位列表
+const areaList = ref([]) // 地区列表
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
@@ -61,8 +81,8 @@ const formData = ref({
 })
 const formRules = reactive({
   title: [{ required: true, message: '职位标题不能为空', trigger: 'blur' }],
-  cityId: [{ required: true, message: '城市ID不能为空', trigger: 'blur' }],
-  jobCategoryId: [{ required: true, message: '职位类别ID不能为空', trigger: 'blur' }]
+  cityId: [{ required: true, message: '城市不能为空', trigger: 'blur' }],
+  jobCategoryId: [{ required: true, message: '岗位不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -81,6 +101,10 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  // 加载岗位列表
+  postList.value = await PostApi.getSimplePostList()
+  // 获得地区列表
+  areaList.value = await AreaApi.getAreaTree()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -121,4 +145,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/portal/jobpost/index.vue b/src/views/portal/jobpost/index.vue
index ae41d51..2154340 100644
--- a/src/views/portal/jobpost/index.vue
+++ b/src/views/portal/jobpost/index.vue
@@ -26,23 +26,15 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="城市ID" prop="cityId">
-        <el-input
-          v-model="queryParams.cityId"
-          placeholder="请输入城市ID"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="职位类别ID" prop="jobCategoryId">
-        <el-input
-          v-model="queryParams.jobCategoryId"
-          placeholder="请输入职位类别ID"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+      <el-form-item label="岗位" prop="jobCategoryId">
+        <el-select v-model="queryParams.jobCategoryId" placeholder="请选择">
+          <el-option
+            v-for="item in postList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id!"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="发布时间" prop="publishTime">
         <el-date-picker
@@ -94,11 +86,26 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="主键ID" align="center" prop="id" />
+      <el-table-column label="岗位" align="center" prop="jobCategoryId" >
+        <template #default="scope">
+          <template v-for="item in postList">
+            <el-tag type="success" :key="item.id" v-if="item.id == scope.row.jobCategoryId">
+              {{ item.name }}
+            </el-tag>
+          </template>
+        </template>
+      </el-table-column>
       <el-table-column label="职位标题" align="center" prop="title" />
       <el-table-column label="职位描述" align="center" prop="description" />
       <el-table-column label="职位要求" align="center" prop="requirement" />
-      <el-table-column label="城市ID" align="center" prop="cityId" />
-      <el-table-column label="职位类别ID" align="center" prop="jobCategoryId" />
+      <el-table-column label="城市" align="center" prop="cityId" >
+        <template #default="scope">
+          <el-tag type="success">
+            {{ findFullPathById(scope.row.cityId,areaList) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+
       <el-table-column
         label="发布时间"
         align="center"
@@ -152,12 +159,17 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { JobPostApi, JobPostVO } from '@/api/portal/jobpost'
 import JobPostForm from './JobPostForm.vue'
+import * as PostApi from "@/api/system/post";
+import * as AreaApi from "@/api/system/area";
+import {defaultProps} from "@/utils/tree";
 
 /** 职位 列表 */
 defineOptions({ name: 'JobPost' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
+const postList = ref([] as PostApi.PostVO[]) // 岗位列表
+const areaList = ref([]) // 地区列表
 
 const loading = ref(true) // 列表的加载中
 const list = ref<JobPostVO[]>([]) // 列表的数据
@@ -188,6 +200,14 @@ const getList = async () => {
   }
 }
 
+/** 查询列表 */
+const initSelectData = async () => {
+  // 加载岗位列表
+  postList.value = await PostApi.getSimplePostList()
+  // 获得地区列表
+  areaList.value = await AreaApi.getAreaTree();
+}
+
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
@@ -234,8 +254,29 @@ const handleExport = async () => {
   }
 }
 
+/**
+ * table中显示位置、城市标签
+ * @param targetId
+ * @param list
+ * @param path
+ */
+const findFullPathById = (targetId: number, list: any[], path: string[] = []): string | null => {
+  for (const node of list) {
+    if (node.id === targetId) {
+      return [...path, node.name].join("/");
+    }
+    if (node.children?.length) {
+      const result = findFullPathById(targetId, node.children, [...path, node.name]);
+      if (result) return result;
+    }
+  }
+  return null;
+};
+
+
 /** 初始化 **/
 onMounted(() => {
   getList()
+  initSelectData();
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/portal/news/NewsForm.vue b/src/views/portal/news/NewsForm.vue
index b3f0e6b..3ae94b0 100644
--- a/src/views/portal/news/NewsForm.vue
+++ b/src/views/portal/news/NewsForm.vue
@@ -20,10 +20,17 @@
         <el-input v-model="formData.newsPath" placeholder="请输入新闻路径" />
       </el-form-item>
       <el-form-item label="封面图片" prop="coverImg">
-        <el-input v-model="formData.coverImg" placeholder="请输入封面图片" />
+        <UploadImg v-model="formData.coverImg" height="80px" />
       </el-form-item>
-      <el-form-item label="新闻类型ID" prop="newsTypeId">
-        <el-input v-model="formData.newsTypeId" placeholder="请输入新闻类型ID" />
+      <el-form-item label="新闻类型" prop="newsTypeId">
+        <el-select v-model="formData.newsTypeId" placeholder="请选择新闻类型" clearable class="!w-240px">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PORTAL_NEWS_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="发布时间" prop="publishTime">
         <el-date-picker
@@ -42,6 +49,7 @@
 </template>
 <script setup lang="ts">
 import { NewsApi, NewsVO } from '@/api/portal/news'
+import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
 
 /** 新闻 表单 */
 defineOptions({ name: 'NewsForm' })
@@ -67,7 +75,7 @@ const formRules = reactive({
   newsTitle: [{ required: true, message: '新闻标题不能为空', trigger: 'blur' }],
   newsContent: [{ required: true, message: '新闻内容不能为空', trigger: 'blur' }],
   newsPath: [{ required: true, message: '新闻路径不能为空', trigger: 'blur' }],
-  newsTypeId: [{ required: true, message: '新闻类型ID不能为空', trigger: 'blur' }]
+  newsTypeId: [{ required: true, message: '新闻类型不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -127,4 +135,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/portal/news/index.vue b/src/views/portal/news/index.vue
index d754179..7bfe92a 100644
--- a/src/views/portal/news/index.vue
+++ b/src/views/portal/news/index.vue
@@ -26,32 +26,15 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="新闻路径" prop="newsPath">
-        <el-input
-          v-model="queryParams.newsPath"
-          placeholder="请输入新闻路径"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="封面图片" prop="coverImg">
-        <el-input
-          v-model="queryParams.coverImg"
-          placeholder="请输入封面图片"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="新闻类型ID" prop="newsTypeId">
-        <el-input
-          v-model="queryParams.newsTypeId"
-          placeholder="请输入新闻类型ID"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+      <el-form-item label="新闻类型" prop="newsTypeId">
+        <el-select v-model="queryParams.newsTypeId" placeholder="请选择新闻类型" clearable class="!w-240px">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PORTAL_NEWS_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="发布时间" prop="publishTime">
         <el-date-picker
@@ -64,17 +47,6 @@
           class="!w-220px"
         />
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -108,7 +80,23 @@
       <el-table-column label="新闻内容" align="center" prop="newsContent" />
       <el-table-column label="新闻路径" align="center" prop="newsPath" />
       <el-table-column label="封面图片" align="center" prop="coverImg" />
-      <el-table-column label="新闻类型ID" align="center" prop="newsTypeId" />
+
+      <el-table-column label="商品信息" min-width="300">
+        <template #default="{ row }">
+          <div class="flex">
+            <el-image
+              fit="cover"
+              :src="row.coverImg"
+              class="flex-none w-50px h-50px"
+              @click="imagePreview(row.coverImg)"
+            /></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="新闻类型" align="center" prop="newsTypeId">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PORTAL_NEWS_TYPE" :value="scope.row.newsTypeId" />
+        </template>
+      </el-table-column>
       <el-table-column
         label="发布时间"
         align="center"
@@ -162,6 +150,8 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { NewsApi, NewsVO } from '@/api/portal/news'
 import NewsForm from './NewsForm.vue'
+import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
+import { createImageViewer } from '@/components/ImageViewer'
 
 /** 新闻 列表 */
 defineOptions({ name: 'News' })
@@ -229,6 +219,12 @@ const handleDelete = async (id: number) => {
     await getList()
   } catch {}
 }
+/** 商品图预览 */
+const imagePreview = (imgUrl: string) => {
+  createImageViewer({
+    urlList: [imgUrl]
+  })
+}
 
 /** 导出按钮操作 */
 const handleExport = async () => {
@@ -249,4 +245,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/portal/newstype/NewsTypeForm.vue b/src/views/portal/newstype/NewsTypeForm.vue
deleted file mode 100644
index d3c610d..0000000
--- a/src/views/portal/newstype/NewsTypeForm.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="类型名称" prop="typeName">
-        <el-input v-model="formData.typeName" placeholder="请输入类型名称" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import { NewsTypeApi, NewsTypeVO } from '@/api/portal/newstype'
-
-/** 新闻类型 表单 */
-defineOptions({ name: 'NewsTypeForm' })
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  typeName: undefined
-})
-const formRules = reactive({
-  typeName: [{ required: true, message: '类型名称不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await NewsTypeApi.getNewsType(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as NewsTypeVO
-    if (formType.value === 'create') {
-      await NewsTypeApi.createNewsType(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await NewsTypeApi.updateNewsType(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    typeName: undefined
-  }
-  formRef.value?.resetFields()
-}
-</script>
\ No newline at end of file
diff --git a/src/views/portal/newstype/index.vue b/src/views/portal/newstype/index.vue
deleted file mode 100644
index a6dedb3..0000000
--- a/src/views/portal/newstype/index.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="类型名称" prop="typeName">
-        <el-input
-          v-model="queryParams.typeName"
-          placeholder="请输入类型名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['portal:news-type:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['portal:news-type:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="类型名称" align="center" prop="typeName" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center" min-width="120px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['portal:news-type:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['portal:news-type:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <NewsTypeForm ref="formRef" @success="getList" />
-</template>
-
-<script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
-import download from '@/utils/download'
-import { NewsTypeApi, NewsTypeVO } from '@/api/portal/newstype'
-import NewsTypeForm from './NewsTypeForm.vue'
-
-/** 新闻类型 列表 */
-defineOptions({ name: 'NewsType' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const list = ref<NewsTypeVO[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  typeName: undefined,
-  createTime: []
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await NewsTypeApi.getNewsTypePage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await NewsTypeApi.deleteNewsType(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await NewsTypeApi.exportNewsType(queryParams)
-    download.excel(data, '新闻类型.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>
\ No newline at end of file
diff --git a/src/views/portal/user/UserForm.vue b/src/views/portal/user/UserForm.vue
deleted file mode 100644
index aa1b2dc..0000000
--- a/src/views/portal/user/UserForm.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="用户名" prop="username">
-        <el-input v-model="formData.username" placeholder="请输入用户名" />
-      </el-form-item>
-      <el-form-item label="密码" prop="password">
-        <el-input v-model="formData.password" placeholder="请输入密码" />
-      </el-form-item>
-      <el-form-item label="登录token" prop="token">
-        <el-input v-model="formData.token" placeholder="请输入登录token" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import { UserApi, UserVO } from '@/api/portal/user'
-
-/** 用户 表单 */
-defineOptions({ name: 'UserForm' })
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  username: undefined,
-  password: undefined,
-  token: undefined
-})
-const formRules = reactive({
-  username: [{ required: true, message: '用户名不能为空', trigger: 'blur' }],
-  password: [{ required: true, message: '密码不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await UserApi.getUser(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as UserVO
-    if (formType.value === 'create') {
-      await UserApi.createUser(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await UserApi.updateUser(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    username: undefined,
-    password: undefined,
-    token: undefined
-  }
-  formRef.value?.resetFields()
-}
-</script>
\ No newline at end of file
diff --git a/src/views/portal/user/index.vue b/src/views/portal/user/index.vue
deleted file mode 100644
index 38fd84b..0000000
--- a/src/views/portal/user/index.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="用户名" prop="username">
-        <el-input
-          v-model="queryParams.username"
-          placeholder="请输入用户名"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="密码" prop="password">
-        <el-input
-          v-model="queryParams.password"
-          placeholder="请输入密码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="登录token" prop="token">
-        <el-input
-          v-model="queryParams.token"
-          placeholder="请输入登录token"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['portal:user:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['portal:user:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="用户名" align="center" prop="username" />
-      <el-table-column label="密码" align="center" prop="password" />
-      <el-table-column label="登录token" align="center" prop="token" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center" min-width="120px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['portal:user:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['portal:user:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <UserForm ref="formRef" @success="getList" />
-</template>
-
-<script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
-import download from '@/utils/download'
-import { UserApi, UserVO } from '@/api/portal/user'
-import UserForm from './UserForm.vue'
-
-/** 用户 列表 */
-defineOptions({ name: 'User' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const list = ref<UserVO[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  username: undefined,
-  password: undefined,
-  token: undefined,
-  createTime: []
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await UserApi.getUserPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await UserApi.deleteUser(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await UserApi.exportUser(queryParams)
-    download.excel(data, '用户.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>
\ No newline at end of file