客服话术和素材图片添加分类

yudao-admin-vue3/src/api/infra/file/index.ts

@@ -45,4 +45,8 @@ export const updateFile = (data: any) => {
   return request.upload({ url: '/infra/file/upload', data })
 }
 
+export const updatePicType = (id: number , picType: number) => {
+  return request.get({ url: '/infra/file/updatePicType?id=' + id + `&picType=` + picType })
+}
+
 

yudao-admin-vue3/src/api/system/dict/dict.data.ts

@@ -57,3 +57,23 @@ export const getTypeList = () => {
 export const getHuaShuTypeList = () => {
   return request.get({ url: '/system/dict-data/getHuaShuTypeList' })
 }
+
+// 新增字典数据，客服话术分类
+export const createType = (data: DictDataVO) => {
+  return request.post({ url: '/system/dict-data/createType', data })
+}
+
+// 新增字典数据，素材管理图片分类
+export const createPicType = (data: DictDataVO) => {
+  return request.post({ url: '/system/dict-data/createPicType', data })
+}
+
+// 新增字典数据，素材管理图片分类
+export const updateMenu = (id : number, name : string) => {
+  return request.get({ url: '/system/dict-data/updateMenu?id='+ id + `&name=` + name  })
+}
+
+// 删除字典数据
+export const deleteMenu = (id: number | undefined) => {
+  return request.delete({ url: '/system/dict-data/deleteMenu?id=' + id })
+}

yudao-admin-vue3/src/utils/dict.ts

@@ -124,6 +124,8 @@ export enum DICT_TYPE {
   TECHNICIAN_STATUS = 'technician_status',
   SEX = 'sex',
   
+  INFRA_FILE_TYPE = 'infra_file_type',
+  
   //预约：项目
   SUBSCRIBE_PROJECT_STATUS = 'subscribe_project_status',
   

yudao-admin-vue3/src/views/infra/file/index.vue

@@ -4,22 +4,35 @@
 	<div class="flex-container">
 		<!-- 菜单区域 -->
 		<div class="menu-area">
-    <el-menu :default-active="targetMenuId">
-      <el-menu-item  v-for="item in typeMenu" :index="item.value" :key="item.value"  @click="clickMenu(item.value)">{{item.label}}</el-menu-item>
 
+			<el-button type="primary" plain @click="createType">
+				<Icon icon="ep:plus" class="mr-5px" /> 新增分类
+			</el-button>
+
+			<el-menu :default-active="targetMenuId">
+				<el-menu-item :index="targetMenuId" :key="targetMenuId" @click="clickMenu(targetMenuId)">
+					全部类型
+				</el-menu-item>
+				<el-menu-item v-for="item in typeMenu" :index="item.value" :key="item.value"
+					@click="clickMenu(item.value)">
+					{{ item.label }}
+					<el-icon style="margin-left: 40px;" @mouseover="showActions = item.value"
+						@mouseleave="showActions = null">
+						<MoreFilled />
+						<div  v-if="showActions === item.value" class="action-buttons">
+							<el-button size="small" @click.stop="editItem(item.id,item.label)">编辑</el-button>
+							<el-button size="small" @click.stop="deleteItem(item.id)">删除</el-button>
+						</div>
+					</el-icon>
+				</el-menu-item>
 			</el-menu>
+
 		</div>
 
 		<!-- 内容区域 -->
 		<div class="content-wrap">
 			<ContentWrap>
-        <el-form
+				<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-              class="-mb-15px"
-              :model="queryParams"
-              ref="queryFormRef"
-              :inline="true"
-              label-width="68px"
-            >
 					<!-- <el-form-item label="文件路径" prop="path">
                 <el-input
                   v-model="queryParams.path"
@@ -29,26 +42,22 @@
                 />
               </el-form-item> -->
 					<el-form-item label="文件类型" prop="type" width="80">
-                <el-input
+						<el-input v-model="queryParams.type" placeholder="请输入文件类型" clearable
-                  v-model="queryParams.type"
+							@keyup.enter="handleQuery" />
-                  placeholder="请输入文件类型"
-                  clearable
-                  @keyup.enter="handleQuery"
-                />
 					</el-form-item>
+
 					<el-form-item label="创建时间" prop="createTime">
-                <el-date-picker
+						<el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss"
-                  v-model="queryParams.createTime"
+							type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
-                  value-format="YYYY-MM-DD HH:mm:ss"
+							:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" />
-                  type="daterange"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-                />
 					</el-form-item>
 					<el-form-item>
-                <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+						<el-button @click="handleQuery">
-                <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+							<Icon icon="ep:search" class="mr-5px" /> 搜索
+						</el-button>
+						<el-button @click="resetQuery">
+							<Icon icon="ep:refresh" class="mr-5px" /> 重置
+						</el-button>
 						<el-button type="primary" plain @click="openForm">
 							<Icon icon="ep:upload" class="mr-5px" /> 上传文件
 						</el-button>
@@ -57,91 +66,140 @@
 			</ContentWrap>
 
 
+			<ContentWrap>
 				<el-table v-loading="loading" :data="list">
-          <el-table-column label="文件名" align="center" prop="name" :show-overflow-tooltip="true" />
-          <el-table-column label="文件路径" align="center" prop="path" :show-overflow-tooltip="true" />
-          <el-table-column label="URL" align="center" prop="url" :show-overflow-tooltip="true" />
-          <el-table-column label="文件大小" align="center" prop="size" width="120" :formatter="fileSizeFormatter" />
-          <el-table-column label="文件类型" align="center" prop="type" width="180px" />
 					<el-table-column label="文件内容" align="center" prop="url" width="110px">
 						<template #default="{ row }">
-              <el-image
+							<el-image v-if="row.type.includes('image')" class="h-80px w-80px" lazy :src="row.url"
-                v-if="row.type.includes('image')"
+								:preview-src-list="[row.url]" preview-teleported fit="cover" />
-                class="h-80px w-80px"
+							<el-link v-else-if="row.type.includes('pdf')" type="primary" :href="row.url"
-                lazy
+								:underline="false" target="_blank">预览</el-link>
-                :src="row.url"
+							<el-link v-else type="primary" download :href="row.url" :underline="false"
-                :preview-src-list="[row.url]"
+								target="_blank">下载</el-link>
-                preview-teleported
-                fit="cover"
-              />
-              <el-link
-                v-else-if="row.type.includes('pdf')"
-                type="primary"
-                :href="row.url"
-                :underline="false"
-                target="_blank"
-              >预览</el-link>
-              <el-link v-else type="primary" download :href="row.url" :underline="false" target="_blank"
-              >下载</el-link>
 						</template>
 					</el-table-column>
-          <el-table-column label="上传时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+					<el-table-column label="文件名" align="center" prop="name" :show-overflow-tooltip="true" />
+					<!-- <el-table-column label="文件路径" align="center" prop="path" :show-overflow-tooltip="true" /> -->
+					<el-table-column label="URL" align="center" prop="url" :show-overflow-tooltip="true" />
+					<!-- <el-table-column label="文件大小" align="center" prop="size" width="120"
+						:formatter="fileSizeFormatter" /> -->
+					<!-- <el-table-column label="文件类型" align="center" prop="type" width="180px" />
+					<el-table-column label="图片分类" align="center" prop="picType">
+						<template #default="scope">
+							<dict-tag :type="DICT_TYPE.INFRA_FILE_TYPE" :value="scope.row.picType" />
+						</template>
+					</el-table-column> -->
+
+					<el-table-column label="上传时间" align="center" prop="createTime" width="180"
+						:formatter="dateFormatter" />
 					<el-table-column label="操作" align="center">
 						<template #default="scope">
-              <el-button
+							<el-button link type="primary"
-                link
+								@click="updateForm('update', scope.row.id , scope.row.picType)">
-                type="danger"
+								更改类型
-                @click="handleDelete(scope.row.id)"
+							</el-button>
-                v-hasPermi="['infra:file:delete']"
+							<el-button link type="danger" @click="handleDelete(scope.row.id)"
-              >
+								v-hasPermi="['infra:file:delete']">
 								删除
 							</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
-        
+			</ContentWrap>
 			<!-- 分页 -->
-        <Pagination
+			<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
-          :total="total"
+				@pagination="getList" />
-          v-model:page="queryParams.pageNo"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-        />
 
 		</div>
 	</div>
-
 	<!-- 表单弹窗：添加/修改 -->
 	<FileForm ref="formRef" @success="getList" />
-</template>
-<script lang="ts" setup>
 
+	<UpdateForm ref="forRef" @success="getList" />
+
+	<Dialog v-model="dialogVisibles" :title="dialogTitles">
+		<el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="80px">
+
+			<el-form-item label="数据标签" prop="label">
+				<el-input v-model="formData.label" placeholder="请输入数据标签" />
+			</el-form-item>
+			<el-form-item label="显示排序" prop="sort">
+				<el-input-number v-model="formData.sort" :min="0" controls-position="right" />
+			</el-form-item>
+
+		</el-form>
+		<template #footer>
+			<el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+			<el-button @click="dialogVisibles = false">取 消</el-button>
+		</template>
+	</Dialog>
+
+	<Dialog v-model="dialogVisible" :title="dialogTitle">
+		<el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+			<el-form-item label="数据标签" prop="label">
+				<el-input v-model="updateLabel" placeholder="请输入数据标签" />
+			</el-form-item>
+		</el-form>
+		<template #footer>
+			<el-button :disabled="formLoading" type="primary" @click="submitForms">确 定</el-button>
+			<el-button @click="dialogVisible = false">取 消</el-button>
+		</template>
+	</Dialog>
+
+
+</template>
+
+<script lang="ts" setup>
+	import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 	import { fileSizeFormatter } from '@/utils'
+	import { Search, MoreFilled } from '@element-plus/icons-vue';
 	import { dateFormatter } from '@/utils/formatTime'
+	// import * as ElementPlusIconsVue from '@element-plus/icons-vue'
 	import * as FileApi from '@/api/infra/file'
 	import FileForm from './FileForm.vue'
-import { string } from 'vue-types';
+	import UpdateForm from './updateForm.vue'
-import { number } from 'echarts';
 	import * as DictDataApi from '@/api/system/dict/dict.data'
 	const typeMenu = ref<DictDataApi.DictDataVO[]>([]) // 
 	const targetMenuId = ref('0')
 	defineOptions({ name: 'InfraFile' })
-
+	const showActions = ref(null);
+	const dialogVisible = ref(false) // 弹窗的是否展示
+	const dialogTitle = ref('') // 弹窗的标题
+	const dialogVisibles = ref(false) // 弹窗的是否展示
+	const dialogTitles = ref('') // 弹窗的标题
+	const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+	const formData = ref({
+		id: undefined,
+		sort: undefined,
+		label: '',
+		value: '',
+		dictType: '',
+		// status: CommonStatusEnum.ENABLE,
+		colorType: '',
+		cssClass: '',
+		remark: ''
+	})
+	const formRules = reactive({
+		label: [{ required: true, message: '数据标签不能为空', trigger: 'blur' }],
+		sort: [{ required: true, message: '数据顺序不能为空', trigger: 'blur' }],
+	})
+	const updateLabel = ref('')
 	const message = useMessage() // 消息弹窗
 	const { t } = useI18n() // 国际化
 
 	const loading = ref(true) // 列表的加载中
 	const total = ref(0) // 列表的总页数
 	const list = ref([]) // 列表的
+	const menuId = ref()
 
 	const queryParams = reactive({
 		pageNo: 1,
 		pageSize: 10,
 		name: undefined,
 		type: undefined,
+		picType: '',
 		path: undefined,
 		createTime: [],
-  menuType: '0',
 	})
 	const queryFormRef = ref() // 搜索的表单
 
@@ -157,6 +215,77 @@ const getList = async () => {
 		}
 	}
 
+	//新增分类
+	const createType = () => {
+		dialogVisibles.value = true
+		dialogTitles.value = '新增分类'
+
+	}
+
+	/** 添加分类菜单 */
+	const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+	const submitForm = async () => {
+		// 校验表单
+		if (!formRef) return
+		const valid = await formRef.value.validate()
+		if (!valid) return
+		// 提交请求
+		formLoading.value = true
+		try {
+			const data = formData.value as DictDataApi.DictDataVO
+			await DictDataApi.createPicType(data)
+			message.success(t('common.createSuccess'))
+			dialogVisibles.value = false
+			// 发送操作成功的事件
+			emit('success')
+			getTypeList()
+
+		} finally {
+			formLoading.value = false
+		}
+	}
+
+	//修改分类菜单
+	const submitForms = async () => {
+		// 校验表单
+		if (!formRef) return
+		const valid = await formRef.value.validate()
+		if (!valid) return
+		// 提交请求
+		formLoading.value = true
+		try {
+
+			await DictDataApi.updateMenu(menuId.value, updateLabel.value)
+			message.success(t('common.createSuccess'))
+			dialogVisible.value = false
+			// 发送操作成功的事件
+			emit('success')
+			getTypeList()
+
+		} finally {
+			formLoading.value = false
+		}
+	}
+
+	//分类菜单修改按钮
+	const editItem = (id : number | undefined, lable : string) => {
+		dialogVisible.value = true
+		dialogTitle.value = '菜单编辑'
+		menuId.value = id
+		updateLabel.value = lable
+		// 处理编辑事件
+		console.log('编辑:',);
+	};
+	//分类菜单删除按钮
+	const deleteItem = async (id : number | undefined) => {
+		// 处理删除事件
+		// 删除的二次确认
+		await message.delConfirm()
+		await DictDataApi.deleteMenu(id)
+		message.success(t('common.delSuccess'))
+		getTypeList()
+
+	};
 	//图片素材管理分类菜单
 	const getTypeList = async () => {
 		const data = await DictDataApi.getTypeList()
@@ -167,7 +296,7 @@ const getTypeList = async () => {
 
 	/**  */
 	const clickMenu = (id : string) => {
-  queryParams.menuType = id
+		queryParams.picType = id
 		queryParams.pageNo = 1
 		getList()
 	}
@@ -184,12 +313,20 @@ const resetQuery = () => {
 		handleQuery()
 	}
 
-/** 添加/修改操作 */
+
 	const formRef = ref()
 	const openForm = () => {
 		formRef.value.open()
 	}
 
+	const forRef = ref()
+	/** 修改操作 */
+	const updateForm = (type : string, id : number, picType : number) => {
+		forRef.value.open(type, id, picType)
+	}
+
+
+
 	/** 删除按钮操作 */
 	const handleDelete = async (id : number) => {
 		try {
@@ -205,25 +342,33 @@ const handleDelete = async (id: number) => {
 
 	/** 初始化 **/
 	onMounted(() => {
-  // queryParams.value.menuType = targetMenuId
+		queryParams.picType = targetMenuId.value
 		getTypeList()
 		getList()
 	})
 </script>
 <style scoped>
 	.flex-container {
-	height: 100vh; /* 使容器填满视口高度 */
+		height: 100vh;
+		/* 使容器填满视口高度 */
 		display: flex;
 	}
+
 	.menu-area {
 
 		width: 200px;
-    height: 100vh; /* 固定高度 */
+		height: 100vh;
-    overflow-y: hidden; /* 禁止滚动 */
+		/* 固定高度 */
-    border-right: 1px solid #e0e0e0; /* 可选：添加分隔线 */
+		overflow-y: hidden;
+		/* 禁止滚动 */
+		border-right: 1px solid #e0e0e0;
+		/* 可选：添加分隔线 */
 	}
+
 	.content-wrap {
-  flex-grow: 1; /* 使内容区域占据剩余空间 */
+		flex-grow: 1;
-   overflow-y: auto; /* 允许内容区域滚动 */
+		/* 使内容区域占据剩余空间 */
+		overflow-y: auto;
+		/* 允许内容区域滚动 */
 	}
 </style>

yudao-admin-vue3/src/views/mall/promotion/kefu/components/KeFuMessageList.vue

@@ -121,7 +121,6 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
 			<div style="flex: 0 0 20%; padding: 10px;">
 				<el-menu :default-active="targetMenuId">
 				  <el-menu-item  v-for="item in huashuType" :index="item.value" :key="item.value"  @click="clickMenu(item.value)">{{item.label}}</el-menu-item>
-				  
 				</el-menu>
 			</div>
 			<!-- 右边占 70% -->
@@ -299,7 +298,6 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
 	const getHuaShuTypeList = async () => {
 		const data = await DictDataApi.getHuaShuTypeList()
 	    huashuType.value = data
-		
 	}
 	//话术内容
 	const getVerbalTrickList = async (id: string) => {

yudao-admin-vue3/src/views/mall/promotion/verbaltrick/index.vue

@@ -1,66 +1,52 @@
 <template>
+
+	<div class="flex-container">
+		<!-- 菜单区域 -->
+		<div class="menu-area">
+			<el-button type="primary" plain @click="createType">
+				<Icon icon="ep:plus" class="mr-5px" /> 新增分类
+			</el-button>
+			<el-menu :default-active="targetMenuId">
+				<el-menu-item v-for="item in huashuType" :index="item.value" :key="item.value"
+					@click="clickMenu(item.value)">{{item.label}}</el-menu-item>
+			</el-menu>
+		</div>
+
+		<!-- 内容区域 -->
+		<div class="content-wrap">
+
+
 			<ContentWrap>
 				<!-- 搜索工作栏 -->
-    <el-form
+				<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-      class="-mb-15px"
+					<!-- <el-form-item label="分类" prop="type">	
-      :model="queryParams"
+						<el-select v-model="queryParams.type" placeholder="请选择分类" clearable class="!w-240px">
-      ref="queryFormRef"
+							<el-option v-for="dict in getIntDictOptions(DICT_TYPE.KEFU_VERBAL_TRICK_TYPE)"
-      :inline="true"
+								:key="dict.value" :label="dict.label" :value="dict.value" />
-      label-width="68px"
-    >
-      <el-form-item label="分类" prop="type">
-        <el-select
-          v-model="queryParams.type"
-          placeholder="请选择分类"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.KEFU_VERBAL_TRICK_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
 						</el-select>
-      </el-form-item>
+					</el-form-item> -->
 					<el-form-item label="标题" prop="title">
-        <el-input
+						<el-input v-model="queryParams.title" placeholder="请输入标题" clearable @keyup.enter="handleQuery"
-          v-model="queryParams.title"
+							class="!w-240px" />
-          placeholder="请输入标题"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
 					</el-form-item>
 					<el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
+						<el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss"
-          v-model="queryParams.createTime"
+							type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
-          value-format="YYYY-MM-DD HH:mm:ss"
+							:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px" />
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
 					</el-form-item>
 					<el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+						<el-button @click="handleQuery">
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+							<Icon icon="ep:search" class="mr-5px" /> 搜索
-        <el-button
+						</el-button>
-          type="primary"
+						<el-button @click="resetQuery">
-          plain
+							<Icon icon="ep:refresh" class="mr-5px" /> 重置
-          @click="openForm('create')"
+						</el-button>
-          v-hasPermi="['promotion:verbal-trick:create']"
+						<el-button type="primary" plain @click="openForm('create')"
-        >
+							v-hasPermi="['promotion:verbal-trick:create']">
 							<Icon icon="ep:plus" class="mr-5px" /> 新增
 						</el-button>
-        <el-button
+						<el-button type="success" plain @click="handleExport" :loading="exportLoading"
-          type="success"
+							v-hasPermi="['promotion:verbal-trick:export']">
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['promotion:verbal-trick:export']"
-        >
 							<Icon icon="ep:download" class="mr-5px" /> 导出
 						</el-button>
 					</el-form-item>
@@ -78,45 +64,59 @@
 					</el-table-column>
 					<el-table-column label="标题" align="center" prop="title" />
 					<el-table-column label="详情" align="center" prop="details" />
-      <el-table-column
+					<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter"
-        label="创建时间"
+						width="180px" />
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
 					<el-table-column label="操作" align="center">
 						<template #default="scope">
-          <el-button
+							<el-button link type="primary" @click="openForm('update', scope.row.id)"
-            link
+								v-hasPermi="['promotion:verbal-trick:update']">
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['promotion:verbal-trick:update']"
-          >
 								编辑
 							</el-button>
-          <el-button
+							<el-button link type="danger" @click="handleDelete(scope.row.id)"
-            link
+								v-hasPermi="['promotion:verbal-trick:delete']">
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['promotion:verbal-trick:delete']"
-          >
 								删除
 							</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
 				<!-- 分页 -->
-    <Pagination
+				<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
-      :total="total"
+					@pagination="getList" />
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
 			</ContentWrap>
 
+		</div>
+	</div>
+
+
+
 	<!-- 表单弹窗：添加/修改 -->
 	<VerbalTrickForm ref="formRef" @success="getList" />
+	
+	
+	<Dialog v-model="dialogVisible" :title="dialogTitle">
+	  <el-form
+	    ref="formRef"
+	    v-loading="formLoading"
+	    :model="formData"
+	    :rules="formRules"
+	    label-width="80px"
+	  >
+
+	    <el-form-item label="数据标签" prop="label">
+	      <el-input v-model="formData.label" placeholder="请输入数据标签" />
+	    </el-form-item>
+	    <el-form-item label="显示排序" prop="sort">
+	      <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
+	    </el-form-item>
+	    
+	  </el-form>
+	  <template #footer>
+	    <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+	    <el-button @click="dialogVisible = false">取 消</el-button>
+	  </template>
+	</Dialog>
+	
+	
 </template>
 
 <script setup lang="ts">
@@ -125,6 +125,28 @@ import { dateFormatter } from '@/utils/formatTime'
 	import download from '@/utils/download'
 	import { VerbalTrickApi, VerbalTrickVO } from '@/api/mall/promotion/verbaltrick'
 	import VerbalTrickForm from './VerbalTrickForm.vue'
+	import * as DictDataApi from '@/api/system/dict/dict.data'
+	const huashuType = ref<DictDataApi.DictDataVO[]>([]) // 
+	const targetMenuId = ref('0')
+	
+	const dialogVisible = ref(false) // 弹窗的是否展示
+	const dialogTitle = ref('新增分类') // 弹窗的标题
+	const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+	const formData = ref({
+	  id: undefined,
+	  sort: undefined,
+	  label: '',
+	  value: '',
+	  dictType: '',
+	  // status: CommonStatusEnum.ENABLE,
+	  colorType: '',
+	  cssClass: '',
+	  remark: ''
+	})
+	const formRules = reactive({
+	  label: [{ required: true, message: '数据标签不能为空', trigger: 'blur' }],
+	  sort: [{ required: true, message: '数据顺序不能为空', trigger: 'blur' }],
+	})
 
 	/** 客服话术 列表 */
 	defineOptions({ name: 'VerbalTrick' })
@@ -138,7 +160,7 @@ const total = ref(0) // 列表的总页数
 	const queryParams = reactive({
 		pageNo: 1,
 		pageSize: 10,
-  type: undefined,
+		type: '',
 		title: undefined,
 		details: undefined,
 		createTime: []
@@ -158,6 +180,48 @@ const getList = async () => {
 		}
 	}
 	
+	//新增分类
+	const createType = () =>{
+		dialogVisible.value = true
+	}
+	
+	/** 提交表单 */
+	const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+	const submitForm = async () => {
+	  // 校验表单
+	  if (!formRef) return
+	  const valid = await formRef.value.validate()
+	  if (!valid) return
+	  // 提交请求
+	  formLoading.value = true
+	  try {
+	    const data = formData.value as DictDataApi.DictDataVO
+		await DictDataApi.createType(data)
+	    message.success(t('common.createSuccess'))
+	    dialogVisible.value = false
+	    // 发送操作成功的事件
+	    emit('success')
+		queryParams.type = targetMenuId.value
+		getList()
+		getHuaShuTypeList()
+	  } finally {	
+	    formLoading.value = false
+	  }
+	}
+	
+
+	const clickMenu = (id : string) => {
+		console.log('1111111111', id)
+		queryParams.type = id
+		getList()
+	}
+
+	//话术分类菜单
+	const getHuaShuTypeList = async () => {
+		const data = await DictDataApi.getHuaShuTypeList()
+		huashuType.value = data
+	}
+
 	/** 搜索按钮操作 */
 	const handleQuery = () => {
 		queryParams.pageNo = 1
@@ -206,6 +270,34 @@ const handleExport = async () => {
 
 	/** 初始化 **/
 	onMounted(() => {
+		queryParams.type = targetMenuId.value
 		getList()
+		getHuaShuTypeList()
 	})
 </script>
+
+<style scoped>
+	.flex-container {
+		height: 100vh;
+		/* 使容器填满视口高度 */
+		display: flex;
+	}
+
+	.menu-area {
+
+		width: 200px;
+		height: 100vh;
+		/* 固定高度 */
+		overflow-y: hidden;
+		/* 禁止滚动 */
+		border-right: 1px solid #e0e0e0;
+		/* 可选：添加分隔线 */
+	}
+
+	.content-wrap {
+		flex-grow: 1;
+		/* 使内容区域占据剩余空间 */
+		overflow-y: auto;
+		/* 允许内容区域滚动 */
+	}
+</style>

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java

@@ -102,11 +102,21 @@ public class FileController {
     @Operation(summary = "获得文件分页")
     @PreAuthorize("@ss.hasPermission('infra:file:query')")
     public CommonResult<PageResult<FileRespVO>> getFilePage(@Valid FilePageReqVO pageVO) {
+        if (pageVO.getPicType() == 0){
+            pageVO.setPicType(null);
+        }
         PageResult<FileDO> pageResult = fileService.getFilePage(pageVO);
         return success(BeanUtils.toBean(pageResult, FileRespVO.class));
     }
 
 
+    @GetMapping("/updatePicType")
+    public CommonResult<Long> updatePicType(Integer id,Integer picType){
+       return success(fileService.updatePicType(id,picType));
+    }
+
+
+
 
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileCreateReqVO.java

@@ -28,6 +28,9 @@ public class FileCreateReqVO {
     @Schema(description = "文件 MIME 类型", example = "application/octet-stream")
     private String type;
 
+    @Schema(description = "图片类型")
+    private Integer picType;
+
     @Schema(description = "文件大小", example = "2048", requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer size;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePageReqVO.java

@@ -23,6 +23,11 @@ public class FilePageReqVO extends PageParam {
     @Schema(description = "文件类型，模糊匹配", example = "jpg")
     private String type;
 
+    @Schema(description = "图片类型", example = "jpg")
+    private Integer picType;
+
+
+
     @Schema(description = "创建时间", example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileRespVO.java

@@ -27,6 +27,9 @@ public class FileRespVO {
     @Schema(description = "文件MIME类型", example = "application/octet-stream")
     private String type;
 
+    @Schema(description = "图片类型")
+    private Integer picType;
+
     @Schema(description = "文件大小", example = "2048", requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer size;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileDO.java

@@ -47,6 +47,8 @@ public class FileDO extends BaseDO {
      * 文件的 MIME 类型，例如 "application/octet-stream"
      */
     private String type;
+
+    private Integer picType;
     /**
      * 文件大小
      */

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileMapper.java

@@ -18,6 +18,7 @@ public interface FileMapper extends BaseMapperX<FileDO> {
     default PageResult<FileDO> selectPage(FilePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<FileDO>()
                 .likeIfPresent(FileDO::getPath, reqVO.getPath())
+                .eqIfPresent(FileDO::getPicType, reqVO.getPicType())
                 .likeIfPresent(FileDO::getType, reqVO.getType())
                 .betweenIfPresent(FileDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(FileDO::getId));

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java

@@ -63,4 +63,8 @@ public interface FileService {
      */
     FilePresignedUrlRespVO getFilePresignedUrl(String path) throws Exception;
 
+    Long updatePicType(Integer id,Integer picType);
+
+    boolean deleteMenu(Long id);
+
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java

@@ -13,11 +13,14 @@ import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePageReqVO
 import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePresignedUrlRespVO;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.dal.mysql.file.FileMapper;
+import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
 import lombok.SneakyThrows;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
+import java.util.List;
+
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_NOT_EXISTS;
 
@@ -35,6 +38,9 @@ public class FileServiceImpl implements FileService {
     @Resource
     private FileMapper fileMapper;
 
+    @Resource
+    private DictDataApi dictDataApi;
+
     @Override
     public PageResult<FileDO> getFilePage(FilePageReqVO pageReqVO) {
         return fileMapper.selectPage(pageReqVO);
@@ -114,4 +120,23 @@ public class FileServiceImpl implements FileService {
                 object -> object.setConfigId(fileClient.getId()));
     }
 
+    @Override
+    public Long updatePicType(Integer id, Integer picType) {
+        FileDO fileDO = fileMapper.selectOne("id", id);
+        if (picType != null){
+            fileDO.setPicType(picType);
+        }
+        return (long)fileMapper.updateById(fileDO);
+    }
+
+    @Override
+    public boolean deleteMenu(Long id) {
+        List<FileDO> pic_type = fileMapper.selectList("pic_type", id);
+        if (pic_type.isEmpty()){
+            dictDataApi.deleteMenu(id);
+            return true;
+        }
+        return false;
+    }
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java

@@ -108,7 +108,7 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
         }
         MemberPointRecordDO memberPointRecordDO = new MemberPointRecordDO();
         memberPointRecordDO.setAddUp(addUp);
-        memberPointRecordDO.setReduce(reduce);
+        memberPointRecordDO.setReduce(Math.abs(reduce));
         return memberPointRecordDO;
     }
 

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/configuration/ConfigurationController.java

@@ -41,6 +41,29 @@ public class ConfigurationController {
     @Resource
     private ConfigurationService configurationService;
 
+
+
+
+    //根据项目预约天id查找预约套餐时间段
+    @GetMapping("/getConfiguration")
+    public CommonResult<List<ServiceTimeVO>> getConfiguration(Integer id) {
+        List<ServiceTimeVO> serviceTimeVOS = configurationService.getConfiguration(id);
+        return success(serviceTimeVOS);
+    }
+
+    //添加预约套餐时间段配置
+    @PostMapping("/addUpdConfiguration")
+    public CommonResult<Integer> addConfiguration(@RequestBody ConfigurationDO pageReqVO) {
+        Integer aLong = configurationService.addUpdConfiguration(pageReqVO);
+        return success(aLong);
+    }
+
+
+
+
+
+
+
     @PostMapping("/create")
     @Operation(summary = "创建预约配置")
     @PreAuthorize("@ss.hasPermission('subscribe:configuration:create')")
@@ -96,18 +119,6 @@ public class ConfigurationController {
     }
 
 
-    //根据项目预约天id查找预约套餐时间段
-    @GetMapping("/getConfiguration")
-    public CommonResult<List<ServiceTimeVO>> getConfiguration(Integer id) {
-        List<ServiceTimeVO> serviceTimeVOS = configurationService.getConfiguration(id);
-        return success(serviceTimeVOS);
-    }
 
-    //添加预约套餐时间段配置
-    @PostMapping("/addUpdConfiguration")
-    public CommonResult<Integer> addConfiguration(@RequestBody ConfigurationDO pageReqVO) {
-        Integer aLong = configurationService.addUpdConfiguration(pageReqVO);
-        return success(aLong);
-    }
 
 }

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/configuration/ConfigurationServiceImpl.java

@@ -149,7 +149,7 @@ public class ConfigurationServiceImpl implements ConfigurationService {
 
                 for (int j = 0; j < serviceTimeVOS.size(); j++) {
                     ServiceTimeVO serviceTimeVO = serviceTimeVOS.get(j);
-                    String serviceTime =  serviceTimeVO.getStart() + " - " + serviceTimeVO.getEnd();
+                    String serviceTime =  serviceTimeVO.getStart() + " ~ " + serviceTimeVO.getEnd();
 
                     //判断时间段是否存在
                     /**

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java

@@ -81,4 +81,8 @@ public interface DictDataApi {
 
     Long createDictDataApi(DictDataSaveReqApiVO createReqVO);
 
+    int updateMenu(Integer id,String name);
+
+    void deleteMenu(Long id);
+
 }

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/dto/DictDataRespDTO.java

@@ -10,6 +10,7 @@ import lombok.Data;
  */
 @Data
 public class DictDataRespDTO {
+    private Integer id;
 
     /**
      * 字典标签

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java

@@ -50,4 +50,16 @@ public class DictDataApiImpl implements DictDataApi {
         return dictDataService.createDictDataApi(createReqVO);
     }
 
+    @Override
+    public int updateMenu(Integer id, String name) {
+        int i = dictDataService.updateMenu(id, name);
+        return i;
+    }
+
+    @Override
+    public void deleteMenu(Long id) {
+        dictDataService.deleteDictData(id);
+    }
+
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java

@@ -126,4 +126,39 @@ public class DictDataController {
         return success(dictDataList);
     }
 
+
+    //添加客服话术分类字典数据
+    @PostMapping("/createType")
+    public CommonResult<Long> createType( @RequestBody DictDataDO createReqVO) {
+        Long dictDataId = dictDataService.createType(createReqVO);
+        return success(dictDataId);
+    }
+
+    //添加客服话术分类字典数据
+    @PostMapping("/createPicType")
+    public CommonResult<Long> createPicType( @RequestBody DictDataDO createReqVO) {
+        Long dictDataId = dictDataService.createPicType(createReqVO);
+        return success(dictDataId);
+    }
+
+
+    /**
+     * 素材管理菜单编辑
+     */
+    @GetMapping(value = "/updateMenu")
+    public CommonResult<Integer> updateMenu(Integer id,String name) {
+        int i = dictDataApi.updateMenu(id, name);
+        return success(i);
+    }
+
+
+    @DeleteMapping("/deleteMenu")
+    public CommonResult<Boolean> deleteMenu(Long id) {
+        dictDataService.deleteDictData(id);
+        return success(true);
+    }
+
+
+
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPage
 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -46,4 +47,10 @@ public interface DictDataMapper extends BaseMapperX<DictDataDO> {
                 .eqIfPresent(DictDataDO::getDictType, dictType));
     }
 
+    @Select(" SELECT MAX(value) FROM system_dict_data where dict_type = 'kefu_verbal_trick_type' ")
+    int getMaxValue();
+
+    @Select(" SELECT MAX(value) FROM system_dict_data where dict_type = 'infra_file_type' ")
+    int getPicTypeMaxValue();
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java

@@ -39,6 +39,8 @@ public interface DictDataService {
      */
     void deleteDictData(Long id);
 
+
+
     /**
      * 获得字典数据列表
      *
@@ -109,4 +111,20 @@ public interface DictDataService {
     List<DictDataDO> getDictDataListByDictType(String dictType);
 
     Long createDictDataApi(DictDataSaveReqApiVO createReqVO);
+
+    /**
+     * 添加客服话术分类
+     * @param createReqVO
+     * @return
+     */
+    Long createType(DictDataDO createReqVO);
+
+    /**
+     * 添加图片类型字典数据
+     * @param createReqVO
+     * @return
+     */
+    Long createPicType(DictDataDO createReqVO);
+
+    int updateMenu(Integer id, String name);
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java

@@ -99,6 +99,8 @@ public class DictDataServiceImpl implements DictDataService {
         dictDataMapper.deleteById(id);
     }
 
+
+
     @Override
     public long getDictDataCountByDictType(String dictType) {
         return dictDataMapper.selectCountByDictType(dictType);
@@ -190,4 +192,44 @@ public class DictDataServiceImpl implements DictDataService {
         return dictData.getId();
     }
 
+    @Override
+    public Long createType(DictDataDO createReqVO) {
+
+        List<DictDataDO> dictDataDOS = dictDataMapper.selectList("dict_type", "infra_file_type");
+        int maxValue = 0;
+        if (!dictDataDOS.isEmpty()){
+            maxValue = dictDataMapper.getMaxValue();
+        }
+        createReqVO.setValue( String.valueOf( maxValue + 1 ) );
+        createReqVO.setDictType("kefu_verbal_trick_type");
+        createReqVO.setStatus(0);
+        // 插入字典类型
+        dictDataMapper.insert(createReqVO);
+        return createReqVO.getId();
+    }
+
+    @Override
+    public Long createPicType(DictDataDO createReqVO) {
+
+        List<DictDataDO> dictDataDOS = dictDataMapper.selectList("dict_type", "infra_file_type");
+        int maxValue = 0;
+        if (!dictDataDOS.isEmpty()){
+            maxValue = dictDataMapper.getPicTypeMaxValue();
+        }
+        createReqVO.setValue( String.valueOf( maxValue + 1 ) );
+        createReqVO.setDictType("infra_file_type");
+        createReqVO.setStatus(0);
+        // 插入字典类型
+        dictDataMapper.insert(createReqVO);
+        return createReqVO.getId();
+    }
+
+    @Override
+    public int updateMenu(Integer id, String name) {
+        DictDataDO id1 = dictDataMapper.selectOne("id", id);
+        id1.setLabel(name);
+
+        return  dictDataMapper.updateById(id1);
+    }
+
 }