chenmy 2 gadi atpakaļ
vecāks
revīzija
bc80cd49dc

+ 5 - 2
TEAMModelBI/ClientApp/src/view/areamanage/statistics.vue

@@ -1717,6 +1717,7 @@ export default {
         aspectsData.value[1].addmonth = res.areaScStats.monthTch
         aspectsData.value[2].addmonth = res.areaScStats.monthStu
         aspectsData.value[3].addmonth = Number(res.areaScStats.lessStats.month) + Number(res.areaScStats.actStats.month)
+        aspectsLoading.value.headerBasics = false
         // //基础数据 左一
         activityData.value.oneself[0].num = res.areaScStats.lessStats.week
         activityData.value.oneself[1].num = res.areaScStats.lessStats.term
@@ -1731,6 +1732,7 @@ export default {
         areaData.value.research.series[0].data[1].value = res.areaScStats.actStats.vote
         areaData.value.research.series[0].data[2].value = res.areaScStats.actStats.survey
         areaData.value.research.series[0].data[3].value = res.areaScStats.actStats.homework
+        aspectsLoading.value.basics = false
         //课例活跃度
         let namedata = []
         for (let i in res.weekLess) {
@@ -1741,8 +1743,9 @@ export default {
         areaData.value.dynamic.series[1].data = res.weekLess
         areaData.value.dynamic.xAxis.data = namedata
         aspectsLoading.value.classWeek = false
-        // //学区内的学校列表
-        // schooltableData.value=
+        //学区内的学校列表
+        schooltableData.value = res.schoolInfos
+        aspectsLoading.value.schoolList = false
       }).catch((error) => {
         ElMessage.error('获取学区统计数据失败')
       })

+ 2 - 1
TEAMModelBI/ClientApp/src/view/schoolmanage/schoolAnalyse.vue

@@ -215,7 +215,7 @@
     <div class="schoolList-all">
       <div class="school-list-title">学校列表:</div>
       <div class="school-search">
-        <el-input v-model="allscSearch" placeholder="搜索 学校名称/学校简码" class="input-with-select" size="small" clearable />
+        <el-input v-model="searchText.values" placeholder="搜索 学校名称/学校简码" class="input-with-select" size="small" clearable />
       </div>
       <div class="school-tables" style="width: 100%; height: 60vh" v-loading="searchText.loading" element-loading-background="rgba(0, 0, 0, 0.5)">
         <!-- <el-table :data="schoolDefault" height="55vh" style="width: 100%" v-loading="searchText.loading" element-loading-background="rgba(0, 0, 0, 0.5)" empty-text="暂无数据">
@@ -1725,6 +1725,7 @@ export default {
           })
           allLoding.value.rankData = false
           schoolDefault.value = res.scInfos
+          searchText.original = res.scInfos
           searchText.loading = false
           aspectsInfo(res.areaScStats)
           // aspectsData.value.classed.push(item.lessCnt)