diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 571373df..85f1d827 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -487,7 +487,7 @@ export default { this.total = 0 return this.$message.error(res.msg) } - if (res.data.list.length !== 0) { + if (res.data.list.length >= 0) { this.dataList = res.data.list this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue index 5df46152..8e879897 100644 --- a/back/src/views/modules/ability/bsabilityservice.vue +++ b/back/src/views/modules/ability/bsabilityservice.vue @@ -364,7 +364,7 @@ export default { this.total = 0 return this.$message.error(res.msg) } - if (res.data.list.length !== 0) { + if (res.data.list.length >= 0) { this.dataList = res.data.list this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index d55a4e06..f3d58a61 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -31,7 +31,7 @@ - + 审核状态： @@ -53,7 +53,7 @@ - + 类型： diff --git a/back/src/views/modules/algorithm/algorithm-management.vue b/back/src/views/modules/algorithm/algorithm-management.vue index 839664ba..3dba3e36 100644 --- a/back/src/views/modules/algorithm/algorithm-management.vue +++ b/back/src/views/modules/algorithm/algorithm-management.vue @@ -249,7 +249,7 @@ export default { this.total = 0 return this.$message.error(res.msg) } - if (res.data.list.length !== 0) { + if (res.data.list.length >= 0) { this.dataList = res.data.list this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total diff --git a/back/src/views/modules/canassigncase/index.vue b/back/src/views/modules/canassigncase/index.vue index 9489a202..b6d2f5cc 100644 --- a/back/src/views/modules/canassigncase/index.vue +++ b/back/src/views/modules/canassigncase/index.vue @@ -131,54 +131,54 @@ diff --git a/front/src/views/home/components/DetailsView_backL.vue b/front/src/views/home/components/DetailsView_backL.vue index af0b7beb..f1985325 100644 --- a/front/src/views/home/components/DetailsView_backL.vue +++ b/front/src/views/home/components/DetailsView_backL.vue @@ -2,7 +2,7 @@
- 能力超市 + 能力集市  /  查看详情
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index 9acd5daa..bac92f97 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -10,8 +10,8 @@
-

政务信息系统生态运营平台

-

(Government information ecological operation platform)

+

城市云脑通用能力服务平台

+

(United Capacity System)

{ - if (res.data.data.superAdmin == '1') { + if(res.data.data.superAdmin =='1'){ backFlag.value = true } else { - res.data.data.roleIdList.map((val) => { - getRole(val).then((role) => { - if (role.data.data.name === '后台管理员') { - backFlag.value = true - } - }) + res.data.data.roleIdList.map((val) => { + getRole(val).then((role) => { + if (role.data.data.name === '后台管理员') { + backFlag.value = true + } }) + }) } }) console.log('navList------------>', navList) @@ -209,7 +209,7 @@ path: '/abilityStatistics', }) break - case '能力超市': + case '能力集市': router.push({ path: '/DetailsPageconetent', query: { diff --git a/front/src/views/home/constantData/showData.js b/front/src/views/home/constantData/showData.js index defad213..85602f8a 100644 --- a/front/src/views/home/constantData/showData.js +++ b/front/src/views/home/constantData/showData.js @@ -1,22 +1,15 @@ -/* - * @Author: Light - * @Date: 2022-09-14 10:48:25 - * @LastEditors: Light - * @LastEditTime: 2022-11-01 15:56:52 - * @Description: 告诉大家这是什么 - */ export const titleNameArray = [ { photo: require('@/assets/newHome/banner-yy.png'), - name: '应用系统', + name: '应用资源', }, { photo: require('@/assets/newHome/banner-zj.png'), - name: 'GIS图层', + name: '组件服务', }, { photo: require('@/assets/newHome/banner-jc.png'), - name: '视频资源', + name: '基础设施', }, { photo: require('@/assets/newHome/banner-sj.png'), @@ -24,7 +17,7 @@ export const titleNameArray = [ }, { photo: require('@/assets/newHome/banner-zs.png'), - name: '云网资源', + name: '知识库', }, ] diff --git a/front/src/views/home/detailsPageconetentTree.vue b/front/src/views/home/detailsPageconetentTree.vue index 59b2e2eb..d3bd2e2f 100644 --- a/front/src/views/home/detailsPageconetentTree.vue +++ b/front/src/views/home/detailsPageconetentTree.vue @@ -128,11 +128,11 @@ title: 'name', } const store = useStore() - // 用户信息 - const user = ref({ - deptName: store.getters['user/deptName'], - deptId: store.getters['user/deptId'], - }) + // 用户信息 + const user = ref({ + deptName: store.getters['user/deptName'], + deptId: store.getters['user/deptId'], + }) const showKey = ref(0) const treeData = ref([]) const init = () => { @@ -145,7 +145,7 @@ if (select === '123') { select = '' } - + console.log( '获取url中的select=====================>', router.currentRoute.value.query.select @@ -169,7 +169,6 @@ } switch (val.type) { case '市级': - case '省级': case '企业': case '其他': generateChildren(val, obj) @@ -187,33 +186,33 @@ return sortArr.indexOf(a.key) - sortArr.indexOf(b.key) }) //根据不同的权限展示不同的能力超市左侧树 - // let deptId=user.value.deptId - // treeData.value.forEach((child) => { - // let childern=child.children - // childern.forEach((childs) => {//第一层：市级 - // if(childs.key==deptId ){ - // childs.show=true - // child.show=true - // mybus.emit('paramsGetResources', [childs.key]) - // selectId.value =childs.key - // } - // if(childs.children && childs.children.length>0){//第二层 区级 - // let qu=childs.children - // qu.forEach((qu) => { - // if(qu.key==deptId ){ - // qu.show=true - // childs.show=true - // child.show=true - // mybus.emit('paramsGetResources', [qu.key]) - // selectId.value = qu.key - // } - // }) - // } - // }) - - // }) + // let deptId=user.value.deptId + // treeData.value.forEach((child) => { + // let childern=child.children + // childern.forEach((childs) => {//第一层：市级 + // if(childs.key==deptId ){ + // childs.show=true + // child.show=true + // mybus.emit('paramsGetResources', [childs.key]) + // selectId.value =childs.key + // } + // if(childs.children && childs.children.length>0){//第二层 区级 + // let qu=childs.children + // qu.forEach((qu) => { + // if(qu.key==deptId ){ + // qu.show=true + // childs.show=true + // child.show=true + // mybus.emit('paramsGetResources', [qu.key]) + // selectId.value = qu.key + // } + // }) + // } + // }) + + // }) console.log('左侧树结构数据======================>', treeData.value) - + showKey.value++ }) } @@ -223,6 +222,7 @@ }) // 生成children const generateChildren = (val, obj) => { + if (val.dataList.length > 0) { val.dataList.forEach((child) => { let children = { @@ -232,13 +232,14 @@ total: child.deptCount, key: child.deptId, } - + obj.children.push(children) }) } } // 区级特殊处理 const generateChildren2 = (val, obj) => { + if (val.dataList.length > 0) { val.dataList.forEach((dis) => { let children = { @@ -258,7 +259,7 @@ select: false, key: child.deptId, } - + children.children.push(children2) }) } diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index 80efcaff..0ddcbba2 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -1052,7 +1052,7 @@ roomResult.value = true onSearch() } else { - tabClick(0, '政务云资源') + tabClick(0, '城市云脑会客厅') } } } @@ -1106,14 +1106,14 @@ content: isXiHaiAn ? ['视频资源'] : username == 'admin' - ? ['政务云资源', '视频资源', '城市云脑会客厅', '视频会议'] - : ['政务云资源', '视频资源', '城市云脑会客厅'], + ? ['城市云脑会客厅', '视频资源', '政务云资源', '视频会议'] + : ['城市云脑会客厅', '视频资源', '政务云资源'], }, ]) let clickList = ref([]) //存储点击的tab if (!isXiHaiAn) { tabList.value.push({ - title: '政务云资源', + title: '城市云脑会客厅', content: [], }) } diff --git a/front/src/views/instructionManual/components/TheOverallProcess.vue b/front/src/views/instructionManual/components/TheOverallProcess.vue index 7ccb7c2b..a09fb3e8 100644 --- a/front/src/views/instructionManual/components/TheOverallProcess.vue +++ b/front/src/views/instructionManual/components/TheOverallProcess.vue @@ -5,7 +5,7 @@
- 能力超市 + 能力集市 能力查阅 审核发布/下架 申请 diff --git a/front/src/views/instructionManual/components/menuBook.vue b/front/src/views/instructionManual/components/menuBook.vue index 0a70ab56..d27eb5fe 100644 --- a/front/src/views/instructionManual/components/menuBook.vue +++ b/front/src/views/instructionManual/components/menuBook.vue @@ -257,7 +257,7 @@ path: '/DetailsPageconetent', query: { // select: '组件服务', - select: DETAIL_PAGE_CONTENT_DEFAULT_TAB, + select: DETAIL_PAGE_CONTENT_DEFAULT_TAB }, }) window.location.href = newpage.href diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue index 11b4f681..5cfa10e3 100644 --- a/front/src/views/newHome/components/CapabilityConvergence.vue +++ b/front/src/views/newHome/components/CapabilityConvergence.vue @@ -7,21 +7,7 @@
-
应用系统
-
- - {{ index + 1 }}-{{ item.name }} -
-
查看更多
-
-
-
GIS图层
+
组件服务
- - {{ index + 1 }}-{{ item.name }} + {{ item.name + '-' + item.num + '项' }}
-
查看更多
+
查看更多
-
视频资源
+
应用资源
+
+ {{ item.name + '-' + item.num + '项' }} +
+
查看更多
+
+
+
基础设施
- - {{ index + 1 }}-{{ item.name }} + }}
-
查看更多
+
查看更多
数据资源
@@ -66,13 +63,12 @@ :class="index == 4 ? 'name-last' : ''" @click="selectOne3(item.name)" > - {{ index + 1 }}-{{ item.name }}
查看更多
-
云网资源
+
知识库
{{ index + 1 }}-{{ item.name }}
-
查看更多
+
查看更多
@@ -108,7 +104,7 @@ const jcList = ref([]) const sjList = ref([]) const yyList = ref([]) - // 云网资源模块数据 + // 知识库模块数据 const zsList = ref([]) // const jcList = ref([]) const paramsGetResources = { @@ -135,196 +131,131 @@ const getAppResources = (type, obj) => { paramsGetResources.type = type if (type === '数据资源' && !whoShow1.value.itShowBaoTou) { - sjList.value = [ - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - ] - // getDataResource({ - // serviceName: paramsGetResources.name || '', //资源名称 - // orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段 - // orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc - // pageNum: paramsGetResources.pageNum, //页码 - // pageSize: paramsGetResources.pageSize, //分页大小 - // }).then((res) => { - // console.log('数据资源==================>', res.data.data) - // 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 // 发布时间 - // val.description = val.xgxt // 描述 - // }) - // obj.value = res.data.data.data || [] - // object.sjNum = res.data.data.rows - // } 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 // 发布时间 - // }) - // obj.value = res.data.data.list || [] - // object.sjNum = res.data.data.total - // } - // }) + getDataResource({ + serviceName: paramsGetResources.name || '', //资源名称 + orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段 + orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc + pageNum: paramsGetResources.pageNum, //页码 + pageSize: paramsGetResources.pageSize, //分页大小 + }).then((res) => { + console.log('数据资源==================>', res.data.data) + 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 // 发布时间 + val.description = val.xgxt // 描述 + }) + obj.value = res.data.data.data || [] + object.sjNum = res.data.data.rows + } 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 // 发布时间 + }) + obj.value = res.data.data.list || [] + object.sjNum = res.data.data.total + } + }) } else { let type = paramsGetResources.type - if (type == '视频资源') { - jcList.value = [ - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - ] - // selectInfrastructureList().then((res) => { - // console.log('视频资源------res------>', res) - // for (const key in res.data.data) { - // if (whoShow1.value.itShowXiHaiAn) { - // if (key === '视频资源') { - // jcList.value.push({ - // name: key, - // num: res.data.data[key], - // }) - // } - // } else { - // jcList.value.push({ - // name: key, - // num: res.data.data[key], - // }) - // } - // } - // // jcList.value.push({ - // // name: '会客厅', - // // num: 4, - // // }) - // // 西海岸-单兵设备、无人机 获取数量 - // if (whoShow1.value.itShowXiHaiAn) { - // getSoldierData('无人机') - // .then((res) => { - // let { total = 0 } = res.data.data - // jcList.value.push({ - // name: '无人机', - // num: total, - // }) - // }) - // .catch((err) => { - // console.log('err--无人机---------->', err) - // }) - // getSoldierData('单兵设备') - // .then((res) => { - // let { total = 0 } = res.data.data - // jcList.value.push({ - // name: '单兵设备', - // num: total, - // }) - // }) - // .catch((err) => { - // console.log('err--单兵设备---------->', err) - // }) - // } - // }) - } else if (type == 'GIS图层') { - zjList.value = [ - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - ] - // selectCollectComponentList().then((res) => { - // console.log('GIS图层----res-------->', res) - // for (const key in res.data.data) { - // console.log('key------------>', key) - // zjList.value.push({ - // name: key, - // num: res.data.data[key], - // }) - // } - // console.log('zjList------------>', zjList) - // }) - } else if (type == '应用系统') { - yyList.value = [ - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - { - name: '阿斯蒂芬', - }, - ] - // selectCollectResourceList().then((res) => { - // console.log('应用系统---res--------->', res) - // for (const key in res.data.data) { - // yyList.value.push({ - // name: key, - // num: res.data.data[key], - // }) - // } - // }) + if (type == '基础设施') { + jcList.value = [] + selectInfrastructureList().then((res) => { + console.log('基础设施------res------>', res) + for (const key in res.data.data) { + if (whoShow1.value.itShowXiHaiAn) { + if (key === '视频资源') { + jcList.value.push({ + name: key, + num: res.data.data[key], + }) + } + } else { + jcList.value.push({ + name: key, + num: res.data.data[key], + }) + } + } + // jcList.value.push({ + // name: '会客厅', + // num: 4, + // }) + // 西海岸-单兵设备、无人机 获取数量 + if (whoShow1.value.itShowXiHaiAn) { + getSoldierData('无人机') + .then((res) => { + let { total = 0 } = res.data.data + jcList.value.push({ + name: '无人机', + num: total, + }) + }) + .catch((err) => { + console.log('err--无人机---------->', err) + }) + getSoldierData('单兵设备') + .then((res) => { + let { total = 0 } = res.data.data + jcList.value.push({ + name: '单兵设备', + num: total, + }) + }) + .catch((err) => { + console.log('err--单兵设备---------->', err) + }) + } + }) + } else if (type == '组件服务') { + zjList.value = [] + selectCollectComponentList().then((res) => { + console.log('组件服务----res-------->', res) + for (const key in res.data.data) { + console.log('key------------>', key) + zjList.value.push({ + name: key, + num: res.data.data[key], + }) + } + console.log('zjList------------>', zjList) + }) + } else if (type == '应用资源') { + yyList.value = [] + selectCollectResourceList().then((res) => { + console.log('应用资源---res--------->', res) + for (const key in res.data.data) { + yyList.value.push({ + name: key, + num: res.data.data[key], + }) + } + }) } else { pageWithAttrs(paramsGetResources).then((res) => { console.log('object个数======>', type) obj.value = res.data.data.records switch (type) { - case 'GIS图层': + case '组件服务': assignmentMethod('zjNum', res) break - case '应用系统': + case '应用资源': assignmentMethod('yyNum', res) break - case '视频资源': + case '基础设施': assignmentMethod('jcNum', res) break - case '云网资源': + case '知识库': assignmentMethod('zsNum', res) break } @@ -377,11 +308,11 @@ const assignmentMethod = (type, res) => { object[type] = res.data.data.total } - getAppResources('GIS图层', zjList) - getAppResources('应用系统', yyList) - getAppResources('视频资源', jcList) + getAppResources('组件服务', zjList) + getAppResources('应用资源', yyList) + getAppResources('基础设施', jcList) getAppResources('数据资源', sjList) - getAppResources('云网资源', zsList) + getAppResources('知识库', zsList) function jumpPage(type) { // 点击内存入store @@ -414,7 +345,7 @@ path: '/DetailsPageconetent', query: { type: name, - select: 'GIS图层', + select: '组件服务', }, }) } @@ -423,7 +354,7 @@ path: '/DetailsPageconetent', query: { type: name, - select: '应用系统', + select: '应用资源', }, }) } @@ -440,7 +371,7 @@ path: '/DetailsPageconetent', query: { type: names, - select: '视频资源', + select: '基础设施', }, }) } diff --git a/front/src/views/newHome/components/Header.vue b/front/src/views/newHome/components/Header.vue index 576186a8..2bad4823 100644 --- a/front/src/views/newHome/components/Header.vue +++ b/front/src/views/newHome/components/Header.vue @@ -36,7 +36,7 @@ const route = useRoute() const navList = ref([ { name: '共享门户', key: 'home' }, - { name: '能力超市', key: 'DetailsPageconetent' }, + { name: '能力集市', key: 'DetailsPageconetent' }, { name: '能力统计', key: 'abilityStatistics' }, { name: '技术文档', key: 'developmentGuide' }, { name: '需求中心', key: 'demandCenter' }, @@ -77,7 +77,7 @@ path: '/abilityStatistics', }) break - case '能力超市': + case '能力集市': router.push({ path: '/DetailsPageconetent', query: { diff --git a/front/src/views/newHome/components/Navigation.vue b/front/src/views/newHome/components/Navigation.vue index d98492ba..a7dacf61 100644 --- a/front/src/views/newHome/components/Navigation.vue +++ b/front/src/views/newHome/components/Navigation.vue @@ -161,13 +161,13 @@ const store = useStore() const router = useRouter() const topList = ref([ - '应用系统', - 'GIS图层', - '视频资源', + '应用资源', + '组件服务', + '基础设施', '数据资源', - '云网资源', + '知识库', ]) - const select = ref(whoShow.itShowQingDao ? '' : '应用系统') + const select = ref(whoShow.itShowQingDao ? '' : '应用资源') let applicationDataList = ref([]) let technosphereDataList = ref([]) const fabubumen = ref([ diff --git a/front/src/views/newHome/components/Navigation2.vue b/front/src/views/newHome/components/Navigation2.vue index d64223ab..08310675 100644 --- a/front/src/views/newHome/components/Navigation2.vue +++ b/front/src/views/newHome/components/Navigation2.vue @@ -1,21 +1,10 @@