Merge branch 'dev' of https://gitee.com/zzpaym/zhongzheng-clear-sample-admin into dev

src/views/pages/richedit/all.vue

@@ -117,6 +117,18 @@
 						</div>
 
 						<div class="labels">
+							<!-- <div v-if="scope.row.conceptLabels && scope.row.conceptLabels.length > 0" class="label_item_box">
+								<div v-for="item in scope.row.conceptLabels" :key="item" class="label_item" style="background-color: #eee6cd">
+									{{ item }}
+								</div>
+							</div>
+
+							<div v-if="scope.row.industryLabels && scope.row.industryLabels.length > 0" class="label_item_box">
+								<div v-for="item in scope.row.industryLabels" :key="item" class="label_item" style="background-color: #cfdcf3">
+									{{ item }}
+								</div>
+							</div> -->
+
 							<div style="background-color: #eee6cd" class="label_item"
 								v-if="scope.row.conceptLabels && scope.row.conceptLabels.length > 0">
 								{{ scope.row.conceptLabels[0] }}
@@ -308,13 +320,13 @@
 					<el-col :span="12">媒体影响力</el-col>
 					<el-col :span="12" style="text-align: right">评分：<span style="color: #36a4f8">{{
 						scoreDetail.sourceImpact
-					}}</span></el-col>
+							}}</span></el-col>
 				</el-row>
 				<el-row class="score-detail-row">
 					<el-col :span="12">中国股市相关性</el-col>
 					<el-col :span="12" style="text-align: right">置信度：<span style="color: #36a4f8">{{
 						scoreDetail.chinaFactor
-					}}</span></el-col>
+							}}</span></el-col>
 				</el-row>
 				<el-row class="score-detail-row">
 					<el-col :span="12">资讯质量</el-col>
@@ -329,7 +341,7 @@
 					<el-col :span="12">资讯评分</el-col>
 					<el-col :span="12" style="color: #36a4f8; text-align: right; font-weight: 700">{{
 						scoreDetail.newsScore
-					}}</el-col>
+						}}</el-col>
 				</el-row>
 			</div>
 			<template #footer>
@@ -778,8 +790,8 @@ function restData() {
 
 	includeRuleIds.value = null;
 	excludeRuleIds.value = null;
-	form.value.companyName = null
+	form.value.companyName = null;
-	form.value.exclusive = null
+	form.value.exclusive = null;
 
 	getData();
 }
@@ -877,7 +889,7 @@ onMounted(async () => {
 	}
 
 	getSignalRulesFn();
-	getCompany()
+	getCompany();
 });
 </script>
 
@@ -987,6 +999,7 @@ onMounted(async () => {
 .labels {
 	display: flex;
 	gap: 5px;
+	flex-wrap: wrap;
 
 	.label_item {
 		height: 24px;
@@ -1007,6 +1020,15 @@ onMounted(async () => {
 		text-align: center;
 		justify-content: center;
 		align-items: center;
+
+		flex-wrap: nowrap;
+		white-space: nowrap;
+	}
+
+	.label_item_box {
+		// width: 100%;
+		display: flex;
+		gap: 5px;
 	}
 }
 </style>

src/views/pages/richedit/index.vue

@@ -197,6 +197,18 @@
 						</div>
 
 						<div class="labels" v-if="Session.get('userInfoLocal').userType == '00'">
+							<!-- <div v-if="scope.row.conceptLabels && scope.row.conceptLabels.length > 0" class="label_item_box">
+								<div v-for="item in scope.row.conceptLabels" :key="item" class="label_item" style="background-color: #eee6cd">
+									{{ item }}
+								</div>
+							</div>
+
+							<div v-if="scope.row.industryLabels && scope.row.industryLabels.length > 0" class="label_item_box">
+								<div v-for="item in scope.row.industryLabels" :key="item" class="label_item" style="background-color: #cfdcf3">
+									{{ item }}
+								</div>
+							</div> -->
+
 							<div style="background-color: #eee6cd" class="label_item"
 								v-if="scope.row.conceptLabels && scope.row.conceptLabels.length > 0">
 								{{ scope.row.conceptLabels[0] }}
@@ -458,13 +470,13 @@
 					<el-col :span="12">媒体影响力</el-col>
 					<el-col :span="12" style="text-align: right">评分：<span style="color: #36a4f8">{{
 						scoreDetail.sourceImpact
-					}}</span></el-col>
+							}}</span></el-col>
 				</el-row>
 				<el-row class="score-detail-row">
 					<el-col :span="12">中国股市相关性</el-col>
 					<el-col :span="12" style="text-align: right">置信度：<span style="color: #36a4f8">{{
 						scoreDetail.chinaFactor
-					}}</span></el-col>
+							}}</span></el-col>
 				</el-row>
 				<el-row class="score-detail-row">
 					<el-col :span="12">资讯质量</el-col>
@@ -479,7 +491,7 @@
 					<el-col :span="12">资讯评分</el-col>
 					<el-col :span="12" style="color: #36a4f8; text-align: right; font-weight: 700">{{
 						scoreDetail.newsScore
-					}}</el-col>
+						}}</el-col>
 				</el-row>
 			</div>
 			<template #footer>
@@ -933,8 +945,8 @@ function restData() {
 
 	includeRuleIds.value = null;
 	excludeRuleIds.value = null;
-	form.value.companyName = null
+	form.value.companyName = null;
-	form.value.exclusive = null
+	form.value.exclusive = null;
 
 	getData();
 }
@@ -1065,7 +1077,7 @@ onMounted(async () => {
 		getSignalRulesFn();
 	}
 
-	getCompany()
+	getCompany();
 });
 </script>
 
@@ -1175,6 +1187,7 @@ onMounted(async () => {
 .labels {
 	display: flex;
 	gap: 5px;
+	flex-wrap: wrap;
 
 	.label_item {
 		height: 24px;
@@ -1195,6 +1208,15 @@ onMounted(async () => {
 		text-align: center;
 		justify-content: center;
 		align-items: center;
+
+		flex-wrap: nowrap;
+		white-space: nowrap;
 	}
 }
+
+.label_item_box {
+	// width: 100%;
+	display: flex;
+	gap: 5px;
+}
 </style>