diff --git a/src/api/archive/warnRecord/types.ts b/src/api/archive/warnRecord/types.ts
index 9319757..7d8f014 100644
--- a/src/api/archive/warnRecord/types.ts
+++ b/src/api/archive/warnRecord/types.ts
@@ -90,11 +90,13 @@ export interface WarnRecordQuery extends PageQuery {
* 预警时间
*/
warnTime?: string;
+ warnTimeStart?: string;
+ warnTimeEnd?: string;
- /**
- * 日期范围参数
- */
- params?: any;
+ /**
+ * 日期范围参数
+ */
+ params?: any;
}
diff --git a/src/views/archive/interveneRecord/index.vue b/src/views/archive/interveneRecord/index.vue
index 4ab8600..f0be2b5 100644
--- a/src/views/archive/interveneRecord/index.vue
+++ b/src/views/archive/interveneRecord/index.vue
@@ -14,8 +14,8 @@
-
+
搜索
@@ -146,15 +146,26 @@
-
-
+
+
+
+
+ {{ des.score }}
+ {{ des.factorName }}
+ {{ des.evalDesc }}
+
+
+
+
+
+
@@ -188,7 +199,13 @@ const recordDialog = reactive({
const listDialog = ref(false)
const activeName = ref('static')
-const statusOptions: any[] = []
+//状态 0 未处理,1 分配咨询师,2 咨询师拒绝干预,3 干预中 4 干预结束
+const statusOptions = [
+ { label: '无须干预', value: 0 },
+ { label: '干预中', value: 1 }
+]
+
+const activeFactory = ref('')
const initFormData: WarnRecordForm = {
warnId: undefined,
@@ -208,6 +225,8 @@ const data = reactive>({
status: undefined,
note: undefined,
warnTime: undefined,
+ warnTimeStart: undefined,
+ warnTimeEnd: undefined,
params: {
}
},
@@ -252,6 +271,11 @@ function handleSituation(situation: any) {
/** 查询预警记录列表 */
const getList = async () => {
loading.value = true;
+ const warnArr = queryParams.value.warnTime
+ if (warnArr && warnArr.length > 0) {
+ queryParams.value.warnTimeStart = warnArr[0]
+ queryParams.value.warnTimeEnd = warnArr[1]
+ }
const res = await listWarnRecord(queryParams.value);
warnRecordList.value = res.rows;
total.value = res.total;
@@ -345,6 +369,13 @@ async function handleResult(row: any) {
dialogResult.value = true
const result = await getEvaluationList({ recordId: row.recordId, status: 1 })
currentResult.value = result.data
+
+ activeFactory.value = result.data[0].id
+}
+
+function handleResultClose() {
+ currentResult.value = []
+ activeFactory.value = ''
}
function handleExport(row: any) {