首页修改

1

src/views/main/baseinfo/business.vue

@@ -24,22 +24,23 @@
         </span>
       </statistic-item>
     </statistic>
-    <ve-histogram
+    <!--   :data-zoom="dataZoom" -->
+    <ve-line
       style="width: 100%;"
       height="350px"
       :data="chartData"
       :data-empty="dataEmpty"
-      :data-zoom="dataZoom"
+
       :extend="chartExtend"
       :legend='legend'
-    ></ve-histogram>
+    ></ve-line>
   </el-card>
 </template>
 <script>
 import 'v-charts/lib/style.css'
 import 'echarts/lib/component/dataZoom'
 import countTo from 'vue-count-to'
-import veHistogram from 'v-charts/lib/histogram.common'
+import veLine from "v-charts/lib/line.common";
 import searchHeader from "./modals/searchHeader";
 import { getTimes } from "@/utils";
 import { getIndex } from "../api";
@@ -51,8 +52,9 @@ import {
 export default {
   props: ['data',"search"],
   components: {
-    've-histogram': veHistogram,
+
     'count-to': countTo,
+     "ve-line": veLine,
     searchHeader
   },
   computed: {

src/views/main/baseinfo/curriculum.vue

@@ -32,7 +32,7 @@
           </el-tooltip>
         </span>
         <span>
-          <count-to :endVal="item.percent" />
+          <count-to :endVal="item.percent" />节
         </span>
       </statistic-item>
     </statistic>
@@ -43,6 +43,7 @@
           <el-radio-button label="month">按月</el-radio-button>
         </el-radio-group>
       </div>
+      <!-- :data-zoom="dataZoom" -->
       <ve-line
         :settings="{
           area: true,
@@ -50,7 +51,7 @@
        :data="timer == 'day'?chartData:chartDataForMoth"
         height="350px"
         :data-empty="dataEmpty"
-        :data-zoom="dataZoom"
+
         :legend="legend"
       />
     </div>

src/views/main/baseinfo/hr.vue

@@ -16,7 +16,7 @@
           </el-tooltip>
         </span>
         <span>
-          <count-to :endVal="item.percent"/>
+          <count-to :endVal="item.percent"/>人
         </span>
       </statistic-item>
     </statistic>

src/views/main/baseinfo/index.vue

@@ -66,12 +66,13 @@
       <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
         <business :data="dataInfo" :search="search" @resetDate="resetDate" />
       </el-col>
+        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+        <curriculum :data="dataInfo" :search="search" @resetDate="resetDate" />
+      </el-col>
       <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
         <student :data="dataInfo" :search="search" @resetDate="resetDate" />
       </el-col>
-      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
-        <curriculum :data="dataInfo" :search="search" @resetDate="resetDate" />
-      </el-col>
+
 
       <!-- <el-col :xs="24" :sm="24" :md="12">
         <operate :data="dataInfo"/>

src/views/main/baseinfo/management.vue

@@ -52,12 +52,12 @@
         :data="timer == 'day'?chartData:chartDataForMoth"
         height="350px"
         :data-empty="dataEmpty"
-        :data-zoom="dataZoom"
         :extend="chartExtend"
         :legend="legend"
       />
           <!-- <ve-line
       v-else
+        :data-zoom="dataZoom"
         :settings="{
           area: true,
         }"

src/views/main/baseinfo/student.vue

@@ -42,22 +42,23 @@ v-loading="loading"
           <el-radio-button label="month">按月</el-radio-button>
         </el-radio-group>
       </div>
-      <ve-histogram
+      <!--  :data-zoom="dataZoom" -->
+      <ve-line
         style="width: 100%"
         height="350px"
         :data="timer == 'day' ? chartData : chartDataForMoth"
         :data-empty="dataEmpty"
-        :data-zoom="dataZoom"
+
         :extend="chartExtend"
         :legend="legend"
-      ></ve-histogram>
+      ></ve-line>
     </div>
     <!-- <ve-funnel v-else style="width: 100%;" height="350px" :data="funnelData" :data-empty="dataEmpty"></ve-funnel> -->
   </el-card>
 </template>
 <script>
 import countTo from "vue-count-to";
-import veHistogram from "v-charts/lib/histogram.common";
+import veLine from "v-charts/lib/line.common";
 import veFunnel from "v-charts/lib/funnel.common";
 import searchHeader from "./modals/searchHeader";
 import { getIndex } from "../api";
@@ -67,7 +68,7 @@ export default {
   props: ["data", "search"],
   components: {
     "ve-funnel": veFunnel,
-    "ve-histogram": veHistogram,
+      "ve-line": veLine,
     "count-to": countTo,
     searchHeader,
   },