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 @@