flx：更改

src/api/home/home.js

@@ -7,9 +7,15 @@ const requestBBQ = (url, ...arg) => baseRequest(`/homePage/hmsupervisioninspecti
 const requestDDL = (url, ...arg) => baseRequest(`/homePage/hmrelatedwebsitesconfig/` + url, ...arg)
 const requestRRT = (url, ...arg) => baseRequest(`/homePage/hmgovernmentaffairsconfig/` + url, ...arg)
 const requestEEC = (url, ...arg) => baseRequest(`/homePage/hminteractionconfig/` + url, ...arg)
-
+const requestRRY = (url, ...arg) => baseRequest(`/homePage/hmpartyhistoryedu/` + url, ...arg)
+const requestPPO = (url, ...arg) => baseRequest(`/homePage/hmcarouselconfig/` + url, ...arg)
+const requestUUO = (url, ...arg) => baseRequest(`/sys/user/` + url, ...arg)
 //
 export default {
+	pagelist(data) {
+		return requestUUO('list', data, 'get')
+	},
+
 	configPage(data) {
 		return request('page', data, 'get')
 	},
@@ -122,5 +128,39 @@ export default {
 	},
 	HDJLadd(data) {
 		return requestEEC('disposition', data, 'post')
+	},
+	//轮播信息管理
+	LUNBOTUlist(data) {
+		return requestRRY('findPage', data, 'get')
+	},
+	// 禁用启用
+	batchUpdateStatus(data) {
+		return requestRRY('batchUpdateStatus', data, 'post')
+	},
+	//add
+	LUNBOTUadd(data) {
+		return requestPPO('add', data, 'post')
+	},
+	LUNBOTUdetail(data) {
+		return requestPPO('detail', data, 'get')
+	},
+	LUNBOTUedit(data) {
+		return requestPPO('edit', data, 'post')
+	},
+	LUNBOTUdel(data) {
+		return requestPPO('delete', data, 'post')
+	},
+	//党史学习教育表
+	DANGSHIXXIadd(data) {
+		return requestRRY('add', data, 'post')
+	},
+	DANGSHIXXIdetail(data) {
+		return requestRRY('detail', data, 'get')
+	},
+	DANGSHIXXIedit(data) {
+		return requestRRY('edit', data, 'post')
+	},
+	DANGSHIXXIdel(data) {
+		return requestRRY('delete', data, 'post')
 	}
 }

src/hook/enumMap.js

@@ -1,158 +1,16 @@
 // import { onMounted, ref, onBeforeUnmount, computed, reactive } from 'vue'
 import { enumMaplistStore } from '@/store'
 
-export function enumMap () {
+export function enumMap() {
 	const StoreDEl = enumMaplistStore()
-	const { enumMap, parentMap } = StoreDEl.enumMaplist
-	const cocName = (id = '') => {
-		const name = enumMap[id]
-		return name
-	}
-	const cocID = (id) => {
-		const name = enumMap[id]
-		return id
-	}
-	const getEnumByEnumCode = (enumCode) => {
-		for (const key of Object.keys(parentMap)) {
-			const arr = parentMap[key]
-			for (const enumData of arr) {
-				if (enumData.enumid == enumCode) {
-					// console.log(enumData)
-					if (!enumData.enumname) return console.log('取不到')
-					// console.log(enumData.enumname)
-					return enumData.enumname
-				}
-			}
-		}
-		console.warn('没有找到 enum code', enumCode)
-		return null
-	}
-	const getEnumListByEnumId = (enumId) => {
-		return parentMap[enumId]
-	}
-
-	const YES_NO_3 = [
-		{ value: '1', label: '能' },
-		{ value: '0', label: '否' },
-		{ value: '9', label: '其他或不确定' }
-	]
-
-	const cocDEl = (id) => {
-		for (const item of YES_NO_3) {
-			if (item.value == id) return item.label
-		}
-	}
-
-	const LEVEL_TYPE_3 = [
-		{ value: '1', label: 'Ⅰ级' },
-		{ value: '2', label: 'Ⅱ级' },
-		{ value: '3', label: 'Ⅲ级' },
-		{ value: '4', label: 'Ⅳ级' }
-	]
-
-	const cocDElⅣ = (id) => {
-		for (const item of LEVEL_TYPE_3) {
-			if (item.value == id) return item.label
-		}
-	}
-
-	const LEVEL_TYPE_5 = [
-		{ value: '1', label: 'Ⅰ级' },
-		{ value: '2', label: 'Ⅱ级' },
-		{ value: '3', label: 'Ⅲ级' },
-		{ value: '4', label: '无粮情检测技术' }
-	]
+	const res = StoreDEl.enumMaplist
 
-	const cocDElⅣV = (id) => {
-		for (const item of LEVEL_TYPE_5) {
-			if (item.value == id) return item.label
-		}
-	}
-
-	const TFXTXS = [
-		{ value: '0', label: '竖向通风' },
-		{ value: '1', label: '横向通风' },
-		{ value: '2', label: '径向通风' },
-		{ value: '3', label: '全网板通风' },
-		{ value: '4', label: '其它' }
-	]
-
-	const cocTFXTXS = (id) => {
-		for (const item of TFXTXS) {
-			if (item.value == id) return item.label
-		}
-	}
-	const DLMXS = [
-		{ value: '01', label: '“一字型”挡粮板' },
-		{ value: '02', label: '“三角形”挡粮门' },
-		{ value: '03', label: '“弧形”挡粮门' },
-		{ value: '04', label: '围包' },
-		{ value: '05', label: '其它型式' }
-	]
 	const cocDLMXS = (id) => {
-		for (const item of DLMXS) {
-			if (item.value == id) return item.label
-		}
-	}
-
-	const BUG_INSPECTION_TYPE = [
-		{ value: '01', label: '远程检测预警' },
-		{ value: '02', label: '人工手动筛查' },
-		{ value: '03', label: '其它' }
-	]
-	const cocBUG_INSPECTION_TYPE = (id) => {
-		for (const item of BUG_INSPECTION_TYPE) {
-			if (item.value == id) return item.label
-		}
-	}
-
-	const GRANARY_STATUS = [
-		{ value: '1', label: '完好' },
-		{ value: '2', label: '需小修' },
-		{ value: '3', label: '需大修' },
-		{ value: '4', label: '待报废' },
-		{ value: '5', label: '待拆除' },
-		{ value: '6', label: '死角仓' },
-		{ value: '9', label: '其他' }
-	]
-
-	const cocGRANARY_STATUS = (id) => {
-		for (const item of GRANARY_STATUS) {
-			if (item.value == id) return item.label
-		}
-	}
-	const PROPERTY_RIGHTS = [
-		{ value: '1', label: '自有' },
-		{ value: '2', label: '租赁' },
-		{ value: '3', label: '共有' },
-		{ value: '4', label: '混合' },
-		{ value: '9', label: '其他' }
-	]
-	const cocPROPERTY_RIGHTS = (id) => {
-		for (const item of PROPERTY_RIGHTS) {
-			if (item.value == id) return item.label
-		}
-	}
-	const YES_NO = [
-		{ value: '1', label: '是' },
-		{ value: '0', label: '否' }
-	]
-	const cocYES_NO = (id) => {
-		for (const item of YES_NO) {
-			if (item.value == id) return item.label
+		for (const item of res) {
+			if (item.id == id) return item.name
 		}
 	}
 	return {
-		cocYES_NO,
-		cocPROPERTY_RIGHTS,
-		cocName,
-		getEnumByEnumCode,
-		cocDEl,
-		cocDElⅣ,
-		cocDElⅣV,
-		cocTFXTXS,
-		cocDLMXS,
-		cocBUG_INSPECTION_TYPE,
-		cocGRANARY_STATUS
+		cocDLMXS
 	}
 }

src/layout/components/userbar.vue

@@ -98,6 +98,7 @@
 				onOk() {
 					message.loading('正在清理中...', 1)
 					tool.data.clear()
+					localStorage.removeItem('enumMaplist')
 					setTimeout(() => {
 						router.replace({ path: '/login' })
 						location.reload()
@@ -128,6 +129,7 @@
 							tool.data.remove('MENU')
 							tool.data.remove('PERMISSIONS')
 							router.replace({ path: '/login' })
+							localStorage.removeItem('enumMaplist')
 						})
 						.catch(() => {
 							tool.data.clear()

src/store/enumMap.js

@@ -0,0 +1,18 @@
+import { defineStore } from 'pinia'
+import businessDEl from '@/api/home/home.js'
+
+export const enumMaplistStore = defineStore('enumMaplist', () => {
+	// 定义state
+	const enumMaplist = ref(JSON.parse(localStorage.getItem('enumMaplist')) || [])
+
+	const businessDElasync = async () => {
+		const res = await businessDEl.pagelist()
+		console.log(444)
+		enumMaplist.value = []
+		enumMaplist.value = res
+		localStorage.setItem('enumMaplist', JSON.stringify(res))
+		console.log(res)
+	}
+
+	return { enumMaplist, businessDElasync }
+})

src/store/index.js

@@ -3,3 +3,4 @@ export * from './search'
 export * from './iframe'
 export * from './keepAlive'
 export * from './viewTags'
+export * from './enumMap'

src/views/auth/login/login.vue

@@ -107,7 +107,7 @@
 	import configData from '@/config'
 	import configApi from '@/api/dev/configApi'
 	import tool from '@/utils/tool'
-	import { globalStore, iframeStore, keepAliveStore, viewTagsStore } from '@/store'
+	import { globalStore, iframeStore, keepAliveStore, viewTagsStore, enumMaplistStore } from '@/store'
 	const { proxy } = getCurrentInstance()
 
 	const activeKey = ref('userAccount')
@@ -146,6 +146,8 @@
 	const kStore = keepAliveStore()
 	const iStore = iframeStore()
 	const vStore = viewTagsStore()
+	const StoreDEl = enumMaplistStore()
+	const businessDElasync = StoreDEl.businessDElasync
 
 	const setSysBaseConfig = store.setSysBaseConfig
 	const clearKeepLive = kStore.clearKeepLive
@@ -230,6 +232,7 @@
 				loading.value = false
 				loginCaptcha()
 			}
+			businessDElasync()
 		})
 	}
 	const configLang = (key) => {

src/views/home/Configuration/index.vue

@@ -161,7 +161,7 @@
 	.box1 {
 		width: 250px;
 		height: 250px;
-		.img_del_add {
+		.img_del {
 			border: 1px solid #e4e4e4;
 			width: 160px;
 			height: 160px;

src/views/home/LBmanagement/form.vue

@@ -1,23 +1,16 @@
 <template>
+	<!-- 轮播图配置 -->
 	<xn-form-container :title="'基本设置'" :width="800" :visible="visible" :destroy-on-close="true" @close="onClose">
-		<a-form
-			:model="formState"
-			ref="formStateRef"
-			:rules="formStateRules"
-			name="basic"
-			autocomplete="off"
-			@finish="onFinish"
-			@finishFailed="onFinishFailed"
-		>
+		<a-form :model="formState" ref="formStateRef" :rules="formStateRules" name="basic" autocomplete="off">
 			<div class="form">
 				<a-row>
 					<a-col :span="12">
-						<a-form-item class="form-item" label="跳转链接" name="systemName" :label-col="{ span: 10 }">
+						<a-form-item class="form-item" label="跳转链接" name="redirectUrl" :label-col="{ span: 10 }">
 							<a-input
 								placeholder="请输入跳转链接"
 								style="width: 600px"
 								:disabled="disabled"
-								v-model:value="formState.systemName"
+								v-model:value="formState.redirectUrl"
 							/>
 						</a-form-item>
 					</a-col>
@@ -33,15 +26,15 @@
 						:disabled="disabled"
 						:change="changeUpload"
 						listType="picture-card"
-						v-model:urls="formState.attachment"
+						v-model:urls="formState.carouselImage"
 					></DIYUPLoad>
 				</a-form-item>
 			</div>
 
 			<a-form-item>
 				<div class="item-submit">
-					<a-button class="btn1" :disabled="disabled" html-type="submit" @click="onClose">提交</a-button>
-					<a-button class="btn1" :disabled="disabled" type="primary" html-type="submit">保存</a-button>
+					<a-button class="btn1" :disabled="disabled" @click="onFinish(2)">提交</a-button>
+					<a-button class="btn1" :disabled="disabled" type="primary" @click="onFinish(1)">保存</a-button>
 				</div>
 			</a-form-item>
 		</a-form>
@@ -72,29 +65,26 @@
 					detail(row.id)
 				}
 			}
+			const rest = () => {
+				for (let key in formState.value) {
+					formState.value[key] = ''
+				}
+			}
 			const detail = async (v) => {
-				const res = await {}({ id: v })
+				const res = await business.LUNBOTUdetail({ id: v })
 				formState.value = res
-				formState.value.attachment = res.attachment.split(',')
-				formState.value.createUser = res.createUserName
-				console.log(formState.value)
+				formState.value.carouselImage = (res.carouselImage || '').split(',').filter((v) => v)
 			}
 			const onClose = () => {
 				visible.value = false
+				rest()
 			}
 			watch(
 				() => visible.value,
 				(newVal) => {
 					if (!newVal) {
 						setTimeout(() => {
-							formState.value = {
-								systemName: '',
-								createUser: JSON.parse(localStorage.getItem('USER_INFO')).name,
-								publishTime: '',
-								publishContent: '',
-								attachment: '',
-								id: ''
-							}
+							rest()
 						}, 0)
 					}
 				},
@@ -102,41 +92,37 @@
 			)
 
 			const formState = ref({
-				systemName: '',
-				createUser: JSON.parse(localStorage.getItem('USER_INFO')).name,
-				publishTime: '',
-				publishContent: '',
-				attachment: '',
-				id: ''
+				redirectUrl: '',
+				carouselImage: '',
+				status: 0
 			})
 			const formStateRules = ref({
-				systemName: [{ required: true, message: '请填写!', trigger: 'blur' }],
-				publishTime: [{ required: true, message: '请填写!', trigger: 'change' }],
-				attachment: [{ required: true, message: '请填写!', trigger: 'change' }]
+				// systemName: [{ required: true, message: '请填写!', trigger: 'blur' }],
+				// publishTime: [{ required: true, message: '请填写!', trigger: 'change' }],
+				// attachment: [{ required: true, message: '请填写!', trigger: 'change' }]
 			})
 			const formStateRef = ref(null)
-
-			const onFinish = async (values) => {
-				formState.value.attachment = values.attachment.join(',')
-				await handleAdd(formState.value)
-				emit('change')
-				formState.value = {
-					systemName: '',
-					createUser: '',
-					publishTime: '',
-					publishContent: '',
-					attachment: '',
-					id: ''
-				}
-				onClose()
+			const onFinish = async (status) => {
+				formStateRef.value.validate().then(async () => {
+					try {
+						if (Array.isArray(formState.value.carouselImage)) {
+							formState.value.carouselImage = formState.value.carouselImage.join(',')
+						}
+						formState.value.status = status
+						await handleAdd(formState.value)
+						emit('change')
+						onClose()
+					} catch (err) {
+						console.log(err)
+					}
+				})
 			}
 
 			const handleAdd = async (val) => {
 				if (records.value == 'edit') {
-					console.log(records.value)
-					const res = await {}(val)
+					const res = await business.LUNBOTUedit(val)
 				} else {
-					const res = await {}(val)
+					const res = await business.LUNBOTUadd(val)
 					console.log('add')
 				}
 			}

src/views/home/LBmanagement/formCopy.vue

@@ -1,33 +1,25 @@
 <template>
 	<xn-form-container :title="'基本设置'" :width="800" :visible="visible" :destroy-on-close="true" @close="onClose">
-		<a-form
-			:model="formState"
-			ref="formStateRef"
-			:rules="formStateRules"
-			name="basic"
-			autocomplete="off"
-			@finish="onFinish"
-			@finishFailed="onFinishFailed"
-		>
-			<a-form-item ref="uploadDataList" class="form-item" label="轮播图" name="attachment" :label-col="{ span: 3 }">
+		<a-form :model="formState" ref="formStateRef" :rules="formStateRules" name="basic" autocomplete="off">
+			<a-form-item ref="uploadDataList" class="form-item" label="轮播图" name="carousel" :label-col="{ span: 3 }">
 				<DIYUPLoad
 					:beforeUpload="beforeUpload"
 					multiple
 					:disabled="disabled"
 					:change="changeUpload"
 					listType="picture-card"
-					v-model:urls="formState.attachment"
+					v-model:urls="formState.carousel"
 				></DIYUPLoad>
 			</a-form-item>
 			<div class="form">
 				<a-row>
 					<a-col :span="12">
-						<a-form-item class="form-item" label="标题" name="systemName" :label-col="{ span: 10 }">
+						<a-form-item class="form-item" label="标题" name="title" :label-col="{ span: 10 }">
 							<a-input
 								placeholder="请输入标题"
 								style="width: 600px"
 								:disabled="disabled"
-								v-model:value="formState.systemName"
+								v-model:value="formState.title"
 							/>
 						</a-form-item>
 					</a-col>
@@ -44,19 +36,19 @@
 						</a-form-item>
 					</a-col>
 					<a-col :span="12">
-						<a-form-item class="form-item" label="新闻来源" name="createUser" :label-col="{ span: 10 }">
-							<a-input style="width: 250px" :disabled="true" v-model:value="formState.createUser" />
+						<a-form-item class="form-item" label="新闻来源" name="source" :label-col="{ span: 10 }">
+							<a-input style="width: 250px" :disabled="disabled" v-model:value="formState.source" />
 						</a-form-item>
 					</a-col>
 				</a-row>
 
 				<a-row>
 					<a-col :span="12">
-						<a-form-item class="form-item" label="公告内容" name="createUser" :label-col="{ span: 10 }">
+						<a-form-item class="form-item" label="公告内容" name="announcementContent" :label-col="{ span: 10 }">
 							<a-textarea
 								style="width: 600px"
 								placeholder="请输入公告内容"
-								v-model:value="formState.publishContent"
+								v-model:value="formState.announcementContent"
 								:disabled="disabled"
 								allow-clear
 							/>
@@ -72,14 +64,14 @@
 						multiple
 						:disabled="disabled"
 						:change="changeUpload"
-						v-model:urls="formState.attachment"
+						v-model:urls="formState.attachments"
 					></DIYUPLoad>
 				</a-form-item>
 			</div>
 			<a-form-item>
 				<div class="item-submit">
-					<a-button class="btn1" :disabled="disabled" html-type="submit" @click="onClose">提交</a-button>
-					<a-button class="btn1" :disabled="disabled" type="primary" html-type="submit">保存</a-button>
+					<a-button class="btn1" :disabled="disabled" @click="onFinish(2)">提交</a-button>
+					<a-button class="btn1" :disabled="disabled" type="primary" @click="onFinish(1)">保存</a-button>
 				</div>
 			</a-form-item>
 		</a-form>
@@ -110,12 +102,16 @@
 					detail(row.id)
 				}
 			}
+			const rest = () => {
+				for (let key in formState.value) {
+					formState.value[key] = ''
+				}
+			}
 			const detail = async (v) => {
-				const res = await {}({ id: v })
+				const res = await business.DANGSHIXXIdetail({ id: v })
 				formState.value = res
-				formState.value.attachment = res.attachment.split(',')
-				formState.value.createUser = res.createUserName
-				console.log(formState.value)
+				formState.value.attachments = (res.attachments || '').split(',').filter((v) => v)
+				formState.value.carousel = (res.carousel || '').split(',').filter((v) => v)
 			}
 			const onClose = () => {
 				visible.value = false
@@ -125,14 +121,7 @@
 				(newVal) => {
 					if (!newVal) {
 						setTimeout(() => {
-							formState.value = {
-								systemName: '',
-								createUser: JSON.parse(localStorage.getItem('USER_INFO')).name,
-								publishTime: '',
-								publishContent: '',
-								attachment: '',
-								id: ''
-							}
+							rest()
 						}, 0)
 					}
 				},
@@ -140,41 +129,43 @@
 			)
 
 			const formState = ref({
-				systemName: '',
-				createUser: JSON.parse(localStorage.getItem('USER_INFO')).name,
+				carousel: '',
+				title: '',
 				publishTime: '',
-				publishContent: '',
-				attachment: '',
-				id: ''
+				source: '',
+				announcementContent: '',
+				attachments: '',
+				status: 0
 			})
 			const formStateRules = ref({
-				systemName: [{ required: true, message: '请填写!', trigger: 'blur' }],
-				publishTime: [{ required: true, message: '请填写!', trigger: 'change' }],
-				attachment: [{ required: true, message: '请填写!', trigger: 'change' }]
+				// systemName: [{ required: true, message: '请填写!', trigger: 'blur' }],
+				// publishTime: [{ required: true, message: '请填写!', trigger: 'change' }],
+				// attachment: [{ required: true, message: '请填写!', trigger: 'change' }]
 			})
 			const formStateRef = ref(null)
 
-			const onFinish = async (values) => {
-				formState.value.attachment = values.attachment.join(',')
-				await handleAdd(formState.value)
-				emit('change')
-				formState.value = {
-					systemName: '',
-					createUser: '',
-					publishTime: '',
-					publishContent: '',
-					attachment: '',
-					id: ''
-				}
-				onClose()
+			const onFinish = async (status) => {
+				formStateRef.value.validate().then(async () => {
+					try {
+						if (Array.isArray(formState.value.attachments) || Array.isArray(formState.value.carousel)) {
+							formState.value.attachments = formState.value.attachments.join(',')
+							formState.value.carousel = formState.value.carousel.join(',')
+						}
+						formState.value.status = status
+						await handleAdd(formState.value)
+						emit('change')
+						onClose()
+					} catch (err) {
+						console.log(err)
+					}
+				})
 			}
 
 			const handleAdd = async (val) => {
 				if (records.value == 'edit') {
-					console.log(records.value)
-					const res = await {}(val)
+					const res = await business.DANGSHIXXIedit(val)
 				} else {
-					const res = await {}(val)
+					const res = await business.DANGSHIXXIadd(val)
 					console.log('add')
 				}
 			}

src/views/home/LBmanagement/index.vue

@@ -7,16 +7,17 @@
 					<span style="width: 70px; margin-right: 8px; text-align: right; display: block; line-height: 30px">{{
 						'标题'
 					}}</span>
-					<a-input style="width: 220px" v-model:value="SearchFormDel.unitName" placeholder="请输入" />
+					<a-input style="width: 220px" v-model:value="SearchFormDel.title" placeholder="请输入" />
 				</div>
 				<div class="silt-title">
 					<span style="width: 70px; margin-right: 8px; text-align: right; display: block; line-height: 30px">{{
 						'状态'
 					}}</span>
 
-					<a-select style="width: 220px" v-model:value="SearchFormDel.unitName">
-						<a-select-option :value="1">禁用</a-select-option>
+					<a-select style="width: 220px" v-model:value="SearchFormDel.status">
+						<a-select-option :value="3">禁用</a-select-option>
 						<a-select-option :value="2">启用</a-select-option>
+						<a-select-option :value="1">保存</a-select-option>
 					</a-select>
 				</div>
 				<div class="btnBox">
@@ -25,8 +26,8 @@
 				</div>
 			</a-space>
 			<div class="btnBox">
-				<a-button type="primary" class="primarySele" @click="onView('add', {}, 1)"> 新增轮播图配置 </a-button>
-				<a-button type="primary" class="primarySele" @click="onView('add', {}, 2)"> 新增党史学习教育 </a-button>
+				<a-button type="primary" class="primarySele" @click="onView('add', {}, 2)"> 新增轮播图配置 </a-button>
+				<a-button type="primary" class="primarySele" @click="onView('add', {}, 1)"> 新增党史学习教育 </a-button>
 				<a-button
 					class="btnl colro primarySele"
 					type="primary"
@@ -34,10 +35,7 @@
 					:loading="state.loading"
 					@click="start"
 				>
-					批量共享
-				</a-button>
-				<a-button class="btnl colro" type="primary" :disabled="!hasSelected" :loading="state.loading" @click="start">
-					批量禁用
+					批量操作(启用/禁用)
 				</a-button>
 			</div>
 		</a-card>
@@ -51,21 +49,31 @@
 				:row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
 			>
 				<template #bodyCell="{ column, record }">
-					<template v-if="column.dataIndex === 'isShare'">
+					<template v-if="column.dataIndex === 'status'">
 						<div class="switch_del">
 							<a-switch
-								:checked="record.isShare == '0' ? false : true"
-								:checked-children="'是'"
-								:un-checked-children="'否'"
+								v-if="record.status !== 1"
+								:checked="record.status == 2 ? true : false"
+								:checked-children="'启用'"
+								:un-checked-children="'禁用'"
+								@change="handleSwitchChange(record)"
+								size="default"
+							/>
+							<a-switch
+								v-if="record.status == 1"
+								:checked="record.status == 1 ? false : true"
+								:checked-children="'启用'"
+								:un-checked-children="'保存'"
 								@change="handleSwitchChange(record)"
 								size="default"
 							/>
 						</div>
 					</template>
+					<template v-if="column.dataIndex === 'createUser'">
+						{{ cocDLMXS(record.createUser) }}
+					</template>
 					<template v-if="column.key === '操作'">
 						<a-button type="link" @click="onView('view', record)">查看</a-button>
-
-						<a-button type="link">状态</a-button>
 						<a-button type="link" @click="onView('edit', record)">编辑</a-button>
 						<a-popconfirm title="确定要删除吗？" @confirm="onView('del', record)">
 							<a-button type="link">删除</a-button>
@@ -87,10 +95,11 @@
 	import { message } from 'ant-design-vue'
 	import Form from './form.vue'
 	import Formcode from './formCopy.vue'
+	import { enumMap } from '@/hook/enumMap.js'
+	const { cocDLMXS } = enumMap()
 	const router = useRouter()
 
 	const tableColumns = [
-		// { title: '序号', key: 'INDEX' },
 		{
 			title: '序号',
 			dataIndex: 'INDEX',
@@ -99,21 +108,43 @@
 				return `${index + 1}`
 			}
 		},
-		{ title: '标题', align: 'center', dataIndex: 'unitName' },
-		{ title: '来源', align: 'center', dataIndex: 'creditLevel' },
-		{ title: '状态', align: 'center', dataIndex: 'assessResult' },
-		{ title: '发布人', align: 'center', dataIndex: 'assessResultDepict' },
-		{ title: '发布时间', align: 'center', dataIndex: 'isShare' },
+		{
+			title: '标题',
+			align: 'center',
+			dataIndex: 'title',
+			customRender: ({ text, record, index }) => {
+				return `${record.title ? record.title : '-'}`
+			}
+		},
+		{
+			title: '来源',
+			align: 'center',
+			dataIndex: 'source',
+			customRender: ({ text, record, index }) => {
+				return `${record.source ? record.source : '-'}`
+			}
+		},
+		{ title: '状态', align: 'center', dataIndex: 'status' },
+		{
+			title: '发布人',
+			align: 'center',
+			dataIndex: 'createUser',
+			customRender: ({ text, record, index }) => {
+				return `${record.createUser ? record.createUser : '-'}`
+			}
+		},
+		{ title: '发布时间', align: 'center', dataIndex: 'publishTime' },
 		{ title: '操作', align: 'center', key: '操作' }
 	]
 
 	//共享
 	const handleSwitchChange = async (v) => {
-		// console.log(v)
-		if (v.isShare == 1) {
-			const res = await {}([{ id: v.id, isShare: 0 }])
-		} else {
-			const res = await {}([{ id: v.id, isShare: 1 }])
+		if (v.status == 1) {
+			const res = await business.batchUpdateStatus([{ id: v.id, status: 2, type: +v.type }])
+		} else if (v.status == 2) {
+			const res = await business.batchUpdateStatus([{ id: v.id, status: 3, type: +v.type }])
+		} else if (v.status == 3) {
+			const res = await business.batchUpdateStatus([{ id: v.id, status: 2, type: +v.type }])
 		}
 		message.success('操作成功')
 		await onSearch()
@@ -126,9 +157,10 @@
 	const hasSelected = computed(() => state.selectedRowKeys.length > 0)
 	const start = async () => {
 		state.loading = true
-		const res = await {}(del.value)
+		const res = await business.batchUpdateStatus(del.value)
 		setTimeout(() => {
 			state.loading = false
+			state.selectedRowKeys = []
 			message.success('操作成功')
 			onSearch()
 		}, 300)
@@ -140,40 +172,62 @@
 		state.selectedRowKeys = selectedRowKeys
 		del.value = state.selectedRowKeys.map((item) => {
 			return {
+				type: +item.type,
 				id: item.id,
-				isShare: 1
+				status: item.status === 1 ? 2 : item.status === 2 ? 3 : 2
 			}
 		})
-		console.log(del.value)
 	}
 
-	const { DEl, change, tableData, onSearch, handlePageChange, pagination, Search, onReset, SearchFormDel } =
-		listPagination({ unitName: '' }, business.configPage, {}, { isEntAppQuery: 1, sortOrder: 'ASCEND' })
+	const { change, tableData, onSearch, handlePageChange, pagination, Search, onReset, SearchFormDel } = listPagination(
+		{ title: '', status: '' },
+		business.LUNBOTUlist,
+		{},
+		{ isEntAppQuery: 1, sortOrder: 'ASCEND' }
+	)
+	const DEl = async (row) => {
+		const res = await business.LUNBOTUdel([{ id: row.id }])
+		onSearch()
+	}
+
+	const DElCOP = async (row) => {
+		const res = await business.DANGSHIXXIdel([{ id: row.id }])
+		onSearch()
+	}
 
-	setTimeout(() => {
-		tableData.value = [{ unitName: '33' }]
-	}, 900)
 	// 查看表单数据
 	const formRef = ref(null)
 	const formRefcode = ref(null)
-
+	// 状态，1党史教育 2轮播图配置；
 	const onView = (record, row, code) => {
 		switch (record) {
 			case 'add':
 				if (code == 1) {
-					formRef.value.onOpen(record, true, false)
-				} else {
 					formRefcode.value.onOpen(record, true, false)
+				} else {
+					formRef.value.onOpen(record, true, false)
 				}
 				break
 			case 'del':
-				DEl(row)
+				if (row.type == 1) {
+					DElCOP(row)
+				} else {
+					DEl(row)
+				}
 				break
 			case 'view':
-				formRef.value.onOpen(record, true, true, row)
+				if (row.type == 1) {
+					formRefcode.value.onOpen(record, true, true, row)
+				} else {
+					formRef.value.onOpen(record, true, true, row)
+				}
 				break
 			case 'edit':
-				formRef.value.onOpen(record, true, false, row)
+				if (row.type == 1) {
+					formRefcode.value.onOpen(record, true, false, row)
+				} else {
+					formRef.value.onOpen(record, true, false, row)
+				}
 				break
 			default:
 				break

src/views/home/Related/index.vue

@@ -55,6 +55,9 @@
 							/>
 						</div>
 					</template>
+					<template v-if="column.dataIndex === 'createUser'">
+						{{ cocDLMXS(record.createUser) }}
+					</template>
 					<template v-if="column.key === '操作'">
 						<a-button type="link" @click="onView('view', record)">查看</a-button>
 						<a-button type="link" @click="onView('edit', record)">编辑</a-button>
@@ -76,6 +79,8 @@
 	import { defineComponent } from 'vue'
 	import { message } from 'ant-design-vue'
 	import Form from './form.vue'
+	import { enumMap } from '@/hook/enumMap.js'
+	const { cocDLMXS } = enumMap()
 
 	const formRef = ref(null)
 	const router = useRouter()

src/views/home/Supervision/index.vue

@@ -66,6 +66,9 @@
 							/>
 						</div>
 					</template>
+					<template v-if="column.dataIndex === 'createUser'">
+						{{ cocDLMXS(record.createUser) }}
+					</template>
 					<template v-if="column.key === '操作'">
 						<a-button type="link" @click="onView('view', record)">查看</a-button>
 						<a-button type="link" @click="onView('edit', record)">编辑</a-button>
@@ -87,6 +90,8 @@
 	import { defineComponent } from 'vue'
 	import { message } from 'ant-design-vue'
 	import Form from './form.vue'
+	import { enumMap } from '@/hook/enumMap.js'
+	const { cocDLMXS } = enumMap()
 
 	const formRef = ref(null)
 	const router = useRouter()

src/views/home/carousel/index.vue

@@ -66,6 +66,9 @@
 							/>
 						</div>
 					</template>
+					<template v-if="column.dataIndex === 'createUser'">
+						{{ cocDLMXS(record.createUser) }}
+					</template>
 					<template v-if="column.key === '操作'">
 						<a-button type="link" @click="onView('view', record)">查看</a-button>
 						<a-button type="link" @click="onView('edit', record)">编辑</a-button>
@@ -87,6 +90,8 @@
 	import { defineComponent } from 'vue'
 	import { message } from 'ant-design-vue'
 	import Form from './form.vue'
+	import { enumMap } from '@/hook/enumMap.js'
+	const { cocDLMXS } = enumMap()
 	const router = useRouter()
 
 	const tableColumns = [

src/views/home/tabloid/form.vue

@@ -93,10 +93,12 @@
 			}
 			const detail = async (v) => {
 				const res = await business.IMGXWdetail({ id: v })
-				formState.value.newsImages = (res.newsImages || '').split(',').filter((v) => v)
-
-				// (FeedbackDialog.row.sysOrgId || '').split(',').filter((v) => v)
 				formState.value = res
+				formState.value.newsImages = (res.newsImages || '').split(',').filter((v) => v)
+				// if (res.newsImages) {
+				// 	formState.value.newsImages = res.newsImages.split(',')
+				// 	console.log(formState.value.newsImages)
+				// }
 			}
 			const onClose = () => {
 				visible.value = false
@@ -132,7 +134,9 @@
 				formStateRef.value.validate().then(async () => {
 					try {
 						formState.value.status = status
-						formState.value.newsImages = (formState.value.newsImages || []).filter((v) => v).join(',')
+						if (Array.isArray(formState.value.newsImages)) {
+							formState.value.newsImages = formState.value.newsImages.join(',')
+						}
 						await handleAdd(formState.value, status)
 						emit('change')
 						onClose()

src/views/home/tabloid/index.vue

@@ -66,6 +66,9 @@
 							/>
 						</div>
 					</template>
+					<template v-if="column.dataIndex === 'createUser'">
+						{{ cocDLMXS(record.createUser) }}
+					</template>
 					<template v-if="column.key === '操作'">
 						<a-button type="link" @click="onView('view', record)">查看</a-button>
 						<a-button type="link" @click="onView('edit', record)">编辑</a-button>
@@ -87,7 +90,8 @@
 	import { defineComponent } from 'vue'
 	import { message } from 'ant-design-vue'
 	import Form from './form.vue'
-
+	import { enumMap } from '@/hook/enumMap.js'
+	const { cocDLMXS } = enumMap()
 	const formRef = ref(null)
 	const router = useRouter()