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

2022-06-23 19:19:32 +08:00 · 2022-06-23 19:19:32 +08:00 · 980cdb9e33
parent c66bf1de0d c9b12426ca
commit 980cdb9e33
13 changed files with 917 additions and 51 deletions
--- a/back/public/index.html
+++ b/back/public/index.html
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.wuhongjian
 * @Date: 2022-04-11 10:11:40
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-22 17:19:39
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-23 18:30:45
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@ -27,9 +27,9 @@
      'isTab': true,     // 是否通过tab展示内容?
      'iframeURL': ''    // 是否通过iframe嵌套展示内容? (以http[s]://开头, 自动匹配)
    };
-    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/#/vueTemplateDemo';  
+    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/#/vueTemplateDemo';  
    // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/#/vueTemplateDemo';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo';  
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo';  
    // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9797/#/vueTemplateDemo'; 
    window.SITE_CONFIG['menuList'] = [];                     // 左侧菜单列表（后台返回，未做处理）
    window.SITE_CONFIG['permissions'] = [];                  // 页面按钮操作权限（后台返回，未做处理）
@ -42,7 +42,8 @@
  <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
    <script>
      // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
    // window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin';
    // WebSocket地址
    window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket';
@ -71,7 +72,8 @@
      // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';

            // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
-      window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
+        window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
+      // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
      // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
      // WebSocket地址
      window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket';
--- a/back/src/assets/img/TOP5.png
+++ b/back/src/assets/img/TOP5.png
--- a/back/src/views/modules/abilityStatistics/applicationResources.vue
+++ b/back/src/views/modules/abilityStatistics/applicationResources.vue
@ -0,0 +1,110 @@
+<template>
+    <div class='container'>
+        <span class='title-style'>应用资源</span>
+        <span class='page-introduction'>发布情况统计</span>
+        <div class='container-body'>
+            <div class='container-body1'>
+                <span style='font-size:18px;color;#000000;'>评分发布情况</span>
+            </div>
+            <div class='container-body2'>
+                <span style='font-size:18px;color;#000000;'>发布量情况分布</span>
+            </div>
+            <div class='container-body3'>
+                <span style='font-size:18px;color;#000000;'>应用领域分布情况</span>
+            </div>
+             <div class='container-body4'>
+                <span style='font-size:18px;color;#000000;'>被调用组件及数量</span>
+                <img src="@/assets/img/TOP5.png" style='margin-left:10px'>
+            </div>
+             <div class='container-body5'>
+                <span style='font-size:18px;color;#000000;'>被申请组件及数量</span>
+                <img src="@/assets/img/TOP5.png" style='margin-left:10px'>
+            </div>
+             <div class='container-body6'>
+                <span style='font-size:18px;color;#000000;'>评分发布情况</span>
+            </div>
+             <div class='container-body7'>
+                <span style='font-size:18px;color;#000000;'>评分发布情况</span>
+            </div>
+        </div>
+    </div>
+</template>
+<style scoped>
+.container{
+    padding-top: 15px;
+}
+    .title-style{
+        font-size: 24px;
+        color:#000000;
+        font-weight: bold;
+    }
+    .page-introduction{
+        font-size: 18px;
+        color:#666666;
+        margin-left: 20px;
+    }
+    .container-body{
+        width:1300px;
+        margin-top:30px;
+        display: flex;
+        flex-wrap:wrap
+    }
+    .container-body1{
+        width:420px;
+        height:250px;
+        background-color: #ffffff;
+        margin-right:20px;
+        padding-top:20px;
+        padding-left: 20px;
+        
+    }
+    .container-body2{
+        width:420px;
+        height:250px;
+        background-color: #ffffff;
+        margin-right:20px;
+        padding-top:20px;
+        padding-left: 20px;
+    }
+    .container-body3{
+        width:420px;
+        height:250px;
+        background-color: #ffffff;
+        padding-top:20px;
+        padding-left: 20px;
+    }
+    .container-body4{
+        width:640px;
+        height:300px;
+        background-color: #ffffff;
+        padding-top:20px;
+        padding-left: 20px;
+        margin-top: 20px;
+        margin-right: 20px;
+    }
+    .container-body5{
+        width:640px;
+        height:300px;
+        background-color: #ffffff;
+        padding-top:20px;
+        padding-left: 20px;
+        margin-top: 20px;
+    }
+     .container-body6{
+        width:420px;
+        height:250px;
+        background-color: #ffffff;
+        margin-right:20px;
+        padding-top:20px;
+        padding-left: 20px;
+        margin-top: 20px;
+    }
+     .container-body7{
+        width:860px;
+        height:250px;
+        background-color: #ffffff;
+        padding-top:20px;
+        padding-left: 20px;
+        margin-top: 20px;
+    }
+</style>
--- a/back/src/views/modules/abilityStatistics/componentServices.vue
+++ b/back/src/views/modules/abilityStatistics/componentServices.vue
@ -0,0 +1,358 @@
+<template>
+    <div class='container'>
+        <span class='title-style'>组件服务</span>
+        <span class='page-introduction'>发布情况统计</span>
+        <div class='container-body'>
+            <div class='container-body1'>
+                <span style='font-size:18px;color;#000000;'>评分发布情况</span>
+                <div id="main1" style="width: 400px;height:200px;"></div>
+            </div>
+            <div class='container-body2'>
+                <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>
+                <div id="main3" style="width: 400px;height:200px;"></div>
+            </div>
+             <div class='container-body4'>
+                <span style='font-size:18px;color;#000000;'>被调用组件及数量</span>
+                <img src="@/assets/img/TOP5.png" style='margin-left:10px'>
+            </div>
+             <div class='container-body5'>
+                <span style='font-size:18px;color;#000000;'>被申请组件及数量</span>
+                <img src="@/assets/img/TOP5.png" style='margin-left:10px'>
+            </div>
+        </div>
+        <div class='footer'>
+            <div class='footer-left' ></div>
+            <span style='color:#b7c2d1;font-size:16px'>到底啦</span>
+            <div class='footer-right'></div>
+            </div>
+    </div>
+</template>
+<script>
+import * as echarts from 'echarts';
+
+export default {
+    mounted(){
+        this.myEcharts1()
+        this.myEcharts2()
+        this.myEcharts3()
+    },
+   methods:{
+    myEcharts1(){
+        var chartDom = document.getElementById('main1');
+        var myChart = echarts.init(chartDom);
+        var option;
+        option = {
+        tooltip: {
+            trigger: 'item'
+        },
+        legend: {
+            orient: '',
+            top: '14%',
+            left: '55%',
+            width:"auto",
+            height:"auto",
+            orient: "vertical",
+            itemGap: 15,
+            itemWidth: 14,
+            // 使用回调函数
+           formatter: function(name) {
+            var data = option.series[0].data;
+            var total = 0;
+            var tarValue;
+            for (var i = 0; i < data.length; i++) {
+              total += data[i].value;
+              if (data[i].name == name) {
+                tarValue = data[i].value;
+              }
+            }
+            var v = tarValue;
+            var p = Math.round(((tarValue / total) * 100));
+            return `${name}            ${p}%`;
+          },
+          itemStyle:{},
+          textStyle: {
+            color: "#666666",
+            padding:[0,8,0,18]
+          },
+        },
+        color: ['#0087ff', '#51cb8d', '#fcc549', '#ef6567', '#ff8a00', '#fc5656'],
+        series: [
+            {
+            type: 'pie',
+            radius: ['40%', '60%'],
+            center:['22%', '50%'],
+            avoidLabelOverlap: false,
+            itemStyle: {
+                borderRadius: 10,
+                borderColor: '#fff',
+                borderWidth: 2
+            },
+            label: {
+                show: false,
+                position: 'center'
+            },
+            emphasis: {
+                label: {
+                show: true,
+                fontSize: '40',
+                fontWeight: 'bold'
+                }
+            },
+            labelLine: {
+                show: false
+            },
+            data: [
+                { value: 1048, name: '1分' },
+                { value: 735, name: '2分' },
+                { value: 580, name: '3分' },
+                { value: 484, name: '4分' },
+                { value: 300, name: '5分' }
+            ]
+            }
+        ]
+        };
+
+        option && myChart.setOption(option);
+            },
+    myEcharts2(){
+        var chartDom = document.getElementById('main2');
+        var myChart = echarts.init(chartDom);
+        var option;
+        option = {
+        tooltip: {
+            trigger: 'item'
+        },
+        legend: {
+            orient: '',
+            top: '22%',
+            left: '50%',
+            width:"auto",
+            height:"auto",
+            orient: "vertical",
+            itemGap: 15,
+            itemWidth: 14,
+            // 使用回调函数
+           formatter: function(name) {
+            var data = option.series[0].data;
+            var total = 0;
+            var tarValue;
+            for (var i = 0; i < data.length; i++) {
+              total += data[i].value;
+              if (data[i].name == name) {
+                tarValue = data[i].value;
+              }
+            }
+            var v = tarValue;
+            var p = Math.round(((tarValue / total) * 100));
+            return `${name}         ${p}%`;
+          },
+          itemStyle:{},
+          textStyle: {
+            color: "#666666",
+            padding:[0,8,0,18]
+          },
+        },
+        color: ['#0087ff', '#51cb8d', '#fcc549', '#ef6567', '#ff8a00', '#fc5656'],
+        series: [
+            {
+            // name: 'Access From',
+            type: 'pie',
+            radius: ['40%', '60%'],
+            center:['22%', '50%'],
+            avoidLabelOverlap: false,
+            itemStyle: {
+                borderRadius: 10,
+                borderColor: '#fff',
+                borderWidth: 2
+            },
+            label: {
+                show: false,
+                position: 'center'
+            },
+            emphasis: {
+                label: {
+                show: true,
+                fontSize: '40',
+                fontWeight: 'bold'
+                }
+            },
+            labelLine: {
+                show: false
+            },
+            data: [
+                { value: 1048, name: '算法' },
+                { value: 735, name: '图层' },
+                { value: 580, name: '开发' },
+                { value: 484, name: '业务' },
+            ]
+            }
+        ]
+        };
+
+        option && myChart.setOption(option);
+            },
+    myEcharts3(){
+        var chartDom = document.getElementById('main3');
+        var myChart = echarts.init(chartDom);
+        var option;
+        option = {
+        tooltip: {
+            trigger: 'item'
+        },
+        legend: {
+            orient: '',
+            top: '22%',
+            left: '50%',
+            width:"auto",
+            height:"auto",
+            orient: "vertical",
+            itemGap: 15,
+            itemWidth: 14,
+            // 使用回调函数
+           formatter: function(name) {
+            var data = option.series[0].data;
+            var total = 0;
+            var tarValue;
+            for (var i = 0; i < data.length; i++) {
+              total += data[i].value;
+              if (data[i].name == name) {
+                tarValue = data[i].value;
+              }
+            }
+            var v = tarValue;
+            var p = Math.round(((tarValue / total) * 100));
+            return `${name}         ${p}%`;
+          },
+          itemStyle:{},
+          textStyle: {
+            color: "#666666",
+            padding:[0,8,0,18]
+          },
+        },
+        color: ['#0087ff', '#51cb8d', '#fcc549', '#ef6567', '#ff8a00', '#fc5656'],
+        series: [
+            {
+            // name: 'Access From',
+            type: 'pie',
+            radius: ['40%', '60%'],
+            center:['22%', '50%'],
+            avoidLabelOverlap: false,
+            itemStyle: {
+                borderRadius: 10,
+                borderColor: '#fff',
+                borderWidth: 2
+            },
+            label: {
+                show: false,
+                position: 'center'
+            },
+            emphasis: {
+                label: {
+                show: true,
+                fontSize: '40',
+                fontWeight: 'bold'
+                }
+            },
+            labelLine: {
+                show: false
+            },
+            data: [
+                { value: 1048, name: '应用领域' },
+                { value: 735, name: '应用领域2' },
+                { value: 580, name: '应用领域3' },
+                { value: 484, name: '应用领域4' },
+            ]
+            }
+        ]
+        };
+
+        option && myChart.setOption(option);
+            }
+   }
+}
+</script>
+<style scoped>
+.container{
+    padding-top: 15px;
+}
+    .title-style{
+        font-size: 24px;
+        color:#000000;
+        font-weight: bold;
+    }
+    .page-introduction{
+        font-size: 18px;
+        color:#666666;
+        margin-left: 20px;
+    }
+    .container-body{
+        width:1300px;
+        margin-top:30px;
+        display: flex;
+        flex-wrap:wrap
+    }
+    .container-body1{
+        width:420px;
+        height:250px;
+        background-color: #ffffff;
+        margin-right:20px;
+        padding-top:20px;
+        padding-left: 20px;
+        
+    }
+    .container-body2{
+        width:420px;
+        height:250px;
+        background-color: #ffffff;
+        margin-right:20px;
+        padding-top:20px;
+        padding-left: 20px;
+    }
+    .container-body3{
+        width:420px;
+        height:250px;
+        background-color: #ffffff;
+        padding-top:20px;
+        padding-left: 20px;
+    }
+    .container-body4{
+        width:640px;
+        height:300px;
+        background-color: #ffffff;
+        padding-top:20px;
+        padding-left: 20px;
+        margin-top: 20px;
+        margin-right: 20px;
+    }
+    .container-body5{
+        width:640px;
+        height:300px;
+        background-color: #ffffff;
+        padding-top:20px;
+        padding-left: 20px;
+        margin-top: 20px;
+    }
+    .footer{
+        display: flex;
+        margin-top:50px;
+        margin-left:365px;
+    }
+    .footer-left{
+        width:250px;
+        height:1px;
+        background-color:#e0eaf8;
+        margin-right:10px;
+        margin-top:8px
+    }
+    .footer-right{
+        width:250px;
+        height:1px;
+        background-color:#e0eaf8;
+        margin-left:10px;
+        margin-top:8px
+    }
+</style>
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@ -0,0 +1,250 @@
+<template>
+<div>
+     <el-card shadow="never" class="aui-card--fill"  v-if='homeIsShow'>
+    <div class="mod-demand__bsdemand">
+        <div class='top-box'>
+            <span class='title'>能力统计</span>
+            <div class='title-list-style'>
+            <div v-for="(item,index) in titleList" :key='index' class='title-single' :class="{'choseStyle':choseId=== index}" @click="choseBtn(index)">
+             <span class='box-style'>{{item.name}}</span>
+            </div>
+    </div>
+        </div>
+         <div class='second-title'>
+            <span style='margin-right:30px' :class="[departmentId===1?'departmentStyle':'']" @click="handleChose(1)">
+                部门发布情况
+            </span>
+            <span :class="[departmentId===2?'departmentStyle':'']"  @click="handleChose(2)">
+                部门使用情况
+            </span>           
+         </div>
+         <div class='line-style'></div>
+          <el-table
+        :data="tableData"
+        border
+        style="width: 100%">
+        <el-table-column
+            prop="name"
+            label="部门名称"
+            min-width="100%">
+        </el-table-column>
+        <el-table-column
+            prop="releaseNum"
+            label="发布总数"
+            min-width="100%">
+        </el-table-column>
+        <el-table-column
+            prop="applyNum"
+            label="被申请总数"
+            min-width="100%">
+        </el-table-column>
+        <el-table-column
+            prop="browseNmu"
+            label="浏览总量"
+            min-width="100%">
+        </el-table-column>
+        <el-table-column
+            prop="collectNum"
+            label="收藏量"
+            min-width="100%">
+        </el-table-column>
+        <el-table-column
+            prop="transferNum"
+            label="被调用总数"
+            min-width="100%">
+        </el-table-column>
+        <el-table-column
+            prop="applicationNum"
+            label="被应用总数"
+            min-width="100%">
+        </el-table-column>
+        <el-table-column
+            prop="needApplicationNum"
+            label="需申请数量"
+            min-width="100%">
+        </el-table-column>
+        <el-table-column
+            prop="reductionNum"
+            label="免批数量"
+            min-width="100%">
+        </el-table-column>
+        <el-table-column
+            label="操作"
+            min-width="92%">
+        <template slot-scope="scope">
+            <el-button @click="handleClick(scope.row)" type="text" size="small">查看详情</el-button>
+        </template>
+        </el-table-column>
+    </el-table>
+    <div class="block">
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage4"
+      :page-sizes="[10, 20, 30, 40]"
+      layout="total, prev, pager, next, jumper"
+      :total="40">
+    </el-pagination>
+  </div>
+    </div>   
+  </el-card>
+   <component-services v-if='servicesIsShow' ></component-services>
+   <application-resources  v-if='resourcesIsShow'></application-resources>
+
+</div>
+ 
+  
+</template>
+<script>
+import componentServices from './componentServices.vue'
+import applicationResources from './applicationResources.vue'
+export default {
+    components:{componentServices,applicationResources},
+    data(){
+        return{
+            choseId:null,
+            departmentId:1,
+            currentPage4: 4,
+            homeIsShow:true,
+            servicesIsShow:false,
+            resourcesIsShow:false,
+            titleList:[
+                {name:'组件服务',key:1}, {name:'应用资源',key:2}, {name:'基础设施',key:3}, {name:'数据资源',key:3}, {name:'知识库',key:3},
+            ],
+            tableData: [{
+                name: '部门名称一',
+                releaseNum: 111,
+                applyNum: 222,
+                browseNmu: 333,
+                collectNum:444,
+                transferNum:555,
+                applicationNum:666,
+                needApplicationNum:777,
+                reductionNum:888,
+                },{
+                name: '部门名称一',
+                releaseNum: 111,
+                applyNum: 222,
+                browseNmu: 333,
+                collectNum:444,
+                transferNum:555,
+                applicationNum:666,
+                needApplicationNum:777,
+                reductionNum:888,
+                },{
+                name: '部门名称一',
+                releaseNum: 111,
+                applyNum: 222,
+                browseNmu: 333,
+                collectNum:444,
+                transferNum:555,
+                applicationNum:666,
+                needApplicationNum:777,
+                reductionNum:888,
+                },{
+                name: '部门名称一',
+                releaseNum: 111,
+                applyNum: 222,
+                browseNmu: 333,
+                collectNum:444,
+                transferNum:555,
+                applicationNum:666,
+                needApplicationNum:777,
+                reductionNum:888,
+                },
+            ]
+        }
+    },
+     methods: {
+      handleClick(row) {
+        console.log(row);
+      },
+      //选择组件
+      choseBtn(index){
+        this.choseId=index
+        if (index===0){
+            this.homeIsShow=false
+            this.servicesIsShow=true
+        } else if(index===1){
+            this.homeIsShow=false
+            this.servicesIsShow=false
+            this.resourcesIsShow=true
+        }
+      },
+      //选择发布or使用表格
+      handleChose(index){
+        this.departmentId=index
+      },
+      //翻页
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+      },
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+      }
+    },
+
+}
+</script>
+<style lang="scss" scoped>
+.top-box{
+    height:80px;
+    background-color: #fafafc;
+}
+    .title{
+        display: flex;
+        font-size:20px;
+        color:#000000;
+        font-weight: bold;
+        padding-left:15px;
+        padding-top:10px;
+    }
+    .title-list-style{
+        display: flex;
+        margin-top:10px;
+        
+    }
+    .title-single{
+        font-size:14px;
+        width:90px;
+        color:#666666;
+        height:24px;
+        margin-left:10px;
+        border:1px solid #cccccc;
+        border-radius: 12px;
+        cursor:pointer
+       
+    }
+    .box-style{
+        width:90px;
+        height:24px;
+        display:flex;
+        justify-content: center;
+        align-items: center;
+        padding-bottom: 2px;
+    }
+    .second-title{
+        margin-top:20px;
+        font-size: 14px;
+        color:#979eb9;
+        cursor:pointer
+    }
+    .line-style{
+         width:100%;
+         height:1px;
+         background-color:#f5f6fa;
+         margin-top:15px;
+         margin-bottom:15px;
+    }
+   .aui-card--fill{
+        width:100% !important;
+        padding: 0px !important;
+    }
+    .choseStyle{
+        color:#526aff;
+        border:1px solid #526aff
+    }
+    .departmentStyle{
+        color:#526aff
+    }
+</style>
--- a/front/public/index.html
+++ b/front/public/index.html
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-03-29 16:45:25
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-22 18:46:16
+ * @LastEditTime: 2022-06-23 14:37:03
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@ -33,10 +33,10 @@
    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
    // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
    // 包头
-    window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
-    window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/';
-    window.SITE_CONFIG['frontUrl'] = 'http://10.110.205.1:8002/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://10.110.205.1:8000/renren-admin';
+    // window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
+    // window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://10.110.205.1:8002/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://10.110.205.1:8000/renren-admin';

    // 西海岸版本
    // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
@ -49,10 +49,10 @@
    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
    // 穿透版本
-    // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
-    // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
+    window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
+    window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
+    window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
  </script>

    <link href="./leaflet/libs/leaflet/1.3.1/leaflet.css" rel="stylesheet">
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@ -2,18 +2,20 @@
 * @Author: hisense.wuhongjian
 * @Date: 2020-07-07 16:03:23
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-22 18:46:24
+ * @LastEditTime: 2022-06-23 17:55:06
 * @Description: 数据资源参数配置
 */
-// const newLocation = 'qingdao'
+const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-const newLocation = 'baotou'
+// const newLocation = 'xihaian'

 // 数据资源数据
 const whoShow = {}
 const launchedDataNumObject = {}
 // 导航数据
 const navListManagement = {}
+// 区市站点数据
+const mapTestNum = {}
 // 底部数据
 const footerDataList = {}
 // qingdao
@ -51,6 +53,45 @@ if (newLocation === 'qingdao') {
      },
    ],
  }
+  mapTestNum.lsNum = [
+    {
+      name: '基础设施',
+      key: 'lsjcss',
+      num: 20135,
+    },
+    {
+      name: '数据资源',
+      key: 'lsjcss',
+      num: 857,
+    },
+    {
+      name: '应用资源',
+      key: 'lsjcss',
+      num: 28,
+    },
+  ]
+  mapTestNum.xhaNum = [
+    {
+      name: '基础设施',
+      key: 'xhajcss',
+      num: 35282,
+    },
+    {
+      name: '数据资源',
+      key: 'xhajcss',
+      num: 11,
+    },
+    {
+      name: '应用资源',
+      key: 'xhajcss',
+      num: 23,
+    },
+    {
+      name: '组件服务',
+      key: 'xhazjfw',
+      num: 8,
+    },
+  ]
 }
 // baotou
 else if (newLocation === 'baotou') {
--- a/front/src/utils/request.js
+++ b/front/src/utils/request.js
@ -90,6 +90,30 @@ instance.interceptors.response.use(
    console.log('接口返回', response)
    console.log('接口返回headers', response.headers)
    console.log('接口返回REDIRECT', response.headers.redirect)
+
+    if (response.headers.redirect === '/#/login') {
+      var keys = document.cookie.match(/[^ =;]+(?=\=)/g)
+      if (keys) {
+        for (var i = keys.length; i--; ) {
+          document.cookie =
+            keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com
+          document.cookie =
+            keys[i] +
+            '=0;path=/;domain=' +
+            document.domain +
+            ';expires=' +
+            new Date(0).toUTCString() //清除当前域名下的，例如 .m.kevis.com
+          document.cookie =
+            keys[i] +
+            '=0;path=/;domain=kevis.com;expires=' +
+            new Date(0).toUTCString() //清除一级域名下的或指定的，例如 .kevis.com
+        }
+      }
+      console.log('已清除')
+      setTimeout(() => {
+        location.reload()
+      }, 1000)
+    }
    response['Access-Control-Expose-Headers'] = 'redirect'
    const { code, message } = response.data
    if (response.headers.token) {
@ -129,7 +153,30 @@ instance.interceptors.response.use(
    if (error.response && error.response.data) {
      console.log('接口返回', response)
      console.log('接口返回headers', response.headers)
-      console.log('接口返回REDIRECT', response.headers.redirect)
+      console.log('接口返回REDIRECT1111', response.headers.redirect)
+      if (response.headers.redirect === '/#/login') {
+        var keys = document.cookie.match(/[^ =;]+(?=\=)/g)
+        if (keys) {
+          for (var i = keys.length; i--; ) {
+            document.cookie =
+              keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com
+            document.cookie =
+              keys[i] +
+              '=0;path=/;domain=' +
+              document.domain +
+              ';expires=' +
+              new Date(0).toUTCString() //清除当前域名下的，例如 .m.kevis.com
+            document.cookie =
+              keys[i] +
+              '=0;path=/;domain=kevis.com;expires=' +
+              new Date(0).toUTCString() //清除一级域名下的或指定的，例如 .kevis.com
+          }
+        }
+        console.log('已清除')
+        setTimeout(() => {
+          location.reload()
+        }, 1000)
+      }
      if (response.headers.redirect) {
        window.location.href = response.headers.redirect
        return Promise.reject(error)
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@ -89,7 +89,7 @@
      dataList.value.dataList = res.data.data
      res.data.data.map((item, index) => {
        if (dataList.value.dataList[index].type === '数据资源') {
-          dataList.value.dataList[index].amount = dataSourceNum.value || 10433
+          dataList.value.dataList[index].amount = dataSourceNum.value || 0
        }
        dataList.value.dataList[index].organization = '个'
        dataList.value.dataList[index].photo = photo.value[index]
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@ -544,7 +544,6 @@
          </div>
        </div>
      </div>
-      -->
      <div v-if="resourceList.data?.length <= 0" style="margin-top: 2rem">
        <a-empty v-if="!(Cardsname == '数据资源')" />
      </div>
--- a/front/src/views/home/mapTest/index.vue
+++ b/front/src/views/home/mapTest/index.vue
@ -2,7 +2,7 @@
  <home-header></home-header>
  <div class="survey-left" @click="hidePop()">
    <div ref="cityMap" class="city-map-content-echarts"></div>
-    <div class="box xha" v-show="xhaFlag">
+    <div class="box xha" v-show="xhaFlag" v-if="xhaList">
      <div class="top">
        <span>西海岸</span>
        <span>
@ -11,12 +11,12 @@
        </span>
      </div>
      <div class="bottom">
-        <div class="item">
-          <span>基础设施</span>
+        <div class="item" v-for="item in xhaList" :key="item.key">
+          <span>{{ item.name }}</span>
          <i></i>
-          <span>35282</span>
+          <span>{{ item.num }}</span>
        </div>
-        <div class="item">
+        <!-- <div class="item">
          <span>数据资源</span>
          <i></i>
          <span>11</span>
@ -30,11 +30,11 @@
          <span>组件服务</span>
          <i></i>
          <span>8</span>
-        </div>
+        </div> -->
      </div>
      <div class="zx"></div>
    </div>
-    <div class="box lsq" v-show="lsqFlag">
+    <div class="box lsq" v-show="lsqFlag" v-if="lsList">
      <div class="top">
        <span>崂山区</span>
        <span>
@ -43,7 +43,12 @@
        </span>
      </div>
      <div class="bottom">
-        <div class="item">
+        <div class="item" v-for="item in lsList" :key="item.key">
+          <span>{{ item.name }}</span>
+          <i></i>
+          <span>{{ item.num }}</span>
+        </div>
+        <!-- <div class="item">
          <span>基础设施</span>
          <i></i>
          <span>20135</span>
@ -57,7 +62,7 @@
          <span>应用资源</span>
          <i></i>
          <span>28</span>
-        </div>
+        </div> -->
      </div>
      <div class="zx"></div>
    </div>
@ -73,6 +78,15 @@
  const echarts = require('echarts')
  const xhaFlag = ref(false)
  const lsqFlag = ref(false)
+  const lsList = ref([])
+  const xhaList = ref([])
+  // eslint-disable-next-line no-undef
+  const mapTestNum1 = mapTestNum
+  if (mapTestNum1) {
+    lsList.value = mapTestNum1.lsNum
+    xhaList.value = mapTestNum1.xhaNum
+  }
+  console.log('===============>', mapTestNum1)
  const areaMenuList = ref([
    // 全市概况
    // {
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@ -34,24 +34,28 @@
        </div>
        <div class="item">
          <div class="jc">基础设施</div>
-          <div class="name">1-J1-党建展示区走廊-北向</div>
-          <div class="name">2-J2-党建数据中心机房</div>
-          <div class="name">3-J3-党建展示区走廊-南向</div>
-          <div class="name">4-J4-党建大厅电动门</div>
-          <div class="name name-last">5-J5-指挥席位东北向</div>
+          <div
+            class="name"
+            v-for="(item, index) in jcList"
+            :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="sj">数据资源</div>
-          <div class="name">1-扬尘数据接口</div>
-          <div class="name">2-根据证件号码查询全员核酸检测信息(人社专用)</div>
-          <div class="name">
-            3-根据身份证号、姓名、开始日期、结束日期获取医保住院结算信息（市人社局专用）
+          <div
+            class="name"
+            v-for="(item, index) in sjList"
+            :key="item.id"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne(item.id)"
+          >
+            {{ index + 1 }}-{{ item.name }}
          </div>
-          <div class="name">
-            4-根据身份证号、姓名、年度查询医保参保缴费信息（市委组织部专用）
-          </div>
-          <div class="name name-last">5-"金种子"人才培养经费查询API</div>
          <div class="btn" @click="jumpPage('数据资源')">查看更多</div>
        </div>
        <div class="item">
@ -72,13 +76,15 @@
  </div>
 </template>
 <script setup>
-  import { pageWithAttrs } from '@/api/home.js'
+  import { pageWithAttrs, getDataResource } from '@/api/home.js'
  import { ref } from 'vue'
  import { useRouter } from 'vue-router'
  import { useStore } from 'vuex'
  const store = useStore()
  const router = useRouter()
  const zjList = ref([])
+  const jcList = ref([])
+  const sjList = ref([])
  const yyList = ref([])
  // 知识库模块数据
  const zsList = ref([])
@ -93,15 +99,54 @@
    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 getAppResources = (type, obj) => {
    paramsGetResources.type = type
-    pageWithAttrs(paramsGetResources).then((res) => {
-      console.log('知识库查询列表============>', res.data.data.records)
-      obj.value = res.data.data.records
-    })
+    if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
+      getDataResource({
+        serviceName: paramsGetResources.name, //资源名称
+        orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段
+        orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
+        pageNum: paramsGetResources.pageNum, //页码
+        pageSize: paramsGetResources.pageSize, //分页大小
+      }).then((res) => {
+        console.log('数据资源==================>', res.data.data)
+        if (whoShow1.value.itShowQingDao) {
+          res.data.data.data.forEach((val) => {
+            val.id = val.guid // id
+            val.name = val.zyname // 名字
+            val.sjlCount = val.sjcczl // 数据量
+            val.applyCount = val.syqk // 申请量
+            val.deptName = val.TGBM // 部门
+            val.createDate = val.fbrq // 发布时间
+          })
+          obj.value = res.data.data.data || []
+        } else if (whoShow1.value.itShowXiHaiAn) {
+          res.data.data.list.forEach((val) => {
+            val.id = val.serviceId // id
+            val.name = val.serviceName // 名字
+            val.sjlCount = val.requestQuantity // 数据量
+            val.applyCount = val.requestCount // 申请量
+            val.deptName = val.departmentName // 部门
+            val.createTime = val.createTime.split('.')[0]
+            val.createDate = val.createTime // 发布时间
+          })
+          obj.value = res.data.data.list || []
+        }
+      })
+    } else {
+      pageWithAttrs(paramsGetResources).then((res) => {
+        // console.log('知识库查询列表============>', res.data.data.records)
+        obj.value = res.data.data.records
+      })
+    }
  }
  getAppResources('组件服务', zjList)
  getAppResources('应用资源', yyList)
+  getAppResources('基础设施', jcList)
+  getAppResources('数据资源', sjList)
  getAppResources('知识库', zsList)

  function jumpPage(type) {
--- a/front/src/views/newHome/components/Navigation2.vue
+++ b/front/src/views/newHome/components/Navigation2.vue
@ -47,9 +47,9 @@
  import { ref, onMounted } from 'vue'
  const yyNum = ref('')
  const zjNum = ref('')
-  const jcNum = ref('23万')
-  const sjNum = ref('10372')
-  const zsNum = ref('14')
+  const jcNum = ref('')
+  const sjNum = ref('')
+  const zsNum = ref('')
  selectTotal().then((res) => {
    console.log('selectTotal===============>', res.data.data)
    res.data.data.total.forEach((val) => {