推荐管理、发布管理、统计模块完善+微调

src/api/service/recommend/index.ts

@@ -7,6 +7,8 @@ import { pixelUrlHost } from '/@/api/baseUrlHost';
  * 
  * 登录api接口集合
  * @method getRecommendList 获取推荐作品列表
+ * @method saveRecommend 保存推荐作品
+ * @method deleteRecommend 删除推荐作品
  */
 
 export function recommendApi() {
@@ -18,5 +20,18 @@ export function recommendApi() {
 				params,
 			});
 		},
+		saveRecommend: (data: object) => {
+			return request({
+				url: pixelUrlHost + '/paRecommend',
+				method: 'post',
+				data,
+			})
+		},
+		deleteRecommend: (id: Number) => {
+			return request({
+				url: pixelUrlHost + `/paRecommend/${id}`,
+				method: 'delete',
+			})
+		}
 	};
 }

src/views/article/index.vue

@@ -74,7 +74,7 @@
 </template>
 
 <script setup lang="ts" name="article">
-import { onMounted, reactive, ref } from 'vue';
+import { onActivated, onMounted, reactive, ref } from 'vue';
 import { articleApi } from '/@/api/article';
 import { ElMessage, ElMessageBox, TableColumnCtx } from 'element-plus';
 import { useRouter } from 'vue-router';
@@ -255,6 +255,10 @@ const onHandleCurrentChange = (val: number) => {
 	getTableData();
 };
 
+onActivated(() => {
+	getTableData();
+})
+
 onMounted(() => {
 	getTableData();
 	getModuleList();

src/views/service/apply/dialog.vue

@@ -72,7 +72,7 @@
 					<el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16" class="mb20" v-if="state.data.options&&state.data.options.length>0">
 						<el-form-item label="选项：">
 							<div class="tags-option">
-								<el-tag v-for="option in state.data.options" :key="option.id" :disable-transitions="false">{{ option.optionName }}</el-tag>
+								<el-tag v-for="option in state.data.options" :title="option.optionName" :key="option.id" :disable-transitions="false">{{ option.optionName }}</el-tag>
 							</div>
 						</el-form-item>
 					</el-col>
@@ -119,7 +119,7 @@ const state:any = reactive({
 		name: { required: true, message: '请输入应用名称', trigger: 'blur' },
 		api: { required: true, message: '请输入接口名', trigger: 'blur' },
 		tips: { required: true, message: '请输入提示词', trigger: 'blur' },
-		price: { required: true, message: '请输入价格', trigger: 'blur' },
+		// price: { required: true, message: '请输入价格', trigger: 'blur' },
 		position: { required: true, message: '请输入排序号', trigger: 'blur' },
         type: { required: true, message: '请选择应用类型', trigger: 'blur' },
 	},
@@ -320,5 +320,10 @@ defineExpose({
 	grid-template-columns: repeat(auto-fill, minmax(50px,100px) );
 	grid-gap: 0.4em 0.8em;
 	// grid-auto-flow: column dense;
+	::v-deep .el-tag__content{
+		text-overflow: ellipsis;
+		overflow: hidden;
+		white-space: nowrap;
+	}
 }
 </style>

src/views/service/apply/index.vue

@@ -129,8 +129,8 @@ const state: any = reactive({
 			id: 1,
 			children: [
 				{id: '-1',label: '全部',active: true,},
-				{id: '0',label: '上架',active: false,},
+				{id: '1',label: '上架',active: false,},
-				{id: '1',label: '下架',active: false,}
+				{id: '0',label: '下架',active: false,}
 			],
 		}
 	],
@@ -154,9 +154,19 @@ const onSelItem = (val: FilteringRowType, v: FilteringChilType) => {
 	val.children.map((v: FilteringChilType) => (v.active = false));
 	v.active = true;
 	state.tableData.loading = true;
-	setTimeout(() => {
+	const isd = Number(v.id);
-		state.tableData.loading = false;
+	if(val.id === 0){
-	}, 500);
+		state.tableData.param.type = isd;
+		isd === -1 ? delete state.tableData.param.type : '' ;
+	}else{
+		state.tableData.param.publish = isd;
+		isd === -1 ? delete state.tableData.param.publish : '' ;
+	}
+	state.tableData.param.current = 1;
+	getTableData();
+	// setTimeout(() => {
+	// 	state.tableData.loading = false;
+	// }, 500);
 };
 // 当前列表项点击
 const onTableItemClick = (v: FilterListType) => {

src/views/service/recommend/index.vue

@@ -4,9 +4,9 @@
 			<div class="system-dept-search mb15">
                 <!-- 发布者：<el-input size="default" placeholder="请输入发布用户名称" v-model="state.tableData.param.userName" 
 				class="ml10 mr10" style="max-width: 180px" clearable></el-input> -->
-                作品类型：<el-select size="default" v-model="state.tableData.param.serviceId" placeholder="请选择作品类型" 
+                作品类型：<el-select size="default" v-model="state.tableData.param.serviceName" placeholder="请选择作品类型" 
                 clearable class="ml10 mr10" style="max-width: 180px">
-					<el-option v-for="(item,index) in state.special.data" :key="index" :label="item.name" :value="item.id"></el-option>
+					<el-option v-for="(item,index) in state.special.data" :key="index" :label="item.name" :value="item.name"></el-option>
                 </el-select>
                 
 				<el-button @click="getTableData" size="default" type="primary" class="ml10">
@@ -21,13 +21,26 @@
 					</el-icon>
 					重置
 				</el-button>
+				<el-button  size="default" type="success" class="ml10">
+					<el-icon>
+						<ele-FolderAdd />
+					</el-icon>
+					添加推荐作品
+				</el-button>
 			</div>
 			<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
 				<el-table-column align="center" type="index" label="序号"  width="100"/>
-				<el-table-column align="center" prop="name" label="作品">
+				<el-table-column align="center" prop="sourcePath" label="原图">
 					<template #default="scope">
-						<el-image :src="scope.row.path" lazy
+						<el-image v-if="scope.row.sourcePath" :src="getImagePath(scope.row.sourcePath)" lazy
-						preview-teleported="true" :preview-src-list="[scope.row.path]"/>
+						preview-teleported="true" :preview-src-list="[getImagePath(scope.row.sourcePath)]"/>
+						<div v-else>暂无</div>
+					</template>
+				</el-table-column>
+				<el-table-column align="center" prop="path" label="作品">
+					<template #default="scope">
+						<el-image :src="getImagePath(scope.row.path)" lazy
+						preview-teleported="true" :preview-src-list="[getImagePath(scope.row.path)]"/>
 					</template>
 				</el-table-column>
 				<el-table-column prop="serviceName" align="center" label="服务名" show-overflow-tooltip></el-table-column>
@@ -35,7 +48,7 @@
 				<el-table-column label="操作" width="200" align="center">
 					<template #default="scope">
 						<!-- <el-button size="small" text type="primary" @click="toShowDetail(scope.row.id)">查看详情</el-button> -->
-						<el-button  size="small" text type="danger" @click="toPublic(scope.row)">取消推荐</el-button>
+						<el-button  size="small" text type="danger" @click="deleteRecommend(scope.row.id)">删除</el-button>
 						<!-- <el-button size="small" v-else text type="primary" @click="audit(scope.row)">重新审核</el-button> -->
 					</template>
 				</el-table-column>
@@ -87,7 +100,7 @@ const state = reactive<any>({
 		param: {
 			current: 1,
 			size: 10,
-			serviceId: ''
+			serviceName: ''
 		},
 	},
 	special: {
@@ -125,6 +138,13 @@ const getSpecialList = async() => {
 	}
 };
 
+// 图片格式化
+const getImagePath = (path: string) => {
+	if(!path) return;
+	let index = path?.indexOf('?');
+	return path?.includes('://') ? path.substring(0,(!index||index===-1) ? path.length : index) : encodeURI(path);
+}
+
 // 获取表格数据
 const getTableData = async() => {
 	try {
@@ -137,17 +157,41 @@ const getTableData = async() => {
 			ElMessage.error('推荐作品列表获取失败！');
 		}
 	} catch (error) {
+		ElMessage.error('推荐作品列表获取失败！');
 	} finally {
 		state.tableData.loading = false;
 	}
 };
 
+// 删除推荐
+const deleteRecommend = (id:Number) =>{
+	ElMessageBox.confirm('是否确定删除该推荐?', '提示', {
+		confirmButtonText: '确定',
+		cancelButtonText: '取消',
+		type: 'warning',
+	})
+	.then(async() => {
+		try {
+			state.tableData.loading = true;
+			let res = await redApi.deleteRecommend(id);
+			if(res?.success){ 
+				await getTableData();
+				ElMessage.success('推荐作品删除成功！');
+			} else ElMessage.error('推荐作品删除失败！');
+		} catch(e) {
+			ElMessage.error('处理失败！');
+		} finally {
+			state.tableData.loading = false;
+		}
+	})
+}
+
 // 重置
 const reset = () =>{
 	state.tableData.param = {
 		current: 1,
 		size: 10,
-		serviceId: ''
+		serviceName: ''
 	}
 	getTableData();
 }
@@ -181,12 +225,13 @@ const toPublic = (row: any) => {
 // 日期格式化
 const dateFormatter = (row: any, column: TableColumnCtx<String>) => {
     if(row.createtime === null) return '暂无';
-	let mount = row.createtime[1];
+	let date = new Date(row.createtime);
-	let day = row.createtime[2];
+	let mount = date.getMonth() + 1;
-	let hour = row.createtime[3];
+	let day = date.getDate();
-	let minute = row.createtime[4];
+	let hour = date.getHours();
-	let second = row.createtime[5];
+	let minute = date.getMinutes();
-  	return `${row.createtime[0]}-${mount < 10 ? '0' : ''}${mount}-${day < 10 ? '0' : ''}${day} ${hour < 10 ? '0' : ''}${hour}:${minute < 10 ? '0' : ''}${minute}:${second < 10 ? '0' : ''}${second}`;
+	let second = date.getSeconds();
+  	return `${date.getFullYear()}-${mount < 10 ? '0' : ''}${mount}-${day < 10 ? '0' : ''}${day} ${hour < 10 ? '0' : ''}${hour}:${minute < 10 ? '0' : ''}${minute}:${second < 10 ? '0' : ''}${second}`;
 }
 
 // 分页改变

src/views/service/shares/index.vue

@@ -35,9 +35,11 @@
 				<el-table-column prop="reviewStatus" align="center" label="审核结果" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag v-if="scope.row.reviewStatus === 1" type="warning">审核中</el-tag>
-						<el-tag v-else-if="scope.row.reviewStatus === 2" type="success">通过</el-tag>
 						<el-tag v-else-if="scope.row.reviewStatus === 3" type="danger">未通过</el-tag>
-						<el-tag v-else>未发布</el-tag>
+						<el-tag v-else-if="scope.row.reviewStatus === null||scope.row.reviewStatus === 0">未发布</el-tag>
+						<el-tag v-else-if="scope.row.reviewStatus === 2" type="success">通过</el-tag>
+						<el-tag v-else-if="scope.row.reviewStatus === 4" type="success">已推荐</el-tag>
+						<el-tag v-else-if="scope.row.reviewStatus === 5" type="warning">取消推荐</el-tag>
 					</template>
 				</el-table-column>
 				<el-table-column prop="createtime" align="center" label="时间" :formatter="dateFormatter" show-overflow-tooltip></el-table-column>
@@ -46,8 +48,9 @@
 						<!-- <el-button size="small" text type="primary" @click="toShowDetail(scope.row.id)">查看详情</el-button> -->
 						<el-button size="small" v-if="scope.row.reviewStatus === 1" text type="primary" @click="audit(scope.row)">审核</el-button>
 						<el-button size="small" v-else-if="scope.row.reviewStatus === null||scope.row.reviewStatus === 0" text type="primary" @click="toPublic(scope.row)">发布</el-button>
-						<el-button size="small" v-else text type="primary" @click="audit(scope.row)">重新审核</el-button>
+						<el-button size="small" v-else-if="scope.row.reviewStatus === 2||scope.row.reviewStatus === 3||scope.row.reviewStatus === 5" text type="primary" @click="audit(scope.row)">重新审核</el-button>
-						<!-- <el-button size="small" v-if="scope.row.reviewStatus === 2" text type="primary" @click="toPublicHome(scope.row)">首页推荐</el-button> -->
+						<el-button size="small" v-if="scope.row.reviewStatus === 2||scope.row.reviewStatus === 5" text type="primary" @click="toPublicHome(scope.row)">首页推荐</el-button>
+						<el-button size="small" v-else-if="scope.row.reviewStatus === 4" text type="danger" @click="toCancelPublic(scope.row)">取消推荐</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -123,6 +126,8 @@ const statusList = ref([
 	{label: '审核中', value: 1},
     {label: '通过', value: 2},
     {label: '未通过', value: 3},
+	{label: '已推荐', value: 4},
+	{label: '取消推荐', value: 5},
 ]);
 
 // 引入 api 请求接口
@@ -185,6 +190,32 @@ const toPublic = (row: any) => {
 	})
 }
 
+// 取消推荐
+const toCancelPublic = (row: any) => {
+	ElMessageBox.confirm('是否确定取消推荐该作品?', '提示', {
+		confirmButtonText: '确定',
+		cancelButtonText: '取消',
+		type: 'warning',
+	})
+	.then(async() => {
+		try {
+			state.auditDialog.form.id = row.id;
+			state.auditDialog.form.status = 5;
+			state.tableData.loading = true;
+			let res = await shareApi.auditRelease(state.auditDialog.form);
+			if(res?.success){
+				ElMessage.success('作品取消推荐成功！');
+				state.auditDialog.show = false;
+				getTableData();
+			}else{ElMessage.error('作品取消推荐失败！');}
+		} catch(e) {
+			ElMessage.error('处理失败！');
+		} finally {
+			state.tableData.loading = false;
+		}
+	})
+}
+
 // 首页推荐
 const toPublicHome = (row: any) => {
 	ElMessageBox.confirm('确定要推荐该作品吗?', '提示', {
@@ -194,18 +225,15 @@ const toPublicHome = (row: any) => {
 	})
 	.then(async() => {
 		try {
+			state.auditDialog.form.id = row.id;
+			state.auditDialog.form.status = 4;
 			state.tableData.loading = true;
-			const form = {
+			let res = await shareApi.auditRelease(state.auditDialog.form);
-					labelName: '首页推荐',
+			if(res?.success){
-					moduleName: '首页推荐',
+				ElMessage.success('作品推荐成功！');
-					path: row.path
+				state.auditDialog.show = false;
-				}
+				getTableData();
-				console.log(form);
+			}else{ElMessage.error('作品推荐失败！');}
-				
-			// let res = await shareApi.saveRelease({ creationId: row.creationId });
-			// if(res?.success){ 
-			// 	ElMessage.success('推荐成功！');
-			// } else ElMessage.error('推荐失败！');
 		} catch(e) {
 			ElMessage.error('处理失败！');
 		} finally {
@@ -244,7 +272,12 @@ const commitAudit = async() => {
 const dateFormatter = (row: any, column: TableColumnCtx<String>) => {
     if(row.createtime === null) return '暂无';
 	let date = new Date(row.createtime);
-  	return `${date.getFullYear()}-${date.getMonth()+1}-${date.getDate()} ${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`;
+	let mount = date.getMonth() + 1;
+	let day = date.getDate();
+	let hour = date.getHours();
+	let minute = date.getMinutes();
+	let second = date.getSeconds();
+  	return `${date.getFullYear()}-${mount < 10 ? '0' : ''}${mount}-${day < 10 ? '0' : ''}${day} ${hour < 10 ? '0' : ''}${hour}:${minute < 10 ? '0' : ''}${minute}:${second < 10 ? '0' : ''}${second}`;
 }
 
 // 分页改变

src/views/statistics/index.vue

@@ -3,14 +3,15 @@
 		<el-row :gutter="15" class="home-card-one mb15">
 			<el-col
 				:xs="24"
-				:sm="12"
+				:sm="24"
-				:md="12"
+				:md="24"
 				:lg="8"
-				:xl="6"
+				:xl="8"
 				v-for="(v, k) in state.homeOne"
 				:key="k"
-				:class="{ 'home-media home-media-lg': k > 1, 'home-media-sm': k === 1 }"
+				class="home-media-sm"
 			>
+			<!-- :class="{ 'home-media home-media-lg': k > 1, 'home-media-sm': k === 1 }" -->
 				<div class="home-card-item flex">
 					<div class="flex-margin flex w100" :class="` home-one-animation${k}`">
 						<div class="flex-auto">
@@ -31,7 +32,7 @@
 					:sm="24"
 					:md="24"
 					:lg="24"
-					:xl="20"
+					:xl="24"
 					>
 				<div class="home-card-item">
         <!-- 添加日期范围选择框 -->
@@ -587,7 +588,8 @@ $homeNavLengh: 8;
 	.home-card-two,
 	.home-card-three {
 		.home-card-item {
-			height: 600px;
+			// height: 600px;
+			height: 700px;
 			width: 100%;
 			overflow: hidden;
 			.home-monitor {