From 09d56091fa770000a3cf0ce4d0329b20355c6cff Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Thu, 27 Oct 2022 15:48:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/file.js                         |   31 +-
 front/src/views/home/infrastructurePage.vue   |    3 +-
 .../views/home/videoSurveillance/index.vue    |    4 +-
 .../components/AbilityApplication.vue         | 1159 +++++++++--------
 4 files changed, 640 insertions(+), 557 deletions(-)

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/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index eea54b44..b43fc8c8 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 @@
         ></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) => {
diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index 06b43157..954fa943 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-12 09:42:44
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-08-04 10:41:06
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-26 18:15:01
  * @Description:我的申请 能力申请 查看详情
 -->
 <template>
@@ -52,18 +52,31 @@
           <span class="img"></span>
           <span>{{ item.name }}</span>
         </div>
-        <div style="
+        <div
+          style="
             display: flex;
             justify-content: space-between;
             align-items: center;
-          ">
+          "
+        >
           <div class="oddNumbers">子单号：{{ item.instanceId }}</div>
           <div style="display: flex; align-items: center">
-            <a-button type="primary" @click="modify(props.refObj.id, item)" v-if="item.backToFirst">
+            <a-button
+              type="primary"
+              @click="modify(props.refObj.id, item)"
+              v-if="item.backToFirst"
+            >
               修改
             </a-button>
-            <a-popconfirm class="aaa"  v-if="!item.ended" title="是否撤回此流程?" ok-text="是" cancel-text="否"
-              @confirm="endThis(item.instanceId)" @cancel="cancel">
+            <a-popconfirm
+              class="aaa"
+              v-if="!item.ended"
+              title="是否撤回此流程?"
+              ok-text="是"
+              cancel-text="否"
+              @confirm="endThis(item.instanceId)"
+              @cancel="cancel"
+            >
               <a-button type="primary" danger style="margin-left: 10px">
                 撤回申请
               </a-button>
@@ -72,29 +85,36 @@
         </div>
 
         <div class="box" v-if="item.list.length > 0">
-          <div class="ability" v-for="val in item.list" :key="val.id"
-            :class="item.approveStatus === '通过' ? 'clickCursor' : ''">
-            <div class="left" :class="
-              val.type == '应用资源'
-                ? 'yyzy'
-                : val.infoList.filter(
-                    (val2) => val2.attrType == '组件类型'
-                  )[0].attrValue == '智能算法'
-                ? 'znsf'
-                : val.infoList.filter(
-                    (val2) => val2.attrType == '组件类型'
-                  )[0].attrValue == '图层服务'
-                ? 'tcfw'
-                : val.infoList.filter(
-                    (val2) => val2.attrType == '组件类型'
-                  )[0].attrValue == '开发组件'
-                ? 'kfzj'
-                : val.infoList.filter(
-                    (val2) => val2.attrType == '组件类型'
-                  )[0].attrValue == '业务组件'
-                ? 'ywzj'
-                : 'yyzy'
-            "></div>
+          <div
+            class="ability"
+            v-for="val in item.list"
+            :key="val.id"
+            :class="item.approveStatus === '通过' ? 'clickCursor' : ''"
+          >
+            <div
+              class="left"
+              :class="
+                val.type == '应用资源'
+                  ? 'yyzy'
+                  : val.infoList.filter(
+                      (val2) => val2.attrType == '组件类型'
+                    )[0].attrValue == '智能算法'
+                  ? 'znsf'
+                  : val.infoList.filter(
+                      (val2) => val2.attrType == '组件类型'
+                    )[0].attrValue == '图层服务'
+                  ? 'tcfw'
+                  : val.infoList.filter(
+                      (val2) => val2.attrType == '组件类型'
+                    )[0].attrValue == '开发组件'
+                  ? 'kfzj'
+                  : val.infoList.filter(
+                      (val2) => val2.attrType == '组件类型'
+                    )[0].attrValue == '业务组件'
+                  ? 'ywzj'
+                  : 'yyzy'
+              "
+            ></div>
             <div class="right">
               <div class="ability-top">
                 <div class="name">
@@ -102,25 +122,25 @@
                     <span class="channelName">{{ val.name }}</span>
                     <span class="type">
                       {{
-                      val.type == '应用资源'
-                      ? '应用资源'
-                      : val.infoList.filter(
-                      (val2) => val2.attrType == '组件类型'
-                      )[0].attrValue == '智能算法'
-                      ? '智能算法'
-                      : val.infoList.filter(
-                      (val2) => val2.attrType == '组件类型'
-                      )[0].attrValue == '图层服务'
-                      ? '图层服务'
-                      : val.infoList.filter(
-                      (val2) => val2.attrType == '组件类型'
-                      )[0].attrValue == '开发组件'
-                      ? '开发组件'
-                      : val.infoList.filter(
-                      (val2) => val2.attrType == '组件类型'
-                      )[0].attrValue == '业务组件'
-                      ? '业务组件'
-                      : '--'
+                        val.type == '应用资源'
+                          ? '应用资源'
+                          : val.infoList.filter(
+                              (val2) => val2.attrType == '组件类型'
+                            )[0].attrValue == '智能算法'
+                          ? '智能算法'
+                          : val.infoList.filter(
+                              (val2) => val2.attrType == '组件类型'
+                            )[0].attrValue == '图层服务'
+                          ? '图层服务'
+                          : val.infoList.filter(
+                              (val2) => val2.attrType == '组件类型'
+                            )[0].attrValue == '开发组件'
+                          ? '开发组件'
+                          : val.infoList.filter(
+                              (val2) => val2.attrType == '组件类型'
+                            )[0].attrValue == '业务组件'
+                          ? '业务组件'
+                          : '--'
                       }}
                     </span>
                   </div>
@@ -132,17 +152,25 @@
                 <div class="dec">资源描述：{{ val.description }}</div>
                 <div class="result">
                   申请结果：{{
-                  item.ended ? item.approveStatus || '审核完成' : '审核中'
+                    item.ended ? item.approveStatus || '审核完成' : '审核中'
                   }}
-                  <a-button v-if="
-                    item.approveStatus === '通过' &&
-                    val.infoList.filter(
-                      (item) => item.attrType == '上传附件'
-                    )[0]
-                  " @click.stop="downloadFile(item, '附件下载')" class="DownloadAttachment">
+                  <a-button
+                    v-if="
+                      item.approveStatus === '通过' &&
+                      val.infoList.filter(
+                        (item) => item.attrType == '上传附件'
+                      )[0]
+                    "
+                    @click.stop="downloadFile(item, '附件下载')"
+                    class="DownloadAttachment"
+                  >
                     附件下载
                   </a-button>
-                  <a-button type="primary" v-if="item.approveStatus === '通过'" @click.stop="switchFunction(item)">
+                  <a-button
+                    type="primary"
+                    v-if="item.approveStatus === '通过'"
+                    @click.stop="switchFunction(item)"
+                  >
                     查看详情
                   </a-button>
                 </div>
@@ -160,31 +188,49 @@
                   <span class="type">基础设施</span>
                 </div>
                 <div>
-                  <a-button type="primary" v-if="item.approveStatus == '通过' && whoShow1.itShowXiHaiAn"
-                    @click.stop="openVideo(val)">
+                  <a-button
+                    type="primary"
+                    v-if="
+                      item.approveStatus == '通过' && whoShow1.itShowXiHaiAn
+                    "
+                    @click.stop="openVideo(val)"
+                  >
                     视频预览
                   </a-button>
-                  <div class="channelName" style="color:#ff7875" v-if="whoShow1.itShowXiHaiAn && item.ended">该流程已终止
-                  </div>
+                  <!-- <div class="channelName" style="color:#ff7875" v-if="whoShow1.itShowXiHaiAn && item.ended">该流程已终止
+                  </div> -->
                 </div>
               </div>
               <div class="ability-bottom">
                 <div class="dec2">位置：{{ val.nodeName }}</div>
                 <div class="result" v-if="item.approveStatus == '通过'">
                   申请结果：
-                  <span>列表地址：</span><span style="cursor: pointer;" @click="openView(backUrl +
-                  'resource/getApplyCameraList/' +
-                  item.instanceId)">{{
-                  backUrl +
-                  'resource/getApplyCameraList/' +
-                  item.instanceId }}</span>
+                  <span>列表地址：</span>
+                  <span
+                    style="cursor: pointer"
+                    @click="
+                      openView(
+                        backUrl +
+                          'resource/getApplyCameraList/' +
+                          item.instanceId
+                      )
+                    "
+                  >
+                    {{
+                      backUrl + 'resource/getApplyCameraList/' + item.instanceId
+                    }}
+                  </span>
                   <span>视频流地址：</span>
-                  <span style="cursor: pointer" @click="openView(backUrl +
-                  'resource/hls/getHls/?key=' +
-                  val.channelId)">{{
-                  backUrl +
-                  'resource/hls/getHls/?key=' +
-                  val.channelId}}</span>
+                  <span
+                    style="cursor: pointer"
+                    @click="
+                      openView(
+                        backUrl + 'resource/hls/getHls/?key=' + val.channelId
+                      )
+                    "
+                  >
+                    {{ backUrl + 'resource/hls/getHls/?key=' + val.channelId }}
+                  </span>
                 </div>
               </div>
             </div>
@@ -194,435 +240,488 @@
     </div>
 
     <!-- 单个预览弹窗 -->
-    <a-modal wrapClassName="single-preview-modal" v-model:visible="visible" title="视频预览" :width="960" destroyOnClose>
+    <a-modal
+      wrapClassName="single-preview-modal"
+      v-model:visible="visible"
+      title="视频预览"
+      :width="960"
+      destroyOnClose
+    >
       <template #footer></template>
       <div style="width: 100%; display: flex; justify-content: center">
-        <div style="width: 100%; height: 100%;position: relative">
+        <div style="width: 100%; height: 100%; position: relative">
           <!-- 预览视频--遮罩 -->
-          <div class="waterMark waterMark-left-top">{{userInfo.usernameShow}}</div>
-          <div class="waterMark waterMark-right-top">{{userInfo.realNameShow}}</div>
-          <div class="waterMark waterMark-left-bottom">{{userInfo.usernameShow}}</div>
-          <div class="waterMark waterMark-right-bottom">{{userInfo.realNameShow}}</div>
+          <div class="waterMark waterMark-left-top">
+            {{ userInfo.usernameShow }}
+          </div>
+          <div class="waterMark waterMark-right-top">
+            {{ userInfo.realNameShow }}
+          </div>
+          <div class="waterMark waterMark-left-bottom">
+            {{ userInfo.usernameShow }}
+          </div>
+          <div class="waterMark waterMark-right-bottom">
+            {{ userInfo.realNameShow }}
+          </div>
           <vue3VideoPlay v-bind="options" />
         </div>
       </div>
     </a-modal>
-
   </div>
 </template>
 <script setup>
-import { ref, defineProps, reactive, onMounted } from 'vue'
-import mybus from '@/myplugins/mybus'
-import { message } from 'ant-design-vue'
-import { endProcess, getApplyForm } from '@/api/personalCenter.js'
-import { useRouter } from 'vue-router'
-import {
-  getStreamByChannelCode,
-} from '@/api/videoSurveillance'
-import {
-  getUser,
-} from '@/api/home'
-const router = useRouter()
-const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
-const props = defineProps({
-  refObj: { type: Object, default: null },
-})
-const whoShow1 = ref(whoShow)
-let visible = ref(false)
-const options = reactive({
-  width: '912px', //播放器宽度
-  height: '513px', //播放器高度
-  color: '#409eff', //主题色
-  title: '', //视频名称
-  src: '', //视频源
-  type: 'm3u8', // 视频源类型
-  muted: false, //静音
-  webFullScreen: false,
-  speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-  autoPlay: true, //自动播放
-  loop: false, //循环播放
-  mirror: false, //镜像画面
-  ligthOff: false, //关灯模式
-  volume: 0.3, //默认音量大小
-  control: true, //是否显示控制
-  controlBtns: [
-    'audioTrack',
-    'quality',
-    'speedRate',
-    'volume',
-    'setting',
-    'pip',
-    'pageFullScreen',
-    'fullScreen',
-  ], //显示所有按钮,
-})
+  import { ref, defineProps, reactive, onMounted } from 'vue'
+  import mybus from '@/myplugins/mybus'
+  import { message } from 'ant-design-vue'
+  import { endProcess, getApplyForm } from '@/api/personalCenter.js'
+  import { useRouter } from 'vue-router'
+  import { getStreamByChannelCode } from '@/api/videoSurveillance'
+  import { getUser } from '@/api/home'
+  const router = useRouter()
+  const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
+  const props = defineProps({
+    refObj: { type: Object, default: null },
+  })
+  const whoShow1 = ref(whoShow)
+  let visible = ref(false)
+  const options = reactive({
+    width: '912px', //播放器宽度
+    height: '513px', //播放器高度
+    color: '#409eff', //主题色
+    title: '', //视频名称
+    src: '', //视频源
+    type: 'm3u8', // 视频源类型
+    muted: false, //静音
+    webFullScreen: false,
+    speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
+    autoPlay: true, //自动播放
+    loop: false, //循环播放
+    mirror: false, //镜像画面
+    ligthOff: false, //关灯模式
+    volume: 0.3, //默认音量大小
+    control: true, //是否显示控制
+    controlBtns: [
+      'audioTrack',
+      'quality',
+      'speedRate',
+      'volume',
+      'setting',
+      'pip',
+      'pageFullScreen',
+      'fullScreen',
+    ], //显示所有按钮,
+  })
 
-const dept = reactive({})
-// eslint-disable-next-line no-undef
-if (infrastructure) {
+  const dept = reactive({})
   // eslint-disable-next-line no-undef
-  dept.deptId = infrastructure.deptId
-  // eslint-disable-next-line no-undef
-  dept.deptName = infrastructure.deptName
-}
-const showThis = () => {
-  window.open(
-    window.SITE_CONFIG.previewUrl +
-    'hisense_office/onlinePreview?url=' +
-    btoa(encodeURI(props.refObj.enclosure))
-  )
-}
-const showArr = ref([])
-console.log(props.refObj, '=====================================')
-const endThis = (instanceId) => {
-  endProcess({ instanceId: instanceId }).then((res) => {
-    if (res.data.code == 0) {
-      message.success('撤回申请成功！')
-      mybus.emit('closeModal', { type: '能力申请', index: 0 })
-    } else {
-      message.warning('撤回申请失败！')
-    }
-  })
-}
-const modify = (id, item) => {
-  getApplyForm(id).then((res) => {
-    console.log('修改==============>', res.data.data, item)
-    if (item.list.length > 0) {
-      let arr = []
-      item.list.map((val) => {
-        arr.push({
-          delFlag: val.delFlag,
-          description: val.description,
-          resourceId: val.id,
-          resourceName: val.name,
-          time: val.createDate,
-          type: val.type,
-          componentType:
-            (val.infoList.filter((val) => val.attrType == '组件类型')[0] &&
-              val.infoList.filter((val) => val.attrType == '组件类型')[0]
-                .attrValue) ||
-            '',
-        })
-      })
-      localStorage.setItem(
-        'applyList',
-        JSON.stringify([
-          {
-            arr: arr,
-            deptId: item.name,
-            deptName: item.name,
-          },
-        ])
-      )
-      router.push({
-        path: '/apply',
-        query: {
-          id: id,
-          taskId: item.instanceId,
-        },
-      })
-    } else if (item.list2.length > 0) {
-      let arr = [
-        {
-          arr: [
-            {
-              description: '',
-              note1: JSON.stringify(item.list2),
-              resourceId: '1522550195055828996',
-              resourceName: '摄像头列表',
-              type: '基础设施',
-            },
-          ],
-          deptId: dept.deptId,
-          deptName: dept.deptName,
-        },
-      ]
-      localStorage.setItem('applyList', JSON.stringify(arr))
-      router.push({
-        path: '/apply',
-        query: {
-          id: id,
-          taskId: item.instanceId,
-        },
-      })
-    }
-  })
-}
-if (props.refObj.resourceApplication) {
-  showArr.value = []
-  for (const key in props.refObj.resourceApplication) {
-    if (props.refObj.resourceApplication[key].length > 0) {
-      let obj = { name: '', instanceId: '', list: [], list2: [] }
-      obj.name = key
-      props.refObj.resourceApplication[key].map((item) => {
-        obj.instanceId = item.instanceId
-        obj.backToFirst = item.backToFirst
-        obj.ended = item.ended
-        obj.approveStatus = item.approveStatus
-        if (item.resources.length > 0) {
-          item.resources.map((val) => {
-            obj.list.push(val)
-          })
-        } else {
-          item.camera.map((val) => {
-            obj.list2.push(val)
-          })
-        }
-      })
-      showArr.value.push(obj)
-    }
+  if (infrastructure) {
+    // eslint-disable-next-line no-undef
+    dept.deptId = infrastructure.deptId
+    // eslint-disable-next-line no-undef
+    dept.deptName = infrastructure.deptName
   }
-}
-const switchFunction = (data) => {
-  if (data.approveStatus === '通过') {
-    let id = data.list[0].id
-    const applypage = router.resolve({
-      path: '/details', // 跳转的页面路由
-      query: {
-        id: id,
-      },
-    })
-    window.open(applypage.href, '_blank')
+  const showThis = () => {
+    window.open(
+      window.SITE_CONFIG.previewUrl +
+        'hisense_office/onlinePreview?url=' +
+        btoa(encodeURI(props.refObj.enclosure))
+    )
   }
-}
-const downloadFile = (data, name) => {
-  let path = data.list[0].infoList.filter(
-    (item) => item.attrType === '上传附件'
-  )[0].attrValue
-  console.log(path, 'obj')
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', path)
-  xhr.responseType = 'blob'
-  xhr.send()
-  xhr.onload = function () {
-    if (this.status === 200 || this.status === 304) {
-      // 如果是IE10及以上，不支持download属性，采用msSaveOrOpenBlob方法，但是IE10以下也不支持msSaveOrOpenBlob
-      if ('msSaveOrOpenBlob' in navigator) {
-        navigator.msSaveOrOpenBlob(this.response, name)
-        return
+  const showArr = ref([])
+  console.log(props.refObj, '=====================================')
+  const endThis = (instanceId) => {
+    endProcess({ instanceId: instanceId }).then((res) => {
+      if (res.data.code == 0) {
+        message.success('撤回申请成功！')
+        mybus.emit('closeModal', { type: '能力申请', index: 0 })
+      } else {
+        message.warning('撤回申请失败！')
+      }
+    })
+  }
+  const modify = (id, item) => {
+    getApplyForm(id).then((res) => {
+      console.log('修改==============>', res.data.data, item)
+      if (item.list.length > 0) {
+        let arr = []
+        item.list.map((val) => {
+          arr.push({
+            delFlag: val.delFlag,
+            description: val.description,
+            resourceId: val.id,
+            resourceName: val.name,
+            time: val.createDate,
+            type: val.type,
+            componentType:
+              (val.infoList.filter((val) => val.attrType == '组件类型')[0] &&
+                val.infoList.filter((val) => val.attrType == '组件类型')[0]
+                  .attrValue) ||
+              '',
+          })
+        })
+        localStorage.setItem(
+          'applyList',
+          JSON.stringify([
+            {
+              arr: arr,
+              deptId: item.name,
+              deptName: item.name,
+            },
+          ])
+        )
+        router.push({
+          path: '/apply',
+          query: {
+            id: id,
+            taskId: item.instanceId,
+          },
+        })
+      } else if (item.list2.length > 0) {
+        let arr = [
+          {
+            arr: [
+              {
+                description: '',
+                note1: JSON.stringify(item.list2),
+                resourceId: '1522550195055828996',
+                resourceName: '摄像头列表',
+                type: '基础设施',
+              },
+            ],
+            deptId: dept.deptId,
+            deptName: dept.deptName,
+          },
+        ]
+        localStorage.setItem('applyList', JSON.stringify(arr))
+        router.push({
+          path: '/apply',
+          query: {
+            id: id,
+            taskId: item.instanceId,
+          },
+        })
+      }
+    })
+  }
+  if (props.refObj.resourceApplication) {
+    showArr.value = []
+    for (const key in props.refObj.resourceApplication) {
+      if (props.refObj.resourceApplication[key].length > 0) {
+        let obj = { name: '', instanceId: '', list: [], list2: [] }
+        obj.name = key
+        props.refObj.resourceApplication[key].map((item) => {
+          obj.instanceId = item.instanceId
+          obj.backToFirst = item.backToFirst
+          obj.ended = item.ended
+          obj.approveStatus = item.approveStatus
+          if (item.resources.length > 0) {
+            item.resources.map((val) => {
+              obj.list.push(val)
+            })
+          } else {
+            item.camera.map((val) => {
+              obj.list2.push(val)
+            })
+          }
+        })
+        showArr.value.push(obj)
       }
-      // const blob = new Blob([this.response], { type: xhr.getResponseHeader('Content-Type') });
-      // const url = URL.createObjectURL(blob);
-      const url = URL.createObjectURL(this.response)
-      const a = document.createElement('a')
-      a.style.display = 'none'
-      a.href = url
-      a.download = name
-      document.body.appendChild(a)
-      a.click()
-      document.body.removeChild(a)
-      URL.revokeObjectURL(url)
     }
   }
-}
-
-// 视频预览
-const openVideo = (item) => {
-  console.log('打开视频', item)
-  if (item && item.status != 1) {
-    return message.error('当前视频离线不可预览!')
-  }
-  const param = {
-    key: item.cameraId,
-  }
-  getStreamByChannelCode(param).then((res) => {
-    console.log('视频预览------------>', res);
-    console.log(res)
-    visible.value = true
-    options.src = res.data.data || ''
-  }).catch(err => {
-    message.error(err)
-  })
-  // 视频测试--勿删
-  // visible.value = true
-  // options.src = 'http://playertest.longtailvideo.com/adaptive/bipbop/gear4/prog_index.m3u8'
-}
-
-onMounted(() => {
-  handleUser()
-})
-
-// 获取用户信息
-const userInfo = ref(null)
-const handleUser = () => {
-  getUser().then(res => {
-    console.log('res-----获取用户信息------->', res);
-    if (res.data.code != 0) {
-      return message.warning(res.data.msg)
+  const switchFunction = (data) => {
+    if (data.approveStatus === '通过') {
+      let id = data.list[0].id
+      const applypage = router.resolve({
+        path: '/details', // 跳转的页面路由
+        query: {
+          id: id,
+        },
+      })
+      window.open(applypage.href, '_blank')
     }
-    userInfo.value = res.data.data || {}
-    userInfo.value.usernameShow = '西海岸能力超市' + (userInfo.value.deptName || '') + (userInfo.value.username || '');
-    userInfo.value.realNameShow = '西海岸能力超市' + (userInfo.value.deptName || '') + (userInfo.value.realName || '');
-  }).catch(err => {
-    message.warning(err)
+  }
+  const downloadFile = (data, name) => {
+    let path = data.list[0].infoList.filter(
+      (item) => item.attrType === '上传附件'
+    )[0].attrValue
+    console.log(path, 'obj')
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', path)
+    xhr.responseType = 'blob'
+    xhr.send()
+    xhr.onload = function () {
+      if (this.status === 200 || this.status === 304) {
+        // 如果是IE10及以上，不支持download属性，采用msSaveOrOpenBlob方法，但是IE10以下也不支持msSaveOrOpenBlob
+        if ('msSaveOrOpenBlob' in navigator) {
+          navigator.msSaveOrOpenBlob(this.response, name)
+          return
+        }
+        // const blob = new Blob([this.response], { type: xhr.getResponseHeader('Content-Type') });
+        // const url = URL.createObjectURL(blob);
+        const url = URL.createObjectURL(this.response)
+        const a = document.createElement('a')
+        a.style.display = 'none'
+        a.href = url
+        a.download = name
+        document.body.appendChild(a)
+        a.click()
+        document.body.removeChild(a)
+        URL.revokeObjectURL(url)
+      }
+    }
+  }
+
+  // 视频预览
+  const openVideo = (item) => {
+    console.log('打开视频', item)
+    if (item && item.status != 1) {
+      return message.error('当前视频离线不可预览!')
+    }
+    const param = {
+      key: item.cameraId,
+    }
+    getStreamByChannelCode(param)
+      .then((res) => {
+        console.log('视频预览------------>', res)
+        console.log(res)
+        visible.value = true
+        options.src = res.data.data || ''
+      })
+      .catch((err) => {
+        message.error(err)
+      })
+    // 视频测试--勿删
+    // visible.value = true
+    // options.src = 'http://playertest.longtailvideo.com/adaptive/bipbop/gear4/prog_index.m3u8'
+  }
+
+  onMounted(() => {
+    handleUser()
   })
-}
 
-const openView = (url) => {
-  window.open(url, '_blank')
-}
+  // 获取用户信息
+  const userInfo = ref(null)
+  const handleUser = () => {
+    getUser()
+      .then((res) => {
+        console.log('res-----获取用户信息------->', res)
+        if (res.data.code != 0) {
+          return message.warning(res.data.msg)
+        }
+        userInfo.value = res.data.data || {}
+        userInfo.value.usernameShow =
+          '西海岸能力超市' +
+          (userInfo.value.deptName || '') +
+          (userInfo.value.username || '')
+        userInfo.value.realNameShow =
+          '西海岸能力超市' +
+          (userInfo.value.deptName || '') +
+          (userInfo.value.realName || '')
+      })
+      .catch((err) => {
+        message.warning(err)
+      })
+  }
 
+  const openView = (url) => {
+    window.open(url, '_blank')
+  }
 </script>
 
 <style lang="less" scoped>
-.aaa{
-  margin-right: 30px;
-}
- :deep(.ant-popover-inner) {
-    position: fixed !important;
-  
-    margin-right: 100px;
-  
-    
-    
+  .aaa {
+    margin-right: 30px;
   }
-.title {
-  font-size: 0.18rem;
-  color: #000;
-  font-weight: bold;
-  margin-bottom: 0.2rem;
-  padding-left: 0.1rem;
-  border-left: 0.06rem #0058e1 solid;
-}
+  :deep(.ant-popover-inner) {
+    position: fixed !important;
 
-.top {
-  margin-bottom: 0.1rem;
+    margin-right: 100px;
+  }
+  .title {
+    font-size: 0.18rem;
+    color: #000;
+    font-weight: bold;
+    margin-bottom: 0.2rem;
+    padding-left: 0.1rem;
+    border-left: 0.06rem #0058e1 solid;
+  }
 
-  .main {
-    background: #eee;
-    padding: 0.2rem 0.2rem 0.1rem;
+  .top {
+    margin-bottom: 0.1rem;
 
-    p {
-      display: flex;
-      justify-content: space-between;
+    .main {
+      background: #eee;
+      padding: 0.2rem 0.2rem 0.1rem;
 
-      &>span {
-        width: 100%;
-      }
-
-      .enclosure {
-        width: 95%;
-        padding: 0.05rem 0.1rem;
-        background: #ddd;
+      p {
         display: flex;
         justify-content: space-between;
-        margin-top: 0.05rem;
-      }
 
-      .btn:hover {
-        color: #0058e1;
-        cursor: pointer;
-      }
-    }
+        & > span {
+          width: 100%;
+        }
 
-    .item {
-      span {
-        width: 2.5rem;
-      }
-    }
-  }
-}
+        .enclosure {
+          width: 95%;
+          padding: 0.05rem 0.1rem;
+          background: #ddd;
+          display: flex;
+          justify-content: space-between;
+          margin-top: 0.05rem;
+        }
 
-.bottom {
-  .main {
-    .item {
-      border-top: 1px #eee solid;
-
-      .deptName {
-        color: #0058e1;
-        font-size: 0.16rem;
-        margin-top: 0.1rem;
-        display: flex;
-        align-items: center;
-
-        .img {
-          width: 0.05rem;
-          height: 0.05rem;
-          border-radius: 0.05rem;
-          background: #0058e1;
-          margin-right: 0.1rem;
+        .btn:hover {
+          color: #0058e1;
+          cursor: pointer;
         }
       }
 
-      .oddNumbers {
-        margin: 0.1rem 0 0 0.15rem;
+      .item {
+        span {
+          width: 2.5rem;
+        }
       }
+    }
+  }
 
-      .box {
-        margin-left: 0.1rem;
+  .bottom {
+    .main {
+      .item {
+        border-top: 1px #eee solid;
 
-        .ability {
-          height: 1.6rem;
+        .deptName {
+          color: #0058e1;
+          font-size: 0.16rem;
+          margin-top: 0.1rem;
           display: flex;
-          border-bottom: 1px #eee solid;
-          padding: 0.1rem 0;
+          align-items: center;
 
-          .left {
-            display: inline-block;
-            width: 1.1rem;
-            height: 1.1rem;
-            margin-left: 0.1rem;
-            background: url('~@/assets/home/sxt_square.png') no-repeat;
-            background-size: 100%;
+          .img {
+            width: 0.05rem;
+            height: 0.05rem;
+            border-radius: 0.05rem;
+            background: #0058e1;
+            margin-right: 0.1rem;
           }
+        }
 
-          .sxt {
-            background: url('~@/assets/home/sxt_square.png') no-repeat;
-            background-size: 100%;
-          }
+        .oddNumbers {
+          margin: 0.1rem 0 0 0.15rem;
+        }
 
-          .yyzy {
-            background: url('~@/assets/home/yyzy_square.png') no-repeat;
-            background-size: 100%;
-          }
+        .box {
+          margin-left: 0.1rem;
 
-          .znsf {
-            background: url('~@/assets/home/znsf_square.png') no-repeat;
-            background-size: 100%;
-          }
+          .ability {
+            height: 1.6rem;
+            display: flex;
+            border-bottom: 1px #eee solid;
+            padding: 0.1rem 0;
 
-          .tcfw {
-            background: url('~@/assets/home/tcfw_square.png') no-repeat;
-            background-size: 100%;
-          }
+            .left {
+              display: inline-block;
+              width: 1.1rem;
+              height: 1.1rem;
+              margin-left: 0.1rem;
+              background: url('~@/assets/home/sxt_square.png') no-repeat;
+              background-size: 100%;
+            }
 
-          .kfzj {
-            background: url('~@/assets/home/kfzj_square.png') no-repeat;
-            background-size: 100%;
-          }
+            .sxt {
+              background: url('~@/assets/home/sxt_square.png') no-repeat;
+              background-size: 100%;
+            }
 
-          .ywzj {
-            background: url('~@/assets/home/ywzj_square.png') no-repeat;
-            background-size: 100%;
-          }
+            .yyzy {
+              background: url('~@/assets/home/yyzy_square.png') no-repeat;
+              background-size: 100%;
+            }
 
-          .btn {
-            cursor: pointer;
-            color: #0087ff;
-            align-self: flex-end;
-            padding: 5px 10px;
-            border: 1px #0087ff solid;
-            border-radius: 0.2rem;
-          }
+            .znsf {
+              background: url('~@/assets/home/znsf_square.png') no-repeat;
+              background-size: 100%;
+            }
 
-          .right {
-            flex: 1;
-            margin-left: 0.15rem;
+            .tcfw {
+              background: url('~@/assets/home/tcfw_square.png') no-repeat;
+              background-size: 100%;
+            }
 
-            .ability-top {
-              width: 100%;
-              display: flex;
-              justify-content: space-between;
-              align-items: center;
+            .kfzj {
+              background: url('~@/assets/home/kfzj_square.png') no-repeat;
+              background-size: 100%;
+            }
 
-              .name {
-                width: 6rem;
-                height: 0.2rem;
+            .ywzj {
+              background: url('~@/assets/home/ywzj_square.png') no-repeat;
+              background-size: 100%;
+            }
+
+            .btn {
+              cursor: pointer;
+              color: #0087ff;
+              align-self: flex-end;
+              padding: 5px 10px;
+              border: 1px #0087ff solid;
+              border-radius: 0.2rem;
+            }
+
+            .right {
+              flex: 1;
+              margin-left: 0.15rem;
+
+              .ability-top {
+                width: 100%;
                 display: flex;
+                justify-content: space-between;
+                align-items: center;
 
-                .channelName {
-                  max-width: 5rem;
+                .name {
+                  width: 6rem;
                   height: 0.2rem;
+                  display: flex;
+
+                  .channelName {
+                    max-width: 5rem;
+                    height: 0.2rem;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    display: -webkit-box;
+                    -webkit-line-clamp: 1;
+                    -webkit-box-orient: vertical;
+                    word-break: break-all;
+                  }
+
+                  .type {
+                    background: #0087ff;
+                    color: #fff;
+                    line-height: 14px;
+                    padding: 2px 10px;
+                    border-radius: 10px;
+                    margin-left: 0.1rem;
+                  }
+                }
+              }
+
+              .ability-bottom {
+                margin-top: 0.15rem;
+
+                // display: flex;
+                // justify-content: space-between;
+                .dec {
+                  width: 7rem;
+                  height: 0.44rem;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  display: -webkit-box;
+                  -webkit-line-clamp: 2;
+                  -webkit-box-orient: vertical;
+                  word-break: break-all;
+                }
+
+                .dec2 {
+                  width: 7rem;
+                  height: 0.22rem;
                   overflow: hidden;
                   text-overflow: ellipsis;
                   display: -webkit-box;
@@ -631,130 +730,90 @@ const openView = (url) => {
                   word-break: break-all;
                 }
 
-                .type {
-                  background: #0087ff;
-                  color: #fff;
-                  line-height: 14px;
-                  padding: 2px 10px;
-                  border-radius: 10px;
-                  margin-left: 0.1rem;
+                // .result:hover {
+                //   color: #0058e1;
+                //   cursor: pointer;
+                // }
+                .result {
+                  position: relative;
                 }
               }
             }
 
-            .ability-bottom {
-              margin-top: 0.15rem;
+            .DownloadAttachment {
+              position: absolute;
+              right: 10px;
+              top: -150px;
+            }
 
-              // display: flex;
-              // justify-content: space-between;
-              .dec {
-                width: 7rem;
-                height: 0.44rem;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                display: -webkit-box;
-                -webkit-line-clamp: 2;
-                -webkit-box-orient: vertical;
-                word-break: break-all;
-              }
-
-              .dec2 {
-                width: 7rem;
-                height: 0.22rem;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                display: -webkit-box;
-                -webkit-line-clamp: 1;
-                -webkit-box-orient: vertical;
-                word-break: break-all;
-              }
-
-              // .result:hover {
-              //   color: #0058e1;
-              //   cursor: pointer;
-              // }
-              .result {
-                position: relative;
-              }
+            .DownloadAttachment2 {
+              position: absolute;
+              right: 10px;
+              top: -110px;
             }
           }
 
-          .DownloadAttachment {
-            position: absolute;
-            right: 10px;
-            top: -150px;
+          .clickCursor {
+            cursor: pointer;
           }
-
-          .DownloadAttachment2 {
-            position: absolute;
-            right: 10px;
-            top: -110px;
-          }
-        }
-
-        .clickCursor {
-          cursor: pointer;
         }
       }
     }
   }
-}
 
-.single-preview-modal {
-  .ant-modal-header {
-    background: url(~@/assets/home/video-background.png) no-repeat;
-    background-size: cover;
+  .single-preview-modal {
+    .ant-modal-header {
+      background: url(~@/assets/home/video-background.png) no-repeat;
+      background-size: cover;
+    }
+
+    .ant-modal-title {
+      font-size: 0.16rem;
+      font-weight: 500;
+      color: #ffffff;
+    }
+
+    .anticon {
+      color: #ffffff;
+    }
   }
 
-  .ant-modal-title {
-    font-size: 0.16rem;
-    font-weight: 500;
-    color: #ffffff;
+  // 左上
+  .waterMark-left-top {
+    left: 50px;
+    top: 100px;
+    text-align: left;
   }
 
-  .anticon {
-    color: #ffffff;
+  // 右上
+  .waterMark-right-top {
+    right: 50px;
+    top: 100px;
+    text-align: right;
   }
-}
 
+  // 左下
+  .waterMark-left-bottom {
+    left: 50px;
+    bottom: 100px;
+    text-align: left;
+  }
 
-// 左上
-.waterMark-left-top {
-  left: 50px;
-  top: 100px;
-  text-align: left;
-}
+  // 右下
+  .waterMark-right-bottom {
+    right: 50px;
+    bottom: 100px;
+    text-align: right;
+  }
 
-// 右上
-.waterMark-right-top {
-  right: 50px;
-  top: 100px;
-  text-align: right;
-}
-
-// 左下
-.waterMark-left-bottom {
-  left: 50px;
-  bottom: 100px;
-  text-align: left;
-}
-
-// 右下
-.waterMark-right-bottom {
-  right: 50px;
-  bottom: 100px;
-  text-align: right;
-}
-
-.waterMark {
-  position: absolute;
-  z-index: 99999999;
-  color: #0058e1;
-  font-size: 22px;
-  font-weight: bold;
-  opacity: 0.4;
-  transform: rotate(-25deg);
-  width: 470px;
-
-}
+  .waterMark {
+    position: absolute;
+    z-index: 99999999;
+    color: #0058e1;
+    font-size: 22px;
+    font-weight: bold;
+    opacity: 0.4;
+    transform: rotate(-25deg);
+    width: 470px;
+  }
 </style>

From f837060104681eb6bfff6f638f363949d3af42e9 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 27 Oct 2022 17:39:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/myAgent/demo/competency-application.vue  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 @@
       </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,

From fbcd40f2a6b433861ac2adec6a35302c942eee5e Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 27 Oct 2022 18:05:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/apply.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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"
                   >
                     <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')
-        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)