diff --git a/front/public/index.html b/front/public/index.html
index 5a5e6a12..165054aa 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-04 18:09:11
+ * @LastEditTime: 2022-07-05 13:09:00
* @Description: 告诉大家这是什么
-->
@@ -40,15 +40,15 @@
// window.SITE_CONFIG['apiURL'] = 'http://10.110.205.1:8000/renren-admin';
// 西海岸版本
- // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
- // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
- // 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://10.134.135.9:9797';
+ window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
+ 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.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['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
// 穿透版本
// window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 89580eda..0f94a799 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -2,12 +2,12 @@
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-04 14:23:05
+ * @LastEditTime: 2022-07-05 13:09:17
* @Description: 数据资源参数配置
*/
-const newLocation = 'qingdao'
+//const newLocation = 'qingdao'
// const newLocation = 'baotou'
-// const newLocation = 'xihaian'
+ const newLocation = 'xihaian'
// 数据资源数据
const whoShow = {}
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index b2645069..71e324d8 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1053,7 +1053,7 @@
paramsGetResources.pageNum = 1
}
let dataResourceParams = {
- serviceName: paramsGetResources.name, //资源名称
+ serviceName: paramsGetResources.name || '', //资源名称
orderField: whoShow1.value.itShowQingDao
? paramsGetResources.orderField == 'applyCount'
? 'syqk'
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index e9bdd500..4d31df98 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -425,7 +425,7 @@
)
} else {
window.open(
- 'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=')
+ 'http://10.134.135.24:30090/#/home')
}
} else {
if (type === 'apply') {
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 4c35dc3b..9b195a16 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -119,7 +119,7 @@
paramsGetResources.type = type
if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
getDataResource({
- serviceName: paramsGetResources.name, //资源名称
+ serviceName: paramsGetResources.name || '', //资源名称
orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段
orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
pageNum: paramsGetResources.pageNum, //页码
diff --git a/front/src/views/newHome/components/Navigation2.vue b/front/src/views/newHome/components/Navigation2.vue
index a9b67abd..ed186af5 100644
--- a/front/src/views/newHome/components/Navigation2.vue
+++ b/front/src/views/newHome/components/Navigation2.vue
@@ -99,6 +99,8 @@
path: '/DetailsPageconetent',
query: {
select: type,
+ tecHnosphere: '',
+ appLiCation: ''
},
})
}