diff --git a/front/public/index.html b/front/public/index.html index bf156246..deb29db3 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -44,10 +44,10 @@ // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // 开发 - window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; - window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796'; - window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; + window.SITE_CONFIG['backUrl'] = 'http://15.2.21.239:9797'; + window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.239:9796'; + window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.239:9796/document/#/devModelFile/'; + window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; @@ -66,7 +66,7 @@ - + diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index 732d579b..50aebc14 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -1,18 +1,99 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-04-01 10:51:45 + * @LastEditors: hisense.liangjunhua + * @LastEditTime: 2022-06-21 16:58:56 * @Description: 数据资源参数配置 */ -const launchedDataNum = [ - { - num: 10373, - }, - { - num: 1080, - }, - { - num: 976, - }, -] +const newLocation = 'qingdao' +// const newLocation = 'baotou' +// const newLocation = 'xihaian' + +// 数据资源数据 +const launchedDataNumObject = {} +// 导航数据 +const navListManagement = {} +// qingdao +if (newLocation === 'qingdao') { + // 数据资源数据 + launchedDataNumObject.launchedDataNum = [ + { + num: 10374, + }, + { + num: 1080, + }, + { + num: 976, + }, + ] + // 导航数据 + navListManagement.navList = [ + { 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' }, + ] +} +// baotou +else if (newLocation === 'baotou') { + // 数据资源数据 + launchedDataNumObject.launchedDataNum = [ + { + num: 10373, + }, + { + num: 1080, + }, + { + num: 976, + }, + ] + // 导航数据 + navListManagement.navList = [ + { 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' }, + ] +} +// xihaian +else if (newLocation === 'xihaian') { + // 数据资源数据 + launchedDataNumObject.launchedDataNum = [ + { + num: 10372, + }, + { + num: 1080, + }, + { + num: 976, + }, + ] + // 导航数据 + navListManagement.navList = [ + { 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' }, + ] +} diff --git a/front/src/assets/mynoticeView/all.png b/front/src/assets/mynoticeView/all.png new file mode 100644 index 00000000..ba1003fc Binary files /dev/null and b/front/src/assets/mynoticeView/all.png differ diff --git a/front/src/assets/mynoticeView/comment.png b/front/src/assets/mynoticeView/comment.png new file mode 100644 index 00000000..6bb4f32c Binary files /dev/null and b/front/src/assets/mynoticeView/comment.png differ diff --git a/front/src/assets/mynoticeView/notice.png b/front/src/assets/mynoticeView/notice.png new file mode 100644 index 00000000..57f3b79b Binary files /dev/null and b/front/src/assets/mynoticeView/notice.png differ diff --git a/front/src/router/index.js b/front/src/router/index.js index 40584e34..235b7f3b 100644 --- a/front/src/router/index.js +++ b/front/src/router/index.js @@ -138,6 +138,16 @@ export const constantRoutes = [ icon: 'error-warning-line', }, }, + { + path: '/mynoticeView', + name: 'mynoticeView', + hidden: true, + component: () => import('@/views/mynoticeView'), + meta: { + title: '我的消息', + icon: 'error-warning-line', + }, + }, { path: '/WorkDynDetails', name: 'WorkDynDetails', diff --git a/front/src/views/capabilityCloud/components/DataResources.vue b/front/src/views/capabilityCloud/components/DataResources.vue index 66e9bf62..fb204199 100644 --- a/front/src/views/capabilityCloud/components/DataResources.vue +++ b/front/src/views/capabilityCloud/components/DataResources.vue @@ -143,7 +143,7 @@ // assignRankings.value[i - 1].name = contentData.value.resourceTop5[i - 1].service_name || '' - assignRankings.value[i - 1].opacity = + assignRankings.value[i - 1].operation = contentData.value.resourceTop5[i - 1].count || ' ' } }) diff --git a/front/src/views/home/components/DetailsPageResource.vue b/front/src/views/home/components/DetailsPageResource.vue index 01056c86..157a3605 100644 --- a/front/src/views/home/components/DetailsPageResource.vue +++ b/front/src/views/home/components/DetailsPageResource.vue @@ -32,17 +32,17 @@ const launchedData = ref([ { title: '已上线目录', - num: launchedDataNum[0].num, + num: launchedDataNumObject.launchedDataNum[0].num, img: require('@/assets/home/pageResource/catalogue-icon.png'), }, { title: '已发布服务', - num: launchedDataNum[1].num, + num: launchedDataNumObject.launchedDataNum[1].num, img: require('@/assets/home/pageResource/service-icon.png'), }, { title: '已发布接口', - num: launchedDataNum[2].num, + num: launchedDataNumObject.launchedDataNum[2].num, img: require('@/assets/home/pageResource/port-icon.png'), }, ]) diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index ecefa67d..3605e21e 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -59,20 +59,15 @@ +
查看更多
@@ -113,29 +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: 'capabilityCloud' }, - { name: '能力统计', key: 'abilityStatistics' }, - { name: '开发指南', key: 'developmentGuide' }, - { name: '需求中心', key: 'demandCenter' }, - // { name: '个人中心', key: 'personalCenter' }, - { name: '区市站点', key: 'mapTest' }, - // { 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: '' }, }) @@ -243,15 +240,20 @@ mynotice({ page: 1, limit: 999, readStatus: 0 }).then((res) => { console.log('我的消息', res.data.data) mynoticeNum.value = res.data.data.total - mynoticeData.value = res.data.data.list + mynoticeData.value = res.data.data.list.splice(0, 3) }) } - 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) @@ -263,21 +265,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', () => { @@ -361,6 +363,7 @@ } .white { background-color: #fff; + box-shadow: 0 0.02rem 0.1rem rgba(0, 0, 0, 0.1); .name { color: #0058e1; } @@ -397,7 +400,7 @@ } } .mynotice { - width: 2.5rem; + width: 4rem; height: 3rem; background: #eee; border-radius: 0.05rem; @@ -405,24 +408,33 @@ top: 0.45rem; right: 3.1rem; overflow-y: scroll; + .bottom { + cursor: pointer; + width: 100%; + text-align: center; + color: #000; + font-size: 0.16rem; + } } .mynotice::-webkit-scrollbar { display: none; } :deep(.ant-list-item) { border-bottom: 0.01rem solid #ccc; + padding: 0.1rem; } :deep(.ant-list-item-meta-title) { - display: flex; - justify-content: space-around; - align-items: center; - padding: 0 0.05rem; + // display: flex; + // justify-content: space-around; + // align-items: center; + // padding: 0 0.05rem; a { - width: 1.5rem; - // 超出显示... + width: 3.8rem; overflow: hidden; text-overflow: ellipsis; - white-space: nowrap; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; } button { width: 0.7rem; diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue new file mode 100644 index 00000000..7e4db574 --- /dev/null +++ b/front/src/views/mynoticeView/components/NoticeList.vue @@ -0,0 +1,260 @@ + + + + diff --git a/front/src/views/mynoticeView/index.vue b/front/src/views/mynoticeView/index.vue new file mode 100644 index 00000000..8b012893 --- /dev/null +++ b/front/src/views/mynoticeView/index.vue @@ -0,0 +1,18 @@ + + + +