|
|
@@ -10,21 +10,21 @@
|
|
|
</div> -->
|
|
|
<div class="province-box">
|
|
|
<!-- <span>{{$t(`areaManages.selector.provinceName`)}}：</span> -->
|
|
|
- <el-select v-model="provinceOptions.provinceValue" :placeholder="$t(`areaManages.selector.provinceDefault`)" @change="areaSelctChange(provinceOptions.provinceValue, 'province')" size="small">
|
|
|
+ <el-select v-model="provinceOptions.provinceValue" :placeholder="$t(`areaManages.selector.provinceDefault`)" @change="areaSelctChange(provinceOptions.provinceValue, 'province')">
|
|
|
<el-option v-for="item in provinceOptions.optionInfo" :key="item.code" :label="item.name" :value="item.name">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
<div class="city-box">
|
|
|
<!-- <span>{{$t(`areaManages.selector.cityName`)}}：</span> -->
|
|
|
- <el-select v-model="cityOptions.cityValue" :placeholder="$t(`areaManages.selector.cityDefault`)" @change="areaSelctChange(cityOptions.cityValue, 'city')" size="small" no-data-text="请筛选 省级 列表">
|
|
|
+ <el-select v-model="cityOptions.cityValue" :placeholder="$t(`areaManages.selector.cityDefault`)" @change="areaSelctChange(cityOptions.cityValue, 'city')" no-data-text="请筛选 省级 列表">
|
|
|
<el-option v-for="item in cityOptions.cityInfo" :key="item.code" :label="item.name" :value="item.name">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
<div class="dist-box">
|
|
|
<!-- <span>{{$t(`areaManages.selector.areaName`)}}：</span> -->
|
|
|
- <el-select v-model="distOptions.distValue" filterable allow-create default-first-option :placeholder="$t(`areaManages.selector.areaDefault`)" @change="areaSelctChange(distOptions.distValue, 'dist')" size="small" no-data-text="请筛选 市/县 列表">
|
|
|
+ <el-select v-model="distOptions.distValue" filterable allow-create default-first-option :placeholder="$t(`areaManages.selector.areaDefault`)" @change="areaSelctChange(distOptions.distValue, 'dist')" no-data-text="请筛选 市/县 列表">
|
|
|
<el-option v-for="item in distOptions.distInfo" :key="item.code" :label="item.name" :value="item.name">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
@@ -35,7 +35,7 @@
|
|
|
</svg>
|
|
|
</div>
|
|
|
<div class="searchSchoolbox">
|
|
|
- <el-input v-model="searchValues" placeholder="搜索 学校名称/学校简码" class="input-with-select" size="small" clearable>
|
|
|
+ <el-input v-model="searchValues" placeholder="搜索 学校名称/学校简码" class="input-with-select" clearable>
|
|
|
<template #prepend>
|
|
|
<svg class="addrelevancy-icon" aria-hidden="true">
|
|
|
<use xlink:href="#icon-sousuo3-copy"></use>
|
|
|
@@ -46,7 +46,7 @@
|
|
|
</div>
|
|
|
<div class="boxselect">
|
|
|
<div class="batchDelete" v-show="PowerShow && deleteSchoolArr.length !==0">
|
|
|
- <el-button size="small" type="primary" @click="batchRemoveSchool">
|
|
|
+ <el-button type="danger" @click="batchRemoveSchool">
|
|
|
<svg class="created-icon" aria-hidden="true">
|
|
|
<use xlink:href="#icon-piliangshanchu"></use>
|
|
|
</svg>
|
|
|
@@ -55,7 +55,7 @@
|
|
|
</div>
|
|
|
<div class="schoolNums"><span>学校数量：</span><span>{{tablesccnt}}</span></div>
|
|
|
<div class="createschools" v-if="PowerShow">
|
|
|
- <el-button size="small" @click="createdSchoolbtn" type="primary">
|
|
|
+ <el-button @click="createdSchoolbtn" type="primary">
|
|
|
<svg class="created-icon" aria-hidden="true">
|
|
|
<use xlink:href="#icon-chuangjianx"></use>
|
|
|
</svg>
|
|
|
@@ -63,10 +63,9 @@
|
|
|
</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="school-list">
|
|
|
- <el-table :data="tableData" :ref="tablesInfo" id="tablescroll" style="width: 100%" height="72vh" v-loading="loading" element-loading-text="加载中..." empty-text="暂无数据" @selection-change="selectChange" @sort-change="versionsSort">
|
|
|
+ <div class="school-list" style="width: 96%; height: 74vh" v-loading="loading" element-loading-text="加载中...">
|
|
|
+ <!-- <el-table :data="tableData" :ref="tablesInfo" id="tablescroll" style="width: 100%" height="72vh" v-loading="loading" element-loading-text="加载中..." empty-text="暂无数据" @selection-change="selectChange" @sort-change="versionsSort">
|
|
|
<el-table-column type="selection" width="55" v-if="PowerShow" />
|
|
|
- <!-- <el-table-column prop="index" :label="$t(`schoolManages.tables.serialnum`)" type="index" sortable align="center" /> -->
|
|
|
<el-table-column :label="$t(`schoolManages.tables.badge`)" width="150" align="center">
|
|
|
<template #default="scope">
|
|
|
<el-image style="width: 70px; height: 70px" :src="scope.row.picture" fit="fill" v-if="scope.row.picture"></el-image>
|
|
|
@@ -74,18 +73,8 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="name" :label="$t(`schoolManages.tables.name`)" sortable align="center" />
|
|
|
- <!-- <el-table-column label="学段" width="150" align="center">
|
|
|
- <template #default="scope">
|
|
|
- <span>{{scope.row.period[0].name}}</span>
|
|
|
- </template>
|
|
|
- </el-table-column> -->
|
|
|
<el-table-column :label="$t(`schoolManages.tables.scale`)" class="school-table-edition" sortable="custom" align="center">
|
|
|
<template #default="scope">
|
|
|
- <!-- <el-image style="width: 80px; height: 80px" :src="imgData.basics" fit="fill" v-if="scope.row.scale === 0"></el-image>
|
|
|
- <el-image style="width: 80px; height: 80px" :src="imgData.standard" fit="fill" v-else-if="scope.row.scale === 500 && scope.row.hard.length === 0 && scope.row.serial.length === 0 && scope.row.service.length === 0">
|
|
|
- </el-image>
|
|
|
- <el-image style="width: 80px; height: 80px" :src="imgData.specialty" fit="fill" v-else-if="scope.row.scale === 500 && (scope.row.hard.length != 0 || scope.row.serial.length != 0 || scope.row.service.length != 0)">
|
|
|
- </el-image> -->
|
|
|
<div class="scalebox">
|
|
|
<p class="scalebox-content basic" v-if="scope.row.scale === 0 && (scope.row.size <100 || scope.row.size ==100)">
|
|
|
基础版
|
|
|
@@ -100,20 +89,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="id" :label="$t(`schoolManages.tables.brevityCode`)" align="center" />
|
|
|
- <!-- <el-table-column label="数据量" sortable :sort-method="schooldataSort" align="center">
|
|
|
- <template #default="scope">
|
|
|
- <div v-if="scope.row.lessonCount">
|
|
|
- <svg class="created-icon" aria-hidden="true">
|
|
|
- <use xlink:href="#icon-shuju"></use>
|
|
|
- </svg>
|
|
|
- {{ scope.row.lessonCount }}
|
|
|
- </div>
|
|
|
- <div v-else>暂无</div>
|
|
|
- </template>
|
|
|
- </el-table-column> -->
|
|
|
<el-table-column prop="location" label="位置" align="center" />
|
|
|
- <!-- <el-table-column prop="city" :label="$t(`schoolManages.tables.city`)" align="center" />
|
|
|
- <el-table-column prop="dist" :label="$t(`schoolManages.tables.area`)" align="center" /> -->
|
|
|
<el-table-column prop="size" :label="$t(`schoolManages.tables.spacesize`)" sortable align="center" />
|
|
|
<el-table-column :label="$t(`schoolManages.tables.assis`)" align="center">
|
|
|
<template #default="scope">
|
|
|
@@ -132,25 +108,20 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column label="数据统计" align="center">
|
|
|
- <template #default="scope">
|
|
|
- <div title="查看学校数据分析" @click="skipAnalyse">
|
|
|
- <svg class="school-analyse" aria-hidden="true">
|
|
|
- <use xlink:href="#icon-shujufenxi"></use>
|
|
|
- </svg>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- </el-table-column> -->
|
|
|
- <!-- <el-table-column prop="state" label="状态" width="110" align="center" /> -->
|
|
|
<el-table-column prop="areaName" label="所属学区" align="center" sortable />
|
|
|
<el-table-column :label="$t(`schoolManages.tables.operate`)" align="center">
|
|
|
<template #default="scope">
|
|
|
- <el-button type="primary" size="small" @click.prevent="deleteRow(scope.$index, scope.row)" v-if="PowerShow">{{ $t(`schoolManages.tables.operatecontent`) }}</el-button>
|
|
|
- <el-button type="primary" size="small" @click.prevent="deleteRow(scope.$index, scope.row)" v-else-if="!PowerShow">查看</el-button>
|
|
|
- <el-button class="deletebtns" type="danger" size="small" @click="removeSchool(scope.row, scope.$index)" v-if="PowerShow">删 除</el-button>
|
|
|
+ <el-button type="primary" @click.prevent="deleteRow(scope.$index, scope.row)" v-if="PowerShow">{{ $t(`schoolManages.tables.operatecontent`) }}</el-button>
|
|
|
+ <el-button type="primary" @click.prevent="deleteRow(scope.$index, scope.row)" v-else-if="!PowerShow">查看</el-button>
|
|
|
+ <el-button class="deletebtns" type="danger" @click="removeSchool(scope.row, scope.$index)" v-if="PowerShow">删 除</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- </el-table>
|
|
|
+ </el-table> -->
|
|
|
+ <el-auto-resizer>
|
|
|
+ <template #default="{ height, width }">
|
|
|
+ <el-table-v2 :columns="columns" :data="tableData" :width="width" :height="height" :estimated-row-height="40" :sort-by="sortState" @column-sort="onSort" fixed />
|
|
|
+ </template>
|
|
|
+ </el-auto-resizer>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!--学校列表end-->
|
|
|
@@ -163,7 +134,7 @@
|
|
|
</svg>
|
|
|
<span class="changebtn-title">{{ $t(`schoolManages.gradSet.save`) }}</span>
|
|
|
</el-button>
|
|
|
- <el-button type="primary" size="small" @click="schoolClose">
|
|
|
+ <el-button type="primary" @click="schoolClose">
|
|
|
<svg class="back-icon" aria-hidden="true">
|
|
|
<use xlink:href="#icon-fanhui"></use>
|
|
|
</svg>
|
|
|
@@ -229,7 +200,7 @@
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item :label="$t(`schoolManages.basicSet.nowAssistant`)" class="school-form-admin">
|
|
|
- <div v-if="PowerShow">
|
|
|
+ <div v-if="PowerShow" class="admin-boxs-width">
|
|
|
<el-select v-model="adminvalue" multiple @change="assistChange" :placeholder="$t(`schoolManages.basicSet.nowAssistanthint`)">
|
|
|
<el-option v-for="item in adminoptions" :key="item.name" :label="item.mobile + '——' + item.name" :value="item.tmdId === null ? '' : item.tmdId" :disabled="!item.tmdId">
|
|
|
</el-option>
|
|
|
@@ -247,7 +218,7 @@
|
|
|
<el-input disabled :placeholder="$t(`schoolManages.basicSet.notCode`)" v-else="nowPitchdata.id ==null" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="所属学区：" class="school-form-area">
|
|
|
- <div v-if="PowerShow">
|
|
|
+ <div v-if="PowerShow" class="area-width">
|
|
|
<el-select v-model="areaSelect.Selectvalue" :placeholder="$t(`schoolManages.basicSet.region`)">
|
|
|
<el-option v-for="item in areaSelect.data" :key="item.name" :label="item.name" :value="item.id" :disabled="item.cutArea">
|
|
|
<div class="areaname">{{item.name}}</div>
|
|
|
@@ -265,7 +236,7 @@
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="学校位置" class="school-form-area">
|
|
|
- <el-cascader v-model="placeData.dataValue" :options="placeData.dataInfo" :props="schoolregionParams" placeholder="选择学校所在地" @change="schoolBelong" />
|
|
|
+ <el-cascader v-model="placeData.dataValue" :options="placeData.dataInfo" :props="schoolregionParams" placeholder="选择学校所在地" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="详细地址" class="school-form-name">
|
|
|
<el-input v-model="nowPitchdata.address" placeholder="编辑学校详细地址"></el-input>
|
|
|
@@ -302,7 +273,7 @@
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane :label="$t(`schoolManages.redactGrading`)">
|
|
|
- <SetSchool :schoolData="studyPhase" ref="setSchoolData"></SetSchool>
|
|
|
+ <SetSchool :schoolData="studyPhase" ref="setSchoolData" @schoolDetails="schoolDetails"></SetSchool>
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="学校管理员">
|
|
|
<setSchooladmin :schoolinfo="nowPitchdata"></setSchooladmin>
|
|
|
@@ -318,17 +289,18 @@
|
|
|
<!--编辑学校页面end-->
|
|
|
</template>
|
|
|
<script>
|
|
|
-import { reactive, ref, getCurrentInstance, toRef, onMounted, watch } from 'vue'
|
|
|
+import { reactive, ref, getCurrentInstance, toRef, onMounted, watch, h } from 'vue'
|
|
|
// import option from '@/static/region.json'
|
|
|
import option_cn from '@/static/regions/region_cn.json'
|
|
|
import option_gl from '@/static/regions/region_gl.json'
|
|
|
import { useStore } from 'vuex'
|
|
|
-import { ElMessage, ElLoading, ElMessageBox } from 'element-plus'
|
|
|
+import { ElMessage, ElLoading, ElMessageBox, TableV2SortOrder, ElButton, ElCheckbox, TableV2FixedDir } from 'element-plus'
|
|
|
import { useRouter } from 'vue-router'
|
|
|
import SetSchool from './setschool.vue'
|
|
|
import Impower from './impower.vue'
|
|
|
import Classpower from './classpower.vue'
|
|
|
import setSchooladmin from './setSchooladmin.vue'
|
|
|
+import jwt_decode from 'jwt-decode'
|
|
|
const siteValue = window.location.host === 'localhost:5001' ? 'cn' : window.location.host === 'bi.teammodel.cn' ? 'cn' : window.location.host === 'bitest.teammodel.cn' ? 'cn' : 'international'
|
|
|
const optionsData = siteValue === 'cn' ? option_cn : option_gl
|
|
|
//const optionsData = siteValue === 'cn' ? option_gl : option_gl
|
|
|
@@ -342,6 +314,8 @@ export default {
|
|
|
setup () {
|
|
|
let { proxy } = getCurrentInstance()
|
|
|
let PowerShow = proxy.$access.identifyPosition(JSON.parse(localStorage.getItem('id_token')))
|
|
|
+ let userVerify = jwt_decode(JSON.parse(localStorage.getItem('id_token')))
|
|
|
+ console.log(PowerShow, userVerify, '!!!!333')
|
|
|
// let PowerShow = false
|
|
|
//根据部署站点不同的值
|
|
|
const store = useStore()
|
|
|
@@ -376,7 +350,7 @@ export default {
|
|
|
let adminvalue = ref([])
|
|
|
const value2 = ref(true)
|
|
|
//为了让表单呈现 暂时的数据，
|
|
|
- let loading = ref(true)
|
|
|
+ let loading = ref(false)
|
|
|
let scrollHeight = ref()
|
|
|
let uploadHeader = ref({})
|
|
|
let nowPitchdata = ref({
|
|
|
@@ -462,12 +436,12 @@ export default {
|
|
|
//关于 修改学校所属位置
|
|
|
let placeData = ref({
|
|
|
dataInfo: [],
|
|
|
- dataValue: '',
|
|
|
+ dataValue: [],
|
|
|
})
|
|
|
let schoolregionParams = ref({
|
|
|
label: 'name', //这里可以配置你们后端返回的属性
|
|
|
value: 'code',
|
|
|
- checkStrictly: false,
|
|
|
+ checkStrictly: true,
|
|
|
})
|
|
|
//当前学校显示
|
|
|
let nSchool = ref({
|
|
|
@@ -476,68 +450,217 @@ export default {
|
|
|
})
|
|
|
provinceOptions.value.optionInfo = optionsData
|
|
|
placeData.value.dataInfo = optionsData
|
|
|
- onMounted(() => {
|
|
|
- //监听表格滚动事件
|
|
|
- // let table = mutipleTable.value._value.layout.table.refs.bodyWrapper;
|
|
|
- let table = document.getElementById('tablescroll')
|
|
|
- console.log(table, '查看是否获取到')
|
|
|
- table.addEventListener("scroll", (res) => { loadmore(res) }, true);
|
|
|
+ const columns = [
|
|
|
+ {
|
|
|
+ cellRenderer: (data) =>
|
|
|
+ h(
|
|
|
+ ElCheckbox,
|
|
|
+ // { onClick: () => handleDelete(data), type: "danger", icon: "Delete" },
|
|
|
+ { onChange: () => selectChange(data.rowData) },
|
|
|
+ { default: () => "" }
|
|
|
+ ),
|
|
|
+ width: 100,//当前列的宽度，必须设置
|
|
|
+ // fixed: true,//是否固定列
|
|
|
+ align: 'center',
|
|
|
+ // cellRenderer: ({ rowData }) => {
|
|
|
+ // const onChange = (value: CheckboxValueType) => (rowData.checked = value)
|
|
|
+ // return <SelectionCell value={rowData.checked} onChange={onChange} />
|
|
|
+ // },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ // key: "name",
|
|
|
+ // dataKey: "name",//需要渲染当前列的数据字段，如{id:9527,name:'Mike'}，则填name
|
|
|
+ title: "校徽",
|
|
|
+ width: 200,
|
|
|
+ fixed: false,
|
|
|
+ align: 'center',
|
|
|
+ cellRenderer: (data) => (
|
|
|
+ <>
|
|
|
+ <el-image style="width: 55px; height: 55px;margin:5px" src={data.rowData.picture} fit="contain" v-show={data.rowData.picture ? true : false}></el-image>
|
|
|
+ <div style=" width: 55px;height: 55px;line-height: 55px;text-align: center;background-color: #bdc3c7;font-size: 10px;color: #ecf0f1;margin:5px;" v-show={!data.rowData.picture ? true : false}>暂无图片</div>
|
|
|
+ </>
|
|
|
+ )
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: "name",
|
|
|
+ dataKey: "name",//需要渲染当前列的数据字段，如{id:9527,name:'Mike'}，则填name
|
|
|
+ title: "名称",
|
|
|
+ width: 200,
|
|
|
+ fixed: false,
|
|
|
+ align: 'center',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ // key: "name",
|
|
|
+ // dataKey: "name",//需要渲染当前列的数据字段，如{id:9527,name:'Mike'}，则填name
|
|
|
+ title: "规模版本",
|
|
|
+ width: 100,
|
|
|
+ fixed: false,
|
|
|
+ align: 'center',
|
|
|
+ // sortable: true,
|
|
|
+ cellRenderer: (data) => (
|
|
|
+ <>
|
|
|
+ <div style="color:#409EFF" v-show={data.rowData.scale === 0 && (data.rowData.size < 100 || data.rowData.size == 100) ? true : false}>基础版</div>
|
|
|
+ <div style="color:#67C23A" v-show={(data.rowData.scale === 300 && data.rowData.size === 500) || (data.rowData.size > 100 && (!data.rowData.service.includes('YMPCVCIM') && !data.rowData.service.includes('VLY6J6N6') && !data.rowData.service.includes('VABAJ6NV'))) ? true : false}>标准版</div>
|
|
|
+ <div style="color: #e6a23c;" v-show={data.rowData.service.includes('YMPCVCIM') || data.rowData.service.includes('VLY6J6N6') || data.rowData.service.includes('VABAJ6NV') ? true : false}>专业版</div>
|
|
|
+ </>
|
|
|
+ ),
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: "id",
|
|
|
+ dataKey: "id",//需要渲染当前列的数据字段，如{id:9527,name:'Mike'}，则填id
|
|
|
+ title: "学校简码",//显示在单元格表头的文本
|
|
|
+ width: 150,//当前列的宽度，必须设置
|
|
|
+ align: 'center',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: "location",
|
|
|
+ dataKey: "location",
|
|
|
+ title: "位置",
|
|
|
+ align: 'center',
|
|
|
+ width: 200,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: "size",
|
|
|
+ dataKey: "size",
|
|
|
+ title: "空间大小",
|
|
|
+ width: 170,
|
|
|
+ align: 'center',
|
|
|
+ sortable: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: "assisName",
|
|
|
+ dataKey: "assisName",
|
|
|
+ title: "关联管家",
|
|
|
+ align: 'center',
|
|
|
+ width: 150,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: "serial",
|
|
|
+ dataKey: "serial",
|
|
|
+ title: "模组情况",
|
|
|
+ align: 'center',
|
|
|
+ width: 200,
|
|
|
+ cellRenderer: (data) => (
|
|
|
+ <>
|
|
|
+ <div title="学情分析" v-show={data.rowData.service.includes('YMPCVCIM') ? true : false}>
|
|
|
+ <svg style=" width: 1.8em;height: 1.8em;vertical-align: -0.5em;fill: currentColor;overflow: hidden;cursor: pointer;" aria-hidden="true" ><use xlink:href="#icon-tongjifenxi"></use></svg>
|
|
|
+ </div>
|
|
|
+ <div title="智慧学校管理服务" v-show={data.rowData.service.includes('IPDYZYLC') ? true : false}>
|
|
|
+ <svg style=" width: 1.8em;height: 1.8em;vertical-align: -0.5em;fill: currentColor;overflow: hidden;cursor: pointer;" aria-hidden="true" ><use xlink:href="#icon-zhihuixiaoyuan"></use></svg>
|
|
|
+ </div>
|
|
|
+ <div title="A Class ONE 智慧学伴" v-show={data.rowData.service.includes('3CLYJ6NP') ? true : false}>
|
|
|
+ <svg style=" width: 1.8em;height: 1.8em;vertical-align: -0.5em;fill: currentColor;overflow: hidden;cursor: pointer;" aria-hidden="true" ><use xlink:href="#icon-jxuexiao2"></use></svg>
|
|
|
+ </div>
|
|
|
+ <div title="数据存储服务空间" v-show={data.rowData.service.includes('IPALJ6NY') ? true : false}>
|
|
|
+ <svg style=" width: 1.8em;height: 1.8em;vertical-align: -0.5em;fill: currentColor;overflow: hidden;cursor: pointer;" aria-hidden="true" ><use xlink:href="#icon-yuncunchu"></use></svg>
|
|
|
+ </div>
|
|
|
+ <div title="卷卡合一阅卷系统" v-show={data.rowData.service.includes('VABAJ6NV') ? true : false}>
|
|
|
+ <svg style=" width: 1.8em;height: 1.8em;vertical-align: -0.5em;fill: currentColor;overflow: hidden;cursor: pointer;" aria-hidden="true" ><use xlink:href="#icon-pingtai_kaoshi"></use></svg>
|
|
|
+ </div>
|
|
|
+ <div title="教研中心模组" v-show={data.rowData.service.includes('VLY6J6N6') ? true : false}>
|
|
|
+ <svg style=" width: 1.8em;height: 1.8em;vertical-align: -0.5em;fill: currentColor;overflow: hidden;cursor: pointer;" aria-hidden="true" ><use xlink:href="#icon-jiaoyan"></use></svg>
|
|
|
+ </div>
|
|
|
+ </>
|
|
|
+ ),
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: "areaName",
|
|
|
+ dataKey: "areaName",
|
|
|
+ title: "所属学区",
|
|
|
+ width: 150,
|
|
|
+ align: 'center',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: "handle",
|
|
|
+ title: "操作",
|
|
|
+ width: 150,
|
|
|
+ align: "center",
|
|
|
+ // fixed: 'right',
|
|
|
+ cellRenderer: (data) =>
|
|
|
+ (
|
|
|
+ <>
|
|
|
+ <el-button type="primary" onClick={deleteRow.bind(this, data.rowData)} v-show={userVerify.roles.includes('admin') ? true : false}>编辑</el-button>
|
|
|
+ <el-button type="primary" onClick={deleteRow.bind(data.rowData)} v-show={userVerify.roles.includes('leader') ? true : false}>查看</el-button>
|
|
|
+ <el-button type="danger" onClick={removeSchool.bind(this, data.rowData)} v-show={userVerify.roles.includes('admin') ? true : false}>删除</el-button>
|
|
|
+ </>
|
|
|
+ ),
|
|
|
+ },
|
|
|
+ ];
|
|
|
+ const sortState = ref({
|
|
|
+ key: 'id',
|
|
|
+ order: TableV2SortOrder.ASC,
|
|
|
})
|
|
|
- const loadmore = (res) => {
|
|
|
- if (res.target.scrollTop && ((res.target.scrollHeight - 20) <= (res.target.scrollTop + res.target.clientHeight))) {
|
|
|
- scrollHeight.value = (res.target.scrollHeight - 20) - (res.target.scrollTop + res.target.clientHeight)
|
|
|
- console.log(scrollHeight.value, '值')
|
|
|
- }
|
|
|
+ const onSort = (sortBy) => {
|
|
|
+ console.log(sortBy)
|
|
|
+ tableData.value = tableData.value.reverse()
|
|
|
+ sortState.value = sortBy
|
|
|
}
|
|
|
+ // onMounted(() => {
|
|
|
+ // //监听表格滚动事件
|
|
|
+ // // let table = mutipleTable.value._value.layout.table.refs.bodyWrapper;
|
|
|
+ // let table = document.getElementById('tablescroll')
|
|
|
+ // console.log(table, '查看是否获取到')
|
|
|
+ // table.addEventListener("scroll", (res) => { loadmore(res) }, true);
|
|
|
+ // })
|
|
|
+ // const loadmore = (res) => {
|
|
|
+ // if (res.target.scrollTop && ((res.target.scrollHeight - 20) <= (res.target.scrollTop + res.target.clientHeight))) {
|
|
|
+ // scrollHeight.value = (res.target.scrollHeight - 20) - (res.target.scrollTop + res.target.clientHeight)
|
|
|
+ // console.log(scrollHeight.value, '值')
|
|
|
+ // }
|
|
|
+ // }
|
|
|
//所有学校列表
|
|
|
async function getAllschool () {
|
|
|
+ loading.value = true
|
|
|
await getoption()
|
|
|
- proxy.$api.getSchooldata({}).then((res) => {
|
|
|
- console.log(res, '获取学校列表')
|
|
|
+ proxy.$api.getSchool({}).then((res) => {
|
|
|
+ console.log(res, '获取学校列表V2')
|
|
|
//处理关联管家 拼内容
|
|
|
- for (let i in res.schoolAssists) {
|
|
|
- res.schoolAssists[i].serviceData = []
|
|
|
- if (res.schoolAssists[i].assists) {
|
|
|
- res.schoolAssists[i].assisName = ''
|
|
|
- res.schoolAssists[i].location = res.schoolAssists[i].dist !== null ? res.schoolAssists[i].province + res.schoolAssists[i].city + res.schoolAssists[i].dist : res.schoolAssists[i].province + res.schoolAssists[i].city
|
|
|
- let datas = res.schoolAssists[i].assists
|
|
|
+ for (let i in res.scInfos) {
|
|
|
+ res.scInfos[i].serviceData = []
|
|
|
+ res.scInfos[i].location = res.scInfos[i].dist !== null ? res.scInfos[i].province + res.scInfos[i].city + res.scInfos[i].dist : res.scInfos[i].province + res.scInfos[i].city
|
|
|
+ if (res.scInfos[i].assists) {
|
|
|
+ res.scInfos[i].assisName = ''
|
|
|
+ let datas = res.scInfos[i].assists
|
|
|
for (let y in datas) {
|
|
|
- res.schoolAssists[i].assisName = res.schoolAssists[i].assisName + datas[y].tmdName + ','
|
|
|
+ res.scInfos[i].assisName = res.scInfos[i].assisName + datas[y].name + ','
|
|
|
}
|
|
|
}
|
|
|
- if (res.schoolAssists[i].service.length > 0) {
|
|
|
- res.schoolAssists[i].service.forEach((x) => {
|
|
|
+ if (res.scInfos[i].service && res.scInfos[i].service.length > 0) {
|
|
|
+ res.scInfos[i].service.forEach((x) => {
|
|
|
for (let m in patternIcon.value) {
|
|
|
- patternIcon.value[m].key === x ? res.schoolAssists[i].serviceData.push(patternIcon.value[m]) : ''
|
|
|
+ patternIcon.value[m].key === x ? res.scInfos[i].serviceData.push(patternIcon.value[m]) : ''
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
console.log(areaSelect, '当时的学区数据')
|
|
|
- res.state == 200 ? (tableData.value = [], originalData.value = [], tableData.value.push(...res.schoolAssists), (originalNum.value = res.schoolAssists.length), (originalData.value = res.schoolAssists), tableNexttoken.value = res.continuationToken, tablesccnt.value = res.scCnt) : ''
|
|
|
- tableData.value.forEach((item) => { item.areaName = ''; areaSelect.value.data.forEach((itema) => { item.areaId === itema.id ? item.areaName = itema.name : '' }) })
|
|
|
+ res.state == 200 ? (tableData.value = [], originalData.value = [], tableData.value.push(...res.scInfos), (originalNum.value = res.scInfos.length), (originalData.value = res.scInfos), tablesccnt.value = res.allCnt) : ''
|
|
|
+ // tableData.value.forEach((item) => { item.areaName = ''; areaSelect.value.data.forEach((itema) => { item.areaId === itema.id ? item.areaName = itema.name : '' }) })
|
|
|
loading.value = false
|
|
|
- console.log(tableData, '区域的数据')
|
|
|
+ console.log(tableData, '完善后的数据')
|
|
|
})
|
|
|
}
|
|
|
//点击学校列表，详情
|
|
|
- function deleteRow (index, data) {
|
|
|
- console.log(index, data, 'DATA')
|
|
|
+ function deleteRow (data, index) {
|
|
|
+ console.log(index, 'INDEX')
|
|
|
+ console.log(data, 'DATA')
|
|
|
//处理的基础设置
|
|
|
areaSelect.value.data = []
|
|
|
studyPhase.value = data.id
|
|
|
nowPitchdata.value = Object.assign(nowPitchdata.value, data)
|
|
|
nowPitchdata.value.address = data.address
|
|
|
nowPitchdata.value.name = data.name
|
|
|
- nowPitchdata.value.type = data.type.toString()
|
|
|
+ nowPitchdata.value.address = data.address
|
|
|
+ // nowPitchdata.value.type = data.type.toString()
|
|
|
nowPitchdata.value.scale = data.scale
|
|
|
nowPitchdata.value.standard = data.standard
|
|
|
nowPitchdata.value.areaId = data.areaId
|
|
|
nSchool.value.img = data.picture
|
|
|
nSchool.value.name = data.name
|
|
|
- data.assists.length ? data.assists.forEach((element) => { adminvalue.value.push(element.tmdId) }) : ''
|
|
|
+ data.assists.length ? data.assists.forEach((element) => { adminvalue.value.push(element.id) }) : ''
|
|
|
//处理现实学校所属位置
|
|
|
let provinceValues = data.province; let cityValues = data.city; let distValues = data.dist;
|
|
|
+ console.log(provinceValues, cityValues, distValues, '位置')
|
|
|
let belongValue = [];
|
|
|
for (let p in options) {
|
|
|
if (options[p].name === provinceValues || options[p].name.includes(provinceValues)) {
|
|
|
@@ -554,13 +677,17 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ console.log(belongValue, '位置结果')
|
|
|
+ belongValue.forEach((items) => { items = Number(items) })
|
|
|
placeData.value.dataValue = belongValue
|
|
|
+ console.log(placeData.value.dataValue, '位置code')
|
|
|
let token = JSON.parse(localStorage.getItem('id_token'))
|
|
|
uploadHeader.value['x-auth-authtoken'] = token
|
|
|
data.areaId !== null ? (areaSelect.value.Selectvalue = data.areaId) : ''
|
|
|
store.state.point.length ? areaSelect.value.data.push(...store.state.point) : ''
|
|
|
models.value = 'details'
|
|
|
console.log(nowPitchdata.value, '查看当前学校的值')
|
|
|
+ console.log(adminoptions, '顾问合集')
|
|
|
}
|
|
|
//更换校徽
|
|
|
function changeBadge (file) {
|
|
|
@@ -589,15 +716,8 @@ export default {
|
|
|
})
|
|
|
console.log(cityData, '筛选记过')
|
|
|
cityOptions.value.cityInfo = cityData[0].hasOwnProperty('children') ? cityData[0].children : []
|
|
|
- //遍历list
|
|
|
- // let schoolData = originalData.value.filter((items) => {
|
|
|
- // // let provinceState = items.province.includes('自治区') || items.province.includes('市') ? true : false
|
|
|
- // // let names = provinceState === false && items.province.indexOf('省') === -1 ? items.province + '省' : items.province
|
|
|
- // return value.includes(items.province)
|
|
|
- // // return items.province === value
|
|
|
- // })
|
|
|
let disposeText = ''
|
|
|
- if (siteValue.value === 'cn') {
|
|
|
+ if (siteValue === 'cn') {
|
|
|
let textNums = value.indexOf('省') !== -1 ? value.indexOf('省') : value.indexOf('自治区') !== -1 ? value.indexOf('自治区') : value.indexOf('市') !== -1 ? value.indexOf('市') :
|
|
|
value.indexOf('特别行政区') !== -1 ? value.indexOf('特别行政区') : value.indexOf('地區') !== -1 ? value.indexOf('地區') : value
|
|
|
console.log(textNums, '数字')
|
|
|
@@ -606,14 +726,21 @@ export default {
|
|
|
} else {
|
|
|
disposeText = value
|
|
|
}
|
|
|
- let data = { province: disposeText }
|
|
|
- await proxy.$api.getSchooldata(data).then((res) => {
|
|
|
- console.log(res, '筛选结果')
|
|
|
- // res.state === 200 ? tableData.value=res.schoolAssists:''
|
|
|
- res.state === 200 ? (schoolListDatas = res.schoolAssists, selectValue.value.province = disposeText, nextPageToken = res.continuationToken, tablesccnt.value = res.scCnt) : ''
|
|
|
- }).catch((error) => {
|
|
|
- ElMessage.error('API异常，数据 省 筛选失败')
|
|
|
+ // let data = { province: disposeText }
|
|
|
+ console.log(disposeText, value, '省')
|
|
|
+ //遍历list
|
|
|
+ let schoolData = originalData.value.filter((items) => {
|
|
|
+ return items.province.includes(disposeText)
|
|
|
})
|
|
|
+ console.log(schoolData, '123456')
|
|
|
+ tableData.value = schoolData
|
|
|
+ // await proxy.$api.getSchooldata(data).then((res) => {
|
|
|
+ // console.log(res, '筛选结果')
|
|
|
+ // // res.state === 200 ? tableData.value=res.schoolAssists:''
|
|
|
+ // res.state === 200 ? (schoolListDatas = res.schoolAssists, selectValue.value.province = disposeText, nextPageToken = res.continuationToken, tablesccnt.value = res.scCnt) : ''
|
|
|
+ // }).catch((error) => {
|
|
|
+ // ElMessage.error('API异常，数据 省 筛选失败')
|
|
|
+ // })
|
|
|
// tableData.value = schoolData
|
|
|
// console.log(schoolData, tableData.value)
|
|
|
} else if (model === 'city') {
|
|
|
@@ -628,7 +755,7 @@ export default {
|
|
|
// })
|
|
|
// tableData.value = schoolData
|
|
|
let disposeText = ''
|
|
|
- if (siteValue.value === 'cn') {
|
|
|
+ if (siteValue === 'cn') {
|
|
|
let cityNums = value.indexOf('市') !== -1 && value !== '直辖市' ? value.indexOf('市') : value.indexOf('县') !== -1 ? value.indexOf('县') :
|
|
|
value.indexOf('自治州') !== -1 ? value.indexOf('自治州') : value.indexOf('縣') !== -1 ? value.indexOf('縣') : value.indexOf('直辖市') !== -1 ? value.length : ''
|
|
|
disposeText = value.substr(0, cityNums)
|
|
|
@@ -636,12 +763,17 @@ export default {
|
|
|
} else {
|
|
|
disposeText = value
|
|
|
}
|
|
|
- let data = { province: selectValue.value.province ? selectValue.value.province : '', city: disposeText }
|
|
|
- await proxy.$api.getSchooldata(data).then((res) => {
|
|
|
- res.state === 200 ? (schoolListDatas = res.schoolAssists, selectValue.value.city = disposeText, nextPageToken = res.continuationToken, tablesccnt.value = res.scCnt) : ''
|
|
|
- }).catch((error) => {
|
|
|
- ElMessage.error('API异常，数据 市/县 筛选失败')
|
|
|
+ let CityschoolData = originalData.value.filter((items) => {
|
|
|
+ return items.province.includes(selectValue.value.province) && items.city.includes(disposeText)
|
|
|
})
|
|
|
+ console.log(CityschoolData, '456789')
|
|
|
+ tableData.value = CityschoolData
|
|
|
+ // let data = { province: selectValue.value.province ? selectValue.value.province : '', city: disposeText }
|
|
|
+ // await proxy.$api.getSchooldata(data).then((res) => {
|
|
|
+ // res.state === 200 ? (schoolListDatas = res.schoolAssists, selectValue.value.city = disposeText, nextPageToken = res.continuationToken, tablesccnt.value = res.scCnt) : ''
|
|
|
+ // }).catch((error) => {
|
|
|
+ // ElMessage.error('API异常，数据 市/县 筛选失败')
|
|
|
+ // })
|
|
|
} else if (model === 'dist') {
|
|
|
let provinceData = provinceOptions.value.provinceValue
|
|
|
let cityData = cityOptions.value.cityValue
|
|
|
@@ -652,43 +784,47 @@ export default {
|
|
|
// })
|
|
|
// tableData.value = schoolData
|
|
|
let disposeText = ''
|
|
|
- if (siteValue.value === 'cn') {
|
|
|
+ if (siteValue === 'cn') {
|
|
|
let distNums = value.indexOf('区') !== -1 && value.length > 2 ? value.indexOf('区') : value.indexOf('县') !== -1 ? value.indexOf('县') : value.indexOf('市') !== -1 ? value.indexOf('市') : value.indexOf('直辖市') !== -1 || value.indexOf('天府新区') !== -1 ? value.length : ''
|
|
|
disposeText = value.substr(0, distNums)
|
|
|
console.log(distNums, disposeText, '位置')
|
|
|
} else {
|
|
|
disposeText = value
|
|
|
}
|
|
|
- let data = { province: selectValue.value.province ? selectValue.value.province : '', city: selectValue.value.city ? selectValue.value.city : '', dist: disposeText }
|
|
|
- await proxy.$api.getSchooldata(data).then((res) => {
|
|
|
- res.state === 200 ? (schoolListDatas = res.schoolAssists, nextPageToken = res.continuationToken, tablesccnt.value = res.scCnt) : ''
|
|
|
- }).catch((error) => {
|
|
|
- ElMessage.error('API异常，数据 地区 筛选失败')
|
|
|
+ let distschoolData = originalData.value.filter((items) => {
|
|
|
+ return items.province.includes(selectValue.value.province) && items.city.includes(selectValue.value.city) && (items.dist !== null ? items.dist.indexOf(disposeText) !== -1 : '')
|
|
|
})
|
|
|
+ tableData.value = distschoolData
|
|
|
+ // let data = { province: selectValue.value.province ? selectValue.value.province : '', city: selectValue.value.city ? selectValue.value.city : '', dist: disposeText }
|
|
|
+ // await proxy.$api.getSchooldata(data).then((res) => {
|
|
|
+ // res.state === 200 ? (schoolListDatas = res.schoolAssists, nextPageToken = res.continuationToken, tablesccnt.value = res.scCnt) : ''
|
|
|
+ // }).catch((error) => {
|
|
|
+ // ElMessage.error('API异常，数据 地区 筛选失败')
|
|
|
+ // })
|
|
|
}
|
|
|
//统一处理
|
|
|
- console.log(schoolListDatas, '处理前的')
|
|
|
- for (let i in schoolListDatas) {
|
|
|
- schoolListDatas[i].serviceData = []
|
|
|
- if (schoolListDatas[i].assists) {
|
|
|
- schoolListDatas[i].assisName = ''
|
|
|
- schoolListDatas[i].location = schoolListDatas[i].dist !== null ? schoolListDatas[i].province + schoolListDatas[i].city + schoolListDatas[i].dist : schoolListDatas[i].province + schoolListDatas[i].city
|
|
|
- let datas = schoolListDatas[i].assists
|
|
|
- for (let y in datas) {
|
|
|
- schoolListDatas[i].assisName = schoolListDatas[i].assisName + datas[y].tmdName + ','
|
|
|
- }
|
|
|
- }
|
|
|
- if (schoolListDatas[i].service.length > 0) {
|
|
|
- schoolListDatas[i].service.forEach((x) => {
|
|
|
- for (let m in patternIcon.value) {
|
|
|
- patternIcon.value[m].key === x ? schoolListDatas[i].serviceData.push(patternIcon.value[m]) : ''
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
- }
|
|
|
- tableData.value = schoolListDatas
|
|
|
- tableData.value.forEach((item) => { item.areaName = ''; areaSelect.value.data.forEach((itema) => { item.areaId === itema.id ? item.areaName = itema.name : '' }) })
|
|
|
- tableNexttoken.value = nextPageToken
|
|
|
+ // console.log(schoolListDatas, '处理前的')
|
|
|
+ // for (let i in schoolListDatas) {
|
|
|
+ // schoolListDatas[i].serviceData = []
|
|
|
+ // if (schoolListDatas[i].assists) {
|
|
|
+ // schoolListDatas[i].assisName = ''
|
|
|
+ // schoolListDatas[i].location = schoolListDatas[i].dist !== null ? schoolListDatas[i].province + schoolListDatas[i].city + schoolListDatas[i].dist : schoolListDatas[i].province + schoolListDatas[i].city
|
|
|
+ // let datas = schoolListDatas[i].assists
|
|
|
+ // for (let y in datas) {
|
|
|
+ // schoolListDatas[i].assisName = schoolListDatas[i].assisName + datas[y].tmdName + ','
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // if (schoolListDatas[i].service.length > 0) {
|
|
|
+ // schoolListDatas[i].service.forEach((x) => {
|
|
|
+ // for (let m in patternIcon.value) {
|
|
|
+ // patternIcon.value[m].key === x ? schoolListDatas[i].serviceData.push(patternIcon.value[m]) : ''
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // tableData.value = schoolListDatas
|
|
|
+ // tableData.value.forEach((item) => { item.areaName = ''; areaSelect.value.data.forEach((itema) => { item.areaId === itema.id ? item.areaName = itema.name : '' }) })
|
|
|
+ // tableNexttoken.value = nextPageToken
|
|
|
loading.value = false
|
|
|
}
|
|
|
//学校详情 close
|
|
|
@@ -718,7 +854,7 @@ export default {
|
|
|
}
|
|
|
//管家发生变化
|
|
|
function assistChange (val) {
|
|
|
- console.log(val, adminvalue.value)
|
|
|
+ console.log(val, adminvalue.value, '管家发生变化')
|
|
|
}
|
|
|
//获取所有的顾问API访问
|
|
|
function getAllassists () {
|
|
|
@@ -763,12 +899,20 @@ export default {
|
|
|
//修改表单
|
|
|
let assistData = adminvalue.value
|
|
|
let periodData = []
|
|
|
+ //接口搜索顾问array
|
|
|
+ let assisArr = []
|
|
|
for (let i in nowPitchdata.value.period) {
|
|
|
let num = Number(i) + 1
|
|
|
if (nowPitchdata.value.period[i].value === true) {
|
|
|
periodData.push(nowPitchdata.value.period[i].name)
|
|
|
}
|
|
|
}
|
|
|
+ //处理管家列表
|
|
|
+ assistData.forEach((item) => {
|
|
|
+ for (let itemA of adminoptions.value) {
|
|
|
+ item === itemA.tmdId ? assisArr.push({ id: itemA.tmdId, name: itemA.name, picture: itemA.picture ? itemA.picture : null }) : ''
|
|
|
+ }
|
|
|
+ })
|
|
|
//处理学校所谓位置 文字
|
|
|
let provinceV = placeData.value.dataValue[0]; let cityV = placeData.value.dataValue[1]; let distV = placeData.value.dataValue[2];
|
|
|
let placeArr = []
|
|
|
@@ -788,12 +932,19 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
console.log(placeArr)
|
|
|
+ //去重管家列表
|
|
|
+ // assisArr.forEach((item) => {
|
|
|
+ // let ids = item.id
|
|
|
+ // for (let i = assisArr.length - 1; i <= 0; i--) {
|
|
|
+ // assisArr[i].id === ids ? assisArr.splice(i, 1) : ''
|
|
|
+ // }
|
|
|
+ // })
|
|
|
let updateForm = {
|
|
|
name: nowPitchdata.value.name,
|
|
|
schoolId: nowPitchdata.value.id,
|
|
|
picture: nowPitchdata.value.picture,
|
|
|
size: nowPitchdata.value.size,
|
|
|
- assistId: assistData,
|
|
|
+ assist: assisArr,
|
|
|
scale: nowPitchdata.value.scale,
|
|
|
type: parseInt(nowPitchdata.value.type),
|
|
|
standard: nowPitchdata.value.standard,
|
|
|
@@ -804,11 +955,16 @@ export default {
|
|
|
address: nowPitchdata.value.address,
|
|
|
}
|
|
|
console.log(updateForm, '修改学校信息')
|
|
|
+ console.log(nowPitchdata.value, '原本的学校信息')
|
|
|
+ console.log(assistData, '顾问信息')
|
|
|
proxy.$api.updateSchoolinfo(updateForm).then((res) => {
|
|
|
console.log(res, '修改学校的返回')
|
|
|
loadingUpdate.close()
|
|
|
res.state === 200
|
|
|
- ? (ElMessage.success(proxy.$t(`commonMsg.schoolUpdateSuccess`), schoolJoinarea(), schoolClose()), updateSuccess())
|
|
|
+ ? (ElMessage.success(proxy.$t(`commonMsg.schoolUpdateSuccess`),
|
|
|
+ // schoolJoinarea(),
|
|
|
+ schoolClose()),
|
|
|
+ updateSuccess())
|
|
|
: ElMessage.error(proxy.$t(`commonMsg.schoolUpdateError`))
|
|
|
}).catch((error) => {
|
|
|
loadingUpdate.close()
|
|
|
@@ -934,7 +1090,6 @@ export default {
|
|
|
}).catch((error) => {
|
|
|
ElMessage.error('删除失败，操作异常')
|
|
|
})
|
|
|
-
|
|
|
})
|
|
|
}
|
|
|
function batchRemoveSchool () {
|
|
|
@@ -959,6 +1114,7 @@ export default {
|
|
|
proxy.$api.removeSchool(data).then((res) => {
|
|
|
if (res.state === 200) {
|
|
|
ElMessage.success('删除成功')
|
|
|
+ deleteSchoolArr.value = []
|
|
|
getAllschool()
|
|
|
}
|
|
|
}).catch((error) => {
|
|
|
@@ -968,8 +1124,29 @@ export default {
|
|
|
}
|
|
|
function selectChange (value) {
|
|
|
console.log(value)
|
|
|
- deleteSchoolArr.value = value
|
|
|
- console.log(deleteSchoolArr.value[0])
|
|
|
+ if (deleteSchoolArr.value.length === 0) {
|
|
|
+ deleteSchoolArr.value.push(value)
|
|
|
+ } else {
|
|
|
+ for (var i = deleteSchoolArr.value.length - 1; i >= 0; i--) {
|
|
|
+ console.log(i)
|
|
|
+ if (deleteSchoolArr.value[i].id === value.id) {
|
|
|
+ console.log('进入删除')
|
|
|
+ deleteSchoolArr.value.splice(i, 1)
|
|
|
+ break
|
|
|
+ } else {
|
|
|
+ console.log('进入添加')
|
|
|
+ deleteSchoolArr.value.push(value)
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ console.log(deleteSchoolArr.value)
|
|
|
+ // if (result !== -1) {
|
|
|
+ // deleteSchoolArr.value.splice(result, 1)
|
|
|
+ // } else {
|
|
|
+ // deleteSchoolArr.value.push(value)
|
|
|
+ // }
|
|
|
+ // console.log(deleteSchoolArr.value)
|
|
|
}
|
|
|
function datascroll () {
|
|
|
console.log('触发了')
|
|
|
@@ -1021,51 +1198,57 @@ export default {
|
|
|
}
|
|
|
function personnelSearch () {
|
|
|
loading.value = true
|
|
|
- let searchstate = false
|
|
|
+ // let searchstate = false
|
|
|
let values = searchValues.value
|
|
|
- let cnLang = new RegExp("[\u4E00-\u9FA5]+");
|
|
|
- let letter = new RegExp("[A-Za-z]+");
|
|
|
- let numbers = new RegExp("[0-9]+");
|
|
|
- let data = cnLang.test(values) || numbers.test(values) ? { name: values } : letter.test(values) ? { scId: values } : {}
|
|
|
- Object.keys(data).length === 0 ? searchstate = true : searchstate = false
|
|
|
- if (searchstate) {
|
|
|
- loading.value = false
|
|
|
- console.log('9999999999999999')
|
|
|
- return
|
|
|
- }
|
|
|
- proxy.$api.getSchooldata(data).then((res) => {
|
|
|
- console.log(res, '查询的返回')
|
|
|
- // res.state === 200 ? tableData.value = res.schoolAssists : ''
|
|
|
- if (res.state === 200) {
|
|
|
- if (res.schoolAssists.length !== 0) {
|
|
|
- for (let i in res.schoolAssists) {
|
|
|
- res.schoolAssists[i].serviceData = []
|
|
|
- if (res.schoolAssists[i].assists) {
|
|
|
- res.schoolAssists[i].assisName = ''
|
|
|
- res.schoolAssists[i].location = res.schoolAssists[i].dist !== null ? res.schoolAssists[i].province + res.schoolAssists[i].city + res.schoolAssists[i].dist : res.schoolAssists[i].province + res.schoolAssists[i].city
|
|
|
- let datas = res.schoolAssists[i].assists
|
|
|
- for (let y in datas) {
|
|
|
- res.schoolAssists[i].assisName = res.schoolAssists[i].assisName + datas[y].tmdName + ','
|
|
|
- }
|
|
|
- }
|
|
|
- if (res.schoolAssists[i].service.length > 0) {
|
|
|
- res.schoolAssists[i].service.forEach((x) => {
|
|
|
- for (let m in patternIcon.value) {
|
|
|
- patternIcon.value[m].key === x ? res.schoolAssists[i].serviceData.push(patternIcon.value[m]) : ''
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- tableData.value = res.schoolAssists
|
|
|
- tableData.value.forEach((item) => { item.areaName = ''; areaSelect.value.data.forEach((itema) => { item.areaId === itema.id ? item.areaName = itema.name : '' }) })
|
|
|
- tablesccnt.value = res.scCnt
|
|
|
- loading.value = false
|
|
|
- }
|
|
|
- }).catch((err) => {
|
|
|
- ElMessage.error('查询学校API异常，请重试')
|
|
|
- loading.value = false
|
|
|
+ // let cnLang = new RegExp("[\u4E00-\u9FA5]+");
|
|
|
+ // let letter = new RegExp("[A-Za-z]+");
|
|
|
+ // let numbers = new RegExp("[0-9]+");
|
|
|
+ // let data = cnLang.test(values) || numbers.test(values) ? { name: values } : letter.test(values) ? { scId: values } : {}
|
|
|
+ // Object.keys(data).length === 0 ? searchstate = true : searchstate = false
|
|
|
+ // if (searchstate) {
|
|
|
+ // loading.value = false
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ let arr = tableData.value
|
|
|
+ let newArr = arr.filter((item) => {
|
|
|
+ return item.name.includes(values) || item.id.includes(values)
|
|
|
})
|
|
|
+ tableData.value = newArr
|
|
|
+ loading.value = false
|
|
|
+ // showPattern.value === 'all' ? notClassifydata.value = newArr : schooltableData.value = newArr
|
|
|
+ // proxy.$api.getSchooldata(data).then((res) => {
|
|
|
+ // console.log(res, '查询的返回')
|
|
|
+ // // res.state === 200 ? tableData.value = res.schoolAssists : ''
|
|
|
+ // if (res.state === 200) {
|
|
|
+ // if (res.schoolAssists.length !== 0) {
|
|
|
+ // for (let i in res.schoolAssists) {
|
|
|
+ // res.schoolAssists[i].serviceData = []
|
|
|
+ // if (res.schoolAssists[i].assists) {
|
|
|
+ // res.schoolAssists[i].assisName = ''
|
|
|
+ // res.schoolAssists[i].location = res.schoolAssists[i].dist !== null ? res.schoolAssists[i].province + res.schoolAssists[i].city + res.schoolAssists[i].dist : res.schoolAssists[i].province + res.schoolAssists[i].city
|
|
|
+ // let datas = res.schoolAssists[i].assists
|
|
|
+ // for (let y in datas) {
|
|
|
+ // res.schoolAssists[i].assisName = res.schoolAssists[i].assisName + datas[y].tmdName + ','
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // if (res.schoolAssists[i].service.length > 0) {
|
|
|
+ // res.schoolAssists[i].service.forEach((x) => {
|
|
|
+ // for (let m in patternIcon.value) {
|
|
|
+ // patternIcon.value[m].key === x ? res.schoolAssists[i].serviceData.push(patternIcon.value[m]) : ''
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // tableData.value = res.schoolAssists
|
|
|
+ // tableData.value.forEach((item) => { item.areaName = ''; areaSelect.value.data.forEach((itema) => { item.areaId === itema.id ? item.areaName = itema.name : '' }) })
|
|
|
+ // tablesccnt.value = res.scCnt
|
|
|
+ // loading.value = false
|
|
|
+ // }
|
|
|
+ // }).catch((err) => {
|
|
|
+ // ElMessage.error('查询学校API异常，请重试')
|
|
|
+ // loading.value = false
|
|
|
+ // })
|
|
|
// setTimeout(function () { loading.value = false }, 500);
|
|
|
}
|
|
|
function versionsSort (val) {
|
|
|
@@ -1094,11 +1277,15 @@ export default {
|
|
|
ElMessage.error('API异常，规模版本排序失败')
|
|
|
})
|
|
|
}
|
|
|
- watch(scrollHeight, (newdata, olddata) => {
|
|
|
- if (newdata < olddata) {
|
|
|
- scrollHeight.value < 0 ? debounce(datascroll, 500) : ''
|
|
|
- }
|
|
|
- })
|
|
|
+ function schoolDetails (val) {
|
|
|
+ nowPitchdata.value.type = val.type.toString()
|
|
|
+ nowPitchdata.value.standard = val.standard
|
|
|
+ }
|
|
|
+ // watch(scrollHeight, (newdata, olddata) => {
|
|
|
+ // if (newdata < olddata) {
|
|
|
+ // scrollHeight.value < 0 ? debounce(datascroll, 500) : ''
|
|
|
+ // }
|
|
|
+ // })
|
|
|
watch(searchValues, (newdata) => {
|
|
|
if (newdata.trim().length !== 0) {
|
|
|
debounce(personnelSearch, 500)
|
|
|
@@ -1160,7 +1347,6 @@ export default {
|
|
|
batchRemoveSchool,
|
|
|
datascroll,
|
|
|
scrollHeight,
|
|
|
- loadmore,
|
|
|
tableNexttoken,
|
|
|
tablesInfo,
|
|
|
debounce,
|
|
|
@@ -1172,7 +1358,12 @@ export default {
|
|
|
schoolregionParams,
|
|
|
originalNum,
|
|
|
nSchool,
|
|
|
- versionsSort
|
|
|
+ versionsSort,
|
|
|
+ columns,
|
|
|
+ sortState,
|
|
|
+ onSort,
|
|
|
+ userVerify,
|
|
|
+ schoolDetails,
|
|
|
}
|
|
|
},
|
|
|
}
|
|
|
@@ -1547,8 +1738,21 @@ export default {
|
|
|
color: #00a8ff;
|
|
|
margin-left: 2%;
|
|
|
}
|
|
|
+.deletebtns {
|
|
|
+ margin-left: 2px !important;
|
|
|
+}
|
|
|
+.admin-boxs-width,
|
|
|
+.area-width {
|
|
|
+ width: 100%;
|
|
|
+}
|
|
|
+.el-table-v2__sort-icon {
|
|
|
+ display: block;
|
|
|
+}
|
|
|
</style>
|
|
|
<style>
|
|
|
+.el-table-v2__cell-text {
|
|
|
+ line-height: 20px !important;
|
|
|
+}
|
|
|
.schoolboxea .el-cascader {
|
|
|
width: 20%;
|
|
|
}
|
|
|
@@ -1668,6 +1872,9 @@ export default {
|
|
|
width: 100%;
|
|
|
height: 100% !important;
|
|
|
}
|
|
|
+.school-list .el-auto-resizer {
|
|
|
+ margin-top: 3%;
|
|
|
+}
|
|
|
@media screen and (max-width: 2600px) {
|
|
|
.school-formbox .school-form-badge {
|
|
|
width: 15vw;
|
|
|
@@ -1681,7 +1888,7 @@ export default {
|
|
|
width: 17.5%;
|
|
|
}
|
|
|
.searchSchoolbox {
|
|
|
- width: 53% !important;
|
|
|
+ width: 54.5% !important;
|
|
|
}
|
|
|
.school-form-size {
|
|
|
width: 65% !important;
|
Li