diff --git a/src/api/activity/statistics/index.ts b/src/api/activity/statistics/index.ts
index 7807a50..5043c47 100644
--- a/src/api/activity/statistics/index.ts
+++ b/src/api/activity/statistics/index.ts
@@ -34,4 +34,12 @@ export const getWarnClass = (query: any): AxiosPromise<any[]> => {
     method: 'get',
     params: query
   });
+};
+
+export const getSchedule = (query: any): AxiosPromise<any[]> => {
+  return request({
+    url: '/scale/publish/evaluation/pageList',
+    method: 'get',
+    params: query
+  });
 };
\ No newline at end of file
diff --git a/src/api/archive/warnRecord/index.ts b/src/api/archive/warnRecord/index.ts
index 4a7cd8a..7cd6248 100644
--- a/src/api/archive/warnRecord/index.ts
+++ b/src/api/archive/warnRecord/index.ts
@@ -37,7 +37,7 @@ export const getEvaluationRecordList = (warnId: string | number): AxiosPromise<W
 
 export const getEvaluationList = (query: any): AxiosPromise<WarnRecordVO> => {
   return request({
-    url: '/scale/evaluationConclusion/list',
+    url: '/scale/evaluation/conclusion/list',
     method: 'get',
     params: query
   });
diff --git a/src/views/activity/component/schedule/index.vue b/src/views/activity/component/schedule/index.vue
index 447ac13..e10da01 100644
--- a/src/views/activity/component/schedule/index.vue
+++ b/src/views/activity/component/schedule/index.vue
@@ -54,17 +54,15 @@
 
     <el-row justify="start">
       <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-        <el-form-item label="年级" prop="grade">
-          <el-input v-model="queryParams.grade" placeholder="请输入年级" clearable style="width: 240px"
-            @keyup.enter="handleQuery" />
+        <el-form-item label="量表" prop="scaleId">
+          <el-select v-model="queryParams.scaleId" placeholder="请选择量表" style="width: 240px" @keyup.enter="handleQuery">
+            <el-option v-for="item in scaleList" :key="item.scaleId" :label="item.scaleName" :value="item.scaleId" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="班级" prop="class">
-          <el-input v-model="queryParams.class" placeholder="请输入班级" clearable style="width: 240px"
-            @keyup.enter="handleQuery" />
-        </el-form-item>
-        <el-form-item label="用户姓名" prop="userName">
-          <el-input v-model="queryParams.userName" placeholder="请输入用户姓名" clearable style="width: 240px"
-            @keyup.enter="handleQuery" />
+        <el-form-item label="部门" prop="deptId">
+          <el-tree-select v-model="queryParams.deptId" :data="deptOptions" style="width: 240px"
+            :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择归属部门"
+            check-strictly />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -73,143 +71,100 @@
         </el-form-item>
       </el-form>
     </el-row>
+
     <el-row justify="center">
       <el-table :data="completeTableData" style="width: 100%;">
         <el-table-column prop="scaleName" label="量表" />
-        <el-table-column prop="userName" label="用户姓名" />
-        <el-table-column prop="gradeClass" label="班级" />
-        <el-table-column prop="status" label="状态" />
+        <el-table-column prop="nickName" label="用户姓名" />
+        <el-table-column prop="deptName" label="班级" />
+        <el-table-column prop="status" label="状态">
+          <template #default="scope">
+            <el-tag :type="scope.row.status == 1 ? 'success' : 'danger'">{{ scope.row.status == 0 ? '未测' :
+              '已测'}}</el-tag>
+          </template>
+        </el-table-column>
       </el-table>
     </el-row>
+
+    <el-row justify="end">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-row>
   </el-card>
 </template>
 
 <script setup>
-const completeTableData = [
-  {
-    scaleName: '气质类型测试量表',
-    userName: '墨渊',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '白真',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '苏誉',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '白浅',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '凤九',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '张依依',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '赵莹',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '李风茹',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '宁淑萍',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '白清月',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '王兰婷',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '苏枫明嘉',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '贾子又',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '墨渊',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '墨渊',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '墨渊',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '墨渊',
-    gradeClass: '五年级一班',
-    status: '未测',
-  },
-  {
-    scaleName: '气质类型测试量表',
-    userName: '墨渊',
-    gradeClass: '五年级一班',
-    status: '未测',
+import api from "@/api/system/user"
+import { getScalePublish } from '@/api/scale/scalePublish';
+import { getSchedule } from '@/api/activity/statistics'
+import { deptTreeSelect } from "@/api/system/user"
+
+const props = defineProps({
+  batchNo: {
+    type: String,
+    default: ''
   }
-]
+})
+
+const batchNo = props.batchNo
+const scaleList = ref([])
+
+const total = ref(10)
+const completeTableData = ref([])
+
+const deptOptions = ref([]);
 
 const queryFormRef = ref()
 const queryParams = ref({
-  grade: '',
-  class: '',
-  userName: ''
+  batchNo: batchNo,
+  pageNum: 1,
+  pageSize: 10,
+  scaleId: '',
+  deptId: ''
 })
 
-function handleQuery() {
+const getTreeSelect = async () => {
+  const res = await deptTreeSelect();
+  deptOptions.value = res.data;
+}
 
+async function getScalePublishList() {
+  const res = await getScalePublish(batchNo)
+  const scaleIds = res.data.scaleIds
+  const scaleNames = res.data.scaleNames
+  scaleIds.forEach((item, index) => {
+    scaleList.value.push({ scaleId: item, scaleName: scaleNames[index] })
+  })
+
+  if (scaleIds.length) {
+    queryParams.value.scaleId = scaleIds[0]
+
+    getList()
+  }
+
+}
+
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
 }
 
 function resetQuery() {
-
+  queryFormRef.value.restFields()
+  handleQuery()
 }
+
+async function getList() {
+  const res = await getSchedule(queryParams.value)
+  completeTableData.value = res.rows
+  total.value = res.total
+}
+
+
+onMounted(() => {
+  getTreeSelect()
+  getScalePublishList()
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue
index 4f371af..ff6f728 100644
--- a/src/views/activity/index.vue
+++ b/src/views/activity/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-tabs v-model="activeName" style="padding-left: 20px; padding-right: 20px;">
     <el-tab-pane label="活动进度" name="schedule">
-      <schedule></schedule>
+      <schedule :batchNo="batchNo"></schedule>
     </el-tab-pane>
     <el-tab-pane label="活动统计" name="statistics">
       <statistics :batchNo="batchNo"></statistics>
@@ -22,4 +22,4 @@ const batchNo = route.params.batchNo
 const activeName = ref('schedule')
 </script>
 
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped></style>