|
@@ -66,17 +66,47 @@
|
|
<div class="areaList">
|
|
<div class="areaList">
|
|
<p class="commonbox-title arealists">区域列表</p>
|
|
<p class="commonbox-title arealists">区域列表</p>
|
|
<div class="area-listinfo" v-loading="loadingTotal.areaList" element-loading-background="rgba(0, 0, 0, 0.3)">
|
|
<div class="area-listinfo" v-loading="loadingTotal.areaList" element-loading-background="rgba(0, 0, 0, 0.3)">
|
|
- <div class="area-item" v-for="(item,index) in areaLists" :key="item.id">
|
|
|
|
- <div class="area-item-list">
|
|
|
|
- <p class="area-item-name">{{item.name}}</p>
|
|
|
|
- <p class="area-item-school"><span class="area-item-school-title">学区学校数:</span><span class="area-item-school-content">{{item.scCnt}}</span></p>
|
|
|
|
|
|
+ <el-tabs type="border-card">
|
|
|
|
+ <el-tab-pane label="学区">
|
|
|
|
+ <div class="area-data">
|
|
|
|
+ <div class="area-item" v-for="(item,index) in areaLists" :key="item.id">
|
|
|
|
+ <div class="area-item-list">
|
|
|
|
+ <p class="area-item-name">{{item.name}}</p>
|
|
|
|
+ <p class="area-item-school"><span class="area-item-school-title">学区学校数:</span><span class="area-item-school-content">{{item.scCnt}}</span></p>
|
|
<!-- <p class="area-item-school"><span class="area-item-school-title">学区教师数:</span><span class="area-item-school-content">{{item.tchCnt}}</span></p>
|
|
<!-- <p class="area-item-school"><span class="area-item-school-title">学区教师数:</span><span class="area-item-school-content">{{item.tchCnt}}</span></p>
|
|
<p class="area-item-school"><span class="area-item-school-title">学区学生数:</span><span class="area-item-school-content">{{item.stuCnt}}</span></p> -->
|
|
<p class="area-item-school"><span class="area-item-school-title">学区学生数:</span><span class="area-item-school-content">{{item.stuCnt}}</span></p> -->
|
|
- </div>
|
|
|
|
- <div class="item-detailsbtn" @click="getSchoolDistrict(item)">
|
|
|
|
- <span>详情 ></span>
|
|
|
|
- </div>
|
|
|
|
- </div>
|
|
|
|
|
|
+ </div>
|
|
|
|
+ <div class="item-detailsbtn" @click="getSchoolDistrict(item)">
|
|
|
|
+ <span>详情 ></span>
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ </el-tab-pane>
|
|
|
|
+ <el-tab-pane label="未归区学校">
|
|
|
|
+ <div class="not-classify">
|
|
|
|
+ <el-table :data="notClassifydata" style="width:100%" height="300" empty-text="暂无数据">
|
|
|
|
+ <el-table-column label="校徽" align="center">
|
|
|
|
+ <template #default="scope">
|
|
|
|
+ <div class="school-badge">
|
|
|
|
+ <el-image :src="scope.row.picture" fit="fill" />
|
|
|
|
+ </div>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column prop="name" label="名称" align="center" />
|
|
|
|
+ <el-table-column prop="id" label="简码" align="center" />
|
|
|
|
+ <el-table-column prop="size" label="空间" align="center" />
|
|
|
|
+ <el-table-column align="center">
|
|
|
|
+ <template #header>
|
|
|
|
+ <el-input v-model="areaSearchValue" size="small" placeholder="搜索学校名称/简码" clearable />
|
|
|
|
+ </template>
|
|
|
|
+ <template #default="scope">
|
|
|
|
+ <el-button type="primary" size="small" @click="detailsclick(scope.row)">详情</el-button>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ </el-table>
|
|
|
|
+ </div>
|
|
|
|
+ </el-tab-pane>
|
|
|
|
+ </el-tabs>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -344,6 +374,8 @@ export default {
|
|
classLine: true,
|
|
classLine: true,
|
|
areaList: true,
|
|
areaList: true,
|
|
})
|
|
})
|
|
|
|
+ let notClassifydata=ref([])
|
|
|
|
+ let notClassifyoriginal=ref({})
|
|
let schooltableData = ref([])
|
|
let schooltableData = ref([])
|
|
//某个学区顾问列表
|
|
//某个学区顾问列表
|
|
let CounselorList = ref([])
|
|
let CounselorList = ref([])
|
|
@@ -1429,6 +1461,7 @@ export default {
|
|
getClassData()
|
|
getClassData()
|
|
getclassification()
|
|
getclassification()
|
|
getAllList()
|
|
getAllList()
|
|
|
|
+ notclassify()
|
|
}
|
|
}
|
|
})
|
|
})
|
|
.catch((res) => {
|
|
.catch((res) => {
|
|
@@ -1565,6 +1598,15 @@ export default {
|
|
ElMessage.error('全区课例活跃度获取异常')
|
|
ElMessage.error('全区课例活跃度获取异常')
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
+ //获取未归学区的学校列表
|
|
|
|
+ function notclassify(){
|
|
|
|
+ proxy.$api.getAreaSchoolList({}).then((res)=>{
|
|
|
|
+ console.log(res,'未归区的学校')
|
|
|
|
+ res.state === 200 ? (notClassifydata.value=res.areaSchool,notClassifyoriginal.value=res.areaSchool):''
|
|
|
|
+ }).catch((error)=>{
|
|
|
|
+ ElMessage.error('API异常,获取未归区学校列表失败')
|
|
|
|
+ })
|
|
|
|
+ }
|
|
//获取某个学区的数据统计包含跳转
|
|
//获取某个学区的数据统计包含跳转
|
|
function getSchoolDistrict (areaids) {
|
|
function getSchoolDistrict (areaids) {
|
|
console.log(areaids, 'ID!!!!!')
|
|
console.log(areaids, 'ID!!!!!')
|
|
@@ -1814,12 +1856,12 @@ export default {
|
|
timer.value = setTimeout(fn, wait)
|
|
timer.value = setTimeout(fn, wait)
|
|
}
|
|
}
|
|
function personnelSearch () {
|
|
function personnelSearch () {
|
|
- let arr = schooltableData.value
|
|
|
|
|
|
+ let arr = showPattern.value==='all'? notClassifydata.value:schooltableData.value
|
|
let newArr = arr.filter((item) => {
|
|
let newArr = arr.filter((item) => {
|
|
// return (item.name && item.name.includes(filterText.value)) || (item.mobile && item.mobile.includes(filterText.value)) || (item.mobile && item.mobile.tmdId.includes(filterText.value))
|
|
// return (item.name && item.name.includes(filterText.value)) || (item.mobile && item.mobile.includes(filterText.value)) || (item.mobile && item.mobile.tmdId.includes(filterText.value))
|
|
return item.name.includes(areaSearchValue.value) || item.id.includes(areaSearchValue.value)
|
|
return item.name.includes(areaSearchValue.value) || item.id.includes(areaSearchValue.value)
|
|
})
|
|
})
|
|
- schooltableData.value = newArr
|
|
|
|
|
|
+ showPattern.value==='all'? notClassifydata.value=newArr:schooltableData.value = newArr
|
|
}
|
|
}
|
|
getAll()
|
|
getAll()
|
|
// getoption()
|
|
// getoption()
|
|
@@ -1830,7 +1872,7 @@ export default {
|
|
if (newdata.trim().length !== 0) {
|
|
if (newdata.trim().length !== 0) {
|
|
debounce(personnelSearch, 500)
|
|
debounce(personnelSearch, 500)
|
|
} else {
|
|
} else {
|
|
- schooltableData.value = originalSchool.value
|
|
|
|
|
|
+ showPattern.value==='all'? notClassifydata.value=notClassifyoriginal.value:schooltableData.value = originalSchool.value
|
|
}
|
|
}
|
|
})
|
|
})
|
|
return {
|
|
return {
|
|
@@ -1865,7 +1907,10 @@ export default {
|
|
timer,
|
|
timer,
|
|
personnelSearch,
|
|
personnelSearch,
|
|
originalSchool,
|
|
originalSchool,
|
|
- unit
|
|
|
|
|
|
+ unit,
|
|
|
|
+ notclassify,
|
|
|
|
+ notClassifydata,
|
|
|
|
+ notClassifyoriginal
|
|
}
|
|
}
|
|
},
|
|
},
|
|
}
|
|
}
|
|
@@ -2225,7 +2270,7 @@ export default {
|
|
}
|
|
}
|
|
.area-listinfo {
|
|
.area-listinfo {
|
|
width: 100%;
|
|
width: 100%;
|
|
- height: 300px;
|
|
|
|
|
|
+ height: 450px;
|
|
background: #fff;
|
|
background: #fff;
|
|
padding: 1%;
|
|
padding: 1%;
|
|
/* height: 40vh; */
|
|
/* height: 40vh; */
|
|
@@ -2234,7 +2279,7 @@ export default {
|
|
flex-wrap: wrap;
|
|
flex-wrap: wrap;
|
|
flex-direction: row;
|
|
flex-direction: row;
|
|
justify-content: flex-start;
|
|
justify-content: flex-start;
|
|
- overflow: auto;
|
|
|
|
|
|
+ /* overflow: auto; */
|
|
}
|
|
}
|
|
.area-item {
|
|
.area-item {
|
|
width: 18%;
|
|
width: 18%;
|
|
@@ -2412,6 +2457,17 @@ export default {
|
|
width: 100%;
|
|
width: 100%;
|
|
text-align: center;
|
|
text-align: center;
|
|
}
|
|
}
|
|
|
|
+.area-data{
|
|
|
|
+ width:100%;
|
|
|
|
+ height:25vh;
|
|
|
|
+ display: flex;
|
|
|
|
+ flex-wrap: wrap;
|
|
|
|
+ overflow: auto;
|
|
|
|
+}
|
|
|
|
+.not-classify{
|
|
|
|
+ width:100%;
|
|
|
|
+ height:25vh;
|
|
|
|
+}
|
|
</style>
|
|
</style>
|
|
|
|
|
|
<style>
|
|
<style>
|
|
@@ -2419,4 +2475,5 @@ export default {
|
|
.statisticsbox .el-loading-spinner .circular {
|
|
.statisticsbox .el-loading-spinner .circular {
|
|
display: inline !important;
|
|
display: inline !important;
|
|
}
|
|
}
|
|
|
|
+.area-listinfo .el-tabs{width:100%}
|
|
</style>
|
|
</style>
|