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

bug修复
2022-08-09 17:10:48 +08:00 · 2022-08-09 17:09:58 +08:00
10 changed files with 193 additions and 82 deletions
--- a/front/public/index.html
+++ b/front/public/index.html
@ -48,18 +48,18 @@
    // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin';
    // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
    // 西海岸版本
-    // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
-    // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
+    window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
+    window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
+    window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
    // 开发
    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
-    window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
-    window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin';
-    window.SITE_CONFIG['websocketURL'] = '192.168.124.236:8888/renren-admin';
-    window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
+    // window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
+    // window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin';
+    // window.SITE_CONFIG['websocketURL'] = '192.168.124.236:8888/renren-admin';
+    // window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
    // 穿透版本
    // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
    // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@ -1,13 +1,13 @@
 /*
 * @Author: hisense.wuhongjian
 * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-08-09 15:29:14
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-08-06 10:43:53
 * @Description: 数据资源参数配置
 */
 const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-// const newLocation = 'xihaian'
+//const newLocation = 'xihaian'

 // 数据资源数据
 const whoShow = {}
--- a/front/src/assets/home/video-background.png
+++ b/front/src/assets/home/video-background.png
--- a/front/src/assets/newHome/ucs-1.png
+++ b/front/src/assets/newHome/ucs-1.png
--- a/front/src/assets/newHome/ucs-2.png
+++ b/front/src/assets/newHome/ucs-2.png
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-08 11:56:28
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-19 15:04:02
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-08-09 11:54:40
 * @Description: 算法详情页头部
 -->
 <template>
@ -54,7 +54,15 @@
          <template #icon><form-outlined /></template>
          申请使用
        </a-button>
-        <a-button type="primary" @click="addShoppingCart()">
+        <a-button
+          type="primary"
+          @click="addShoppingCart()"
+          v-show="
+            props.dataList.infoList.filter(
+              (val) => val.attrType == '外部服务地址'
+            ).length === 0
+          "
+        >
          <template #icon><shopping-cart-outlined /></template>
          加入申购车
        </a-button>
@ -105,30 +113,37 @@
  // 立即申请
  function toView() {
    // window.open(newpage.href, '_blank')
-    console.log('一键申请===================>', props.dataList)
-    localStorage.setItem(
-      'applyList',
-      JSON.stringify([
-        {
-          arr: [
-            {
-              delFlag: props.dataList.delFlag,
-              description: props.dataList.description,
-              resourceId: props.dataList.id,
-              resourceName: props.dataList.name,
-              time: props.dataList.createDate,
-              type: props.dataList.type,
-              componentType: '图层服务',
-            },
-          ],
-          deptId: props.dataList.deptId,
-          deptName: props.dataList.deptName,
-        },
-      ])
-    )
-    router.push({
-      path: '/apply',
-    })
+    const webUrl = props.dataList.infoList.filter(
+      (val) => val.attrType == '外部服务地址'
+    )[0]?.attrValue
+    if (webUrl) {
+      window.open(webUrl)
+    } else {
+      console.log('一键申请===================>', props.dataList)
+      localStorage.setItem(
+        'applyList',
+        JSON.stringify([
+          {
+            arr: [
+              {
+                delFlag: props.dataList.delFlag,
+                description: props.dataList.description,
+                resourceId: props.dataList.id,
+                resourceName: props.dataList.name,
+                time: props.dataList.createDate,
+                type: props.dataList.type,
+                componentType: '图层服务',
+              },
+            ],
+            deptId: props.dataList.deptId,
+            deptName: props.dataList.deptName,
+          },
+        ])
+      )
+      router.push({
+        path: '/apply',
+      })
+    }
  }
  // 收藏
  const scFlag2 = ref(true)
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@ -9,7 +9,10 @@
    <div class="name">
      <div class="name-bg" v-if="!whoShow1.itShowXiHaiAn"></div>
      <div class="name-bg-xihaian" v-else></div>
-      城市云脑通用能力服务平台
+      <div class="name-content">
+        <p>城市云脑通用能力服务平台</p>
+        <p>(United Capacity System)</p>
+      </div>
    </div>
    <div
      v-for="item in navList"
@ -360,7 +363,7 @@
      .name-bg {
        height: 0.6rem;
        width: 0.6rem;
-        background: url('~@/assets/newHome/newHome-title-bg.png') no-repeat;
+        background: url('~@/assets/newHome/ucs-2.png') no-repeat;
        background-size: 100%;
        margin-right: 0.15rem;
      }
@ -372,6 +375,16 @@
        background-size: 100%;
        margin-right: 0.15rem;
      }
+      .name-content {
+        padding-top: 0.14rem;
+        p {
+          font-size: 0.2rem;
+          margin-bottom: 0;
+          &:nth-of-type(2) {
+            font-size: 0.12rem;
+          }
+        }
+      }
    }
    .nav {
      width: 1.2rem;
@ -432,6 +445,16 @@
    box-shadow: 0 0.02rem 0.1rem rgba(0, 0, 0, 0.1);
    .name {
      color: #0058e1;
+      .name-bg {
+        height: 0.6rem;
+        width: 0.6rem;
+        background: url('~@/assets/newHome/ucs-1.png') no-repeat;
+        background-size: 100%;
+        margin-right: 0.15rem;
+      }
+      p {
+        color: #0058e1;
+      }
    }
    .icon {
      cursor: pointer;
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@ -321,10 +321,14 @@
            </div> -->
            </div>
            <div class="right" v-if="selectCardsname !== '基础设施'">
+              <!-- 申购车 -->
              <div class="shopping" :key="shoppingKey">
                <template
                  v-if="
-                    selectCardsname == '组件服务' ||
+                    (selectCardsname == '组件服务' &&
+                      item.infoList.filter(
+                        (val) => val.attrType == '外部服务地址'
+                      ).length === 0) ||
                    (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
                  "
                >
@ -649,37 +653,46 @@
          })
        } else {
          if (type === 'apply') {
-            console.log('一键申请===================>', item)
-            localStorage.setItem(
-              'applyList',
-              JSON.stringify([
-                {
-                  arr: [
-                    {
-                      delFlag: item.delFlag,
-                      description: item.description,
-                      resourceId: item.id,
-                      resourceName: item.name,
-                      time: item.createDate,
-                      type: item.type,
-                      componentType:
-                        (item.infoList.filter(
-                          (val) => val.attrType == '组件类型'
-                        )[0] &&
-                          item.infoList.filter(
+            // 外部服务地址跳转到外部
+            const webUrl = item.infoList.filter(
+              (val) => val.attrType == '外部服务地址'
+            )[0]?.attrValue
+            if (webUrl) {
+              window.open(webUrl)
+            } else {
+              // 内部跳转申请页面
+              console.log('一键申请===================>', item)
+              localStorage.setItem(
+                'applyList',
+                JSON.stringify([
+                  {
+                    arr: [
+                      {
+                        delFlag: item.delFlag,
+                        description: item.description,
+                        resourceId: item.id,
+                        resourceName: item.name,
+                        time: item.createDate,
+                        type: item.type,
+                        componentType:
+                          (item.infoList.filter(
                            (val) => val.attrType == '组件类型'
-                          )[0].attrValue) ||
-                        '',
-                    },
-                  ],
-                  deptId: item.deptId,
-                  deptName: item.deptName,
-                },
-              ])
-            )
-            router.push({
-              path: '/apply',
-            })
+                          )[0] &&
+                            item.infoList.filter(
+                              (val) => val.attrType == '组件类型'
+                            )[0].attrValue) ||
+                          '',
+                      },
+                    ],
+                    deptId: item.deptId,
+                    deptName: item.deptName,
+                  },
+                ])
+              )
+              router.push({
+                path: '/apply',
+              })
+            }
          } else {
            console.log(
              '111111111111111111===========>',
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@ -149,9 +149,10 @@
    </div>
    <!-- 单个预览弹窗 -->
    <a-modal
+      wrapClassName="single-preview-modal"
      v-model:visible="visible"
      title="视频预览"
-      :width="950"
+      :width="960"
      destroyOnClose
    >
      <template #footer></template>
@ -166,7 +167,7 @@
      wrapClassName="batch-preview-modal"
      v-model:visible="batchVisible"
      title="视频批量预览"
-      :width="1250"
+      :width="1060"
      destroyOnClose
      @cancel="videoClean"
    >
@ -177,9 +178,18 @@
          :key="item.id"
          style="width: 100%; height: 100%"
        >
+          <p></p>
          <vue3VideoPlay v-bind="item.options" />
        </div>
      </div>
+      <a-pagination
+        v-model:current="current"
+        :total="videoTotal"
+        defaultPageSize="4"
+        :showSizeChanger="false"
+        @change="batchPreview"
+        show-less-items
+      />
    </a-modal>
    <a-modal
      wrapClassName="wrj"
@ -255,11 +265,13 @@
  import { getCameraByCondition } from '@/api/file'
  import { sgcInsert } from '@/api/home'
  import mybus from '@/myplugins/mybus'
+  const current = ref(1)
+  const videoTotal = ref(0)
  const router = useRouter()
  const whoShow1 = ref(whoShow)
  const options = reactive({
-    width: '900px', //播放器宽度
-    height: '400px', //播放器高度
+    width: '912px', //播放器宽度
+    height: '513px', //播放器高度
    color: '#409eff', //主题色
    title: '', //视频名称
    src: '', //视频源
@ -579,9 +591,16 @@
      }
    }
  }
-  const batchPreview = async function () {
+  const batchPreview = async function (page) {
+    if (page.layerX) {
+      page = 1
+    }
    if (selectedList.value.length > 0) {
-      const list = selectedList.value.splice(0, 4)
+      videoTotal.value = selectedList.value.length
+      const arr = JSON.parse(JSON.stringify(selectedList.value))
+      let start = (page - 1) * 4
+      let list = []
+      list = arr.splice(start, 4)
      const length = list.length
      videoList.value = []
      for (let index = 0; index < length; index++) {
@ -590,8 +609,8 @@
        }
        let ob = {
          options: {
-            width: '600px', //播放器宽度
-            height: '350px', //播放器高度
+            width: '512px', //播放器宽度
+            height: '288px', //播放器高度
            color: '#409eff', //主题色
            title: '', //视频名称
            src: '', //视频源
@ -651,7 +670,10 @@
    selectedList.value = []
    selectedRowKeys.value = []
    videoList.value = []
+    current.value = 1
  }
+  // 改变批量预览的分页
+  const changePage = (page) => {}
  // 一键申请
  const dept = reactive({})
  // eslint-disable-next-line no-undef
@ -712,6 +734,14 @@
        longitude: mapSearchParam.value.gpsX || '',
        latitude: mapSearchParam.value.gpsY || '',
        radius: mapSearchParam.value.radius || '',
+        status: 1,
+      }
+      if (
+        params.regionId === '70be8c5b664f4bcf869d82f2e8335051' &&
+        !params.name &&
+        !params.longitude
+      ) {
+        params.status = ''
      }
      let paramsFather = ''
      let i = 1
@ -1000,6 +1030,20 @@
      overflow-y: scroll !important;
    }
  }
+  .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;
+    }
+  }
  .batch-preview-modal {
    .batch-video {
      width: 100%;
@ -1007,8 +1051,23 @@
      grid-template-columns: 50% 50%;
      grid-template-rows: 50% 50%;
      justify-content: center;
-      grid-row-gap: 14px;
+      // grid-row-gap: 14px;
      grid-column-gap: 20px;
    }
+    .ant-pagination-item-link {
+      background-color: #5580f7;
+    }
+    .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;
+    }
  }
 </style>
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@ -226,6 +226,7 @@
            longitude: this.mapSearchParam.gpsX || '',
            latitude: this.mapSearchParam.gpsY || '',
            radius: this.mapSearchParam.radius || '',
+            status: 1,
          }
          let paramsFather = ''
          let i = 1
Author	SHA1	Message	Date
wuhongjian	e026c97a73	Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-08-09 17:10:48 +08:00
wuhongjian	5a32f96150	bug修复	2022-08-09 17:09:58 +08:00