diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index 20786d2..5b7d605 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -1476,4 +1476,44 @@ export default {
       data,
     });
   },
+  //学校学段及年级
+  sectionAndGradeList(data) {
+    return service({
+      url: setUpUrls.sectionAndGradeList,
+      method: "POST",
+      data,
+    });
+  },
+  //学校设备使用分析
+  usageStatistics(data) {
+    return service({
+      url: setUpUrls.usageStatistics,
+      method: "POST",
+      data,
+    });
+  },
+  //集团设备使用分析
+  tenantUsageStatistics(data) {
+    return service({
+      url: setUpUrls.tenantUsageStatistics,
+      method: "POST",
+      data,
+    });
+  },
+  //集团学段及年级
+  tenantSectionAndGradeList(data) {
+    return service({
+      url: setUpUrls.tenantSectionAndGradeList,
+      method: "POST",
+      data,
+    });
+  },
+  //集团查询科目列表
+  tenantSubjectList(data) {
+    return service({
+      url: setUpUrls.tenantSubjectList,
+      method: "POST",
+      data,
+    });
+  },
 };
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index c16b41f..029435d 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -382,4 +382,14 @@ export default {
   updateSubject: "/api_html/school/manager/updateSubject",
   //.net下载地址
   runtimeEnvFileUrl: "/api_html/school/manager/runtimeEnvFileUrl",
+  //学校学段及年级
+  sectionAndGradeList: "/api_html/school/manager/sectionAndGradeList",
+  //学校设备使用分析
+  usageStatistics: "/api_html/school/manager/usageStatistics",
+  //集团设备使用分析
+  tenantUsageStatistics: "/api_html/tenant/usageStatistics",
+  //集团学段及年级
+  tenantSectionAndGradeList: "/api_html/tenant/sectionAndGradeList",
+  //集团查询科目列表
+  tenantSubjectList: "/api_html/tenant/subjectList",
 }
diff --git a/src/components/charts/barChart.vue b/src/components/charts/barChart.vue
new file mode 100644
index 0000000..9c5ec6b
--- /dev/null
+++ b/src/components/charts/barChart.vue
@@ -0,0 +1,126 @@
+<template>
+  <div class="chart" :id="id"></div>
+</template>
+
+<script>
+export default {
+  name: "barChart",
+  props: {
+    id: String,
+    params: Array,
+    xAxis: Array,
+  },
+  watch: {
+    params: {
+      handler: function (val) {
+        this.initData();
+      },
+      deep: true,
+    },
+  },
+  data() {
+    return {
+      chart: null,
+    };
+  },
+  created() {},
+  mounted() {
+    // this.initData();
+  },
+  methods: {
+    setOption(xAxis,params) {
+      const that = this;
+      const options = {
+        color: this.colors || ["#4472c4", "#ed7d32", "#a5a5a5"],
+        backgroundColor: "#f8f8f8",
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "shadow",
+          },
+        },
+        legend: {
+          show: true,
+          top: 20,
+          itemHeight: 2,
+        },
+        toolbox: {
+          show: true,
+          orient: "vertical",
+          right: "6",
+          top: "10",
+          feature: {
+            magicType: { show: true, type: ["line", "bar", "stack"] },
+            saveAsImage: { show: true },
+          },
+        },
+        xAxis: {
+          type: "category",
+          axisLine: { show: true, lineStyle: { color: "#e2e2e2" } },
+          axisLabel: { color: "#666" },
+          axisTick: { show: false },
+          boundaryGap: true,
+          data: xAxis,
+        },
+        yAxis: {
+          type: "value",
+          axisLine: { show: true, lineStyle: { color: "#e2e2e2" } },
+          splitLine: {
+            show: true,
+            lineStyle: { color: "#eee" },
+          },
+          axisLabel: {
+            color: "#666",
+            formatter: function (value, index) {
+              if (value != 0) {
+                return value;
+              } else {
+                return "";
+              }
+            },
+          },
+        },
+        grid: {
+          top: 60,
+          left: 20,
+          right: 40,
+          bottom: 30,
+          containLabel: true,
+        },
+        series: params.map((item) => {
+          return {
+            name: item.name,
+            type: "bar",
+            symbolSize: "8",
+            barWidth: 20,
+            itemStyle: {
+              borderRadius: [20, 20, 0, 0],
+            },
+            lineStyle: {
+              width: 3,
+            },
+            data: item.value,
+          };
+        }),
+      };
+      return options;
+    },
+    initData(xAxis,params) {
+      if (!xAxis.length) return;
+      if (!this.chart) {
+        const div = document.getElementById(this.id);
+        this.chart = this.$echarts.init(div);
+      }
+      const options = this.setOption(xAxis,params);
+      this.chart?.clear();
+      this.chart.setOption(options, true);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.chart {
+  height: 100%;
+}
+</style>
diff --git a/src/plugins/echarts.js b/src/plugins/echarts.js
index 0b042fb..3ced106 100644
--- a/src/plugins/echarts.js
+++ b/src/plugins/echarts.js
@@ -3,6 +3,7 @@ import Vue from 'vue'
 import * as echarts from 'echarts/core';
 // 引入柱状图图表，图表后缀都为 Chart
 import {
+    BarChart,
     LineChart,
     PieChart,
     ScatterChart,
@@ -19,7 +20,8 @@ import {
     GridComponent,
     GraphicComponent,
     SingleAxisComponent,
-    LegendComponent
+    LegendComponent,
+    ToolboxComponent
 } from 'echarts/components';
 
 // 引入 Canvas 渲染器，注意引入 CanvasRenderer 或者 SVGRenderer 是必须的一步
@@ -29,7 +31,7 @@ import {
 
 // 注册必须的组件
 echarts.use(
-    [LineChart,RadarChart, ScatterChart, PieChart, SingleAxisComponent, TitleComponent, TooltipComponent, GridComponent, CanvasRenderer, GraphicComponent, UniversalTransition, LabelLayout,LegendComponent]
+    [BarChart,LineChart,RadarChart, ScatterChart, PieChart, SingleAxisComponent, TitleComponent, TooltipComponent, GridComponent, CanvasRenderer, GraphicComponent, UniversalTransition, LabelLayout,LegendComponent,ToolboxComponent]
 );
 
 Vue.prototype.$echarts = echarts
\ No newline at end of file
diff --git a/src/views/standard/analysis/index.vue b/src/views/standard/analysis/index.vue
index cb85746..a1fcc5e 100644
--- a/src/views/standard/analysis/index.vue
+++ b/src/views/standard/analysis/index.vue
@@ -6,219 +6,198 @@
       </template>
     </back-box>
     <div class="page-content">
-      <div class="answer-header">
-        <div class="sel-box">
-          <el-select
-            class="sel"
-            v-model="query.regionId"
-            placeholder="选择区域"
-            @change="_QueryData"
-            v-if="role == 'ROLE_JITUAN'"
-          >
-            <el-option
-              v-for="item in gradeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-          <el-select
-            v-else
-            class="sel"
-            v-model="query.gradeName"
-            placeholder="选择年级"
-            @change="_QueryData"
-          >
-            <el-option
-              v-for="item in gradeList"
-              :key="item.label"
-              :label="item.label"
-              :value="item.label"
-            >
-            </el-option>
-          </el-select>
-          <div class="d1">
-            <el-date-picker
-              v-model="query.startDay"
-              type="date"
-              @change="handleChangeTimeStart"
-              placeholder="选择日期时间"
-              value-format="yyyy-MM-dd"
-            >
-            </el-date-picker>
-            ~
-            <el-date-picker
-              v-model="query.endDay"
-              type="date"
-              placeholder="选择日期时间"
-              @change="handleChangeTimeEnd"
-              value-format="yyyy-MM-dd"
-            >
-            </el-date-picker>
+      <ul class="params-box">
+        <li class="item">
+          <span class="s-txt">时间段：</span>
+          <div class="sel-box">
+            <div class="d1">
+              <el-date-picker
+                v-model="query.startDay"
+                type="date"
+                @change="handleChangeTimeStart"
+                placeholder="选择日期时间"
+                value-format="yyyy-MM-dd"
+                size="mini"
+              >
+              </el-date-picker>
+              ~
+              <el-date-picker
+                v-model="query.endDay"
+                type="date"
+                placeholder="选择日期时间"
+                @change="handleChangeTimeEnd"
+                value-format="yyyy-MM-dd"
+                size="mini"
+              >
+              </el-date-picker>
+            </div>
+            <p class="p1">
+              <span
+                @click="setDate(1)"
+                :class="[date == 1 ? 'active' : '', 's1']"
+                >今天</span
+              >
+              <span
+                @click="setDate(2)"
+                :class="[date == 2 ? 'active' : '', 's1']"
+                >本周</span
+              >
+              <span
+                @click="setDate(3)"
+                :class="[date == 3 ? 'active' : '', 's1']"
+                >本月</span
+              >
+              <span
+                @click="setDate(4)"
+                :class="[date == 4 ? 'active' : '', 's1']"
+                >本季度</span
+              >
+            </p>
           </div>
-          <p class="p1">
-            <span @click="setDate(1)" :class="[date == 1 ? 'active' : '', 's1']"
-              >今天</span
-            >
-            <span @click="setDate(2)" :class="[date == 2 ? 'active' : '', 's1']"
-              >本周</span
-            >
-            <span @click="setDate(3)" :class="[date == 3 ? 'active' : '', 's1']"
-              >本月</span
+        </li>
+        <li class="item" v-for="(item, index) in query.secGraClaSub">
+          <span class="s-txt">对比项{{ setBigNum(index) }}：</span>
+          <div class="sel-box">
+            <el-cascader
+              size="small"
+              class="sel sel2"
+              clearable
+              placeholder="选择范围"
+              v-model="query.secGraClaSub[index]"
+              :options="gradeList"
+              :props="props"
+            ></el-cascader>
+          </div>
+          <i class="el-icon-delete" @click="removeQuery(index)"></i>
+        </li>
+        <li class="item">
+          <span class="s-txt"></span>
+          <div class="disflex-b">
+            <el-button
+              class="btn"
+              icon="el-icon-plus"
+              size="small"
+              round
+              @click="query.secGraClaSub.push([])"
+              >添加对比项</el-button
             >
-            <span @click="setDate(4)" :class="[date == 4 ? 'active' : '', 's1']"
-              >本季度</span
+            <el-button class="btn" round size="small" @click="getData"
+              >确定</el-button
             >
-          </p>
-          <el-button type="primary" round @click="_QueryData">筛选</el-button>
-        </div>
-      </div>
-      <div class="radio-box" v-if="role == 'ROLE_JITUAN'">
-        <el-radio-group v-model="type" @change="changeType">
-          <el-radio-button :label="1">学校使用对比</el-radio-button>
-          <el-radio-button :label="2">学段使用对比</el-radio-button>
-        </el-radio-group>
-      </div>
-      <div class="table-box" v-loading="loading">
-        <el-empty
-          :image-size="100"
-          v-if="!tableData.length && !loading"
-          description="没有更多数据"
-        ></el-empty>
-        <el-table
-          v-else
-          :data="tableData"
-          :border="false"
-          style="width: 100%"
-          show-summary
-        >
-          <el-table-column align="center" fixed label="科目" prop="subjectName">
-          </el-table-column>
-          <el-table-column
-            align="center"
-            v-for="(item, index) in dataList"
-            :key="index"
-            :label="
-              role == 'ROLE_JITUAN'
-                ? item.schoolName || item.gradeName
-                : item.gradeName || item.className
-            "
-          >
-            <template v-if="role == 'ROLE_JITUAN'">
-              <el-table-column
-                :prop="'periodCount' + (type == 1 ? item.schoolId : item.grade)"
-                label="课时数"
-                align="center"
-              >
-              <template slot-scope="scoped">{{scoped.row['periodCount' + (type == 1 ? item.schoolId : item.grade)]||"--"}}</template>
-              </el-table-column>
-              <el-table-column
-                :prop="'examCount' + (type == 1 ? item.schoolId : item.grade)"
-                label="测练数"
-                align="center"
-              ><template slot-scope="scoped">{{scoped.row['examCount' + (type == 1 ? item.schoolId : item.grade)]||"--"}}</template></el-table-column>
-            </template>
-            <template v-else>
-              <el-table-column
-                :prop="'periodCount' + (item.grade || item.classId)"
-                label="课时数"
-                align="center"
-              ><template slot-scope="scoped">{{scoped.row['periodCount' + (item.grade || item.classId)]||"--"}}</template></el-table-column>
-              <el-table-column
-                :prop="'examCount' + (item.grade || item.classId)"
-                label="测练数"
-                align="center"
-              ><template slot-scope="scoped">{{scoped.row['examCount' + (item.grade || item.classId)]||"--"}}</template></el-table-column>
-            </template>
-          </el-table-column>
-        </el-table>
-        <p class="down" v-if="tableData.length">
-          <el-button
-            @click="downExc"
-            type="primary"
-            plain
-            round
-            icon="fa fa-cloud-download"
-            >导出报表</el-button
-          >
-        </p>
+          </div>
+        </li>
+      </ul>
+      <div class="chart-box">
+        <barChart id="barChart" ref="barChart" />
       </div>
     </div>
   </div>
 </template>
 
 <script>
+import barChart from "@/components/charts/barChart";
 import { formatDate, downloadFile } from "@/utils";
 export default {
+  components: {
+    barChart,
+  },
   data() {
     return {
-      loading: false,
-      exportLoading: false,
       role: "",
+      loading: false,
       date: "", //今天-本周-本月-本季度
       type: 1, //集团管理员 表格切换
       query: {
         //搜索条件
-        regionId: "",
-        gradeName: "全部",
         startDay: "",
         endDay: "",
         day: "",
+        secGraClaSub: [],
       },
+      props: {
+        multiple: false,
+        checkStrictly: true,
+      },
+      params: [
+        {
+          index: 1,
+          sections: "小学",
+          grades: "二年级",
+          classIds: "2班",
+          subjectNames: "语文",
+        },
+        {
+          index: 2,
+          sections: "小学",
+          grades: "二年级",
+        },
+      ],
       gradeList: [],
-      tableData: [],
-      dataList: [],
+      chartData: [
+        {
+          name: "课时数",
+          value: [],
+        },
+        {
+          name: "测练数",
+          value: [],
+        },
+      ],
+      xAxis: [],
     };
   },
-  created() {
-    this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role;
-    this._QueryGradeList();
-    this.setDate(1);
+  async created() {
+    let that = this;
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    if (this.role == "ROLE_JITUAN") {
+      (this.props.lazy = true),
+        (this.props.lazyLoad = function (node, resolve) {
+          const { level } = node;
+          if (level == 3) {
+            console.log(node);
+            that.$request
+              .tenantSubjectList({
+                schoolId: node.path[0],
+                grade: node.value,
+              })
+              .then((res) => {
+                let children = res.data?.subjectNames.map((item) => {
+                  return {
+                    label: item,
+                    value: item,
+                    leaf: true,
+                  };
+                });
+                const nodes = [...children];
+                // 通过调用resolve将子节点数据返回，通知组件数据加载完成
+                resolve(nodes);
+              });
+          } else {
+            resolve(node);
+          }
+        });
+      await this._QuerySchool();
+    }
+    await this._QueryGradeList();
+    if (this.role == "ROLE_XUEXIAO") {
+      await this._QueryClassList();
+    }
+
     let startDay = this.query?.startDay;
     if (!startDay) {
-      this.query.startDay = new Date();
-      this.query.endDay = new Date();
+      this.query.startDay = formatDate(new Date(), "yyyy-MM-dd");
+      this.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
     }
   },
   methods: {
-    async downExc() {
-      if (this.exportLoading == true) return;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "gradeName") {
-            query[key] = this.query[key] == "全部" ? "" : this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_JITUAN") {
-        delete query.gradeName;
-      } else {
-        delete query.regionId;
-      }
-      this.exportLoading = true;
+    setBigNum(num) {
+      let txt = "";
+      let bigNum = ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十"];
+      txt = bigNum[num];
 
-      const exportUsageAnalysis = this.role != "ROLE_JITUAN"?this.$request.exportUsageAnalysis:
-      this.$request.exportSchoolContrast
-      const data = await exportUsageAnalysis({ ...query });
-      this.exportLoading = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile("使用分析.xlsx", blob);
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-    changeType(val) {
-      if (val == 1) {
-        this.query.regionId = "";
-      }
-      this._QueryData(val);
+      return txt;
     },
     setDate(index) {
       const that = this;
@@ -266,8 +245,13 @@ export default {
           that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
           break;
       }
-      this.page = 1;
-      this._QueryData();
+    },
+    removeQuery(index) {
+      this.query.secGraClaSub.splice(index, 1);
+      this.chartData[0].value.splice(index, 1);
+      this.chartData[1].value.splice(index, 1);
+      this.xAxis.pop();
+      this.$refs.barChart.initData(this.xAxis, this.chartData);
     },
     handleChangeTimeStart(val) {
       this.query.day = "";
@@ -289,108 +273,70 @@ export default {
         }
       }
     },
-    async _QueryData() {
-      this.loading = true;
-      //多课时对比
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "gradeName") {
-            query[key] = this.query[key] == "全部" ? "" : this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
+    getData() {
+      if (!this.query.secGraClaSub.length) {
+        this.$message.warning("请添加对比项，并选择对比条件！");
+        return;
+      }
+      let hasSpace = null;
+      this.query.secGraClaSub.map((item, index) => {
+        if (!item.length) {
+          hasSpace = index;
         }
+      });
+      if (hasSpace !== null) {
+        this.$message.warning(
+          `对比项${this.setBigNum(hasSpace)}对比条件不能为空请检查！`
+        );
+        return;
       }
-      if (this.role == "ROLE_JITUAN") {
-        delete query.gradeName;
+      this._QueryData();
+    },
+    setQuery() {
+      let query = { ...this.query };
+      delete query.secGraClaSub;
+      if (this.role != "ROLE_JITUAN") {
+        query.params = this.query.secGraClaSub.map((item) => {
+          let jsons = {};
+          jsons.section = item[0];
+          item.length > 1 ? (jsons.grade = item[1]) : "";
+          item.length > 2 ? (jsons.classId = item[2]) : "";
+          item.length == 4 ? (jsons.subjectName = item[3]) : "";
+          return jsons;
+        });
       } else {
-        delete query.regionId;
+        query.params = this.query.secGraClaSub.map((item) => {
+          let jsons = {};
+          jsons.schoolId = item[0];
+          item.length > 1 ? (jsons.section = item[1]) : "";
+          item.length > 2 ? (jsons.grade = item[2]) : "";
+          item.length == 4 ? (jsons.subjectName = item[3]) : "";
+          return jsons;
+        });
       }
-      this.tableData = [];
-      const Contrast =
+      return query;
+    },
+    async _QueryData() {
+      this.loading = true;
+      let query = this.setQuery();
+      const usageStatistics =
         this.role != "ROLE_JITUAN"
-          ? this.$request.usageAnalysis
-          : this.type == 1
-          ? this.$request.schoolContrast
-          : this.$request.gradeContrast;
-      const { data, status, info } = await Contrast({
+          ? this.$request.usageStatistics
+          : this.$request.tenantUsageStatistics;
+      const { data, status, info } = await usageStatistics({
         ...query,
       });
       this.loading = false;
       if (status === 0) {
-        let dataIdsList = [],
-          dataList = [];
-
-        data.map((item) => {
-          item.dataList.map((items) => {
-            if (this.role == "ROLE_JITUAN") {
-              if (this.type == 1) {
-                if (!dataIdsList.includes(items.schoolId)) {
-                  dataIdsList.push(items.schoolId);
-                  dataList.push(items);
-                }
-              } else if (this.type == 2) {
-                if (!dataIdsList.includes(items.grade)) {
-                  dataIdsList.push(items.grade);
-                  dataList.push(items);
-                }
-              }
-            } else {
-              if (this.query.gradeName == "全部") {
-                if (!dataIdsList.includes(items.grade)) {
-                  dataIdsList.push(items.grade);
-                  dataList.push(items);
-                }
-              } else {
-                if (!dataIdsList.includes(items.classId)) {
-                  dataIdsList.push(items.classId);
-                  dataList.push(items);
-                }
-              }
-            }
-          });
-        });
-        console.log(dataList);
-        this.tableData = data.map((item) => {
-          let params = {};
-          dataIdsList.map((ids, index) => {
-            item.dataList.map((items) => {
-              if (this.role == "ROLE_JITUAN") {
-                if (this.type == 1) {
-                  if (items.schoolId == ids) {
-                    params["examCount" + items.schoolId] = items.examCount;
-                    params["periodCount" + items.schoolId] = items.periodCount;
-                  }
-                } else if (this.type == 2) {
-                  if (items.grade == ids) {
-                    params["examCount" + items.grade] = items.examCount;
-                    params["periodCount" + items.grade] = items.periodCount;
-                  }
-                }
-              } else {
-                if (this.query.gradeName == "全部") {
-                  if (items.grade == ids) {
-                    params["examCount" + items.grade] = items.examCount;
-                    params["periodCount" + items.grade] = items.periodCount;
-                  }
-                } else if (this.query.gradeName) {
-                  if (items.classId == ids) {
-                    params["examCount" + items.classId] = items.examCount;
-                    params["periodCount" + items.classId] = items.periodCount;
-                  }
-                }
-              }
-            });
-          });
-          return {
-            subjectName: item.subjectName,
-            ...params,
-          };
-        });
-        this.dataList = dataList.sort((a, b) => {
-          return a.grade - b.grade;
+        this.chartData[0].value = [];
+        this.chartData[1].value = [];
+        this.xAxis = [];
+        data?.list.map((item, index) => {
+          this.xAxis.push("对比项" + this.setBigNum(index));
+          this.chartData[0].value.push(item.periodCount);
+          this.chartData[1].value.push(item.examCount);
         });
+        this.$refs.barChart.initData(this.xAxis, this.chartData);
       } else {
         this.$message.error(info);
       }
@@ -400,43 +346,101 @@ export default {
       this.loading = true;
       const gradeList =
         this.role != "ROLE_JITUAN"
-          ? this.$request.gradeList
-          : this.$request.regionList;
+          ? this.$request.sectionAndGradeList
+          : this.$request.tenantSectionAndGradeList;
       const { data, status, info } = await gradeList();
       if (status === 0) {
         if (!!data.list) {
           if (this.role != "ROLE_JITUAN") {
             this.gradeList =
               data.list?.map((item) => {
-                let gradeList = {
-                  value: item.grade,
-                  label: item.gradeName,
+                let gradeIds = [];
+                let children = item.gradeList.map((items) => {
+                  gradeIds.push(items.grade);
+                  return {
+                    value: items.grade,
+                    label: items.gradeName,
+                  };
+                });
+                return {
+                  value: item.section,
+                  label: item.sectionName,
+                  gradeIds: [...gradeIds],
+                  children: [...children],
                 };
-                return gradeList;
               }) || [];
-            this.gradeList.unshift({
-              value: "",
-              label: "全部",
-            });
           } else {
-            this.gradeList =
-              data.list?.map((item) => {
-                let gradeList = {
-                  value: item.id,
-                  label: item.regionName,
+            let children = data.list?.map((item) => {
+              let children = item.gradeList.map((items) => {
+                return {
+                  value: items.grade,
+                  label: items.gradeName,
                 };
-                return gradeList;
-              }) || [];
-            this.gradeList.unshift({
-              value: "",
-              label: "全部",
+              });
+              return {
+                value: item.section,
+                label: item.sectionName,
+                children: [...children],
+              };
             });
+            this.gradeList = this.schoolList.map((item) => {
+              return {
+                value: item.id,
+                label: item.schoolName,
+                children: [...children],
+              };
+            });
+          }
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找班级
+    async _QueryClassList() {
+      const { data, status, info } = await this.$request.gradeList();
+      if (status === 0) {
+        if (!!data.list) {
+          if (this.role == "ROLE_XUEXIAO") {
+            data.list?.map((item) => {
+              let subList = item.subjectNames?.map((items) => {
+                return {
+                  value: items,
+                  label: items,
+                };
+              });
+              let children = item.classList.map((clazz) => {
+                return {
+                  value: clazz.id,
+                  label: clazz.className,
+                  id: clazz.id,
+                  children: [...subList],
+                };
+              });
+              this.gradeList.map((sec) => {
+                if (sec.gradeIds.includes(item.grade)) {
+                  sec.children[sec.gradeIds.indexOf(item.grade)].children = [
+                    ...children,
+                  ];
+                }
+              });
+            }) || [];
           }
         }
       } else {
         this.$message.error(info);
       }
     },
+    async _QuerySchool() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.schoolList();
+      this.loading = false;
+      if (status === 0) {
+        this.schoolList = [...data.list] || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
   },
 };
 </script>
@@ -451,13 +455,89 @@ div::-webkit-scrollbar-thumb {
 }
 </style>
 <style lang="scss" scoped>
-.table-box {
-  padding: 0 20px;
+.page-content {
+  padding: 20px 40px;
+}
+.disflex-b {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.sel-box {
+  display: flex;
+  align-items: center;
+  flex-wrap: nowrap;
+  .sel {
+    width: 8%;
+    min-width: 160px;
+    margin-right: 20px;
+  }
+  :deep(.el-input__inner) {
+    border: 1px solid #e2e2e2;
+    border-radius: 20px;
+    height: 32px;
+    line-height: 30px;
+  }
+
+  .el-input__icon {
+    line-height: 34px;
+  }
+  .el-date-editor.el-input,
+  .el-date-editor.el-input__inner {
+    width: 160px;
+  }
+
+  .p1 {
+    flex: 1;
+
+    .s1 {
+      margin-left: 36px;
+      cursor: pointer;
+      color: #7f7f7f;
+
+      &:hover {
+        color: #409eff;
+      }
+
+      &.active {
+        color: #667ffd;
+      }
+    }
+  }
+  .sel2 {
+    width: 240px;
+  }
 }
-.radio-box {
-  padding: 0 20px 12px;
+.params-box {
+  .item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+    .s-txt {
+      width: 120px;
+    }
+    .btn {
+      font-size: 14px;
+    }
+    .disflex-b {
+      flex: 1;
+      padding-right: 100px;
+    }
+    &:hover {
+      .el-icon-delete {
+        display: block;
+      }
+    }
+    .el-icon-delete {
+      cursor: pointer;
+      display: none;
+      &:hover {
+        color: #667ffd;
+      }
+    }
+  }
 }
-.down {
-  padding-top: 20px;
+.chart-box {
+  height: 600px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/standard/analysis/indexOld.vue b/src/views/standard/analysis/indexOld.vue
new file mode 100644
index 0000000..cb85746
--- /dev/null
+++ b/src/views/standard/analysis/indexOld.vue
@@ -0,0 +1,463 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>使用分析</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="answer-header">
+        <div class="sel-box">
+          <el-select
+            class="sel"
+            v-model="query.regionId"
+            placeholder="选择区域"
+            @change="_QueryData"
+            v-if="role == 'ROLE_JITUAN'"
+          >
+            <el-option
+              v-for="item in gradeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-select
+            v-else
+            class="sel"
+            v-model="query.gradeName"
+            placeholder="选择年级"
+            @change="_QueryData"
+          >
+            <el-option
+              v-for="item in gradeList"
+              :key="item.label"
+              :label="item.label"
+              :value="item.label"
+            >
+            </el-option>
+          </el-select>
+          <div class="d1">
+            <el-date-picker
+              v-model="query.startDay"
+              type="date"
+              @change="handleChangeTimeStart"
+              placeholder="选择日期时间"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+            ~
+            <el-date-picker
+              v-model="query.endDay"
+              type="date"
+              placeholder="选择日期时间"
+              @change="handleChangeTimeEnd"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </div>
+          <p class="p1">
+            <span @click="setDate(1)" :class="[date == 1 ? 'active' : '', 's1']"
+              >今天</span
+            >
+            <span @click="setDate(2)" :class="[date == 2 ? 'active' : '', 's1']"
+              >本周</span
+            >
+            <span @click="setDate(3)" :class="[date == 3 ? 'active' : '', 's1']"
+              >本月</span
+            >
+            <span @click="setDate(4)" :class="[date == 4 ? 'active' : '', 's1']"
+              >本季度</span
+            >
+          </p>
+          <el-button type="primary" round @click="_QueryData">筛选</el-button>
+        </div>
+      </div>
+      <div class="radio-box" v-if="role == 'ROLE_JITUAN'">
+        <el-radio-group v-model="type" @change="changeType">
+          <el-radio-button :label="1">学校使用对比</el-radio-button>
+          <el-radio-button :label="2">学段使用对比</el-radio-button>
+        </el-radio-group>
+      </div>
+      <div class="table-box" v-loading="loading">
+        <el-empty
+          :image-size="100"
+          v-if="!tableData.length && !loading"
+          description="没有更多数据"
+        ></el-empty>
+        <el-table
+          v-else
+          :data="tableData"
+          :border="false"
+          style="width: 100%"
+          show-summary
+        >
+          <el-table-column align="center" fixed label="科目" prop="subjectName">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            v-for="(item, index) in dataList"
+            :key="index"
+            :label="
+              role == 'ROLE_JITUAN'
+                ? item.schoolName || item.gradeName
+                : item.gradeName || item.className
+            "
+          >
+            <template v-if="role == 'ROLE_JITUAN'">
+              <el-table-column
+                :prop="'periodCount' + (type == 1 ? item.schoolId : item.grade)"
+                label="课时数"
+                align="center"
+              >
+              <template slot-scope="scoped">{{scoped.row['periodCount' + (type == 1 ? item.schoolId : item.grade)]||"--"}}</template>
+              </el-table-column>
+              <el-table-column
+                :prop="'examCount' + (type == 1 ? item.schoolId : item.grade)"
+                label="测练数"
+                align="center"
+              ><template slot-scope="scoped">{{scoped.row['examCount' + (type == 1 ? item.schoolId : item.grade)]||"--"}}</template></el-table-column>
+            </template>
+            <template v-else>
+              <el-table-column
+                :prop="'periodCount' + (item.grade || item.classId)"
+                label="课时数"
+                align="center"
+              ><template slot-scope="scoped">{{scoped.row['periodCount' + (item.grade || item.classId)]||"--"}}</template></el-table-column>
+              <el-table-column
+                :prop="'examCount' + (item.grade || item.classId)"
+                label="测练数"
+                align="center"
+              ><template slot-scope="scoped">{{scoped.row['examCount' + (item.grade || item.classId)]||"--"}}</template></el-table-column>
+            </template>
+          </el-table-column>
+        </el-table>
+        <p class="down" v-if="tableData.length">
+          <el-button
+            @click="downExc"
+            type="primary"
+            plain
+            round
+            icon="fa fa-cloud-download"
+            >导出报表</el-button
+          >
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate, downloadFile } from "@/utils";
+export default {
+  data() {
+    return {
+      loading: false,
+      exportLoading: false,
+      role: "",
+      date: "", //今天-本周-本月-本季度
+      type: 1, //集团管理员 表格切换
+      query: {
+        //搜索条件
+        regionId: "",
+        gradeName: "全部",
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      gradeList: [],
+      tableData: [],
+      dataList: [],
+    };
+  },
+  created() {
+    this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role;
+    this._QueryGradeList();
+    this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  methods: {
+    async downExc() {
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "gradeName") {
+            query[key] = this.query[key] == "全部" ? "" : this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_JITUAN") {
+        delete query.gradeName;
+      } else {
+        delete query.regionId;
+      }
+      this.exportLoading = true;
+
+      const exportUsageAnalysis = this.role != "ROLE_JITUAN"?this.$request.exportUsageAnalysis:
+      this.$request.exportSchoolContrast
+      const data = await exportUsageAnalysis({ ...query });
+      this.exportLoading = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("使用分析.xlsx", blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
+    changeType(val) {
+      if (val == 1) {
+        this.query.regionId = "";
+      }
+      this._QueryData(val);
+    },
+    setDate(index) {
+      const that = this;
+      this.date = index == this.date ? "" : index;
+      let aYear = new Date().getFullYear();
+      let aMonth = new Date().getMonth() + 1;
+      that.query.day = "";
+      that.query.startDay = "";
+      that.query.endDay = "";
+      switch (index) {
+        case 1:
+          that.query.day = formatDate(new Date(), "yyyy-MM-dd");
+          that.query.startDay = that.query.day;
+          that.query.endDay = that.query.day;
+          break;
+        case 2:
+          let day = new Date().getDay();
+          if (day == 0) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          day--;
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 0 && aMonth < 4) {
+            aMonth = "1";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "4";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "7";
+          } else {
+            aMonth = "10";
+          }
+
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+      }
+      this.page = 1;
+      this._QueryData();
+    },
+    handleChangeTimeStart(val) {
+      this.query.day = "";
+      this.date = "";
+      if (this.query.endDay) {
+        if (new Date(val).getTime() > new Date(this.query.endDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.startDay = "";
+        }
+      }
+    },
+    handleChangeTimeEnd(val) {
+      this.query.day = "";
+      this.date = "";
+      if (this.query.startDay) {
+        if (new Date(val).getTime() < new Date(this.query.startDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.endDay = "";
+        }
+      }
+    },
+    async _QueryData() {
+      this.loading = true;
+      //多课时对比
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "gradeName") {
+            query[key] = this.query[key] == "全部" ? "" : this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_JITUAN") {
+        delete query.gradeName;
+      } else {
+        delete query.regionId;
+      }
+      this.tableData = [];
+      const Contrast =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.usageAnalysis
+          : this.type == 1
+          ? this.$request.schoolContrast
+          : this.$request.gradeContrast;
+      const { data, status, info } = await Contrast({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        let dataIdsList = [],
+          dataList = [];
+
+        data.map((item) => {
+          item.dataList.map((items) => {
+            if (this.role == "ROLE_JITUAN") {
+              if (this.type == 1) {
+                if (!dataIdsList.includes(items.schoolId)) {
+                  dataIdsList.push(items.schoolId);
+                  dataList.push(items);
+                }
+              } else if (this.type == 2) {
+                if (!dataIdsList.includes(items.grade)) {
+                  dataIdsList.push(items.grade);
+                  dataList.push(items);
+                }
+              }
+            } else {
+              if (this.query.gradeName == "全部") {
+                if (!dataIdsList.includes(items.grade)) {
+                  dataIdsList.push(items.grade);
+                  dataList.push(items);
+                }
+              } else {
+                if (!dataIdsList.includes(items.classId)) {
+                  dataIdsList.push(items.classId);
+                  dataList.push(items);
+                }
+              }
+            }
+          });
+        });
+        console.log(dataList);
+        this.tableData = data.map((item) => {
+          let params = {};
+          dataIdsList.map((ids, index) => {
+            item.dataList.map((items) => {
+              if (this.role == "ROLE_JITUAN") {
+                if (this.type == 1) {
+                  if (items.schoolId == ids) {
+                    params["examCount" + items.schoolId] = items.examCount;
+                    params["periodCount" + items.schoolId] = items.periodCount;
+                  }
+                } else if (this.type == 2) {
+                  if (items.grade == ids) {
+                    params["examCount" + items.grade] = items.examCount;
+                    params["periodCount" + items.grade] = items.periodCount;
+                  }
+                }
+              } else {
+                if (this.query.gradeName == "全部") {
+                  if (items.grade == ids) {
+                    params["examCount" + items.grade] = items.examCount;
+                    params["periodCount" + items.grade] = items.periodCount;
+                  }
+                } else if (this.query.gradeName) {
+                  if (items.classId == ids) {
+                    params["examCount" + items.classId] = items.examCount;
+                    params["periodCount" + items.classId] = items.periodCount;
+                  }
+                }
+              }
+            });
+          });
+          return {
+            subjectName: item.subjectName,
+            ...params,
+          };
+        });
+        this.dataList = dataList.sort((a, b) => {
+          return a.grade - b.grade;
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找班级
+    async _QueryGradeList() {
+      this.loading = true;
+      const gradeList =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.gradeList
+          : this.$request.regionList;
+      const { data, status, info } = await gradeList();
+      if (status === 0) {
+        if (!!data.list) {
+          if (this.role != "ROLE_JITUAN") {
+            this.gradeList =
+              data.list?.map((item) => {
+                let gradeList = {
+                  value: item.grade,
+                  label: item.gradeName,
+                };
+                return gradeList;
+              }) || [];
+            this.gradeList.unshift({
+              value: "",
+              label: "全部",
+            });
+          } else {
+            this.gradeList =
+              data.list?.map((item) => {
+                let gradeList = {
+                  value: item.id,
+                  label: item.regionName,
+                };
+                return gradeList;
+              }) || [];
+            this.gradeList.unshift({
+              value: "",
+              label: "全部",
+            });
+          }
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
+<style lang="scss" scoped>
+.table-box {
+  padding: 0 20px;
+}
+.radio-box {
+  padding: 0 20px 12px;
+}
+.down {
+  padding-top: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/standard/card/index.vue b/src/views/standard/card/index.vue
index 5fce5c2..05320bd 100644
--- a/src/views/standard/card/index.vue
+++ b/src/views/standard/card/index.vue
@@ -146,6 +146,8 @@
               }}
             </template></el-table-column
           >
+          <el-table-column align="center" label="操作次数" prop="operations"></el-table-column
+          >
           <el-table-column align="center" label="描述">
             <template slot-scope="scope">
               {{