预警干预列表问题修改

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;
 }
 
 

src/views/archive/interveneRecord/index.vue

@@ -14,8 +14,8 @@
             </el-select>
           </el-form-item>
           <el-form-item label="预警时间" prop="note">
-            <el-date-picker clearable v-model="queryParams.warnTime" type="date" value-format="YYYY-MM-DD"
+            <el-date-picker clearable v-model="queryParams.warnTime" type="daterange" start-placeholder="开始时间"
-              placeholder="请选预警时间" />
+              end-placeholder="结束时间" value-format="YYYY-MM-DD" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -146,15 +146,26 @@
       </el-tabs>
     </el-dialog>
 
-    <el-dialog title="记录详情" v-model="dialogResult" width="900px" append-to-body>
+    <el-dialog title="记录详情" v-model="dialogResult" width="900px" append-to-body @close="handleResultClose">
-      <el-card v-for="des in currentResult">
+      <el-tabs v-model="activeFactory">
+        <el-tab-pane v-for="des in currentResult" :label="des.factorName" :name="des.id">
+          <el-descriptions title="测评详情" :column="1">
+            <el-descriptions-item label="总分：">{{ des.score }}</el-descriptions-item>
+            <el-descriptions-item label="测评项：">{{ des.factorName }}</el-descriptions-item>
+            <el-descriptions-item label="测评结果：">{{ des.evalDesc }}</el-descriptions-item>
+          </el-descriptions>
+          <p v-html="des.evalPropose"></p>
+        </el-tab-pane>
+      </el-tabs>
+
+      <!-- <el-card v-for="des in currentResult">
         <el-descriptions title="测评详情" :column="1">
           <el-descriptions-item label="总分：">{{ des.score }}</el-descriptions-item>
           <el-descriptions-item label="测评项：">{{ des.factorName }}</el-descriptions-item>
           <el-descriptions-item label="测评结果：">{{ des.evalDesc }}</el-descriptions-item>
         </el-descriptions>
         <p v-html="des.evalPropose"></p>
-      </el-card>
+      </el-card> -->
     </el-dialog>
   </div>
 </template>
@@ -188,7 +199,13 @@ const recordDialog = reactive<DialogOption>({
 
 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<PageData<WarnRecordForm, WarnRecordQuery>>({
     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) {