diff --git a/src/api/audioResources.js b/src/api/audioResources.js new file mode 100644 index 000000000..8e35efc71 --- /dev/null +++ b/src/api/audioResources.js @@ -0,0 +1,49 @@ +import request from '@/utils/request'; + +// 创建音频资源 +export function createAudioResources(data) { + return request({ + url: `/api/audioResources`, + method: 'post', + data + }); +} +// 查询所有音频资源 +export function queryAllAudioResources() { + return request({ + url: `/api/audioResources/list`, + method: 'get' + }); +} +// 删除音频资源 +export function deleteAudioResources(id) { + return request({ + url: `/api/audioResources/${id}`, + method: 'delete' + }); +} +// 更新音频资源 +export function updateAudioResources(id, data) { + return request({ + url: `/api/audioResources/${id}`, + method: 'put', + data + }); +} +// 分页查询音频资源 +export function pagedAudioResources(params) { + return request({ + url: `/api/audioResources/paged`, + method: 'get', + params + }); +} +// 上传音频文件 +export function uploadAudio(file) { + return request({ + url: `/api/upload/AUDIO?appId=00001&appSecret=joylink00001`, + method: 'post', + data: file, + upload: true + }); +} diff --git a/src/api/iscs.js b/src/api/iscs.js index 2b81ddacb..b1ae9c608 100644 --- a/src/api/iscs.js +++ b/src/api/iscs.js @@ -49,3 +49,86 @@ export function queryHasIscs(params) { params }); } +// iscs设备创建 +export function createIscsDevcie(data) { + return request({ + url: `/api/iscsDevice`, + method: 'post', + data + }); +} +// 查询所有iscs设备 +export function queryAllIscsDevice() { + return request({ + url: `/api/iscsDevice/all`, + method: 'get' + }); +} +// 根据id查询iscs设备 +export function queryIscsDevcieById(id) { + return request({ + url: + `/api/iscsDevice/${id}`, + method: 'get' + }); +} +// 根据mapId获取Iscs设备list +export function queryIscsDeviceListByMapId(mapId) { + return request({ + url: `/api/iscsDevice/list/mapId/${mapId}`, + method: 'get' + }); +} +// 分页查询ISCS设备 +export function pagedIscsDevice(params) { + return request({ + url: `/api/iscsDevice/paged`, + method: 'get', + params + }); +} +// 删除ISCS设备 +export function deleteIscsDevice(id) { + return request({ + url: `/api/iscsDevice/${id}`, + method: 'delete' + }); +} + +// 创建ISCS系统资源 +export function createIscsResources(data) { + return request({ + url: `/api/systemRes`, + method: 'post', + data + }); +} +// 查询所有ISCS系统资源 +export function queryAllIscsResources() { + return request({ + url: `/api/systemRes/all`, + method: 'get' + }); +} +// 根据id查询ISCS系统资源 +export function queryIscsResourcesById(id) { + return request({ + url: `/api/systemRes/${id}`, + method: 'get' + }); +} +// 分页查询ISCS系统资源 +export function pagedIscsResources(params) { + return request({ + url: `/api/systemRes/paged`, + method: 'get', + params + }); +} +// 删除ISCS系统资源 +export function deleteIscsResources(id) { + return request({ + url: `/api/systemRes/${id}`, + method: 'delete' + }); +} diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js index 723edc0dc..8bbad7997 100644 --- a/src/i18n/langs/en/router.js +++ b/src/i18n/langs/en/router.js @@ -100,5 +100,8 @@ export default { voiceTraining: 'Voice Training', mapGroup: 'Map Group', drawingMange:'Drawing Mange', - projectServer: 'Project Server' + projectServer: 'Project Server', + audioResourcesManage: 'Audio Resources Manage', + iscsDeviceManage: 'ISCS Device Manage', + iscsResourcesManage: 'ISCS Resources Manage' }; diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js index 7cede752b..f74e62b56 100644 --- a/src/i18n/langs/zh/router.js +++ b/src/i18n/langs/zh/router.js @@ -104,5 +104,8 @@ export default { voiceTraining: '语音训练', mapGroup: '地图分组', drawingMange:'图纸管理', - projectServer: '项目域名' + projectServer: '项目域名', + audioResourcesManage: '音频资源管理', + iscsDeviceManage: 'ISCS设备管理', + iscsResourcesManage: 'ISCS资源管理' }; diff --git a/src/router/index.js b/src/router/index.js index 06c3aed08..749b8ded2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -192,6 +192,9 @@ const UploadPdfList = () => import('@/views/uploadPdf/list'); const ThirdLogin = () => import('@/views/thirdLogin'); const ProjectServer = () => import('@/views/system/serverManage'); +const VoiceManage = () => import('@/views/fileManage/voiceManage'); +const IscsDeviceManage = () => import('@/views/system/iscsDeviceManage'); +const IscsResourcesManage = () => import('@/views/system/iscsResourcesManage'); // import { GenerateRouteProjectList } from '@/scripts/ProjectConfig'; // import { getSessionStorage } from '@/utils/auth'; @@ -1210,6 +1213,20 @@ export const asyncRouter = [ meta: { i18n: 'router.projectServer' } + }, + { + path: 'iscsDeviceManage', + component: IscsDeviceManage, + meta: { + i18n: 'router.iscsDeviceManage' + } + }, + { + path: 'iscsResourcesManage', + component: IscsResourcesManage, + meta: { + i18n: 'router.iscsResourcesManage' + } } // { // path: 'deviceManage', @@ -1255,6 +1272,13 @@ export const asyncRouter = [ meta: { i18n: 'router.uploadPdf' } + }, + { + path: 'audioResources', + component: VoiceManage, + meta: { + i18n: 'router.audioResourcesManage' + } } ] }, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 15d13d61e..516a07357 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -25,7 +25,7 @@ export function handlerUrl(data) { if (process.env.NODE_ENV === 'development') { // const data = null; // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.8.152:9000'; // 袁琪 // BASE_API = 'http://192.168.8.172:9200'; // 旭强 diff --git a/src/utils/request.js b/src/utils/request.js index 5673dd619..5049fbb20 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -29,6 +29,9 @@ service.interceptors.request.use(config => { if (store.state.user.baseUrl) { config.baseURL = store.state.user.baseUrl; } + if (config.upload) { + config.baseURL = urlData.UPLOAD_API; + } if (config.time) { config.timeout = config.time; // 让每个请求携带自定义token 请根据实际情况自行修改 diff --git a/src/views/fileManage/voiceManage/add.vue b/src/views/fileManage/voiceManage/add.vue new file mode 100644 index 000000000..db1cc2d31 --- /dev/null +++ b/src/views/fileManage/voiceManage/add.vue @@ -0,0 +1,281 @@ + + + + diff --git a/src/views/fileManage/voiceManage/index.vue b/src/views/fileManage/voiceManage/index.vue new file mode 100644 index 000000000..13d2a5fe0 --- /dev/null +++ b/src/views/fileManage/voiceManage/index.vue @@ -0,0 +1,131 @@ + + + diff --git a/src/views/iscs/iscsSystem/config/broadcast/homeScreen.vue b/src/views/iscs/iscsSystem/config/broadcast/homeScreen.vue index e3e216733..6104d4cf2 100644 --- a/src/views/iscs/iscsSystem/config/broadcast/homeScreen.vue +++ b/src/views/iscs/iscsSystem/config/broadcast/homeScreen.vue @@ -1,7 +1,7 @@ @@ -16,16 +16,19 @@ export default { }, data() { return { - currentSystem: '' + currentSystem: '', + stationId: '' }; }, watch:{ $route() { this.currentSystem = this.$route.query.currentSystem; + this.stationId = this.$route.query.stationId; } }, mounted() { this.currentSystem = this.$route.query.currentSystem; + this.stationId = this.$route.query.stationId; } }; diff --git a/src/views/iscs/iscsSystem/stationConfig/index.vue b/src/views/iscs/iscsSystem/stationConfig/index.vue index 423ada21d..14501cdb1 100644 --- a/src/views/iscs/iscsSystem/stationConfig/index.vue +++ b/src/views/iscs/iscsSystem/stationConfig/index.vue @@ -7,6 +7,13 @@ + + + + + + + + diff --git a/src/views/system/iscsDeviceManage/index.vue b/src/views/system/iscsDeviceManage/index.vue new file mode 100644 index 000000000..f5d290adf --- /dev/null +++ b/src/views/system/iscsDeviceManage/index.vue @@ -0,0 +1,216 @@ + + + diff --git a/src/views/system/iscsResourcesManage/add.vue b/src/views/system/iscsResourcesManage/add.vue new file mode 100644 index 000000000..830fc199a --- /dev/null +++ b/src/views/system/iscsResourcesManage/add.vue @@ -0,0 +1,228 @@ + + + + diff --git a/src/views/system/iscsResourcesManage/index.vue b/src/views/system/iscsResourcesManage/index.vue new file mode 100644 index 000000000..ddf0f9bef --- /dev/null +++ b/src/views/system/iscsResourcesManage/index.vue @@ -0,0 +1,201 @@ + + + diff --git a/src/views/system/serverManage/index.vue b/src/views/system/serverManage/index.vue index 37a73e55a..1925bb4e8 100644 --- a/src/views/system/serverManage/index.vue +++ b/src/views/system/serverManage/index.vue @@ -47,10 +47,10 @@ export default { title: '接口域名', prop: 'domainName' }, - { - title: '资源域名', - prop: 'resourcesDomainName' - }, + { + title: '资源域名', + prop: 'resourcesDomainName' + }, { title: '项目名称', prop: 'projectCode',