From 724c252ed0e857690ace361304f382e561b17356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=BA=A2=E4=B8=BD?= <1181930680@qq.com>
Date: Mon, 23 Sep 2024 14:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=8E=A8=E8=8D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/layoutItem/article/columns2.ts    | 59 +++++++++++++++++++
 .../content/layoutItem/article/index.vue      | 25 ++++++--
 .../layoutItem/article/querySchemas2.ts       | 49 +++++++++++++++
 src/views/content/layoutItem/edit.vue         | 10 +++-
 4 files changed, 137 insertions(+), 6 deletions(-)
 create mode 100644 src/views/content/layoutItem/article/columns2.ts
 create mode 100644 src/views/content/layoutItem/article/querySchemas2.ts

diff --git a/src/views/content/layoutItem/article/columns2.ts b/src/views/content/layoutItem/article/columns2.ts
new file mode 100644
index 0000000..a8382f0
--- /dev/null
+++ b/src/views/content/layoutItem/article/columns2.ts
@@ -0,0 +1,59 @@
+import { h } from 'vue';
+import { ElTag } from 'element-plus';
+
+export const columns2 = [
+  {
+    label: '标题',
+    prop: 'title',
+    width: 300,
+  },
+  {
+    label: '类型',
+    prop: 'type',
+    // render(record) {
+    //   return h('span', record.row.type === 1 ? '通知' : '公告');
+    // },
+    render(record) {
+      return h(
+        ElTag,
+        {
+          type: record.row.type == 1 ? 'primary' : 'warning',
+        },
+        {
+          default: () => (record.row.type == 1 ? '通知' : '公告'),
+        },
+      );
+    },
+  },
+  {
+    label: '状态',
+    prop: 'status',
+    // render(record) {
+    //   return h('span', record.row.status === 1 ? '正常' : '关闭')
+    // },
+    render(record) {
+      return h(
+        ElTag,
+        {
+          type: record.row.status ==1 ? 'success' : 'danger',
+        },
+        {
+          default: () => (record.row.status ==1 ? '正常' : '禁用'),
+        },
+      );
+    },
+  },
+  {
+    label: '点击率',
+    prop: 'clickNum',
+  },
+  {
+    label: '创建人',
+    prop: 'createUser',
+  },
+  {
+    label: '创建时间',
+    prop: 'createTime',
+    width: 180,
+  },
+];
diff --git a/src/views/content/layoutItem/article/index.vue b/src/views/content/layoutItem/article/index.vue
index 819197c..fc7f2d5 100644
--- a/src/views/content/layoutItem/article/index.vue
+++ b/src/views/content/layoutItem/article/index.vue
@@ -4,13 +4,14 @@
       title="选择文章"
       :close-on-click-modal="false"
       :before-close="dialogClose"
+      style="margin-top:20px;"
   >
   <el-card  class="pt-3 mb-3 proCard">
       <BasicForm @register="register" @submit="handleSubmit" @reset="handleReset"></BasicForm>
     </el-card>
   <el-card >
       <BasicTable
-        :columns="columns"
+        :columns="type==1?columns:columns2"
         :request="loadDataTable"
         ref="tableRef"
         highlight-current-row
@@ -28,12 +29,15 @@
 </template>
 <script lang="ts" setup>
 import { getArticleList } from '@/api/content/article';
+import { getNoticeList } from '@/api/data/notice';
 import {onMounted, reactive,ref} from "vue";
 import { useForm } from '@/components/Form/index';
 import { ColProps } from 'element-plus';
 import {message} from "@/utils/auth";
 import { columns } from './columns';
+import { columns2 } from './columns2';
 import { schemas } from './querySchemas';
+import { schemas2 } from './querySchemas2';
 
 const emit = defineEmits(["success", "update:visible"]);
 
@@ -42,7 +46,12 @@ const props = defineProps({
     type: Boolean,
     required: true,
     default: false
-  }
+  },
+  type: {
+    type: Number,
+    required: true,
+    default: 1
+  },
 });
 const selectRow = ref({})
 const tableRef = ref();
@@ -63,8 +72,14 @@ const dialogClose = () => {
 };
 
 const loadDataTable = async (res: any) => {
-    const result = await getArticleList({ ...formParams, ...res });
-    return result;
+    let result = []
+    if(props.type==1) {
+      result = await getArticleList({ ...formParams, ...res });
+    } else {
+      result = await getNoticeList({ ...formParams, ...res });
+    }
+
+   return result
   };
   function reloadTable(noRefresh='') {
     tableRef.value.reload(noRefresh?{}:{pageNo:1});
@@ -74,7 +89,7 @@ const loadDataTable = async (res: any) => {
     layout: 'horizontal',
     colProps: { span: 8 } as ColProps,
     submitOnReset:true,
-    schemas
+    schemas:props.type==1?schemas:schemas2
   });
   function handleSubmit(values: Recordable) {
     handleReset()
diff --git a/src/views/content/layoutItem/article/querySchemas2.ts b/src/views/content/layoutItem/article/querySchemas2.ts
new file mode 100644
index 0000000..c647ab0
--- /dev/null
+++ b/src/views/content/layoutItem/article/querySchemas2.ts
@@ -0,0 +1,49 @@
+import { FormSchema } from '@/components/Form/index';
+export const schemas2: FormSchema[] = [
+  {
+    field: 'title',
+    component: 'Input',
+    label: '标题',
+    componentProps: {
+      placeholder: '请输入标题',
+    },
+  },
+  {
+    field: 'type',
+    component: 'Select',
+    label: '类型',
+    componentProps: {
+      placeholder: '请选择类型',
+      clearable: true,
+      options: [
+        {
+          label: '通知',
+          value: '1',
+        },
+        {
+          label: '公告',
+          value: '2',
+        },
+      ],
+    },
+  },
+  {
+    field: 'status',
+    component: 'Select',
+    label: '状态',
+    componentProps: {
+      placeholder: '请选择状态',
+      clearable: true,
+      options: [
+        {
+          label: '正常',
+          value: '1',
+        },
+        {
+          label: '关闭',
+          value: '2',
+        },
+      ],
+    },
+  },
+];
diff --git a/src/views/content/layoutItem/edit.vue b/src/views/content/layoutItem/edit.vue
index 807961c..56cab1a 100644
--- a/src/views/content/layoutItem/edit.vue
+++ b/src/views/content/layoutItem/edit.vue
@@ -28,7 +28,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="推荐文章" prop="typeId"  :rules="{ required: true, message: '请选择推荐文章', trigger: 'blur' }">
-          <el-input v-model="formData.typeText"  placeholder="请选择推荐文章" @click="chooseVisible = true"/>
+          <el-input v-model="formData.typeText"  placeholder="请选择推荐文章" @click="getArticle"/>
         </el-form-item>
       <el-form-item
             label="图片路径"
@@ -57,6 +57,7 @@
     <chooseArticle
         v-if="chooseVisible"
         v-model:visible="chooseVisible"
+        :type="formData.type"
         @success="setArticle"
     >
     </chooseArticle>
@@ -113,6 +114,13 @@ const dialogClose = () => {
 
 const { isLock:subLoading,lockFn: submit } = useLockFn(handleSubmit);
 
+const getArticle=()=>{
+  if(!formData.type) {
+    message("请选择页面类型",'warning');
+    return
+  }
+  chooseVisible.value = true
+}
 const setFormData = async () => {
   const data = await getLayoutDetail(props.layoutId);
   for (const key in formData) {