650、657bug
This commit is contained in:
gaoyuanwei
parent
f820d49f58
commit
2548beb7c1
|
|
@ -26,8 +26,8 @@
|
||||||
</a-tooltip>
|
</a-tooltip>
|
||||||
</div>
|
</div>
|
||||||
<div class="right">
|
<div class="right">
|
||||||
<div @click="technical()">接口文档</div>
|
<div @click="technical()">技术文档</div>
|
||||||
<div @click="technicalNew()">使用手册</div>
|
<div @click="technicalNew()">新手指引</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="content-right">
|
<div class="content-right">
|
||||||
|
|
|
||||||
|
|
@ -945,78 +945,162 @@
|
||||||
const videoList = reactive({ data: [] })
|
const videoList = reactive({ data: [] })
|
||||||
const resourceTotal = ref('')
|
const resourceTotal = ref('')
|
||||||
const getAppResources = (switchIndex) => {
|
const getAppResources = (switchIndex) => {
|
||||||
//switchIndex这个参数是下面的分页传过来的参数
|
if (switchIndex) {
|
||||||
paramsGetResources.name = searchValue.value
|
if (switchIndex.length > 1) {
|
||||||
paramsGetResources.type = Cardsname.value
|
//switchIndex这个参数是下面的分页传过来的参数
|
||||||
console.log(
|
paramsGetResources.name = searchValue.value
|
||||||
'执行getAppResources====================》',
|
paramsGetResources.type = Cardsname.value
|
||||||
paramsGetResources
|
console.log(
|
||||||
)
|
'执行getAppResources====================》',
|
||||||
if (
|
paramsGetResources
|
||||||
!whoShow1.value.itShowBaoTou &&
|
)
|
||||||
paramsGetResources.type === '数据资源'
|
if (
|
||||||
) {
|
!whoShow1.value.itShowBaoTou &&
|
||||||
if (switchIndex != '分页查询') {
|
paramsGetResources.type === '数据资源'
|
||||||
paramsGetResources.pageNum = 1
|
) {
|
||||||
}
|
if (switchIndex != '分页查询') {
|
||||||
let dataResourceParams = {
|
paramsGetResources.pageNum = 1
|
||||||
serviceName: paramsGetResources.name || '', //资源名称
|
}
|
||||||
orderField: whoShow1.value.itShowQingDao
|
let dataResourceParams = {
|
||||||
? paramsGetResources.orderField == 'applyCount'
|
serviceName: paramsGetResources.name || '', //资源名称
|
||||||
? 'syqk'
|
orderField: whoShow1.value.itShowQingDao
|
||||||
: 'fbrq'
|
? paramsGetResources.orderField == 'applyCount'
|
||||||
: paramsGetResources.orderField == 'applyCount'
|
? 'syqk'
|
||||||
? 'requestCount'
|
: 'fbrq'
|
||||||
: 'createTime', //排序字段
|
: paramsGetResources.orderField == 'applyCount'
|
||||||
orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
|
? 'requestCount'
|
||||||
pageNum: paramsGetResources.pageNum, //页码
|
: 'createTime', //排序字段
|
||||||
pageSize: paramsGetResources.pageSize, //分页大小
|
orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
|
||||||
}
|
pageNum: paramsGetResources.pageNum, //页码
|
||||||
getDataResource(dataResourceParams).then((res) => {
|
pageSize: paramsGetResources.pageSize, //分页大小
|
||||||
if (whoShow1.value.itShowQingDao) {
|
}
|
||||||
res.data.data.data.forEach((val) => {
|
getDataResource(dataResourceParams).then((res) => {
|
||||||
val.id = val.guid // id
|
if (whoShow1.value.itShowQingDao) {
|
||||||
val.name = val.zyname // 名字
|
res.data.data.data.forEach((val) => {
|
||||||
val.sjlCount = val.sjcczl // 数据量
|
val.id = val.guid // id
|
||||||
val.applyCount = val.syqk // 申请量
|
val.name = val.zyname // 名字
|
||||||
val.deptName = val.TGBM // 部门
|
val.sjlCount = val.sjcczl // 数据量
|
||||||
val.createDate = val.fbrq // 发布时间
|
val.applyCount = val.syqk // 申请量
|
||||||
|
val.deptName = val.TGBM // 部门
|
||||||
|
val.createDate = val.fbrq // 发布时间
|
||||||
|
})
|
||||||
|
resourceList.data = res.data.data.data || []
|
||||||
|
resourceTotal.value = res.data.data.rows || ''
|
||||||
|
loading.value = false
|
||||||
|
} else if (whoShow1.value.itShowXiHaiAn) {
|
||||||
|
res.data.data.list.forEach((val) => {
|
||||||
|
val.id = val.serviceId // id
|
||||||
|
val.name = val.serviceName // 名字
|
||||||
|
val.sjlCount = val.requestQuantity // 数据量
|
||||||
|
val.applyCount = val.requestCount // 申请量
|
||||||
|
val.deptName = val.departmentName // 部门
|
||||||
|
val.createTime = val.createTime.split('.')[0]
|
||||||
|
val.createDate = val.createTime // 发布时间
|
||||||
|
})
|
||||||
|
resourceList.data = res.data.data.list || []
|
||||||
|
resourceTotal.value = res.data.data.total || ''
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
})
|
})
|
||||||
resourceList.data = res.data.data.data || []
|
} else if (paramsGetResources.type !== '数据资源') {
|
||||||
resourceTotal.value = res.data.data.rows || ''
|
if (switchIndex != '分页查询') {
|
||||||
loading.value = false
|
paramsGetResources.pageNum = 1
|
||||||
} else if (whoShow1.value.itShowXiHaiAn) {
|
}
|
||||||
res.data.data.list.forEach((val) => {
|
pageWithAttrs(paramsGetResources).then((res) => {
|
||||||
val.id = val.serviceId // id
|
console.log(
|
||||||
val.name = val.serviceName // 名字
|
'查询列表============>',
|
||||||
val.sjlCount = val.requestQuantity // 数据量
|
resourceList,
|
||||||
val.applyCount = val.requestCount // 申请量
|
res.data.data
|
||||||
val.deptName = val.departmentName // 部门
|
)
|
||||||
val.createTime = val.createTime.split('.')[0]
|
resourceList.data = []
|
||||||
val.createDate = val.createTime // 发布时间
|
videoList.data = []
|
||||||
|
if (Cardsname.value === '基础设施') {
|
||||||
|
resourceList.data = res.data.data.records || []
|
||||||
|
resourceTotal.value = res.data.data.total || ''
|
||||||
|
loading.value = false
|
||||||
|
} else {
|
||||||
|
resourceTotal.value = res.data.data.total || ''
|
||||||
|
getShoppingCartList(res.data.data.records)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
resourceList.data = res.data.data.list || []
|
|
||||||
resourceTotal.value = res.data.data.total || ''
|
|
||||||
loading.value = false
|
|
||||||
}
|
}
|
||||||
})
|
} else {
|
||||||
} else if (paramsGetResources.type !== '数据资源') {
|
message.error('请输入一个字以上！')
|
||||||
if (switchIndex != '分页查询') {
|
|
||||||
paramsGetResources.pageNum = 1
|
|
||||||
}
|
}
|
||||||
pageWithAttrs(paramsGetResources).then((res) => {
|
} else {
|
||||||
console.log('查询列表============>', resourceList, res.data.data)
|
//switchIndex这个参数是下面的分页传过来的参数
|
||||||
resourceList.data = []
|
paramsGetResources.name = searchValue.value
|
||||||
videoList.data = []
|
paramsGetResources.type = Cardsname.value
|
||||||
if (Cardsname.value === '基础设施') {
|
console.log(
|
||||||
resourceList.data = res.data.data.records || []
|
'执行getAppResources====================》',
|
||||||
resourceTotal.value = res.data.data.total || ''
|
paramsGetResources
|
||||||
loading.value = false
|
)
|
||||||
} else {
|
if (
|
||||||
resourceTotal.value = res.data.data.total || ''
|
!whoShow1.value.itShowBaoTou &&
|
||||||
getShoppingCartList(res.data.data.records)
|
paramsGetResources.type === '数据资源'
|
||||||
|
) {
|
||||||
|
if (switchIndex != '分页查询') {
|
||||||
|
paramsGetResources.pageNum = 1
|
||||||
}
|
}
|
||||||
})
|
let dataResourceParams = {
|
||||||
|
serviceName: paramsGetResources.name || '', //资源名称
|
||||||
|
orderField: whoShow1.value.itShowQingDao
|
||||||
|
? paramsGetResources.orderField == 'applyCount'
|
||||||
|
? 'syqk'
|
||||||
|
: 'fbrq'
|
||||||
|
: paramsGetResources.orderField == 'applyCount'
|
||||||
|
? 'requestCount'
|
||||||
|
: 'createTime', //排序字段
|
||||||
|
orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
|
||||||
|
pageNum: paramsGetResources.pageNum, //页码
|
||||||
|
pageSize: paramsGetResources.pageSize, //分页大小
|
||||||
|
}
|
||||||
|
getDataResource(dataResourceParams).then((res) => {
|
||||||
|
if (whoShow1.value.itShowQingDao) {
|
||||||
|
res.data.data.data.forEach((val) => {
|
||||||
|
val.id = val.guid // id
|
||||||
|
val.name = val.zyname // 名字
|
||||||
|
val.sjlCount = val.sjcczl // 数据量
|
||||||
|
val.applyCount = val.syqk // 申请量
|
||||||
|
val.deptName = val.TGBM // 部门
|
||||||
|
val.createDate = val.fbrq // 发布时间
|
||||||
|
})
|
||||||
|
resourceList.data = res.data.data.data || []
|
||||||
|
resourceTotal.value = res.data.data.rows || ''
|
||||||
|
loading.value = false
|
||||||
|
} else if (whoShow1.value.itShowXiHaiAn) {
|
||||||
|
res.data.data.list.forEach((val) => {
|
||||||
|
val.id = val.serviceId // id
|
||||||
|
val.name = val.serviceName // 名字
|
||||||
|
val.sjlCount = val.requestQuantity // 数据量
|
||||||
|
val.applyCount = val.requestCount // 申请量
|
||||||
|
val.deptName = val.departmentName // 部门
|
||||||
|
val.createTime = val.createTime.split('.')[0]
|
||||||
|
val.createDate = val.createTime // 发布时间
|
||||||
|
})
|
||||||
|
resourceList.data = res.data.data.list || []
|
||||||
|
resourceTotal.value = res.data.data.total || ''
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
} else if (paramsGetResources.type !== '数据资源') {
|
||||||
|
if (switchIndex != '分页查询') {
|
||||||
|
paramsGetResources.pageNum = 1
|
||||||
|
}
|
||||||
|
pageWithAttrs(paramsGetResources).then((res) => {
|
||||||
|
console.log('查询列表============>', resourceList, res.data.data)
|
||||||
|
resourceList.data = []
|
||||||
|
videoList.data = []
|
||||||
|
if (Cardsname.value === '基础设施') {
|
||||||
|
resourceList.data = res.data.data.records || []
|
||||||
|
resourceTotal.value = res.data.data.total || ''
|
||||||
|
loading.value = false
|
||||||
|
} else {
|
||||||
|
resourceTotal.value = res.data.data.total || ''
|
||||||
|
getShoppingCartList(res.data.data.records)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue