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

# Conflicts: # front/public/static/config/location.js
2022-07-08 08:53:52 +08:00 · 2022-07-08 08:53:52 +08:00 · e8485a86f9
parent 2aa05ee719 32e5253c9f
commit e8485a86f9
10 changed files with 451 additions and 403 deletions
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2020-07-07 16:03:23
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-07 20:22:03
+ * @LastEditTime: 2022-07-08 08:53:41
 * @Description: 数据资源参数配置
 */
 const newLocation = 'qingdao'
--- a/front/src/store/modules/user.js
+++ b/front/src/store/modules/user.js
@ -125,7 +125,10 @@ const actions = {
        commit('setUsername', data.data.username)
        commit('setRole', data.data.roleIdList.length)
        commit('setUserId', data.data.id)
+        setTimeout(()=>{
          resolve()
+        },500)
+
      })
    })
  },
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-04-01 17:23:11
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-07 18:15:38
+ * @LastEditTime: 2022-07-07 19:58:32
 * @Description: 告诉大家这是什么
 */
 /**
@ -49,7 +49,7 @@ router.beforeEach(async (to, from, next) => {
      next()
    } else {
      store.dispatch('user/getUserInfo').then((res)=>{
-        debugger
+        console.log('马到成功！')
        next()
      })
      // if (recordRoute)
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
@ -18,11 +18,15 @@
        <!-- <span class="name">{{ props.dataList.name }}</span> -->
        <div class="label-content">
          <p class="lable-father">
-            <span class="label">
-              {{ componentType || props.dataList.type }}
+            <span class="label" v-if="props.dataList.type">
+              {{ props.dataList.type }}
+            </span>
+            <span class="label" v-if="props.dataList.shareType">
+              {{ props.dataList.shareType }}
+            </span>
+            <span class="label" v-if="props.dataList.shareCondition">
+              {{ props.dataList.shareCondition }}
            </span>
-            <span class="label">{{ props.dataList.shareType }}</span>
-            <span class="label">{{ props.dataList.shareCondition }}</span>
          </p>
        </div>
        <!-- <span class="label">免费</span> -->
--- a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
@ -2,17 +2,34 @@
 <template>
  <div class="application-deployment-and-security">
    <div class="title">
-      <DetalsTitle :title="dataFrom.title" :type="dataFrom.englishTitle"></DetalsTitle>
+      <DetalsTitle
+        :title="dataFrom.title"
+        :type="dataFrom.englishTitle"
+      ></DetalsTitle>
    </div>
    <div class="content">
-      <div v-for="(item, index) in dataFrom.content" :key="index" class="content-card">
+      <div
+        v-for="(item, index) in dataFrom.content"
+        :key="index"
+        class="content-card"
+      >
        <div class="card-title">{{ item.childrenTitle }}</div>
        <div class="card-content">
-          <div v-for="carditem in item.childrenContent" :key="carditem">
+          <div
+            v-for="carditem in item.childrenContent"
+            :key="carditem"
+            :class="
+              carditem.attrType == '访问地址' ? 'access-to-the-address' : ''
+            "
+          >
            <span>{{ carditem.attrType }}：</span>
            <a-tooltip>
              <template #title>{{ carditem.attrValue }}</template>
-              <span>{{ carditem.attrValue }}</span>
+              <span
+                @click="addressFunction(carditem.attrType, carditem.attrValue)"
+              >
+                {{ carditem.attrValue }}
+              </span>
            </a-tooltip>
          </div>
        </div>
@ -80,6 +97,12 @@ if (props.dataList.infoList) {
      })
    }
  }
+  //访问地址跳转方法
+  const addressFunction = (name, itemValue) => {
+    if (name == '访问地址') {
+      window.open(itemValue)
+    }
+  }
  watch(
    () => props.dataList,
    (val) => {
@ -151,9 +174,11 @@ watch(
        height: 1.5rem;
        width: 6.2rem;
        border-radius: 0.2rem;
-      background: linear-gradient(to right,
+        background: linear-gradient(
+          to right,
          rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4));
+          rgba(148, 163, 252, 0.4)
+        );
        padding: 0 0.3rem;
        display: flex;
        flex-direction: column;
@ -190,6 +215,9 @@ watch(
              /*超出的设置为省略号*/
            }
          }
+          .access-to-the-address {
+            cursor: pointer;
+          }
        }
      }
    }
--- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
@ -18,9 +18,15 @@
        <!-- <span class="name">{{ props.dataList.name }}</span> -->
        <div class="label-content">
          <p class="lable-father">
-            <span class="label">{{ props.dataList.type }}</span>
-            <span class="label">{{ props.dataList.shareType }}</span>
-            <span class="label">{{ props.dataList.shareCondition }}</span>
+            <span class="label" v-if="props.dataList.type">
+              {{ props.dataList.type }}
+            </span>
+            <span class="label" v-if="props.dataList.shareType">
+              {{ props.dataList.shareType }}
+            </span>
+            <span class="label" v-if="props.dataList.shareCondition">
+              {{ props.dataList.shareCondition }}
+            </span>
          </p>
        </div>
        <!-- <span class="label">免费</span> -->
--- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
@ -18,11 +18,15 @@
        <!-- <span class="name">{{ props.dataList.name }}</span> -->
        <div class="label-content">
          <p class="lable-father">
-            <span class="label">
-              {{ componentType || props.dataList.type }}
+            <span class="label" v-if="props.dataList.type">
+              {{ props.dataList.type }}
+            </span>
+            <span class="label" v-if="props.dataList.shareType">
+              {{ props.dataList.shareType }}
+            </span>
+            <span class="label" v-if="props.dataList.shareCondition">
+              {{ props.dataList.shareCondition }}
            </span>
-            <span class="label">{{ props.dataList.shareType }}</span>
-            <span class="label">{{ props.dataList.shareCondition }}</span>
          </p>
        </div>
        <!-- <span class="label">免费</span> -->
@ -265,7 +269,8 @@ watch(
    .right {
      width: 5.8rem;
      height: 4rem;
-    background: url('~@/assets/detailsAll/business/business_right_bg.png') no-repeat;
+      background: url('~@/assets/detailsAll/business/business_right_bg.png')
+        no-repeat;
      background-size: 100%;
      margin-top: -0.4rem;
    }
--- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
@ -18,11 +18,15 @@
        <!-- <span class="name">{{ props.dataList.name }}</span> -->
        <div class="label-content">
          <p class="lable-father">
-            <span class="label">
-              {{ componentType || props.dataList.type }}
+            <span class="label" v-if="props.dataList.type">
+              {{ props.dataList.type }}
+            </span>
+            <span class="label" v-if="props.dataList.shareType">
+              {{ props.dataList.shareType }}
+            </span>
+            <span class="label" v-if="props.dataList.shareCondition">
+              {{ props.dataList.shareCondition }}
            </span>
-            <span class="label">{{ props.dataList.shareType }}</span>
-            <span class="label">{{ props.dataList.shareCondition }}</span>
          </p>
        </div>
        <!-- <span class="label">免费</span> -->
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
@ -18,11 +18,15 @@
        <!-- <span class="name">{{ props.dataList.name }}</span> -->
        <div class="label-content">
          <p class="lable-father">
-            <span class="label">
-              {{ componentType || props.dataList.type }}
+            <span class="label" v-if="props.dataList.type">
+              {{ props.dataList.type }}
+            </span>
+            <span class="label" v-if="props.dataList.shareType">
+              {{ props.dataList.shareType }}
+            </span>
+            <span class="label" v-if="props.dataList.shareCondition">
+              {{ props.dataList.shareCondition }}
            </span>
-            <span class="label">{{ props.dataList.shareType }}</span>
-            <span class="label">{{ props.dataList.shareCondition }}</span>
          </p>
        </div>
        <!-- <span class="label">免费</span> -->
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@ -5,13 +5,11 @@
    <div class="infrastructrue-tab">
      <div v-for="(item, index) in tabList" :key="index" class="tabBox">
        <b class="leftType">{{ item.title }}</b>
-        <a-button @click="nullClick" v-if="item.title == '视频标签'">
-          清空
-        </a-button>
+        <button @click="nullClick" v-if="item.title == '视频标签'">清空</button>
        <span
          v-for="itemContent in item.content"
          :key="itemContent"
-          @click="tabClick(index, itemContent, item)"
+          @click="tabClick(index, itemContent)"
          :class="
            clickList[index].content.indexOf(itemContent.labelName) != -1 ||
            clickList[index].content.indexOf(itemContent) != -1
@ -117,8 +115,8 @@
 </template>
 <script setup>
  import VideoSurveillance from '@/views/home/videoSurveillance'
-  import { getCategoryTreePage } from '@/api/personalCenter'
-  import { dataType } from 'element-plus/es/components/table-v2/src/common'
+  // import { getCategoryTreePage } from '@/api/personalCenter'
+  // import { dataType } from 'element-plus/es/components/table-v2/src/common'
  import { useRouter } from 'vue-router'
  import { message } from 'ant-design-vue'
  import { ref, reactive, onMounted } from 'vue'
@ -245,7 +243,7 @@
      clickList.value.push(params)
    })
    mybus.off('tranferToList')
-    mybus.on('tranferToList', (data) => {
+    mybus.on('tranferToList', () => {
      console.log('获取到的列表数据')
    })
  }
@ -255,7 +253,6 @@
  let tableHeight = ref('600')
  //tab切换点击事件
  const tabClick = (indexFather, name) => {
-    console.log(clickList.value, indexFather, name)
    selectedRowKeys.value = []
    selectedList.value = []
    if (clickList.value[indexFather].content.indexOf(name) != -1) {
@ -341,12 +338,22 @@
    })
    console.log('选中的标签code', mapSearchParam.value)
    mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
-    if (name == '视频资源') {
+    let fatherName = ref('视频资源')
+    if (name == '视频资源' || name == '云资源' || name == '感知资源') {
+      fatherName.value == name
+    }
+    if (fatherName.value == '视频资源') {
      getCamera()
    } else {
      dataSource.value = []
      pagination.value.total = 0
    }
+    // if (name == '视频资源') {
+    //   getCamera()
+    // } else {
+    //   dataSource.value = []
+    //   pagination.value.total = 0
+    // }
  }
  // 清空
  const nullClick = () => {
@ -395,10 +402,10 @@
      message.error('请选择需要申请的数据')
    }
  }
-  // 添加至购物车
-  const addShopCar = () => {
-    console.log('添加至购物车')
-  }
+  // // 添加至购物车
+  // const addShopCar = () => {
+  //   console.log('添加至购物车')
+  // }
  const getCamera = () => {
    console.log('初始化调用')
    getCameraByParentId(mapSearchParam.value).then((res) => {
@ -445,7 +452,7 @@
      key: 'channelId',
    },
  ])
-  const allClick = ref([])
+  // const allClick = ref([])
  const onSelectChange = (record, selected, selectedRows, nativeEvent) => {
    console.log('hahhahah', record, selected, selectedRows, nativeEvent)
    if (selected) {
@ -541,19 +548,6 @@
      }
      .tabBox {
        margin-bottom: 0.16rem;
-        :deep(.ant-btn:active) {
-          color: unset;
-          border-color: unset;
-        }
-        :deep(.ant-btn) {
-          margin-left: 10px;
-          border: 1px solid #666666;
-          color: #666666;
-          border-radius: 10px;
-        }
-        :deep(.ant-btn:hover) {
-          color: #40a9ff;
-        }
      }
      .tabBox:last-of-type {
        margin-bottom: 0;