From b9ed594f1c19e5d3534f2e7fbbb2472dee12dfda Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Fri, 1 Jul 2022 14:24:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E6=B1=87=E8=81=9A?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/newHome/components/CapabilityConvergence.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 014021ee..4c35dc3b 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -284,6 +284,7 @@
           background-color: #fff;
           border-radius: 0.02rem;
           box-shadow: 0 0.05rem 0.2rem #ccc;
+          position: relative;
           div:nth-of-type(1) {
             height: 1.02rem;
             line-height: 1.02rem;
@@ -336,6 +337,8 @@
             text-align: center;
             margin-top: 0.1rem;
             margin-left: 0.85rem;
+            position: absolute;
+            bottom: 0.2rem;
           }
           .btn:hover {
             background: rgba(0, 88, 225, 0.3);

From 4f11e078b827eda9ae157d551673984278831138 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 1 Jul 2022 14:31:46 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E9=9B=86=E5=B8=82=20=E5=92=8C=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD=20=20=20=20=20=20=E6=91=84?=
 =?UTF-8?q?=E5=83=8F=E5=A4=B4=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Algorithm/AlgorithmTopDetails.vue         |  26 +++-
 .../Business/BusinessTopDetails.vue           |  76 ++++++-----
 .../Developer/DeveloperTopDetails.vue         |  26 +++-
 .../LayerService/LayerServiceTopDetails.vue   |  26 +++-
 front/src/views/home/apply.vue                |   4 +-
 .../home/components/searchResultList.vue      |  37 ++++--
 .../personalCenter/components/MyApply.vue     | 124 +++++++++++-------
 .../components/PurchaseVehicle.vue            |  26 ++--
 8 files changed, 229 insertions(+), 116 deletions(-)

diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
index 6d2288af..0554fbfd 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:56:28
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-13 15:29:27
+ * @LastEditTime: 2022-07-01 14:16:18
  * @Description: 算法详情页头部
 -->
 <template>
@@ -77,12 +77,28 @@
   //立即申请
   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,
+            },
+          ],
+          deptId: props.dataList.deptId,
+          deptName: props.dataList.deptName,
+        },
+      ])
+    )
     router.push({
       path: '/apply',
-      query: {
-        name: props.dataList.name,
-        resourceId: [props.dataList.id],
-      },
     })
   }
   const componentType = ref('')
diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
index 33ffb300..3f8b3d39 100644
--- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:56:28
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-14 11:31:12
+ * @LastEditTime: 2022-07-01 14:20:52
  * @Description: 算法详情页头部
 -->
 <template>
@@ -35,14 +35,14 @@
         </div>
       </div>
       <div class="bottom" v-if="props.dataList.id">
-        <!-- <a-button type="primary" @click="toView()">
+        <a-button type="primary" @click="toView()">
           <template #icon><form-outlined /></template>
           申请使用
         </a-button>
         <a-button type="primary" @click="addShoppingCart()">
           <template #icon><shopping-cart-outlined /></template>
           加入申购车
-        </a-button> -->
+        </a-button>
         <a-button type="primary" @click="goTOCollection()">收藏</a-button>
       </div>
     </div>
@@ -50,42 +50,58 @@
   </div>
 </template>
 <script setup>
-  // import { ShoppingCartOutlined } from '@ant-design/icons-vue'
+  import { ShoppingCartOutlined } from '@ant-design/icons-vue'
   import { defineProps, ref, watch } from 'vue'
   import { scInsert } from '@/api/personalCenter'
-  // import { sgcInsert } from '@/api/home'
-  // import { useRouter } from 'vue-router'
-  // import mybus from '@/myplugins/mybus'
+  import { sgcInsert } from '@/api/home'
+  import { useRouter } from 'vue-router'
+  import mybus from '@/myplugins/mybus'
   import { message } from 'ant-design-vue'
   const props = defineProps({
     dataList: { type: Object, default: null },
   })
-  // const router = useRouter()
+  const router = useRouter()
   const businessArea = ref('')
   // // 加入申购车
-  // const addShoppingCart = () => {
-  //   console.log('加入申购车==================>', props.dataList)
-  //   sgcInsert({
-  //     delFlag: '0',
-  //     resourceId: props.dataList.id,
-  //     // userId: userId.value,
-  //   }).then((res) => {
-  //     console.log(res)
-  //     message.success('添加申购车成功！')
-  //     mybus.emit('getSgcNum')
-  //   })
-  // }
+  const addShoppingCart = () => {
+    console.log('加入申购车==================>', props.dataList)
+    sgcInsert({
+      delFlag: '0',
+      resourceId: props.dataList.id,
+      // userId: userId.value,
+    }).then((res) => {
+      console.log(res)
+      message.success('添加申购车成功！')
+      mybus.emit('getSgcNum')
+    })
+  }
   // // 立即申请
-  // function toView() {
-  //   // window.open(newpage.href, '_blank')
-  //   router.push({
-  //     path: '/apply',
-  //     query: {
-  //       name: props.dataList.name,
-  //       resourceId: [props.dataList.id],
-  //     },
-  //   })
-  // }
+  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,
+            },
+          ],
+          deptId: props.dataList.deptId,
+          deptName: props.dataList.deptName,
+        },
+      ])
+    )
+    router.push({
+      path: '/apply',
+    })
+  }
   // 收藏
   const goTOCollection = () => {
     console.log('收藏===================》', props.dataList)
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
index e7c71332..63d3dc47 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:56:28
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-14 11:31:12
+ * @LastEditTime: 2022-07-01 14:21:04
  * @Description: 开发组件详情页头部
 -->
 <template>
@@ -77,12 +77,28 @@
   // 立即申请
   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,
+            },
+          ],
+          deptId: props.dataList.deptId,
+          deptName: props.dataList.deptName,
+        },
+      ])
+    )
     router.push({
       path: '/apply',
-      query: {
-        name: props.dataList.name,
-        resourceId: [props.dataList.id],
-      },
     })
   }
   // 收藏
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
index c8c5b45b..f8b73a11 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:56:28
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-14 11:31:12
+ * @LastEditTime: 2022-07-01 14:21:10
  * @Description: 算法详情页头部
 -->
 <template>
@@ -78,12 +78,28 @@
   // 立即申请
   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,
+            },
+          ],
+          deptId: props.dataList.deptId,
+          deptName: props.dataList.deptName,
+        },
+      ])
+    )
     router.push({
       path: '/apply',
-      query: {
-        name: props.dataList.name,
-        resourceId: [props.dataList.id],
-      },
     })
   }
   // 收藏
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index d0d5866d..f56b499c 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -387,7 +387,9 @@
                     resourceName: item.resourceName,
                   })
                   console.log(item.id)
-                  ids.push(item.id)
+                  if (item.id) {
+                    ids.push(item.id)
+                  }
                 } else {
                   let obj = {}
                   Object.assign(obj, formName)
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index c22c6c89..935c1d5f 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -182,21 +182,15 @@
               >
                 免费试用
               </a-button> -->
-              <!-- <a-button
+              <a-button
                 type="primary"
                 @click="toView('apply', item)"
-                v-show="
-                  cardType !== '数据资源' &&
-                  !(
-                    cardType == '组件服务' &&
-                    findComponentName(item, '智能算法')
-                  )
-                "
+                v-show="cardType == '组件服务'"
               >
                 {{
                   item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
-              </a-button> -->
+              </a-button>
             </div>
             <div class="right" v-else>
               <a-button type="primary" @click="openVideo(item)">
@@ -382,13 +376,28 @@
           )
         } else {
           if (type === 'apply') {
-            // window.open(newpage.href, '_blank')
+            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,
+                    },
+                  ],
+                  deptId: item.deptId,
+                  deptName: item.deptName,
+                },
+              ])
+            )
             router.push({
               path: '/apply',
-              query: {
-                name: [item.name],
-                resourceId: [item.id],
-              },
             })
           } else {
             console.log(
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index bc685583..aa8fef21 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -48,8 +48,13 @@
           <a-tooltip>
             <template #title>{{ item.name }}</template>
             <div class="content-body-title">
-              <span v-if="item.name ==='申请摄像头列表'" @click="showVideoList(item)"> 名称：{{ item.name }} </span>
-              <span v-else> 名称：{{ item.name }} </span>
+              <span
+                v-if="item.name === '申请摄像头列表'"
+                @click="showVideoList(item)"
+              >
+                名称：{{ item.name }}
+              </span>
+              <span v-else>名称：{{ item.name }}</span>
               <div></div>
             </div>
           </a-tooltip>
@@ -71,9 +76,43 @@
             </p>
           </div>
           <div v-else>
-            <p class="content-body-content-son">
-              <span v-if="item.name ==='申请摄像头列表'">申请结果：{{ '列表地址：' + backUrl +  'resource/getApplyCameraList/' + item.processInstanceId+';'+ '视频流地址：'+backUrl + '/resource/hls/getHls/?channelId='}}</span>
-              <span v-else>申请结果：{{ item.comment || '暂无' }}</span>
+            <p
+              class="content-body-content-son"
+              v-if="item.name === '申请摄像头列表'"
+            >
+              <span>
+                申请结果：{{
+                  '列表地址：' +
+                  backUrl +
+                  'resource/getApplyCameraList/' +
+                  item.processInstanceId +
+                  ';' +
+                  '视频流地址：' +
+                  backUrl +
+                  '/resource/hls/getHls/?channelId='
+                }}
+              </span>
+              <a-button
+                type="primary"
+                size="small"
+                @click="
+                  copyComment(
+                    '列表地址：' +
+                      backUrl +
+                      'resource/getApplyCameraList/' +
+                      item.processInstanceId +
+                      ';' +
+                      '视频流地址：' +
+                      backUrl +
+                      '/resource/hls/getHls/?channelId='
+                  )
+                "
+              >
+                复制
+              </a-button>
+            </p>
+            <p class="content-body-content-son" v-else>
+              <span>申请结果：{{ item.comment || '暂无' }}</span>
               <a-button
                 type="primary"
                 size="small"
@@ -225,15 +264,20 @@
     <a-modal
       v-model:visible="videoVisible"
       title="已申请摄像头列表"
-      @ok="videoVisible=false"
+      @ok="videoVisible = false"
     >
-      <a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{defaultPageSize: 6}">
-      <template #bodyCell="{ column, text }">
-      <!-- <template>
+      <a-table
+        :columns="columns"
+        :data-source="xVideoList"
+        bordered
+        :pagination="{ defaultPageSize: 6 }"
+      >
+        <template #bodyCell="{ column, text }">
+          <!-- <template>
         <a>{{ text }}</a>
       </template> -->
-      </template>
-  </a-table>
+        </template>
+      </a-table>
     </a-modal>
   </div>
 </template>
@@ -246,7 +290,12 @@
     getTaskHandleDetailInfo,
     // getProcDefBizRoute,
   } from '@/api/personalCenter'
-  import { updateRes, relaunch, selectOne,getApplyCameraList } from '@/api/home'
+  import {
+    updateRes,
+    relaunch,
+    selectOne,
+    getApplyCameraList,
+  } from '@/api/home'
   import { useRouter } from 'vue-router'
   import { message } from 'ant-design-vue'
   import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
@@ -257,39 +306,13 @@
   // let contentListLength = contentList.length
   let tabIndex = ref(0)
   const videoVisible = ref(false)
-  const columns = ref([{
-    title: '摄像头名称',
-    dataIndex: 'name'
-  }])
-  const xVideoList = ref([{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },])
+  const columns = ref([
+    {
+      title: '摄像头名称',
+      dataIndex: 'name',
+    },
+  ])
+  const xVideoList = ref([])
   function tabqiehuan(item, index) {
     // debugger
     tabIndex.value = index
@@ -332,9 +355,14 @@
     resourceId.value = item.resourceId
   }
   const showVideoList = (item) => {
-    // getApplyCameraList(item.processInstanceId).then(res=>{
-    //   console.log('res', res)
-    // })
+    console.log('显示列表', item)
+    getApplyCameraList(item.processInstanceId).then((res) => {
+      console.log('res', res)
+      xVideoList.value = []
+      res.data.data.map((val) => {
+        xVideoList.value.push({ name: val.channelName, key: val.channelId })
+      })
+    })
     videoVisible.value = true
   }
   const copyComment = (data) => {
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index f7496e40..292ecec2 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -233,21 +233,30 @@
     //   scInsert
     // )
     let scArr = []
-    if (checkedList.value.length === 0) {
+    if (checkedListAbility.value.length === 0) {
       message.error('请选择需要收藏的数据')
     } else {
       list.value.forEach((val) => {
-        if (checkedList.value.indexOf(val.deptId) !== -1) {
-          if (val.delFlag == 0) {
-            scArr.push({ id: val.id })
-          }
+        if (val.children) {
+          val.children.map((item) => {
+            if (item.resourceId == '8888888880000000001') {
+              message.warning('摄像头无法添加收藏！')
+            } else {
+              if (
+                checkedListAbility.value.indexOf(item.id) > -1 &&
+                item.delFlag == 0
+              ) {
+                scArr.push({ resourceId: item.resourceId })
+              }
+            }
+          })
         }
       })
       if (scArr.length > 0) {
         scInsert(scArr).then((res) => {
           if (res.data.code === 0) {
             message.success('收藏成功')
-            checkedList.value = []
+            clean()
           }
         })
       } else {
@@ -373,6 +382,7 @@
     pageNum.value = '1'
     pageSize.value = '99999'
     checkedList.value = []
+    checkedListAbility.value = []
     checkedListAll.value = []
     checkAll.value = false
     showKey.value++
@@ -631,11 +641,11 @@
   }
   // 删除按钮
   const delList = () => {
-    if (checkedList.value.length == 0) {
+    if (checkedListAbility.value.length == 0) {
       message.error('请先选择需要操作的数据！')
     } else {
       sgcDel({
-        ids: checkedList.value,
+        ids: checkedListAbility.value,
       }).then((res) => {
         if (res.data.msg === 'success') {
           message.success('删除成功')

From 75a56eec3a44f95fcee92f37f47c5e68f9fe63a7 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Fri, 1 Jul 2022 14:40:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=BA=91=E5=9B=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/capabilityCloud/components/ComponentServices.vue    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/front/src/views/capabilityCloud/components/ComponentServices.vue b/front/src/views/capabilityCloud/components/ComponentServices.vue
index 4003bd3b..f2dd031d 100644
--- a/front/src/views/capabilityCloud/components/ComponentServices.vue
+++ b/front/src/views/capabilityCloud/components/ComponentServices.vue
@@ -180,7 +180,11 @@
       callTheTrendPort(start, end, 86400).then((res) => {
         if (res.data.data.result) {
           // res.data.data.result.splice(0, 1)
+          callTheTrendData.value.snum = []
           res.data.data.result[0].values.map((item) => {
+            callTheTrendData.value.snum.push(
+              moment(item[0] * 1000).format('MM-DD')
+            )
             callTheTrendData.value.snum.push(parseInt(item[1]))
           })
           callTheTrend(callTheTrendData.value)