diff --git a/.env.development b/.env.development
index c92ea84..dc34e7e 100644
--- a/.env.development
+++ b/.env.development
@@ -2,10 +2,10 @@
 ENV = development
 
 # 本地环境接口地址
-# VITE_API_URL = https://4155gf93ll13.vicp.fun/admin
+VITE_API_URL = http://4155gf93ll13.vicp.fun/admin
 # VITE_API_URL = http://localhost:13579/admin
 # VITE_API_URL = https://cankao.cs.com.cn/admin
-VITE_API_URL =  http://123.60.153.169:8040/admin
+# VITE_API_URL =  http://123.60.153.169:8040/admin
 
 # VITE_API_URL = /api
 
diff --git a/src/views/pages/richedit/all.vue b/src/views/pages/richedit/all.vue
index 98ed0cf..ae3c636 100644
--- a/src/views/pages/richedit/all.vue
+++ b/src/views/pages/richedit/all.vue
@@ -3,13 +3,12 @@
 		<div class="colHeader">
 			<div class="page_title">资讯精选</div>
 
-			<div style="width: 100%; display: flex; align-items: flex-end">
-				<el-button type="primary" style="margin-bottom: 10px" @click="restData">清空条件</el-button>
-
+			<div style="width: 100%; display: flex;margin-top: 20px;">
 				<div class="colHeader-right">
 					<el-space :size="12" class="colHeader-right-1">
+						<span>标题检索：</span>
 						<el-input v-model="form.keyword" placeholder="输入标题/内容关键字进行搜索（以空格隔开）" class="input-with-select"
-							@keyup.enter="handleSearch" style="width: 455px">
+							@keyup.enter="handleSearch" style="width: 500px">
 							<template #append>
 								<el-button icon="Search" @click="handleSearch" />
 							</template>
@@ -32,21 +31,30 @@
 						</el-input>
 					</el-space>
 
-					<div class="colHeader-right-2">
-						<el-date-picker v-model="daterange" type="daterange" range-separator="至"
-							value-format="YYYY-MM-DD" start-placeholder="选择报道时间" end-placeholder="选择报道时间"
-							style="margin-right: 12px" @change="handleSearch" />
 
-						<el-select-v2 v-model="form.mediaId" :options="tagSourceList" clearable placeholder="媒体来源"
-							size="large" style="width: 240px" filterable @change="handleSearch" />
+					<div class="colHeader-right-2" style="gap: 10px">
+						<span>信号规则：</span>
+						<el-select v-model="signalId1" clearable placeholder="含任一信号规则" multiple size="large"
+							style="width: 180px" filterable @change="signalChange($event, 1)">
 
-						<el-select clearable v-model="form.deleted" size="large" style="width: 150px; margin-left: 10px"
-							placeholder="筛选删除状态" @change="handleSearch">
-							<el-option :value="1" label="已删除资讯"></el-option>
-							<el-option :value="0" label="未删除资讯"></el-option>
+							<el-option v-for="item in signalRulesList1" :key="item.value" :value="item.value"
+								:label="item.label"></el-option>
 						</el-select>
 
-						<div style="margin-left: 12px; display: flex; flex-wrap: nowrap; align-items: center">
+						<el-select v-model="signalId2" clearable placeholder="不含任一信号规则" multiple size="large"
+							style="width: 180px" filterable @change="signalChange($event, 2)">
+							<el-option v-for="item in signalRulesList2" :key="item.value" :value="item.value"
+								:label="item.label"></el-option>
+						</el-select>
+						<span>报道时间：</span>
+						<div>
+							<el-date-picker v-model="daterange" type="daterange" range-separator="-"
+								value-format="YYYY-MM-DD" start-placeholder="选择报道时间" end-placeholder="选择报道时间"
+								@change="handleSearch" />
+						</div>
+
+
+						<div style="display: flex; flex-wrap: nowrap; align-items: center">
 							<span>评分范围：</span>
 							<el-input type="number" v-model="form.minScore" style="width: 80px" placeholder="最低"
 								:min="0" :max="100" @keyup.enter="handleSearch" />
@@ -58,21 +66,36 @@
 								</template>
 							</el-input>
 						</div>
+
 					</div>
 
-					<div class="colHeader-right-2" style="gap: 10px">
-						<el-select v-model="signalId1" clearable placeholder="含任一信号规则" multiple size="large"
-							style="width: 240px" filterable @change="signalChange($event, 1)">
-
-							<el-option v-for="item in signalRulesList1" :key="item.value" :value="item.value"
-								:label="item.label"></el-option>
+					<div class="colHeader-right-2" style="gap: 10px;">
+						<span>媒体来源：</span>
+						<el-select-v2 v-model="form.mediaId" :options="tagSourceList" clearable placeholder="媒体来源"
+							size="large" style="width: 180px" filterable @change="handleSearch" />
+						<span>企业检索：</span>
+						<el-select v-model="form.companyName" clearable placeholder="请选择" multiple size="large"
+							style="width: 180px" filterable @change="handleSearch">
+							<el-option>是</el-option>
+							<el-option>否</el-option>
 						</el-select>
 
-						<el-select v-model="signalId2" clearable placeholder="不含任一信号规则" multiple size="large"
-							style="width: 240px" filterable @change="signalChange($event, 2)">
-							<el-option v-for="item in signalRulesList2" :key="item.value" :value="item.value"
-								:label="item.label"></el-option>
+						<span>独家资源：</span>
+						<el-select v-model="form.exclusive" clearable placeholder="是否独家搜索" multiple size="large"
+							style="width: 180px" filterable @change="handleSearch">
+							<el-option>是</el-option>
+							<el-option>否</el-option>
 						</el-select>
+
+
+						<span>删除状态：</span>
+						<el-select clearable v-model="form.deleted" size="large" style="width: 150px; margin-left: 10px"
+							placeholder="筛选删除状态" @change="handleSearch">
+							<el-option :value="1" label="已删除资讯"></el-option>
+							<el-option :value="0" label="未删除资讯"></el-option>
+						</el-select>
+
+						<el-button type="primary" @click="restData">清空条件</el-button>
 					</div>
 				</div>
 			</div>
@@ -91,15 +114,20 @@
 						</div>
 
 						<div class="labels">
-							<div v-for="company in scope.row.companys" :key="company" class="label_item">
-								{{ company }}
+							<div class="label_item" v-if="scope.row.companyName && scope.row.companyName.length > 0">
+								{{ scope.row.companyName }}
 							</div>
+
 						</div>
 
 						<div class="labels">
-							<div v-for="(label, index) in scope.row.labels" :key="label" class="label_item"
-								:style="{ backgroundColor: index == 0 ? '#EEE6CD' : '#CFDCF3' }">
-								{{ label }}
+							<div style="background-color: #EEE6CD;" class="label_item"
+								v-if="scope.row.conceptLabels && scope.row.conceptLabels.length > 0">
+								{{ scope.row.conceptLabels[0] }}
+							</div>
+							<div style="background-color: #CFDCF3;" class="label_item"
+								v-if="scope.row.industryLabels && scope.row.industryLabels.length > 0">
+								{{ scope.row.industryLabels[0] }}
 							</div>
 						</div>
 					</div>
@@ -326,7 +354,7 @@ import {
 	getColumn,
 	getNewsScore,
 	getIndustryHierarchy,
-	getTagSource,
+	getTagSource, getSignalRules,
 	doRecover,
 } from '/@/api/api';
 import { highlightTitle } from '/@/utils/highlight';
@@ -447,20 +475,20 @@ async function getData() {
 				});
 				item.title = highlightTitle(item.title, form.value.keyword);
 
-				item.companys = [
-					"英伟达",
-					"微软",
-				]
+				// item.companys = [
+				// 	"英伟达",
+				// 	"微软",
+				// ]
 
-				item.labels = [
-					"新科技-人工智能",
-					"新科技-人工智能",
-				]
+				// item.labels = [
+				// 	"新科技-人工智能",
+				// 	"新科技-人工智能",
+				// ]
 
-				item.signalNames = [
-					"信号规则1",
-					"信号规则2",
-				]
+				// item.signalNames = [
+				// 	"信号规则1",
+				// 	"信号规则2",
+				// ]
 			});
 		}
 	} catch (error) {
@@ -783,16 +811,26 @@ const signalRulesList2 = ref([
 	},
 ])
 
-async function getSignalRulesFn() {
+async function getSignalRulesFn(type) {
 	let { code, data } = await getSignalRules({
 	});
 	if (code == 200) {
-		signalRulesList.value = data.map((item: any) => {
-			return {
-				label: item.name,
-				value: item.id,
-			};
-		});
+		if (type == 1) {
+			signalRulesList1.value = data.map((item: any) => {
+				return {
+					label: item.name,
+					value: item.id,
+				};
+			});
+		} else {
+			signalRulesList2.value = data.map((item: any) => {
+				return {
+					label: item.name,
+					value: item.id,
+				};
+			});
+		}
+
 	}
 }
 
@@ -839,7 +877,8 @@ onMounted(async () => {
 		});
 	}
 
-	getSignalRulesFn()
+	getSignalRulesFn(0);
+	getSignalRulesFn(1);
 
 });
 </script>
@@ -935,13 +974,13 @@ onMounted(async () => {
 	flex: 1;
 	display: flex;
 	flex-direction: column;
-	align-items: flex-end;
-	min-width: 700px;
+	// align-items: flex-end;
+	// min-width: 700px;
 
 	.colHeader-right-1,
 	.colHeader-right-2 {
 		display: flex;
-		justify-self: flex-end;
+		// justify-self: flex-end;
 		align-items: center;
 		margin-bottom: 10px;
 	}
diff --git a/src/views/pages/richedit/index.vue b/src/views/pages/richedit/index.vue
index 65bbee1..0d96060 100644
--- a/src/views/pages/richedit/index.vue
+++ b/src/views/pages/richedit/index.vue
@@ -4,10 +4,13 @@
 			<div class="page_title" v-if="Session.get('userInfoLocal').userType == '00'">资讯精选</div>
 			<div class="page_title" v-if="Session.get('userInfoLocal').userType == '01'">资讯审核</div>
 
-			<div style="width: 100%; display: flex; align-items: flex-end">
+			<!-- 普通管理员和审核人员的筛选条件不一样，普通管理员是资讯精选、其他是资讯审核 -->
+			<!-- 普通管理员的筛选 start -->
+			<div style="width: 100%; display: flex; align-items: flex-end"
+				v-if="Session.get('userInfoLocal').userType != '00'">
 				<el-button type="primary" style="margin-bottom: 10px" @click="restData">清空条件</el-button>
 
-				<div class="colHeader-right">
+				<div class="colHeader-right" :style="{ alignItems: 'flex-end', minWidth: '700px' }">
 					<el-space :size="12" class="colHeader-right-1">
 						<el-input v-model="form.keyword" placeholder="输入标题/内容关键字进行搜索（以空格隔开）" class="input-with-select"
 							@keyup.enter="handleSearch" style="width: 455px">
@@ -62,22 +65,104 @@
 						</div>
 					</div>
 
-					<div class="colHeader-right-2" style="gap: 10px"
-						v-if="Session.get('userInfoLocal').userType == '00'">
+
+				</div>
+			</div>
+			<!-- 普通管理员的筛选 end -->
+			<div style="width: 100%; display: flex;margin-top: 20px;" v-else>
+				<div class="colHeader-right">
+					<el-space :size="12" class="colHeader-right-1">
+						<span>标题检索：</span>
+						<el-input v-model="form.keyword" placeholder="输入标题/内容关键字进行搜索（以空格隔开）" class="input-with-select"
+							@keyup.enter="handleSearch" style="width: 500px">
+							<template #append>
+								<el-button icon="Search" @click="handleSearch" />
+							</template>
+						</el-input>
+
+						<div>
+							<span>行业分类：</span>
+							<el-tree-select v-model="form.industry" :data="industryList" multiple
+								:render-after-expand="false" filterable show-checkbox style="width: 240px"
+								@check="handleCheckChange" @clear="handleSearch" node-key="id" collapse-tags
+								collapse-tags-tooltip clearable :props="defaultProps">
+							</el-tree-select>
+						</div>
+
+						<el-input v-model="form.tag" placeholder="匹配多个概念标签(以空格隔开)" class="input-with-select"
+							@keyup.enter="handleSearch" style="width: 280px">
+							<template #append>
+								<el-button icon="Search" @click="handleSearch" />
+							</template>
+						</el-input>
+					</el-space>
+
+
+					<div class="colHeader-right-2" style="gap: 10px">
+						<span>信号规则：</span>
 						<el-select v-model="signalId1" clearable placeholder="含任一信号规则" multiple size="large"
-							style="width: 240px" filterable @change="signalChange($event, 1)">
+							style="width: 180px" filterable @change="signalChange($event, 1)">
 
 							<el-option v-for="item in signalRulesList1" :key="item.value" :value="item.value"
 								:label="item.label"></el-option>
 						</el-select>
 
 						<el-select v-model="signalId2" clearable placeholder="不含任一信号规则" multiple size="large"
-							style="width: 240px" filterable @change="signalChange($event, 2)">
+							style="width: 180px" filterable @change="signalChange($event, 2)">
 							<el-option v-for="item in signalRulesList2" :key="item.value" :value="item.value"
 								:label="item.label"></el-option>
 						</el-select>
+						<span>报道时间：</span>
+						<div>
+							<el-date-picker v-model="daterange" type="daterange" range-separator="-"
+								value-format="YYYY-MM-DD" start-placeholder="选择报道时间" end-placeholder="选择报道时间"
+								@change="handleSearch" />
+						</div>
+
+
+						<div style="display: flex; flex-wrap: nowrap; align-items: center">
+							<span>评分范围：</span>
+							<el-input type="number" v-model="form.minScore" style="width: 80px" placeholder="最低"
+								:min="0" :max="100" @keyup.enter="handleSearch" />
+							<i style="color: #ccc"> - </i>
+							<el-input type="number" v-model="form.maxScore" style="width: 140px" placeholder="最高"
+								:min="0" :max="100" @keyup.enter="handleSearch">
+								<template #append>
+									<el-button icon="Search" @click="handleSearch" />
+								</template>
+							</el-input>
+						</div>
+
 					</div>
 
+					<div class="colHeader-right-2" style="gap: 10px;">
+						<span>媒体来源：</span>
+						<el-select-v2 v-model="form.mediaId" :options="tagSourceList" clearable placeholder="媒体来源"
+							size="large" style="width: 180px" filterable @change="handleSearch" />
+						<span>企业检索：</span>
+						<el-select v-model="form.companyName" clearable placeholder="请选择" multiple size="large"
+							style="width: 180px" filterable @change="handleSearch">
+							<el-option>是</el-option>
+							<el-option>否</el-option>
+						</el-select>
+
+						<span>独家资源：</span>
+						<el-select v-model="form.exclusive" clearable placeholder="是否独家搜索" multiple size="large"
+							style="width: 180px" filterable @change="handleSearch">
+							<el-option>是</el-option>
+							<el-option>否</el-option>
+						</el-select>
+
+
+						<span>删除状态：</span>
+						<el-select clearable v-model="form.deleted" size="large" style="width: 150px; margin-left: 10px"
+							placeholder="筛选删除状态" @change="handleSearch">
+							<el-option :value="1" label="已删除资讯"></el-option>
+							<el-option :value="0" label="未删除资讯"></el-option>
+						</el-select>
+
+						<el-button type="primary" @click="restData">清空条件</el-button>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -95,15 +180,22 @@
 						</div>
 
 						<div class="labels" v-if="Session.get('userInfoLocal').userType == '00'">
-							<div v-for="company in scope.row.companys" :key="company" class="label_item">
-								{{ company }}
+							<div class="label_item" v-if="scope.row.companyName && scope.row.companyName.length > 0">
+								{{ scope.row.companyName }}
 							</div>
+							<!-- <div v-for="company in scope.row.companys" :key="company" class="label_item">
+								{{ company }}
+							</div> -->
 						</div>
 
 						<div class="labels" v-if="Session.get('userInfoLocal').userType == '00'">
-							<div v-for="(label, index) in scope.row.labels" :key="label" class="label_item"
-								:style="{ backgroundColor: index == 0 ? '#EEE6CD' : '#CFDCF3' }">
-								{{ label }}
+							<div style="background-color: #EEE6CD;" class="label_item"
+								v-if="scope.row.conceptLabels && scope.row.conceptLabels.length > 0">
+								{{ scope.row.conceptLabels[0] }}
+							</div>
+							<div style="background-color: #CFDCF3;" class="label_item"
+								v-if="scope.row.industryLabels && scope.row.industryLabels.length > 0">
+								{{ scope.row.industryLabels[0] }}
 							</div>
 						</div>
 					</div>
@@ -1043,13 +1135,13 @@ onMounted(async () => {
 	flex: 1;
 	display: flex;
 	flex-direction: column;
-	align-items: flex-end;
-	min-width: 700px;
+	// align-items: flex-end;
+	// min-width: 700px;
 
 	.colHeader-right-1,
 	.colHeader-right-2 {
 		display: flex;
-		justify-self: flex-end;
+		// justify-self: flex-end;
 		align-items: center;
 		margin-bottom: 10px;
 	}