+
+
+
+ {{ item.name }}
+
+
+
-
+
+
+
+
+ {{ item.name }}
+
+
+
+
{{ item.name }}
@@ -322,12 +614,12 @@
:resourceTotal="resourceTotal"
>
-
+
@@ -348,7 +640,12 @@
DownOutlined,
// VideoCameraOutlined,
} from '@ant-design/icons-vue'
- import { selectDicStoreAll, pageWithAttrs, zywMessage } from '@/api/home.js'
+ import {
+ selectDicStoreAll,
+ pageWithAttrs,
+ // zywMessage,
+ getDataResource,
+ } from '@/api/home.js'
import { getSgcList } from '@/api/personalCenter'
import { useRouter } from 'vue-router'
// import { useStore } from 'vuex'
@@ -356,7 +653,9 @@
import detailsPageconetentTree from '@/views/home/detailsPageconetentTree.vue'
import searchResultList from '@/views/home/components/searchResultList.vue'
import KnowledgeBase from '@/views/home/components/KnowledgeBase.vue'
- import VideoSurveillance from '@/views/home/videoSurveillance'
+ // import VideoSurveillance from '@/views/home/videoSurveillance'
+ // 数据资源引用
+ import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
export default defineComponent({
setup() {
// const store = useStore()
@@ -388,7 +687,6 @@
// const jichusheshi=ref([
// {
// name:'青岛市云资源管理平台'
-
// }
// ])
// 模糊查询
@@ -435,6 +733,11 @@
value: '2022-05-06',
},
])
+ // 西海岸数据资源页
+ // const dataShowbt = ref(whoShow.itshow)
+ // 青岛数据资源页
+ const whoShow1 = ref(whoShow)
+ console.log(whoShow, 'dataShowdev==========================>')
// 分页
const loading = ref(true)
const currentPage = ref(1)
@@ -478,7 +781,6 @@
}
// 免批
const tagFlag = ref('')
-
// 视频资源
const stateTags = ref(['在线', '离线'])
const selStateTags = ref([])
@@ -690,20 +992,7 @@
// debugger
tecHnosphere = router.currentRoute.value.query.tecHnosphere
appLiCation = router.currentRoute.value.query.appLiCation
- // if (!appLiCation && !tecHnosphere) {
- // ListContent.records[0].selectedTags = []
- // ListContent.records[1].selectedTags = []
- // ListContent.records = []
- // ListContent.records = data
- // paramsGetResources.infoList = []
- // // debugger
- // // pageWithAttrs(paramsGetResources).then((res) => {
- // // resourceList.data = []
- // // resourceList.data = res.data.data.records
- // // resourceTotal.value = res.data.data.total
- // // })
- // }
- if (val.typeList?.length > 6) {
+ if (val.typeList && val.typeList.length > 6) {
val.showShrink = true
val.shrinkFlag = true
}
@@ -723,26 +1012,77 @@
const getAppResources = () => {
paramsGetResources.name = searchValue.value
paramsGetResources.type = Cardsname.value
- pageWithAttrs(paramsGetResources).then((res) => {
- console.log('查询列表============>', resourceList, res.data.data)
- resourceList.data = []
- videoList.data = []
- if (Cardsname.value === '基础设施') {
- console.log('基础设施~~~~~~~~~~~')
- videoList.data = res.data.data.records || []
- resourceTotal.value = res.data.data.total || ''
- loading.value = false
- } else {
- // resourceList.data = res.data.data.records || []
- resourceTotal.value = res.data.data.total || ''
- getShoppingCartList(res.data.data.records)
- console.log(
- '其他~~~~~~~~~~~',
- resourceList.data,
- resourceTotal.value
- )
- }
- })
+ console.log(
+ '执行getAppResources====================》',
+ paramsGetResources
+ )
+ if (
+ !whoShow1.value.itShowBaoTou &&
+ paramsGetResources.type === '数据资源'
+ ) {
+ getDataResource({
+ 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, //分页大小
+ }).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 // 发布时间
+ })
+ 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 !== '数据资源') {
+ pageWithAttrs(paramsGetResources).then((res) => {
+ console.log('查询列表============>', resourceList, res.data.data)
+ resourceList.data = []
+ videoList.data = []
+ if (Cardsname.value === '基础设施') {
+ console.log('基础设施~~~~~~~~~~~')
+ resourceList.data = res.data.data.records || []
+ resourceTotal.value = res.data.data.total || ''
+ loading.value = false
+ } else {
+ // resourceList.data = res.data.data.records || []
+ resourceTotal.value = res.data.data.total || ''
+ getShoppingCartList(res.data.data.records)
+ console.log(
+ '其他~~~~~~~~~~~',
+ resourceList.data,
+ resourceTotal.value
+ )
+ }
+ })
+ }
}
let shoppingCartList = ref([])
// 获取申购车列表
@@ -815,21 +1155,21 @@
paramsGetResources.pageNum = val
getAppResources()
}
- const findZywMessage = () => {
- zywMessage().then((res) => {
- console.log('findMessage============>', res)
- const { data } = res.data
- shujuziyuanqingkuang.value[0].value = data.sxmlcount
- shujuziyuanqingkuang.value[1].value = data.yfbfwcount
- shujuziyuanqingkuang.value[2].value = data.yfbjk
- shujuziyuanqingkuang.value[3].value = new Date().toLocaleString()
- })
- }
+ // const findZywMessage = () => {
+ // zywMessage().then((res) => {
+ // console.log('findMessage============>', res)
+ // const { data } = res.data
+ // shujuziyuanqingkuang.value[0].value = data.sxmlcount
+ // shujuziyuanqingkuang.value[1].value = data.yfbfwcount
+ // shujuziyuanqingkuang.value[2].value = data.yfbjk
+ // shujuziyuanqingkuang.value[3].value = new Date().toLocaleString()
+ // })
+ // }
onMounted(() => {
listKey2.value++
console.log('45345345', Cardsname.value, tecHnosphere, appLiCation)
getNewList()
- findZywMessage()
+ // findZywMessage()
// onSearch()
if (!tecHnosphere && !appLiCation) {
getAppResources()
@@ -843,6 +1183,7 @@
currentPageSize.value = pageSize
paramsGetResources.pageNum = current
paramsGetResources.pageSize = pageSize
+ console.log('执行onShowSizeChange', paramsGetResources)
getAppResources()
console.log(current, pageSize)
}
@@ -936,6 +1277,7 @@
handleChangeBqTags,
loading,
getShoppingCartList,
+ whoShow1,
}
},
components: {
@@ -947,7 +1289,8 @@
DownOutlined,
KnowledgeBase,
// VideoCameraOutlined,
- VideoSurveillance,
+ // VideoSurveillance,
+ DetailsPageResource,
},
beforeUnmount() {
mybus.off('selectCardsitem')
@@ -962,38 +1305,38 @@
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 9aedcaff..8d360247 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -59,20 +59,15 @@
-
+
-
- {{ item.content }}
- {{ item.title }}
-
-
- 设为已读
-
+ {{ item.content }}
+
查看更多
@@ -80,9 +75,32 @@
{{ user.username }}
-
{{ user.username }}
+
+ {{ user.username }}
+
退出
+
@@ -90,27 +108,31 @@
import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
import { recordRoute } from '@/config'
import { useRoute, useRouter } from 'vue-router'
- import { getUser, mynotice, mynoticeRead } from '@/api/home'
+ import { getUser, mynotice } from '@/api/home'
import { useStore } from 'vuex'
import { getSgcTotal } from '@/api/home'
import mybus from '@/myplugins/mybus'
const store = useStore()
const router = useRouter()
const route = useRoute()
- const navList = ref([
- { name: '共享门户', key: 'home' },
- { name: '能力集市', key: 'DetailsPageconetent' },
- { name: '能力统计', key: 'abilityStatistics' },
- { name: '开发指南', key: 'developmentGuide' },
- { name: '需求中心', key: 'demandCenter' },
- { name: '个人中心', key: 'personalCenter' },
- { name: '后台管理', key: 'houtaiguanli' },
- { name: '赋能案例', key: 'assignCase' },
- ])
+ // const navListManagement = ref([
+ // { name: '共享门户', key: 'home' },
+ // { name: '能力集市', key: 'DetailsPageconetent' },
+ // { name: '能力云图', key: 'capabilityCloud' },
+ // { name: '能力统计', key: 'abilityStatistics' },
+ // { name: '开发指南', key: 'developmentGuide' },
+ // { name: '需求中心', key: 'demandCenter' },
+ // // { name: '个人中心', key: 'personalCenter' },
+ // { name: '区市站点', key: 'mapTest' },
+ // // { name: '后台管理', key: 'houtaiguanli' },
+ // { name: '赋能案例', key: 'assignCase' },
+ // ])
const user = ref({})
const select = ref(router.currentRoute.value.name)
const mynoticeFlag = ref(false)
const mynoticeData = ref([])
+ // eslint-disable-next-line no-undef
+ const navList = ref(navListManagement.navList)
const props = defineProps({
showView: { type: String, default: '' },
})
@@ -154,6 +176,11 @@
},
})
break
+ case '能力云图':
+ router.push({
+ path: '/capabilityCloud',
+ })
+ break
case '开发指南':
router.push({
path: '/developmentGuide',
@@ -164,6 +191,11 @@
path: '/demandCenter',
})
break
+ case '区市站点':
+ router.push({
+ path: '/mapTest',
+ })
+ break
case '后台管理':
window.open(window.SITE_CONFIG.backUrl + '/#/bscatalogue-bscatalogue')
window.reload('http://15.2.21.238:9797')
@@ -198,25 +230,26 @@
window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
router.push('/personalCenter')
}
- onBeforeUnmount(() => {
- console.log('卸载getSgcNum========================>')
- mybus.off('getSgcNum')
- })
const mynoticeNum = ref(0)
// 我的消息
const getMynotice = () => {
- mynotice({ page: 1, limit: 999, readStatus: 0 }).then((res) => {
+ mynotice({ page: 1, limit: 3, readStatus: 0 }).then((res) => {
console.log('我的消息', res.data.data)
mynoticeNum.value = res.data.data.total
mynoticeData.value = res.data.data.list
})
}
- const read = (item) => {
- mynoticeRead(item.id).then((res) => {
- console.log('已读', res)
- getMynotice()
+ const goToView = () => {
+ router.push({
+ path: '/mynoticeView',
})
}
+ // const read = (item) => {
+ // mynoticeRead(item.id).then((res) => {
+ // console.log('已读', res)
+ // getMynotice()
+ // })
+ // }
onMounted(() => {
getSgcTotal().then((res) => {
console.log('初始化========================>', res.data.data.count)
@@ -228,21 +261,21 @@
if (mynoticeDom) {
mynoticeDom.addEventListener('mouseover', () => {
mynoticeFlag.value = true
- document.documentElement.style.overflow = 'hidden'
+ document.documentElement.style.overflowY = 'hidden'
})
mynoticeDom.addEventListener('mouseout', () => {
mynoticeFlag.value = false
- document.documentElement.style.overflow = 'scroll'
+ document.documentElement.style.overflowY = 'scroll'
})
}
if (mynotice) {
mynotice.addEventListener('mouseover', () => {
mynoticeFlag.value = true
- document.documentElement.style.overflow = 'hidden'
+ document.documentElement.style.overflowY = 'hidden'
})
mynotice.addEventListener('mouseout', () => {
mynoticeFlag.value = false
- document.documentElement.style.overflow = 'scroll'
+ document.documentElement.style.overflowY = 'scroll'
})
}
mybus.on('getSgcNum', () => {
@@ -251,6 +284,13 @@
console.log('申购车总数========================>', res.data.data.count)
})
})
+ mybus.on('getMynotice', () => {
+ getMynotice()
+ })
+ })
+ onBeforeUnmount(() => {
+ mybus.off('getSgcNum')
+ mybus.off('getMynotice')
})
diff --git a/front/src/views/home/components/searchResultList_back.vue b/front/src/views/home/components/searchResultList_back.vue
index 0546fe08..60196eb2 100644
--- a/front/src/views/home/components/searchResultList_back.vue
+++ b/front/src/views/home/components/searchResultList_back.vue
@@ -267,6 +267,7 @@
}
function toView(type, id, name, dataResourceId) {
+ debugger
if (type === 'apply') {
// window.open(newpage.href, '_blank')
router.push({
diff --git a/front/src/views/home/details.vue b/front/src/views/home/details.vue
index d07ddcfb..ff5c7ec5 100644
--- a/front/src/views/home/details.vue
+++ b/front/src/views/home/details.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-14 09:43:49
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-14 10:20:42
+ * @LastEditTime: 2022-06-20 18:44:52
* @Description: 告诉大家这是什么
-->
@@ -16,7 +16,14 @@
-
+
+
+
+
+ 
+ 
+