Merge branch 'main' of http://47.109.205.240:3000/Web/operation-system

src/components/myUploadImage.vue

@@ -24,7 +24,7 @@
 
 
                     <!-- 自定义删除按钮（带文字） -->
-                    <span class="custom-delete-btn" @click.stop="handleDelete(file)">
+                    <span v-if="!disabled" class="custom-delete-btn" @click.stop="handleDelete(file)">
                         <el-icon>
                             <Delete />
                         </el-icon>

src/views/content/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container customer-control">
+  <div class="app-container customer-control" :key="containerKey" >
     <div class="container-custom">
       <!-- 搜索栏 -->
       <div ref="searchBarRef" class="search-box">
@@ -106,9 +106,9 @@
           :rowkey="'id'"
         >
         <!-- 自定义-图片 -->
-          <template #imgPath="slotProps">
+          <template #coverUrl="slotProps">
             <div class="table-cell-img-box">
-              <img :src="slotProps.row.imgPath" class="table-cell-img" alt="" />
+              <img :src="slotProps.row.coverUrl" class="table-cell-img" alt="" />
             </div>
           </template>
           <!-- 自定义-资讯分类 -->
@@ -141,11 +141,14 @@
       </div>
     </div>
     <!-- 添加/编辑 -->
-    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="500" :close-on-click-modal="false">
+    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false">
       <el-form :disabled="disabled" :model="dialogForm" :label-width="'80'" :rules="dialogFormRules" ref="dialogRef">
         <el-form-item label="标题" prop="title">
           <el-input v-model="dialogForm.title" autocomplete="off" placeholder="请输入内容标题" />
         </el-form-item>
+        <el-form-item label="封面" prop="coverUrl">
+          <myUploadImage v-model="dialogForm.coverUrl" :limit="1" :disabled="disabled" ></myUploadImage>
+        </el-form-item>
         <el-form-item label="资讯分类" prop="category">
           <el-select v-model="dialogForm.category" placeholder="请选择资讯分类">
             <el-option
@@ -175,7 +178,7 @@
               :mode="mode"
               :disabled="disabled"
               v-model="dialogForm.content"
-              style="height: 300px; overflow-y: scroll"
+              style="height: 200px; overflow-y: scroll"
               @onCreated="handleCreated"
               @onChange="handleChange"
               @onDestroyed="handleDestroyed"
@@ -189,7 +192,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="onSaveCategory">
+          <el-button v-if="!disabled" type="primary" @click="onSaveCategory">
             保存
           </el-button>
           <el-button @click="cancelDialog">取消</el-button>
@@ -265,6 +268,8 @@ defineExpose({
   handleCreated
 })
 
+const containerKey = ref(0)
+
 const formInline = reactive({
   id: "",
   title: "",//商品名称
@@ -286,6 +291,7 @@ const disabled = ref(false);
 let dialogForm = reactive({
     id: "",
     title: "",
+    coverUrl:"",
     content:"",
     category:"",
     publishLocation:'',
@@ -294,6 +300,9 @@ const dialogFormRules = ref({
     title:  [
         { required: true, message: "请输入品牌名称", trigger: "blur" },
     ],
+    coverUrl:  [
+        { required: true, message: "请上传封面", trigger: "blur" },
+    ],
     content:  [
         { required: true, message: "请输入内容", trigger: "blur" },
     ],
@@ -370,6 +379,7 @@ let nowClickRow = ref({});
 // 列配置
 const columns = ref([
   { prop: "title", label: "标题" },
+  { prop: "coverUrl", label: "封面", slotName: "coverUrl",},
   { prop: "category", label: "资讯分类", slotName: "category",},
   { prop: "publishLocation", label: "发布位置", slotName: "publishLocation",},
   { prop: "createTime", label: "发布日期",},
@@ -383,7 +393,7 @@ const getHeaderClass = ({ column }) => {
 };
 // 分页变化
 const handlePaginationChange = ({ page, pageSize }) => {
-  console.log("分页变化:", page, pageSize);
+  // console.log("分页变化:", page, pageSize);
   formInline.current = page;
   formInline.size = pageSize;
   // 这里可以调用API获取新数据
@@ -391,7 +401,7 @@ const handlePaginationChange = ({ page, pageSize }) => {
 };
 // 多选框变化
 const handleSelectionChange = (selection) => {
-  console.log("选中项:", selection);
+  // console.log("选中项:", selection);
   selectedIds.value = [];
   selection.forEach(element => {
     selectedIds.value.push(element.id);
@@ -415,7 +425,7 @@ const batchDelete = async () => {
   
 };
 const deleteGoods = async (param) => {
-  console.log("批量删除参数:", param);
+  // console.log("批量删除参数:", param);
   
   try {
     tableLoading.value = true;
@@ -448,31 +458,27 @@ resetDlg();
 };
 //提交保存
 const onSaveCategory = async () => { 
-  console.log('dialogForm',dialogForm);
-  
   dialogRef.value.validate(async (valid) => { 
     if (valid) { 
-        if(isADD.value){
+      if(isADD.value){
-            let response = await addConten(dialogForm);
+        let response = await addConten(dialogForm);
-            if (response.code === 200) {
+        if (response.code === 200) {
-                dialogFormVisible.value = false;
+          dialogFormVisible.value = false;
-                ElMessage.success("新增成功！");
+          ElMessage.success("新增成功！");
-                dialogRef.value.resetFields();
+          dialogRef.value.resetFields();
-                loadData();
+          containerKey.value++ // 修改 key 值强制刷新
-            } else {
+          loadData();
-                ElMessage.error(response.message);
-            }
-        }else{ 
-            let response = await updateInformation(dialogForm);
-            if (response.code === 200) {
-                dialogFormVisible.value = false;
-                ElMessage.success("编辑成功！");
-                dialogRef.value.resetFields();
-                loadData();
-            } else {
-                ElMessage.error(response.message);
-            }
         }
+      } else { 
+        let response = await updateInformation(dialogForm);
+        if (response.code === 200) {
+          dialogFormVisible.value = false;
+          ElMessage.success("编辑成功！");
+          dialogRef.value.resetFields();
+          containerKey.value++ // 修改 key 值强制刷新
+          loadData();
+        }
+      }
     }
   });
 };