Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

bug修复
2022-07-05 12:52:35 +08:00 · 2022-07-05 12:52:32 +08:00
3 changed files with 11 additions and 5 deletions
--- a/front/public/index.html
+++ b/front/public/index.html
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.wuhongjian
 * @Date: 2022-03-29 16:45:25
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-04 14:13:57
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-04 18:09:11
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@ -32,6 +32,7 @@
    // window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
    // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/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://10.110.205.1:8001';
    // window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/';
@ -48,7 +49,7 @@
    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['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';
    // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
--- a/front/public/static/image/test.jpg
+++ b/front/public/static/image/test.jpg
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@ -191,7 +191,7 @@
              <a-button
                type="primary"
                @click="toView('details', item)"
-                v-if="whoShow1.itShowQingDao"
+                v-if="!whoShow1.itShowBaoTou"
              >
                查看详情
              </a-button>
@ -418,10 +418,15 @@
      }
      function toView(type, item) {
        if (props.selectCardsname == '数据资源') {
-          window.open(
+          if (whoShow1.itShowQingDao) {
+            window.open(
            'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
              item.guid
          )
+          } else {
+             window.open(
+            'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=')
+          }
        } else {
          if (type === 'apply') {
            console.log('一键申请===================>', item)
Author	SHA1	Message	Date
wuhongjian	dc0a44dab7	Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-07-05 12:52:35 +08:00
wuhongjian	8a5b0a6370	bug修复	2022-07-05 12:52:32 +08:00