|
@@ -550,19 +550,19 @@ export default {
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- // key: "name",
|
|
|
|
|
- // dataKey: "name",//需要渲染当前列的数据字段，如{id:9527,name:'Mike'}，则填name
|
|
|
|
|
|
|
+ // key: "versions",
|
|
|
|
|
+ // dataKey: "versions",
|
|
|
title: "规模版本",
|
|
title: "规模版本",
|
|
|
width: 100,
|
|
width: 100,
|
|
|
fixed: false,
|
|
fixed: false,
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
headerClass: 'testclass',
|
|
headerClass: 'testclass',
|
|
|
// sortable: true,
|
|
// sortable: true,
|
|
|
- cellRenderer: (data) => (
|
|
|
|
|
|
|
+ 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>
|
|
|
|
|
|
|
+ <div style="color:#e6a23c;" v-show={data.rowData.versions ==='专业版' ? true:false}>专业版</div>
|
|
|
|
|
+ <div style="color:#67C23A;" v-show={data.rowData.versions ==='标准版' ? true:false}>标准版</div>
|
|
|
|
|
+ <div style="color:#409EFF;" v-show={data.rowData.versions ==='基础版' ? true:false}>基础版</div>
|
|
|
</>
|
|
</>
|
|
|
),
|
|
),
|
|
|
},
|
|
},
|
|
@@ -602,7 +602,7 @@ export default {
|
|
|
(
|
|
(
|
|
|
<>
|
|
<>
|
|
|
<el-button class="relbox" v-show={data.rowData.code ==='BIRel'} type="primary" size="small">实体</el-button>
|
|
<el-button class="relbox" v-show={data.rowData.code ==='BIRel'} type="primary" size="small">实体</el-button>
|
|
|
- <el-button class="virtubox" v-show={data.rowData.code ==='VirtualBase'} type="success" size="small">虚拟</el-button >
|
|
|
|
|
|
|
+ <el-button class="virtubox" v-show={data.rowData.code ==='VirtualBase'} type="success" size="small">虚拟</el-button >
|
|
|
</>
|
|
</>
|
|
|
)
|
|
)
|
|
|
},
|
|
},
|
|
@@ -623,23 +623,26 @@ export default {
|
|
|
width: 200,
|
|
width: 200,
|
|
|
cellRenderer: (data) => (
|
|
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 title="基础服务模组">
|
|
|
|
|
+ <svg style=" width: 1.6em;height: 1.6em;vertical-align: -0.5em;fill: currentColor;overflow: hidden;cursor: pointer;" aria-hidden="true" ><use xlink:href="#icon-jianyanbiaozhun"></use></svg>
|
|
|
</div>
|
|
</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 title="学情分析服务模组(未开启)" v-show={!data.rowData.service.includes('YMPCVCIM') ? true : false}>
|
|
|
|
|
+ <svg style=" width: 1.5em;height: 1.5em;vertical-align: -0.5em;fill: currentColor;overflow: hidden;cursor: pointer;" aria-hidden="true" ><use xlink:href="#icon-xueqinggailan"></use></svg>
|
|
|
</div>
|
|
</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 title="学情分析服务模组" v-show={data.rowData.service.includes('YMPCVCIM') ? true : false}>
|
|
|
|
|
+ <svg style=" width: 1.5em;height: 1.5em;vertical-align: -0.5em;fill: currentColor;overflow: hidden;cursor: pointer;" aria-hidden="true" ><use xlink:href="#icon-xueqinggailan-copy"></use></svg>
|
|
|
</div>
|
|
</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 title="艺术评测服务(未开启)" v-show={!data.rowData.service.includes('B6V5J6NP') ? true : false}>
|
|
|
|
|
+ <svg style=" width: 1.5em;height: 1.5em;vertical-align: -0.5em;fill: currentColor;overflow: hidden;cursor: pointer;" aria-hidden="true" ><use xlink:href="#icon-yishuzhuanye"></use></svg>
|
|
|
</div>
|
|
</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 title="艺术评测服务" v-show={data.rowData.service.includes('B6V5J6NP') ? true : false}>
|
|
|
|
|
+ <svg style=" width: 1.5em;height: 1.5em;vertical-align: -0.5em;fill: currentColor;overflow: hidden;cursor: pointer;" aria-hidden="true" ><use xlink:href="#icon-yishuzhuanye-copy"></use></svg>
|
|
|
</div>
|
|
</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 title="五育看板服(未开启)" v-show={!data.rowData.service.includes('YPXSJ6NJ') ? true : false}>
|
|
|
|
|
+ <svg style=" width: 1.5em;height: 1.5em;vertical-align: -0.5em;fill: currentColor;overflow: hidden;cursor: pointer;" aria-hidden="true" ><use xlink:href="#icon-shuzikanban-copy"></use></svg>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div title="五育看板服" v-show={data.rowData.service.includes('YPXSJ6NJ') ? true : false}>
|
|
|
|
|
+ <svg style=" width: 1.5em;height: 1.5em;vertical-align: -0.5em;fill: currentColor;overflow: hidden;cursor: pointer;" aria-hidden="true" ><use xlink:href="#icon-shuzikanban"></use></svg>
|
|
|
</div>
|
|
</div>
|
|
|
</>
|
|
</>
|
|
|
),
|
|
),
|
|
@@ -780,10 +783,19 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
console.log(areaSelect, '当时的学区数据')
|
|
console.log(areaSelect, '当时的学区数据')
|
|
|
- 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) : ''
|
|
|
|
|
|
|
+ res.state == 200 ?
|
|
|
|
|
+ (tableData.value = [], originalData.value = [],
|
|
|
|
|
+ res.scInfos.forEach((item)=>{item.versions= item.service.includes('YPXSJ6NJ') && item.service.includes('B6V5J6NP') ? '专业版':item.service.includes('YMPCVCIM') ? '标准版':'基础版'}),
|
|
|
|
|
+ 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 : '' }) })
|
|
// tableData.value.forEach((item) => { item.areaName = ''; areaSelect.value.data.forEach((itema) => { item.areaId === itema.id ? item.areaName = itema.name : '' }) })
|
|
|
loading.value = false
|
|
loading.value = false
|
|
|
- console.log(tableData, '完善后的数据')
|
|
|
|
|
|
|
+ console.log(tableData,originalData.value,'完善后的数据')
|
|
|
|
|
+ // proxy.$api.getAllschool({}).then((res)=>{
|
|
|
|
|
+ // console.log(res,'backsssss')
|
|
|
|
|
+ // }).catch((error)=>{
|
|
|
|
|
+ // })
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
//点击学校列表，详情
|
|
//点击学校列表，详情
|
|
@@ -1456,9 +1468,9 @@ export default {
|
|
|
console.log(shouldFilter.value)
|
|
console.log(shouldFilter.value)
|
|
|
let arrState = shouldFilter.value
|
|
let arrState = shouldFilter.value
|
|
|
let marjorArr = []; let standardArr = []; let basicsArr = []
|
|
let marjorArr = []; let standardArr = []; let basicsArr = []
|
|
|
- arrState.major ? originalData.value.forEach((item) => { item.service.includes('YMPCVCIM') || item.service.includes('VLY6J6N6') || item.service.includes('VABAJ6NV') ? marjorArr.push(item) : '' }) : ''
|
|
|
|
|
- arrState.standard ? originalData.value.forEach((item) => { (item.scale === 300 && item.size === 500) || (item.size > 100 && (!item.service.includes('YMPCVCIM') && !item.service.includes('VLY6J6N6') && !item.service.includes('VABAJ6NV'))) ? standardArr.push(item) : '' }) : ''
|
|
|
|
|
- arrState.basics ? originalData.value.forEach((item) => { item.scale < 300 && item.size <= 100 ? basicsArr.push(item) : '' }) : ''
|
|
|
|
|
|
|
+ arrState.major ? originalData.value.forEach((item) => { item.service.includes('YPXSJ6NJ') && item.service.includes('B6V5J6NP') ? marjorArr.push(item) : '' }) : ''
|
|
|
|
|
+ arrState.standard ? originalData.value.forEach((item) => {item.service.includes('YMPCVCIM') && (!item.service.includes('YPXSJ6NJ') && !item.service.includes('B6V5J6NP')) ? standardArr.push(item) : '' }) : ''
|
|
|
|
|
+ arrState.basics ? originalData.value.forEach((item) => { !item.service.includes('YMPCVCIM') && !item.service.includes('YPXSJ6NJ') && !item.service.includes('B6V5J6NP') ? basicsArr.push(item) : '' }) : ''
|
|
|
let versionArr = [...marjorArr, ...standardArr, ...basicsArr]
|
|
let versionArr = [...marjorArr, ...standardArr, ...basicsArr]
|
|
|
console.log(versionArr, '合并结果')
|
|
console.log(versionArr, '合并结果')
|
|
|
tableData.value = versionArr
|
|
tableData.value = versionArr
|
CrazyIter_Bin