From ff550e0ffd42d2d110603c24859b047db981a2a8 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Thu, 24 Oct 2024 19:29:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/home/homeimg/index.ts      |  16 +++--
 src/views/Home/Index.vue           |  78 ++++++++++++----------
 src/views/Home/homeimg/imgForm.vue | 102 +++++++++++++++++++++--------
 src/views/Home/homeimg/index.vue   |  42 ++++++------
 4 files changed, 147 insertions(+), 91 deletions(-)

diff --git a/src/api/home/homeimg/index.ts b/src/api/home/homeimg/index.ts
index cde3c58..09629d9 100644
--- a/src/api/home/homeimg/index.ts
+++ b/src/api/home/homeimg/index.ts
@@ -2,14 +2,16 @@ import request from '@/config/axios'
 
 // 公告管理 VO
 export interface imgVO {
-  imgId: number // 公告id
-  imgName: string // 公告名称
-  imgCreatetime: Date // 发布时间
-  imgImg: string // 轮换图片
-  imgContent: string // 发布内容
+  id: number // 公告id
+  newsName: string // 公告名称
+  newsCreatetime: Date // 发布时间
+  newsImg: string // 轮换图片
+  newsContent: string // 发布内容
   contentType: number // 公告分类
-  imgStatus: number // 公告图片状态
-  contentStatus: number // 公告状态
+  newsStatus: number // 公告图片状态
+  status: number // 公告状态
+  deptId: number // 公告状态
+  userId: number // 部门id
 }
 
 // 公告管理 API
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index add85b7..07b5646 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -20,14 +20,14 @@
         <el-skeleton :loading="loading" animated>
           <el-card shadow="never" style="margin-bottom: 5px;height: 330px">
             <el-carousel :interval="4000" height="300px" motion-blur @change="handleCarouselChange">
-              <el-carousel-item v-for="item in filteredList"  :key="item.imgId">
-                <el-image  style="width: 100%; height: 100%" :src="imgUrl+item.imgImg" alt="无图片" :title="item.imgName"/>
+              <el-carousel-item v-for="item in filteredList"  :key="item.Id">
+                <el-image  style="width: 100%; height: 100%" :src="imgUrl+item.newsImg" alt="无图片" :title="item.newsName"/>
               </el-carousel-item>
             </el-carousel>
           </el-card>
           <el-row>
             <el-col :span="24">
-              <span class="ellipsis" v-if="filteredList[pageNo - 1]">{{filteredList[pageNo-1].imgName}}</span>
+              <span class="ellipsis" v-if="filteredList[pageNo - 1]">{{filteredList[pageNo-1].newsName}}</span>
             </el-col>
           </el-row>
         </el-skeleton>
@@ -220,12 +220,12 @@
           <div v-for="(item, index) in filteredList2" :key="`dynamics-${index}`">
             <div class="flex items-center">
               <div>
-                <div class="text-14px" @click="openDialog(item.contentType,item.imgId)">
+                <div class="text-14px" @click="openDialog(item.contentType,item.id)">
                   <dict-tag :type="DICT_TYPE.HOME_CONTENT_STATUS" :value="item.contentType" /> :
-                  {{ item.imgName }}
+                  {{ item.newsName }}
                 </div>
                 <div class="text-12px text-gray-400">
-                  {{ formatTime(item.imgCreatetime, 'yyyy-MM-dd') }}
+                  {{ formatTime(item.newsCreatetime, 'yyyy-MM-dd') }}
                 </div>
               </div>
             </div>
@@ -303,11 +303,11 @@
   <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 85%">
     <el-form >
       <el-form-item >
-        <span style="font-size: 20px; font-weight: bold;">{{formData.imgName}}</span>
+        <span style="font-size: 20px; font-weight: bold;">{{formData.newsName}}</span>
         <el-divider style="border-top: none; margin: 0;"/>
-        <span style="font-size: 12px">发布时间: {{formatTime(formData.imgCreatetime,'yyyy-MM-dd')}}</span>
+        <span style="font-size: 12px">发布时间: {{formatTime(formData.newsCreatetime,'yyyy-MM-dd')}}</span>
         <el-divider style="margin-top: 10px"/>
-        <span style="line-height: 1.2" v-html="formData.imgContent"></span>
+        <span style="line-height: 1.2" v-html="formData.newsContent"></span>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -414,14 +414,16 @@ const getTodo = async () => {
   todo = Object.assign(todo, data)
 }
 const formData = ref({
-  imgId: undefined,
-  imgName: undefined,
-  imgCreatetime: new Date(),
-  imgImg: [],
-  imgContent: undefined,
+  id: undefined,
+  newsName: undefined,
+  newsCreatetime: undefined,
+  newsImg: [],
+  newsContent: undefined,
   contentType: undefined,
-  imgStatus: undefined,
-  contentStatus: undefined,
+  newsStatus: undefined,
+  status: undefined,
+  deptId: undefined,
+  userId: undefined,
 })
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
@@ -435,39 +437,43 @@ const openDialog = async (type:number,id?:number) => {
 }
 /** 重置表单 */
 const resetForm = () => {
-    formData.value = {
-      imgId: undefined,
-      imgName: undefined,
-      imgCreatetime: new Date(),
-      imgImg: [],
-      imgContent: undefined,
-      contentType: undefined,
-      imgStatus: undefined,
-      contentStatus: undefined,
-    }
+  formData.value = {
+    Id: undefined,
+    newsName: undefined,
+    newsCreatetime: undefined,
+    newsImg: undefined,
+    newsContent: undefined,
+    contentType: undefined,
+    newsStatus: undefined,
+    status: undefined,
+    deptId: undefined,
+    userId: undefined,
+  }
   }
 const filteredList = computed(() => {
-  return imgList.value.filter(item => item.imgStatus !== 0 && item.contentStatus!==0);
+  return imgList.value.filter(item => item.newsStatus !== 0 && item.status!==0);
 });
 // const filteredList2 = computed(() => {
 //   return imgList.value.filter(item => item.contentStatus !== 0 );
 // });
 const filteredList2 = computed(() => {
   return imgList.value
-    .filter(item => item.contentStatus !== 0)
+    .filter(item => item.status !== 0)
     .slice(0, 3); // 限制只显示前3条
 });
 const queryParamsImg = reactive({
   pageNo: 1,
-  pageSize: 20,
-  imgId: undefined,
-  imgName: undefined,
-  imgCreatetime: [],
-  imgImg: undefined,
-  imgContent: undefined,
+  pageSize: 10,
+  id: undefined,
+  newsName: undefined,
+  newsCreatetime: [],
+  newsImg: undefined,
+  newsContent: undefined,
   contentType: undefined,
-  imgStatus: undefined,
-  contentStatus: undefined,
+  newsStatus: undefined,
+  status: undefined,
+  deptId: undefined,
+  userId: undefined,
   createTime: [],
 })
 const imgUrl = "//images.weserv.nl/?url="
diff --git a/src/views/Home/homeimg/imgForm.vue b/src/views/Home/homeimg/imgForm.vue
index 0964ca9..c94632e 100644
--- a/src/views/Home/homeimg/imgForm.vue
+++ b/src/views/Home/homeimg/imgForm.vue
@@ -7,13 +7,27 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="新闻名称" prop="imgName">
-        <el-input v-model="formData.imgName" placeholder="请输入新闻名称" />
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="部门" prop="deptId">
+            <div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo?.name }} </div>
+            <div class="pull-left" v-show="true" v-if="!deptInfo">获取失败 </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="用户" prop="userId">
+            <div class="pull-left" v-show="true" v-if="userInfo">{{ userInfo}} </div>
+            <div class="pull-left" v-show="true" v-if="!userInfo">获取失败 </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="新闻名称" prop="newsName">
+        <el-input v-model="formData.newsName" placeholder="请输入新闻名称" />
       </el-form-item>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="图片状态" prop="imgStatus">
-            <el-radio-group v-model="formData.imgStatus" placeholder="请选择图片状态">
+          <el-form-item label="图片状态" prop="newsStatus">
+            <el-radio-group v-model="formData.newsStatus" placeholder="请选择图片状态">
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.HOME_IMG_STATUS)"
                 :key="dict.value"
@@ -24,8 +38,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="新闻状态" prop="contentStatus">
-            <el-radio-group v-model="formData.contentStatus" placeholder="请选择新闻状态">
+          <el-form-item label="新闻状态" prop="status">
+            <el-radio-group v-model="formData.status" placeholder="请选择新闻状态">
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.HOME_CONTENT)"
                 :key="dict.value"
@@ -38,9 +52,9 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="发布时间" prop="imgCreatetime">
+          <el-form-item label="发布时间" prop="newsCreatetime">
             <el-date-picker
-              v-model="formData.imgCreatetime"
+              v-model="formData.newsCreatetime"
               type="date"
               value-format="x"
               placeholder="选择发布时间"
@@ -60,11 +74,11 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="轮换图片" prop="imgImg">
-        <UploadImg v-model="formData.imgImg" />
+      <el-form-item label="轮换图片" prop="newsImg">
+        <UploadImg v-model="formData.newsImg" />
       </el-form-item>
-      <el-form-item label="发布内容" prop="imgContent">
-        <Editor v-model="formData.imgContent" height="150px" />
+      <el-form-item label="发布内容" prop="newsContent">
+        <Editor v-model="formData.newsContent" height="150px" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -76,6 +90,8 @@
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { imgApi, imgVO } from '@/api/home/homeimg'
+import {DeptVO, getDept} from "@/api/system/dept";
+import {getUserProfile} from "@/api/system/user/profile";
 
 /** 新闻管理 表单 */
 defineOptions({ name: 'imgForm' })
@@ -87,15 +103,41 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const deptInfo = ref({} as DeptVO ) // 部门信息
+const userInfo = ref('') // 用户名字
+
+//获取用户部门
+const getUserInfo = async () => {
+  const user = await getUserProfile();
+  console.log("user",user)
+  if (formData.value.deptId == ''||formData.value.deptId == undefined){
+    formData.value.deptId = user.dept.id
+  }
+  if (formData.value.userId == ''||formData.value.userId == undefined){
+    console.log("user",user)
+    formData.value.userId = user.id
+  }
+  if (formData.value.deptId != undefined){
+    console.log("deptId",formData.value.deptId)
+    deptInfo.value = await getDept(formData.value.deptId)
+    console.log("deptInfo",deptInfo.value)
+  }
+  if (user != undefined){
+    userInfo.value = user.nickname
+  }
+  console.log("formData",formData.value)
+}
 const formData = ref({
-  imgId: undefined,
-  imgName: undefined,
-  imgCreatetime: undefined,
-  imgImg: [],
-  imgContent: undefined,
+  id: undefined,
+  newsName: undefined,
+  newsCreatetime: undefined,
+  newsImg: [],
+  newsContent: undefined,
   contentType: undefined,
-  imgStatus: undefined,
-  contentStatus: undefined,
+  newsStatus: undefined,
+  status: undefined,
+  deptId: undefined,
+  userId: undefined,
 })
 const formRules = reactive({
   imgName: [{ required: true, message: '新闻名称不能为空', trigger: 'blur' }],
@@ -122,6 +164,8 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+
+  await getUserInfo()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -133,8 +177,8 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    if (formData.value.imgImg.length==2){
-      formData.value.imgImg=formData.value.imgImg[1]
+    if (formData.value.newsImg.length==2){
+      formData.value.newsImg=formData.value.newsImg[1]
     }
     const data = formData.value as unknown as imgVO
     if (formType.value === 'create') {
@@ -155,14 +199,16 @@ const submitForm = async () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    imgId: undefined,
-    imgName: undefined,
-    imgCreatetime: undefined,
-    imgImg: undefined,
-    imgContent: undefined,
+    id: undefined,
+    newsName: undefined,
+    newsCreatetime: undefined,
+    newsImg: undefined,
+    newsContent: undefined,
     contentType: undefined,
-    imgStatus: undefined,
-    contentStatus: undefined,
+    newsStatus: undefined,
+    status: undefined,
+    deptId: undefined,
+    userId: undefined,
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/Home/homeimg/index.vue b/src/views/Home/homeimg/index.vue
index f658352..6ac3e8f 100644
--- a/src/views/Home/homeimg/index.vue
+++ b/src/views/Home/homeimg/index.vue
@@ -17,9 +17,9 @@
 <!--          class="!w-240px"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="新闻名称" prop="imgName">
+      <el-form-item label="新闻名称" prop="newsName">
         <el-input
-          v-model="queryParams.imgName"
+          v-model="queryParams.newsName"
           placeholder="请输入新闻名称"
           clearable
           @keyup.enter="handleQuery"
@@ -67,9 +67,9 @@
 <!--          />-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-      <el-form-item label="新闻状态" prop="contentStatus">
+      <el-form-item label="新闻状态" prop="status">
         <el-select
-          v-model="queryParams.contentStatus"
+          v-model="queryParams.status"
           placeholder="请选择新闻状态"
           clearable
           class="!w-240px"
@@ -121,7 +121,7 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column width="70" label="序号" align="center" type="index" />
-      <el-table-column label="新闻名称" align="center" prop="imgName" />
+      <el-table-column label="新闻名称" align="center" prop="newsName" />
 <!--      <el-table-column-->
 <!--        label="发布时间"-->
 <!--        align="center"-->
@@ -135,20 +135,20 @@
           <dict-tag :type="DICT_TYPE.HOME_CONTENT_STATUS" :value="scope.row.contentType" />
         </template>
       </el-table-column>
-      <el-table-column label="新闻图片状态" align="center" prop="imgStatus">
+      <el-table-column label="新闻图片状态" align="center" prop="newsStatus">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.HOME_IMG_STATUS" :value="scope.row.imgStatus" />
+          <dict-tag :type="DICT_TYPE.HOME_IMG_STATUS" :value="scope.row.newsStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="新闻状态" align="center" prop="contentStatus">
+      <el-table-column label="新闻状态" align="center" prop="status">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.HOME_CONTENT" :value="scope.row.contentStatus" />
+          <dict-tag :type="DICT_TYPE.HOME_CONTENT" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="图片预览" align="center" prop="imgImg" >
+      <el-table-column label="图片预览" align="center" prop="newsImg" >
         <template #default="scope">
           <el-image
-            :src="imgUrl+scope.row.imgImg"
+            :src="imgUrl+scope.row.newsImg"
             style="width: 60px;height: 20px"
             alt="无图片"/>
         </template>
@@ -165,7 +165,7 @@
           <el-button
             link
             type="primary"
-            @click="openForm('update', scope.row.imgId)"
+            @click="openForm('update', scope.row.id)"
             v-hasPermi="['home:img:update']"
           >
             编辑
@@ -173,7 +173,7 @@
           <el-button
             link
             type="danger"
-            @click="handleDelete(scope.row.imgId)"
+            @click="handleDelete(scope.row.id)"
             v-hasPermi="['home:img:delete']"
           >
             删除
@@ -215,14 +215,16 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  imgId: undefined,
-  imgName: undefined,
-  imgCreatetime: [],
-  imgImg: undefined,
-  imgContent: undefined,
+  id: undefined,
+  newsName: undefined,
+  newsCreatetime: [],
+  newsImg: undefined,
+  newsContent: undefined,
   contentType: undefined,
-  imgStatus: undefined,
-  contentStatus: undefined,
+  newsStatus: undefined,
+  status: undefined,
+  deptId: undefined,
+  userId: undefined,
   createTime: [],
 })
 const queryFormRef = ref() // 搜索的表单