diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue index 1c26e4dc..86ba9469 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue @@ -26,8 +26,8 @@
-
接口文档
-
使用手册
+
技术文档
+
新手指引
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 9ff9bb1c..af2606a0 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -945,78 +945,162 @@ const videoList = reactive({ data: [] }) const resourceTotal = ref('') const getAppResources = (switchIndex) => { - //switchIndex这个参数是下面的分页传过来的参数 - paramsGetResources.name = searchValue.value - paramsGetResources.type = Cardsname.value - console.log( - '执行getAppResources====================》', - paramsGetResources - ) - if ( - !whoShow1.value.itShowBaoTou && - 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 // 发布时间 + if (switchIndex) { + if (switchIndex.length > 1) { + //switchIndex这个参数是下面的分页传过来的参数 + paramsGetResources.name = searchValue.value + paramsGetResources.type = Cardsname.value + console.log( + '执行getAppResources====================》', + paramsGetResources + ) + if ( + !whoShow1.value.itShowBaoTou && + 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 + } }) - 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 // 发布时间 + } 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) + } }) - resourceList.data = res.data.data.list || [] - resourceTotal.value = res.data.data.total || '' - loading.value = false } - }) - } else if (paramsGetResources.type !== '数据资源') { - if (switchIndex != '分页查询') { - paramsGetResources.pageNum = 1 + } else { + message.error('请输入一个字以上!') } - 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) + } else { + //switchIndex这个参数是下面的分页传过来的参数 + paramsGetResources.name = searchValue.value + paramsGetResources.type = Cardsname.value + console.log( + '执行getAppResources====================》', + paramsGetResources + ) + if ( + !whoShow1.value.itShowBaoTou && + 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) + } + }) + } } }