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

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

@@ -25,6 +25,7 @@
       <el-form :inline="true">
         <!--起始日期 @keyup.enter.native="getDataList()"-->
         <el-form-item>
+          <span>日期：</span>
           <el-date-picker
             v-model="value1"
             type="datetimerange"
@@ -38,6 +39,7 @@
         </el-form-item>
         <!--审核状态-->
         <el-form-item>
+          <span>审核状态：</span>
           <el-select
             v-model="examineStatus"
             placeholder="请选审核状态"
@@ -51,6 +53,7 @@
 
         <!--部门-->
         <el-form-item>
+          <span>部门名称：</span>
           <el-select
             v-model="abilityDepartment"
             placeholder="请选择部门"
@@ -67,6 +70,7 @@
 
         <!--类型-->
         <el-form-item>
+          <span>类型：</span>
           <el-select v-model="abilityType" placeholder="请选择类型" clearable>
             <el-option label="全部" value=""></el-option>
             <el-option
@@ -109,7 +113,7 @@
                   ? 'departmentStyle'
                   : ''
               ]"
-              @click="handleChose(1)"
+              @click="handleChose(3)"
             >
               能力上架统计
             </span>
@@ -119,7 +123,7 @@
                   ? 'departmentStyle'
                   : ''
               ]"
-              @click="handleChose(2)"
+              @click="handleChose(4)"
             >
               能力使用统计
             </span>
@@ -144,7 +148,7 @@
             style="width: 100%"
             v-show="this.departmentId === 1"
           >
-            <el-table-column prop="name" label="部门名称" min-width="100%">
+            <el-table-column prop="name" label="上架部门" min-width="100%">
             </el-table-column>
             <el-table-column label="组件">
               <el-table-column prop="znsf" label="智能算法" min-width="100%">
@@ -177,7 +181,7 @@
             style="width: 100%"
             v-show="this.departmentId === 2"
           >
-            <el-table-column prop="name" label="部门名称" min-width="100%">
+            <el-table-column prop="name" label="申请部门" min-width="100%">
             </el-table-column>
             <el-table-column label="组件">
               <el-table-column prop="znsf" label="智能算法" min-width="100%">
@@ -211,11 +215,15 @@
             style="width: 100%"
             v-show="this.departmentId === 3 || this.departmentId === 4"
           >
-            <el-table-column prop="deptName" label="部门" min-width="100%">
+          <el-table-column v-if="this.departmentId === 3" prop="deptName" label="上架部门" min-width="100%">
+            </el-table-column>
+            <el-table-column v-if="this.departmentId === 4" prop="deptName" label="申请部门" min-width="100%">
             </el-table-column>
             <el-table-column prop="resourceName" label="资源名称" min-width="100%">
             </el-table-column>
             <el-table-column prop="type" label="类型" min-width="100%"> </el-table-column>
+            <el-table-column v-if="this.departmentId === 4"  prop="resourceDeptName" label="提供部门" min-width="100%">
+            </el-table-column>
             <el-table-column prop="createDate" label="日期" min-width="100%"> </el-table-column>
             <el-table-column prop="approveStatus" label="状态" min-width="100%">
             </el-table-column>
@@ -390,7 +398,7 @@ export default {
         { name: '页面开发组件', value: 4 },
         { name: '应用资源', value: 5 }
       ], // 类型备选列表
-      detailFlag: true, // 明细返回按钮显示标志位
+      detailFlag: false, // 明细返回按钮显示标志位
       startDate: '', // 开始时间
       endDate: '' // 结束时间
     }
@@ -410,7 +418,15 @@ export default {
     // this.value1.unshift(date2)
   },
   mounted () {
-    this.getFirstTree()
+    // this.getFirstTree()
+    if (this.departmentId === 1) {
+      this.handleChose(3)
+      // this.departmentId = 1;
+    } else if (this.departmentId === 2) {
+      this.handleChose(4)
+      // this.departmentId = 2;
+    } else {
+    }
   },
   computed: {
     ...mapState(['departmentSelects'])
@@ -786,12 +802,14 @@ export default {
           // this.getUsedTree()
         }
       } else if (index === 3) {
+        this.detailFlag = false
         if (this.choseId === 0) {
           this.getOneDetail()
         } else {
           // this.getUsedTree()
         }
       } else if (index === 4) {
+        this.detailFlag = false
         if (this.choseId === 0) {
           this.getTwoDetail()
         } else {
@@ -879,7 +897,7 @@ export default {
       this.value1 = []
       this.startDate = ''
       this.endDate = ''
-      this.examineStatus = '全部'
+      this.examineStatus = ''
       this.abilityDepartment = ''
       this.abilityType = ''
       if (this.departmentId === 1) {

front/public/static/config/basicConfig.js

@@ -2,16 +2,16 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-12 15:29:29
+ * @LastEditTime: 2022-10-13 13:50:44
  * @Description: 系统静态参数配置
  */
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
   // version: 'xihaian', // 西海岸
-  version: 'dev', // 开发
+  // version: 'dev', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
-  //version: 'test', // 测试
+  version: 'test', // 测试
   //version: 'frp', // 内网穿透
   vNum: 'v0.8.7.2',
   configData: {

front/src/views/abilityStatistics/components/AbilityTotal.vue

@@ -15,11 +15,26 @@
           ></div>
           <div class="name">{{ item.type }}</div>
           <div class="organization-value">
-            <span class="num">{{ item.amount }}</span>
+            <a-tooltip
+              placement="top"
+              v-if="
+                useName === 'admin' &&
+                (item.type === '已上架部门数' ||
+                  item.type === '用户量' ||
+                  item.type === '资源申请量')
+              "
+            >
+              <template #title>点击查看详情</template>
+              <span class="hover-click num" @click="showDetail(item.type)">
+                {{ item.amount }}
+              </span>
+            </a-tooltip>
+            <span v-else class="num">
+              {{ item.amount }}
+            </span>
             <span class="organization">{{ item.organization }}</span>
           </div>
         </div>
-
         <div class="shuxian"></div>
       </div>
     </div>
@@ -27,21 +42,25 @@
 </template>
 <script setup>
   import { ref } from 'vue'
+  import { useStore } from 'vuex'
   import { totalResourceAggregation } from '@/api/abilityStatistics.js'
   let photo = ref([
+    require('../../../assets/abilityStatistics/Volume-of-covered-sectors.png'),
     require('../../../assets/abilityStatistics/pingtaifangwenliang.png'),
     require('../../../assets/abilityStatistics/yonghuliang.png'),
-    require('../../../assets/abilityStatistics/Volume-of-covered-sectors.png'),
     require('../../../assets/abilityStatistics/ziyuanhuijusnum.png'),
     require('../../../assets/abilityStatistics/ziyuanshenqingliang.png'),
   ])
   let dataList = ref([])
+  const store = useStore()
+  // 用户信息
+  const useName = ref(store.getters['user/username'])
   ///whole_amount接口
   function snum() {
     totalResourceAggregation().then((res) => {
-      dataList.value = res.data.data;
+      dataList.value = res.data.data
-      console.log('res.data.data------------>', res.data.data);
+      console.log('res.data.data------------>', res.data.data)
-      
+
       res.data.data.map((item, index) => {
         console.log('dataList', dataList.value)
         switch (item.type) {
@@ -68,6 +87,22 @@
     })
   }
   snum()
+  const showDetail = function (type) {
+    switch (type) {
+      case '已上架部门数':
+        window.open(window.SITE_CONFIG.backUrl + '/#/sys-dept', '_blank')
+        break
+      case '用户量':
+        window.open(window.SITE_CONFIG.backUrl + '/#/sys-user', '_blank')
+        break
+      case '资源申请量':
+        window.open(
+          window.SITE_CONFIG.backUrl + '/#/abilityStatistics-index',
+          '_blank'
+        )
+        break
+    }
+  }
 </script>
 <style lang="less" scoped>
   @font-face {
@@ -84,6 +119,9 @@
     font-size: 32px;
     font-weight: 600;
   }
+  .hover-click {
+    cursor: pointer;
+  }
   .ability-total {
     background: #f1f4fb;
     font-size: 18px;

front/src/views/home/integrationServicesDetails.vue

@@ -92,9 +92,15 @@
       >
         <div
           class="top"
-          style="font-size: 0.24rem; text-align: center; margin-bottom: 0.3rem"
+          style="font-size: 0.24rem;text-align: center; margin-bottom: 0.3rem"
         >
           {{ i == 0 ? '基础设施' : i == 1 ? '组件服务' : '数据资源' }}
+        </div>
+         <div
+          class="data-count"
+          style="font-size: 0.14rem; text-align: right; margin-bottom: 0.2rem"
+        >
+         <span style="color:#909399;">共 {{ i == 0 ? infrastructureCount : i == 1 ? componentCount : dataSourceCount }}条数据,示例数据如下：</span>
         </div>
         <div class="bottom" style="display: flex; align-items: flex-start">
           <div class="title" :class="'title' + i"></div>
@@ -171,6 +177,9 @@
   const solution = ref([])
   const step = ref([])
   const bgImg = ref('')
+  const dataSourceCount = ref(0)
+  const infrastructureCount = ref(0)
+  const componentCount = ref(0)
   const id = router.currentRoute.value.query.id
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0
@@ -283,6 +292,9 @@
           return message.error(res.data.msg)
         }
         detailInfoObj.value = res.data.data || {}
+        dataSourceCount.value = res.data.dataSourceCount || 0
+        infrastructureCount.value = res.data.infrastructureCount || 0
+        componentCount.value = res.data.componentCount || 0
         // 资源属性
         let fuseAttrList = res.data.data.fuseAttrList || []
         // 融合关系
@@ -667,6 +679,7 @@
         // width: 100%;
         font-size: 16px;
       }
+      .data-count{}
     }
 
     .name-box {