diff --git a/src/api/middle-school-indicator/middle-school-indicator.js b/src/api/middle-school-indicator/middle-school-indicator.js
index 1f14e56..f466fe7 100644
--- a/src/api/middle-school-indicator/middle-school-indicator.js
+++ b/src/api/middle-school-indicator/middle-school-indicator.js
@@ -35,3 +35,13 @@ export function destroy(params, isLoading = true) {
     isLoading
   })
 }
+
+export function importData(data, isLoading = true) {
+  return request({
+    method: 'post',
+    url: '/api/admin/middle-school-indicator/import',
+    data,
+    isLoading
+  })
+}
+
diff --git a/src/api/score/score.js b/src/api/score/score.js
index 3e4f8fd..36ce81e 100644
--- a/src/api/score/score.js
+++ b/src/api/score/score.js
@@ -35,3 +35,12 @@ export function destroy(params, isLoading = true) {
     isLoading
   })
 }
+
+export function importData(data, isLoading = true) {
+  return request({
+    method: 'post',
+    url: '/api/admin/score/import',
+    data,
+    isLoading
+  })
+}
diff --git a/src/views/MiddleSchoolIndicator/MiddleSchoolIndicator.vue b/src/views/MiddleSchoolIndicator/MiddleSchoolIndicator.vue
index e3a6c8b..1e1c51f 100644
--- a/src/views/MiddleSchoolIndicator/MiddleSchoolIndicator.vue
+++ b/src/views/MiddleSchoolIndicator/MiddleSchoolIndicator.vue
@@ -308,6 +308,8 @@
       :school="school"
       :is-show.sync="isShowDetail"
     />
+    <importShow ref="importShow" :school="school" @success="getList" :is-show.sync="isShowImport"></importShow>
+
   </div>
 </template>
 
@@ -330,6 +332,7 @@ import { getToken } from "@/utils/auth";
 
 import { index as schoolIndex } from "@/api/school/school";
 import {getparameter} from "@/api/system/dictionary";
+  import importShow from "./components/importShow.vue";
 
 export default {
   name: "MiddleSchoolIndicator",
@@ -337,15 +340,16 @@ export default {
   components: {
     AddMiddleSchoolIndicator,
     ShowMiddleSchoolIndicator,
+    importShow
   },
   data() {
     return {
-      action: `${process.env.VUE_APP_BASE_API}/api/admin/middle-school-indicator/import`,
+      action: `${process.env.VUE_APP_BASE_API}/api/admin/middle-school-indicator/excel-show`,
       uploadSize,
       examineKey: 0,
       isShowAdd: false,
       isShowDetail: false,
-
+        isShowImport: false,
       loading: false,
       tableHeight: 400,
       select: {
@@ -405,8 +409,18 @@ export default {
       if (response.hasOwnProperty('errcode')) {
         this.$message.error(response.errmsg)
       } else {
-        this.$message.success(`已导入${response.total}条`)
-        this.getList(true)
+        let arr = []
+        response.list.map(row => {
+          arr.push({
+            ...row,
+            year: row.year?row.year+'':''
+          });
+        });
+        this.isShowImport = true
+        this.$refs.importShow.errList = response.err
+        this.$refs.importShow.list = arr
+        // this.$message.success(`已导入${response.total}条`)
+        // this.getList(true)
       }
     },
     exportMethod() {
@@ -421,7 +435,7 @@ export default {
           Object.keys(this.form).forEach(key => {
             export_fields[key] = tableColumns.find(col => col.field === key)?.title || key
           })
-          download("/api/admin/school/index", "get", {
+          download("/api/admin/middle-school-indicator/index", "get", {
             ...this.select,
             page: 1,
             page_size: 9999,
diff --git a/src/views/MiddleSchoolIndicator/components/importShow.vue b/src/views/MiddleSchoolIndicator/components/importShow.vue
new file mode 100644
index 0000000..8f2847e
--- /dev/null
+++ b/src/views/MiddleSchoolIndicator/components/importShow.vue
@@ -0,0 +1,122 @@
+<template>
+  <div>
+    <vxe-modal :value="isShow" show-footer title="导入预览" show-confirm-button :width="defaultModalSize.sWidth"
+      :height="defaultModalSize.sHeight" transfer :fullscreen="$store.getters.device === 'mobile'"
+      @input="(e) => $emit('update:isShow', e)">
+      <div v-if="errList.length>0">
+        学校库暂无<span style="color:red;margin-right:10px" v-for="item in errList">{{item}}</span>
+      </div>
+      <vxe-table ref="table" stripe style="margin-top: 10px" :loading="loading" :height="tableHeight" keep-source
+        show-overflow :row-config="{ isCurrent: true, isHover: true }" :column-config="{ resizable: true }"
+        :edit-config="{
+          trigger: 'manual',
+          mode: 'row',
+          showStatus: true,
+          isHover: true,
+          autoClear: false,
+        }" :data="list">
+        <vxe-column type="seq" width="58" align="center" />
+        <vxe-column align="center" field="year" width="180" title="年份">
+          <template #default="{ row }">
+            <el-date-picker style="width: 100%;" size="small" type="year" format="yyyy" value-format="yyyy" v-model="row['year']"></el-date-picker>
+          </template>
+        </vxe-column>
+        <vxe-column align="center" field="school.name" title="学校">
+          <template #default="{ row }">
+            <el-cascader size="small" filterable v-model="row['school_id']" :options="school" :props="{
+                    emitPath: false,
+                    value: 'id',
+                    label: 'name',
+                  }"></el-cascader>
+          </template>
+        </vxe-column>
+        <vxe-column header-align="center" align="right" field="total" width="160" title="学籍数">
+          <template #default="{ row }">
+            <el-input type="number" v-model="row['total']"></el-input>
+          </template>
+        </vxe-column>
+        <vxe-column header-align="center" align="right" field="details_name" width="160" title="分配学校">
+          <template #default="{ row }">
+            <el-input v-model="row['details_name']"></el-input>
+          </template>
+        </vxe-column>
+        <vxe-column header-align="center" align="right" field="details_total" width="160" title="名额">
+          <template #default="{ row }">
+            <el-input type="number" v-model="row['details_total']"></el-input>
+          </template>
+        </vxe-column>
+      </vxe-table>
+
+      <template #footer>
+        <el-button type="primary" :loading="loading" @click="submit">确认</el-button>
+      </template>
+    </vxe-modal>
+  </div>
+</template>
+
+<script>
+  import {
+    importData
+  } from "@/api/middle-school-indicator/middle-school-indicator";
+  import {
+    defaultModalSize
+  } from "@/settings";
+
+  export default {
+    props: {
+      isShow: {
+        type: Boolean,
+        default: false,
+        required: true
+      },
+      school: {
+        type: Array,
+        default: () => [],
+      },
+    },
+    data() {
+      return {
+        loading: false,
+        defaultModalSize,
+        list: [],
+        errList:[],
+        tableHeight: 400,
+      };
+    },
+    mounted() {
+      this.calcTableHeight();
+    },
+    methods: {
+      calcTableHeight() {
+        let clientHeight = document.documentElement.clientHeight;
+        let padding = 160;
+        let margin = 20;
+        this.tableHeight =
+          clientHeight -
+          padding -
+          margin;
+      },
+      async submit() {
+        try {
+          this.loading = true
+          console.log(this.list)
+          // return
+          await importData({
+            data:this.list
+          }, false)
+          this.$message.success("添加成功")
+          this.$emit('update:isShow', false)
+          this.$emit("success")
+          this.list = []
+        } catch (err) {
+          console.error(err)
+        } finally {
+          this.loading = false
+        }
+      }
+    },
+    computed: {},
+  };
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/Score/Score.vue b/src/views/Score/Score.vue
index e36cc7c..0f17393 100644
--- a/src/views/Score/Score.vue
+++ b/src/views/Score/Score.vue
@@ -1,654 +1,567 @@
-<template>
-  <div>
-    <el-card shadow="never" style="margin-top: 20px">
-      <template #header>
-        <slot name="header">
-          <vxe-toolbar :print="isHasAuth('print')" custom ref="toolbar">
-            <template #toolSuffix>
-              <vxe-button
-                style="margin-right: 10px"
-                v-if="isHasAuth('export')"
-                icon="vxe-icon-download"
-                circle
-                @click="exportMethod"
-              ></vxe-button>
-            </template>
-            <template #buttons>
-              <el-button
-                v-if="isHasAuth('create')"
-                icon="el-icon-plus"
-                type="primary"
-                size="small"
-                @click="isShowAdd = true"
-                >新增</el-button
-              >
-              <template v-if="isHasAuth('search')">
-                <el-select v-model="select.area_id" size="small" style="width: 100px;" clearable placeholder="区域..">
-                  <el-option v-for="i in area" :key="i.id" :label="i.name" :value="i.id"></el-option>
-                </el-select>
-                <el-date-picker v-model="select['filter[1][value]']" size="small" style="width: 110px;" type="year" value-format="yyyy" placeholder="年份.."></el-date-picker>
-                <el-cascader
-                  size="small"
-                  v-model="select['filter[0][value]']"
-                  :options="school"
-                  :props="{
-                    emitPath: false,
-                    value: 'id',
-                    label: 'name',
-                  }"></el-cascader>
-<!--                <el-select style="width: 140px;" clearable v-model="select['filter[0][value]']" placeholder="学校.." size="small">-->
-<!--                  <el-option v-for="item in school" :key="item.id" :label="item.name" :value="item.id"></el-option>-->
-<!--                </el-select>-->
-
-                <el-button
-                  icon="el-icon-search"
-                  type="primary"
-                  plain
-                  size="small"
-                  @click="getList(true)"
-                >搜索</el-button
-                >
-              </template>
-              <el-popover
-                v-if="isHasAuth('import')"
-                placement="bottom-start"
-                title="导入"
-                width="400"
-                trigger="click">
-                <template #reference>
-                  <el-button type="primary" size="small" icon="el-icon-upload">导入</el-button>
-                </template>
-                <template #default>
-                  <el-upload
-                    ref="upload"
-                    :action="action"
-                    :on-success="uploadSuccess"
-                    accept=".xls,.xlsx"
-                    :headers="{
-                      'Authorization': 'Bearer ' + getToken()
-                    }"
-                    :auto-upload="false">
-                    <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-                    <el-button style="margin-left: 10px;" size="small" type="success" @click="uploadData">上传到服务器</el-button>
-                    <el-button style="margin-left: 10px;" size="small" type="primary" icon="el-icon-download" @click="downloadTemplate">模版下载</el-button>
-
-                    <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件</div>
-                  </el-upload>
-                </template>
-              </el-popover>
-            </template>
-          </vxe-toolbar>
-        </slot>
-      </template>
-
-      <vxe-table
-        ref="table"
-        stripe
-        style="margin-top: 10px"
-        :loading="loading"
-        :height="tableHeight"
-        keep-source
-        show-overflow
-        :menu-config="{
-          className: 'my-menus',
-          body: {
-            options: [
-              [
-                {
-                  code: 'copy',
-                  name: '复制',
-                  prefixConfig: { icon: 'vxe-icon-copy' },
-                  suffixConfig: { content: 'Ctrl+C' },
-                },
-                {
-                  code: 'remove',
-                  name: '删除',
-                  prefixConfig: {
-                    icon: 'vxe-icon-delete-fill',
-                    className: 'color-red',
-                  },
-                },
-              ],
-            ],
-          },
-        }"
-        @menu-click="contextMenuClickEvent"
-        :row-config="{ isCurrent: true, isHover: true }"
-        :column-config="{ resizable: true }"
-        :export-config="{}"
-        :edit-rules="validRules"
-        :edit-config="{
-          trigger: 'manual',
-          mode: 'row',
-          showStatus: true,
-          isHover: true,
-          autoClear: false,
-        }"
-        :align="allAlign"
-        :data="tableData"
-      >
-        <vxe-column type="checkbox" width="50" align="center" />
-        <vxe-column type="seq" width="58" align="center" />
-
-        <vxe-column
-          header-align="center"
-          field="code"
-          width="160"
-          title="代码"
-          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-        />
-
-        <vxe-column
-          align="center"
-          field="school.name"
-          width="180"
-          title="所属学校"
-          :edit-render="{
-            name: 'VxeSelect',
-            options: school,
-            props: { multiple: false },
-            optionProps: { value: 'id', label: 'name' },
-          }"
-        >
-          <template #edit="{ row }">
-            <el-cascader
-              size="small"
-              v-model="row['school_id']"
-              :options="school"
-              :props="{
-                    emitPath: false,
-                    value: 'id',
-                    label: 'name',
-                  }"></el-cascader>
-          </template>
-        </vxe-column>
-
-        <vxe-column
-          align="center"
-          field="year"
-          width="180"
-          title="年份"
-          :edit-render="{}"
-        >
-          <template #edit="{ row }">
-            <el-date-picker style="width: 100%;" size="small" type="year" value-format="yyyy" v-model="row['year']"></el-date-picker>
-          </template>
-        </vxe-column>
-
-        <vxe-column
-          header-align="center"
-          align="right"
-          field="total_score"
-          width="160"
-          title="统招总分"
-          :edit-render="{ name: 'input', attrs: { type: 'number' } }"
-        />
-
-        <vxe-column
-          header-align="center"
-          align="right"
-          field="main_score"
-          width="160"
-          title="统招语数外"
-          :edit-render="{ name: 'input', attrs: { type: 'number' } }"
-        />
-
-        <vxe-column
-          header-align="center"
-          align="right"
-          field="area_total_score"
-          width="160"
-          title="跨区总分"
-          :edit-render="{ name: 'input', attrs: { type: 'number' } }"
-        />
-
-        <vxe-column
-          header-align="center"
-          align="right"
-          field="area_main_score"
-          width="160"
-          title="跨区语数外"
-          :edit-render="{ name: 'input', attrs: { type: 'number' } }"
-        />
-
-        <vxe-column
-          field="operate"
-          header-align="center"
-          title="操作"
-          min-width="220"
-          fixed="right"
-        >
-          <template #default="{ row }">
-            <template v-if="isActiveStatus(row)">
-              <el-button size="small" type="primary" @click="saveRowEvent(row)"
-                >保存</el-button
-              >
-              <el-button
-                size="small"
-                type="primary"
-                plain
-                @click="cancelRowEvent(row)"
-                >取消</el-button
-              >
-            </template>
-            <template v-else>
-              <el-button
-                v-if="isHasAuth('detail')"
-                size="small"
-                type="primary"
-                plain
-                @click="detail(row)"
-                >查看</el-button
-              >
-              <el-button
-                v-if="isHasAuth('edit')"
-                size="small"
-                type="warning"
-                @click="editRowEvent(row)"
-                >编辑</el-button
-              >
-              <el-button
-                v-if="isHasAuth('delete')"
-                size="small"
-                type="danger"
-                @click="destroyRowEvent(row)"
-                >删除</el-button
-              >
-            </template>
-          </template>
-        </vxe-column>
-      </vxe-table>
-
-      <el-pagination
-        style="margin-top: 10px; display: flex; justify-content: flex-end"
-        :current-page.sync="select.page"
-        :page-sizes="[20, 30, 40, 50]"
-        :page-size.sync="select.page_size"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="
-          (e) => {
-            select.page_size = e;
-            select.page = 1;
-            getList();
-          }
-        "
-        @current-change="
-          (e) => {
-            select.page = e;
-            getList();
-          }
-        "
-      />
-    </el-card>
-
-    <AddScore
-      ref="AddScore"
-      :school="school"
-      :is-show.sync="isShowAdd"
-      @refresh="getList"
-    />
-    <ShowScore ref="ShowScore" :school="school" :is-show.sync="isShowDetail" />
-  </div>
-</template>
-
-<script>
-import VxeUI from "vxe-pc-ui";
-
-import { authMixin } from "@/mixin/authMixin";
-import { uploadSize } from "@/settings";
-import {deepCopy, download as downloadByTA, paramsSerializer} from "@/utils";
-import { download } from "@/utils/downloadRequest";
-import { destroy, index, save } from "@/api/score/score";
-import AddScore from "./components/AddScore.vue";
-import ShowScore from "./components/ShowScore.vue";
-import axios from "axios";
-import { getToken } from "@/utils/auth";
-import { index as areaIndex } from "@/api/area/area";
-import { index as schoolIndex } from "@/api/school/school";
-import {getparameter} from "@/api/system/dictionary";
-
-export default {
-  name: "Score",
-  mixins: [authMixin],
-  components: {
-    AddScore,
-    ShowScore,
-  },
-  data() {
-    return {
-      action: `${process.env.VUE_APP_BASE_API}/api/admin/score/import`,
-      uploadSize,
-      examineKey: 0,
-      isShowAdd: false,
-      isShowDetail: false,
-
-      loading: false,
-      tableHeight: 400,
-      select: {
-        page: 1,
-        page_size: 20,
-        keyword: "",
-        show_relation: ['school'],
-        "filter[0][key]": 'school_id',
-        "filter[0][op]": 'eq',
-        "filter[0][value]": '',
-        "filter[1][key]": 'year',
-        "filter[1][op]": 'eq',
-        "filter[1][value]": '',
-        area_id: ""
-      },
-      total: 0,
-      allAlign: null,
-      tableData: [],
-      form: {
-        id: "",
-
-        code: "",
-
-        school_id: "",
-
-        year: "",
-
-        total_score: "",
-
-        main_score: "",
-
-        area_total_score: "",
-
-        area_main_score: "",
-      },
-      validRules: {},
-
-      school: [],
-      area: [],
-    };
-  },
-  computed: {
-    isActiveStatus() {
-      return function (row) {
-        if (this.$refs["table"]) {
-          return this.$refs["table"].isEditByRow(row);
-        }
-      };
-    },
-    isHasAuth() {
-      return function (auth) {
-        return this.auths_auth_mixin.indexOf(auth) !== -1;
-      };
-    },
-  },
-  created() {
-    this.getArea().then(_ => {
-      this.getSchool();
-    })
-
-    this.getList();
-  },
-  mounted() {
-    this.bindToolbar();
-    this.calcTableHeight();
-  },
-  methods: {
-    getToken,
-    uploadData() {
-      this.$refs.upload.submit();
-    },
-    uploadSuccess(response) {
-      console.log(response)
-      if (response.hasOwnProperty('errcode')) {
-        this.$message.error(response.errmsg)
-      } else {
-        this.$message.success(`已导入${response.total}条`)
-        this.getList(true)
-      }
-    },
-    exportMethod() {
-      this.$confirm("请选择导出方式", "提示", {
-        confirmButtonText: "全量导出",
-        cancelButtonText: "部分导出",
-        distinguishCancelAndClose: true,
-      })
-        .then((_) => {
-          const tableColumns = this.$refs['table'].getFullColumns()
-          let export_fields = {}
-          Object.keys(this.form).forEach(key => {
-            export_fields[key] = tableColumns.find(col => col.field === key)?.title || key
-          })
-          download("/api/admin/school/index", "get", {
-            ...this.select,
-            page: 1,
-            page_size: 9999,
-            is_export: 1,
-            export_fields
-          }, `${this.$route.meta.title}_${this.$moment().valueOf()}.xlsx`,paramsSerializer);
-        })
-        .catch((action) => {
-          if (action === "cancel" && this.$refs["table"]) {
-            this.$refs["table"].openExport();
-          }
-        });
-    },
-    calcTableHeight() {
-      let clientHeight = document.documentElement.clientHeight;
-      let cardTitle = document
-        .querySelector(".el-card__header")
-        ?.getBoundingClientRect()?.height;
-      let search = document
-        .querySelector(".vxe-toolbar")
-        ?.getBoundingClientRect()?.height;
-      let paginationHeight =
-        (document.querySelector(".el-pagination")?.getBoundingClientRect()
-          ?.height ?? 0) + 10; //分页的高度
-      let topHeight = 50; //页面 头部
-      let padding = 80;
-      let margin = 20;
-      this.tableHeight =
-        clientHeight -
-        cardTitle -
-        search -
-        paginationHeight -
-        topHeight -
-        padding -
-        margin;
-    },
-    contextMenuClickEvent({ menu, row, column }) {
-      switch (menu.code) {
-        case "copy":
-          // 示例
-          if (row && column) {
-            if (VxeUI.clipboard.copy(row[column.field])) {
-              this.$message.success("已复制到剪贴板！");
-            }
-          }
-          break;
-        case "remove":
-          if (row && column) {
-            this.destroyRowEvent(row);
-          }
-        default:
-      }
-    },
-    async detail(row) {
-      await this.$refs["ShowScore"].getDetail(row.id);
-      this.isShowDetail = true;
-    },
-
-    async getArea() {
-      try {
-        const res = await areaIndex(
-          {
-            page: 1,
-            page_size: 999,
-          },
-          false
-        );
-        this.area = res.data;
-      } catch (err) {
-        console.error(err);
-      }
-    },
-    async getSchool() {
-      try {
-        const res = await schoolIndex(
-          {
-            page: 1,
-            page_size: 999,
-          },
-          false
-        );
-
-        this.school = this.area.map(area => ({
-          ...area,
-          children: res.data.filter(school => school.area_id === area.id)
-        }))
-      } catch (err) {
-        console.error(err);
-      }
-    },
-
-    uploadMethod(file) {
-      const formData = new FormData();
-      formData.append("file", file);
-      window.$_uploading = true;
-      return axios
-        .post(process.env.VUE_APP_UPLOAD_API, formData, {
-          headers: {
-            Authorization: `Bearer ${getToken()}`,
-          },
-        })
-        .then((response) => {
-          window.$_uploading = false;
-          if (response.status === 200 && !response.data.code) {
-            return {
-              response: response.data,
-              name: response.data.original_name,
-              url: response.data.url,
-            };
-          } else {
-            this.$message.error("上传失败");
-          }
-        })
-        .catch((_) => {
-          window.$_uploading = false;
-        });
-    },
-    bindToolbar() {
-      this.$nextTick(() => {
-        if (this.$refs["table"] && this.$refs["toolbar"]) {
-          this.$refs["table"].connect(this.$refs["toolbar"]);
-        }
-      });
-    },
-
-    editRowEvent(row) {
-      if (this.$refs["table"]) {
-        this.$refs["table"].setEditRow(row);
-      }
-    },
-    cancelRowEvent(row) {
-      if (this.$refs["table"]) {
-        this.$refs["table"].clearEdit().then(() => {
-          // 还原行数据
-          this.$refs["table"].revertData(row);
-        });
-      }
-    },
-
-    async getList(isRefresh=false) {
-      if(isRefresh) {
-        this.select.page = 1
-      }
-      this.loading = true;
-      try {
-        const res = await index(this.select, false);
-        this.tableData = res.data;
-        this.total = res.total;
-        this.loading = false;
-      } catch (err) {
-        console.error(err);
-        this.loading = false;
-      }
-    },
-
-    async saveRowEvent(row) {
-      if (window.$_uploading) {
-        this.$message.warning("文件正在上传中");
-        return;
-      }
-      try {
-        const errMap = await this.$refs["table"].validate();
-        if (errMap) {
-          throw new Error(errMap);
-        }
-        await this.$confirm("确认保存？", "提示", {
-          confirmButtonText: "确认",
-          cancelButtonText: "取消",
-        });
-        await this.$refs["table"].clearEdit();
-        let form = deepCopy(this.form);
-        for (const key in form) {
-          form[key] = row[key];
-        }
-
-        this.loading = true;
-        await save(form, false);
-        await this.getList();
-        this.loading = false;
-      } catch (err) {
-        this.loading = false;
-      }
-    },
-    async destroyRowEvent(row) {
-      try {
-        await this.$confirm("确认删除？", "提示", {
-          confirmButtonText: "确认",
-          cancelButtonText: "取消",
-        });
-        this.loading = true;
-        if (row.id) {
-          await destroy(
-            {
-              id: row.id,
-            },
-            false
-          );
-          await this.getList();
+<template>
+  <div>
+    <el-card shadow="never" style="margin-top: 20px">
+      <template #header>
+        <slot name="header">
+          <vxe-toolbar :print="isHasAuth('print')" custom ref="toolbar">
+            <template #toolSuffix>
+              <vxe-button style="margin-right: 10px" v-if="isHasAuth('export')" icon="vxe-icon-download" circle
+                @click="exportMethod"></vxe-button>
+            </template>
+            <template #buttons>
+              <el-button v-if="isHasAuth('create')" icon="el-icon-plus" type="primary" size="small"
+                @click="isShowAdd = true">新增</el-button>
+              <template v-if="isHasAuth('search')">
+                <el-select v-model="select.area_id" size="small" style="width: 100px;" clearable placeholder="区域..">
+                  <el-option v-for="i in area" :key="i.id" :label="i.name" :value="i.id"></el-option>
+                </el-select>
+                <el-date-picker v-model="select['filter[1][value]']" size="small" style="width: 110px;" type="year"
+                  value-format="yyyy" placeholder="年份.."></el-date-picker>
+                <el-cascader size="small" v-model="select['filter[0][value]']" :options="school" :props="{
+                    emitPath: false,
+                    value: 'id',
+                    label: 'name',
+                  }"></el-cascader>
+                <!--                <el-select style="width: 140px;" clearable v-model="select['filter[0][value]']" placeholder="学校.." size="small">-->
+                <!--                  <el-option v-for="item in school" :key="item.id" :label="item.name" :value="item.id"></el-option>-->
+                <!--                </el-select>-->
+
+                <el-button icon="el-icon-search" type="primary" plain size="small" @click="getList(true)">搜索</el-button>
+              </template>
+              <el-popover v-if="isHasAuth('import')" placement="bottom-start" title="导入" width="400" trigger="click">
+                <template #reference>
+                  <el-button type="primary" size="small" icon="el-icon-upload">导入</el-button>
+                </template>
+                <template #default>
+                  <el-upload ref="upload" :action="action" :on-success="uploadSuccess" accept=".xls,.xlsx" :headers="{
+                      'Authorization': 'Bearer ' + getToken()
+                    }" :auto-upload="false">
+                    <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+                    <el-button style="margin-left: 10px;" size="small" type="success"
+                      @click="uploadData">上传到服务器</el-button>
+                    <el-button style="margin-left: 10px;" size="small" type="primary" icon="el-icon-download"
+                      @click="downloadTemplate">模版下载</el-button>
+
+                    <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件</div>
+                  </el-upload>
+                </template>
+              </el-popover>
+            </template>
+          </vxe-toolbar>
+        </slot>
+      </template>
+
+      <vxe-table ref="table" stripe style="margin-top: 10px" :loading="loading" :height="tableHeight" keep-source
+        show-overflow :menu-config="{
+          className: 'my-menus',
+          body: {
+            options: [
+              [
+                {
+                  code: 'copy',
+                  name: '复制',
+                  prefixConfig: { icon: 'vxe-icon-copy' },
+                  suffixConfig: { content: 'Ctrl+C' },
+                },
+                {
+                  code: 'remove',
+                  name: '删除',
+                  prefixConfig: {
+                    icon: 'vxe-icon-delete-fill',
+                    className: 'color-red',
+                  },
+                },
+              ],
+            ],
+          },
+        }" @menu-click="contextMenuClickEvent" :row-config="{ isCurrent: true, isHover: true }"
+        :column-config="{ resizable: true }" :export-config="{}" :edit-rules="validRules" :edit-config="{
+          trigger: 'manual',
+          mode: 'row',
+          showStatus: true,
+          isHover: true,
+          autoClear: false,
+        }" :align="allAlign" :data="tableData">
+        <vxe-column type="checkbox" width="50" align="center" />
+        <vxe-column type="seq" width="58" align="center" />
+
+        <vxe-column
+          header-align="center"
+          field="school.code"
+          width="160"
+          title="代码"
+        />
+
+        <vxe-column align="center" field="school.name" width="180" title="所属学校" :edit-render="{
+            name: 'VxeSelect',
+            options: school,
+            props: { multiple: false },
+            optionProps: { value: 'id', label: 'name' },
+          }">
+          <template #edit="{ row }">
+            <el-cascader size="small" v-model="row['school_id']" :options="school" :props="{
+                    emitPath: false,
+                    value: 'id',
+                    label: 'name',
+                  }"></el-cascader>
+          </template>
+        </vxe-column>
+
+        <vxe-column align="center" field="year" width="180" title="年份" :edit-render="{}">
+          <template #edit="{ row }">
+            <el-date-picker style="width: 100%;" size="small" type="year" value-format="yyyy"
+              v-model="row['year']"></el-date-picker>
+          </template>
+        </vxe-column>
+
+        <vxe-column header-align="center" align="right" field="total_score" width="160" title="统招总分"
+          :edit-render="{ name: 'input', attrs: { type: 'number' } }" />
+
+        <vxe-column header-align="center" align="right" field="main_score" width="160" title="统招语数外"
+          :edit-render="{ name: 'input', attrs: { type: 'number' } }" />
+
+        <vxe-column header-align="center" align="right" field="area_total_score" width="160" title="跨区总分"
+          :edit-render="{ name: 'input', attrs: { type: 'number' } }" />
+
+        <vxe-column header-align="center" align="right" field="area_main_score" width="160" title="跨区语数外"
+          :edit-render="{ name: 'input', attrs: { type: 'number' } }" />
+
+        <vxe-column field="operate" header-align="center" title="操作" min-width="220" fixed="right">
+          <template #default="{ row }">
+            <template v-if="isActiveStatus(row)">
+              <el-button size="small" type="primary" @click="saveRowEvent(row)">保存</el-button>
+              <el-button size="small" type="primary" plain @click="cancelRowEvent(row)">取消</el-button>
+            </template>
+            <template v-else>
+              <el-button v-if="isHasAuth('detail')" size="small" type="primary" plain
+                @click="detail(row)">查看</el-button>
+              <el-button v-if="isHasAuth('edit')" size="small" type="warning" @click="editRowEvent(row)">编辑</el-button>
+              <el-button v-if="isHasAuth('delete')" size="small" type="danger"
+                @click="destroyRowEvent(row)">删除</el-button>
+            </template>
+          </template>
+        </vxe-column>
+      </vxe-table>
+
+      <el-pagination style="margin-top: 10px; display: flex; justify-content: flex-end" :current-page.sync="select.page"
+        :page-sizes="[20, 30, 40, 50]" :page-size.sync="select.page_size"
+        layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="
+          (e) => {
+            select.page_size = e;
+            select.page = 1;
+            getList();
+          }
+        " @current-change="
+          (e) => {
+            select.page = e;
+            getList();
+          }
+        " />
+    </el-card>
+
+    <AddScore ref="AddScore" :school="school" :is-show.sync="isShowAdd" @refresh="getList" />
+    <ShowScore ref="ShowScore" :school="school" :is-show.sync="isShowDetail" />
+    <importShow ref="importShow" :school="school" @success="getList" :is-show.sync="isShowImport"></importShow>
+  </div>
+</template>
+
+<script>
+  import VxeUI from "vxe-pc-ui";
+
+  import {
+    authMixin
+  } from "@/mixin/authMixin";
+  import {
+    uploadSize
+  } from "@/settings";
+  import {
+    deepCopy,
+    download as downloadByTA,
+    paramsSerializer
+  } from "@/utils";
+  import {
+    download
+  } from "@/utils/downloadRequest";
+  import {
+    destroy,
+    index,
+    save
+  } from "@/api/score/score";
+  import AddScore from "./components/AddScore.vue";
+  import ShowScore from "./components/ShowScore.vue";
+  import importShow from "./components/importShow.vue";
+  import axios from "axios";
+  import {
+    getToken
+  } from "@/utils/auth";
+  import {
+    index as areaIndex
+  } from "@/api/area/area";
+  import {
+    index as schoolIndex
+  } from "@/api/school/school";
+  import {
+    getparameter
+  } from "@/api/system/dictionary";
+
+  export default {
+    name: "Score",
+    mixins: [authMixin],
+    components: {
+      AddScore,
+      ShowScore,
+      importShow
+    },
+    data() {
+      return {
+        action: `${process.env.VUE_APP_BASE_API}/api/admin/score/excel-show`,
+        uploadSize,
+        examineKey: 0,
+        isShowAdd: false,
+        isShowDetail: false,
+        isShowImport: false,
+        loading: false,
+        tableHeight: 400,
+        select: {
+          page: 1,
+          page_size: 20,
+          keyword: "",
+          show_relation: ['school'],
+          "filter[0][key]": 'school_id',
+          "filter[0][op]": 'eq',
+          "filter[0][value]": '',
+          "filter[1][key]": 'year',
+          "filter[1][op]": 'eq',
+          "filter[1][value]": '',
+          area_id: ""
+        },
+        total: 0,
+        allAlign: null,
+        tableData: [],
+        form: {
+          id: "",
+          code: "",
+          school_id: "",
+          year: "",
+          total_score: "",
+          main_score: "",
+          area_total_score: "",
+          area_main_score: "",
+        },
+        validRules: {},
+
+        school: [],
+        area: [],
+      };
+    },
+    computed: {
+      isActiveStatus() {
+        return function(row) {
+          if (this.$refs["table"]) {
+            return this.$refs["table"].isEditByRow(row);
+          }
+        };
+      },
+      isHasAuth() {
+        return function(auth) {
+          return this.auths_auth_mixin.indexOf(auth) !== -1;
+        };
+      },
+    },
+    created() {
+      this.getArea().then(_ => {
+        this.getSchool();
+      })
+
+      this.getList();
+    },
+    mounted() {
+      this.bindToolbar();
+      this.calcTableHeight();
+    },
+    methods: {
+      getToken,
+      uploadData() {
+        this.$refs.upload.submit();
+      },
+      uploadSuccess(response) {
+        console.log(response)
+        if (response.hasOwnProperty('errcode')) {
+          this.$message.error(response.errmsg)
         } else {
-          console.log(row);
-          this.tableData.splice(
-            this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
-            1
-          );
-        }
-        this.loading = false;
-      } catch (err) {
-        this.loading = false;
-      }
-    },
-
-    downloadTemplate() {
-      getparameter({
-        number: 'download_url'
-      }).then(({ detail }) => {
-        const url = detail?.find(i => i.value === 'score')?.remark
-        if (url) {
-          downloadByTA(url)
-        }
-      })
-    }
-  },
-};
-</script>
-
-<style scoped lang="scss">
-::v-deep .vxe-buttons--wrapper > * + * {
-  margin-left: 10px;
-}
-::v-deep .el-card__header {
-  padding: 6px 20px;
-}
-::v-deep .el-tag + .el-tag {
-  margin-left: 4px;
-}
+          let arr = []
+          response.list.map(row => {
+            arr.push({
+              ...row,
+              year: row.year?row.year+'':''
+            });
+          });
+          this.isShowImport = true
+          this.$refs.importShow.errList = response.err
+          this.$refs.importShow.list = arr
+          // this.$message.success(`已导入${response.total}条`)
+          // this.getList(true)
+        }
+      },
+      exportMethod() {
+        this.$confirm("请选择导出方式", "提示", {
+            confirmButtonText: "全量导出",
+            cancelButtonText: "部分导出",
+            distinguishCancelAndClose: true,
+          })
+          .then((_) => {
+            const tableColumns = this.$refs['table'].getFullColumns()
+            let export_fields = {}
+            Object.keys(this.form).forEach(key => {
+              if(key==='code'){
+                export_fields['school.code'] = tableColumns.find(col => col.field === 'school.code')?.title || key
+              }else if(key==='school_id'){
+                export_fields['school.name'] = tableColumns.find(col => col.field === 'school.name')?.title || key
+              }else if(key==='id'){
+
+              }else{
+                export_fields[key] = tableColumns.find(col => col.field === key)?.title || key
+              }
+            })
+            download("/api/admin/score/index", "get", {
+              ...this.select,
+              page: 1,
+              page_size: 9999,
+              is_export: 1,
+              export_fields
+            }, `${this.$route.meta.title}_${this.$moment().valueOf()}.xlsx`, paramsSerializer);
+          })
+          .catch((action) => {
+            if (action === "cancel" && this.$refs["table"]) {
+              this.$refs["table"].openExport();
+            }
+          });
+      },
+      calcTableHeight() {
+        let clientHeight = document.documentElement.clientHeight;
+        let cardTitle = document
+          .querySelector(".el-card__header")
+          ?.getBoundingClientRect()?.height;
+        let search = document
+          .querySelector(".vxe-toolbar")
+          ?.getBoundingClientRect()?.height;
+        let paginationHeight =
+          (document.querySelector(".el-pagination")?.getBoundingClientRect()
+            ?.height ?? 0) + 10; //分页的高度
+        let topHeight = 50; //页面 头部
+        let padding = 80;
+        let margin = 20;
+        this.tableHeight =
+          clientHeight -
+          cardTitle -
+          search -
+          paginationHeight -
+          topHeight -
+          padding -
+          margin;
+      },
+      contextMenuClickEvent({
+        menu,
+        row,
+        column
+      }) {
+        switch (menu.code) {
+          case "copy":
+            // 示例
+            if (row && column) {
+              if (VxeUI.clipboard.copy(row[column.field])) {
+                this.$message.success("已复制到剪贴板！");
+              }
+            }
+            break;
+          case "remove":
+            if (row && column) {
+              this.destroyRowEvent(row);
+            }
+          default:
+        }
+      },
+      async detail(row) {
+        await this.$refs["ShowScore"].getDetail(row.id);
+        this.isShowDetail = true;
+      },
+
+      async getArea() {
+        try {
+          const res = await areaIndex({
+              page: 1,
+              page_size: 999,
+            },
+            false
+          );
+          this.area = res.data;
+        } catch (err) {
+          console.error(err);
+        }
+      },
+      async getSchool() {
+        try {
+          const res = await schoolIndex({
+              page: 1,
+              page_size: 999,
+            },
+            false
+          );
+
+          this.school = this.area.map(area => ({
+            ...area,
+            children: res.data.filter(school => school.area_id === area.id)
+          }))
+        } catch (err) {
+          console.error(err);
+        }
+      },
+
+      uploadMethod(file) {
+        const formData = new FormData();
+        formData.append("file", file);
+        window.$_uploading = true;
+        return axios
+          .post(process.env.VUE_APP_UPLOAD_API, formData, {
+            headers: {
+              Authorization: `Bearer ${getToken()}`,
+            },
+          })
+          .then((response) => {
+            window.$_uploading = false;
+            if (response.status === 200 && !response.data.code) {
+              return {
+                response: response.data,
+                name: response.data.original_name,
+                url: response.data.url,
+              };
+            } else {
+              this.$message.error("上传失败");
+            }
+          })
+          .catch((_) => {
+            window.$_uploading = false;
+          });
+      },
+      bindToolbar() {
+        this.$nextTick(() => {
+          if (this.$refs["table"] && this.$refs["toolbar"]) {
+            this.$refs["table"].connect(this.$refs["toolbar"]);
+          }
+        });
+      },
+
+      editRowEvent(row) {
+        if (this.$refs["table"]) {
+          this.$refs["table"].setEditRow(row);
+        }
+      },
+      cancelRowEvent(row) {
+        if (this.$refs["table"]) {
+          this.$refs["table"].clearEdit().then(() => {
+            // 还原行数据
+            this.$refs["table"].revertData(row);
+          });
+        }
+      },
+
+      async getList(isRefresh = false) {
+        if (isRefresh) {
+          this.select.page = 1
+        }
+        this.loading = true;
+        try {
+          const res = await index(this.select, false);
+          this.tableData = res.data;
+          this.total = res.total;
+          this.loading = false;
+        } catch (err) {
+          console.error(err);
+          this.loading = false;
+        }
+      },
+
+      async saveRowEvent(row) {
+        if (window.$_uploading) {
+          this.$message.warning("文件正在上传中");
+          return;
+        }
+        try {
+          const errMap = await this.$refs["table"].validate();
+          if (errMap) {
+            throw new Error(errMap);
+          }
+          await this.$confirm("确认保存？", "提示", {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+          });
+          await this.$refs["table"].clearEdit();
+          let form = deepCopy(this.form);
+          for (const key in form) {
+            form[key] = row[key];
+          }
+
+          this.loading = true;
+          await save(form, false);
+          await this.getList();
+          this.loading = false;
+        } catch (err) {
+          this.loading = false;
+        }
+      },
+      async destroyRowEvent(row) {
+        try {
+          await this.$confirm("确认删除？", "提示", {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+          });
+          this.loading = true;
+          if (row.id) {
+            await destroy({
+                id: row.id,
+              },
+              false
+            );
+            await this.getList();
+          } else {
+            console.log(row);
+            this.tableData.splice(
+              this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
+              1
+            );
+          }
+          this.loading = false;
+        } catch (err) {
+          this.loading = false;
+        }
+      },
+
+      downloadTemplate() {
+        getparameter({
+          number: 'download_url'
+        }).then(({
+          detail
+        }) => {
+          const url = detail?.find(i => i.value === 'score')?.remark
+          if (url) {
+            downloadByTA(url)
+          }
+        })
+      }
+    },
+  };
+</script>
+
+<style scoped lang="scss">
+  ::v-deep .vxe-buttons--wrapper>*+* {
+    margin-left: 10px;
+  }
+
+  ::v-deep .el-card__header {
+    padding: 6px 20px;
+  }
+
+  ::v-deep .el-tag+.el-tag {
+    margin-left: 4px;
+  }
 </style>
diff --git a/src/views/Score/components/ShowScore.vue b/src/views/Score/components/ShowScore.vue
index d6452e7..f4e51a2 100644
--- a/src/views/Score/components/ShowScore.vue
+++ b/src/views/Score/components/ShowScore.vue
@@ -19,7 +19,7 @@
           :labelStyle="{ 'font-weight': '500', 'font-size': '15px' }"
         >
           <el-descriptions-item label="代码">
-            {{ form["code"] }}
+            {{ form['school'] ? form['school'].code : '' }}
           </el-descriptions-item>
 
           <el-descriptions-item label="所属学校">
diff --git a/src/views/Score/components/importShow.vue b/src/views/Score/components/importShow.vue
new file mode 100644
index 0000000..5c0c8ff
--- /dev/null
+++ b/src/views/Score/components/importShow.vue
@@ -0,0 +1,130 @@
+<template>
+  <div>
+    <vxe-modal :value="isShow" show-footer title="导入预览" show-confirm-button :width="defaultModalSize.sWidth"
+      :height="defaultModalSize.sHeight" transfer :fullscreen="$store.getters.device === 'mobile'"
+      @input="(e) => $emit('update:isShow', e)">
+      <div v-if="errList.length>0">
+        学校库暂无<span style="color:red;margin-right:10px" v-for="item in errList">{{item}}</span>
+      </div>
+      <vxe-table ref="table" stripe style="margin-top: 10px" :loading="loading" :height="tableHeight" keep-source
+        show-overflow :row-config="{ isCurrent: true, isHover: true }" :column-config="{ resizable: true }"
+        :edit-config="{
+          trigger: 'manual',
+          mode: 'row',
+          showStatus: true,
+          isHover: true,
+          autoClear: false,
+        }" :data="list">
+        <vxe-column type="seq" width="58" align="center" />
+        <vxe-column align="center" field="school.name" width="180" title="所属学校">
+          <template #default="{ row }">
+            <el-cascader size="small" filterable v-model="row['school_id']" :options="school" :props="{
+                    emitPath: false,
+                    value: 'id',
+                    label: 'name',
+                  }"></el-cascader>
+          </template>
+        </vxe-column>
+        <vxe-column align="center" field="year" width="180" title="年份">
+          <template #default="{ row }">
+            <el-date-picker style="width: 100%;" size="small" type="year" format="yyyy" value-format="yyyy" v-model="row['year']"></el-date-picker>
+          </template>
+        </vxe-column>
+
+        <vxe-column header-align="center" align="right" field="total_score" width="160" title="统招总分">
+          <template #default="{ row }">
+            <el-input type="number" v-model="row['total_score']"></el-input>
+          </template>
+        </vxe-column>
+
+        <vxe-column header-align="center" align="right" field="main_score" width="160" title="统招语数外">
+          <template #default="{ row }">
+            <el-input type="number" v-model="row['main_score']"></el-input>
+          </template>
+        </vxe-column>
+
+        <vxe-column header-align="center" align="right" field="area_total_score" width="160" title="跨区总分">
+          <template #default="{ row }">
+            <el-input type="number" v-model="row['area_total_score']"></el-input>
+          </template>
+        </vxe-column>
+        <vxe-column header-align="center" align="right" field="area_main_score" width="160" title="跨区语数外">
+          <template #default="{ row }">
+            <el-input type="number" v-model="row['area_main_score']"></el-input>
+          </template>
+        </vxe-column>
+      </vxe-table>
+
+      <template #footer>
+        <el-button type="primary" :loading="loading" @click="submit">确认</el-button>
+      </template>
+    </vxe-modal>
+  </div>
+</template>
+
+<script>
+  import {
+    importData
+  } from "@/api/score/score";
+  import {
+    defaultModalSize
+  } from "@/settings";
+
+  export default {
+    props: {
+      isShow: {
+        type: Boolean,
+        default: false,
+        required: true
+      },
+      school: {
+        type: Array,
+        default: () => [],
+      },
+    },
+    data() {
+      return {
+        loading: false,
+        defaultModalSize,
+        list: [],
+        errList:[],
+        tableHeight: 400,
+      };
+    },
+    mounted() {
+      this.calcTableHeight();
+    },
+    methods: {
+      calcTableHeight() {
+        let clientHeight = document.documentElement.clientHeight;
+        let padding = 160;
+        let margin = 20;
+        this.tableHeight =
+          clientHeight -
+          padding -
+          margin;
+      },
+      async submit() {
+        try {
+          this.loading = true
+          console.log(this.list)
+          // return
+          await importData({
+            data:this.list
+          }, false)
+          this.$message.success("添加成功")
+          this.$emit('update:isShow', false)
+          this.$emit("success")
+          this.list = []
+        } catch (err) {
+          console.error(err)
+        } finally {
+          this.loading = false
+        }
+      }
+    },
+    computed: {},
+  };
+</script>
+
+<style scoped lang="scss"></style>