From d9289776a96fdf414a366fa4f4a67a612f7b2d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
 =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Thu, 20 Mar 2025 14:06:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=BA=93=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8F=E5=92=8C=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/taglibrary/index.ts            |  10 +-
 .../ContentWrap/src/ContentWrap.vue           |   2 +-
 src/components/Dialog/src/Dialog.vue          |  12 --
 src/styles/variables.scss                     |  21 ++
 src/views/system/taglibrary/form.vue          |  87 ++++----
 src/views/system/taglibrary/index.vue         | 173 +++++++---------
 src/views/task/create.vue                     | 190 +++++++++---------
 7 files changed, 241 insertions(+), 254 deletions(-)

diff --git a/src/api/system/taglibrary/index.ts b/src/api/system/taglibrary/index.ts
index 8bdcb13..29fd522 100644
--- a/src/api/system/taglibrary/index.ts
+++ b/src/api/system/taglibrary/index.ts
@@ -20,7 +20,7 @@ export const TagLibraryApi = {
 
   // 查询企业标签分页
   childrenList: async (id: number) => {
-    return await request.get({ url: `/system/tag-library/childrenList?id=`+id })
+    return await request.get({ url: `/system/tag-library/childrenList?id=` + id })
   },
 
   // 查询企业标签详情
@@ -43,7 +43,7 @@ export const TagLibraryApi = {
     return await request.delete({ url: `/system/tag-library/delete?id=` + id })
   },
 
-   // 删除企业标签
+  // 删除企业标签
   tagLibraryList: async (codeList: string) => {
     return await request.get({ url: `/system/tag-library/list?` + codeList })
   },
@@ -52,4 +52,10 @@ export const TagLibraryApi = {
   exportTagLibrary: async (params) => {
     return await request.download({ url: `/system/tag-library/export-excel`, params })
   },
+  /**
+   * 获取标签列表
+   */
+  getTagList: async (params: any) => {
+    return await request.get({ url: `/system/tag-library/pageInfo`, params })
+  }
 }
diff --git a/src/components/ContentWrap/src/ContentWrap.vue b/src/components/ContentWrap/src/ContentWrap.vue
index e603596..8847219 100644
--- a/src/components/ContentWrap/src/ContentWrap.vue
+++ b/src/components/ContentWrap/src/ContentWrap.vue
@@ -11,7 +11,7 @@ const prefixCls = getPrefixCls('content-wrap')
 defineProps({
   title: propTypes.string.def(''),
   message: propTypes.string.def(''),
-  bodyStyle: propTypes.object.def({ padding: '10px' })
+  bodyStyle: propTypes.object.def({ padding: '40px' })
 })
 </script>
 
diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index c38eb83..b0d81dd 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -62,11 +62,9 @@ const dialogStyle = computed(() => {
   <ElDialog
     v-bind="getBindValue"
     :close-on-click-modal="true"
-    :fullscreen="isFullscreen"
     :width="width"
     destroy-on-close
     lock-scroll
-    draggable
     class="com-dialog"
     :show-close="false"
   >
@@ -78,14 +76,6 @@ const dialogStyle = computed(() => {
         <div
           class="absolute right-15px top-[50%] h-54px flex translate-y-[-50%] items-center justify-between"
         >
-          <Icon
-            v-if="fullscreen"
-            class="is-hover mr-10px cursor-pointer"
-            :icon="isFullscreen ? 'radix-icons:exit-full-screen' : 'radix-icons:enter-full-screen'"
-            color="var(--el-color-info)"
-            hover-color="var(--el-color-primary)"
-            @click="toggleFull"
-          />
           <Icon
             class="is-hover cursor-pointer"
             icon="ep:close"
@@ -122,7 +112,6 @@ const dialogStyle = computed(() => {
       height: 54px;
       padding: 0;
       margin-right: 0 !important;
-      border-bottom: 1px solid var(--el-border-color);
     }
 
     &__body {
@@ -130,7 +119,6 @@ const dialogStyle = computed(() => {
     }
 
     &__footer {
-      border-top: 1px solid var(--el-border-color);
     }
 
     &__headerbtn {
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 00b66f1..8b1c97e 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -2,3 +2,24 @@
 $namespace: v;
 // el命名空间
 $elNamespace: el;
+
+.el-form--inline {
+  display: flex;
+  gap: 40px;
+  margin-bottom: 0;
+  .el-form-item {
+    margin-right: 0;
+    margin-bottom: 0;
+    .el-form-item__label {
+      width: fit-content;
+    }
+  }
+}
+
+.el-table {
+  border: 1px solid #ebeef5;
+  --el-table-header-bg-color: #f5f7fa;
+  .el-table__header {
+    color: #909399;
+  }
+}
diff --git a/src/views/system/taglibrary/form.vue b/src/views/system/taglibrary/form.vue
index dfff1b2..4245e24 100644
--- a/src/views/system/taglibrary/form.vue
+++ b/src/views/system/taglibrary/form.vue
@@ -7,31 +7,16 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="父标签" prop="tagName">
-        <el-tree-select
-          v-model="formData.parentId"
-          :data="list"
-          check-strictly
-          :render-after-expand="false"
-          placeholder="请选择父标签"
-          node-key="id"
-          :default-checked-keys="echoList"
-          :props="{
-            label: 'tagName'
-          }"
-        />
+      <el-form-item label="父级标签" prop="tagName">
+        <el-select default-first-option v-model="formData.parentId" disabled>
+          <el-option v-for="item in list" :key="item.id" :label="item.tagName" :value="item.id" />
+        </el-select>
       </el-form-item>
-
-      <el-form-item label="标签的名称" prop="tagName">
+      <el-form-item label="标签名称" prop="tagName">
         <el-input v-model="formData.tagName" placeholder="请输入标签的名称" />
       </el-form-item>
-
-      <el-form-item label="助记码" prop="tagCode">
-        <el-input v-model="formData.tagCode" placeholder="助记码" />
-      </el-form-item>
-
-      <el-form-item label="排序" prop="sort">
-        <el-input v-model="formData.sort" placeholder="排序" />
+      <el-form-item label="排列顺序" prop="sort">
+        <el-input v-model.number="formData.sort" placeholder="请输入0～99数字" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -42,7 +27,6 @@
 </template>
 <script setup lang="ts">
 import { TagLibraryApi, TagLibraryVO } from '@/api/system/taglibrary'
-import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 
 /** 企业标签 表单 */
 defineOptions({ name: 'Form' })
@@ -52,29 +36,42 @@ const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formData = ref({
+const formData = ref<any>({
   tagId: undefined,
   tagName: undefined,
   parentId: null as any,
   tagLevel: undefined,
   tagType: null as any,
   sort: undefined,
-  tagCode:undefined,
+  tagCode: undefined,
   id: null as any
 })
-const formRules = reactive({})
+const formRules = reactive({
+  sort: [
+    {
+      required: true,
+      message: '请输入排序',
+      trigger: 'blur'
+    },
+    { type: 'number', message: '请输入数字' }
+  ],
+  tagName: [
+    {
+      required: true,
+      message: '请输入标签名称',
+      trigger: 'blur'
+    }
+  ]
+})
 const formRef = ref() // 表单 Ref
-const echoList = ref([])
+const list = ref<any>([])
 /** 打开弹窗 */
 const open = async (params) => {
-  console.log(params)
   dialogVisible.value = true
-  dialogTitle.value = params.id
-    ? `修改${getDictLabel(DICT_TYPE.TAG_TYPE, params.tagType)}`
-    : `创建${getDictLabel(DICT_TYPE.TAG_TYPE, params.tagType)}`
+  dialogTitle.value = params.id ? `修改标签` : `创建标签`
   resetForm()
   formLoading.value = true
-  await levelList()
+  await getParent(params.parentId)
   // 修改时，设置数据
   if (params.id) {
     formData.value = await TagLibraryApi.getTagLibrary(params.id)
@@ -83,15 +80,10 @@ const open = async (params) => {
     }
   }
   formData.value.tagType = Number(params.tagType)
+  formData.value.parentId = Number(params.parentId)
   formLoading.value = false
 }
 
-const list: any = ref([])
-
-const levelList = async () => {
-  list.value = await TagLibraryApi.getTagLibraryPage(formData.value.id)
-}
-
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
@@ -118,16 +110,21 @@ const submitForm = async () => {
   }
 }
 
+const getParent = async (id) => {
+  const res = await TagLibraryApi.getTagLibrary(id)
+  list.value = [res]
+}
+
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-	  tagId: undefined,
-	  tagName: undefined,
-	  parentId: null as any,
-	  tagLevel: undefined,
-	  tagType: null as any,
-	  sort: undefined,
-	  id: null as any
+    tagId: undefined,
+    tagName: undefined,
+    parentId: undefined,
+    tagLevel: undefined,
+    tagType: undefined,
+    sort: undefined,
+    id: undefined
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/system/taglibrary/index.vue b/src/views/system/taglibrary/index.vue
index e834a0b..a9abf8a 100644
--- a/src/views/system/taglibrary/index.vue
+++ b/src/views/system/taglibrary/index.vue
@@ -1,99 +1,82 @@
 <template>
   <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="名称" prop="tagName">
-        <el-input
-          v-model="queryParams.tagName"
-          placeholder="请输入标签的名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="父标签" prop="parentTagId">
-        <el-input
-          v-model="queryParams.parentId"
-          placeholder="请输入父标签的ID"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </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()">
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['system:tag-library:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
+    <section class="flex flex-col gap-20px">
+      <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+        <el-form-item label="" prop="tagName">
+          <el-input
+            v-model="queryParams.tagName"
+            placeholder="请输入标签的名称"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="">
+          <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-8px" /> 搜索</el-button>
+          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-8px" /> 重置</el-button>
+          <el-button
+            type="success"
+            plain
+            @click="handleExport"
+            :loading="exportLoading"
+            v-hasPermi="['system:tag-library:export']"
+          >
+            <Icon icon="ep:download" class="mr-8px" /> 导出
+          </el-button>
+        </el-form-item>
+        <el-form-item class="ml-auto">
+          <el-button type="primary" @click="openForm()">
+            <Icon icon="ep:circle-plus" class="mr-8px" /> 新增
+          </el-button>
+        </el-form-item>
+      </el-form>
+      <el-table :data="list">
+        <el-table-column label="父级标签" prop="parentName" />
+        <el-table-column label="标签名称" prop="tagName" />
+        <el-table-column label="排列顺序" prop="sort" />
+        <el-table-column label="操作选项" align="right">
+          <template #default="{ row }">
+            <el-button type="text" @click="openForm(row.id)"> 编辑 </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :total="total"
+        :show-page-size="false"
+        layout="total, prev, pager, next"
+        v-model:current-page="queryParams.pageNo"
+        v-model:page-size="queryParams.pageSize"
+        class="ml-auto"
+      />
+    </section>
   </ContentWrap>
 
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-tree
-      :data="list"
-      node-key="id"
-      :props="treeProps"
-      highlight-current
-      default-expand-all
-      @node-click="handleNodeClick"
-    >
-      <template #default="{ node, data }">
-        <span>{{ node.label }}{{ data.tagName }}</span>
-        <el-tag size="small" type="info">层级: {{ data.tagLevel }}</el-tag>
-        <!-- <el-tag size="small" :type="data.tag_type === 1 ? 'success' : 'warning'">
-            {{ data.tag_type === 1 ? '企业标签' : '执法标签' }}
-          </el-tag> -->
-        <el-button type="text" @click="openForm(data.id)"
-          ><el-icon><EditPen /></el-icon
-        ></el-button>
-        <el-button type="text" @click="handleDelete(data.id)"
-          ><el-icon><DeleteFilled /></el-icon
-        ></el-button>
-      </template>
-    </el-tree>
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
   <TagForm ref="tagFormRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { TagLibraryApi, TagLibraryVO } from '@/api/system/taglibrary/index'
+import { TagLibraryApi, TagLibraryVO } from '@/api/system/taglibrary'
 import TagForm from './form.vue'
 
+type QueryParams = {
+  pageNo: number
+  pageSize: number
+  tagType: number
+  tagName: string
+}
+
 /** 企业标签 列表 */
 defineOptions({ name: 'TagLibrary' })
 const message = useMessage() // 消息弹窗
 const loading = ref(true) // 列表的加载中
 const list = ref<TagLibraryVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
-const queryParams = reactive({
+const queryParams = reactive<QueryParams>({
   pageNo: 1,
   pageSize: 10,
-  tagName: undefined,
-  parentId: undefined,
-  tagLevel: undefined,
-  tagType: undefined,
-  createTime: []
+  tagType: 0,
+  tagName: ''
 })
 const route = useRoute()
 const queryFormRef = ref() // 搜索的表单
@@ -102,18 +85,14 @@ const exportLoading = ref(false) // 导出的加载中
 const getList = async () => {
   loading.value = true
   try {
-    const data = await TagLibraryApi.getTagLibraryPage(queryParams)
-    list.value = data
+    const res = await TagLibraryApi.getTagList(queryParams)
+    list.value = res.list
+    total.value = res.total
   } finally {
     loading.value = false
   }
 }
 
-const treeProps = ref({
-  label: 'tag_name', // 标签的显示字段
-  children: 'children' // 子节点字段
-})
-
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
@@ -126,26 +105,14 @@ const resetQuery = () => {
   handleQuery()
 }
 
-const handleNodeClick = (node) => {
-  console.log('当前点击的标签：', node)
-}
 /** 添加/修改操作 */
 const tagFormRef = ref()
 const openForm = (id?: number) => {
-  tagFormRef.value.open({ id, tagType: queryParams.tagType })
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await TagLibraryApi.deleteTagLibrary(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
+  tagFormRef.value.open({
+    id,
+    tagType: queryParams.tagType,
+    parentId: queryParams.tagType == 1 ? 1 : 26
+  })
 }
 
 /** 导出按钮操作 */
@@ -165,7 +132,9 @@ const handleExport = async () => {
 
 /** 初始化 **/
 onMounted(() => {
-  queryParams.tagType = route.fullPath.split('/').pop()
+  queryParams.tagType = Number(route.fullPath.split('/').pop())
   getList()
 })
 </script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/task/create.vue b/src/views/task/create.vue
index 94c9207..e8607fa 100644
--- a/src/views/task/create.vue
+++ b/src/views/task/create.vue
@@ -46,21 +46,21 @@
             />
           </el-select>
         </el-form-item>
-<!--        <el-form-item label="标签" prop="tags" style="width: 100%">-->
-<!--          <el-tree-select-->
-<!--            v-model="formData.tags"-->
-<!--            :data="tagList"-->
-<!--            check-strictly-->
-<!--            :render-after-expand="false"-->
-<!--            placeholder="请选择标签"-->
-<!--            node-key="id"-->
-<!--            show-checkbox-->
-<!--            multiple-->
-<!--            :props="{-->
-<!--              label: 'tagName'-->
-<!--            }"-->
-<!--          />-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="标签" prop="tags" style="width: 100%">-->
+        <!--          <el-tree-select-->
+        <!--            v-model="formData.tags"-->
+        <!--            :data="tagList"-->
+        <!--            check-strictly-->
+        <!--            :render-after-expand="false"-->
+        <!--            placeholder="请选择标签"-->
+        <!--            node-key="id"-->
+        <!--            show-checkbox-->
+        <!--            multiple-->
+        <!--            :props="{-->
+        <!--              label: 'tagName'-->
+        <!--            }"-->
+        <!--          />-->
+        <!--        </el-form-item>-->
         <el-form-item label="描述" prop="description" style="width: 100%">
           <el-input
             type="textarea"
@@ -122,23 +122,23 @@
               />
             </el-select>
           </el-form-item>
-<!--          <el-form-item label="" prop="id">-->
-<!--            <el-select-->
-<!--              v-model="enterprise.queryParams.id"-->
-<!--              placeholder="请选择企业资质"-->
-<!--              clearable-->
-<!--              @clear="handleQuery"-->
-<!--              @change="handleQuery"-->
-<!--              class="!w-150px"-->
-<!--            >-->
-<!--              <el-option-->
-<!--                v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISES_QUA)"-->
-<!--                :key="dict.value"-->
-<!--                :label="dict.label"-->
-<!--                :value="dict.value"-->
-<!--              />-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
+          <!--          <el-form-item label="" prop="id">-->
+          <!--            <el-select-->
+          <!--              v-model="enterprise.queryParams.id"-->
+          <!--              placeholder="请选择企业资质"-->
+          <!--              clearable-->
+          <!--              @clear="handleQuery"-->
+          <!--              @change="handleQuery"-->
+          <!--              class="!w-150px"-->
+          <!--            >-->
+          <!--              <el-option-->
+          <!--                v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISES_QUA)"-->
+          <!--                :key="dict.value"-->
+          <!--                :label="dict.label"-->
+          <!--                :value="dict.value"-->
+          <!--              />-->
+          <!--            </el-select>-->
+          <!--          </el-form-item>-->
           <el-form-item>
             <el-button @click="handleQuery">
               <Icon icon="ep:search" class="mr-5px" /> 搜索
@@ -198,14 +198,15 @@
       </section>
       <section>
         <section class="check-area">
-          <section v-for="item in formData.enterprises" :key="item.id" class="isChecked" >
+          <section v-for="item in formData.enterprises" :key="item.id" class="isChecked">
             <el-tooltip :content="item.enterprisesName" placement="top">
-              <span >
+              <span>
                 企业名称：{{ item.enterprisesName }}
                 <section class="flex gap-5px">
-                区域: <DictTag :type="DICT_TYPE.ENTERPRISES_AREA" :value="Number(item.region)" />
-                规模：<DictTag :type="DICT_TYPE.ENTERPRISES_TYPE" :value="Number(item.type)" />
-              </section>
+                  区域:
+                  <DictTag :type="DICT_TYPE.ENTERPRISES_AREA" :value="Number(item.region)" />
+                  规模：<DictTag :type="DICT_TYPE.ENTERPRISES_TYPE" :value="Number(item.type)" />
+                </section>
               </span>
             </el-tooltip>
             <el-icon @click="checkEnterprise(item)"><Close /></el-icon>
@@ -228,13 +229,18 @@
   </ContentWrap>
   <ContentWrap>
     <el-button type="primary" @click="submitForm">提 交</el-button>
-    <el-button 
-      type="primary" @click="submitForm"  v-hasPermi="['system:enterprise-inspections:audit']">审核通过</el-button>
-    <el-button 
+    <el-button
+      type="primary"
+      @click="submitForm"
+      v-hasPermi="['system:enterprise-inspections:audit']"
+      >审核通过</el-button
+    >
+    <el-button
       type="danger"
       @click="submitForm"
       v-hasPermi="['system:enterprise-inspections:audit']"
-    >删除</el-button>
+      >删除</el-button
+    >
   </ContentWrap>
 </template>
 <script setup lang="ts">
@@ -242,8 +248,8 @@ import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
 import { TagLibraryApi } from '@/api/system/taglibrary'
 import { EnterprisesApi, EnterprisesVO } from '@/api/enterprises'
 import { TaskInfoApi } from '@/api/system/taskinfo'
-import { useTagsViewStore} from '@/store/modules/tagsView'
-import {defaultProps} from "@/utils/tree";
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import { defaultProps } from '@/utils/tree'
 defineOptions({ name: 'CreateTask' })
 const loading = ref(false)
 const formData = ref({
@@ -266,9 +272,9 @@ const formData = ref({
   tags: [],
   enterprises: [] as any
 })
-const router=useRouter()
-const route=useRoute()
-const tagView=useTagsViewStore()
+const router = useRouter()
+const route = useRoute()
+const tagView = useTagsViewStore()
 const message = useMessage() // 消息弹窗
 const formRules = reactive({
   title: [{ required: true, message: '任务标题不能为空', trigger: 'blur' }],
@@ -281,7 +287,7 @@ const formRules = reactive({
   ],
   planTime: [{ required: true, message: '时间周期不能为空', trigger: 'blur' }]
 })
-const {query}=useRoute()
+const { query } = useRoute()
 const formRef = ref() // 表单 Ref
 const tagList = ref([])
 const queryFormRef = ref() // 搜索的表单
@@ -294,7 +300,7 @@ const enterprise = ref({
     type: undefined,
     region: undefined,
     registrationNumber: undefined,
-    id:undefined
+    id: undefined
   }),
   total: ref(0)
 })
@@ -312,14 +318,14 @@ const resetQuery = () => {
  * 获取标签列表
  */
 function getTagList() {
-  TagLibraryApi.getTagLibraryPage({tagType:2}).then((res) => {
+  TagLibraryApi.getTagLibraryPage({ tagType: 2 }).then((res) => {
     tagList.value = res
   })
 }
 const defaultProps = {
   label: 'tagName', // 使用 'name' 字段作为选项的标签
-  children: 'children', // 如果存在子节点，则使用 'children' 字段
-};
+  children: 'children' // 如果存在子节点，则使用 'children' 字段
+}
 /**
  * 获取企业列表
  */
@@ -338,10 +344,10 @@ async function getEnterPriseList() {
  */
 async function selectAll() {
   loading.value = true
-	const data = JSON.parse(JSON.stringify(enterprise.value.queryParams));
-	data.pageSize = -1
-	delete data.pageNo
-	const { list } = await EnterprisesApi.getEnterprisesPage(data)
+  const data = JSON.parse(JSON.stringify(enterprise.value.queryParams))
+  data.pageSize = -1
+  delete data.pageNo
+  const { list } = await EnterprisesApi.getEnterprisesPage(data)
   const arr = [...formData.value.enterprises, ...list]
   formData.value.enterprises = uniqueFunc(arr, 'id')
   loading.value = false
@@ -351,9 +357,9 @@ async function selectAll() {
  */
 async function cancelAll() {
   loading.value = true
-  const data = JSON.parse(JSON.stringify(enterprise.value.queryParams));
+  const data = JSON.parse(JSON.stringify(enterprise.value.queryParams))
   data.pageSize = -1
-	delete data.pageNo
+  delete data.pageNo
   const { list } = await EnterprisesApi.getEnterprisesPage(data)
   if (list) {
     formData.value.enterprises = formData.value.enterprises.filter((e) => {
@@ -394,48 +400,48 @@ async function submitForm() {
   if (validate) {
     const data = JSON.parse(JSON.stringify(formData.value))
     //任务状态默认初始值1
-    data.status=1;
-    console.log("任务类型：",formData.value.taskType)
+    data.status = 1
+    console.log('任务类型：', formData.value.taskType)
     data.enterpriseIds = formData.value.enterprises.map((i) => i.id)
-    if(data.enterpriseIds.length==0){
-      message.success("温馨提示：请您选择执法对象")
-    }else{
-       if(data.status<2){
-            data.startDate = data.planTime[0]
-            data.endDate = data.planTime[1]
-            if (data.id) {
-              TaskInfoApi.updateTaskInfo(data).then(() => {
-                message.success('操作成功')
-                tagView.delView(route)
-                router.go(-1)
-              })
-            } else {
-              TaskInfoApi.createTaskInfo(data).then(() => {
-                message.success('操作成功')
-                tagView.delView(route)
-                router.go(-1)
-              })
-            }
-       }else{
-         message.success('温馨提示：该任务已经执行,无法再进行修改')
-       }
+    if (data.enterpriseIds.length == 0) {
+      message.success('温馨提示：请您选择执法对象')
+    } else {
+      if (data.status < 2) {
+        data.startDate = data.planTime[0]
+        data.endDate = data.planTime[1]
+        if (data.id) {
+          TaskInfoApi.updateTaskInfo(data).then(() => {
+            message.success('操作成功')
+            tagView.delView(route)
+            router.go(-1)
+          })
+        } else {
+          TaskInfoApi.createTaskInfo(data).then(() => {
+            message.success('操作成功')
+            tagView.delView(route)
+            router.go(-1)
+          })
+        }
+      } else {
+        message.success('温馨提示：该任务已经执行,无法再进行修改')
+      }
     }
   }
 }
-function init(){
-	if(query.id){
-		TaskInfoApi.getTaskInfo(query.id).then(res=>{
-			formData.value=res
-			formData.value.planTime=[formData.value.startDate,formData.value.endDate]
-			formData.value.enterprises=res.enterpriseIdes
-      formData.value.tags=res.taskTagIdes.map(t=>t.tagId)
-		})
-	}
+function init() {
+  if (query.id) {
+    TaskInfoApi.getTaskInfo(query.id).then((res) => {
+      formData.value = res
+      formData.value.planTime = [formData.value.startDate, formData.value.endDate]
+      formData.value.enterprises = res.enterpriseIdes
+      formData.value.tags = res.taskTagIdes.map((t) => t.tagId)
+    })
+  }
 }
 getEnterPriseList()
 getTagList()
-onMounted(()=>{
-	init()
+onMounted(() => {
+  init()
 })
 </script>
 <style scoped lang="scss">

From 15d094d934224085248c2d5e5db6bc361fa02771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
 =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Thu, 20 Mar 2025 16:04:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E6=A1=86=E5=92=8C=E7=BC=96=E8=BE=91=E5=99=A8=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E8=B0=83=E6=95=B4=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=92=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialog/src/Dialog.vue   |   8 +-
 src/components/Editor/src/Editor.vue   |  22 +++-
 src/styles/variables.scss              |   6 +
 src/utils/formatTime.ts                |  10 +-
 src/views/system/policy/PolicyForm.vue |  64 ++++++---
 src/views/system/policy/index.vue      | 174 +++++++++++--------------
 src/views/system/taglibrary/index.vue  |  26 +++-
 7 files changed, 171 insertions(+), 139 deletions(-)

diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index b0d81dd..2c17995 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -12,7 +12,7 @@ const props = defineProps({
   width: propTypes.oneOfType([String, Number]).def('40%'),
   scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话，按照 maxHeight 设置最大高度
   maxHeight: propTypes.oneOfType([String, Number]).def('400px'),
-
+	top: propTypes.string.def('15vh')
 })
 
 const getBindValue = computed(() => {
@@ -29,9 +29,7 @@ const getBindValue = computed(() => {
 
 const isFullscreen = ref(false)
 
-const toggleFull = () => {
-  isFullscreen.value = !unref(isFullscreen)
-}
+
 
 const dialogHeight = ref(isNumber(props.maxHeight) ? `${props.maxHeight}px` : props.maxHeight)
 
@@ -67,6 +65,7 @@ const dialogStyle = computed(() => {
     lock-scroll
     class="com-dialog"
     :show-close="false"
+    :top="top"
   >
     <template #header="{ close }">
       <div class="relative h-54px flex items-center justify-between pl-15px pr-15px">
@@ -115,7 +114,6 @@ const dialogStyle = computed(() => {
     }
 
     &__body {
-      padding: 15px !important;
     }
 
     &__footer {
diff --git a/src/components/Editor/src/Editor.vue b/src/components/Editor/src/Editor.vue
index 3a88a3f..620b27c 100644
--- a/src/components/Editor/src/Editor.vue
+++ b/src/components/Editor/src/Editor.vue
@@ -89,9 +89,8 @@ const editorConfig = computed((): IEditorConfig => {
       },
       autoFocus: false,
       scroll: true,
-    
-      MENU_CONF: {
 
+      MENU_CONF: {
         ['uploadImage']: {
           server: getUploadUrl(),
           // 单个文件的最大体积限制，默认为 2M
@@ -229,13 +228,15 @@ defineExpose({
 </script>
 
 <template>
-  <div class="border-0 border-solid border-[var(--tags-view-border-color)] z-10">
+  <div
+    class="border-solid border-1 border-#dcdfe6 border-rounded-4px overflow-hidden z-10 pl-2px pr-2px"
+  >
     <!-- 工具栏 -->
     <Toolbar
       v-if="getShowToolbar"
       :editor="editorRef"
       :editorId="editorId"
-      class="border-0 b-b-1 border-solid border-[var(--tags-view-border-color)]"
+      class="border-0 b-b-1 border-solid border-#303133"
     />
     <!-- 编辑器 -->
     <Editor
@@ -245,8 +246,21 @@ defineExpose({
       :style="editorStyle"
       @on-change="handleChange"
       @on-created="handleCreated"
+      class="scroll-block-none wgEdit"
     />
   </div>
 </template>
 
 <style src="@wangeditor/editor/dist/css/style.css"></style>
+
+<style scoped>
+.wgEdit >>> .w-e-scroll::-webkit-scrollbar {
+  width: 4px !important;
+  //height: 8px !important;
+}
+.wgEdit >>> .w-e-scroll::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6 !important;
+  border-radius: 10px !important;
+  box-shadow: none !important;
+}
+</style>
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 8b1c97e..91f085f 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -5,6 +5,7 @@ $elNamespace: el;
 
 .el-form--inline {
   display: flex;
+  flex-flow: row wrap;
   gap: 40px;
   margin-bottom: 0;
   .el-form-item {
@@ -23,3 +24,8 @@ $elNamespace: el;
     color: #909399;
   }
 }
+
+.el-pagination--large .btn-next, .el-pagination--large .btn-prev, .el-pagination--large .el-pager li{
+  height: fit-content;
+  line-height: normal;
+}
diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts
index 5ca4b10..234b3d3 100644
--- a/src/utils/formatTime.ts
+++ b/src/utils/formatTime.ts
@@ -1,4 +1,5 @@
 import dayjs from 'dayjs'
+import 'dayjs/locale/zh-cn'
 import type { TableColumnCtx } from 'element-plus'
 
 /**
@@ -69,7 +70,7 @@ export function formatDate(date: Date, format?: string): string {
     return ''
   }
   // 日期存在，则进行格式化
-  return date ? dayjs(date).format(format ?? 'YYYY-MM-DD HH:mm:ss') : ''
+  return date ? dayjs(date).locale('zh-cn').format(format ?? 'YYYY-MM-DD HH:mm:ss') : ''
 }
 
 /**
@@ -198,7 +199,7 @@ export function formatPast2(ms: number): string {
  * @param cellValue 字段值
  */
 export function dateFormatter(_row: any, _column: TableColumnCtx<any>, cellValue: any): string {
-  return cellValue ? formatDate(cellValue) : ''
+  return cellValue ? formatDate(cellValue, 'YYYY年MM月DD日 A') : ''
 }
 
 /**
@@ -209,10 +210,9 @@ export function dateFormatter(_row: any, _column: TableColumnCtx<any>, cellValue
  * @param cellValue 字段值
  */
 export function dateFormatter2(_row: any, _column: TableColumnCtx<any>, cellValue: any): string {
-  return cellValue ? formatDate(cellValue, 'YYYY-MM-DD') : ''
+  return cellValue ? formatDate(cellValue, 'YYYY年MM月DD日') : ''
 }
 
-
 /**
  * element plus 的时间 Formatter 实现，使用 YYYY年MM月DD日 格式
  *
@@ -224,8 +224,6 @@ export function dateFormatter3(_row: any, _column: TableColumnCtx<any>, cellValu
   return cellValue ? formatDate(cellValue, 'YYYY年MM月DD日') : ''
 }
 
-
-
 /**
  * 设置起始日期，时间为00:00:00
  * @param param 传入日期
diff --git a/src/views/system/policy/PolicyForm.vue b/src/views/system/policy/PolicyForm.vue
index 878ff93..86fed30 100644
--- a/src/views/system/policy/PolicyForm.vue
+++ b/src/views/system/policy/PolicyForm.vue
@@ -1,31 +1,41 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="80%" >
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="65vw" top="5vh">
     <el-form
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
       v-loading="formLoading"
+      class="policyForm"
     >
-      <el-form-item label="名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入名称" />
-      </el-form-item>
-      <el-form-item label="生效日期" prop="effectiveDate">
-        <el-date-picker
-          v-model="formData.effectiveDate"
-          type="date"
-          placeholder="请选择生效日期"
-          value-format="YYYY-MM-DD"        
-          :default-value="new Date()"
-        />
-      </el-form-item>
-      <el-form-item label="内容" prop="context">
-        <Editor v-model="formData.context" height="350px" />
-      </el-form-item>
+      <section class="flex flex-wrap gap-18px">
+        <el-form-item label="标题名称" prop="name" class="w-[calc(100%/2-10px)]">
+          <el-input v-model="formData.name" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="生效日期" prop="effectiveDate" class="w-[calc(100%/2-10px)]">
+          <el-date-picker
+            v-model="formData.effectiveDate"
+            type="date"
+            placeholder="请选择生效日期"
+            value-format="YYYY-MM-DD"
+            :default-value="new Date()"
+            class="!w100%"
+          />
+        </el-form-item>
+        <el-form-item label="内容详细" prop="context" class="w100%">
+          <Editor v-model="formData.context" height="350px" class="!w100%" />
+        </el-form-item>
+      </section>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-popconfirm title="是否确定删除当前政策法规？" @confirm="deletePolicy" width="230">
+        <template #reference>
+          <el-button type="danger" v-if="formType == 'update'" link class="underline">
+            我要删除
+          </el-button>
+        </template>
+      </el-popconfirm>
       <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
     </template>
   </Dialog>
 </template>
@@ -107,4 +117,20 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+
+const deletePolicy=()=>{
+	PolicyApi.deletePolicy(formData.value.id).then(()=>{
+		message.success(t('common.delSuccess'))
+		dialogVisible.value = false
+		emit('success')
+	})
+}
+</script>
+
+<style scoped lang="scss">
+.policyForm {
+  ::v-deep(.el-form-item--large) {
+    margin-bottom: 0;
+  }
+}
+</style>
diff --git a/src/views/system/policy/index.vue b/src/views/system/policy/index.vue
index bd17963..3fb00da 100644
--- a/src/views/system/policy/index.vue
+++ b/src/views/system/policy/index.vue
@@ -1,107 +1,83 @@
 <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="effectiveDate"  :formatter="dateFormatter2" />
-
-      <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']"
-          >
-            编辑
+    <section class="flex flex-col gap-20px">
+      <!-- 搜索工作栏 -->
+      <el-form :model="queryParams" ref="queryFormRef" :inline="true" @submit.prevent>
+        <el-form-item prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入名称"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQuery" type="primary" plain>
+            <Icon icon="ep:search" class="mr-5px" /> 查询
           </el-button>
+          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        </el-form-item>
+        <el-form-item class="ml-auto">
           <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['system:policy:delete']"
+            type="primary"
+            @click="openForm('create')"
+            v-hasPermi="['system:policy:create']"
           >
-            删除
+            <Icon icon="ep:circle-plus" class="mr-5px" /> 新增
           </el-button>
           <el-button
-            link
-            type="primary"
-            @click="clickOpenDetail(scope.row.id)"
-            
+            @click="handleExport"
+            :loading="exportLoading"
+            v-hasPermi="['system:policy:export']"
           >
-            详情
+            <Icon icon="ep:download" class="mr-5px" /> 导出
           </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true">
+        <el-table-column label="名称" prop="name" />
+        <el-table-column
+          label="生效日期"
+          prop="effectiveDate"
+          :formatter="dateFormatter2"
+          width="320"
+        />
+        <el-table-column label="发布人" width="320">
+          <template #default="{ row }">
+            {{ `${row.createName} | ${row.createDeptName}` }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="创建时间"
+          prop="createTime"
+          :formatter="dateFormatter"
+          width="320"
+        />
+        <el-table-column label="操作选项" align="center" width="120px">
+          <template #default="scope">
+            <el-button
+              link
+              type="primary"
+              @click="openForm('update', scope.row.id)"
+              v-hasPermi="['system:policy:update']"
+            >
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <el-pagination
+        :total="total"
+        :show-page-size="false"
+        layout="total, prev, pager, next"
+        v-model:current-page="queryParams.pageNo"
+        v-model:page-size="queryParams.pageSize"
+        @change="getList"
+        class="ml-auto"
+      />
+    </section>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -109,7 +85,7 @@
 </template>
 
 <script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { PolicyApi, PolicyVO } from '@/api/system/policy'
 import PolicyForm from './PolicyForm.vue'
@@ -127,7 +103,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   name: undefined,
-  createTime: [],
+  createTime: []
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -145,7 +121,7 @@ const getList = async () => {
 }
 
 const clickOpenDetail = (id: number) => {
-  console.log(id);
+  console.log(id)
   window.open(`/policyDetail?id=${id}`, '_blank')
 }
 
@@ -199,4 +175,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/taglibrary/index.vue b/src/views/system/taglibrary/index.vue
index a9abf8a..c9b5760 100644
--- a/src/views/system/taglibrary/index.vue
+++ b/src/views/system/taglibrary/index.vue
@@ -1,18 +1,26 @@
 <template>
   <ContentWrap>
     <section class="flex flex-col gap-20px">
-      <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="68px"
+        @submit.prevent
+      >
         <el-form-item label="" prop="tagName">
           <el-input
             v-model="queryParams.tagName"
             placeholder="请输入标签的名称"
             clearable
-            @keyup.enter="handleQuery"
+            @keyup.enter.prevent="handleQuery"
             class="!w-240px"
           />
         </el-form-item>
         <el-form-item label="">
-          <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-8px" /> 搜索</el-button>
+          <el-button @click="handleQuery" type="primary" plain
+            ><Icon icon="ep:search" class="mr-8px" /> 查询
+          </el-button>
           <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-8px" /> 重置</el-button>
           <el-button
             type="success"
@@ -30,13 +38,18 @@
           </el-button>
         </el-form-item>
       </el-form>
-      <el-table :data="list">
+      <el-table :data="list" size="large">
         <el-table-column label="父级标签" prop="parentName" />
         <el-table-column label="标签名称" prop="tagName" />
         <el-table-column label="排列顺序" prop="sort" />
-        <el-table-column label="操作选项" align="right">
+        <el-table-column label="操作选项" align="center" width="100">
           <template #default="{ row }">
-            <el-button type="text" @click="openForm(row.id)"> 编辑 </el-button>
+            <section
+              class="color-#409EFF cursor-pointer hover--font-bold"
+              @click="openForm(row.id)"
+            >
+              编辑
+            </section>
           </template>
         </el-table-column>
       </el-table>
@@ -47,6 +60,7 @@
         v-model:current-page="queryParams.pageNo"
         v-model:page-size="queryParams.pageSize"
         class="ml-auto"
+        @change="getList"
       />
     </section>
   </ContentWrap>