From c6cb53c3b9eab0c10a169bbfd6e5ead6240332d8 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Wed, 22 Jun 2022 19:11:34 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ back/public/index.html | 10 ++++----- front/public/index.html | 11 +++++----- front/public/static/config/location.js | 22 +++++++++---------- front/src/api/home.js | 13 ++++++++--- .../home/components/searchResultList.vue | 5 ++--- 6 files changed, 36 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index b1d42a94..3521ee6e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ back/dist-西海岸-后台管理.zip back/public/index.html back/dist-西海岸-后台管理-带配置文件.zip back/dist-市局-后台管理-带配置文件.zip +back/dist-包头-后台管理.zip +back/dist-市局-后台管理.zip diff --git a/back/public/index.html b/back/public/index.html index 59ed843e..b48dcb0f 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-11 10:11:40 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-20 16:20:34 + * @LastEditTime: 2022-06-22 17:19:39 * @Description: 告诉大家这是什么 --> @@ -29,8 +29,8 @@ }; // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/#/vueTemplateDemo'; // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/#/vueTemplateDemo'; - // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo'; - window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9797/#/vueTemplateDemo'; + window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo'; + // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9797/#/vueTemplateDemo'; window.SITE_CONFIG['menuList'] = []; // 左侧菜单列表（后台返回，未做处理） window.SITE_CONFIG['permissions'] = []; // 页面按钮操作权限（后台返回，未做处理） window.SITE_CONFIG['dynamicRoutes'] = []; // 动态路由列表 @@ -71,8 +71,8 @@ // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; - // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin'; - window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; + window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin'; + // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // WebSocket地址 window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket'; diff --git a/front/public/index.html b/front/public/index.html index 0c666626..3ccfd971 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-06-21 17:21:23 + * @LastEditTime: 2022-06-22 18:46:16 * @Description: 告诉大家这是什么 --> @@ -32,11 +32,12 @@ // 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['backUrl'] = 'http://10.110.205.1:8001'; + window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/'; + window.SITE_CONFIG['frontUrl'] = 'http://10.110.205.1:8002/document/#/devModelFile/'; + window.SITE_CONFIG['apiURL'] = 'http://10.110.205.1:8000/renren-admin'; - window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001'; - 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['backUrl'] = 'http://10.134.135.9:9797'; // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index f4ff914d..9dbe439d 100644 --- 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-06-22 16:18:47 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-06-22 18:46:24 * @Description: 数据资源参数配置 */ // const newLocation = 'qingdao' // const newLocation = 'baotou' -const newLocation = 'qingdao' +const newLocation = 'baotou' // 数据资源数据 const whoShow = {} @@ -80,21 +80,21 @@ else if (newLocation === 'baotou') { ] footerDataList.footerList = { company: { - left: '青岛西海岸新区大数据发展促进局建设', - right: 'v0.81', + left: '包头市工业和信息化局大数据中心建设', + right: '海信网络科技股份有限公司', }, address: [ { - name: '鲁IC备00000000号', - value: '政府标识码3702000106', + name: '蒙ICP备05003330-1号', + value: '政府标识码1502000040', }, { - name: '版权所有：青岛西海岸新区大数据发展促进局', - value: '地址：青岛市西海岸新区长江中路369号', + name: '版权所有：包头市工业和信息化局大数据中心', + value: '地址：内蒙古自治区包头市九原区开元大街1号', }, { - name: '电话：0532-86986596', - value: '传真：0532-86986596', + name: '电话：0472-5618235', + value: '传真：0472-5618235', }, ], } diff --git a/front/src/api/home.js b/front/src/api/home.js index aa979e96..6f560eb9 100644 --- a/front/src/api/home.js +++ b/front/src/api/home.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-04-01 19:19:40 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-22 15:27:36 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-06-22 18:59:03 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -62,7 +62,14 @@ export function pageWithAttrs(data) { data, }) } - +// 获取hls视频流 +export function getHls(params) { + return request({ + url: '/resource/hls/getHls', + method: 'get', + params, + }) +} // 加入申购车 export function sgcInsert(data) { return request({ diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 61b6dd33..6b5bf890 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -209,7 +209,7 @@ import { getUser, sgcInsert } from '@/api/home' import { scInsert, scDel } from '@/api/personalCenter' import mybus from '@/myplugins/mybus' - import { getHls } from '@/api/file.js' + import { getHls } from '@/api/home.js' export default { name: '', @@ -477,8 +477,7 @@ const openVideo = (item) => { videoUrl.value = '' const param = { - cameraId: item.link, - protocol: 'hls', + key: item.link, } getHls(param).then((res) => { console.log('获取视频地址===============>', res)