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

back/src/views/modules/ability/assignedScene/add-update-scene.vue

@@ -27,10 +27,14 @@
             <el-form-item label="名称" prop="name">
               <el-input v-model="dataForm.name" placeholder="请输入名称" style="width:90%"></el-input>
             </el-form-item>
+           
             <el-form-item label="描述" prop="description">
               <el-input type="textarea" :rows="3" v-model="dataForm.description" placeholder="请输入描述" style="width:90%">
               </el-input>
             </el-form-item>
+            <el-form-item label="场景入口">
+              <el-input v-model="dataForm.sceneUrl" placeholder="请输入场景入口" style="width:90%"></el-input>
+            </el-form-item>
 
             <el-form-item label="图片">
               <el-upload ref="editUpload" class="upload-demo" :action="fileUploadUrl"
@@ -194,6 +198,7 @@ export default {
         name: '',
         applicationArea: '',
         description: '',
+        sceneUrl:'',
         fuseAttrList: [
           {
             attrType: '使用步骤',

back/src/views/modules/ability/assignedScene/index.vue

@@ -23,6 +23,7 @@
         style="width: 100%" :height="qp ? '810px' : '650px'">
         <el-table-column prop="name" label="名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="description" label="描述" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sceneUrl" label="场景入口" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="240" right="0">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('ability:bsabilityai:update')" type="text" size="small"

back/src/views/modules/abilityStatistics/index.vue

@@ -43,6 +43,7 @@
             placeholder="请选审核状态"
             clearable
           >
+          <el-option label="全部" value="-1"></el-option>
             <el-option label="审核完成" value="1"></el-option>
             <el-option label="审核中" value="0"></el-option>
           </el-select>
@@ -315,7 +316,8 @@ export default {
           type: ''
         }
       ],
-      examineStatus: '0', // 审核状态
+      examineStatus: '-1', // 审核状态
+      status:'',
       value1: [], // 起始时间
       abilityDepartment: '', // 部门
       abilityType: '', // 能力
@@ -335,17 +337,17 @@ export default {
   },
   created () {
     // 当前设定的日期时间
-    const d = new Date()
-    let year1, month1, day1
-    ;[year1, month1, day1] = [d.getFullYear(), d.getMonth(), d.getDate()]
-    const date1 = new Date(year1, month1, day1, 7)
-    this.value1.push(date1)
-    // 前一天设定的日期时间
-    let year2, month2, day2
-    d.setTime(d.getTime() - 24 * 60 * 60 * 1000)
-    ;[year2, month2, day2] = [d.getFullYear(), d.getMonth(), d.getDate()]
-    const date2 = new Date(year2, month2, day2, 7)
-    this.value1.unshift(date2)
+    // const d = new Date()
+    // let year1, month1, day1
+    // ;[year1, month1, day1] = [d.getFullYear(), d.getMonth(), d.getDate()]
+    // const date1 = new Date(year1, month1, day1, 7)
+    // this.value1.push(date1)
+    // // 前一天设定的日期时间
+    // let year2, month2, day2
+    // d.setTime(d.getTime() - 24 * 60 * 60 * 1000)
+    // ;[year2, month2, day2] = [d.getFullYear(), d.getMonth(), d.getDate()]
+    // const date2 = new Date(year2, month2, day2, 7)
+    // this.value1.unshift(date2)
   },
   mounted () {
     this.getFirstTree()
@@ -402,12 +404,17 @@ export default {
 
     // 组件服务部门发布情况--改为能力上架统计
     getFirstTree (page) {
+      if(this.examineStatus== '全部'){
+         this.status=''
+      }else{
+        this.status=this.examineStatus
+      }
       this.$http
         .get('/census/center/selectDeptDetailTypeCountList/', {
           params: {
             page: page || 1,
             limit: 5,
-            approveStatus: this.examineStatus,
+            approveStatus: this.status,
             deptId: this.abilityDepartment,
             params: '',
             startDate: this.startDate,
@@ -445,12 +452,17 @@ export default {
     },
     // 组件服务部门使用情况列表-改为能力使用统计
     getSecondTree () {
+      if(this.examineStatus== '全部'){
+         this.status=''
+      }else{
+        this.status=this.examineStatus
+      }
       this.$http
         .get('/census/center/selectApplyDeptDetailTypeCountList', {
           params: {
             // page: page || 1,
             // limit: 5,
-            approveStatus: this.examineStatus,
+            approveStatus: this.status,
             deptId: this.abilityDepartment,
             params: '',
             startDate: this.startDate,
@@ -501,7 +513,7 @@ export default {
             // page: page || 1,
             approveStatus: passAndReview,
             deptId: this.abilityDepartment,
-            type: '',
+            type: this.abilityType,
             startDate: this.startDate,
             endDate: this.endDate
           }
@@ -520,14 +532,19 @@ export default {
       } else {
         passAndReview = this.examineStatus
       }
+      if(this.examineStatus== '全部'){
+         this.status=''
+      }else{
+        this.status=this.examineStatus
+      }
       this.$http
         .get('/census/center/selectCensusApplyTable', {
           params: {
             // limit: 5,
             // page: page || 1,
-            approveStatus: this.examineStatus,
+            approveStatus: this.status,
             deptId: this.abilityDepartment,
-            type: '',
+            type: this.abilityType,
             startDate: this.startDate,
             endDate: this.endDate
           }
@@ -710,14 +727,19 @@ export default {
     },
     // 点击查询按钮查询数据
     getDataList () {
-      if (this.value1.length > 0) {
+      if (this.value1 && this.value1.length > 0) {
         this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd HH:mm:ss')
         this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd HH:mm:ss')
+      }else{
+        this.startDate =''
+        this.endDate =''
       }
       if (this.examineStatus == 0) {
         this.examineStatus = '审核中'
-      } else {
+      }  if (this.examineStatus == 1) {
         this.examineStatus = '审核完成'
+      } else {
+        this.examineStatus = '全部'
       }
 
       if (this.abilityDepartment) {
@@ -731,28 +753,23 @@ export default {
       } else {
         this.abilityType = ''
       }
-      console.log('查询参数开始时间1', this.startDate)
-      console.log('查询参数结束时间2', this.endDate)
-      console.log('查询参数审核状态', this.examineStatus)
-      console.log('查询参数部门', this.abilityDepartment)
-      console.log('查询参数类型', this.abilityType)
       if (this.departmentId === 1) {
-        if (this.detailFlag) {
-          this.handleChose(3)
-          this.detailFlag = !this.detailFlag
-        } else {
+        // if (this.detailFlag) {
+        //   this.handleChose(3)
+        //   this.detailFlag = !this.detailFlag
+        // } else {
           this.handleChose(1)
-          this.detailFlag = !this.detailFlag
-        }
+         // this.detailFlag = !this.detailFlag
+       // }
         // this.departmentId = 1;
       } else if (this.departmentId === 2) {
-        if (this.detailFlag) {
-          this.handleChose(4)
-          this.detailFlag = !this.detailFlag
-        } else {
+        // if (this.detailFlag) {
+        //   this.handleChose(4)
+        //   this.detailFlag = !this.detailFlag
+        // } else {
           this.handleChose(2)
-          this.detailFlag = !this.detailFlag
-        }
+        //   this.detailFlag = !this.detailFlag
+        // }
       } else if (this.departmentId === 3) {
         this.handleChose(3)
       } else {
@@ -763,26 +780,26 @@ export default {
     resetDataList () {
       this.startDate = ''
       this.endDate = ''
-      this.examineStatus = '审核中'
+      this.examineStatus = '全部'
       this.abilityDepartment = ''
       this.abilityType = ''
       if (this.departmentId === 1) {
-        if (this.detailFlag) {
-          this.handleChose(3)
-          this.detailFlag = !this.detailFlag
-        } else {
+        // if (this.detailFlag) {
+        //   this.handleChose(3)
+        //   this.detailFlag = !this.detailFlag
+        // } else {
           this.handleChose(1)
-          this.detailFlag = !this.detailFlag
-        }
+        //   this.detailFlag = !this.detailFlag
+        // }
         // this.departmentId = 1;
       } else if (this.departmentId === 2) {
-        if (this.detailFlag) {
-          this.handleChose(4)
-          this.detailFlag = !this.detailFlag
-        } else {
+        // if (this.detailFlag) {
+        //   this.handleChose(4)
+        //   this.detailFlag = !this.detailFlag
+        // } else {
           this.handleChose(2)
-          this.detailFlag = !this.detailFlag
-        }
+        //   this.detailFlag = !this.detailFlag
+        // }
       } else if (this.departmentId === 3) {
         this.handleChose(3)
       } else {

front/src/api/home.js

@@ -352,6 +352,14 @@ export function selectInfrastructureList(params) {
     params,
   })
 }
+//首页 组件服务
+export function selectCollectComponentList(params) {
+  return request({
+    url: 'resource/selectCollectComponentList',
+    method: 'get',
+    params,
+  })
+}
 // 根据instanceId获取摄像头列表
 export function getApplyCameraList(id) {
   return request({

front/src/views/capacityOnTheShelf/Application.vue

@@ -346,15 +346,15 @@
     ) {
       notFilled.value.push('应用领域')
     }
-    // if (
-    //   !dataFrom.value.infoList.filter(
-    //     (val) => val.attrType === '应用状态'
-    //   )[0] ||
-    //   !dataFrom.value.infoList.filter((val) => val.attrType === '应用状态')[0]
-    //     .attrValue
-    // ) {
-    //   notFilled.value.push('应用状态')
-    // }
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '应用状态'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '应用状态')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('应用状态')
+    }
     if (
       !dataFrom.value.infoList.filter(
         (val) => val.attrType === '应用类型'
@@ -373,6 +373,7 @@
     // ) {
     //   notFilled.value.push('共享条件')
     // }
+   
     if (notFilled.value.length > 0) {
       message.warning('请填写必填字段')
       console.log(notFilled.value)

front/src/views/home/components/ApplicationTopDetails.vue

@@ -27,9 +27,12 @@
             <span class="label" v-if="props.dataList.shareCondition">
               {{ props.dataList.shareCondition }}
             </span>
+           
           </p>
+         
         </div>
         <!-- <span class="label">免费</span> -->
+         
       </div>
       <div class="main">
         <!-- <a-tooltip placement="top">
@@ -42,6 +45,11 @@
             {{ props.dataList.description }}
           </div>
         </a-tooltip>
+        <div style="padding-top:20px">
+        <span >场景入口:</span>
+        <span style="margin-left:10px;cursor: pointer; text-decoration: underline;" 
+        @click="openScene(props.dataList.sceneUrl)">{{(props.dataList.sceneUrl)}}</span>
+      </div>
       </div>
       <div class="bottom" v-if="props.dataList.id">
         <!-- 融合服务 存在fuseResourceList -->
@@ -72,7 +80,9 @@
         </a-button> -->
       </div>
     </div>
-    <div class="right"></div>
+    <div class="right">
+    
+    </div>
   </div>
 </template>
 <script setup>
@@ -113,6 +123,10 @@
         )
       })
     }
+  }
+    //进入场景入口
+    const openScene = (val) => {
+      window.open(val, "_blank");
   }
   // // 立即申请
   function toView() {

front/src/views/home/components/integrationServiceOrder.vue

@@ -33,11 +33,11 @@ const orderList = [
     name: '发布时间',
     orderType: 'DESC',
   },
-  {
-    value: 'update_date',
-    name: '更新时间',
-    orderType: 'DESC',
-  },
+  // {
+  //   value: 'update_date',
+  //   name: '更新时间',
+  //   orderType: 'DESC',
+  // },
 ]
 const integrationOrderList = ref(JSON.parse(JSON.stringify(orderList)))
 const integrationOrder = reactive({

front/src/views/home/integrationServices.vue

@@ -67,7 +67,7 @@ export default defineComponent({
     // 分页
     const loading = ref(true)
     const currentPage = ref(1)
-    const currentPageSize = ref(5)
+    const currentPageSize = ref(10)
     const pageSizeOptions = ref(['2', '5', '10', '20', '50'])
     const router = useRouter()
     const select = router.currentRoute.value.query.select
@@ -137,10 +137,10 @@ export default defineComponent({
       searchValue.value = ''
       // 分页
       currentPage.value = 1
-      currentPageSize.value = 5
+      currentPageSize.value = 10
       // 重置查询条件
       paramsGetResources.page = 1
-      paramsGetResources.limit = 5
+      paramsGetResources.limit = 10
       paramsGetResources.orderField = 'create_date'
       paramsGetResources.orderType = 'DESC'
 

front/src/views/home/productService.vue

@@ -4,7 +4,7 @@
       <a-layout-header>
         <div class="title">最热能力</div>
         <div class="des">
-          能力资源汇聚、能力共享开放、赋能千行百业、孵化生态产业
+          能力资源、能力共享开放、赋能千行百业、孵化生态产业
         </div>
       </a-layout-header>
       <a-layout class="content">

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

@@ -8,7 +8,7 @@
       <div class="bottom">
         <div class="item">
           <div class="zj">组件服务</div>
-          <div
+          <!-- <div
             class="name"
             v-for="(item, index) in zjList"
             :key="item.id"
@@ -16,6 +16,15 @@
             @click="selectOne(item.id)"
           >
             {{ index + 1 }}-{{ item.name }}
+          </div> -->
+          <div
+            class="name"
+            v-for="(item, index) in zjList"
+            :key="item.name"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne1(item.name)"
+          >
+            {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('组件服务')">查看更多</div>
         </div>
@@ -80,6 +89,7 @@
     pageWithAttrs,
     getDataResource,
     selectInfrastructureList,
+    selectCollectComponentList
   } from '@/api/home.js'
   import { ref, reactive } from 'vue'
   import { useRouter } from 'vue-router'
@@ -209,7 +219,52 @@
               })
           }
         })
-      } else {
+      }   
+      else if (type == '组件服务') {
+        zjList.value = []
+        selectCollectComponentList().then((res) => {
+          for (const key in res.data.data) {
+            if (whoShow1.value.itShowXiHaiAn) {
+              if (key === '视频资源') {
+                zjList.value.push({
+                  name: key,
+                  num: res.data.data[key],
+                })
+              }
+            } else {
+              zjList.value.push({
+                name: key,
+                num: res.data.data[key],
+              })
+            }
+          }
+          // 西海岸-单兵设备、无人机 获取数量
+          if (whoShow1.value.itShowXiHaiAn) {
+            getSoldierData('无人机')
+              .then((res) => {
+                let { total = 0 } = res.data.data
+                zjList.value.push({
+                  name: '无人机',
+                  num: total,
+                })
+              })
+              .catch((err) => {
+                console.log('err--无人机---------->', err)
+              })
+            getSoldierData('单兵设备')
+              .then((res) => {
+                let { total = 0 } = res.data.data
+                zjList.value.push({
+                  name: '单兵设备',
+                  num: total,
+                })
+              })
+              .catch((err) => {
+                console.log('err--单兵设备---------->', err)
+              })
+          }
+        })
+      }  else {
         pageWithAttrs(paramsGetResources).then((res) => {
           console.log('object个数======>', type)
           obj.value = res.data.data.records
@@ -318,6 +373,15 @@
       },
     })
   }
+  const selectOne1 = (name) => {
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        type: name,
+        select: '组件服务',
+      },
+    })
+  }
   const selectOne2 = (name) => {
     console.log('点击===============》', name)
     router.push({

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

@@ -283,7 +283,7 @@
   }
   const mohuchaxun = ref('组件服务')
   function onSearch() {
-    if (text.value) {
+  // if (text.value) {
       snum.value.str = text.value
       console.log('===================>', text.value)
       store.commit('home/selectCardsData', snum.value)
@@ -291,9 +291,9 @@
         path: '/DetailsPageconetent',
         query: snum.value,
       })
-    } else {
-      message.warning('请输入查询内容！')
-    }
+    // } else {
+    //   message.warning('请输入查询内容！')
+    // }
     // router.push({ path: '/DetailsPageconetent' })
   }
 </script>