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

back/public/config/basicConfig.js

@@ -2,14 +2,14 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-08-25 14:37:49
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-13 14:49:32
+ * @LastEditTime: 2022-10-13 16:46:41
  * @Description: 告诉大家这是什么
  */
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', // 青岛
   // version: 'xihaian', // 西海岸
-  version: 'test', // 测试
+  version: 'dev', // 测试
   // version: 'frp', // 内网穿透
   // version: 'xihaian', // 开发
   vNum: 'v0.8.7.2',
@@ -43,7 +43,7 @@ var CONFIGITEM = {
     },
     dev: {
       previewUrl: 'http://localhost:8080/',
-      apiURL: 'http://192.168.124.236:8888/renren-admin',
+      apiURL: 'http://192.168.124.233:8888/renren-admin',
       websocketURL: 'ws://192.168.124.236:8888/renren-admin/websocket'
     }
   }

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

@@ -163,12 +163,25 @@ export const modalTypeText = {
 }
 
 export const getFuseResourceList = (abilityListObj) => {
+  console.log('abilityListObjabilityListObj',abilityListObj);
   const arr = []
   let length = 0
   for (const key in abilityListObj) {
     if (Object.hasOwnProperty.call(abilityListObj, key)) {
       const itemArray = abilityListObj[key]
-      itemArray.map((v, i) => {
+      if(key=='数据资源'){
+        itemArray.map((v, i) => {
+        const index = (i + 1) + length
+        arr.push({
+          resourceId: v.id,
+          type: key,
+          sequence: index,
+          resourceName:v.resourceName,
+          deptName:v.deptName,
+        })
+      })
+      }else{
+          itemArray.map((v, i) => {
         const index = (i + 1) + length
         arr.push({
           resourceId: v,
@@ -176,6 +189,8 @@ export const getFuseResourceList = (abilityListObj) => {
           sequence: index
         })
       })
+      }
+     
       length = itemArray.length
     }
   }
@@ -316,6 +331,7 @@ export default {
     },
     // 更新表单
     updateDataForm (data) {
+      console.log('datadatadata',data);
       if (Object.keys(this.getListParams).includes(data.title)) {
         this.abilityListObj[data.title] = data.list
       } else {
@@ -404,11 +420,15 @@ export default {
 
         // 组合能力--特殊处理
         Object.keys(this.getListParams).map(k => {
-          const arr = data.fuseResourceList.filter(v => v.type == k)
+          let arr = data.fuseResourceList.filter(v => v.type == k)
-          const arr2 = []
+          let arr2 = [];
+          if(k === "数据资源"){
+           arr2 = JSON.parse(JSON.stringify(arr));
+          }else{
           arr.map(v => {
             arr2.push(v.resourceId)
           })
+          }
           this.abilityListObj[k] = arr2
         })
       })

back/src/views/modules/ability/components/combine-ability.vue

@@ -20,7 +20,8 @@
                     :titles="nameArray" :props="{
                         key: 'id',
                         label: 'name',
-                    }" :data="transferData">
+                    }" :data="transferData"
+                     @change="handleChange">
                 </el-transfer>
                 <el-input
                   v-model="searchValue"
@@ -225,20 +226,29 @@ export default {
     async getDataInfo (dataForm) {
       await this.getData()
       const arr = []
-      const attrValue = dataForm.fuseResourceList.filter(v => v.type == this.type)
+      const attrValue = dataForm.fuseResourceList.filter(v => v.type == this.type);
+       console.log('attrValue22',attrValue);
       if (attrValue.length > 0) {
         attrValue.map(val => {
-          const _obj = {
+          if(val.type==="数据资源"){
+            const _obj = {
             type: val.type,
             id: val.resourceId,
-            name: val.resource && val.resource.name
+            name: val.resource && val.resource.resourceName,
           }
           arr.push(_obj)
+          }else{
+            const _obj = {
+            type: val.type,
+            id: val.resourceId,
+            name: val.resource && val.resource.name,
+          }
+          arr.push(_obj) 
+          }
         })
       }
-
       // 展示
-      this.displayList = JSON.parse(JSON.stringify(arr))
+      this.displayList = JSON.parse(JSON.stringify(arr));
       // 已选中
       this.selectedArray = arr.map(v => v.id)
       this.$nextTick(() => {
@@ -288,7 +298,9 @@ export default {
             this.transferData.push({
               type: this.type,
               id: v.guid,
-              name: v.zyname || '--'
+              name: v.zyname || '--',
+              deptName:v.TGBM,
+              resourceName:v.zyname
             })
           })
           this.allData = JSON.parse(JSON.stringify(this.transferData))
@@ -302,6 +314,26 @@ export default {
       return item.name && item.name.indexOf(query) > -1
     },
     confirmSubmitHandle () {
+      debugger
+      if(this.type === "数据资源"){
+       //通过选中的数据去查找原始列表数据
+      let selectedObjectList = [];
+      this.selectedArray.forEach((item)=>{
+        let filterData = [];
+        filterData = this.allData.filter(v => v.id == item);
+        //console.log('filterDatafilterData',filterData);
+        selectedObjectList.push(filterData[0]);
+      });
+       this.$emit('update', {
+        title: this.type,
+        list: selectedObjectList
+      })
+      }else{
+        this.$emit('update', {
+        title: this.type,
+        list: this.selectedArray
+      })
+      }
       if (this.selectedArray.length > this.maxNum) {
         return this.$message.error('最多选择十条数据！')
       }
@@ -312,12 +344,11 @@ export default {
           this.displayList.push(v)
         }
       })
-      this.$emit('update', {
-        title: this.type,
-        list: this.selectedArray
-      })
       console.log(this.selectedArray, this.displayList, 'this.displayList')
     },
+    handleChange(){
+      //console.log('222222',this.selectedArray);
+    },
     getDisplay (displayList) {
       this.displayList = []
       this.displayList = displayList

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-13 13:50:44
+ * @LastEditTime: 2022-10-13 19:03:07
  * @Description: 系统静态参数配置
  */
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
   // version: 'xihaian', // 西海岸
-  // version: 'dev', // 开发
+  version: 'dev', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
-  version: 'test', // 测试
+  // version: 'qingdao', // 测试
   //version: 'frp', // 内网穿透
   vNum: 'v0.8.7.2',
   configData: {
@@ -28,8 +28,7 @@ var CONFIGITEM = {
       previewUrl: 'http://15.72.183.90:7008/',
       //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
       //apiURL: 'http://15.72.183.90:8000/renren-admin',
-      // websocketURL: '15.72.183.90:8000/renren-admin',
+      websocketURL: '15.72.183.90:8000/renren-admin',
-      websocketURL: '192.168.124.254:8888/renren-admin', // 李志成-远雄
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -86,7 +85,7 @@ var CONFIGITEM = {
       },
       backUrl: 'http://localhost:8001',
       previewUrl: 'http://192.168.124.236:9796/',
-      websocketURL: '192.168.124.236:8888/renren-admin',
+      websocketURL: '192.168.124.233:8888/renren-admin',
       // websocketURL: '10.18.1.99:8889/renren-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',

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

@@ -25,7 +25,19 @@
               "
             >
               <template #title>点击查看详情</template>
-              <span class="hover-click num" @click="showDetail(item.type)">
+              <!-- 临时临时临时 -->
+              <span
+                v-show="item.type === '用户量'"
+                class="hover-click num"
+                @click="showDetail(item.type)"
+              >
+                482
+              </span>
+              <span
+                v-show="item.type !== '用户量'"
+                class="hover-click num"
+                @click="showDetail(item.type)"
+              >
                 {{ item.amount }}
               </span>
             </a-tooltip>

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

@@ -211,6 +211,7 @@
         })
       }
       console.log('laiyuanDataList.value', laiyuanDataList.value)
+      funnelPlot(laiyuanDataList.value)
     })
   }
   //来源部门饼图
@@ -568,14 +569,14 @@
     },
     { deep: true }
   )
-  watch(
+  // watch(
-    laiyuanDataList,
+  //   laiyuanDataList,
-    (value) => {
+  //   (value) => {
-      funnelPlot(value)
+  //     funnelPlot(value)
-      console.log(value, '   laiyuanDataList')
+  //     console.log(value, '   laiyuanDataList')
-    },
+  //   },
-    { deep: true }
+  //   { deep: true }
-  )
+  // )
 </script>
 <style lang="less" scoped>
   @font-face {

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

@@ -187,6 +187,7 @@
     require('../../../assets/abilityStatistics/zujianfuwu-bg.png'),
     require('../../../assets/abilityStatistics/shujuziyuan-bg.png'),
     require('../../../assets/abilityStatistics/jichujianshe-bg.png'),
+    require('../../../assets/abilityStatistics/yingyongziyuan-bg.png'),
   ])
   let photo = ref([
     require('../../../assets/abilityStatistics/yingyongziyuan.png'),
@@ -194,12 +195,13 @@
     require('../../../assets/abilityStatistics/zujianfuwu.png'),
     require('../../../assets/abilityStatistics/shujuziyuan.png'),
     require('../../../assets/abilityStatistics/jichujianshe.png'),
+    require('../../../assets/abilityStatistics/yingyongziyuan.png'),
   ])
   //申请量接口
   let dataLists = ref([])
   const myApplyAmount = () => {
     applyAmount().then((res) => {
-      // dataLists.value = res.data.data
+      dataLists.value = res.data.data
       res.data.data.map((item) => {
         switch (item.type) {
           case '应用资源':
@@ -217,6 +219,9 @@
           case '智能算法':
             dataLists.value[4] = item
             break
+            case '会客厅':
+            dataLists.value[5] = item
+            break
           default:
             dataLists.value.push(item)
             break

front/src/views/home/integrationServices.vue

@@ -35,7 +35,7 @@
       </div>
       <div v-loading="loadingData">
         <searchResultList
-          v-if="number === 0"
+          v-if="number === 1"
           v-show="resourceList.data && resourceList.data.length > 0"
           :resourceList="resourceList"
           :resourceTotal="resourceTotal"
@@ -124,14 +124,14 @@
       const titleName = ref([
         {
           name: '赋能场景',
-          index: 1,
+          index: 0,
         },
         {
           name: '打包模式',
-          index: 0,
+          index: 1,
         },
       ])
-      let number = ref(1)
+      let number = ref(0)
       // 查询参数
       const paramsGetResources = {
         page: currentPage.value,

front/src/views/home/integrationServicesDetails.vue

@@ -351,36 +351,17 @@
                   )?.attrValue || '组件服务',
               }))
             } else if (item.title === '数据资源') {
+
               arr = resource.map((res) => ({
-                id: res.resource.zycode,
+                id: res.resource.resourceId,
-                name: res.resource.zyname,
+                name: res.resource.resourceName,
-                dept: res.resource.TGBM,
+                dept: res.resource.deptName,
                 platform: '数据资源',
               }))
             }
           }
-          if (item.title === '数据资源') {
+         
-            // item.list.push({
+          item.list = arr
-            //   id: '数据资源1',
-            //   name: '城管案件数据',
-            //   dept: '市城管局',
-            //   platform: '政务信息共享交换网',
-            // })
-            // item.list.push({
-            //   id: '数据资源2',
-            //   name: '手机信令数据',
-            //   dept: '运营商（移动）',
-            //   platform: '政务信息共享交换网',
-            // })
-            // item.list.push({
-            //   id: '数据资源3',
-            //   name: '标准地址数据',
-            //   dept: '市自规局',
-            //   platform: '政务信息共享交换网',
-            // })
-          } else {
-            item.list = arr
-          }
         })
         detailInfoObj.value.infoList = []
         detailInfoObj.value.infoList.push(questionObj)