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

bug修复
2022-07-28 14:43:04 +08:00 · 2022-07-28 14:42:44 +08:00
3 changed files with 16 additions and 16 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-28 14:13:57
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-28 14:42:55
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@ -48,16 +48,16 @@
    // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin';
    // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
    // 西海岸版本
-    // 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://localhost:8001';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
-    window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
+    // window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
+    // window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
    window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@ -1,13 +1,13 @@
 /*
 * @Author: hisense.wuhongjian
 * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-28 09:36:58
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-28 14:32:04
 * @Description: 数据资源参数配置
 */
-const newLocation = 'qingdao'
+//const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-// const newLocation = 'xihaian'
+const newLocation = 'xihaian'

 // 数据资源数据
 const whoShow = {}
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@ -239,7 +239,7 @@
    getStreamByChannelCode(param).then((res) => {
      console.log(res)
      visible.value = true
-      options.value.src = res.data.data
+      options.src = res.data.data
    })
  }
  // const dataTypeList = () => {
Author	SHA1	Message	Date
wuhongjian	e47d7cf470	Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-07-28 14:43:04 +08:00
wuhongjian	b766bcf8fa	bug修复	2022-07-28 14:42:44 +08:00