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

测试问题修复
2022-10-27 15:48:26 +08:00 · 2022-10-27 15:48:24 +08:00
4 changed files with 640 additions and 557 deletions
--- 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
+  )
 }
--- 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,
--- 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,9 +85,15 @@
        </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="
+          <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(
@ -94,7 +113,8 @@
                    )[0].attrValue == '业务组件'
                  ? 'ywzj'
                  : 'yyzy'
-            "></div>
+              "
+            ></div>
            <div class="right">
              <div class="ability-top">
                <div class="name">
@ -134,15 +154,23 @@
                  申请结果：{{
                    item.ended ? item.approveStatus || '审核完成' : '审核中'
                  }}
-                  <a-button v-if="
+                  <a-button
+                    v-if="
                      item.approveStatus === '通过' &&
                      val.infoList.filter(
                        (item) => item.attrType == '上传附件'
                      )[0]
-                  " @click.stop="downloadFile(item, '附件下载')" class="DownloadAttachment">
+                    "
+                    @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)">{{
+                  <span>列表地址：</span>
+                  <span
+                    style="cursor: pointer"
+                    @click="
+                      openView(
                        backUrl +
                          'resource/getApplyCameraList/' +
-                  item.instanceId }}</span>
+                          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,20 +240,33 @@
    </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 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>
@ -216,12 +275,8 @@ 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'
+  import { getStreamByChannelCode } from '@/api/videoSurveillance'
+  import { getUser } from '@/api/home'
  const router = useRouter()
  const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
  const props = defineProps({
@ -425,12 +480,14 @@ const openVideo = (item) => {
    const param = {
      key: item.cameraId,
    }
-  getStreamByChannelCode(param).then((res) => {
-    console.log('视频预览------------>', res);
+    getStreamByChannelCode(param)
+      .then((res) => {
+        console.log('视频预览------------>', res)
        console.log(res)
        visible.value = true
        options.src = res.data.data || ''
-  }).catch(err => {
+      })
+      .catch((err) => {
        message.error(err)
      })
    // 视频测试--勿删
@ -445,15 +502,23 @@ onMounted(() => {
  // 获取用户信息
  const userInfo = ref(null)
  const handleUser = () => {
-  getUser().then(res => {
-    console.log('res-----获取用户信息------->', res);
+    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 => {
+        userInfo.value.usernameShow =
+          '西海岸能力超市' +
+          (userInfo.value.deptName || '') +
+          (userInfo.value.username || '')
+        userInfo.value.realNameShow =
+          '西海岸能力超市' +
+          (userInfo.value.deptName || '') +
+          (userInfo.value.realName || '')
+      })
+      .catch((err) => {
        message.warning(err)
      })
  }
@ -461,7 +526,6 @@ const handleUser = () => {
  const openView = (url) => {
    window.open(url, '_blank')
  }
-
 </script>

 <style lang="less" scoped>
@ -472,9 +536,6 @@ const openView = (url) => {
    position: fixed !important;

    margin-right: 100px;
-  
-    
-    
  }
  .title {
    font-size: 0.18rem;
@ -717,7 +778,6 @@ const openView = (url) => {
    }
  }

-
  // 左上
  .waterMark-left-top {
    left: 50px;
@ -755,6 +815,5 @@ const openView = (url) => {
    opacity: 0.4;
    transform: rotate(-25deg);
    width: 470px;
-
  }
 </style>
Author	SHA1	Message	Date
wuhongjian	9a2c2c07d1	Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-10-27 15:48:26 +08:00
wuhongjian	09d56091fa	测试问题修复	2022-10-27 15:48:24 +08:00