fgm
/
cankao-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
34701892@qq.com 2025-11-14 11:51:08 +08:00
parent 4f67556ade 06c8c29bb7
commit 02b8ee77f5
2 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/views/pages/richedit/all.vue
View File

@ -117,6 +117,18 @@
</div> </div>
<div class="labels"> <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" <div style="background-color: #eee6cd" class="label_item"
v-if="scope.row.conceptLabels && scope.row.conceptLabels.length > 0"> v-if="scope.row.conceptLabels && scope.row.conceptLabels.length > 0">
{{ scope.row.conceptLabels[0] }} {{ scope.row.conceptLabels[0] }}
@ -778,8 +790,8 @@ function restData() {
includeRuleIds.value = null; includeRuleIds.value = null;
excludeRuleIds.value = null; excludeRuleIds.value = null;
form.value.companyName = null form.value.companyName = null;
form.value.exclusive = null form.value.exclusive = null;
getData(); getData();
} }
@ -877,7 +889,7 @@ onMounted(async () => {
} }
getSignalRulesFn(); getSignalRulesFn();
getCompany() getCompany();
}); });
</script> </script>
@ -987,6 +999,7 @@ onMounted(async () => {
.labels { .labels {
display: flex; display: flex;
gap: 5px; gap: 5px;
flex-wrap: wrap;
.label_item { .label_item {
height: 24px; height: 24px;
@ -1007,6 +1020,15 @@ onMounted(async () => {
text-align: center; text-align: center;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex-wrap: nowrap;
white-space: nowrap;
}
.label_item_box {
// width: 100%;
display: flex;
gap: 5px;
} }
} }
</style> </style>

28
src/views/pages/richedit/index.vue
View File

@ -197,6 +197,18 @@
</div> </div>
<div class="labels" v-if="Session.get('userInfoLocal').userType == '00'"> <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" <div style="background-color: #eee6cd" class="label_item"
v-if="scope.row.conceptLabels && scope.row.conceptLabels.length > 0"> v-if="scope.row.conceptLabels && scope.row.conceptLabels.length > 0">
{{ scope.row.conceptLabels[0] }} {{ scope.row.conceptLabels[0] }}
@ -933,8 +945,8 @@ function restData() {
includeRuleIds.value = null; includeRuleIds.value = null;
excludeRuleIds.value = null; excludeRuleIds.value = null;
form.value.companyName = null form.value.companyName = null;
form.value.exclusive = null form.value.exclusive = null;
getData(); getData();
} }
@ -1065,7 +1077,7 @@ onMounted(async () => {
getSignalRulesFn(); getSignalRulesFn();
} }
getCompany() getCompany();
}); });
</script> </script>
@ -1175,6 +1187,7 @@ onMounted(async () => {
.labels { .labels {
display: flex; display: flex;
gap: 5px; gap: 5px;
flex-wrap: wrap;
.label_item { .label_item {
height: 24px; height: 24px;
@ -1195,6 +1208,15 @@ onMounted(async () => {
text-align: center; text-align: center;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex-wrap: nowrap;
white-space: nowrap;
} }
} }
.label_item_box {
// width: 100%;
display: flex;
gap: 5px;
}
</style> </style>