修改bug

修改bug

src/permission.js

@@ -87,6 +87,8 @@ router.beforeEach(async (to, from, next) => {
                 if(userInfo.code == 400){
                     console.log("用户没有访问权限，将跳转到无权限页面！")
                     if (to.path !== '/no-permission') {
+                        //到达此页面后直接清理token,避免出现用户直接从url返回login导致无限循环
+                        removeToken()
                         //避免重复跳转
                         next({path:'/no-permission'})
                     } else {

src/views/dashboard/admin/components/LineChart.vue

@@ -62,158 +62,164 @@ export default {
             this.setOptions(this.chartData)
         },
         setOptions(chartData) {
+            console.log(chartData.length)
             //循环一下第一个数据，把日期取出来
-            const dates = chartData[0].data.map(item => item.date)
-            //管理员
-            let data1 = [];
-            for(let item of chartData[0].data) {
-                data1.push(item.count)
-            }
-            //个人会员
-            let data2 = [];
-            for(let item of chartData[1].data) {
-                data2.push(item.count)
-            }
-            //政务会员
-            let data3 = [];
-            for(let item of chartData[2].data) {
-                data3.push(item.count)
-            }
-            //企业会员
-            let data4 = [];
-            for(let item of chartData[3].data) {
-                data4.push(item.count)
-            }
-            //调研员
-            let data5 = [];
-            for(let item of chartData[4].data) {
-                data5.push(item.count)
-            }
+            if(chartData.length > 0){
+                const dates = chartData[0].data.map(item => item.date)
+                //管理员
+                let data1 = [];
+                for(let item of chartData[0].data) {
+                    data1.push(item.count)
+                }
+                //个人会员
+                let data2 = [];
+                for(let item of chartData[1].data) {
+                    data2.push(item.count)
+                }
+                //政务会员
+                let data3 = [];
+                for(let item of chartData[2].data) {
+                    data3.push(item.count)
+                }
+                //企业会员
+                let data4 = [];
+                for(let item of chartData[3].data) {
+                    data4.push(item.count)
+                }
+                //调研员
+                let data5 = [];
+                for(let item of chartData[4].data) {
+                    data5.push(item.count)
+                }
 
 
-            this.chart.setOption({
-                xAxis: {
-                    data: dates,
-                    boundaryGap: false,
-                    axisTick: {
-                        show: false
-                    }
-                },
-                grid: {
-                    left: 10,
-                    right: 10,
-                    bottom: 20,
-                    top: 30,
-                    containLabel: true
-                },
-                tooltip: {
-                    trigger: 'axis',
-                    axisPointer: {
-                        type: 'cross'
+                this.chart.setOption({
+                    xAxis: {
+                        data: dates,
+                        boundaryGap: false,
+                        axisTick: {
+                            show: false
+                        }
                     },
-                    padding: [5, 10]
-                },
-                yAxis: {
-                    axisTick: {
-                        show: false
+                    grid: {
+                        left: 20,
+                        right: 10,
+                        bottom: 20,
+                        top: 30,
+                        containLabel: true
                     },
-                    minInterval: 1,
-                    axisLabel: {
-                        formatter: function (value) {
-                            return value
-                        }
-                    }
-                },
-                legend: {
-                    data: ['管理员','个人会员','政务会员','企业会员','调研员']
-                    //管理员=10000
-                    //个人会员=1
-                    //政务会员=2
-                    //企业会员=3
-                    //调研员=4
-                },
-                series: [{
-                    name: '管理员',
-                    smooth: true,
-                    type: 'line',
-                    itemStyle: {
-                        normal: {
-                            color: '#5570F1',
-                            lineStyle: {
-                                color: '#5570F1',
-                                width: 2
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'cross'
+                        },
+                        padding: [5, 10]
+                    },
+                    yAxis: {
+                        axisTick: {
+                            show: false
+                        },
+                        minInterval: 1,
+                        axisLabel: {
+                            formatter: function (value) {
+                                return value
                             }
                         }
                     },
-                    data: data1,
-                    animationDuration: 2800,
-                    animationEasing: 'quadraticOut'
-                },{
-                    name: '个人会员',
-                    smooth: true,
-                    type: 'line',
-                    itemStyle: {
-                        normal: {
-                            color: '#FFCC91',
-                            lineStyle: {
+                    legend: {
+                        data: ['管理员','个人会员','政务会员','企业会员','调研员']
+                        //管理员=10000
+                        //个人会员=1
+                        //政务会员=2
+                        //企业会员=3
+                        //调研员=4
+                    },
+                    series: [{
+                        name: '管理员',
+                        smooth: true,
+                        type: 'line',
+                        itemStyle: {
+                            normal: {
+                                color: '#5570F1',
+                                lineStyle: {
+                                    color: '#5570F1',
+                                    width: 2
+                                }
+                            }
+                        },
+                        data: data1,
+                        animationDuration: 2800,
+                        animationEasing: 'quadraticOut'
+                    },{
+                        name: '个人会员',
+                        smooth: true,
+                        type: 'line',
+                        itemStyle: {
+                            normal: {
                                 color: '#FFCC91',
-                                width: 2
+                                lineStyle: {
+                                    color: '#FFCC91',
+                                    width: 2
+                                }
                             }
-                        }
-                    },
-                    data: data2,
-                    animationDuration: 2800,
-                    animationEasing: 'quadraticOut'
-                },{
-                    name: '政务会员',
-                    smooth: true,
-                    type: 'line',
-                    itemStyle: {
-                        normal: {
-                            color: '#91FFA5',
-                            lineStyle: {
+                        },
+                        data: data2,
+                        animationDuration: 2800,
+                        animationEasing: 'quadraticOut'
+                    },{
+                        name: '政务会员',
+                        smooth: true,
+                        type: 'line',
+                        itemStyle: {
+                            normal: {
                                 color: '#91FFA5',
-                                width: 2
+                                lineStyle: {
+                                    color: '#91FFA5',
+                                    width: 2
+                                }
                             }
-                        }
-                    },
-                    data: data3,
-                    animationDuration: 2800,
-                    animationEasing: 'quadraticOut'
-                },{
-                    name: '企业会员',
-                    smooth: true,
-                    type: 'line',
-                    itemStyle: {
-                        normal: {
-                            color: '#FF9191',
-                            lineStyle: {
+                        },
+                        data: data3,
+                        animationDuration: 2800,
+                        animationEasing: 'quadraticOut'
+                    },{
+                        name: '企业会员',
+                        smooth: true,
+                        type: 'line',
+                        itemStyle: {
+                            normal: {
                                 color: '#FF9191',
-                                width: 2
+                                lineStyle: {
+                                    color: '#FF9191',
+                                    width: 2
+                                }
                             }
-                        }
-                    },
-                    data: data3,
-                    animationDuration: 2800,
-                    animationEasing: 'quadraticOut'
-                },{
-                    name: '调研员',
-                    smooth: true,
-                    type: 'line',
-                    itemStyle: {
-                        normal: {
-                            color: '#97A5EB',
-                            lineStyle: {
+                        },
+                        data: data3,
+                        animationDuration: 2800,
+                        animationEasing: 'quadraticOut'
+                    },{
+                        name: '调研员',
+                        smooth: true,
+                        type: 'line',
+                        itemStyle: {
+                            normal: {
                                 color: '#97A5EB',
-                                width: 2
+                                lineStyle: {
+                                    color: '#97A5EB',
+                                    width: 2
+                                }
                             }
-                        }
-                    },
-                    data: data3,
-                    animationDuration: 2800,
-                    animationEasing: 'quadraticOut'
-                }]
-            })
+                        },
+                        data: data3,
+                        animationDuration: 2800,
+                        animationEasing: 'quadraticOut'
+                    }]
+                })
+
+            }
+
+
         }
     }
 }

src/views/dashboard/admin/index.vue

@@ -11,45 +11,45 @@
                             </div>
                             <div class="topDataBoxTitleText">待审核列表</div>
                         </div>
-                        <div class="topDataBoxList" v-if="indexData.apply">
+                        <div class="topDataBoxList">
                             <div class="topDataLi1">
                                 <div class="topDataMain">
                                     <span @click="goToList(1)">待审核资讯</span>
-                                    <span @click="goToList(1)">{{indexData.apply.article}}</span>
+                                    <span @click="goToList(1)">{{articleCount}}</span>
                                 </div>
                                 <div class="topDataMain">
                                     <span @click="goToList(8)">待审核广告</span>
-                                    <span @click="goToList(8)">{{indexData.apply.order}}</span>
+                                    <span @click="goToList(8)">{{adCount}}</span>
                                 </div>
                             </div>
                             <div class="topDataLi2">
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(2)">待审核商品</span>
-                                    <span @click="goToList(2)">{{indexData.apply.good}}</span>
+                                    <span @click="goToList(2)">{{goodsCount}}</span>
                                 </div>
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(3)">待审核书刊音像</span>
-                                    <span @click="goToList(3)">{{indexData.apply.book}}</span>
+                                    <span @click="goToList(3)">{{bookCount}}</span>
                                 </div>
                             </div>
                             <div class="topDataLi3">
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(4)">待审核招聘</span>
-                                    <span @click="goToList(4)">{{indexData.apply.jobRecruiting}}</span>
+                                    <span @click="goToList(4)">{{jobRecruitingCount}}</span>
                                 </div>
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(5)">待审核求职</span>
-                                    <span @click="goToList(5)">{{indexData.apply.jobHunting}}</span>
+                                    <span @click="goToList(5)">{{jobHuntingCount}}</span>
                                 </div>
                             </div>
                             <div class="topDataLi4">
                                 <div class="topDataMain">
                                     <span @click="goToList(6)">待审核行政通知</span>
-                                    <span @click="goToList(6)">{{indexData.apply.notice}}</span>
+                                    <span @click="goToList(6)">{{noticeCount}}</span>
                                 </div>
                                 <div class="topDataMain">
                                     <span @click="goToList(7)">待审核行政投诉</span>
-                                    <span @click="goToList(7)">{{indexData.apply.complaint}}</span>
+                                    <span @click="goToList(7)">{{complaintCount}}</span>
                                 </div>
                             </div>
                         </div>
@@ -65,7 +65,7 @@
                             </div>
                             网站数量
                         </div>
-                        <div class="twbNumber">{{indexData.website.count}}</div>
+                        <div class="twbNumber">{{allWebsiteCount}}</div>
                         <!-- <div class="twbStatus"><img src="@/assets/index/arrow-up.png"/> +12% <span>较上周</span></div> -->
                     </div>
                 </el-col>
@@ -77,7 +77,7 @@
                             </div>
                             栏目数量
                         </div>
-                        <div class="twbNumber">{{indexData.category.count}}</div>
+                        <div class="twbNumber">{{allCategoryCount}}</div>
                         <!-- <div class="twbStatus"><img src="@/assets/index/arrow-up.png"/> +18% <span>较昨天</span></div> -->
                     </div>
                 </el-col>
@@ -89,7 +89,7 @@
                             </div>
                             资讯发布总数量
                         </div>
-                        <div class="twbNumber">{{indexData.article.count}}</div>
+                        <div class="twbNumber">{{allArticleCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="6">
@@ -100,7 +100,7 @@
                             </div>
                             商品发布总数量
                         </div>
-                        <div class="twbNumber">{{indexData.good.count}}</div>
+                        <div class="twbNumber">{{allGoodsCount}}</div>
                     </div>
                 </el-col>
             </el-row>
@@ -113,7 +113,7 @@
                             </div>
                             书刊音像发布总数量
                         </div>
-                        <div class="twbNumber">{{indexData.book.count}}</div>
+                        <div class="twbNumber">{{allBookCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="6">
@@ -124,7 +124,7 @@
                             </div>
                             招聘发布总数量
                         </div>
-                        <div class="twbNumber">{{indexData.jobRecruiting.count}}</div>
+                        <div class="twbNumber">{{allJobRecruitingCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="6">
@@ -135,7 +135,7 @@
                             </div>
                             求职发布总数量
                         </div>
-                        <div class="twbNumber">{{indexData.jobHunting.count}}</div>
+                        <div class="twbNumber">{{allJobHuntingCount}}</div>
                     </div>
                 </el-col>
             </el-row>
@@ -160,7 +160,7 @@
                             </el-select>
                         </div>
                         <el-row style="background:#fff;padding:16px 16px 0;">
-                            <line-chart :chart-data="chartData.lineChartData" />
+                            <line-chart :chart-data="lineChartData" />
                         </el-row>
                     </div>
                 </el-col>
@@ -168,7 +168,7 @@
                     <div class="chartBox">
                         <div class="chartTitle">用户类型占比</div>
                         <div class="chart-wrapper">
-                            <ring-chart :chart-data="chartData.ringChartData" />
+                            <ring-chart :chart-data="ringChartData" />
                         </div>
                     </div>
                 </el-col>
@@ -186,41 +186,41 @@
                             </div>
                             <div class="topDataBoxTitleText">待审核列表</div>
                         </div>
-                        <div class="topDataBoxList" v-if="indexData.apply">
+                        <div class="topDataBoxList">
                             <div class="topDataLi1">
                                 <div class="topDataMain">
                                     <span @click="goToList(1)">待审核资讯</span>
-                                    <span @click="goToList(1)">{{indexData.apply.article}}</span>
+                                    <span @click="goToList(1)">{{articleCount}}</span>
                                 </div>
                             </div>
                             <div class="topDataLi2">
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(2)">待审核商品</span>
-                                    <span @click="goToList(2)">{{indexData.apply.good}}</span>
+                                    <span @click="goToList(2)">{{goodsCount}}</span>
                                 </div>
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(3)">待审核书刊音像</span>
-                                    <span @click="goToList(3)">{{indexData.apply.book}}</span>
+                                    <span @click="goToList(3)">{{bookCount}}</span>
                                 </div>
                             </div>
                             <div class="topDataLi3">
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(4)">待审核招聘</span>
-                                    <span @click="goToList(4)">{{indexData.apply.jobRecruiting}}</span>
+                                    <span @click="goToList(4)">{{jobRecruitingCount}}</span>
                                 </div>
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(5)">待审核求职</span>
-                                    <span @click="goToList(5)">{{indexData.apply.jobHunting}}</span>
+                                    <span @click="goToList(5)">{{jobHuntingCount}}</span>
                                 </div>
                             </div>
                             <div class="topDataLi4">
                                 <div class="topDataMain">
                                     <span @click="goToList(6)">待审核行政通知</span>
-                                    <span @click="goToList(6)">{{indexData.apply.notice}}</span>
+                                    <span @click="goToList(6)">{{noticeCount}}</span>
                                 </div>
                                 <div class="topDataMain">
                                     <span @click="goToList(7)">待审核行政投诉</span>
-                                    <span @click="goToList(7)">{{indexData.apply.complaint}}</span>
+                                    <span @click="goToList(7)">{{complaintCount}}</span>
                                 </div>
                             </div>
                         </div>
@@ -236,7 +236,7 @@
                             </div>
                             资讯发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.article.count}}</div>
+                        <div class="twbNumber">{{allArticleCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="6">
@@ -247,7 +247,7 @@
                             </div>
                             商品发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.good.count}}</div>
+                        <div class="twbNumber">{{allGoodsCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="6">
@@ -258,7 +258,7 @@
                             </div>
                             书刊音像发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.book.count}}</div>
+                        <div class="twbNumber">{{allBookCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="6">
@@ -269,7 +269,7 @@
                             </div>
                             求职发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.jobHunting.count}}</div>
+                        <div class="twbNumber">{{allJobHuntingCount}}</div>
                     </div>
                 </el-col>
             </el-row>
@@ -286,31 +286,31 @@
                             </div>
                             <div class="topDataBoxTitleText">待审核列表</div>
                         </div>
-                        <div class="topDataBoxList" v-if="indexData.apply">
+                        <div class="topDataBoxList">
                             <div class="topDataLi1">
                                 <div class="topDataMain">
                                     <span @click="goToList(1)">待审核资讯</span>
-                                    <span @click="goToList(1)">{{indexData.apply.article}}</span>
+                                    <span @click="goToList(1)">{{articleCount}}</span>
                                 </div>
                             </div>
                             <div class="topDataLi2">
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(2)">待审核商品</span>
-                                    <span @click="goToList(2)">{{indexData.apply.good}}</span>
+                                    <span @click="goToList(2)">{{goodsCount}}</span>
                                 </div>
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(3)">待审核书刊音像</span>
-                                    <span @click="goToList(3)">{{indexData.apply.book}}</span>
+                                    <span @click="goToList(3)">{{bookCount}}</span>
                                 </div>
                             </div>
                             <div class="topDataLi4">
                                 <div class="topDataMain">
                                     <span @click="goToList(6)">待审核行政通知</span>
-                                    <span @click="goToList(6)">{{indexData.apply.notice}}</span>
+                                    <span @click="goToList(6)">{{noticeCount}}</span>
                                 </div>
                                 <div class="topDataMain">
                                     <span @click="goToList(7)">待审核行政投诉</span>
-                                    <span @click="goToList(7)">{{indexData.apply.complaint}}</span>
+                                    <span @click="goToList(7)">{{complaintCount}}</span>
                                 </div>
                             </div>
                         </div>
@@ -326,7 +326,7 @@
                             </div>
                             资讯发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.article.count}}</div>
+                        <div class="twbNumber">{{allArticleCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="6">
@@ -337,7 +337,7 @@
                             </div>
                             商品发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.good.count}}</div>
+                        <div class="twbNumber">{{allGoodsCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="6">
@@ -348,7 +348,7 @@
                             </div>
                             书刊音像发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.book.count}}</div>
+                        <div class="twbNumber">{{allBookCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="6">
@@ -361,11 +361,11 @@
                         </div>
                         <div class="twbNumber2">
                             <div class="twbNumber2Item">
-                                <div class="twbNumber2ItemNum">{{indexData.notice.count}}</div>
+                                <div class="twbNumber2ItemNum">{{allNoticeCount}}</div>
                                 <div>行政通知</div>
                             </div>
                             <div class="twbNumber2Item">
-                                <div class="twbNumber2ItemNum">{{indexData.complaint.count}}</div>
+                                <div class="twbNumber2ItemNum">{{allComplaintCount}}</div>
                                 <div>行政投诉</div>
                             </div>
                         </div>
@@ -406,37 +406,37 @@
                             </div>
                             <div class="topDataBoxTitleText">待审核列表</div>
                         </div>
-                        <div class="topDataBoxList" v-if="indexData.apply">
+                        <div class="topDataBoxList">
                             <div class="topDataLi1">
                                 <div class="topDataMain">
                                     <span @click="goToList(1)">待审核资讯</span>
-                                    <span @click="goToList(1)">{{indexData.apply.article}}</span>
+                                    <span @click="goToList(1)">{{articleCount}}</span>
                                 </div>
                             </div>
                             <div class="topDataLi2">
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(2)">待审核商品</span>
-                                    <span @click="goToList(2)">{{indexData.apply.good}}</span>
+                                    <span @click="goToList(2)">{{goodsCount}}</span>
                                 </div>
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(3)">待审核书刊音像</span>
-                                    <span @click="goToList(3)">{{indexData.apply.book}}</span>
+                                    <span @click="goToList(3)">{{bookCount}}</span>
                                 </div>
                             </div>
                             <div class="topDataLi3">
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(4)">待审核招聘</span>
-                                    <span @click="goToList(4)">{{indexData.apply.jobRecruiting}}</span>
+                                    <span @click="goToList(4)">{{jobRecruitingCount}}</span>
                                 </div>
                             </div>
                             <div class="topDataLi4">
                                 <div class="topDataMain">
                                     <span @click="goToList(6)">待审核行政通知</span>
-                                    <span @click="goToList(6)">{{indexData.apply.notice}}</span>
+                                    <span @click="goToList(6)">{{noticeCount}}</span>
                                 </div>
                                 <div class="topDataMain">
                                     <span @click="goToList(7)">待审核行政投诉</span>
-                                    <span @click="goToList(7)">{{indexData.apply.complaint}}</span>
+                                    <span @click="goToList(7)">{{complaintCount}}</span>
                                 </div>
                             </div>
                         </div>
@@ -452,7 +452,7 @@
                             </div>
                             资讯发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.article.count}}</div>
+                        <div class="twbNumber">{{allWebsiteCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="6">
@@ -463,7 +463,7 @@
                             </div>
                             商品发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.good.count}}</div>
+                        <div class="twbNumber">{{allGoodsCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="6">
@@ -474,7 +474,7 @@
                             </div>
                             书刊音像发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.book.count}}</div>
+                        <div class="twbNumber">{{allBookCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="6">
@@ -485,7 +485,7 @@
                             </div>
                             招聘发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.jobRecruiting.count}}</div>
+                        <div class="twbNumber">{{allJobRecruitingCount}}</div>
                     </div>
                 </el-col>
             </el-row>
@@ -502,31 +502,31 @@
                             </div>
                             <div class="topDataBoxTitleText">待审核列表</div>
                         </div>
-                        <div class="topDataBoxList" v-if="indexData.apply">
+                        <div class="topDataBoxList">
                             <div class="topDataLi1">
                                 <div class="topDataMain">
                                     <span @click="goToList(1)">待审核资讯</span>
-                                    <span @click="goToList(1)">{{indexData.apply.article}}</span>
+                                    <span @click="goToList(1)">{{articleCount}}</span>
                                 </div>
                             </div>
                             <div class="topDataLi2">
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(2)">待审核商品</span>
-                                    <span @click="goToList(2)">{{indexData.apply.good}}</span>
+                                    <span @click="goToList(2)">{{goodsCount}}</span>
                                 </div>
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(3)">待审核书刊音像</span>
-                                    <span @click="goToList(3)">{{indexData.apply.book}}</span>
+                                    <span @click="goToList(3)">{{bookCount}}</span>
                                 </div>
                             </div>
                             <div class="topDataLi4">
                                 <div class="topDataMain">
                                     <span @click="goToList(6)">待审核行政通知</span>
-                                    <span @click="goToList(6)">{{indexData.apply.notice}}</span>
+                                    <span @click="goToList(6)">{{noticeCount}}</span>
                                 </div>
                                 <div class="topDataMain">
                                     <span @click="goToList(7)">待审核行政投诉</span>
-                                    <span @click="goToList(7)">{{indexData.apply.complaint}}</span>
+                                    <span @click="goToList(7)">{{complaintCount}}</span>
                                 </div>
                             </div>
                         </div>
@@ -542,7 +542,7 @@
                             </div>
                             资讯发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.article.count}}</div>
+                        <div class="twbNumber">{{allArticleCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="8">
@@ -553,7 +553,7 @@
                             </div>
                             商品发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.good.count}}</div>
+                        <div class="twbNumber">{{allGoodsCount}}</div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="8">
@@ -564,7 +564,7 @@
                             </div>
                             书刊音像发布数量
                         </div>
-                        <div class="twbNumber">{{indexData.book.count}}</div>
+                        <div class="twbNumber">{{allBookCount}}</div>
                     </div>
                 </el-col>
             </el-row>
@@ -601,17 +601,27 @@ export default {
     },
     data() {
         return {
-            userType: 0,//用户身份
-            indexData:[],//首页的全部数据
-            chartData: {
-                lineChartData:[],//折线图目前展示哪个数据
-                ringChartData: [],//圆环图数据
-                lineChartData1: [],//折线图数据 - 资讯
-                lineChartData2: [],//折线图数据 - 商品
-                lineChartData3: [],//折线图数据 - 书刊音像
-                lineChartData4: [],//折线图数据 - 招聘
-                lineChartData5: [],//折线图数据 - 求职
-            },
+            //防止对象超过三层无法被vue监听，直接把对象的属性拿出来放到这里
+            //待审核数据
+            articleCount: 0, //待审核资讯
+            adCount: 0, //待审核广告
+            goodsCount: 0, //待审核商品
+            bookCount: 0,//待审核书刊音像
+            jobRecruitingCount: 0, //待审核招聘
+            jobHuntingCount: 0, //待审核求职
+            noticeCount: 0, //待审核行政通知
+            complaintCount: 0, //待审核行政投诉
+            //所有数据
+            allWebsiteCount: 0,
+            allArticleCount: 0,
+            allCategoryCount: 0,
+            allGoodsCount: 0,
+            allBookCount: 0,
+            allJobRecruitingCount: 0,
+            allJobHuntingCount: 0,
+            allNoticeCount: 0,
+            allComplaintCount: 0,
+            //折线图
             chatType: '1', //用户选择的哪个数据
             indexDataOptions: [
                 {label:'资讯',value:'1'},
@@ -619,12 +629,21 @@ export default {
                 {label:'书刊音像',value:'3'},
                 {label:'招聘',value:'4'},
                 {label:'求职',value:'5'}
-            ]
+            ],
+            lineChartData:[],//折线图目前展示哪个数据
+            lineChartData1: [],//折线图数据 - 资讯
+            lineChartData2: [],//折线图数据 - 商品
+            lineChartData3: [],//折线图数据 - 书刊音像
+            lineChartData4: [],//折线图数据 - 招聘
+            lineChartData5: [],//折线图数据 - 求职
+            //圆环图
+            ringChartData: [],//圆环图数据
+            //用户身份
+            userType: 0,
         }
     },
     methods: {
         handleClick(row) {
-            console.log(row, '----------------1---')
             //跳转
             this.$router.push({
                 path: '/articleList',
@@ -632,50 +651,48 @@ export default {
                     id: row.id
                 }
             })
-
         },
         // 获取首页数据
         //获取用户身份信息
-        getUserInfo(fun) {
+        getUserInfo() {
+            let that = this;
             this.$store.dispatch('public/getInfo').then(res => {
-                console.log(res)
                 this.userType = res.data.type_id;
-                //if(res.data.type_id==10000){}//管理员
-                //if(res.data.type_id==4){}//调研员
-                //个人会员=1 政务会员=2 企业会员=3 调研员=4 管理员=10000 游客=20000
-            }).catch(() => {
-                this.$message({
-                    type: 'info',
-                    message: '网络错误，请重试！'
-                });
+                that.getData();
             })
-            fun();
         },
         getData() {
             //获取首页数据
             this.$store.dispatch('public/getAdminIndex').then(res => {
-                //如果是调研员就不显示其他的
-                // if (this.userType == 4) {
-                //     this.chartData.lineChartData = res.data.letterOfComplaintList;
-                // } else if (this.userType == 1) {
-                //     //个人会员
-                //     this.type_id1 = res.data;
-                // } else {
-                //     this.topData.article.count = res.data.article.count;
-                //     this.topData.category.count = res.data.category.count;
-                //     this.topData.website.count = res.data.website.count;
-                //     this.chartData.lineChartData = res.data.monthArticle;
-                //     this.chartData.ringChartData = res.data.userType;
-                // }
                 if(res.code==200){
-                    this.indexData = res.data;//面板其他数据
-                    this.chartData.lineChartData = res.data.monthArticle;//初始化展示资讯的数据
-                    this.chartData.ringChartData = res.data.userType;//圆环图数据
-                    this.chartData.lineChartData1 = res.data.monthArticle;//折线图数据 - 资讯
-                    this.chartData.lineChartData2 = res.data.monthGood;//圆环图数据 - 资讯
-                    this.chartData.lineChartData3 = res.data.monthBook;//圆环图数据 - 书刊音像
-                    this.chartData.lineChartData4 = res.data.monthJobRecruiting;//圆环图数据 - 招聘
-                    this.chartData.lineChartData5 = res.data.monthJobHunting;//圆环图数据 - 求职
+                    //待审核数据
+                    this.articleCount = res.data.apply.article;
+                    this.adCount = res.data.apply.order;
+                    this.goodsCount = res.data.apply.good;
+                    this.bookCount = res.data.apply.book;
+                    this.jobRecruitingCount = res.data.apply.jobRecruiting;
+                    this.jobHuntingCount = res.data.apply.jobHunting;
+                    this.noticeCount = res.data.apply.notice;
+                    this.complaintCount = res.data.apply.complaint;
+                    //所有数据
+                    this.allWebsiteCount = res.data.website.count;
+                    this.allCategoryCount = res.data.category.count;
+                    this.allArticleCount = res.data.article.count;
+                    this.allGoodsCount = res.data.good.count;
+                    this.allBookCount = res.data.book.count;
+                    this.allJobRecruitingCount = res.data.jobRecruiting.count;
+                    this.allJobHuntingCount = res.data.jobHunting.count;
+                    this.allNoticeCount = res.data.notice.count;
+                    this.allComplaintCount = res.data.complaint.count;
+                    //折线图
+                    this.lineChartData = res.data.monthArticle;//当前展示的那个
+                    this.lineChartData1 = res.data.monthArticle;//折线图数据 - 资讯
+                    this.lineChartData2 = res.data.monthGood;//圆环图数据 - 资讯
+                    this.lineChartData3 = res.data.monthBook;//圆环图数据 - 书刊音像
+                    this.lineChartData4 = res.data.monthJobRecruiting;//圆环图数据 - 招聘
+                    this.lineChartData5 = res.data.monthJobHunting;//圆环图数据 - 求职
+                    //圆环图
+                    this.ringChartData = res.data.userType;
                 }
             })
         },
@@ -693,27 +710,25 @@ export default {
         changeLineChartData(type){
             console.log(type)
             if(type == 1){
-                this.chartData.lineChartData = this.chartData.lineChartData1;
+                this.lineChartData = this.lineChartData1;
             }
             if(type == 2){
-                this.chartData.lineChartData = this.chartData.lineChartData2;
+                this.lineChartData = this.lineChartData2;
             }
             if(type == 3){
-                this.chartData.lineChartData = this.chartData.lineChartData3;
+                this.lineChartData = this.lineChartData3;
             }
             if(type == 4){
-                this.chartData.lineChartData = this.chartData.lineChartData4;
+                this.lineChartData = this.lineChartData4;
             }
             if(type == 5){
-                this.chartData.lineChartData = this.chartData.lineChartData5;
+                this.lineChartData = this.lineChartData5;
             }
         }
     },
     mounted() {
         //先获取用户身份
-        this.getUserInfo(this.getData)
-        //再获取数据
-        // this.getData()
+        this.getUserInfo()
     }
 }
 </script>