Browse Source

调整细节

shaogen1995 4 năm trước cách đây
mục cha
commit
7a37a23dc7
2 tập tin đã thay đổi với 34 bổ sung33 xóa
  1. 33 32
      src/views/home/index.vue
  2. 1 1
      src/views/layout/index.vue

+ 33 - 32
src/views/home/index.vue

@@ -150,6 +150,39 @@ export default {
   },
   // 生命周期 - 挂载完成(可以访问DOM元素)
   async mounted () {
+    // 文物类别数据处理
+    const Datares = await getReport()
+    const Datatemp = Datares.data.goodsType
+    Datatemp.forEach((v) => {
+      v.value = v.amount
+      v.name += Number(v.percent * 100).toFixed(1) + '%'
+    })
+
+    // 图表
+    const chartDom = document.querySelector('.echarts')
+    const myChart = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item'
+      },
+
+      series: [
+        {
+          type: 'pie',
+          radius: ['40%', '70%'],
+          data: Datatemp,
+          emphasis: {
+            itemStyle: {
+              shadowBlur: 10,
+              shadowOffsetX: 0,
+              shadowColor: 'rgba(0, 0, 0, 0.5)'
+            }
+          }
+        }
+      ]
+    }
+    option && myChart.setOption(option)
+
     // 进来显示用户信息
     const userData = localStorage.getItem('daliCK')
     this.userData = JSON.parse(userData).user
@@ -193,38 +226,6 @@ export default {
     col2.data.list.forEach(v => {
       if (v.status === 1 || v.status === 0) this.dingdong[7].inoc++
     })
-    // 文物类别数据处理
-    const Datares = await getReport()
-    const Datatemp = Datares.data.goodsType
-    Datatemp.forEach((v) => {
-      v.value = v.amount
-      v.name += Number(v.percent * 100).toFixed(1) + '%'
-    })
-
-    // 图表
-    const chartDom = document.querySelector('.echarts')
-    const myChart = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item'
-      },
-
-      series: [
-        {
-          type: 'pie',
-          radius: ['40%', '70%'],
-          data: Datatemp,
-          emphasis: {
-            itemStyle: {
-              shadowBlur: 10,
-              shadowOffsetX: 0,
-              shadowColor: 'rgba(0, 0, 0, 0.5)'
-            }
-          }
-        }
-      ]
-    }
-    option && myChart.setOption(option)
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 1 - 1
src/views/layout/index.vue

@@ -228,7 +228,7 @@ export default {
       })
     },
     toHome (index) {
-      if (index === 0) this.$router.push('/layout/home')
+      if (index === 0) this.$router.push('/layout/home').catch(() => {})
     }
   },
   // 生命周期 - 创建完成(可以访问当前this实例)