reactor:418 市州通用-【发布待办】中办结时间需增加排序按钮;416 优化【中心统计报表】

.env.development

@@ -3,7 +3,7 @@ VITE_MODE_NAME=development
 # 防止部署多套系统到同一域名不同目录时，变量共用的问题 设置不同的前缀
 VITE_STORAGE_NAME=dev
 # 业务系统基础请求地址
-VITE_API_URL=http://110.188.24.28:50100
+VITE_API_URL=http://110.188.24.28:50300
 # 业务系统socket请求地址
 VITE_API_SOCKET_URL=http://110.188.24.28:50100/hubs/hotline
 # 业务系统文件上传上传请求地址

src/views/early/setting/components/Setting-add.vue

@@ -12,7 +12,7 @@
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<el-form-item label="预警级别" prop="earlyWarningLevelValue" :rules="[{ required: true, message: '请选择预警级别', trigger: 'change' }]">
-						<el-select v-model="state.ruleForm.politicalIdentityValue" placeholder="请选择预警级别" @change="selectLevel" clearable>
+						<el-select v-model="state.ruleForm.earlyWarningLevelValue" placeholder="请选择预警级别" @change="selectLevel" clearable>
 							<el-option v-for="item in earlyWarningLevel" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
 						</el-select>
 					</el-form-item>
@@ -27,7 +27,7 @@
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<el-form-item label="频率" prop="frequency" :rules="[{ required: true, message: '请选择频率', trigger: 'change' }]">
 						<el-select v-model="state.ruleForm.frequency" placeholder="请选择频率" @change="selectType" clearable>
-							<el-option v-for="item in eFrequency" :value="item.key" :key="item.key" :label="item.value" />
+							<el-option v-for="item in eCompareType" :value="item.key" :key="item.key" :label="item.value" />
 						</el-select>
 					</el-form-item>
 				</el-col>
@@ -66,7 +66,7 @@
 									label-width="80px"
 								>
 									<el-select v-model="item.compareType" placeholder="请选择出现次数" @change="selectType" clearable>
-										<el-option v-for="item in eFrequency" :value="item.key" :key="item.key" :label="item.value" />
+										<el-option v-for="item in eCompareType" :value="item.key" :key="item.key" :label="item.value" />
 									</el-select>
 								</el-form-item>
 							</el-col>
@@ -87,8 +87,7 @@
 							<el-col :span="3">
 								<div class="flex">
 <!--									<el-select v-model="item.compareType">
-										<el-option value="1" label="且" />
-										<el-option value="2" label="或" />
+										<el-option  v-for="item in eFrequency" :value="item.key" :key="item.key" :label="item.value" />
 									</el-select>-->
 									<el-button link type="danger" @click="onDelete(index)" v-if="index" class="ml10"><SvgIcon name="ele-Delete" /></el-button>
 								</div>

src/views/early/setting/components/Setting-edit.vue

@@ -12,7 +12,7 @@
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<el-form-item label="预警级别" prop="earlyWarningLevelValue" :rules="[{ required: true, message: '请选择预警级别', trigger: 'change' }]">
-						<el-select v-model="state.ruleForm.politicalIdentityValue" placeholder="请选择预警级别" @change="selectLevel" clearable>
+						<el-select v-model="state.ruleForm.earlyWarningLevelValue" placeholder="请选择预警级别" @change="selectLevel" clearable>
 							<el-option v-for="item in earlyWarningLevel" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
 						</el-select>
 					</el-form-item>
@@ -66,7 +66,7 @@
 									label-width="80px"
 								>
 									<el-select v-model="item.compareType" placeholder="请选择出现次数" @change="selectType" clearable>
-										<el-option v-for="item in eFrequency" :value="item.key" :key="item.key" :label="item.value" />
+										<el-option v-for="item in eCompareType" :value="item.key" :key="item.key" :label="item.value" />
 									</el-select>
 								</el-form-item>
 							</el-col>
@@ -121,7 +121,7 @@
 import { reactive, ref } from 'vue';
 import { ElMessage, FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
-import { editEarlySetting, getEarlySettingDetail } from '@/api/early/setting';
+import { editEarlySetting, getEarlySettingBaseData, getEarlySettingDetail } from '@/api/early/setting';
 
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['updateList']);
@@ -161,11 +161,21 @@ const openDialog = async (Id: string) => {
 const earlyWarningLevel = ref<EmptyArrayType>([]); // 预警级别
 const earlyWarningType = ref<EmptyArrayType>([]); // 预警类型
 const eFrequency = ref<EmptyArrayType>([]); // 频率
+const eCompareType = ref<EmptyArrayType>([]); // 比较类型
+const sensitiveWords = ref<EmptyArrayType>([]); // 敏感词
 const queryBaseInfo = () => {
 	getEarlySettingBaseData().then((res) => {
 		earlyWarningLevel.value = res.result.earlyWarningLevel ?? [];
 		earlyWarningType.value = res.result.earlyWarningType ?? [];
 		eFrequency.value = res.result.eFrequency ?? [];
+		eCompareType.value = res.result.eCompareType ?? [];
+		sensitiveWords.value =
+			res.result.sensitiveWords.map((item: any) => {
+				return {
+					label: item,
+					value: item,
+				};
+			}) ?? [];
 	});
 };
 // 选择级别