Merge remote-tracking branch 'origin/master'

src/api/system/policy/index.ts

@@ -0,0 +1,41 @@
+import request from '@/config/axios'
+
+// 政策法规 VO
+export interface PolicyVO {
+  id: number // id
+  name: string // 名称
+  context: string // 内容
+}
+
+// 政策法规 API
+export const PolicyApi = {
+  // 查询政策法规分页
+  getPolicyPage: async (params: any) => {
+    return await request.get({ url: `/system/policy/page`, params })
+  },
+
+  // 查询政策法规详情
+  getPolicy: async (id: number) => {
+    return await request.get({ url: `/system/policy/get?id=` + id })
+  },
+
+  // 新增政策法规
+  createPolicy: async (data: PolicyVO) => {
+    return await request.post({ url: `/system/policy/create`, data })
+  },
+
+  // 修改政策法规
+  updatePolicy: async (data: PolicyVO) => {
+    return await request.put({ url: `/system/policy/update`, data })
+  },
+
+  // 删除政策法规
+  deletePolicy: async (id: number) => {
+    return await request.delete({ url: `/system/policy/delete?id=` + id })
+  },
+
+  // 导出政策法规 Excel
+  exportPolicy: async (params) => {
+    return await request.download({ url: `/system/policy/export-excel`, params })
+  },
+}

src/components/Editor/src/Editor.vue

@@ -27,7 +27,8 @@ const props = defineProps({
     default: () => undefined
   },
   readonly: propTypes.bool.def(false),
-  modelValue: propTypes.string.def('')
+  modelValue: propTypes.string.def(''),
+  showToolbar: propTypes.bool.def(true)
 })
 
 const emit = defineEmits(['change', 'update:modelValue'])
@@ -66,6 +67,7 @@ const editorConfig = computed((): IEditorConfig => {
     {
       placeholder: '请输入内容...',
       readOnly: props.readonly,
+
       customAlert: (s: string, t: string) => {
         switch (t) {
           case 'success':
@@ -87,7 +89,9 @@ const editorConfig = computed((): IEditorConfig => {
       },
       autoFocus: false,
       scroll: true,
+    
       MENU_CONF: {
+
         ['uploadImage']: {
           server: getUploadUrl(),
           // 单个文件的最大体积限制，默认为 2M
@@ -133,7 +137,7 @@ const editorConfig = computed((): IEditorConfig => {
           },
           // 自定义插入图片
           customInsert(res: any, insertFn: InsertFnType) {
-            insertFn(res.data, 'image', res.data)
+            insertFn(res.data.url, 'image', res.data.url)
           }
         },
         ['uploadVideo']: {
@@ -181,7 +185,7 @@ const editorConfig = computed((): IEditorConfig => {
           },
           // 自定义插入图片
           customInsert(res: any, insertFn: InsertFnType) {
-            insertFn(res.data, 'mp4', res.data)
+            insertFn(res.data.url, 'mp4', res.data.url)
           }
         }
       },
@@ -210,6 +214,10 @@ onBeforeUnmount(() => {
   editor?.destroy()
 })
 
+const getShowToolbar = computed(() => {
+  return Boolean(props.showToolbar)
+})
+
 const getEditorRef = async (): Promise<IDomEditor> => {
   await nextTick()
   return unref(editorRef.value) as IDomEditor
@@ -221,9 +229,10 @@ defineExpose({
 </script>
 
 <template>
-  <div class="border-1 border-solid border-[var(--tags-view-border-color)] z-10">
+  <div class="border-0 border-solid border-[var(--tags-view-border-color)] z-10">
     <!-- 工具栏 -->
     <Toolbar
+      v-if="getShowToolbar"
       :editor="editorRef"
       :editorId="editorId"
       class="border-0 b-b-1 border-solid border-[var(--tags-view-border-color)]"

src/permission.ts

@@ -52,7 +52,8 @@ const whiteList = [
   '/auth-redirect',
   '/bind',
   '/register',
-  '/oauthLogin/gitee'
+  '/oauthLogin/gitee',
+  '/policyDetail'
 ]
 
 // 路由加载前

src/router/index.ts

@@ -2,6 +2,7 @@ import type { App } from 'vue'
 import type { RouteRecordRaw } from 'vue-router'
 import { createRouter, createWebHistory } from 'vue-router'
 import remainingRouter from './modules/remaining'
+import { Console } from 'console'
 
 // 创建路由实例
 const router = createRouter({
@@ -12,7 +13,7 @@ const router = createRouter({
 })
 
 export const resetRouter = (): void => {
-  const resetWhiteNameList = ['Redirect', 'Login', 'NoFind', 'Root']
+  const resetWhiteNameList = ['Redirect', 'Login', 'NoFind', 'Root','PolicyDetail']
   router.getRoutes().forEach((route) => {
     const { name } = route
     if (name && !resetWhiteNameList.includes(name as string)) {

src/router/modules/remaining.ts

@@ -184,6 +184,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
+{
+  path: '/policyDetail',
+  component: () => import('@/views/system/policy/policyView.vue'),
+  name: 'PolicyDetail',
+  meta: {
+    noCache: true,
+    hidden: true,
+    title: '策略详情'
+  }
+  },
   {
     path: '/sso',
     component: () => import('@/views/Login/Login.vue'),

src/views/system/policy/PolicyForm.vue

@@ -0,0 +1,96 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="80%" >
+    <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="context">
+        <Editor v-model="formData.context" height="350px" />
+      </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 { PolicyApi, PolicyVO } from '@/api/system/policy'
+
+/** 政策法规 表单 */
+defineOptions({ name: 'PolicyForm' })
+
+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,
+  context: undefined,
+})
+const formRules = reactive({
+})
+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 PolicyApi.getPolicy(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 PolicyVO
+    if (formType.value === 'create') {
+      await PolicyApi.createPolicy(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PolicyApi.updatePolicy(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    context: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/system/policy/index.vue

@@ -0,0 +1,200 @@
+<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="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="['system:policy:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['system:policy: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="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="['system:policy:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['system:policy:delete']"
+          >
+            删除
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="clickOpenDetail(scope.row.id)"
+            
+          >
+            详情
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <PolicyForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { PolicyApi, PolicyVO } from '@/api/system/policy'
+import PolicyForm from './PolicyForm.vue'
+
+/** 政策法规 列表 */
+defineOptions({ name: 'Policy' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<PolicyVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await PolicyApi.getPolicyPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const clickOpenDetail = (id: number) => {
+  console.log(id);
+  window.open(`/policyDetail?id=${id}`, '_blank')
+}
+
+/** 搜索按钮操作 */
+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 PolicyApi.deletePolicy(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PolicyApi.exportPolicy(queryParams)
+    download.excel(data, '政策法规.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/system/policy/policyView.vue

@@ -0,0 +1,52 @@
+<template>
+    <!-- 富文本展示区域 -->
+    <editor
+    v-model="policyContent"
+    readonly
+    height="100vh"
+    :showToolbar="false"
+      class="policy-content"
+    />
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { useRoute } from 'vue-router'
+import { PolicyApi } from '@/api/system/policy' // 假设有这个 API
+
+const route = useRoute()
+const policyContent = ref('')
+
+// 获取政策内容
+const getPolicyContent = async () => {
+  try {
+    const id = Number(route.query.id as string)
+    if (!id) return
+    const res = await PolicyApi.getPolicy(id)
+    policyContent.value = res.context
+  } catch (error) {
+    console.error('获取政策内容失败:', error)
+  }
+}
+
+onMounted(() => {
+  getPolicyContent()
+})
+</script>
+
+<style scoped>
+.policy-content {
+  padding: 20px;
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  height: 100vh;
+}
+
+/* 确保富文本内容样式正确显示 */
+:deep(.policy-content img) {
+  max-width: 100%;
+  height: 100vh;
+
+}
+</style>