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

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

@@ -2,22 +2,22 @@
     <div class='container'>
         <div>
             <span class='title-style'>组件服务</span>
-            <span class='page-introduction'>发布情况统计</span>
+            <span class='page-introduction'>使用情况统计</span>
             <button class='back-btn' @click="backBtn">返回</button>
         </div>
         
         <div class='container-body'>
-            <div class='container-body1'>
+            <!-- <div class='container-body1'>
                 <span style='font-size:18px;color;#000000;'>评分发布情况</span>
                 <div id="main1" style="width: 400px;height:200px;"></div>
-            </div>
+            </div> -->
             <div class='container-body2'>
-                <span style='font-size:18px;color;#000000;'>发布量情况分布</span>
+                <span style='font-size:18px;color;#000000;'>使用组件数量分布</span>
                 <div id="main2" style="width: 400px;height:200px;"></div>
             </div>
             <div class='container-body3'>
-                <span style='font-size:18px;color;#000000;'>应用领域分布情况</span>
+                <span style='font-size:18px;color;#000000;'>使用组件应用领域分布情况</span>
-                <div id="main3" style="width: 400px;height:200px;"></div>
+                <div id="main8" style="width: 400px;height:200px;"></div>
             </div>
              <div class='container-body4'>
                 <div style='margin-bottom:30px'>
@@ -472,7 +472,7 @@ export default {
         
     }
     .container-body2{
-        width:420px;
+        width:640px;
         height:250px;
         background-color: #ffffff;
         margin-right:20px;
@@ -480,7 +480,7 @@ export default {
         padding-left: 20px;
     }
     .container-body3{
-        width:420px;
+        width:640px;
         height:250px;
         background-color: #ffffff;
         padding-top:20px;

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

@@ -36,7 +36,7 @@
             <span style='margin-right:30px' :class="[departmentId===1?'departmentStyle':'']" @click="handleChose(1)">
                 部门发布情况
             </span>
-            <span :class="[departmentId===2?'departmentStyle':'']"  @click="handleChose(2)">
+            <span v-if='this.choseId===0' :class="[departmentId===2?'departmentStyle':'']"  @click="handleChose(2)">
                 部门使用情况
             </span>           
          </div>
@@ -178,7 +178,7 @@ export default {
             titleList:[
                 {name:'组件服务',key:1}, {name:'应用资源',key:2}, {name:'基础设施',key:3}, {name:'数据资源',key:3}, {name:'知识库',key:3},
             ],
-            tableData: []
+            tableData: [{deptName:'部门',resourceNum:222}]
         }
     },
     created(){
@@ -216,7 +216,7 @@ export default {
                     // pageSize: 20
                     }                    
             }).then(res => {
-                this.tableData =res.data.data
+                // this.tableData =res.data.data
             })
             },
         //  // 获取部门列表
@@ -244,7 +244,7 @@ export default {
                     resourceType:'组件服务'
                     }                    
             }).then(res => {
-                this.tableData =res.data.data.list
+                // this.tableData =res.data.data.list
                 this.total = res.data.data.total            
             })
             },
@@ -258,7 +258,7 @@ export default {
                     resourceType:'组件服务'
                     }                     
             }).then(res => {
-                this.tableData =res.data.data.list
+                // this.tableData =res.data.data.list
             
             })
             },
@@ -272,7 +272,7 @@ export default {
                     resourceType:'应用资源'
                     }                     
             }).then(res => {
-                this.tableData =res.data.data.list
+                // this.tableData =res.data.data.list
                 this.total = res.data.data.total
             
             })
@@ -287,22 +287,31 @@ export default {
                     resourceType:'应用资源'
                     }                     
             }).then(res => {
-                this.tableData =res.data.data.list
+                // this.tableData =res.data.data.list
             
             })
             },
       handleClick(row) {
         if(this.choseId===0){
+            if(this.departmentId===1){
                     this.homeIsShow=false
                     this.servicesIsShow=true
                     this.tableId=row.deptId
                     this.fatherId=1
-        }else if(this.choseId===1){
+                }else if(this.departmentId===2){
+                    this.homeIsShow=false
+                    this.UsedIsShow=true
+                    this.tableId=row.deptId
+                    this.fatherId=1
+                }
+            else if(this.choseId===1){
                     this.homeIsShow=false
                     this.resourcesIsShow=true
                     this.tableId=row.deptId
                     this.fatherId=2
                 }
+            }
+           
        
       },
       //选择组件

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 18:17:07
+ * @LastEditTime: 2022-07-01 09:29:57
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -183,16 +183,30 @@ export default {
             })
           }
           this.dataForm.content = res.data.tAbilityApplicationDTOList[0]
+          const obj = {
+            name: '申请摄像头列表',
+            type: '基础设施',
+            describe: ''
+          }
+          let flag = false
           res.data.tAbilityApplicationDTOList.map(val => {
+            if (val.cameraList) {
+              flag = true
+              obj.describe += val.system
+            } else {
               this.$http.get('/resource/' + val.resourceId).then(res1 => {
-              console.log(res1.data.data, '1111111111111111111111111111111111')
+                // console.log(res1.data.data, '1111111111111111111111111111111111')
                 this.dataList.push({
                   name: res1.data.data.name,
                   type: res1.data.data.type,
                   describe: res1.data.data.description
                 })
               })
+            }
           })
+          if (flag) {
+            this.dataList.push(obj)
+          }
         })
         .catch(() => {})
     },

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

@@ -121,6 +121,7 @@
 <script setup>
   import { nextTick, ref } from 'vue'
   import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+  import { getCategoryTreePage } from '@/api/personalCenter'
   import {
     capabilityShareCapabilitySet,
     selectResourceListByDept,
@@ -317,23 +318,20 @@
   // 右侧列表
   const dataList = ref([])
   // 所有领域类型
-  const allType = ref([
+  const allType = ref([])
-    '社会治安',
+  getCategoryTreePage({
-    '城市管理',
+    page: 1,
-    '疫情防控',
+    limit: 99,
-    '危化品管理',
+    dictTypeId: '1513712507692818433',
-    '交通运输',
+  }).then((res) => {
-    '森林防火',
+    // console.log('kasdjflkajsdlkf ', res.data.data)
-    '防汛抗旱',
+    allType.value = []
-    '文化旅游',
+    res.data.data.list.map((val) => {
-    '非煤矿山',
+      if (val.dictLabel !== '其他') {
-    '医疗卫生',
+        allType.value.push(val.dictLabel)
-    '安全生产',
+      }
-    '生态环境',
+    })
-    '农业农村',
+  })
-    '市场监管',
-    '政务服务',
-  ])
   const flag = ref('')
   const nowShow = ref(false)
   const showDetails = (item) => {

front/src/views/assignCase/components/queryPage.vue

@@ -30,10 +30,10 @@
                 <span
                   v-for="(item, index) in tabClickData"
                   :key="index"
-                  :class="listBg == item.name ? 'down' : ''"
+                  :class="listBg == item.dictLabel ? 'down' : ''"
-                  @click="switchList(item.name)"
+                  @click="switchList(item.dictLabel)"
                 >
-                  {{ item.name }}
+                  {{ item.dictLabel }}
                 </span>
               </div>
               <a class="more" @click="lookmore(hidetext)">
@@ -82,6 +82,7 @@
   import { ref, onMounted } from 'vue'
   // import { useStore } from 'vuex'
   import { pageWithAttrs } from '@/api/home.js'
+  import { getCategoryTreePage } from '@/api/personalCenter.js'
   import { useRouter } from 'vue-router'
   // import { pinyin } from 'pinyin-pro'
   // import { Empty } from 'ant-design-vue'
@@ -159,6 +160,17 @@
       name: '其他',
     },
   ])
+  //赋能案例tab页接口
+  const tabChaXun = () => {
+    const params = {
+      page: 1,
+      limit: 99,
+      dictTypeId: '1513712507692818433',
+    }
+    getCategoryTreePage(params).then(({ data: res }) => {
+      tabClickData.value = res.data.list
+    })
+  }
   const tabClickShow = ref(false)
   const number = ref(0)
   const changeCards = (val) => {
@@ -195,6 +207,7 @@
   }
   //查询分页接口
   const init = (list) => {
+    tabChaXun()
     let params = {
       deptIds: [],
       districtId: '',

front/src/views/home/infrastructurePage.vue

@@ -156,6 +156,7 @@
     ], //显示所有按钮,
   })
   let visible = ref(false)
+  const jjssType = ref(router.currentRoute.value.query.type)
   const pagination = ref({
     total: 0,
     current: 1,
@@ -177,7 +178,12 @@
   })
   const showMap = ref(true)
   onMounted(() => {
+    if (jjssType.value) {
+      tabClick(0, jjssType.value)
+    } else {
       tabClick(0, '视频资源')
+    }
+
     getCamera()
     mybus.off('getListByParentId')
     mybus.on('getListByParentId', (parentId) => {

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

@@ -37,8 +37,9 @@
           <div
             class="name"
             v-for="(item, index) in jcList"
-            :key="item.id"
+            :key="item.name"
             :class="index == 2 ? 'name-last' : ''"
+            @click="selectOne2(item.name)"
           >
             {{ item.name + '-' + item.num + '项' }}
           </div>
@@ -232,6 +233,16 @@
       },
     })
   }
+  const selectOne2 = (name) => {
+    console.log('点击===============》', name)
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        type: name,
+        select: '基础设施',
+      },
+    })
+  }
 </script>
 <style lang="less" scoped>
   .capability-convergence {

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

@@ -1,6 +1,6 @@
 <template>
   <div class="navigation2">
-    <div class="item">
+    <div class="item" @click="jumpPage('组件服务')">
       <div class="img zj"></div>
       <div class="name">组件服务</div>
       <div class="sl">
@@ -8,7 +8,7 @@
         个
       </div>
     </div>
-    <div class="item">
+    <div class="item" @click="jumpPage('应用资源')">
       <div class="img yy"></div>
       <div class="name">应用资源</div>
       <div class="sl">
@@ -16,7 +16,7 @@
         个
       </div>
     </div>
-    <div class="item">
+    <div class="item" @click="jumpPage('基础设施')">
       <div class="img jc"></div>
       <div class="name">基础设施</div>
       <div class="sl">
@@ -24,7 +24,7 @@
         个
       </div>
     </div>
-    <div class="item">
+    <div class="item" @click="jumpPage('数据资源')">
       <div class="img sj"></div>
       <div class="name">数据资源</div>
       <div class="sl">
@@ -32,7 +32,7 @@
         项
       </div>
     </div>
-    <div class="item">
+    <div class="item" @click="jumpPage('知识库')">
       <div class="img zs"></div>
       <div class="name">知识库</div>
       <div class="sl">
@@ -45,6 +45,10 @@
 <script setup>
   import { selectTotal } from '@/api/home'
   import { ref, onMounted, onBeforeUnmount } from 'vue'
+  import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
+  const router = useRouter()
+  const store = useStore()
   // import mybus from '@/myplugins/mybus'
   const yyNum = ref('')
   const zjNum = ref('')
@@ -81,6 +85,23 @@
       }
     })
   })
+  function jumpPage(type) {
+    // 点击内存入store
+    store.commit('home/selectCardsData', {
+      selectCardsnum: type,
+    })
+    console.log(
+      '选中===================>',
+      store.getters['home/selectCardsnum']
+    )
+    // router.push({ path: '/DetailsPageconetent' })
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        select: type,
+      },
+    })
+  }
   // const findZywMessage = () => {
   //   zywMessage().then((res) => {
   //     // console.log('findMessage============>', res)
@@ -149,5 +170,28 @@
         }
       }
     }
+    .item:hover {
+      cursor: pointer;
+      .img {
+        animation: turn 5s linear infinite;
+      }
+    }
+  }
+  @keyframes turn {
+    0% {
+      -webkit-transform: rotateY(0deg);
+    }
+    25% {
+      -webkit-transform: rotateY(90deg);
+    }
+    50% {
+      -webkit-transform: rotateY(180deg);
+    }
+    75% {
+      -webkit-transform: rotateY(270deg);
+    }
+    100% {
+      -webkit-transform: rotateY(360deg);
+    }
   }
 </style>