Merge branch 'master' of http://8.140.26.4:10003/caijian/risk-monitor

src/api/decree/introduction.js

@@ -64,6 +64,13 @@ export function getDecreeSummary(params) {
 /**
  * @param {id} 
  */
+// export function getDecreeReport(params) {
+//     return request({
+//         method: 'GET',
+//         url: `/api/administrativeOrderInfo/contentUrl/${params.id}`,
+//     })
+// }
+
 export function getDecreeReport(params) {
     return request({
         method: 'GET',

src/views/decree/decreeHome/index.vue

@@ -113,8 +113,7 @@
 					</div>
 				</div>
 				<div class="home-main-header-item-box">
-					<div class="item" v-for="(item, index) in govInsList" :key="index"
-						@click="handleToInstitution(item)">
+					<div class="item" v-for="(item, index) in govInsList" :key="index" @click="handleToInstitution(item)">
 						<div class="item-left">
 							<img :src="item.img ? item.img : DefaultIcon2" alt="" />
 						</div>
@@ -156,7 +155,7 @@
 										<div v-else class="box1-main-left-img-mock">
 											<img class="img-mock-badge-img" src="./assets/images/badge.png">
 											<p class="img-mock-badge-title">行政令</p>
-											<p class="img-mock-badge-title">{{item.name}}</p>
+											<p class="img-mock-badge-title">{{ item.name }}</p>
 											<!-- <p class="img-mock-badge-org">The White House</p> -->
 										</div>
 									</div>
@@ -240,8 +239,7 @@
 							</div>
 						</div>
 						<div class="box3-main">
-							<div class="box3-item" v-for="(news, index) in newsList" :key="index"
-								@click="handleToNewsAnalysis(news)">
+							<div class="box3-item" v-for="(news, index) in newsList" :key="index" @click="handleToNewsAnalysis(news)">
 								<div class="left">
 									<img :src="news.img ? news.img : DefaultIconNews" alt="" />
 								</div>
@@ -269,9 +267,8 @@
 						</div>
 						<div class="box4-main">
 							<MessageBubble v-for="(item, index) in messageList" @click="handleClickPerson(item)"
-								@info-click="handleMediaClick(item)" :key="index"
-								:avatar="item.img ? item.img : DefaultIcon1" :name="item.name" :time="item.time"
-								:source="item.source" :content="item.content" />
+								@info-click="handleMediaClick(item)" :key="index" :avatar="item.img ? item.img : DefaultIcon1"
+								:name="item.name" :time="item.time" :source="item.source" :content="item.content" />
 							<!-- <div class="box4-main-item" v-for="(item, index) in messageList" :key="index">
 								<div class="left" @click="handleClickPerson(item)">
 									<img :src="item.img ? item.img : DefaultIcon1" alt="" />
@@ -300,8 +297,7 @@
 							<div class="box5-selectbox">
 								<el-select @change="handleBox5YearChange" v-model="box5SelectedYear" placeholder="选择时间"
 									style="width: 120px">
-									<el-option v-for="item in box5YearList" :key="item.value" :label="item.label"
-										:value="item.value" />
+									<el-option v-for="item in box5YearList" :key="item.value" :label="item.label" :value="item.value" />
 								</el-select>
 							</div>
 						</div>
@@ -319,8 +315,7 @@
 							<div class="box6-selectbox">
 								<el-select @change="handleBox6YearChange" v-model="box6SelectedYear" placeholder="选择时间"
 									style="width: 120px">
-									<el-option v-for="item in box6YearList" :key="item.value" :label="item.label"
-										:value="item.value" />
+									<el-option v-for="item in box6YearList" :key="item.value" :label="item.label" :value="item.value" />
 								</el-select>
 							</div>
 						</div>
@@ -336,8 +331,7 @@
 							<div class="header-title">{{ "关键行政令" }}</div>
 						</div>
 						<div class="box7-main">
-							<div class="box7-item" v-for="(item, index) in keyDecreeList" :key="index"
-								@click="handleKeyDecree(item)">
+							<div class="box7-item" v-for="(item, index) in keyDecreeList" :key="index" @click="handleKeyDecree(item)">
 								<div class="icon">
 									<img src="./assets/images/warning.png" alt="" />
 								</div>
@@ -393,9 +387,9 @@
 							</div>
 							<div class="select-main">
 								<div class="checkbox-group">
-									<el-checkbox v-for="type in decreeTypeList" :key="type.id"
-										v-model="checkedDecreeType" :label="type.typeId" style="width: 180px"
-										class="filter-checkbox" @change="handleChangeCheckedDecreeType">
+									<el-checkbox v-for="type in decreeTypeList" :key="type.id" v-model="checkedDecreeType"
+										:label="type.typeId" style="width: 180px" class="filter-checkbox"
+										@change="handleChangeCheckedDecreeType">
 										{{ type.typeName }}
 									</el-checkbox>
 								</div>
@@ -408,9 +402,8 @@
 							</div>
 							<div class="select-main">
 								<div class="checkbox-group">
-									<el-checkbox v-for="cate in govInsList" :key="cate.id" v-model="checkedGovIns"
-										:label="cate.id" style="width: 180px" class="filter-checkbox"
-										@change="handleChangeCheckedGovIns">
+									<el-checkbox v-for="cate in govInsList" :key="cate.id" v-model="checkedGovIns" :label="cate.id"
+										style="width: 180px" class="filter-checkbox" @change="handleChangeCheckedGovIns">
 										{{ cate.name }}
 									</el-checkbox>
 								</div>
@@ -423,8 +416,9 @@
 							</div>
 							<div class="select-main">
 								<div class="checkbox-group">
-									<el-checkbox v-for="time in pubTime" :key="time.id" v-model="activePubTime"
-										:label="time.id" style="width: 100px" class="filter-checkbox">
+									<el-checkbox v-for="time in pubTime" :key="time.id" v-model="activePubTime" :label="time.id"
+										style="width: 100px" class="filter-checkbox"
+										@change="(checked) => handlePubTimeChange(time.id, checked)">
 										{{ time.name }}
 									</el-checkbox>
 								</div>
@@ -437,8 +431,8 @@
 							</div>
 							<div class="select-main select-main1">
 								<div class="checkbox-group">
-									<el-checkbox v-for="area in areaList" :key="area.id" v-model="activeAreaList"
-										:label="area.id" style="width: 100px">
+									<el-checkbox v-for="area in areaList" :key="area.id" v-model="activeAreaList" :label="area.id"
+										style="width: 100px" @change="(checked) => handleAreaChange(area.id, checked)">
 										{{ area.name }}
 									</el-checkbox>
 								</div>
@@ -457,7 +451,8 @@
 								@click="handleClickDecree(item)">
 								<div class="main-item-left">
 
-									<div class="left-left">{{ item.time.split('-')[0] }}<br>{{ item.time.split('-')[1]}}月{{ item.time.split('-')[2] }}日</div>
+									<div class="left-left">{{ item.time.split('-')[0] }}<br>{{ item.time.split('-')[1] }}月{{
+										item.time.split('-')[2] }}日</div>
 									<div class="left-right">
 										<div class="icon">
 											<img :src="item.orgImage ? item.orgImage : DefaultIcon2" alt="" />
@@ -493,9 +488,8 @@
 								{{ `共 ${totalDecreesNum} 项` }}
 							</div>
 							<div class="footer-right">
-								<el-pagination @current-change="handleCurrentChange" :pageSize="10"
-									:current-page="currentPage" background layout="prev, pager, next"
-									:total="totalDecreesNum" />
+								<el-pagination @current-change="handleCurrentChange" :pageSize="10" :current-page="currentPage"
+									background layout="prev, pager, next" :total="totalDecreesNum" />
 							</div>
 						</div>
 					</div>
@@ -1078,7 +1072,7 @@ const handleBox8 = async () => {
 };
 
 // 资源库
-const isSort = ref(true); // true 升序  false 倒序
+const isSort = ref(false); // true 升序  false 倒序
 const handleSwithSort = () => {
 	isSort.value = !isSort.value;
 };
@@ -1113,21 +1107,21 @@ const areaList = ref([
 	// { id: "量子科技", name: "量子科技" }
 ]);
 const activeAreaList = ref(["1"]);
-const handleGetAreaList = async () => {
-	try {
-		const res = await getDecreehylyList();
-		console.log("行业领域列表", res);
-		if (res.code === 200 && res.data) {
-			areaList.value = res.data.map(item => {
-				return {
-					name: item.name,
-					id: item.id
-				};
-			});
-			console.log("areaList", areaList.value);
-		}
-	} catch (error) { }
-};
+// const handleGetAreaList = async () => {
+// 	try {
+// 		const res = await getDecreehylyList();
+// 		console.log("行业领域列表", res);
+// 		if (res.code === 200 && res.data) {
+// 			areaList.value = res.data.map(item => {
+// 				return {
+// 					name: item.name,
+// 					id: item.id
+// 				};
+// 			});
+// 			console.log("areaList", areaList.value);
+// 		}
+// 	} catch (error) { }
+// };
 
 // 政令类型
 const decreeTypeList = ref([]);
@@ -1148,6 +1142,7 @@ const handleChangeCheckedDecreeType = () => {
 }
 
 const pubTime = ref([
+	{ id: "all", name: "全选" },
 	{ id: "2026", name: "2026年" },
 	{ id: "2025", name: "2025年" },
 	{ id: "2024", name: "2024年" },
@@ -1155,27 +1150,111 @@ const pubTime = ref([
 	{ id: "2022", name: "2022年" },
 	{ id: "2021", name: "2021年" },
 	{ id: "2020", name: "2020年" }
-	// { id: "更早时间", name: "更早时间" }
 ]);
 const activePubTime = ref(["2026"]);
+// 处理发布时间全选逻辑
+const handlePubTimeChange = (id, checked) => {
+	const allIds = pubTime.value.filter(item => item.id !== 'all').map(item => item.id);
+
+	if (id === 'all') {
+		// 点击全选：选中所有或清空所有
+		activePubTime.value = checked ? ['all', ...allIds] : [];
+	} else {
+		const selectedIds = activePubTime.value.filter(itemId => itemId !== 'all');
+		const isAllSelected = selectedIds.length === allIds.length;
+
+		if (isAllSelected && !activePubTime.value.includes('all')) {
+			// 手动选中了所有年份，自动勾选全选
+			activePubTime.value = ['all', ...allIds];
+		} else if (!isAllSelected && activePubTime.value.includes('all')) {
+			// 取消某个选项，取消全选状态
+			activePubTime.value = selectedIds;
+		}
+	}
+
+};
+
+
+
+const handleAreaChange = (id, checked) => {
+	const allIds = areaList.value.filter(item => item.id !== 'all').map(item => item.id);
+
+	if (id === 'all') {
+		activeAreaList.value = checked ? ['all', ...allIds] : [];
+	} else {
+		const selectedIds = activeAreaList.value.filter(itemId => itemId !== 'all');
+		const isAllSelected = selectedIds.length === allIds.length;
+
+		if (isAllSelected && !activeAreaList.value.includes('all')) {
+			activeAreaList.value = ['all', ...allIds];
+		} else if (!isAllSelected && activeAreaList.value.includes('all')) {
+			activeAreaList.value = selectedIds;
+		}
+	}
+};
+
+// 修改获取涉及领域列表，添加全选选项
+const handleGetAreaList = async () => {
+	try {
+		const res = await getDecreehylyList();
+		console.log("行业领域列表", res);
+		if (res.code === 200 && res.data) {
+			areaList.value = [
+				{ name: "全选", id: "all" },
+				...res.data.map(item => {
+					return {
+						name: item.name,
+						id: item.id
+					};
+				})
+			];
+			// 设置默认全选
+			activeAreaList.value = ['all', ...res.data.map(item => item.id)];
+			console.log("areaList", areaList.value);
+			// 获取列表后重新查询
+			handleGetDecreeOrderList();
+		}
+	} catch (error) { }
+};
 
 const totalDecreesNum = ref(0);
 
 const decreeList = ref([]);
 
+// 修改请求方法，处理全选时不传参数的情况
 const handleGetDecreeOrderList = async () => {
 	const p0 = checkedGovIns.value.join(",");
-	const p1 = activeAreaList.value.join(",");
-	const p2 = activePubTime.value.join(",");
+
+	// 处理涉及领域：如果包含 all 或全选，则 researchTypeIds 为空（不传）
+	let p1 = '';
+	const allAreaIds = areaList.value.filter(item => item.id !== 'all').map(item => item.id);
+	const selectedAreaIds = activeAreaList.value.filter(id => id !== 'all');
+
+	if (!activeAreaList.value.includes('all') && selectedAreaIds.length > 0 && selectedAreaIds.length < allAreaIds.length) {
+		p1 = selectedAreaIds.join(",");
+	}
+	// 其他情况（包含all、长度为0、全部选中）p1保持为空，即不传researchTypeIds
+
+	// 处理发布时间：如果包含 all 或全选，则 years 为空（不传）
+	let p2 = '';
+	const allPubTimeIds = pubTime.value.filter(item => item.id !== 'all').map(item => item.id);
+	const selectedPubTimeIds = activePubTime.value.filter(id => id !== 'all');
+
+	if (!activePubTime.value.includes('all') && selectedPubTimeIds.length > 0 && selectedPubTimeIds.length < allPubTimeIds.length) {
+		p2 = selectedPubTimeIds.join(",");
+	}
+	// 其他情况（包含all、长度为0、全部选中）p2保持为空，即不传years
+	console.log(activePubTime.value, 'activePubTime.value')
 	const params = {
 		currentPage: 0,
 		pageSize: 999999,
 		proposeName: p0,
-		researchTypeIds: p1,
+		researchTypeIds: p1,  // 全选时不传（为空）
 		sortFun: isSort.value,
-		years: p2,
+		years: p2,            // 全选时不传（为空）
 		typeIds: checkedDecreeType.value.toString()
 	};
+
 	try {
 		const res = await getDecreeOrderList(params);
 		console.log("资源库列表", res);
@@ -1191,17 +1270,18 @@ const handleGetDecreeOrderList = async () => {
 					tagList: item.industryList
 				};
 			});
-
-			console.log("decreeList", decreeList.value);
 		} else {
 			decreeList.value = [];
+			totalDecreesNum.value = 0;
 		}
 	} catch (error) {
 		console.error("资源库列表error", error);
 		decreeList.value = [];
+		totalDecreesNum.value = 0;
 	}
 };
 
+
 const curDecreeList = computed(() => {
 	const startIndex = (currentPage.value - 1) * pageSize.value;
 	const endIndex = startIndex + pageSize.value;
@@ -3235,7 +3315,7 @@ onMounted(async () => {
 				gap: 16px;
 
 				.left {
-					width: 300px;
+					width: 360px;
 					// height: 666px;
 					box-shadow: 0px 0px 15px 0px rgba(60, 87, 126, 0.2);
 					background: rgba(255, 255, 255, 1);
@@ -3498,4 +3578,20 @@ onMounted(async () => {
 :deep(.el-input__wrapper.is-focus) {
 	box-shadow: none !important;
 }
+
+:deep(.el-checkbox__label) {
+	color: rgba(95, 101, 108, 1);
+
+	font-family: Source Han Sans CN;
+	font-style: Regular;
+	font-size: 16px;
+	font-weight: 400;
+	line-height: 24px;
+	letter-spacing: 0px;
+	text-align: justify;
+}
+
+:deep(.el-checkbox__input.is-checked+.el-checkbox__label) {
+	color: rgba(95, 101, 108, 1);
+}
 </style>

src/views/decree/decreeOriginal/index.vue

@@ -33,14 +33,15 @@
 						{{ "政令原文" }}
 					</div>
 					<div class="report-main">
-						<div class="left">
-							<div v-if="!reportUrl" class="noContent">{{ "中文原文暂无数据" }}</div>
-							<iframe v-else :src="reportUrl" style="border: none" width="100%" height="100%"> </iframe>
-						</div>
-						<div class="right">
-							<div v-if="!reportUrlEn" class="noContent">{{ "英文原文暂无数据" }}</div>
-							<iframe v-else :src="reportUrlEn" style="border: none" width="100%" height="100%"> </iframe>
+						<div v-if="!reportData.length" class="noContent">{{ "暂无数据" }}</div>
+						<template v-else>
+							<div v-for="(item, index) in reportData" :key="index" class="content-row">
+								<!-- 左侧：英文 -->
+								<div class="content-en">{{ item.contentEn }}</div>
+								<!-- 右侧：中文 -->
+								<div class="content-cn">{{ item.content }}</div>
 							</div>
+						</template>
 					</div>
 				</div>
 			</div>
@@ -50,14 +51,13 @@
 
 <script setup>
 import { ref, onMounted } from "vue";
-
 import { useRoute } from "vue-router";
 import { getDecreeSummary } from "@/api/decree/introduction";
 import { getDecreeReport } from "@/api/decree/introduction";
 
 const route = useRoute();
-const reportUrl = ref("");
-const reportUrlEn = ref("");
+// 修改为数组存储分段数据
+const reportData = ref([]);
 
 const summaryInfo = ref({});
 
@@ -72,10 +72,10 @@ const handleGetSummary = async () => {
 		if (res.code === 200 && res.data) {
 			summaryInfo.value = res.data;
 		}
-	} catch (error) {}
+	} catch (error) { }
 };
 
-// 获取报告原文
+// 获取报告原文 - 修改为获取分段数组
 const handleGetReport = async () => {
 	const params = {
 		id: route.query.id
@@ -85,10 +85,10 @@ const handleGetReport = async () => {
 		const res = await getDecreeReport(params);
 		console.log("报告原文", res);
 		if (res.code === 200 && res.data) {
-			reportUrl.value = res.data.content;
-			reportUrlEn.value = res.data.contentEn;
+			// 假设后端返回的是数组格式，如果返回的是对象包含数组，请改为 res.data.list
+			reportData.value = res.data || [];
 		}
-	} catch (error) {}
+	} catch (error) { }
 };
 
 onMounted(() => {
@@ -106,6 +106,7 @@ onMounted(() => {
 
 	.layout-main {
 		width: 100%;
+
 		.layout-main-header {
 			height: 120px;
 			background: rgba(255, 255, 255, 1);
@@ -119,26 +120,32 @@ onMounted(() => {
 			border-top: 1px solid rgba(234, 236, 238, 1);
 			box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 			background: rgba(255, 255, 255, 1);
+
 			.layout-main-header-left-box {
 				width: 1100px;
 				margin-left: 160px;
 				margin-top: 13px;
+
 				.left-box-top {
 					height: 64px;
 					display: flex;
+
 					.icon {
 						width: 122px;
 						height: 64px;
 						border-radius: 4px;
 						overflow: hidden;
+
 						img {
 							width: 100%;
 							height: 100%;
 						}
 					}
+
 					.info {
 						width: 700px;
 						margin-left: 9px;
+
 						.info-box1 {
 							width: 700px;
 							color: rgba(59, 65, 75, 1);
@@ -153,6 +160,7 @@ onMounted(() => {
 							text-overflow: ellipsis;
 							white-space: nowrap;
 						}
+
 						.info-box2 {
 							margin-top: 5px;
 							height: 22px;
@@ -166,21 +174,25 @@ onMounted(() => {
 							text-align: left;
 							display: flex;
 							margin-left: -10px;
+
 							.info-box2-item {
 								padding: 0 10px;
 							}
+
 							.item1 {
 								width: 100px;
 								overflow: hidden;
 								text-overflow: ellipsis;
 								white-space: nowrap;
 							}
+
 							.item2 {
 								width: 180px;
 								overflow: hidden;
 								text-overflow: ellipsis;
 								white-space: nowrap;
 							}
+
 							.item3 {
 								width: 420px;
 								overflow: hidden;
@@ -190,25 +202,30 @@ onMounted(() => {
 						}
 					}
 				}
+
 				.left-box-bottom {
 					display: flex;
 					height: 40px;
 					margin-top: 21px;
+
 					.left-box-bottom-item {
 						display: flex;
 						margin-right: 32px;
 						margin-top: 3px;
 						height: 35px;
 						cursor: pointer;
+
 						.icon {
 							margin-top: 4px;
 							width: 16px;
 							height: 16px;
+
 							img {
 								width: 100%;
 								height: 100%;
 							}
 						}
+
 						.name {
 							height: 24px;
 							color: rgba(59, 65, 75, 1);
@@ -220,20 +237,24 @@ onMounted(() => {
 							text-align: left;
 							margin-left: 3px;
 						}
+
 						.nameActive {
 							color: var(--color-main-active);
 							font-weight: 700;
 						}
 					}
+
 					.leftBoxBottomItemActive {
 						border-bottom: 3px solid var(--color-main-active);
 					}
 				}
 			}
+
 			.layout-main-header-right-box {
 				width: 300px;
 				margin-right: 150px;
 				margin-top: 19px;
+
 				.right-box-top {
 					.time {
 						height: 24px;
@@ -246,6 +267,7 @@ onMounted(() => {
 						letter-spacing: 0px;
 						text-align: right;
 					}
+
 					.name {
 						height: 24px;
 						line-height: 24px;
@@ -258,12 +280,14 @@ onMounted(() => {
 						text-align: right;
 					}
 				}
+
 				.right-box-bottom {
 					margin-top: 24px;
 					text-align: right;
 					display: flex;
 					justify-content: flex-end;
 					gap: 8px;
+
 					.btn {
 						width: 120px;
 						height: 36px;
@@ -276,14 +300,17 @@ onMounted(() => {
 						gap: 8px;
 						align-items: center;
 						cursor: pointer;
+
 						.icon {
 							width: 16px;
 							height: 16px;
+
 							img {
 								width: 100%;
 								height: 100%;
 							}
 						}
+
 						.text {
 							width: 64px;
 							height: 24px;
@@ -297,6 +324,7 @@ onMounted(() => {
 							text-align: left;
 						}
 					}
+
 					.btn-active {
 						width: 120px;
 						height: 36px;
@@ -307,14 +335,17 @@ onMounted(() => {
 						align-items: center;
 						gap: 8px;
 						cursor: pointer;
+
 						.icon-active {
 							width: 16px;
 							height: 16px;
+
 							img {
 								width: 100%;
 								height: 100%;
 							}
 						}
+
 						.text-active {
 							width: 64px;
 							height: 24px;
@@ -331,16 +362,18 @@ onMounted(() => {
 				}
 			}
 		}
+
 		.layout-main-center {
 			.report-box {
 				margin: 0 auto;
 				width: 1600px;
 				height: 926px;
 				background: rgba(248, 249, 250, 1);
+
 				.report-header {
 					height: 80px;
 					line-height: 80px;
-					padding-left: 20px;
+					padding-left: 69px;
 					color: rgba(59, 65, 75, 1);
 					font-family: Microsoft YaHei;
 					font-style: Bold;
@@ -349,39 +382,68 @@ onMounted(() => {
 					letter-spacing: 0px;
 					text-align: left;
 				}
+
 				.report-main {
 					width: 1600px;
-					margin: 0 auto;
+					margin-top: 24px;
 					background: #fff;
 					box-sizing: border-box;
-					padding: 0 69px;
-					display: flex;
+					padding: 24px 69px;
 					height: calc(100% - 100px);
-					justify-content: space-between;
-					.left {
-						width: 800px;
+					overflow-y: auto; // 改为单一滚动容器，天然同步
+
+					// 滚动条样式
+					&::-webkit-scrollbar {
+						display: none;
+					}
+
+					&::-webkit-scrollbar-thumb {
+						background: #c1c1c1;
+						border-radius: 4px;
+					}
+
+					&::-webkit-scrollbar-track {
+						background: #f1f1f1;
+					}
+
 					.noContent {
-							height: 100px;
-							line-height: 100px;
-							text-align: center;
+						height: 100%;
+						display: flex;
+						align-items: center;
+						justify-content: center;
 						color: rgba(59, 65, 75, 1);
 						font-family: Microsoft YaHei;
 						font-style: Regular;
 						font-size: 20px;
 						font-weight: 400;
 					}
+
+					.content-row {
+						display: flex;
+						width: 100%;
+						min-height: 100px;
+						// border-bottom: 1px solid rgba(234, 236, 238, 1);
+						align-items: stretch; // 默认stretch，确保左右等高，头部对齐
+
+						&:last-child {
+							border-bottom: none;
 						}
-					.right {
+
+						.content-en,
+						.content-cn {
 							width: 800px;
-						.noContent {
-							height: 100px;
-							line-height: 100px;
-							text-align: center;
+							padding: 24px 30px;
+							box-sizing: border-box;
+							font-size: 16px;
+							line-height: 1.8;
 							color: rgba(59, 65, 75, 1);
 							font-family: Microsoft YaHei;
-							font-style: Regular;
-							font-size: 20px;
-							font-weight: 400;
+							text-align: justify;
+							white-space: pre-wrap; // 保留换行格式
+						}
+
+						.content-en {
+							// border-right: 1px solid rgba(234, 236, 238, 1); // 中间分隔线
 						}
 					}
 				}