diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue index 873a10ec..8b8634bc 100644 --- a/back/src/views/modules/myAgent/demo/competency-application.vue +++ b/back/src/views/modules/myAgent/demo/competency-application.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-29 15:59:51 * @LastEditors: Light - * @LastEditTime: 2022-10-21 16:11:46 + * @LastEditTime: 2022-10-27 16:04:01 * @Description: 告诉大家这是什么 --> @@ -77,7 +77,7 @@ - - + @@ -131,6 +131,7 @@ export default { mixins: [processModule], data () { return { + callbacks: null, taskEntrustFlag: false, taskEntrustFlag2: false, dialogVisible: false, diff --git a/front/src/api/file.js b/front/src/api/file.js index 19b43c8d..b4f0d1ce 100644 --- a/front/src/api/file.js +++ b/front/src/api/file.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-20 17:16:35 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-25 14:13:30 + * @LastEditTime: 2022-10-26 17:57:52 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -99,14 +99,37 @@ export function getHls(params) { } // 西海岸--获取摄像头列表的后台地址 (测试环境地址:10.134.135.92:9537) -let _cameraUrl = _global && _global.config && _global.config.camreaInfo && _global.config.camreaInfo.cameraUrl || '10.134.135.92:9537'; +let _cameraUrl = + (_global && + _global.config && + _global.config.camreaInfo && + _global.config.camreaInfo.cameraUrl) || + '10.134.135.92:9537' //能力集市基础设施-左侧列表 export function getCameraInfoByAreaId(params) { - return axios.get(`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`, + return axios.get( + `http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`, config2 ) } //能力集市基础设施-摄像头 export function getCameraByCondition(params) { - return axios.post(`http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`, params, config2) + return axios.post( + `http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`, + params, + config2 + ) +} + +export function initiateMeet(data) { + // return request({ + // url: '/enke/initiateMeet', + // method: 'post', + // data: data, + // }) + return axios.post( + 'http://10.134.135.92:8888/renren-admin/enke/initiateMeet', + data, + config2 + ) } diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index 149a45e9..688ed0ed 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -88,9 +88,9 @@ v-else placeholder="请选择归属部门" v-model:value="formName.unit" - :getPopupContainer="(triggerNode) => triggerNode.parentNode" - show-search - :filterOption="true" + :getPopupContainer="(triggerNode) => triggerNode.parentNode" + show-search + :filterOption="true" @change="deptIdChangeFunction" > -
+
{ console.log('blur') } + const arrId = [] const handleFocus = () => { - console.log('focus') - let arrId = [] - for (var valueIndex of systemOptions2.value) { + console.log('focus', systemOptions2.value, systemOptions.value) + for (let valueIndex of systemOptions2.value) { if (arrId.indexOf(valueIndex['value']) == -1) { arrId.push(valueIndex['value']) systemOptions.value.push(valueIndex) diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index 09340b4a..ff73deae 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -776,7 +776,8 @@ defineExpose, computed, } from 'vue' - import { getUser, initiateMeet, getEnkeUsers } from '@/api/home' + import { getUser, getEnkeUsers } from '@/api/home' + import { initiateMeet } from '@/api/file' import { getCameraByParentId, getStreamByChannelCode, diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue index 99cd9b4e..7f7c128a 100644 --- a/front/src/views/home/videoSurveillance/index.vue +++ b/front/src/views/home/videoSurveillance/index.vue @@ -66,7 +66,7 @@ > - +
{ diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue index 544b8687..40e1683b 100644 --- a/front/src/views/personalCenter/components/AbilityApplication.vue +++ b/front/src/views/personalCenter/components/AbilityApplication.vue @@ -1,8 +1,8 @@ -