Merge remote-tracking branch 'origin/master'

yyt

2024-01-23 c80c6b24a0d76321780d71c2d4249f5144693096

 jcdm-ui/src/views/index.vue

@@ -5,10 +5,16 @@

    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
      <el-col :xs="24" :sm="12">
        <pie-chart />
        <el-card>
          <pie-chart />
        </el-card>
      </el-col>

      <el-col :xs="24" :sm="12">
        <line-chart :chart-data="lineChartData" />
        <el-card>
          <line-chart :chart-data="lineChartData" />
        </el-card>

      </el-col>
    </el-row>

@@ -19,6 +25,7 @@
import PanelGroup from './dashboard/PanelGroup'
import LineChart from './dashboard/LineChart'
import PieChart from './dashboard/PieChart'
import pieChart from "@/views/dashboard/PieChart.vue";

const lineChartData = {
  newVisitis: {
@@ -41,6 +48,11 @@

export default {
  name: 'Index',
  computed: {
    pieChart() {
      return pieChart
    }
  },
  components: {
    PanelGroup,
    LineChart,