合并

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 @@
       </ul>
     </div>
     <!--  流程综合组件   -->
-    <!--   <ren-process-multiple
+      <!-- <ren-process-multiple
       v-if="processVisible"
       updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
       saveFormUrl="/processForm/tabilityapplication"
@@ -105,7 +105,7 @@
 
         <ren-task-entrust v-if="renTaskEntrustVisible" ref="renTaskEntrust"></ren-task-entrust>
     <!--  流程详情   -->
-    <ren-process-detail></ren-process-detail>
+    <ren-process-detail ref="renProcessMultiple"></ren-process-detail>
     <el-dialog title="审批意见" :close-on-click-modal="false" :visible.sync="dialogVisible" width="30%"
       :before-close="handleClose">
       <el-input v-model="input" placeholder="请输入审批意见"></el-input>
@@ -131,6 +131,7 @@ export default {
   mixins: [processModule],
   data () {
     return {
+      callbacks: null,
       taskEntrustFlag: false,
       taskEntrustFlag2: false,
       dialogVisible: false,

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
+  )
 }

front/src/views/home/apply.vue

@@ -88,9 +88,9 @@
                     v-else
                     placeholder="请选择归属部门"
                     v-model:value="formName.unit"
-                    :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
+                    :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                    show-search 
+                    show-search
-                     :filterOption="true" 
+                    :filterOption="true"
                     @change="deptIdChangeFunction"
                   >
                     <a-select-option
@@ -103,7 +103,7 @@
                   </a-select>
                 </a-form-item>
               </div>
-              <div class="base-info" v-if="flag">
+              <div class="base-info" v-show="flag">
                 <div style="margin-bottom: 24px">
                   <a-form-item
                     style="margin-bottom: 0"
@@ -811,10 +811,10 @@
       const handleBlur = () => {
         console.log('blur')
       }
+      const arrId = []
       const handleFocus = () => {
-        console.log('focus')
+        console.log('focus', systemOptions2.value, systemOptions.value)
-        let arrId = []
+        for (let valueIndex of systemOptions2.value) {
-        for (var valueIndex of systemOptions2.value) {
           if (arrId.indexOf(valueIndex['value']) == -1) {
             arrId.push(valueIndex['value'])
             systemOptions.value.push(valueIndex)

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,

front/src/views/home/videoSurveillance/index.vue

@@ -66,7 +66,7 @@
         ></path>
       </svg>
       <img class="icon-poylon" @click="areaMode()" src="~@/supermap/image/icon-poylon.png">
-      
+
     </div>
     <video-play
       v-if="openVideo"
@@ -197,7 +197,7 @@
         L.drawLocal.draw.handlers.polygon.tooltip.cont = '单击继续绘制形状'
         L.drawLocal.draw.handlers.polygon.tooltip.end =
           '单击继续绘制形状,双击结束绘制'
-          
+
         this.hiMap.mapObj.map.off('draw:created')
         this.hiMap.mapObj.drawPolygon.enable()
         this.hiMap.mapObj.map.once('draw:created', (e) => {