diff --git a/package-lock.json b/package-lock.json
index 0d563cf..721e0b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3665,6 +3665,11 @@
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
+    "decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
+    },
     "decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
@@ -12430,6 +12435,35 @@
         }
       }
     },
+    "umy-table": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/umy-table/-/umy-table-1.1.8.tgz",
+      "integrity": "sha512-yqPMFwZ6MUNqI73KamsNKBTbHRA7VuVZDEWobaySghtf4n/s7INuTNQoADB/ROVK57WOXr99Xpnol0aMqGlASA==",
+      "requires": {
+        "async-validator": "~1.8.1",
+        "deepmerge": "^1.2.0",
+        "normalize-wheel": "^1.0.1",
+        "resize-observer-polyfill": "^1.5.0",
+        "throttle-debounce": "^1.0.1",
+        "vuedraggable": "^2.23.2",
+        "xe-utils": "^3.0.0-beta.12"
+      }
+    },
+    "umy-ui": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/umy-ui/-/umy-ui-1.1.6.tgz",
+      "integrity": "sha512-wX0S29B5sFn8q0MvU9PEl8DGZeQmZXOJlLrwaCJ2UHiIQZCANWgXMBjjQgpaequ1gRZ8BekEu7Sn7hJccm9YMQ==",
+      "requires": {
+        "async-validator": "~1.8.1",
+        "deepmerge": "^1.2.0",
+        "normalize-wheel": "^1.0.1",
+        "resize-observer-polyfill": "^1.5.0",
+        "throttle-debounce": "^1.0.1",
+        "umy-table": "1.1.8",
+        "vuedraggable": "^2.23.2",
+        "xe-utils": "^3.0.0-beta.12"
+      }
+    },
     "unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
@@ -13584,6 +13618,11 @@
         "async-limiter": "~1.0.0"
       }
     },
+    "xe-utils": {
+      "version": "3.5.22",
+      "resolved": "https://registry.npmjs.org/xe-utils/-/xe-utils-3.5.22.tgz",
+      "integrity": "sha512-rhWuM2fVXsdrqUtyjRAsYTDLvVzYSSZqg/uCRyDqcw96AweB1AWsnTJZyl9g68ejnP0xhxfSoNBSrIcOeX1yxA=="
+    },
     "xml2js": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
diff --git a/package.json b/package.json
index 183b80c..3f2e4f0 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "ali-oss": "^6.18.1",
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
+    "decimal.js": "^10.4.3",
     "echarts": "^4.8.0",
     "element-theme": "^2.0.1",
     "element-ui": "^2.13.0",
@@ -22,6 +23,7 @@
     "postcss-px2rem": "^0.3.0",
     "px2rem-loader": "^0.1.9",
     "sortablejs": "^1.14.0",
+    "umy-ui": "^1.1.6",
     "vue": "^2.6.10",
     "vue-codemirror": "^4.0.6",
     "vue-cropperjs": "^3.0.0",
diff --git a/src/api/index.js b/src/api/index.js
index e811164..7e1541b 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -12,6 +12,7 @@ export default {
     deleteProfile : `users/users/userInfo/deleteProfile`,
     refreshPageNotification : `nakadai/message/refreshPageNotification`,
     getCurrentTime : `competition/competition/management/getCurrentTime`,
+		heartbeatDetection : `nakadai/message/heartbeatDetection`,
 
     getPlayAuth: `${uploadURL}oss/manage/getPlayAuth`, // 获取播放凭证
     
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 7e0e0e6..80da1b2 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -104,6 +104,7 @@ export default {
     this.getSystemDetail();
     this.getUserDetail();
     this.getNotice()
+    this.heartbeatDetection()
   },
   methods: {
     ...mapMutations("user", [
@@ -169,6 +170,12 @@ export default {
       // 监听socket消息
       this.socket.onmessage = this.getMessage;
     },
+    // 心跳检测
+    heartbeatDetection () {
+      setInterval(async () => {
+        await this.$get(this.api.heartbeatDetection)
+      }, 58 * 1000)
+    },
 
     // 获取消息
     getNotice () {
diff --git a/src/libs/util.js b/src/libs/util.js
index d2f4b33..3ddbe9b 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -208,7 +208,18 @@ const util = {
             });
         }
         return result;
-    }
+    },
+    // 获取当前时间
+    getNow () {
+      return new Promise(async (resolve, reject) => {
+        const { data } = await axios.get(Setting.apiBaseURL + api.getCurrentTime, {
+					headers: {
+						token: _local.get(Setting.tokenKey)
+					}
+				})
+        resolve(new Date(data.currentTime))
+      })
+    },
 };
 
 export default util;
\ No newline at end of file
diff --git a/src/pages/achievement/info/course.vue b/src/pages/achievement/info/course.vue
index 3cb7193..110b905 100644
--- a/src/pages/achievement/info/course.vue
+++ b/src/pages/achievement/info/course.vue
@@ -57,11 +57,11 @@
         <div class="wrong">
           <div class="line">
             <span class="jud-name">错误率最高：{{ max.projectName }}</span>
-            <span>参加考试{{ permissions ? peopleNum || 0 : max.quantityAfterWeightRemoval }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${max.itemErrorCount || 0}人做错，` : '' }}错误率{{ max.errorRate || 0 }}%</span>
+            <span>参加考试{{ permissions ? (max.numberOfParticipants || 0) : (max.quantityAfterWeightRemoval || 0) }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${max.itemErrorCount || 0}人做错，` : '' }}错误率{{ max.errorRate || 0 }}%</span>
           </div>
           <div class="line">
             <span class="jud-name">错误率最低：{{ min.projectName }}</span>
-            <span>参加考试{{ permissions ? peopleNum || 0 : min.quantityAfterWeightRemoval }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${min.itemErrorCount || 0}人做错，` : '' }}错误率{{ min.errorRate || 0 }}%</span>
+            <span>参加考试{{ permissions ? (min.numberOfParticipants || 0) : (min.quantityAfterWeightRemoval || 0) }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${min.itemErrorCount || 0}人做错，` : '' }}错误率{{ min.errorRate || 0 }}%</span>
           </div>
         </div>
         <div class="chart"
@@ -364,8 +364,8 @@ export default {
         e.errorRate = (+e.errorRate).toFixed(2)
       })
       this.errorAnalysis = err || []
-      this.max = err[0] || {}
-      this.min = err[err.length - 1] || {}
+      this.max = err.length ? err[0] : {}
+      this.min = err.length ? err[err.length - 1] : {}
       this.errorChart()
       const { row } = this.$store.state.achievement
       row && this.$nextTick(() => {
@@ -403,6 +403,7 @@ export default {
     },
     // 练习考核切换
     tabChange () {
+      this.permissions = +this.curTab
       this.$router.push({
         path: 'course',
         query: {
@@ -563,7 +564,6 @@ export default {
       for (const i in this.stageNumber) {
         data[+(i.replace('num', '')) - 1] = this.stageNumber[i]
       }
-      console.log("🚀 ~ getChart ~ data:", data)
       let myChart = echarts.init(document.getElementById("chart"));
       myChart.setOption({
         title: { text: "实验分数分布图" },
@@ -592,7 +592,6 @@ export default {
     // 错误率统计图
     errorChart () {
       const data = this.errorAnalysis
-      console.log("🚀 ~ file: course.vue:585 ~ errorChart ~ data:", data)
       const maxFontLength = data.length > 13 ? 6 : 10
       const option = {
         tooltip: {
diff --git a/src/pages/achievement/info/project.vue b/src/pages/achievement/info/project.vue
index ca9f7fc..e75e612 100644
--- a/src/pages/achievement/info/project.vue
+++ b/src/pages/achievement/info/project.vue
@@ -602,7 +602,8 @@ export default {
             }
           },
           axisLabel: {
-            interval: 0,
+            // rotate: 45,
+            interval: data.length > 40 ? 20 : 0,
             textStyle: {
               color: '#333',
             },
@@ -642,7 +643,7 @@ export default {
         series: [{
           name: '错误率',
           type: 'bar',
-          barWidth: 25,
+          barWidth: data.length > 40 ? 15 : 25,
           axisLabel: {
             margin: 10,
             textStyle: {
diff --git a/src/pages/assessment/add/index.vue b/src/pages/assessment/add/index.vue
index a4a4cd4..8408dbc 100644
--- a/src/pages/assessment/add/index.vue
+++ b/src/pages/assessment/add/index.vue
@@ -548,8 +548,10 @@ export default {
       }
     },
     getData () { // 获取详情
-      this.$get(`${this.api.getDetailById}?id=${this.form.id}`).then(res => {
-        this.form = res.data;
+      this.$get(`${this.api.getDetailById}?id=${this.form.id}`).then(({ data }) => {
+        this.form = data;
+        this.startTime = data.startTime
+        this.stopTime = data.stopTime
         this.formatDuration();
         this.getschoolCourse();
       }).catch(err => {
@@ -625,7 +627,7 @@ export default {
       if (this.updateTime) {
         this.$confirm(`编辑的内容未保存，是否保存？`, '提示', {
           type: 'warning',
-            closeOnClickModal: false
+          closeOnClickModal: false
         }).then(() => {
           this.save()
         }).catch(() => {
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index d4efe8b..e379b2e 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -223,7 +223,7 @@
 
 <script>
 import { mapState } from "vuex";
-import util from "@/libs/util";
+import Util from "@/libs/util";
 export default {
   data () {
     return {
@@ -299,6 +299,7 @@ export default {
       multipleSelection: [], // 多选
       listLoading: false,// 列表加载
       ticker: null, // 倒计时定时器
+      now: '',
     };
   },
   computed: {
@@ -310,7 +311,7 @@ export default {
     "form.month": function (val) {
       if (val) {
         let unit = 24 * 60 * 60 * 1000;
-        this.date = [util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() - unit * 30 * val)), util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() + unit))];
+        this.date = [Util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() - unit * 30 * val)), Util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() + unit))];
       } else {
         this.date = [];
       }
@@ -342,6 +343,9 @@ export default {
     this.getCourse();
   },
   methods: {
+    async getNow () {
+      this.now = await Util.getNow()
+    },
     pickerInput () {
       this.form.month = '6'
     },
@@ -457,12 +461,12 @@ export default {
       this.$router.push(`add?id=${row.id}`);
     },
     show (row) {
-      this.$router.push(`/achievement/project?id=${row.id}&projectName=${row.projectName}&permissions=1&classId=${row.classId}`)
+      this.$router.push(`/achievement/project?id=${row.id}&projectName=${row.projectName}&permissions=1&classId=${row.classId}&mallId=${row.mallId}`)
     },
     start (row) {
       this.$post(`${this.api.enableAssessment}?id=${row.id}`).then(async res => {
         await this.$post(`${this.api.refreshPageNotification}?content=3-${row.id}`)
-        util.successMsg("启动成功！");
+        Util.successMsg("启动成功！");
         this.getData(1);
       }).catch(err => {
         console.log(err);
@@ -475,11 +479,11 @@ export default {
       }).then(() => {
         let data = {
           id: row.id,
-          endTime: util.formatDate("yyyy-MM-dd hh:mm:ss", new Date()),
+          endTime: Util.formatDate("yyyy-MM-dd hh:mm:ss", new Date()),
           status: 2
         };
         this.$post(`${this.api.collectPaper}?id=${row.id}`).then(async res => {
-          util.successMsg("提前结束成功！");
+          Util.successMsg("提前结束成功！");
           this.getData();
           await this.$post(`${this.api.refreshPageNotification}?content=3-${row.id}`)
         }).catch(err => {
@@ -493,7 +497,7 @@ export default {
         type: "warning"
       }).then(() => {
         this.$post(this.api.deleteAssessment, [row.id]).then(res => {
-          util.successMsg("删除成功");
+          Util.successMsg("删除成功");
           this.getData();
         }).catch(res => {
         });
@@ -512,7 +516,7 @@ export default {
           this.$post(this.api.deleteAssessment, ids).then(res => {
             this.multipleSelection = [];
             this.$refs.table.clearSelection();
-            util.successMsg("删除成功");
+            Util.successMsg("删除成功");
             this.getData();
           }).catch(res => {
           });
@@ -522,7 +526,7 @@ export default {
         }).catch(() => {
         });
       } else {
-        util.errorMsg("请先选择数据 ！");
+        Util.errorMsg("请先选择数据 ！");
       }
     },
     handleSelectionChange (val) {
diff --git a/src/pages/match/add/step2.vue b/src/pages/match/add/step2.vue
index 16a6f14..1e3f908 100644
--- a/src/pages/match/add/step2.vue
+++ b/src/pages/match/add/step2.vue
@@ -460,9 +460,6 @@ export default {
       } else { // 保存草稿的情况下，只保存输入了阶段名称的阶段
         form.competitionStageList = form.competitionStageList.filter(e => e.stageName)
       }
-      // for (const e of form.competitionStageList) {
-      //   if (!e.teamNumLimitOpt) e.teamNumLimit = 0
-      // }
       this.$parent.showLoad()
       this.pass = 1
       if (form.ruleId) {
diff --git a/src/pages/match/manage/matchArchList copy.vue b/src/pages/match/manage/matchArchList copy.vue
new file mode 100644
index 0000000..2ed5446
--- /dev/null
+++ b/src/pages/match/manage/matchArchList copy.vue	
@@ -0,0 +1,656 @@
+<template>
+  <div>
+    <el-card shadow="hover"
+             class="m-b-20 head-card">
+      <div class="flex-between m-b-20">
+        <el-page-header @back="$router.back()"
+                        content="成绩管理"></el-page-header>
+      </div>
+
+    </el-card>
+
+    <el-card v-if="method != 2"
+             shadow="hover"
+             class="m-b-20">
+      <div class="stat">
+        <div class="nums">
+          <div class="item">
+            <p class="name">已参加/应参加人数</p>
+            <p class="val">{{ isNaN(statData.totalNumber) ? '' : statData.attendance + '/' + statData.totalNumber }}</p>
+          </div>
+          <div class="item">
+            <p class="name">实验平均分</p>
+            <p class="val">{{ avgScore }}</p>
+          </div>
+        </div>
+        <div class="chart"
+             id="chart"></div>
+      </div>
+    </el-card>
+
+    <el-card shadow="hover"
+             class="m-b-20">
+      <div v-if="showFile"
+           class="tabs m-b-20">
+        <a class="item"
+           v-for="(item, i) in tabs"
+           :key="i"
+           :class="{active: i === active}"
+           @click="tabChange(i)">{{ item }}</a>
+      </div>
+
+      <div class="flex-between m-b-20">
+        <div>
+          <el-input size="small"
+                    placeholder="请输入学校/学生姓名"
+                    prefix-icon="el-icon-search"
+                    v-model="keyword"
+                    clearable
+                    style="width: 300px"></el-input>
+        </div>
+        <div v-if="!active">
+          <el-button v-if="method == 2"
+                     type="primary"
+                     @click="batchImport">上传成绩</el-button>
+          <el-button type="primary"
+                     @click="delAllData">批量删除</el-button>
+          <el-button type="primary"
+                     @click="exportData">导出</el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary"
+                     :loading="loading"
+                     @click="exportData1">{{ loading ? '正在导出' : '批量导出' }}</el-button>
+        </div>
+      </div>
+      <template v-if="!active">
+        <el-table :data="list"
+                  class="table"
+                  ref="table"
+                  stripe
+                  header-align="center"
+                  @selection-change="handleSelectionChange"
+                  row-key="reportId">
+          <el-table-column type="selection"
+                           width="55"
+                           align="center"
+                           :reserve-selection="true"></el-table-column>
+          <el-table-column type="index"
+                           width="60"
+                           label="序号"
+                           align="center">
+            <template slot-scope="scope">
+              {{ scope.$index + (page - 1) * pageSize + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="schoolName"
+                           label="学校"
+                           min-width="150"
+                           align="center"></el-table-column>
+          <el-table-column v-if="competitionType"
+                           prop="teamName"
+                           label="团队名称"
+                           min-width="100"
+                           align="center"></el-table-column>
+          <el-table-column prop="userName"
+                           label="学生姓名"
+                           min-width="100"
+                           align="center"></el-table-column>
+          <el-table-column prop="workNumber"
+                           label="学号"
+                           min-width="100"
+                           align="center"></el-table-column>
+          <el-table-column prop="score"
+                           label="分数"
+                           width="90"
+                           align="center"></el-table-column>
+          <el-table-column prop="timeSum"
+                           label="耗时"
+                           width="90"
+                           align="center">
+            <template slot-scope="scope">
+              {{ scope.row.timeSum ? scope.row.timeSum + 'min' : '--' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="submitTime"
+                           label="提交时间"
+                           min-width="150"
+                           align="center">
+            <template slot-scope="scope">
+              {{ scope.row.submitTime || '--' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作"
+                           align="center"
+                           width="160">
+            <template slot-scope="scope">
+              <el-button :disabled="!scope.row.reportId"
+                         type="text"
+                         @click="show(scope.row)">{{ scope.row.reportId ? '查看成绩报告' : '未参加' }}</el-button>
+              <el-button v-if="scope.row.reportId"
+                         type="text"
+                         @click="handleDelete(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pagination">
+          <el-pagination background
+                         layout="total, prev, pager, next"
+                         :total="total"
+                         @current-change="handleCurrentChange"
+                         :current-page="page">
+          </el-pagination>
+        </div>
+      </template>
+      <template v-else>
+        <el-table :data="list1"
+                  class="table"
+                  :key="2"
+                  stripe
+                  header-align="center"
+                  @selection-change="handleSelectionChange1"
+                  row-key="reportId">
+          <el-table-column type="selection"
+                           width="55"
+                           align="center"
+                           :reserve-selection="true"></el-table-column>
+          <el-table-column type="index"
+                           width="60"
+                           label="序号"
+                           align="center">
+            <template slot-scope="scope">
+              {{ scope.$index + (page1 - 1) * pageSize + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="schoolName"
+                           label="学校"
+                           align="center"></el-table-column>
+          <el-table-column v-if="competitionType"
+                           prop="teamName"
+                           label="团队名称"
+                           align="center"></el-table-column>
+          <el-table-column prop="userName"
+                           label="学生姓名"
+                           align="center"></el-table-column>
+          <el-table-column prop="workNumber"
+                           label="学号"
+                           align="center"></el-table-column>
+          <el-table-column prop="fileName"
+                           label="文件名"
+                           align="center"></el-table-column>
+          <el-table-column prop="fileSize"
+                           label="文件大小"
+                           align="center"></el-table-column>
+          <el-table-column prop="fileType"
+                           label="文件类型"
+                           align="center"></el-table-column>
+          <el-table-column prop="fileFormat"
+                           label="文件格式"
+                           align="center"></el-table-column>
+          <el-table-column prop="createTime"
+                           label="提交时间"
+                           width="150"
+                           align="center">
+          </el-table-column>
+          <el-table-column label="操作"
+                           align="center"
+                           width="200">
+            <template slot-scope="scope">
+              <el-button v-if="!isCompress(scope.row.fileFormat)"
+                         type="text"
+                         @click="preview(scope.row)">预览文件</el-button>
+              <el-button type="primary"
+                         size="mini"
+                         :loading="scope.row.loading"
+                         @click="exportFile(scope.row)">导出文件</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pagination">
+          <el-pagination background
+                         layout="total, prev, pager, next"
+                         :total="total1"
+                         @current-change="handleCurrentChange1"
+                         :current-page="page1">
+          </el-pagination>
+        </div>
+      </template>
+    </el-card>
+
+    <el-dialog title="批量导入"
+               :visible.sync="importVisible"
+               width="24%"
+               :close-on-click-modal="false">
+      <div style="text-align: center">
+        <div style="margin-bottom: 10px;">
+          <el-button type="primary"
+                     @click="download">模板下载<i class="el-icon-download el-icon--right"></i></el-button>
+        </div>
+        <el-upload ref="importStaff"
+                   name="file"
+                   accept=".xls,.xlsx"
+                   :on-remove="handleRemove"
+                   :on-error="uploadError"
+                   :on-success="uploadSuccess"
+                   :before-remove="beforeRemove"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :action="this.api.batchImportGrades"
+                   :file-list="uploadList"
+                   :headers="headers"
+                   :data="{
+                    competitionId: this.id,
+                    stageId: this.stageId,
+                    systemId: 0
+                  }">
+          <el-button type="primary"
+                     class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
+        </el-upload>
+        <el-link v-if="uploadFaild"
+                 type="primary"
+                 @click="showFaild">部分数据导入失败，查看失败原因</el-link>
+      </div>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="small"
+                   @click="importVisible = false">取 消</el-button>
+        <el-button size="small"
+                   type="primary"
+                   @click="uploadSure">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Setting from "@/setting";
+import util from "@/libs/util";
+import * as echarts from "echarts";
+import axios from 'axios';
+import Zip from '@/libs/zip'
+export default {
+  data () {
+    return {
+      id: +this.$route.query.id,
+      stageId: +this.$route.query.stageId,
+      method: +this.$route.query.method,
+      competitionType: +this.$route.query.competitionType,
+      showFile: this.$route.query.showFile === 'true',
+      isCompress: util.isCompress,
+      keyword: "",
+      searchTimer: null,
+      list: [],
+      multipleSelection: [],
+      page: 1,
+      pageSize: 10,
+      total: 0,
+
+      list1: [],
+      multipleSelection1: [],
+      page1: 1,
+      total1: 0,
+
+      avgScore: 0, // 平均分
+      importVisible: false,
+      uploadList: [],
+      uploadFaild: false,
+      exportCode: '',
+      headers: {
+        token: util.local.get(Setting.tokenKey)
+      },
+      statData: {},
+      tabs: ['成绩列表', '文件列表'],
+      active: 0,
+      loading: false
+    };
+  },
+  watch: {
+    keyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initData();
+      }, 500);
+    }
+  },
+  mounted () {
+    this.getData()
+  },
+  methods: {
+    getData () {
+      // 文件列表
+      if (this.active) {
+        this.$post(this.api.cCompetitionStageFileList, {
+          pageNum: this.page1,
+          pageSize: this.pageSize,
+          competitionId: this.id,
+          stageId: this.stageId,
+          keyWord: this.keyword,
+        }).then(({ data }) => {
+          data.records.forEach(e => {
+            e.loading = false
+            e.fileType = '其他'
+            if (util.isVideo(e.fileFormat)) {
+              e.fileType = '视频'
+            } else if (util.isAudio(e.fileFormat)) {
+              e.fileType = '音频'
+            } else if (util.isImg(e.fileFormat)) {
+              e.fileType = '图片'
+            } else if (util.isDoc(e.fileFormat)) {
+              e.fileType = '文档'
+            } else if (util.isCompress(e.fileFormat)) {
+              e.fileType = '压缩包'
+            } else if (e.fileType === 'pdf') {
+              e.fileType = 'pdf'
+            }
+          })
+          this.list1 = data.records
+          this.total1 = data.total
+        }).catch(res => { })
+      } else { // 成绩列表
+        this.$post(this.api.stageGradeManagementList, {
+          pageNum: this.page,
+          pageSize: this.pageSize,
+          competitionId: this.id,
+          keyWord: this.keyword,
+          stageId: this.stageId,
+          isNakadai: 1
+        }).then(({ data, page }) => {
+          this.total = page.total
+          this.list = page.records
+          this.statData = data
+          this.avgScore = (+data.avgScore).toFixed(2)
+          this.getChart()
+        }).catch(res => { })
+      }
+    },
+    initData () {
+      this.page = 1
+      this.getData()
+    },
+    // 查看成绩报告
+    show (row) {
+      this.$router.push(`/match/report?reportId=${row.reportId}`)
+    },
+    // 导出(有勾选：就导勾选中的；没有勾选：就导全部)
+    exportData () {
+      // 有选择数据，则导出已选择的，否则导出全部
+      if (this.multipleSelection.length) {
+        axios.post(this.api.exportExperimentalResultsInBatch, this.multipleSelection, {
+          headers: this.headers,
+          responseType: 'blob'
+        }).then((res) => {
+          util.downloadFileDirect(`赛事成绩.xls`, new Blob([res.data]))
+        }).catch(res => { })
+      } else if (this.list.length) {
+        axios.post(this.api.allExperimentalResultsAreDerived, {
+          pageNum: 1,
+          pageSize: 10000,
+          competitionId: this.id,
+          isNakadai: 1,
+          stageId: this.stageId,
+        }, {
+          headers: this.headers,
+          responseType: 'blob'
+        }).then((res) => {
+          util.downloadFileDirect(`赛事成绩.xls`, new Blob([res.data]))
+        }).catch(res => { })
+      }
+
+      // let { list } = this
+      // if (this.multipleSelection.length) {
+      //   list = this.multipleSelection
+      // }
+      // axios.post(this.api.exportExperimentalResultsInBatch, list, {
+      //   headers: this.headers,
+      //   responseType: 'blob'
+      // }).then((res) => {
+      //   util.downloadFileDirect(`赛事成绩.xls`, new Blob([res.data]))
+      // }).catch(res => { })
+    },
+    // 导出(有勾选：就导勾选中的；没有勾选：就导全部)
+    exportData1 () {
+      this.loading = true
+      let list = this.list1
+      if (this.multipleSelection1.length) {
+        list = this.multipleSelection1
+      }
+      Zip('批量导出', list, () => {
+        this.loading = false
+      })
+    },
+    handleDelete (row) { // 删除
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$post(this.api.batchDeleteContestGrade, {
+          ids: [this.method == 2 ? row.scoreId : row.reportId],
+          competitionId: this.id,
+          stageId: row.stageId
+        }).then(res => {
+          util.successMsg("删除成功");
+          this.getData();
+        }).catch(res => {
+        });
+      }).catch(() => {
+      });
+    },
+    delAllData () { // 批量删除
+      if (this.multipleSelection.length) {
+        this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", {
+          type: "warning"
+        }).then(() => {
+          let ids = this.multipleSelection.map(item => {
+            return this.method == 2 ? item.scoreId : item.reportId
+          });
+          this.$post(this.api.batchDeleteContestGrade, {
+            ids,
+            competitionId: this.id,
+            stageId: this.stageId
+          }).then(res => {
+            this.multipleSelection = [];
+            this.$refs.table.clearSelection();
+            util.successMsg("删除成功");
+            this.getData();
+          }).catch(res => {
+          });
+        }).catch(() => {
+        });
+      } else {
+        util.errorMsg("请先选择数据 ！");
+      }
+    },
+    handleSelectionChange (val) { // 多选
+      this.multipleSelection = val;
+    },
+    handleCurrentChange (val) { // 切换分页
+      this.page = val;
+      this.getData();
+    },
+
+    handleSelectionChange1 (val) { // 多选
+      this.multipleSelection1 = val;
+    },
+    handleCurrentChange1 (val) { // 切换分页
+      this.page1 = val;
+      this.getData();
+    },
+    getChart () { // 初始化折线图
+      const data = []
+      const { statData } = this
+      for (let i = 1; i <= 10; i++) {
+        data.push(statData['num' + i])
+      }
+      let myChart = echarts.init(document.getElementById("chart"));
+      myChart.setOption({
+        title: { text: "实验分数分布图" },
+        tooltip: {},
+        xAxis: {
+          name: "分数",
+          type: "category",
+          boundaryGap: false,
+          interval: 10,
+          data: ["0-10", "11-20", "21-30", "31-40", "41-50", "51-60", "61-70", "71-80", "81-90", "91-100"]
+        },
+        yAxis: {
+          name: "人数",
+          type: "value",
+          interval: 10
+        },
+        series: [{
+          data,
+          type: "line",
+          areaStyle: {},
+          color: ["#8191fd"]
+        }]
+      });
+    },
+    // 批量导入
+    batchImport () {
+      this.importVisible = true
+      this.uploadList = []
+      this.uploadFaild = false
+    },
+    // 模板下载
+    download () {
+      location.href = this.api.gradeImport
+    },
+    // 上传文件
+    handleExceed (files, fileList) {
+      util.warningMsg(
+        `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`
+      )
+    },
+    // 下载失败文件
+    showFaild () {
+      axios.get(`${this.api.performanceExportFailure}?exportCode=${this.exportCode}`, {
+        headers: this.headers,
+        responseType: 'blob'
+      }).then((res) => {
+        util.downloadFileDirect(`批量导入成绩管理失败数据导出.xls`, new Blob([res.data]))
+      }).catch(res => { })
+    },
+    uploadSuccess (res, file, fileList) {
+      this.uploadFaild = false
+      if (res.status === 200) {
+        if (res.data.exportCode) {
+          this.exportCode = res.data.exportCode
+          this.uploadFaild = true
+          util.errorMsg(`本次上传有${res.data.failureNum}个错误信息录入`)
+        }
+      } else {
+        res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据")
+      }
+    },
+    uploadError (err, file, fileList) {
+      this.$message({
+        message: "上传出错，请重试！",
+        type: "error",
+        center: true
+      })
+    },
+    beforeRemove (file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`)
+    },
+    handleRemove (file, fileList) {
+      this.uploadList = fileList
+      this.uploadFaild = false
+    },
+    uploadSure () {
+      this.importVisible = false
+      this.getData()
+    },
+
+    // tab回调
+    tabChange (i) {
+      this.active = i
+      this.getData()
+    },
+    // 预览附件
+    preview (item) {
+      window.open((util.isDoc(item.fileFormat) ? 'https://view.officeapps.live.com/op/view.aspx?src=' : '') + item.filePath)
+    },
+    // 导出文件
+    exportFile (item) {
+      item.loading = true
+      const url = item.filePath
+      var x = new XMLHttpRequest()
+      x.open("GET", url, true)
+      x.responseType = "blob"
+      x.onload = function (e) {
+        var url = window.URL.createObjectURL(x.response)
+        var a = document.createElement("a")
+        a.href = url
+        a.download = item.userName + '-' + item.fileName
+        a.click()
+        item.loading = false
+      }
+      x.send()
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+/deep/ .head-card {
+    .el-card__body {
+        padding-bottom: 0px;
+
+        .el-tabs__header {
+            margin-bottom: 1px;
+
+            .el-tabs__nav-wrap::after {
+                display: none;
+            }
+
+            .el-tabs__item {
+                font-size: 18px;
+            }
+        }
+    }
+}
+
+.stat {
+    display: flex;
+
+    .nums {
+        display: flex;
+        align-items: center;
+        margin-right: 20px;
+
+        .item:nth-child(1) {
+            background-image: url('../../../assets/img/total.png');
+        }
+
+        .item:nth-child(2) {
+            background-image: url('../../../assets/img/avg.png');
+        }
+
+        .item {
+            width: 300px;
+            min-height: 145px;
+            padding: 30px 30px;
+            margin: 0 10px;
+            box-sizing: border-box;
+            border-radius: 8px;
+            background-size: 100% 100%;
+            background-repeat: no-repeat;
+
+            p {
+                font-size: 18px;
+                color: #ffffff;
+            }
+
+            .val {
+                margin-top: 10px;
+                color: #ffffff;
+                font-size: 36px;
+            }
+        }
+    }
+
+    .chart {
+        flex: 1;
+        height: 300px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/match/manage/matchRank.vue b/src/pages/match/manage/matchRank.vue
index a23658c..e8a0f96 100644
--- a/src/pages/match/manage/matchRank.vue
+++ b/src/pages/match/manage/matchRank.vue
@@ -35,7 +35,12 @@
                      class="ml20"
                      @click="batchImport">上传文件</el-button>
         </div>
-        <div>
+        <div style="display: inline-flex;align-items: center">
+          <el-input style="width: 220px;margin-right: 15px"
+                    placeholder="请输入团队名称/队长/学校"
+                    prefix-icon="el-icon-search"
+                    v-model="keyword"
+                    clearable></el-input>
           <el-button v-if="!published"
                      type="primary"
                      @click="cancelPublish(1)">发布排名</el-button>
@@ -269,6 +274,8 @@ export default {
       method: this.$route.query.method,
       competitionType: +this.$route.query.competitionType,
       rule: +this.$route.query.rule,
+      searchTimer: null,
+      keyword: '',
       teamCalculationMethods: [
         {
           id: 0,
@@ -330,6 +337,14 @@ export default {
       isPointWeight: false
     };
   },
+  watch: {
+    keyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.getRank();
+      }, 500);
+    }
+  },
   mounted () {
     this.getStage()
   },
@@ -351,7 +366,8 @@ export default {
           pageSize: this.pageSize,
           competitionId: this.id,
           isOverallRanking: this.active ? 0 : 1,
-          stageId: this.active || this.stageId
+          stageId: this.active || this.stageId,
+          keyword: this.keyword
         }).then(({ message, publishStatus }) => {
           // isRelease 0未发布，1已发布
           this.published = publishStatus
@@ -370,7 +386,8 @@ export default {
             competitionId: this.id,
             publicationType: this.type,
             locationStageId: this.stageId,
-            stageIds: ids.splice(0, ids.length - 1)
+            stageIds: ids.splice(0, ids.length - 1),
+            keyword: this.keyword
           }).then(({ page, publishStatus, total }) => {
             this.published = publishStatus
             this.list = page
@@ -378,7 +395,7 @@ export default {
             this.getPublishTime()
           }).catch(res => { })
         } else { // 阶段排名
-          this.$post(`${this.api.stageRaceRanking}?competitionId=${this.id}&stageId=${this.active}&pageNum=${this.page}&pageSize=${this.pageSize}&publicationType=${this.type}`).then(({ page, total, publishStatus }) => {
+          this.$post(`${this.api.stageRaceRanking}?competitionId=${this.id}&stageId=${this.active}&pageNum=${this.page}&pageSize=${this.pageSize}&publicationType=${this.type}&keyword=${this.keyword}`).then(({ page, total, publishStatus }) => {
             this.published = publishStatus
             this.list = page
             this.total = total
@@ -605,7 +622,7 @@ export default {
         whetherToPublish ?
           this.$confirm('排名已经发布，是否直接覆盖？', '提示', {
             type: 'success',
-          closeOnClickModal: false
+            closeOnClickModal: false
           }).then(() => {
             this.publishSubmit()
           }).catch(() => { }) :
diff --git a/src/pages/match/manage/matchReport.vue b/src/pages/match/manage/matchReport.vue
index 5c09899..3bafd97 100644
--- a/src/pages/match/manage/matchReport.vue
+++ b/src/pages/match/manage/matchReport.vue
@@ -173,6 +173,11 @@
                 </template>
               </template>
             </el-table-column>
+            <el-table-column prop="quesScore"
+                             label="分值"
+                             :key="6"
+                             width="80"
+                             align="center"></el-table-column>
             <el-table-column prop="score"
                              label="得分"
                              width="80"
diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue
index ab012a1..346a134 100644
--- a/src/pages/project/add/index.vue
+++ b/src/pages/project/add/index.vue
@@ -9,8 +9,10 @@
                           content="项目配置"></el-page-header>
           <div v-if="!isDetail">
             <el-button type="success"
+                       :loading="submiting === 0"
                        @click="save(0)">保存为草稿</el-button>
             <el-button type="primary"
+                       :loading="submiting === 1"
                        @click="save(1)">确定并发布</el-button>
           </div>
         </div>
@@ -137,34 +139,38 @@
                    @click="batchDeleteProjectJudgment"
                    style="margin-bottom: 10px">批量删除</el-button>
         <div class="draggable">
-          <el-table ref="projectJudgementTable"
-                    :data="projectJudgmentData"
-                    class="table"
-                    stripe
-                    header-align="center"
-                    @selection-change="handleSelectionProjectJudgment"
-                    row-key="judgmentId"
-                    v-loading="listLoading">
-            <el-table-column type="selection"
-                             width="55"
-                             align="center"></el-table-column>
-            <el-table-column prop="sort"
-                             label="序号"
-                             width="80"
-                             align="center">
+          <u-table ref="projectJudgementTable"
+                   :data="projectJudgmentData"
+                   class="table"
+                   stripe
+                   header-align="center"
+                   use-virtual
+                   :max-height="400"
+                   :row-height="168"
+                   :border="false"
+                   @selection-change="handleSelectionProjectJudgment"
+                   row-key="judgmentId"
+                   v-loading="listLoading">
+            <u-table-column type="selection"
+                            width="55"
+                            align="center"></u-table-column>
+            <u-table-column prop="sort"
+                            label="序号"
+                            width="80"
+                            align="center">
               <template slot-scope="scope">
                 {{ scope.row.sort }}
               </template>
-            </el-table-column>
-            <el-table-column prop="name"
-                             label="判分指标"
-                             align="center"></el-table-column>
-            <el-table-column prop="name"
-                             label="判分点名称"
-                             align="center"></el-table-column>
-            <el-table-column label="实验要求"
-                             align="center"
-                             width="600">
+            </u-table-column>
+            <u-table-column prop="name"
+                            label="判分指标"
+                            align="center"></u-table-column>
+            <u-table-column prop="name"
+                            label="判分点名称"
+                            align="center"></u-table-column>
+            <u-table-column label="实验要求"
+                            align="center"
+                            width="600">
               <template slot-scope="scope">
                 <quill :border="true"
                        :readonly="true"
@@ -174,27 +180,27 @@
                        :height="150"
                        :index="2" />
               </template>
-            </el-table-column>
-            <el-table-column prop="score"
-                             label="分数"
-                             align="center"
-                             width="120">
+            </u-table-column>
+            <u-table-column prop="score"
+                            label="分数"
+                            align="center"
+                            width="120">
               <template slot-scope="scope">
                 <!--type="number" @blur="updateProjectJudgment"-->
                 <el-input v-model.trim="scope.row.score"
                           @input="scoreChange(scope.row, scope.$index,$event)"></el-input>
               </template>
-            </el-table-column>
-            <el-table-column label="操作"
-                             width="100"
-                             align="center">
+            </u-table-column>
+            <u-table-column label="操作"
+                            width="100"
+                            align="center">
               <template slot-scope="scope">
                 <!--<el-button :disabled="isDetail" type="text" style="margin-right: 10px" @click="toJudgePoint('edit', scope.row)">自定义</el-button>-->
                 <el-button type="text"
                            @click="delJudgePoint(scope.$index)">删除</el-button>
               </template>
-            </el-table-column>
-          </el-table>
+            </u-table-column>
+          </u-table>
         </div>
       </el-card>
 
@@ -241,39 +247,42 @@
                     clearable></el-input>
         </div>
       </div>
-      <el-table v-loading="visibleLoading"
-                :data="judgementData"
-                ref="judgementTable"
-                class="table"
-                stripe
-                header-align="center"
-                max-height="400"
-                @selection-change="handleSelectionJudgment"
-                :row-key="rowKey">
-        <el-table-column type="selection"
-                         width="55"
-                         align="center"
-                         :reserve-selection="true"></el-table-column>
-        <el-table-column prop="id"
-                         label="序号"
-                         align="center"
-                         width="100">
+      <u-table v-loading="visibleLoading"
+               :data="judgementData"
+               ref="judgementTable"
+               class="table"
+               stripe
+               header-align="center"
+               use-virtual
+               :row-height="45"
+               :max-height="400"
+               :border="false"
+               @selection-change="handleSelectionJudgment"
+               :row-key="rowKey">
+        <u-table-column type="selection"
+                        width="55"
+                        align="center"
+                        :reserve-selection="true"></u-table-column>
+        <u-table-column prop="id"
+                        label="序号"
+                        align="center"
+                        width="100">
           <template slot-scope="scope">
             {{ scope.$index + 1 }}
           </template>
-        </el-table-column>
-        <el-table-column prop="name"
-                         label="判分点名称"
-                         align="center"></el-table-column>
-        <el-table-column label="操作"
-                         align="center"
-                         width="100">
+        </u-table-column>
+        <u-table-column prop="name"
+                        label="判分点名称"
+                        align="center"></u-table-column>
+        <u-table-column label="操作"
+                        align="center"
+                        width="100">
           <template slot-scope="scope">
             <el-button size="mini"
                        @click="toJudgePoint('view', scope.row)">查看</el-button>
           </template>
-        </el-table-column>
-      </el-table>
+        </u-table-column>
+      </u-table>
       <div slot="footer"
            class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
@@ -290,10 +299,13 @@ import util from "@/libs/util";
 import { mapState, mapActions } from "vuex";
 import quill from "@/components/quill";
 import Sortable from "sortablejs";
-
+import { UTable, UTableColumn } from 'umy-ui'
+import Decimal from 'decimal.js'
 export default {
   components: {
-    quill
+    quill,
+    UTable,
+    UTableColumn
   },
   data () {
     return {
@@ -350,21 +362,22 @@ export default {
     ...mapState("project", [
       "projectFields", "lastSystemId"
     ]),
-    handDistributionScore: function () {
-      //计算判分点分值，超出100提示，
-      let score = 0;
-      this.projectJudgmentData.forEach(e => {
-        score += parseInt(e.score);
-      });
-      if (isNaN(score)) {
-        return 0;
-      }
-      if (score > 100) {
-        // util.errorMsg(res.message);
-        util.errorMsg("分配的数值已超过100");
-      }
-      console.log("chuli");
-      return score;
+    handDistributionScore: {
+      get () {
+        //计算判分点分值，超出100提示，
+        let score = 0;
+        this.projectJudgmentData.forEach(e => {
+          score = Decimal(e.score).add(Decimal(score))
+        });
+        if (isNaN(score)) {
+          return 0;
+        }
+        if (score > 100) {
+          this.$message.error("分配的数值已超过100");
+        }
+        return score;
+      },
+      set (val) { }
     }
   },
   watch: {
@@ -555,11 +568,11 @@ export default {
       return true;
     },
     save (state) { //处理提交
-      if (this.submiting) return false
+      if (this.submiting === 0 || this.submiting === 1) return false
       if (!this.judgmentRelease(state)) { //判断页面是否有没有输入的内容
         return;
       }
-      this.submiting = true
+      this.submiting = state
       this.setSystemId(this.projectManage.systemId);
       this.projectManage.state = state;
       let { systemId } = this.projectManage;
@@ -628,11 +641,12 @@ export default {
             });
             // this.updateProjectJudgment();
           }
+          this.handDistributionScore = res.sum || 0
         });
       }
     },
     scoreChange (row, i) {
-      row.score = row.score.replace(/[^\d]/g, '')
+      row.score = row.score.replace(/[^\d\.]/g, '')
       this.projectJudgmentData.splice(i, 1, row);
     },
     delJudgePoint (index) { // 删除判分点
diff --git a/src/setting.js b/src/setting.js
index 2543736..44e6744 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -22,7 +22,6 @@ let uploadURL = `https://izhixinyun.com/`
 let title = '教师管理端'
 
 if (isPro) {
-    bankPath = `https://www.huorantech.cn/banksystem`
     // 职站生产
     uploadURL = `https://www.huorantech.cn/`
     jumpPath = `https://www.huorantech.cn/judgmentPoint/`