wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

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

This commit is contained in:
guoyue 2022-10-24 14:30:12 +08:00
parent f6eca9013c 84f1b03c42
commit 99f57e3335
9 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
front/public/static/config/basicConfig.js
View File

@ -1,8 +1,8 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
* @LastEditors: Light
* @LastEditTime: 2022-10-22 11:08:16
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-10-24 11:50:52
* @Description: 系统静态参数配置
*/
var _global = {}
@ -13,7 +13,7 @@ var CONFIGITEM = {
// version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
// version: 'qingdao', // 测试
//version: 'frp', // 内网穿透
vNum: 'v0.8.7.2',
vNum: 'v0.8.14.2',
configData: {
// 青岛市大数据局
qingdao: {
@ -27,8 +27,8 @@ var CONFIGITEM = {
backUrl: 'http://15.72.183.90:8001',
previewUrl: 'http://15.72.183.90:7008/',
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
//apiURL: 'http://15.72.183.90:8000/renren-admin',
// websocketURL: '15.72.183.90:8000/renren-admin',
apiURL: 'http://15.72.183.90:8000/renren-admin',
websocketURL: '15.72.183.90:8000/renren-admin',
// websocketURL: '192.168.124.233:8888/renren-admin',
POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
@ -87,7 +87,7 @@ var CONFIGITEM = {
},
backUrl: 'http://localhost:8001',
previewUrl: 'http://192.168.124.243:9796/',
websocketURL: '192.168.124.243:8888/renren-admin',
websocketURL: '192.168.124.254:8888/renren-admin',
// websocketURL: '10.18.1.99:8889/renren-admin',
POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',

BIN
front/public/static/download/金宏视频会议系统参会终端(10.1.101.504)_20200211.rar Normal file
View File

Binary file not shown.

13
front/src/api/home.js
View File

@ -1,8 +1,8 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2022-04-01 19:19:40
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-08-23 09:37:58
* @LastEditors: Light
* @LastEditTime: 2022-10-24 10:36:56
* @Description: 告诉大家这是什么
*/
import request from '@/utils/request'
@ -103,6 +103,13 @@ export function getUserInfo(params) {
method: 'get',
})
}
export function initiateMeet(data) {
return request({
url: '/enke/initiateMeet',
method: 'post',
data: data,
})
}
// 组件服务
export function ApplicationServe(data) {
@ -492,4 +499,4 @@ export function getMaxApplyNum(number) {
url: '/processForm/tabilityapplication/canApply/' + number,
method: 'get',
})
}
}

2
front/src/api/personalCenter.js
View File

@ -308,4 +308,4 @@ export function getDeviceDetail(deviceId) {
url: `/device/${deviceId}`,
method: 'get',
})
}
}

6
front/src/views/capacitySquare/components/algorithm.vue
View File

@ -53,9 +53,9 @@
}).then((res) => {
dictList.value = ['全部']
res.data.data.list.map((val) => {
if (val.dictLabel !== '其他') {
dictList.value.push(val.dictLabel)
}
// if (val.dictLabel !== '其他') {
dictList.value.push(val.dictLabel)
// }
})
})
const params = {

10
front/src/views/capacitySquare/components/application.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: hisense.liangjunhua
* @Date: 2022-08-09 09:31:25
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-09-19 10:19:02
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-10-24 10:44:50
* @Description: 应用资源
-->
<template>
@ -74,9 +74,9 @@
}).then((res) => {
dictList.value = ['全部']
res.data.data.list.map((val) => {
if (val.dictLabel !== '其他') {
dictList.value.push(val.dictLabel)
}
// if (val.dictLabel !== '其他') {
dictList.value.push(val.dictLabel)
// }
})
})
let dom = null

6
front/src/views/capacitySquare/components/layer.vue
View File

@ -53,9 +53,9 @@
}).then((res) => {
dictList.value = ['全部']
res.data.data.list.map((val) => {
if (val.dictLabel !== '其他') {
dictList.value.push(val.dictLabel)
}
// if (val.dictLabel !== '其他') {
dictList.value.push(val.dictLabel)
// }
})
})
const params = {

25
front/src/views/home/infrastructurePage.vue
View File

@ -457,6 +457,21 @@
>
添加至申购车
</a-button>
<a
stlyle="width: 100px;
height: 36px;
line-height: 36px;
text-align: center;
background: #0558e1;
border-radius: 5px;
font-size: 14px;
color: #fff;
}"
v-if="selectType == '视频会议'"
href="/static/download/金宏视频会议系统参会终端(10.1.101.504)_20200211.rar"
>
客户端下载
</a>
<!-- 一键申请 -->
<a-button
v-if="isXiHaiAn"
@ -742,7 +757,7 @@
defineExpose,
computed,
} from 'vue'
import { getUser, getUserInfo } from '@/api/home'
import { getUser, initiateMeet } from '@/api/home'
import {
getCameraByParentId,
getStreamByChannelCode,
@ -804,6 +819,11 @@
], //显示所有按钮,
})
const videoList = ref([])
const initMeeting = () => {
initiateMeet('青岛市一网统揽项目组/一网统揽平台组/').then((res) => {
console.log('组会=========>', res)
})
}
let visible = ref(false) // 视频预览
let picVisible = ref(false) // 图片预览
let batchVisible = ref(false) // 视频批量预览
@ -1877,6 +1897,9 @@
case '视频资源':
window.open('http://15.72.183.88:8860/video')
break
case '视频会议':
initMeeting()
break
default:
break
}

4
front/vue.config.js
View File

@ -29,8 +29,8 @@ const productionGzipExtensions = [
'ico',
]
// 是否开启gzip压缩
const isPro = process.env.NODE_ENV === 'production'
// const isPro = false
// const isPro = process.env.NODE_ENV === 'production'
const isPro = false
if (donation) donationConsole()
const { version, author } = require('./package.json')
const Webpack = require('webpack')