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

front/src/api/personalCenter.js

@@ -346,6 +346,7 @@ export function getZwyBusinessList(params) {
     params,
   })
 }
+
 // 政务云资源列详情
 export function getZwyBusinessInfoById(params) {
   return request({
@@ -354,7 +355,22 @@ export function getZwyBusinessInfoById(params) {
     params,
   })
 }
-
+// 视频列表
+export function getZwyVideoList(params) {
+  return request({
+    url: '/act/task/getZwyVideoList',
+    method: 'get',
+    params,
+  })
+}
+// 视频详情
+export function getZwyVideoInfoById(params) {
+  return request({
+    url: '/act/task/getZwyVideoInfoById',
+    method: 'get',
+    params,
+  })
+}
 // 催办
 export function treminders(data) {
   return request({

front/src/views/personalCenter/components/CloudDetails.vue

@@ -30,16 +30,20 @@
 <script setup>
 import { onMounted, defineProps, ref } from 'vue'
 import {
-  getZwyBusinessInfoById
+  getZwyBusinessInfoById,
+  getZwyVideoInfoById
 } from '@/api/personalCenter'
 const props = defineProps({
   BSNUM: { type: String, default: '' },
   baseInfo: { type: Object, default: null },
+  chooseTab: { type: Number, default: 0 },
 
 })
 const BSNUM = ref('')
+const chooseTab = ref(0)
 const baseInfo = ref({})
 BSNUM.value = props.BSNUM
+chooseTab.value=props.chooseTab
 baseInfo.value = props.baseInfo
 const columns = ref([
   {
@@ -57,17 +61,27 @@ const xVideoList = ref([
   
 ])
 onMounted(() => {
-  
   const params={
     "id":BSNUM.value
   }
+  if(chooseTab.value===2){
     getZwyBusinessInfoById(params).then(
       (res) => {
         xVideoList.value = res.data.data
-        num.value = []
-        total.value = res.data.data.total
+     
+      //  total.value = res.data.data.length
       }
     )
+  }else if(chooseTab.value===3){
+    getZwyVideoInfoById(params).then(
+      (res) => {
+        xVideoList.value = res.data.data
+     
+      //  total.value = res.data.data.length
+      }
+    )
+  }
+ 
 })
 
 </script>

front/src/views/personalCenter/components/MyApply.vue

@@ -1,93 +1,77 @@
 <template>
   <div class="on-the-right-side-of-the-list">
-    <div class="title" style="margin-bottom: 0.2rem">我的申请</div>
+    <!-- <div class="title" style="margin-bottom: 0.2rem">我的申请</div> -->
+    <div style=" background: #fff;;width:100%;height:75px">
     <div class="second-title">
-      <div
-        style="margin-right: 30px"
-        v-for="(item, index) in chooseList"
-        :class="chooseTab == index ? 'chooseStyle' : 'noChooseStyle'"
-        :key="index"
-        @click="handleTab(index)"
-      >
+      <div style="margin-right: 30px" v-for="(item, index) in chooseList"
+        :class="chooseTab == index ? 'chooseStyle' : 'noChooseStyle'" :key="index" @click="handleTab(index)">
         {{ item }}
       </div>
     </div>
-    <div class="tab" style="margin-bottom: 0.1rem" v-show="chooseTab == 0">
-      <span>类型</span>
-      <div
-        :class="typeIndex == index ? 'tabclass' : ' '"
-        @click="changeType(item, index)"
-        v-for="(item, index) in typeList"
-        :key="index"
-      >
-        {{ item }}
   </div>
+    <!--类型-->
+    <div class="top-title" v-show="chooseTab == 0">
+      <div v-for="(item, index) in typeList" :key="index" :class="index === typeIndex ? 'sel' : ''"
+        @click="changeType(item, index)">
+        <span class="photo" :style="{
+          backgroundImage: `url(${item.photo}) `,
+          backgroundSize: 'cover',
+        }"></span>
+        <span>
+          {{ item.name }}
+        </span>
       </div>
-    <div class="tab" v-if="chooseTab != 1 && chooseTab != 2 && chooseTab != 3">
-      <span>申请状态</span>
-      <div
-        :class="tabIndex == index ? 'tabclass' : ' '"
-        @click="changeApplyState(item, index)"
-        v-for="(item, index) in tabList"
-        :key="index"
-      >
-        <a-badge
-          :count="item === '审核中' ? num.unfinished : num.finished"
-          v-if="item !== '全部'"
-        >
+
+    </div>
+
+    <!--申请状态-->
+    <div class="tab" v-show="chooseTab == 0">
+      <!-- <span>申请状态</span> -->
+      <div :class="tabIndex == 0 ? 'tabclass' : ' '" @click="changeApplyState('全部', 0)">
+      全部
+      </div>
+      <div :class="tabIndex == 1 ? 'tabclass' : ' '" @click="changeApplyState('审核中', 1)">
+      审核中<span v-if="num.unfinished !==0  " style="margin-left:4px">{{num.unfinished}}</span>
+      </div>
+      <div :class="tabIndex == 2 ? 'tabclass' : ' '" @click="changeApplyState('审核完成', 2)">
+      审核完成<span v-if="num.finished !==0" style="margin-left:4px">{{num.finished}}</span>
+      </div>
+        <!-- v-for="(item, index) in tabList" :key="index">
+        <a-badge :count="item === '审核中' ? num.unfinished : num.finished" v-if="item !== '全部'">
           {{ item }}
         </a-badge>
         <template v-else>
           {{ item }}
-        </template>
+        </template> -->
+      <!-- </div> -->
     </div>
-    </div>
-    <!--政务云资源-->
-    <template v-if="chooseTab == 2">
-      <a-form
-        :label-col="{ style: { width: '80px' } }"
-        :wrapper-col="{ style: { width: '200px' } }"
-        labelAlign="center"
-      >
+    <!--政务云资源和视频资源-->
+    <template v-if="chooseTab == 2 || chooseTab == 3">
+      <div  style="margin-top:22px;margin-left:16px">
+      <a-form :label-col="{ style: { width: '80px' } }" :wrapper-col="{ style: { width: '200px' } }"
+        labelAlign="center">
         <a-row>
           <a-form-item label="业务名称">
-            <a-input
-              placeholder="请输入业务名称"
-              v-model:value="yunForm.busineesName"
-              style="width: 200px"
-            />
+            <a-input placeholder="请输入业务名称" v-model:value="yunForm.busineesName" style="width: 200px" />
           </a-form-item>
           <a-form-item label="状态">
-            <a-select
-              ref="select"
-              v-model:value="yunForm.status"
-              placeholder="请选择状态"
-              style="width: 200px"
-            >
-              <a-select-option
-                v-for="(item, index) in cloudResourceStatusList"
-                :key="index"
-                :value="item.dictValue"
-                clearable
-              >
+            <a-select ref="select" v-model:value="yunForm.status" placeholder="请选择状态" style="width: 200px">
+              <a-select-option v-for="(item, index) in cloudResourceStatusList" :key="index" :value="item.dictValue"
+                clearable>
                 {{ item.dictLabel }}
               </a-select-option>
             </a-select>
           </a-form-item>
-          <button class="queryButton" @click="getCloudList()">查询</button>
+          <button class="queryButton" @click="getChooseeList()">查询</button>
           <button class="queryButton" @click="cloudSearchReserve()">
             重置
           </button>
         </a-row>
       </a-form>
-
+    </div>
       <div v-if="cloudList.data.length > 0">
         <div class="content-cloud">
-          <div
-            class="content-cloud-body"
-            v-for="item in cloudList.data"
-            :key="item.index"
-          >
+          <div class="content-cloud-body" v-for="item in cloudList.data" :key="item.index">
             <div class="content-body-left">
               <div class="content-body-left-one">
                 <div style="font-size: 16px">{{ item.BUSINESS_NAME }}</div>
@@ -105,33 +89,25 @@
           </div>
         </div>
         <div class="bottom">
-          <a-pagination
-            size="small"
-            pageSize="4"
-            :total="total"
-            :showTotal="(total) => `共 ${total} 项`"
-            :current="page"
-            @change="handleCurrentChange"
-            @showSizeChange="handlePageSizeChange"
-            :showSizeChanger="false"
-          />
+          <a-pagination size="small" pageSize="4" :total="total" :showTotal="(total) => `共 ${total} 项`" :current="page"
+            @change="handleCurrentChange" @showSizeChange="handlePageSizeChange" :showSizeChanger="false" />
         </div>
       </div>
-      <a-empty v-else />
+      <div style="height: 740px;background: #fff;    padding-top: 200px;" v-else>
+        <a-empty  /></div>
+    
     </template>
     <!--数据资源和视频资源-->
-    <template v-else-if="chooseTab == 1 || chooseTab == 3">
+    <template v-else-if="chooseTab == 1">
+      <div style="height: 740px;background: #fff;    padding-top: 250px;" >
       <a-empty></a-empty>
+      </div>
     </template>
     <!--UCS内部资源-->
     <template v-else>
       <div v-if="contentList.data.length > 0">
         <div class="content">
-          <div
-            class="content-body"
-            v-for="item in contentList.data"
-            :key="item.index"
-          >
+          <div class="content-body" v-for="item in contentList.data" :key="item.index">
             <div class="withdraw" v-if="item.approveStatus === '不通过'"></div>
             <div class="content-body-title">
               <span>
@@ -170,22 +146,13 @@
               <p class="content-body-content-son" v-if="typeName == '设备申请'">
                 审核结果：{{ item.state === 0 ? '审核中' : '审核完成' }}
               </p>
-              <p
-                class="content-body-content-son"
-                v-else-if="typeName == '数据资源申请'"
-              >
+              <p class="content-body-content-son" v-else-if="typeName == '数据资源申请'">
                 审核结果：{{ item.bmyijian === 0 ? '审核中' : '审核完成' }}
               </p>
-              <p
-                class="content-body-content-son"
-                v-else-if="typeName == '云资源申请'"
-              >
+              <p class="content-body-content-son" v-else-if="typeName == '云资源申请'">
                 审核结果：{{ status[item.STATUS] }}
               </p>
-              <p
-                class="content-body-content-son"
-                v-else-if="typeName == '云视频申请'"
-              >
+              <p class="content-body-content-son" v-else-if="typeName == '云视频申请'">
                 审核结果：{{ status2[item.STATUS] }}
               </p>
               <p class="content-body-content-son" v-else>
@@ -212,102 +179,55 @@
               <div v-if="isXiHaiAn">过期时间：{{ item.expireDate || '' }}</div>
             </div>
             <div class="button-box">
-              <div
-                class="button"
-                v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
-                @click="showPhoneModal(item)"
-              >
+              <div class="button" v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
+                @click="showPhoneModal(item)">
                 联系方式
               </div>
               <div class="button" @click="showDetail(item)">查看详情</div>
-              <div
-                class="button"
-                @click="showAdd(item)"
-                v-if="typeName !== '能力申请' && item.backToFirst"
-              >
+              <div class="button" @click="showAdd(item)" v-if="typeName !== '能力申请' && item.backToFirst">
                 修改
               </div>
-              <svg
-                t="1652233950228"
-                class="icon"
-                viewBox="0 0 1024 1024"
-                version="1.1"
-                xmlns="http://www.w3.org/2000/svg"
-                p-id="5970"
-                data-spm-anchor-id="a313x.7781069.0.i8"
-                width="80"
-                height="80"
-                v-if="
+              <svg t="1652233950228" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                xmlns="http://www.w3.org/2000/svg" p-id="5970" data-spm-anchor-id="a313x.7781069.0.i8" width="80"
+                height="80" v-if="
                   item.processDefinitionName != '能力资源下架' &&
                   item.approveStatus !== '不通过' &&
                   (item.resourceStatus == 4 || item.resourceStatus == 5)
-                "
-                style="position: absolute; top: 20px; left: -850px"
-              >
+                " style="position: absolute; top: 20px; left: -850px">
                 <path
                   d="M955.22053 256C813.82053 11.2 500.72053-72.6 255.92053 68.8S-72.67947 523.2 68.72053 768 523.22053 1096.6 768.02053 955.2c244.7-141.2 328.6-454.1 187.4-698.8 0-0.1-0.1-0.3-0.2-0.4zM762.02053 944.7c-239 138.1-544.8 56.2-682.9-182.8S22.92053 217.1 261.92053 79.1s544.8-56.2 682.9 182.8c137.9 239 56.1 544.6-182.8 682.8z"
-                  fill="#515151"
-                  opacity=".5"
-                  p-id="5971"
-                ></path>
+                  fill="#515151" opacity=".5" p-id="5971"></path>
                 <path
                   d="M898.12053 289.2C775.02053 76 502.42053 2.9 289.22053 126 76.02053 249.1 3.02053 521.6 126.02053 734.8 249.12053 948 521.62053 1021.1 734.82053 898 947.92053 774.9 1021.02053 502.4 898.12053 289.2zM731.62053 892.8C521.32053 1014.3 252.42053 942.2 131.02053 731.9 9.52053 521.6 81.62053 252.7 291.92053 131.3 502.12053 9.9 771.02053 81.8 892.42053 292c121.5 210.3 49.5 479.3-160.8 600.8z"
-                  fill="#515151"
-                  opacity=".5"
-                  p-id="5972"
-                ></path>
+                  fill="#515151" opacity=".5" p-id="5972"></path>
                 <path
                   d="M323.62053 176.8c3.6-2 6 0.8 8.8 2.8 6 4.4 12.4 8.8 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.4 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.6 0.6-2zM200.72053 289.2c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 14.8 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.4-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.4-1.2 0-1.6 0.8-2.4l0.2 0.4z m276.6-159.6c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.8-1.2-0.4-1.6 0.4-2.4l0.2 0.4z m141.9 29.6c3.6-2 6 0.8 8.8 2.8l18.8 12.8c7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4-7.7 0.4-15.2 0.8-22.4 0.8-4.4 6.8-8.4 13.2-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.5-1.2 0.2-1.6 0.6-2zM150.02053 430c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-4 14-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.5 0.6-2z m558.9 414.4c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.1 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-1.1 0.8-1.1 1.6-1.1h0.1z m-158.8 50c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.1-3.7-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2-1 4.2-1.7 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.4-0.8 0.8-0.8 1.7-0.7z m276.5-159.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8s-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.2 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0-0.8 0.8-1.2 1.6-1.2l0.1 0.1z m45.6-137.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.2-0.7 0.6-0.7 1.4-0.7h0.3zM402.72053 868c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-0.8 1-1.1 1.7-1.1z"
-                  fill="#515151"
-                  opacity=".5"
-                  p-id="5973"
-                ></path>
+                  fill="#515151" opacity=".5" p-id="5973"></path>
                 <path
                   d="M386.42053 590.4l-43.8-75.9L207.02053 592.7l10.2 17.7L334.02053 543l23.4 40.4-90.5 52.2-13.5-23.4-18.7 10.8 53.1 92c9.1 15.8 21.2 19.5 36.4 10.7l98.8-57c6.2-3.6 11-9.3 13.4-16.1-1.4-15.9-6.2-31.2-14.2-45l-21.4 4.8c6.7 10.3 11 21.9 12.8 34-1 3.3-3.2 6-6.1 7.8l-88.3 51c-6.2 3.6-11.1 2.1-14.8-4.3l-27.3-47.4 109.3-63.1z m2.9-103.2l10.4 18.1 65.6-37.9 79.9 138.4 18.6-10.8-55.9-96.9c18.8-0.9 43.2-0.6 73 0.7l1.5-23.1c-29.8-0.3-58.4 0.4-86 2.6l-12.5-21.6 74.9-43.2-10.4-18.1-159.1 91.8zM669.52053 329l38.2 66.2 61.4-35.4-38.1-66.1-61.5 35.3z m72.4 24.2l-26.3 15.2-19-33 26.3-15.2 19 33zM599.02053 356.7l7.9 13.7-23.3 13.5 9.8 17 21.8-12.6c7.5 18.7 6.6 39.6-2.5 57.6l20.7 4.4c10.3-23.1 10.3-49.4 0-72.5l18.8-10.9c6 9.2 10.7 19.2 14.2 29.7 0.3 5-2.6 9.7-7.2 11.7-2.9 1.2-6.4 2.8-10.9 4.9l14.1 14.1c3.7-1.3 7.3-2.9 10.7-4.8 8.6-3.9 14.4-12.2 15.2-21.6-5.4-22.1-14.6-43-27.4-61.8l-36.1 20.8-7.9-13.7-17.9 10.5z m29.9 108.1l10 17.4 53.2-30.7c-7.8 23.7-20.6 45.4-37.5 63.6l20.6 11.1c18.6-24.2 30-53.1 33-83.4l29.8 51.5 18.4-10.7-29.8-51.5c27.4 11.5 57.2 16.3 86.9 14.1l3.5-23.5c-24.7 5.1-50.1 5-74.8-0.1l53.5-30.9-10-17.3-69.3 40-7.3-12.6-18.4 10.7L698.02053 425l-69.1 39.8z"
-                  fill="#515151"
-                  opacity=".5"
-                  p-id="5974"
-                ></path>
+                  fill="#515151" opacity=".5" p-id="5974"></path>
               </svg>
             </div>
           </div>
         </div>
         <div class="bottom">
-          <a-pagination
-            size="small"
-            pageSize="4"
-            :total="total"
-            :current="page"
-            :showTotal="(total) => `共 ${total} 项`"
-            @change="handleCurrentChange"
-            @showSizeChange="handlePageSizeChange"
-            :showSizeChanger="false"
-          />
+          <a-pagination size="small" pageSize="4" :total="total" :current="page" :showTotal="(total) => `共 ${total} 项`"
+            @change="handleCurrentChange" @showSizeChange="handlePageSizeChange" :showSizeChanger="false" />
         </div>
       </div>
-      <a-empty v-else />
+      <div style="height: 640px;background: #fff;    padding-top: 200px;" v-else>
+      <a-empty  />
+    </div>
     </template>
   </div>
   <!-- 政务云资源详情-->
-  <a-modal
-    bodyStyle="padding:0.1rem 0"
-    v-model:visible="cloudVisible"
-    style="width: 1000px"
-    :footer="null"
-    destroyOnClose="true"
-    :maskClosable="false"
-  >
+  <a-modal bodyStyle="padding:0.1rem 0" v-model:visible="cloudVisible" style="width: 1000px" :footer="null"
+    destroyOnClose="true" :maskClosable="false">
     <template v-slot:title>申请详情</template>
-    <cloud-details :BSNUM="BSNUM" :baseInfo="baseInfo"></cloud-details>
+    <cloud-details :BSNUM="BSNUM" :chooseTab="chooseTab" :baseInfo="baseInfo"></cloud-details>
   </a-modal>
-  <a-modal
-    bodyStyle="padding:0.1rem 0"
-    v-model:visible="detailsVisible"
-    style="width: 1000px"
-    :footer="null"
-    destroyOnClose="true"
-    :maskClosable="false"
-  >
+  <a-modal bodyStyle="padding:0.1rem 0" v-model:visible="detailsVisible" style="width: 1000px" :footer="null"
+    destroyOnClose="true" :maskClosable="false">
     <template v-slot:title>
       {{
           refObj.description && itShowXiHaiAn
@@ -315,34 +235,15 @@
             : '申请详情'
       }}
     </template>
-    <apply-details
-      :processDefinitionName="processDefinitionName"
-      :businessKey="businessKey"
-      :processInstanceId="processInstanceId"
-      :resourceId="resourceId"
-      :refObj="refObj"
-      :showType="showType"
-    ></apply-details>
+    <apply-details :processDefinitionName="processDefinitionName" :businessKey="businessKey"
+      :processInstanceId="processInstanceId" :resourceId="resourceId" :refObj="refObj"
+      :showType="showType"></apply-details>
   </a-modal>
-  <a-modal
-    v-model:visible="visible"
-    title="下架原因"
-    @ok="del()"
-    @cancel="reason = ''"
-  >
+  <a-modal v-model:visible="visible" title="下架原因" @ok="del()" @cancel="reason = ''">
     <a-input v-model:value="reason" placeholder="请输入下架原因" />
   </a-modal>
-  <a-modal
-    v-model:visible="videoVisible"
-    title="已申请摄像头列表"
-    @ok="videoVisible = false"
-  >
-    <a-table
-      :columns="columns"
-      :data-source="xVideoList"
-      bordered
-      :pagination="{ defaultPageSize: 6 }"
-    >
+  <a-modal v-model:visible="videoVisible" title="已申请摄像头列表" @ok="videoVisible = false">
+    <a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{ defaultPageSize: 6 }">
       <template #bodyCell="{ column, text }">
         <!-- <template>
         <a>{{ text }}</a>
@@ -351,11 +252,7 @@
     </a-table>
   </a-modal>
   <!-- 联系方式弹框 -->
-  <a-modal
-    v-model:visible="phoneVisible"
-    title="提示"
-    @ok="phoneVisible = false"
-  >
+  <a-modal v-model:visible="phoneVisible" title="提示" @ok="phoneVisible = false">
     <!-- 工业信息化局那个号，电话配这个号：199 6399 0996 -->
     <p>请联系工业信息化局，电话：199 6399 0996</p>
   </a-modal>
@@ -386,6 +283,7 @@
   getVideoBusinessList,
   getCategoryTreePage,
   getZwyBusinessList,
+  getZwyVideoList
 } from '@/api/personalCenter'
 import {
   updateRes,
@@ -402,6 +300,7 @@
 import mybus from '@/myplugins/mybus'
 import * as moment from 'moment'
 
+
 const props = defineProps({
   tabTypeName: { type: String, default: '' },
 })
@@ -424,14 +323,22 @@
 })
 let chooseList = ref(['UCS内部资源', '数据资源', '政务云资源', '视频资源'])
 let typeList = ref([
-    '能力申请',
-    '能力上架',
-    '能力下架',
-    '能力需求',
-    '需求评论',
-    // '数据资源申请',
-    // '云资源申请',
-    // '云视频申请',
+  {
+    photo: require('@/assets/newHome/nengli1.png'),
+    name: '能力申请',
+  }, {
+    photo: require('@/assets/newHome/nengli2.png'),
+    name: '能力上架',
+  }, {
+    photo: require('@/assets/newHome/nengli3.png'),
+    name: '能力下架',
+  }, {
+    photo: require('@/assets/newHome/nengli4.png'),
+    name: '能力需求',
+  }, {
+    photo: require('@/assets/newHome/nengli1.png'),
+    name: '需求评论',
+  }
 ])
 
 const itShowXiHaiAn = ref(isXiHaiAn)
@@ -452,7 +359,7 @@
 const cloudList = reactive({ data: [] })
 let tabIndex = ref(0)
 let typeIndex = ref(0)
-  let typeName = ref(typeList.value[0])
+let typeName = ref('能力申请')
 
 if (router.currentRoute.value.query.tabTypeName) {
   typeName.value = router.currentRoute.value.query.tabTypeName
@@ -508,23 +415,82 @@
   ended.value = ''
   page.value = 1
   typeIndex.value = index
-    typeName.value = item
+  typeName.value = item.name
   getApplyList()
 }
+const getChooseeList = () => {
+  if (index == 2) {
+    //查询政务云状态
+    getCloudList()
+  } else if (index == 3) {//视频
+    getVideoList()
+  }
+}
 //选择tab
 const handleTab = (index) => {
   chooseTab.value = index
+  Object.keys(yunForm).map((key) => {
+    delete yunForm[key]
+  })
   if (index == 2) {
+    cloudList.data=[]
     //查询政务云状态
     getCloudResource()
     getCloudList()
+  } else if (index == 3) {//视频
+    cloudList.data=[]
+    getCloudResource()
+    getVideoList()
   }
 }
 const cloudSearchReserve = () => {
   Object.keys(yunForm).map((key) => {
     delete yunForm[key]
   })
+  if (index == 2) {
     getCloudList()
+  } else if (index == 3) {//视频
+    getVideoList()
+  }
+}
+//查询云资源数据
+const getVideoList = () => {
+  const params = {
+    pageNum: page.value,
+    pageSize: 5,
+    status: yunForm.status,
+    name: yunForm.busineesName,
+  }
+  total.value = 5
+  //     cloudList.data = [
+  // {
+  // "BSNUM":"0120221010000008",
+  // "BUSINESS_NAME":"应急指挥系统建设项目新增",
+  // "CREATE_TIME":"2022-11-20 02:04:30",
+  // "STATUS":"06",
+  // },{
+  // "BSNUM":"0120221010000008",
+  // "BUSINESS_NAME":"应急指挥系统建设项目新增",
+  // "CREATE_TIME":"2022-11-22 02:04:30",
+  // "STATUS":"06",
+  // },{
+  // "BSNUM":"0120221010000008",
+  // "BUSINESS_NAME":"应急指挥系统建设项目新增",
+  // "CREATE_TIME":"2022-11-05 02:04:30",
+  // "STATUS":"04",
+  // },{
+  // "BSNUM":"0120221010000008",
+  // "BUSINESS_NAME":"应急指挥系统建设项目新增",
+  // "CREATE_TIME":"2022-11-01 02:04:30",
+  // "STATUS":"04",
+  // }
+  // ]
+
+  getZwyVideoList(params).then((res) => {
+    cloudList.data = res.data.data.list
+    num.value = []
+    total.value = res.data.data.total
+  })
 }
 //查询政务云数据
 const getCloudList = () => {
@@ -540,6 +506,7 @@
     num.value = []
     total.value = res.data.data.total
   })
+
 }
 //查询政务云状态
 const getCloudResource = () => {
@@ -617,10 +584,10 @@
 const cilckRowData = ref({})
 //查看政务云详情
 const showCloudDetail = (item) => {
-    //待完成
   cloudVisible.value = true
   BSNUM.value = item.BSNUM
   baseInfo.value = item
+
 }
 const showDetail = (item) => {
   cilckRowData.value = item
@@ -1029,6 +996,8 @@
   page.value = val
   if (chooseTab.value == 2) {
     getCloudList()
+  } else if (chooseTab.value == 3) {//视频资源
+    getVideoList()
   } else {
     getApplyList()
   }
@@ -1038,6 +1007,8 @@
   page.value = val
   if (chooseTab.value == 2) {
     getCloudList()
+  } else if (chooseTab.value == 3) {//视频资源
+    getVideoList()
   } else {
     getApplyList()
   }
@@ -1172,6 +1143,52 @@
 </script>
 
 <style scoped lang="less" >
+// ::v-deep.ant-empty{
+//   height: 610px;
+//     font-size: 14px;
+//     line-height: 1.5715;
+//     text-align: center;
+//     background: #fff;
+//     padding-top: 200px;
+// }
+.top-title {
+  padding-top: 22px;
+  background: #f4f5f8;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  font-size: 18px;
+  font-family: 'Alibaba PuHuiTi';
+  color: #000000;
+  line-height: 0.34rem;
+  //margin-bottom: 0.2rem;
+
+  .photo {
+    display: inline-block;
+    height: 28px;
+    width: 28px;
+    margin-right: 0.1rem;
+  }
+
+  div {
+    padding: 0 0.4rem;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    width:25%;
+  }
+
+  div:hover {
+    color: #0058e1;
+  }
+
+  .sel {
+    font-weight: 600;
+    color: #0058e1;
+    border-bottom: 0.024rem solid #0058e1;
+  }
+}
+
 .queryButton {
   background: #0058e1;
   width: 80px;
@@ -1181,9 +1198,10 @@
   border-radius: 2px;
   color: #fff;
 }
+
 .on-the-right-side-of-the-list {
-    background: #ffffff;
-    padding: 20px 0px 30px 20px;
+  background: #f4f5f8;
+  //padding: 20px 0px 30px 20px;
   position: absolute;
   width: 1087px;
   height: 810px;
@@ -1193,31 +1211,47 @@
   flex-direction: column;
   font-size: 16px;
   justify-content: left;
+
   .second-title {
-      border-radius: 4px;
-      margin-top: 10px;
-      margin-bottom: 22px;
+    background: #f4f5f8;
+    margin-left:100px;
+    margin-top: 30px;
+   // margin-bottom: 22px;
     font-size: 18px;
     cursor: pointer;
     text-align: center;
-      background: #edf4fc;
-      width: 500px;
-      height: 36px;
-      line-height: 36px;
+    background: #fff;
+    width: 820px;
+    height: 40px;
+    line-height: 40px;
     display: table;
+    border-top: 1px solid #d9d9d9;
+    border-bottom: 1px solid #d9d9d9;
+   
+  }
+  .second-title div{
+    border-right: 1px solid #d9d9d9;
+
+  }
+  .second-title div:first-child{
+    border-left: 1px solid #d9d9d9;
+  
   }
 
   .chooseStyle {
     display: table-cell;
-      width: 25%;
+    width: 200px;
     color: #fff;
+    border: 1px solid #0058e1;
     background-color: #0058e1;
-      font-weight: bolder;
+
   }
+
   .noChooseStyle {
     display: table-cell;
-      width: 25%;
+    width: 200px;
   }
+
   .title {
     font-size: 20px;
     color: #000000;
@@ -1255,36 +1289,52 @@
 
   .tab {
     display: flex;
-      font-size: 14px;
-      color: #999999;
+    font-size: 16px;
+    margin-left: 16px;
+    display: flex;
  
+ 
+    padding-top: 24px;
+    //margin-left: 16px;
+    border-bottom: 1px solid #0058e1;
+  
+       ;
     div {
-        // width: 70px;
-        padding: 5px 10px;
-        height: 24px;
-        line-height: 14px;
-        border: 1px solid #cccccc;
-        border-radius: 12px;
-        margin-left: 10px;
+  background: #eeeff1;
+
+      height: 40px;
+    width: 180px;
+    line-height: 40px;
+    border-radius: 2px;
     text-align: center;
-        color: #666666;
     cursor: pointer;
+    color: #212121;
+    border-left: 1px solid #dddee1;
     }
 
+   
     .tabclass {
-        border: 1px solid #0087ff;
-        color: #0087ff;
+      background: #fff;
+      border-left: 1px solid #0087ff;
+      border-right: 1px solid #0087ff;
+      border-top: 1px solid #0087ff;
     }
   }
+
   .content-cloud {
     padding: 0px 10px;
     overflow-y: scroll;
-      height: 610px;
+    height: 658px;
+    
+    background: #fff;
+    margin-left: 16px;
     .content-cloud-body {
+      margin-bottom: 10px;
       height: 100px;
       height: 100px;
       margin-bottom: 10px;
       border-bottom: 1px solid #cccccc;
+
       .content-body-left {
         width: 85%;
         float: left;
@@ -1293,16 +1343,19 @@
           display: table;
           height: 50px;
           width: 80%;
+
           div {
             display: table-cell;
             width: 50%;
             font-size: 14px;
           }
         }
+
         .content-body-left-two {
           width: 80%;
           height: 50px;
           display: table;
+
           div {
             display: table-cell;
             width: 30%;
@@ -1310,24 +1363,29 @@
           }
         }
       }
+
       .content-body-right {
         width: 15%;
         float: left;
       }
     }
   }
+
   .content {
+    margin-left: 16px;
+    padding-left: 12px;
     padding-right: 10px;
     height: 610px;
     overflow-y: scroll;
-
+    background: #fff;
     .content-body {
-        padding-bottom: 20px;
-        padding-top: 20px;
+      padding-bottom: 10px;
+      padding-top: 10px;
       margin-right: 10px;
-        height: 150px;
+      height: 130px;
       border-bottom: #cccccc 1px solid;
       position: relative;
+
       .withdraw {
         width: 0.675rem;
         height: 0.3rem;
@@ -1412,15 +1470,15 @@
   }
 
   .button {
-      width: 96px;
-      height: 30px;
+    width: 80px;
+    height: 32px;
     margin: 5px 0;
-      background: #0087ff;
+    background: #0058e1;
     font-size: 14px;
     color: #fff;
-      border-radius: 4px;
+    border-radius: 1px;
     text-align: center;
-      line-height: 30px;
+    line-height: 32px;
     cursor: pointer;
   }