From 869cfcf8383c5f693c6be1dbad54389cbbe4cf81 Mon Sep 17 00:00:00 2001
From: zjl <xx@163.com>
Date: Mon, 23 Sep 2024 16:55:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B8=83=E5=B1=80=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/content/layoutItem/columns.ts       |  2 +-
 src/views/content/layoutItem/edit.vue         |  8 ++---
 .../{ => layout}/article/columns.ts           | 11 -------
 .../{ => layout}/article/querySchemas.ts      |  0
 .../layoutItem/{article => layout}/index.vue  | 32 ++++++++++++-------
 .../columns2.ts => layout/notice/columns.ts}  |  0
 .../notice/querySchemas.ts}                   |  0
 7 files changed, 26 insertions(+), 27 deletions(-)
 rename src/views/content/layoutItem/{ => layout}/article/columns.ts (67%)
 rename src/views/content/layoutItem/{ => layout}/article/querySchemas.ts (100%)
 rename src/views/content/layoutItem/{article => layout}/index.vue (81%)
 rename src/views/content/layoutItem/{article/columns2.ts => layout/notice/columns.ts} (100%)
 rename src/views/content/layoutItem/{article/querySchemas2.ts => layout/notice/querySchemas.ts} (100%)

diff --git a/src/views/content/layoutItem/columns.ts b/src/views/content/layoutItem/columns.ts
index 59f8d97..154f03f 100644
--- a/src/views/content/layoutItem/columns.ts
+++ b/src/views/content/layoutItem/columns.ts
@@ -15,7 +15,7 @@ export const columns = [
     prop: 'description',
     width: 250,
     render(record) {
-      return record.row.description + ">>" + record.row.location;
+      return record.row.layoutDescription + ">>" + record.row.layoutLocation;
     },
   },
   {
diff --git a/src/views/content/layoutItem/edit.vue b/src/views/content/layoutItem/edit.vue
index f709738..51f2934 100644
--- a/src/views/content/layoutItem/edit.vue
+++ b/src/views/content/layoutItem/edit.vue
@@ -28,8 +28,8 @@
             <el-option label="通知公告" :value="2"></el-option>
           </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="getArticle"/>
+        <el-form-item label="推荐内容" prop="typeId"  :rules="{ required: true, message: '请选择推荐内容', trigger: 'blur' }">
+          <el-input v-model="formData.typeText"  placeholder="请选择推荐内容" @click="getLayoutItem"/>
         </el-form-item>
       <el-form-item
             label="图片路径"
@@ -75,7 +75,7 @@ import {useLockFn} from "@/utils/useLockFn";
 
 const emit = defineEmits(["success", "update:visible"]);
 const chooseArticle = defineAsyncComponent(() =>
-    import('./article/index.vue')
+    import('./layout/index.vue')
 )
 const formRef = shallowRef<FormInstance>();
 const formData = reactive({
@@ -115,7 +115,7 @@ const dialogClose = () => {
 
 const { isLock:subLoading,lockFn: submit } = useLockFn(handleSubmit);
 
-const getArticle=()=>{
+const getLayoutItem=()=>{
   if(!formData.type) {
     message("请选择页面类型",'warning');
     return
diff --git a/src/views/content/layoutItem/article/columns.ts b/src/views/content/layoutItem/layout/article/columns.ts
similarity index 67%
rename from src/views/content/layoutItem/article/columns.ts
rename to src/views/content/layoutItem/layout/article/columns.ts
index 729e8a2..e015552 100644
--- a/src/views/content/layoutItem/article/columns.ts
+++ b/src/views/content/layoutItem/layout/article/columns.ts
@@ -5,22 +5,11 @@ export const columns = [
   {
     label: '文章标题',
     prop: 'title',
-    render(record) {
-      return h('a', {
-        href: 'http://www.baidu.com',
-        target:"_blank"
-      },record.row.title);
-    },
   },
   {
     label: '文章分类',
     prop: 'categoryName',
   },
-  // {
-  //   label: '文章链接',
-  //   value:'articelLink',
-  //   isSlot:true,
-  // },
   {
     label: '文章状态',
     prop: 'status',
diff --git a/src/views/content/layoutItem/article/querySchemas.ts b/src/views/content/layoutItem/layout/article/querySchemas.ts
similarity index 100%
rename from src/views/content/layoutItem/article/querySchemas.ts
rename to src/views/content/layoutItem/layout/article/querySchemas.ts
diff --git a/src/views/content/layoutItem/article/index.vue b/src/views/content/layoutItem/layout/index.vue
similarity index 81%
rename from src/views/content/layoutItem/article/index.vue
rename to src/views/content/layoutItem/layout/index.vue
index 371c4c1..e3c8d07 100644
--- a/src/views/content/layoutItem/article/index.vue
+++ b/src/views/content/layoutItem/layout/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
       v-model="props.visible"
-      title="选择文章"
+      title="选择推荐内容"
       :close-on-click-modal="false"
       :before-close="dialogClose"
       style="margin-top:20px;"
@@ -11,7 +11,7 @@
     </el-card>
   <el-card >
       <BasicTable
-        :columns="type==1?columns:columns2"
+        :columns="columnsType"
         :request="loadDataTable"
         ref="tableRef"
         highlight-current-row
@@ -34,10 +34,10 @@ 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';
+import { columns } from './article/columns';
+import { columns2 } from './notice/columns';
+import { schemas } from './article/querySchemas';
+import { schemas2 } from './notice/querySchemas';
 
 const emit = defineEmits(["success", "update:visible"]);
 
@@ -55,13 +55,23 @@ const props = defineProps({
 });
 const selectRow = ref({})
 const tableRef = ref();
-  const formParams = reactive({
-    title:'',
-    status:''
-  });
+const formParams = reactive({
+  title:'',
+  status:''
+});
+const columnsType =()=>{
+  console.log(1111111)
+  console.log(columns)
+  if(props.type==1){
+    console.log(columns)
+    return columns
+  } else if (props.type==2) {
+    return columns2
+  }
+}
 const handleSubmits = async () => {
    if(!selectRow.value.id) {
-    return message("请选择文章",'error');
+    return message("请选择推荐内容",'error');
    }
     emit("update:visible", false);
     emit("success",selectRow.value);
diff --git a/src/views/content/layoutItem/article/columns2.ts b/src/views/content/layoutItem/layout/notice/columns.ts
similarity index 100%
rename from src/views/content/layoutItem/article/columns2.ts
rename to src/views/content/layoutItem/layout/notice/columns.ts
diff --git a/src/views/content/layoutItem/article/querySchemas2.ts b/src/views/content/layoutItem/layout/notice/querySchemas.ts
similarity index 100%
rename from src/views/content/layoutItem/article/querySchemas2.ts
rename to src/views/content/layoutItem/layout/notice/querySchemas.ts