|
@@ -215,10 +215,30 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="schoolList-all">
|
|
<div class="schoolList-all">
|
|
- <div class="school-list-title">学校列表:</div>
|
|
|
|
|
|
+ <div class="school-list-title">学校列表:</div>
|
|
<div class="school-search">
|
|
<div class="school-search">
|
|
|
|
+ <el-select v-model="selectCity" placeholder="篩選城市" style="width: 240px;margin-bottom: 10px;display: flex;" @change="personnelSearch">
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="item in schoolCitys"
|
|
|
|
+ :key="item.city"
|
|
|
|
+ :label="item.city"
|
|
|
|
+ :value="item.city"
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
<el-input v-model="searchText.values" placeholder="搜索 学校名称/学校简码" class="input-with-select" size="small" clearable />
|
|
<el-input v-model="searchText.values" placeholder="搜索 学校名称/学校简码" class="input-with-select" size="small" clearable />
|
|
</div>
|
|
</div>
|
|
|
|
+ <!-- <div >
|
|
|
|
+ <el-select v-model="selectCity" placeholder="篩選城市" style="width: 240px" @change="personnelSearch">
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="item in schoolCitys"
|
|
|
|
+ :key="item.city"
|
|
|
|
+ :label="item.city"
|
|
|
|
+ :value="item.city"
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
|
|
+ </div> -->
|
|
|
|
+
|
|
|
|
+
|
|
<div class="school-tables" style="width: 100%; height: 60vh" v-loading="searchText.loading" element-loading-background="rgba(0, 0, 0, 0.5)">
|
|
<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="暂无数据">
|
|
<!-- <el-table :data="schoolDefault" height="55vh" style="width: 100%" v-loading="searchText.loading" element-loading-background="rgba(0, 0, 0, 0.5)" empty-text="暂无数据">
|
|
<el-table-column label="校徽" align="center">
|
|
<el-table-column label="校徽" align="center">
|
|
@@ -373,7 +393,7 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
-<script>
|
|
|
|
|
|
+<script >
|
|
import { ref, reactive, onMounted, getCurrentInstance, watch } from 'vue'
|
|
import { ref, reactive, onMounted, getCurrentInstance, watch } from 'vue'
|
|
import Bar from '@/components/echarts/commonBar.vue'
|
|
import Bar from '@/components/echarts/commonBar.vue'
|
|
import CommonLine from '@/components/echarts/commonLine.vue'
|
|
import CommonLine from '@/components/echarts/commonLine.vue'
|
|
@@ -383,9 +403,12 @@ import Gradepie from '@/components/echarts/gradePie.vue'
|
|
import ConventionPie from '@/components/echarts/conventionPie.vue'
|
|
import ConventionPie from '@/components/echarts/conventionPie.vue'
|
|
import { useRouter } from 'vue-router'
|
|
import { useRouter } from 'vue-router'
|
|
import { useStore } from 'vuex'
|
|
import { useStore } from 'vuex'
|
|
-import { ElMessage, ElLoading } from 'element-plus'
|
|
|
|
|
|
+import { ElMessage, TableV2SortOrder, ElLoading, ElCheckbox,HeaderCellSlotProps,ElPopover,Column, RowClassNameGetter} from 'element-plus'
|
|
|
|
+import { Filter } from '@element-plus/icons'
|
|
|
|
+import { Search, CirclePlus } from '@element-plus/icons-vue'
|
|
import jwt_decode from 'jwt-decode'
|
|
import jwt_decode from 'jwt-decode'
|
|
import * as echarts from 'echarts'
|
|
import * as echarts from 'echarts'
|
|
|
|
+import { unique } from 'element-plus/es/utils'
|
|
export default {
|
|
export default {
|
|
components: {
|
|
components: {
|
|
Bar,
|
|
Bar,
|
|
@@ -396,6 +419,9 @@ export default {
|
|
CommonBar
|
|
CommonBar
|
|
},
|
|
},
|
|
setup () {
|
|
setup () {
|
|
|
|
+ const selectCity = ref('')
|
|
|
|
+ let schoolCitys = reactive([{city:'篩選城市'}])
|
|
|
|
+ //let schoolDefault = ref([])
|
|
let showState = ref('all')
|
|
let showState = ref('all')
|
|
let router = useRouter()
|
|
let router = useRouter()
|
|
let { proxy } = getCurrentInstance()
|
|
let { proxy } = getCurrentInstance()
|
|
@@ -445,7 +471,7 @@ export default {
|
|
// key: "name",
|
|
// key: "name",
|
|
// dataKey: "name",//需要渲染当前列的数据字段,如{id:9527,name:'Mike'},则填name
|
|
// dataKey: "name",//需要渲染当前列的数据字段,如{id:9527,name:'Mike'},则填name
|
|
title: "校徽",
|
|
title: "校徽",
|
|
- width: 400,
|
|
|
|
|
|
+ width: 300,
|
|
fixed: false,
|
|
fixed: false,
|
|
align: 'center',
|
|
align: 'center',
|
|
cellRenderer: (data) => (
|
|
cellRenderer: (data) => (
|
|
@@ -455,11 +481,19 @@ export default {
|
|
</>
|
|
</>
|
|
)
|
|
)
|
|
},
|
|
},
|
|
|
|
+ {
|
|
|
|
+ key: "city",
|
|
|
|
+ dataKey: "city",//需要渲染当前列的数据字段,如{id:9527,name:'Mike'},则填name
|
|
|
|
+ title: "城市",
|
|
|
|
+ width: 300,
|
|
|
|
+ fixed: false,
|
|
|
|
+ align: 'center',
|
|
|
|
+ },
|
|
{
|
|
{
|
|
key: "name",
|
|
key: "name",
|
|
dataKey: "name",//需要渲染当前列的数据字段,如{id:9527,name:'Mike'},则填name
|
|
dataKey: "name",//需要渲染当前列的数据字段,如{id:9527,name:'Mike'},则填name
|
|
title: "名称",
|
|
title: "名称",
|
|
- width: 400,
|
|
|
|
|
|
+ width: 300,
|
|
fixed: false,
|
|
fixed: false,
|
|
align: 'center',
|
|
align: 'center',
|
|
},
|
|
},
|
|
@@ -483,12 +517,12 @@ export default {
|
|
key: "schoolId",
|
|
key: "schoolId",
|
|
dataKey: "schoolId",//需要渲染当前列的数据字段,如{id:9527,name:'Mike'},则填id
|
|
dataKey: "schoolId",//需要渲染当前列的数据字段,如{id:9527,name:'Mike'},则填id
|
|
title: "学校简码",//显示在单元格表头的文本
|
|
title: "学校简码",//显示在单元格表头的文本
|
|
- width: 400,//当前列的宽度,必须设置
|
|
|
|
|
|
+ width: 300,//当前列的宽度,必须设置
|
|
align: 'center',
|
|
align: 'center',
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: "",
|
|
title: "",
|
|
- width: 400,
|
|
|
|
|
|
+ width: 300,
|
|
align: "center",
|
|
align: "center",
|
|
// fixed: 'right',
|
|
// fixed: 'right',
|
|
cellRenderer: (data) =>
|
|
cellRenderer: (data) =>
|
|
@@ -1788,6 +1822,35 @@ export default {
|
|
})
|
|
})
|
|
allLoding.value.rankData = false
|
|
allLoding.value.rankData = false
|
|
schoolDefault.value = res.scInfos
|
|
schoolDefault.value = res.scInfos
|
|
|
|
+
|
|
|
|
+ let cityarr = [];
|
|
|
|
+ res.scInfos.forEach((item) =>{
|
|
|
|
+ let citem = {
|
|
|
|
+ city:item.city
|
|
|
|
+ }
|
|
|
|
+ cityarr.push(citem);
|
|
|
|
+ })
|
|
|
|
+
|
|
|
|
+ //cityarr = [...new Set(cityarr)];
|
|
|
|
+ cityarr = [...new Set(cityarr.map(item => item.city))];
|
|
|
|
+
|
|
|
|
+ cityarr.forEach((item) => {
|
|
|
|
+ if (item !== "" && item !== null && item !== undefined) {
|
|
|
|
+ let citem = {
|
|
|
|
+ city: item
|
|
|
|
+ }
|
|
|
|
+ schoolCitys.push(citem)
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+
|
|
|
|
+ // //schoolCitys.value = cityarr;
|
|
|
|
+ // schoolCitys = [
|
|
|
|
+ // {city:'111'},
|
|
|
|
+ // {city:'222'},
|
|
|
|
+ // {city:'333'},
|
|
|
|
+ // ]
|
|
|
|
+
|
|
|
|
+
|
|
searchText.original = res.scInfos
|
|
searchText.original = res.scInfos
|
|
searchText.loading = false
|
|
searchText.loading = false
|
|
serviceVersion(res.productGroup, res.scInfos)
|
|
serviceVersion(res.productGroup, res.scInfos)
|
|
@@ -1807,7 +1870,7 @@ export default {
|
|
}).catch((error) => {
|
|
}).catch((error) => {
|
|
ElMessage.error('数据获取API异常')
|
|
ElMessage.error('数据获取API异常')
|
|
})
|
|
})
|
|
- }
|
|
|
|
|
|
+ }
|
|
function allAspects (val, state, behinddata) {
|
|
function allAspects (val, state, behinddata) {
|
|
console.log(val, state, behinddata)
|
|
console.log(val, state, behinddata)
|
|
//let data = state === 'details' ? { schoolId: val } : { tmdId: val }
|
|
//let data = state === 'details' ? { schoolId: val } : { tmdId: val }
|
|
@@ -1969,8 +2032,7 @@ export default {
|
|
// })
|
|
// })
|
|
}
|
|
}
|
|
function detailsSchool (val) {
|
|
function detailsSchool (val) {
|
|
- console.log(val);
|
|
|
|
- // debugger;
|
|
|
|
|
|
+ console.log(val);
|
|
let schoolData = val
|
|
let schoolData = val
|
|
schoolDeatilsInfo(schoolData.schoolId)
|
|
schoolDeatilsInfo(schoolData.schoolId)
|
|
showState.value = 'particular'
|
|
showState.value = 'particular'
|
|
@@ -2359,6 +2421,13 @@ export default {
|
|
let newArr = arr.filter((item) => {
|
|
let newArr = arr.filter((item) => {
|
|
return item.name.includes(searchText.values) || item.id.includes(searchText.values)
|
|
return item.name.includes(searchText.values) || item.id.includes(searchText.values)
|
|
})
|
|
})
|
|
|
|
+ if (selectCity.value !== "" && selectCity.value !== "篩選城市") {
|
|
|
|
+ newArr = newArr.filter((item) => {
|
|
|
|
+ if (item.city !== null && item.city !== undefined && item.city !== "") {
|
|
|
|
+ return item.city.includes(selectCity.value)
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
schoolDefault.value = newArr
|
|
schoolDefault.value = newArr
|
|
}
|
|
}
|
|
showInit()
|
|
showInit()
|
|
@@ -2369,11 +2438,13 @@ export default {
|
|
watch(() => searchText.values, (newvalues) => {
|
|
watch(() => searchText.values, (newvalues) => {
|
|
if (newvalues.trim().length !== 0) {
|
|
if (newvalues.trim().length !== 0) {
|
|
debounce(personnelSearch, 500)
|
|
debounce(personnelSearch, 500)
|
|
- } else {
|
|
|
|
|
|
+ } else {
|
|
schoolDefault.value = searchText.original
|
|
schoolDefault.value = searchText.original
|
|
}
|
|
}
|
|
})
|
|
})
|
|
- return {
|
|
|
|
|
|
+ return {
|
|
|
|
+ schoolCitys,
|
|
|
|
+ selectCity,
|
|
headerbasics,
|
|
headerbasics,
|
|
echartsData,
|
|
echartsData,
|
|
imgdata,
|
|
imgdata,
|