西海岸：应用详情：增加 审批通过可以查看马赛克内容 逻辑

back/src/views/modules/myAgent/approval.vue

@@ -83,6 +83,9 @@ export default {
             form: {
                 auditViem: ''
             },
+            dataForm: {
+                state: 0
+            },
             rowData: {},
             wrjStateObj: {
                 0: '待审批',
@@ -94,6 +97,7 @@ export default {
     },
     methods: {
         taskHandle(row) {
+            this.form.auditViem = '';
             this.rowData = row;
             this.centerDialogVisible = true
         },

front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue

@@ -13,7 +13,11 @@
         <p>{{ dataFrom.linkName }}</p>
         <a-tooltip>
           <template #title>请申请后查看</template>
-          <p style="cursor: pointer; filter: blur(4px)">
+          <!-- <p style="cursor: pointer; filter: blur(4px)">
+            {{ dataFrom.link }}
+          </p> -->
+          <p style="cursor: pointer;"
+            :class="{ 'blur-word': approveStatus == '通过' && whoShow1.itShowXiHaiAn ? false : true}">
             {{ dataFrom.link }}
           </p>
         </a-tooltip>
@@ -22,12 +26,11 @@
         <p>{{ dataFrom.numberName }}</p>
         <a-tooltip>
           <template #title>请申请后查看</template>
-          <p style="filter: blur(4px)">{{ dataFrom.number }}</p>
+          <!-- <p style="filter: blur(4px)">{{ dataFrom.number }}</p> -->
+          <p :class="{ 'blur-word': approveStatus == '通过' && whoShow1.itShowXiHaiAn ? false : true}">{{ dataFrom.number
+          }}</p>
         </a-tooltip>
-        <div
-          @click="copyFunction(dataFrom.number, '复制账号')"
-          v-if="dataFrom.number != '' && flag"
-        >
+        <div @click="copyFunction(dataFrom.number, '复制账号')" v-if="dataFrom.number != '' && flag">
           复制账号
         </div>
         <!-- <div v-else id="zanwu">暂无</div> -->
@@ -37,11 +40,9 @@
         <a-tooltip>
           <template #title>请申请后查看</template>
           <p style="filter: blur(4px)">{{ dataFrom.password }}</p>
+          <p style="filter: blur(4px)" :class="{ 'blur-word': approveStatus == '通过' && whoShow1.itShowXiHaiAn ? false : true}">{{ dataFrom.password }}</p>
         </a-tooltip>
-        <div
-          @click="copyFunction(dataFrom.password2, '复制密码')"
-          v-if="dataFrom.password2 != '' && flag"
-        >
+        <div @click="copyFunction(dataFrom.password2, '复制密码')" v-if="dataFrom.password2 != '' && flag">
           复制密码
         </div>
         <!-- <div v-else id="zanwu">暂无</div> -->
@@ -50,16 +51,16 @@
   </div>
 </template>
 <script setup>
-  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue'
-  import { ref, defineProps, watch } from 'vue'
-  import { message } from 'ant-design-vue'
-  let flag = ref(true)
-  const whoShow1 = ref(whoShow)
-  console.log('whoShow1', whoShow1.value.itShowQingDao)
-  const props = defineProps({
+import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue'
+import { ref, defineProps, watch } from 'vue'
+import { message } from 'ant-design-vue'
+let flag = ref(true)
+const whoShow1 = ref(whoShow)
+console.log('whoShow1', whoShow1.value.itShowQingDao)
+const props = defineProps({
   dataList: { type: Object, default: null },
-  })
-  const dataFrom = ref({
+})
+const dataFrom = ref({
   linkName: '访问地址',
   link: '',
   numberName: '试用账号',
@@ -67,9 +68,13 @@
   passwordName: '试用密码',
   password: '**************************',
   password2: '',
-  })
-  if (props.dataList.infoList) {
-    let obj = props.dataList.approveStatus
+})
+console.log('props.dataList------------>', props.dataList);
+const approveStatus = ref('')
+
+if (props.dataList.infoList) {
+  let obj = props.dataList.approveStatus;
+  approveStatus.value = props.dataList.approveStatus
   if (obj !== '通过' && whoShow1.value.itShowQingDao) {
     flag.value = false
   }
@@ -85,12 +90,12 @@
     dataFrom.value.password = ''
   }
   // }
-  }
-  const clickLink = (link) => {
+}
+const clickLink = (link) => {
   window.open(link)
-  }
-  //复制方法
-  const copyFunction = (data, name) => {
+}
+//复制方法
+const copyFunction = (data, name) => {
   if (data !== '') {
     let url = data
     let oInput = document.createElement('input')
@@ -104,22 +109,23 @@
   } else {
     message.error('复制为空')
   }
-  }
-  message.config({
+}
+message.config({
   top: '100px', // 距离顶部的位置
-  })
-  // const success = () => {
-  //   message.success({
-  //     // content: 'This is a prompt message with custom className and style',
-  //     className: 'custom-class',
-  //     style: {},
-  //   })
-  // }
-  watch(
+})
+// const success = () => {
+//   message.success({
+//     // content: 'This is a prompt message with custom className and style',
+//     className: 'custom-class',
+//     style: {},
+//   })
+// }
+watch(
   () => props.dataList,
   (val) => {
     if (val) {
       let obj = props.dataList.approveStatus
+      approveStatus.value = props.dataList.approveStatus
       if (obj !== '通过' && whoShow1.value.itShowQingDao) {
         flag.value = false
       }
@@ -136,14 +142,15 @@
       }
     }
   }
-  )
+)
 </script>
 <style lang="less" scoped>
-  .algorithm-on-trial {
+.algorithm-on-trial {
   padding: 0.8rem 0px 0.8rem;
   display: flex;
   flex-direction: column;
   align-items: center;
+
   .main {
     margin-top: 0.3rem;
     width: 13rem;
@@ -152,11 +159,13 @@
     display: grid;
     grid-template-columns: 33.33% 33.33% 33.33%;
     align-items: center;
+
     .main-left {
       border-right: 0.01rem #ffffff solid;
       padding-left: 0.7rem;
       padding-right: 1rem;
-        & > p {
+
+      &>p {
         overflow: hidden;
         text-overflow: ellipsis;
         display: -webkit-box;
@@ -165,29 +174,35 @@
         -webkit-box-orient: vertical;
       }
     }
+
     .main-center {
       padding-left: 1rem;
       padding-right: 1rem;
     }
+
     .main-right {
       padding-right: 0.7rem;
     }
-      & > div > p:first-child {
+
+    &>div>p:first-child {
       font-size: 0.26rem;
       color: #ffffff;
       font-weight: bold;
     }
-      & > div > p:nth-child(2) {
+
+    &>div>p:nth-child(2) {
       font-size: 0.22rem;
       color: #ffffff;
       line-height: 0.34rem;
     }
-      & > div:first-child > p:last-child {
+
+    &>div:first-child>p:last-child {
       text-decoration: underline;
       word-wrap: break-word;
       word-break: normal;
     }
-      & > div > div:last-child {
+
+    &>div>div:last-child {
       height: 0.34rem;
       width: 1.1rem;
       border: 0.01rem solid #ffffff;
@@ -199,6 +214,7 @@
       line-height: 0.34rem;
     }
   }
+
   #zanwu {
     height: 0.34rem;
     width: 1.1rem;
@@ -206,10 +222,14 @@
     color: #ffffff;
     border: 0;
   }
-  }
+}
+
+.blur-word {
+  filter: blur(4px);
+}
 </style>
 <style>
-  .custom-class {
+.custom-class {
   /* top: 100px; */
-  }
+}
 </style>

front/src/views/home/algorithmCompare.vue

@@ -156,8 +156,11 @@
       class="modal-box"
       title="请选择"
       :visible="showAddModal"
-      :onOk="handleOk"
-      :onCancel="handleCancel"
+      ok-text="确认"
+      cancel-text="取消"
+      @ok="handleOk"
+      @cancel="handleCancel"
+      
     >
       <a-table
         :columns="columns"
@@ -652,7 +655,14 @@
   }
 </script>
 
+<style>
+ .ant-modal-footer {
+    display: block;
+  }
+</style>
+
 <style lang="less" scoped>
+ 
   .bg {
     background: #fff;
     height: 100vh;

front/src/views/home/apply.vue

@@ -746,7 +746,7 @@ export default {
         applicationSystem: formName.applicationSystem, // 应用系统
         applicationArea: JSON.stringify(formName.applicationScene), // 应用领域 
         demand: formName.applicationBackground, // 需求依据
-        applyUserId: formName.userId // 登录用户id
+        // applyUserId: formName.userId // 登录用户id
       }
       console.log('_data-----提交申请------->', _data);
       soldierApply(_data).then(res => {

front/src/views/home/infrastructurePage.vue

@@ -395,7 +395,7 @@
         destroyOnClose @cancel="videoClean">
         <template #footer></template>
         <div class="batch-video">
-          <div v-for="item in videoList" :key="item.id" style="width: 100%; height: 100%">
+          <div v-for="item in videoList" :key="item.id" style="width: 100%; height: 100%;position:relative">
             <p></p>
             <vue3VideoPlay v-bind="item.options" />
           </div>
@@ -659,7 +659,7 @@ const selectedRowKeys = ref([])
 const tabList = ref([
   {
     title: '设施类型',
-    content: isXiHaiAn ? ['视频资源', '城市云脑会客厅'] : ['视频资源', '云资源', '感知资源', '城市云脑会客厅'],
+    content: isXiHaiAn ? ['视频资源'] : ['视频资源', '云资源', '感知资源', '城市云脑会客厅'],
   },
   {
     title: '视频标签',
@@ -1261,6 +1261,8 @@ const getSoldierData = (indexFather, name) => {
       return message.error(res.data.msg)
     }
     let { list = [], total = 0 } = res.data.data;
+    console.log('total------------>', total);
+    
     pagination.value.total = total
     if (name == '无人机') {
       list.map((wrj) => {
@@ -2085,4 +2087,5 @@ const showMsg = () => {
 video::-webkit-media-controls {
   display: none !important;
 }
+
 </style>

front/src/views/newHome/components/CapabilityConvergence.vue

@@ -8,65 +8,40 @@
       <div class="bottom">
         <div class="item">
           <div class="zj">组件服务</div>
-          <div
-            class="name"
-            v-for="(item, index) in zjList"
-            :key="item.id"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne(item.id)"
-          >
+          <div class="name" v-for="(item, index) in zjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne(item.id)">
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('组件服务')">查看更多</div>
         </div>
         <div class="item">
           <div class="yy">应用资源</div>
-          <div
-            class="name"
-            v-for="(item, index) in yyList"
-            :key="item.id"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne(item.id)"
-          >
+          <div class="name" v-for="(item, index) in yyList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne(item.id)">
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('应用资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="jc">基础设施</div>
-          <div
-            class="name"
-            v-for="(item, index) in jcList"
-            :key="item.name"
-            :class="index == 2 ? 'name-last' : ''"
-            @click="selectOne2(item.name)"
-          >
+          <div class="name" v-for="(item, index) in jcList" :key="item.name" :class="index == 2 ? 'name-last' : ''"
+            @click="selectOne2(item.name)">
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
         </div>
         <div class="item">
           <div class="sj">数据资源</div>
-          <div
-            class="name"
-            v-for="(item, index) in sjList"
-            :key="item.id"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne3(item.name)"
-          >
+          <div class="name" v-for="(item, index) in sjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne3(item.name)">
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('数据资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="zs">知识库</div>
-          <div
-            class="name"
-            v-for="(item, index) in zsList"
-            :key="item.id"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="openHref(item)"
-          >
+          <div class="name" v-for="(item, index) in zsList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+            @click="openHref(item)">
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('知识库')">查看更多</div>
@@ -76,26 +51,27 @@
   </div>
 </template>
 <script setup>
-  import {
+import {
   pageWithAttrs,
   getDataResource,
   selectInfrastructureList,
-  } from '@/api/home.js'
-  import { ref, reactive } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { useStore } from 'vuex'
-  import { updateVisits, browsingInsert } from '@/api/home'
-  import mybus from '@/myplugins/mybus'
-  const store = useStore()
-  const router = useRouter()
-  const zjList = ref([])
-  const jcList = ref([])
-  const sjList = ref([])
-  const yyList = ref([])
-  // 知识库模块数据
-  const zsList = ref([])
-  // const jcList = ref([])
-  const paramsGetResources = {
+} from '@/api/home.js'
+import { ref, reactive } from 'vue'
+import { useRouter } from 'vue-router'
+import { useStore } from 'vuex'
+import { updateVisits, browsingInsert, getSoldierList } from '@/api/home'
+import { message, Upload } from 'ant-design-vue'
+import mybus from '@/myplugins/mybus'
+const store = useStore()
+const router = useRouter()
+const zjList = ref([])
+const jcList = ref([])
+const sjList = ref([])
+const yyList = ref([])
+// 知识库模块数据
+const zsList = ref([])
+// const jcList = ref([])
+const paramsGetResources = {
   districtId: '',
   pageNum: 1,
   pageSize: 5,
@@ -104,19 +80,19 @@
   infoList: [],
   orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
   orderType: 'DESC', // ASC 升序  DESC 降序
-  }
-  console.log('dataShowdev==========================>', whoShow)
-  // eslint-disable-next-line no-undef
-  const whoShow1 = ref(whoShow)
-  const interfaceSuccess = ref(0)
-  const object = reactive({
+}
+console.log('dataShowdev==========================>', whoShow)
+// eslint-disable-next-line no-undef
+const whoShow1 = ref(whoShow)
+const interfaceSuccess = ref(0)
+const object = reactive({
   yyNum: '',
   zjNum: '',
   jcNum: '',
   sjNum: '',
   zsNum: '',
-  })
-  const getAppResources = (type, obj) => {
+})
+const getAppResources = (type, obj) => {
   paramsGetResources.type = type
   if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
     getDataResource({
@@ -164,22 +140,39 @@
   } else {
     let type = paramsGetResources.type
     if (type == '基础设施') {
+      jcList.value = []
       selectInfrastructureList().then((res) => {
         console.log('基础设施==========>', res.data.data)
         for (const key in res.data.data) {
+          if (whoShow1.value.itShowXiHaiAn) {
+            if (key === '视频资源') {
               jcList.value.push({
                 name: key,
                 num: res.data.data[key],
               })
             }
-          if (uavAndIndividualSoldier.num) {
+          } else {
+            jcList.value.push({
+              name: key,
+              num: res.data.data[key],
+            })
+          }
+        }
+        // 西海岸-单兵设备、无人机 获取数量
+        if (whoShow1.value.itShowXiHaiAn) {
+          getSoldierData('无人机').then(res => {
+            let { total = 0 } = res.data.data;
             jcList.value.push({
               name: '无人机',
-              num: uavAndIndividualSoldier.uavList.length,
+              num: total,
             })
+          })
+          getSoldierData('单兵设备').then(res => {
+            let { total = 0 } = res.data.data;
             jcList.value.push({
               name: '单兵设备',
-              num: uavAndIndividualSoldier.individualSoldier.length,
+              num: total,
+            })
           })
         }
       })
@@ -204,9 +197,32 @@
       })
     }
   }
+}
+
+// todo 获取无人机、单兵设备
+const getSoldierData = (name) => {
+  let _params = {
+    type: name,
+    page: 1,
+    limit: 10,
+  }
+  return new Promise((resolve, reject) => {
+    getSoldierList(_params).then(res => {
+      resolve(res)
+      console.log('res---获取无人机、单兵设备--------->', res);
+      if (res.data.code !== 0) {
+        return message.error(res.data.msg)
       }
 
-  const openHref = (item) => {
+      console.log('total------------>', total);
+    }).catch(err => {
+      reject(err)
+      message.error(err)
+    })
+  })
+}
+
+const openHref = (item) => {
   console.log(item.id, 'wowowo')
   console.log(item.visits, 'wowowo')
   browsingInsert({ resourceId: item.id }).then((res) => {
@@ -229,22 +245,22 @@
   //     'hisense_office/onlinePreview?url=' +
   //     btoa(encodeURI(item.fileHref))
   // )
-  }
-  const assignmentMethod = (type, res) => {
+}
+const assignmentMethod = (type, res) => {
   object[type] = res.data.data.total
   // interfaceSuccess.value++
   // console.log('object个数======>', object, interfaceSuccess.value, type)
   // if (interfaceSuccess.value >= 4) {
   //   mybus.emit('chagneNum', object)
   // }
-  }
-  getAppResources('组件服务', zjList)
-  getAppResources('应用资源', yyList)
-  getAppResources('基础设施', jcList)
-  getAppResources('数据资源', sjList)
-  getAppResources('知识库', zsList)
+}
+getAppResources('组件服务', zjList)
+getAppResources('应用资源', yyList)
+getAppResources('基础设施', jcList)
+getAppResources('数据资源', sjList)
+getAppResources('知识库', zsList)
 
-  function jumpPage(type) {
+function jumpPage(type) {
   // 点击内存入store
   store.commit('home/selectCardsData', {
     selectCardsnum: type,
@@ -260,8 +276,8 @@
       select: type,
     },
   })
-  }
-  const selectOne = (id) => {
+}
+const selectOne = (id) => {
   console.log('点击===============》', id)
   router.push({
     path: '/details',
@@ -269,8 +285,8 @@
       id: id,
     },
   })
-  }
-  const selectOne2 = (name) => {
+}
+const selectOne2 = (name) => {
   console.log('点击===============》', name)
   router.push({
     path: '/DetailsPageconetent',
@@ -279,8 +295,8 @@
       select: '基础设施',
     },
   })
-  }
-  const selectOne3 = (name) => {
+}
+const selectOne3 = (name) => {
   console.log('点击===============》', name)
   router.push({
     path: '/DetailsPageconetent',
@@ -289,7 +305,7 @@
       select: '数据资源',
     },
   })
-  }
+}
 </script>
 <style lang="less" scoped>
 .capability-convergence {
@@ -298,12 +314,14 @@
   background-size: 100%;
   display: flex;
   justify-content: center;
+
   .main {
     width: 13rem;
     margin-top: 1.8rem;
     display: flex;
     flex-direction: column;
     flex-wrap: wrap;
+
     .top {
       font-size: 0.3rem;
       color: #212121;
@@ -313,6 +331,7 @@
       flex-wrap: wrap;
       justify-content: center;
       align-items: center;
+
       .line {
         width: 0.34rem;
         height: 0.03rem;
@@ -320,10 +339,12 @@
         margin-top: 0.08rem;
       }
     }
+
     .bottom {
       display: flex;
       justify-content: space-between;
       margin-top: 0.4rem;
+
       .item {
         width: 2.44rem;
         height: 3.91rem;
@@ -332,6 +353,7 @@
         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;
@@ -340,21 +362,27 @@
           padding-left: 0.15rem;
           background-size: 100%;
         }
+
         .jc {
           background: url('~@/assets/newHome/Convergence-jc.png') no-repeat;
         }
+
         .sj {
           background: url('~@/assets/newHome/Convergence-sj.png') no-repeat;
         }
+
         .zj {
           background: url('~@/assets/newHome/Convergence-zj.png') no-repeat;
         }
+
         .yy {
           background: url('~@/assets/newHome/Convergence-yy.png') no-repeat;
         }
+
         .zs {
           background: url('~@/assets/newHome/Convergence-zs.png') no-repeat;
         }
+
         .name {
           height: 0.47rem;
           line-height: 0.47rem;
@@ -367,13 +395,16 @@
           -webkit-box-orient: vertical;
           word-break: break-all;
         }
+
         .name:hover {
           color: #0058e1;
           cursor: pointer;
         }
+
         .name-last {
           border-bottom: none;
         }
+
         .btn {
           cursor: pointer;
           width: 0.8rem;
@@ -388,11 +419,13 @@
           position: absolute;
           bottom: 0.2rem;
         }
+
         .btn:hover {
           background: rgba(0, 88, 225, 0.3);
           color: #000;
         }
       }
+
       .item:hover {
         border-radius: 0.02rem;
         border: 0.01rem solid #0058e1;