diff --git a/package-lock.json b/package-lock.json
index 9520ae4..42b9605 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2793,6 +2793,11 @@
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
+    "codemirror": {
+      "version": "5.65.13",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.13.tgz",
+      "integrity": "sha512-SVWEzKXmbHmTQQWaz03Shrh4nybG0wXx2MEu3FO4ezbPW8IbnZEd5iGHGEffSUaitKYa3i+pHpBsSvw8sPHtzg=="
+    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -3852,6 +3857,11 @@
       "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
       "dev": true
     },
+    "diff-match-patch": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
+      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
+    },
     "diffie-hellman": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
@@ -12618,6 +12628,15 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz",
       "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
     },
+    "vue-codemirror": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/vue-codemirror/-/vue-codemirror-4.0.6.tgz",
+      "integrity": "sha512-ilU7Uf0mqBNSSV3KT7FNEeRIxH4s1fmpG4TfHlzvXn0QiQAbkXS9lLfwuZpaBVEnpP5CSE62iGJjoliTuA8poQ==",
+      "requires": {
+        "codemirror": "^5.41.0",
+        "diff-match-patch": "^1.0.0"
+      }
+    },
     "vue-cropperjs": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/vue-cropperjs/-/vue-cropperjs-3.0.0.tgz",
diff --git a/package.json b/package.json
index f5bc309..8606595 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "px2rem-loader": "^0.1.9",
     "sortablejs": "^1.14.0",
     "vue": "^2.6.10",
+    "vue-codemirror": "^4.0.6",
     "vue-cropperjs": "^3.0.0",
     "vue-i18n": "^8.10.0",
     "vue-pdf": "^4.2.0",
diff --git a/src/api/index.js b/src/api/index.js
index 180ccf1..7179a55 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -388,6 +388,17 @@ export default {
     // 营销推广
     listMarketing: `nakadai/nakadai/mall/marketing/promotion/pagingQueryList`,
 
+		// 实验系统管理
+    getAllService: `nakadai/nakadai/serviceConfiguration/getAllService`,
+    schoolModelClassification: `nakadai/nakadai/model/reference/schoolModelClassification`,
+    saveAcademyModelDemo: `nakadai/nakadai/model/reference/demo/saveAcademyModelDemo`,
+    referenceFindById: `nakadai/nakadai/model/reference/demo/findById`,
+    modelFindById: `nakadai/nakadai/model/demo/findById`,
+    queryTheModelOfOurSchool: `nakadai/nakadai/model/reference/demo/queryTheModelOfOurSchool`,
+    sourceModelClassification: `nakadai/nakadai/model/category/sourceModelClassification`,
+    getAllModelListBySys: `nakadai/nakadai/model/demo/getAllModelListBySys`,
+    runPythonCode: `nakadai/nakadai/model/demo/runPythonCode`,
+
     // 教师评语
     addComment: `evaluation/cevaluation/comment/addComment`,
     queryComment: `evaluation/evaluation/ccomment/queryComment`,
diff --git a/src/assets/img/error.png b/src/assets/img/error.png
new file mode 100644
index 0000000..0be3829
Binary files /dev/null and b/src/assets/img/error.png differ
diff --git a/src/assets/img/yes.png b/src/assets/img/yes.png
new file mode 100644
index 0000000..6b9df11
Binary files /dev/null and b/src/assets/img/yes.png differ
diff --git a/src/components/codemirror/index.vue b/src/components/codemirror/index.vue
new file mode 100644
index 0000000..3ad9798
--- /dev/null
+++ b/src/components/codemirror/index.vue
@@ -0,0 +1,386 @@
+<template>
+  <div class="wrap">
+    <div class="left">
+      <codemirror
+        v-model="codeVal"
+        :options="cmOption"
+        class="code-mirror"
+        @ready="ready"
+        ref="codemirror"
+      ></codemirror>
+      <el-button
+        class="run btn"
+        type="primary"
+        @click="runCode"
+      >运行</el-button>
+    </div>
+    <div class="code-right answer">
+      <p class="text-wrapper">{{ runResult }}</p>
+      <div class="pic-wrap" v-if="picSrcList.length">
+        <div class="pic-item" v-for="(img, i) in picSrcList" :key="i">
+          <el-image 
+            class="pic"
+            :src="img" 
+            :preview-src-list="picSrcList">
+          </el-image>
+          <el-button class="download-btn btn" type="primary" size="mini" @click="downloadPic(i)">下载图片</el-button>
+          <a :ref="'picLink' + i" style="display: none;" download="运行结果.png" :href="img">下载图片</a>
+        </div>
+      </div>
+      <div class="result-right t-color" v-show="isError">
+        <img src="@/assets/img/yes.png" alt />运行成功
+      </div>
+      <div class="result-wrong" v-show="isError === 0">
+        <img src="@/assets/img/error.png" alt />
+        第{{errLine}}行出现错误
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { codemirror } from "vue-codemirror";
+import "codemirror/theme/ambiance.css"; // 这里引入的是主题样式
+import "codemirror/mode/javascript/javascript.js";
+import "codemirror/mode/python/python.js";
+import "codemirror/lib/codemirror.css";
+// require active-line.js
+import "codemirror/addon/selection/active-line.js";
+// styleSelectedText
+import "codemirror/addon/selection/mark-selection.js";
+// hint
+import "codemirror/addon/hint/show-hint.js";
+import "codemirror/addon/hint/sql-hint.js";
+import "codemirror/addon/hint/show-hint.css";
+import "codemirror/addon/hint/javascript-hint.js";
+// highlightSelectionMatches
+import "codemirror/addon/scroll/annotatescrollbar.js";
+import "codemirror/addon/search/matchesonscrollbar.js";
+import "codemirror/addon/search/match-highlighter.js";
+// keyMap
+import "codemirror/mode/clike/clike.js";
+import "codemirror/mode/sql/sql.js";
+import "codemirror/addon/edit/matchbrackets.js";
+import "codemirror/addon/comment/comment.js";
+import "codemirror/addon/dialog/dialog.js";
+import "codemirror/addon/dialog/dialog.css";
+import "codemirror/addon/search/searchcursor.js";
+import "codemirror/addon/search/search.js";
+import "codemirror/keymap/sublime.js";
+// foldGutter
+import "codemirror/addon/fold/foldgutter.css";
+import "codemirror/addon/fold/brace-fold.js";
+import "codemirror/addon/fold/comment-fold.js";
+import "codemirror/addon/fold/foldcode.js";
+import "codemirror/addon/fold/foldgutter.js";
+import "codemirror/addon/fold/indent-fold.js";
+import "codemirror/addon/fold/markdown-fold.js";
+import "codemirror/addon/fold/xml-fold.js";
+// 编辑的主题文件
+import "codemirror/theme/monokai.css";
+import "codemirror/theme/base16-light.css";
+import { Loading } from 'element-ui';
+export default {
+  props: ['code', 'codeId', 'projectId', 'retResult', 'readOnly'],
+  data() {
+    return {
+      codeVal: this.code,
+      runResult: '', // 运行结果
+      isError: false, // 运行正确与否
+      errLine: '', // 错误代码的位置
+      picSrcList: [],
+      loadIns: null, // loading实例
+      cmOption: {
+        readOnly: this.readOnly,
+        scrollbarStyle: "native",
+        tabSize: 2, // tab
+        styleActiveLine: true, // 高亮选中行
+        lineNumbers: true, // 显示行号
+        styleSelectedText: true,
+        line: true,
+        foldGutter: true, // 块槽
+        gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
+        highlightSelectionMatches: { showToken: /\w/, annotateScrollbar: true }, // 可以启用该选项来突出显示当前选中的内容的所有实例
+        mode: 'python',
+        lineWrapping: true, //代码折叠
+        autoCloseTags: true,// 自动闭合标签
+        autoCloseBrackets: true,// 自动闭合括号
+        // hint.js options
+        hintOptions: {
+          // 当匹配只有一项的时候是否自动补全
+          completeSingle: false
+        },
+        // 快捷键 可提供三种模式 sublime、emacs、vim
+        keyMap: "sublime",
+        matchBrackets: true,
+        showCursorWhenSelecting: true,
+        theme: "monokai" // 主题
+      }
+    };
+  },
+  components: {
+    codemirror
+  },
+  watch: {
+    codeVal(val) {
+      this.$emit("update:code", val)
+    }
+  },
+  mounted() {
+    
+  },
+  methods: {
+    // 页面加载完后重置编辑框大小
+    ready() {
+      const code = this.$refs.codemirror.codemirror
+      code.setSize("auto", "calc(100vh - 370px)");
+      code.on('keypress', function() {
+        // 显示智能提示
+        code.showHint()
+      });
+    },
+    // 运行代码
+    runCode() {
+      let code = this.codeVal
+      if (!code) {
+        this.$message({
+          message: "警告哦，内容为空不可运行",
+          type: "warning"
+        })
+      } else {
+        this.loadIns = Loading.service({
+          background: 'transparent'
+        })
+        code = code.replace(/\.savefig\(([\u4e00-\u9fa5\w]*?['"])/mg, str => {
+          return str + Date.now()
+        })
+        // 把代码传给后端，在后端运行Python代码
+        this.$post(this.api.runPythonCode, {
+          code
+        }).then(res => {
+          const data = res.code
+          const photo = data.photoUrl
+          const result = data.runResult
+          this.$emit('cache') // 每次运行代码都要把代码传给后端做缓存
+          this.loadIns.close()
+          this.picSrcList = []
+          if (photo) this.picSrcList = photo.split(',')
+          let imgList = ''
+          let firtImg = ''
+          try {
+            imgList = eval(result)
+          } catch (error) {}
+          if (imgList && imgList.length) firtImg = imgList[0]
+          // 如果是下载图片的代码，则要显示图片和运行结果，不用显示对错，换成显示下载图片
+          if (photo) {
+            this.isError = '' // 对错隐藏
+            const text = result.replace(photo, '') // 结果里包含了图片路径，所以要把图片路径给去掉
+            this.runResult = text
+            this.picSrcList = photo.split(',')
+          } else if (imgList instanceof Array && imgList.length && typeof firtImg === 'string' && (firtImg.includes('.jpg') || firtImg.includes('.png') || firtImg.includes('img'))) {
+            /**
+             * 这段是为要下载图片的项目案例写的，后端会返回图片名称的数组，前端负责循环这个数组，然后下载下来
+             * 只有该系统有这段代码，因为其他7个系统没有下载图片的项目，后续如果加了，直接把这段代码复制过去即可
+             */
+            imgList.map((n,i) => {
+              // util.downloadFile(`${i+1}.jpg`,n)
+            })
+            this.isError = 0
+            this.runResult = '下载完成'
+          } else {
+            this.isError = data.retResult
+            this.runResult = result
+            this.errLine = parseInt(result.substring(result.indexOf("line") + 4, result.length))
+          }
+        }).catch(res => {
+          this.isError = false
+          this.runResult = ''
+          this.picSrcList = []
+          this.loadIns.close()
+          res.status == 500 && this.$message.error('检测到代码里有非法代码，请检查是否有调用系统命令。')
+        })
+      }
+    },
+    // 下载图片
+    downloadPic(i) {
+      this.$refs['picLink' + i][0].click()
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+::-webkit-scrollbar-thumb {
+  width: 5px;
+  border-radius: 6px;
+  background: rgba(173,173,173,.7);
+}
+.wrap {
+  display: flex;
+}
+.left{
+  position: relative;
+  width: calc(100% - 400px);
+}
+.text-wrapper {
+  white-space: pre-wrap;
+}
+/deep/.answer {
+  .el-tab-pane {
+    padding: 0 10px;
+    height: 340px;
+    overflow: hidden;
+    overflow-y: auto;
+    white-space: pre-wrap;
+  }
+  .el-dialog--center {
+    width: 500px;
+    height: 500px;
+  }
+  .el-dialog__title {
+    font-size: 22px;
+    font-weight: 500;
+  }
+  .el-tabs__nav-wrap::after {
+    background-color: #333;
+  }
+  .el-tabs__active-bar {
+    height: 0;
+    background-color: #fff;
+  }
+  .el-tabs__header {
+    background-color: #333;
+  }
+  .el-dialog--center .el-dialog__body {
+    padding: 0;
+  }
+  .el-tabs__item {
+    width: 80px;
+    color: #fff;
+  }
+  .el-tabs--top .el-tabs__item.is-top:nth-child(2) {
+    padding-left: 20px;
+  }
+  .el-tabs__item.is-active {
+    color: #fff !important;
+    background-color: #333 !important;
+  }
+  .tips-btn {
+    margin-top: 10px;
+    height: 40px;
+    width: 90px;
+    border: none;
+    position: absolute;
+    right: 0;
+    background: rgba(255, 49, 49, 1);
+    color: rgba(255, 255, 255, 1);
+    &:hover,
+    &:focus,
+    &:active {
+      background: rgba(255, 49, 49, 1);
+      color: rgba(255, 255, 255, 1);
+    }
+  }
+}
+/deep/.CodeMirror-wrap pre.CodeMirror-line,
+.CodeMirror-wrap pre.CodeMirror-line-like {
+  height: 30px;
+  line-height: 30px;
+}
+.result-right {
+  background-color: rgba(43, 40, 22, 1);
+}
+.result-wrong {
+  background-color: rgba(43, 22, 22, 1);
+  color: #f00;
+}
+.result-wrong,
+.result-right {
+  position: absolute;
+  left: 20px;
+  right: 20px;
+  display: flex;
+  align-items: center;
+  bottom: 10px;
+  padding: 5px 10px;
+  img {
+    width: 40px;
+    height: 40px;
+    margin-top: 5px;
+    margin-right: 10px;
+  }
+}
+.code-right {
+  width: 500px;
+  color: #fff;
+  background: #1b1b1b;
+  display: inline-block;
+  position: relative;
+  overflow-x: auto;
+  p {
+    font-size: 18px;
+    margin: 10px;
+    position: absolute;
+    width: calc(100% - 14px);
+    top: 0;
+    bottom: -8px;
+    overflow: auto;
+  }
+}
+.pic-wrap {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 5px;
+  display: flex;
+  max-width: calc(100% - 50px);
+  margin: 0 auto;
+  text-align: center;
+  overflow: auto;
+  .pic-item {
+    margin: 0 5px 5px;
+    &:only-child {
+      .pic {
+        width: 80%;
+      }
+    }
+  }
+  .pic {
+    display: block;
+    width: 100px;
+    margin: 0 auto 10px;
+  }
+}
+.code-mask{
+  z-index: 2;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+}
+.run{
+  z-index:99;
+  position:absolute;
+  right: 50px; 
+  bottom:15px;
+  width:100px;
+  color:#fff;
+}
+.download-btn{
+  color:#fff;
+}
+/deep/.answer-wrap{
+  pre{
+    width: 100%;
+    white-space: pre-wrap;
+  }
+  img{
+    max-width: 100%;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 14857c6..1958e3d 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -1,31 +1,47 @@
 <template>
-    <div>
-        <el-menu v-if="menuRefresh" class="sidebar-el-menu" :default-active="active" background-color="#324157" text-color="#bfcbd9" active-text-color="#9278FF" unique-opened mode="horizontal" @select="menuSelect">
-            <template v-for="item in menus">
-                <template v-if="item.subs">
-                    <el-submenu :index="item.index" :key="item.index">
-                        <template slot="title">
-                            <i :class="item.icon"></i>
-                            <span slot="title">{{ item.title }}</span>
-                        </template>
-                        <template v-for="subItem in item.subs">
-                            <el-submenu v-if="subItem.subs" :index="subItem.index" :key="subItem.index">
-                                <template slot="title">{{ subItem.title }}</template>
-                                <el-menu-item v-for="(threeItem,i) in subItem.subs" :key="i" :index="threeItem.index">{{ threeItem.title }}</el-menu-item>
-                            </el-submenu>
-                            <el-menu-item v-else :index="subItem.index" :key="subItem.index">{{ subItem.title }}</el-menu-item>
-                        </template>
-                    </el-submenu>
-                </template>
-                <template v-else>
-                    <el-menu-item :index="item.index" :key="item.index">
-                        <i :class="item.icon"></i>
-                        <span slot="title">{{ item.title }}</span>
-                    </el-menu-item>
-                </template>
+  <div>
+    <el-menu v-if="menuRefresh"
+             class="sidebar-el-menu"
+             :default-active="active"
+             background-color="#324157"
+             text-color="#bfcbd9"
+             active-text-color="#9278FF"
+             unique-opened
+             mode="horizontal"
+             @select="menuSelect">
+      <template v-for="item in menus">
+        <template v-if="item.subs">
+          <el-submenu :index="item.index"
+                      :key="item.index">
+            <template slot="title">
+              <i :class="item.icon"></i>
+              <span slot="title">{{ item.title }}</span>
             </template>
-        </el-menu>
-    </div>
+            <template v-for="subItem in item.subs">
+              <el-submenu v-if="subItem.subs"
+                          :index="subItem.index"
+                          :key="subItem.index">
+                <template slot="title">{{ subItem.title }}</template>
+                <el-menu-item v-for="(threeItem,i) in subItem.subs"
+                              :key="i"
+                              :index="threeItem.index">{{ threeItem.title }}</el-menu-item>
+              </el-submenu>
+              <el-menu-item v-else
+                            :index="subItem.index"
+                            :key="subItem.index">{{ subItem.title }}</el-menu-item>
+            </template>
+          </el-submenu>
+        </template>
+        <template v-else>
+          <el-menu-item :index="item.index"
+                        :key="item.index">
+            <i :class="item.icon"></i>
+            <span slot="title">{{ item.title }}</span>
+          </el-menu-item>
+        </template>
+      </template>
+    </el-menu>
+  </div>
 </template>
 
 <script>
@@ -33,151 +49,156 @@ import { mapState, mapActions } from "vuex";
 import Setting from '@/setting'
 import addRoutes from '@/libs/route/addRoutes'
 export default {
-    data() {
-        return {
-            active: this.$route.path,
-            defaultMenus: [
-                {
-                    icon: "el-icon-s-platform",
-                    index: "/product/list",
-                    title: "产品中心"
-                },
-                {
-                    icon: "el-icon-s-platform",
-                    index: "/station/list",
-                    title: "实验台"
-                },
-                {
-                    icon: "el-icon-user",
-                    index: "/student/list",
-                    title: "学生管理"
-                },
-                {
-                    icon: "el-icon-receiving",
-                    index: "/evaluation/list",
-                    title: "测评管理"
-                },
-                {
-                    icon: "el-icon-takeaway-box",
-                    index: "/assessment/list",
-                    title: "考核管理"
-                },
-                {
-                    icon: "el-icon-collection",
-                    index: "/achievement/list",
-                    title: "成绩管理",
-                },
-                {
-                    icon: "el-icon-news",
-                    index: "/course/list",
-                    title: "理论课程管理"
-                },
-                {
-                    icon: "el-icon-document",
-                    index: "/information/list",
-                    title: "资讯管理"
-                },
-                {
-                    icon: "el-icon-school",
-                    index: "/match/list",
-                    title: "赛事管理"
-                },
-                {
-                    icon: "el-icon-school",
-                    index: "/activity/list",
-                    title: "创业活动"
-                },
-                {
-                    icon: "el-icon-postcard",
-                    index: "/project/list",
-                    title: "实验项目管理"
-                },
-                {
-                    icon: "el-icon-setting",
-                    index: "/system/list",
-                    title: "系统设置"
-                },
-                {
-                    icon: "el-icon-pie-chart",
-                    index: "/screen",
-                    title: "数据看板"
-                }
-            ],
-            menus: [],
-            actives: {
-                dashboard: ["add"],
-                achievement: ["experiment", "experimentVir", "experimentTeach", "addexperiment", "addexperimentoptions", "showExperiment", "showExperimentoption", "showExperimentoptions"],
-                project: ["addproject", "program", "programOption", "programOptions"],
-                backstage: ["report"]
-            },
-            menuRefresh: 1
-        };
-    },
-    computed: {
-      ...mapState('auth', [
-        'routes'
-      ])
-    },
-    watch: {
-        "$route"(to, from) {
-            let actives = this.actives;
-            for (let i in this.actives) {
-                if (actives[i].includes(this.$route.name)) this.active = `/${i}/list`;
-            }
-            let arr=this.$route.path.split("/");
-            let name =  `/${arr[1]}/list`
-            this.active = name;
-        }
-    },
-    created() {
-      this.getPer()
-    },
-    methods: {
-        ...mapActions('user', [
-          'logout'
-        ]),
-        ...mapActions("info", [
-            "setTabsName", "setColumnId"
-        ]),
-        // 获取权限列表
-        getPer() {
-          this.$get(`${this.api.getUserRolesPermissionMenu}?platformId=${Setting.platformId}`).then(res => {
-            const routes = res.permissionMenu[0].children
-            addRoutes(routes)
-            this.initMenu()
-          }).catch(({ status }) => {
-            status === 500 && this.logout()
-          })
+  data () {
+    return {
+      active: this.$route.path,
+      defaultMenus: [
+        {
+          icon: "el-icon-s-platform",
+          index: "/product/list",
+          title: "产品中心"
+        },
+        {
+          icon: "el-icon-s-platform",
+          index: "/station/list",
+          title: "实验台"
+        },
+        {
+          icon: "el-icon-user",
+          index: "/student/list",
+          title: "学生管理"
+        },
+        {
+          icon: "el-icon-receiving",
+          index: "/evaluation/list",
+          title: "测评管理"
+        },
+        {
+          icon: "el-icon-takeaway-box",
+          index: "/assessment/list",
+          title: "考核管理"
         },
-        initMenu() {
-          // 如果开启了动态路由，则取store里的路由匹配
-          if (Setting.dynamicRoute) {
-            const { routes } = this
-            const menus = []
-            this.defaultMenus.map(e => {
-              routes.find(n => n.path === e.index) && menus.push(e)
-            });
-            this.menus = menus
-          } else {
-            this.menus = this.defaultMenus
-          }
+        {
+          icon: "el-icon-collection",
+          index: "/achievement/list",
+          title: "成绩管理",
         },
-        // 菜单点击回调
-        menuSelect(path) {
-          this.setTabsName('1')
-          this.setColumnId('')
-          this.$store.commit('match/setCache', null)
-          if (path === '/screen') {
-            let arr=this.$route.path.split("/");
-            let name =  `/${arr[1]}/list`
-            this.active = name;
-            window.open(this.$router.resolve(path).href)
-            location.reload()
-          } else {
-            this.$router.push(path)
-          }
+        {
+          icon: "el-icon-news",
+          index: "/course/list",
+          title: "理论课程管理"
+        },
+        {
+          icon: "el-icon-document",
+          index: "/information/list",
+          title: "资讯管理"
+        },
+        {
+          icon: "el-icon-school",
+          index: "/match/list",
+          title: "赛事管理"
+        },
+        {
+          icon: "el-icon-school",
+          index: "/activity/list",
+          title: "创业活动"
+        },
+        {
+          icon: "el-icon-c-scale-to-original",
+          index: "/expSystem/list",
+          title: "实验系统管理"
+        },
+        {
+          icon: "el-icon-postcard",
+          index: "/project/list",
+          title: "实验项目管理"
+        },
+        {
+          icon: "el-icon-setting",
+          index: "/system/list",
+          title: "系统设置"
+        },
+        {
+          icon: "el-icon-pie-chart",
+          index: "/screen",
+          title: "数据看板"
         }
+      ],
+      menus: [],
+      actives: {
+        dashboard: ["add"],
+        achievement: ["experiment", "experimentVir", "experimentTeach", "addexperiment", "addexperimentoptions", "showExperiment", "showExperimentoption", "showExperimentoptions"],
+        project: ["addproject", "program", "programOption", "programOptions"],
+        backstage: ["report"]
+      },
+      menuRefresh: 1
+    };
+  },
+  computed: {
+    ...mapState('auth', [
+      'routes'
+    ])
+  },
+  watch: {
+    "$route" (to, from) {
+      let actives = this.actives;
+      for (let i in this.actives) {
+        if (actives[i].includes(this.$route.name)) this.active = `/${i}/list`;
+      }
+      let arr = this.$route.path.split("/");
+      let name = `/${arr[1]}/list`
+      this.active = name;
+    }
+  },
+  created () {
+    this.getPer()
+  },
+  methods: {
+    ...mapActions('user', [
+      'logout'
+    ]),
+    ...mapActions("info", [
+      "setTabsName", "setColumnId"
+    ]),
+    // 获取权限列表
+    getPer () {
+      this.$get(`${this.api.getUserRolesPermissionMenu}?platformId=${Setting.platformId}`).then(res => {
+        const routes = res.permissionMenu[0].children
+        addRoutes(routes)
+        this.initMenu()
+      }).catch(({ status }) => {
+        status === 500 && this.logout()
+      })
+    },
+    initMenu () {
+      // 如果开启了动态路由，则取store里的路由匹配
+      if (Setting.dynamicRoute) {
+        const { routes } = this
+        const menus = []
+        this.defaultMenus.map(e => {
+          routes.find(n => n.path === e.index) && menus.push(e)
+        });
+        this.menus = menus
+      } else {
+        this.menus = this.defaultMenus
+      }
+    },
+    // 菜单点击回调
+    menuSelect (path) {
+      this.setTabsName('1')
+      this.setColumnId('')
+      this.$store.commit('match/setCache', null)
+      if (path === '/screen') {
+        let arr = this.$route.path.split("/");
+        let name = `/${arr[1]}/list`
+        this.active = name;
+        window.open(this.$router.resolve(path).href)
+        location.reload()
+      } else {
+        this.$router.push(path)
+      }
     }
+  }
 };
 </script>
 
diff --git a/src/pages/achievement/teach/index.vue b/src/pages/achievement/teach/index.vue
index d5280fc..bf1141b 100644
--- a/src/pages/achievement/teach/index.vue
+++ b/src/pages/achievement/teach/index.vue
@@ -1,107 +1,260 @@
 <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="experimentalName"></el-page-header>
-            </div>
+  <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="experimentalName"></el-page-header>
+      </div>
 
-        </el-card>
+    </el-card>
 
-        <el-card shadow="hover" class="m-b-20">
-            <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane v-for="(item) in classList" :label="item.className" :name="item.id" :key="item.id"></el-tab-pane>
-            </el-tabs>
-            <div class="stat">
-                <div class="nums">
-                    <div class="item">
-                        <p class="name">实验总人数</p>
-                        <p class="val">{{ peopleNum }}</p>
-                    </div>
-                    <div class="item item2">
-                        <p class="name">实验平均分</p>
-                        <p class="val">{{ avgScore }}</p>
-                    </div>
-                    <div class="item item3">
-                        <p class="name">实验最高分</p>
-                        <p class="val">{{ maxScore }}</p>
-                    </div>
-                    <div class="item item4">
-                        <p class="name">实验最低分</p>
-                        <p class="val">{{ minScore }}</p>
-                    </div>
-                </div>
-                <div class="chart" id="chart"></div>
-            </div>
-        </el-card>
-        
-        <el-card shadow="hover" class="m-b-20">
-          <h6 style="font-size: 16px">错误率分析</h6>
-          <div class="wrong">
-            <div class="line">
-              <span class="jud-name">错误率最高：{{ max.judgmentName }}</span>
-              <span>参加考试{{ max.peopleNum }}人&emsp;｜&emsp;共{{ max.errorTotal }}人做错，错误率{{ max.errorRate }}%</span>
-            </div>
-            <div class="line">
-              <span class="jud-name">错误率最低：{{ min.judgmentName }}</span>
-              <span>参加考试{{ min.peopleNum }}人&emsp;｜&emsp;共{{ min.errorTotal }}人做错，错误率{{ min.errorRate }}%</span>
-            </div>
+    <el-card shadow="hover"
+             class="m-b-20">
+      <el-tabs v-model="activeName"
+               @tab-click="handleClick">
+        <el-tab-pane v-for="(item) in classList"
+                     :label="item.className"
+                     :name="item.id"
+                     :key="item.id"></el-tab-pane>
+      </el-tabs>
+      <div class="stat">
+        <div class="nums">
+          <div class="item">
+            <p class="name">实验总人数</p>
+            <p class="val">{{ peopleNum }}</p>
           </div>
-          <div class="chart" id="chart1"></div>
-        </el-card>
+          <div class="item item2">
+            <p class="name">实验平均分</p>
+            <p class="val">{{ avgScore }}</p>
+          </div>
+          <div class="item item3">
+            <p class="name">实验最高分</p>
+            <p class="val">{{ maxScore }}</p>
+          </div>
+          <div class="item item4">
+            <p class="name">实验最低分</p>
+            <p class="val">{{ minScore }}</p>
+          </div>
+        </div>
+        <div class="chart"
+             id="chart"></div>
+      </div>
+    </el-card>
+
+    <el-card shadow="hover"
+             class="m-b-20">
+      <h6 style="font-size: 16px">错误率分析</h6>
+      <div class="wrong">
+        <div class="line">
+          <span class="jud-name">错误率最高：{{ max.judgmentName }}</span>
+          <span>参加考试{{ max.peopleNum }}人&emsp;｜&emsp;共{{ max.errorTotal }}人做错，错误率{{ max.errorRate }}%</span>
+        </div>
+        <div class="line">
+          <span class="jud-name">错误率最低：{{ min.judgmentName }}</span>
+          <span>参加考试{{ min.peopleNum }}人&emsp;｜&emsp;共{{ min.errorTotal }}人做错，错误率{{ min.errorRate }}%</span>
+        </div>
+      </div>
+      <div class="chart"
+           id="chart1"></div>
+    </el-card>
 
-        <el-card shadow="hover" class="m-b-20">
-            <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>
-                    <el-button type="primary" @click="delAllData">批量删除</el-button>
-                    <el-button type="primary" @click="exportData">导出</el-button>
-                </div>
-            </div>
-            <el-table :data="listData" 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="permissions" prop="experimentalName" label="考核名称" min-width="250" align="center">
-                    <template slot-scope="scope">
-                        {{ experimentalName }}
-                    </template>
-                </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 }}min
-                    </template>
-                </el-table-column>
-                <el-table-column prop="submitTime" label="提交时间" min-width="150" align="center">
-                </el-table-column>
-                <el-table-column label="操作" align="center" width="160">
-                    <template slot-scope="scope">
-                        <el-button type="text" @click="show(scope.row)">查看成绩报告</el-button>
-                        <el-button 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>
-        </el-card>
-    </div>
+    <el-card shadow="hover"
+             class="m-b-20">
+      <div class="flex-between m-b-20">
+        <div>
+
+          <el-tabs v-model="curTab"
+                   @tab-click="tabChange">
+            <el-tab-pane v-for="(item) in tabs"
+                         :label="item.name"
+                         :name="item.id"
+                         :key="item.id"></el-tab-pane>
+          </el-tabs>
+        </div>
+        <div v-if="curTab == 0">
+          <el-button type="primary"
+                     @click="delAllData">批量删除</el-button>
+          <el-button type="primary"
+                     @click="exportData">导出成绩列表</el-button>
+          <el-button type="primary"
+                     @click="exportReport">导出成绩报告</el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary"
+                     @click="exportDataActivation">导出</el-button>
+        </div>
+      </div>
+      <template v-if="curTab == 0">
+        <el-table :data="listData"
+                  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="permissions"
+                           prop="experimentalName"
+                           label="考核名称"
+                           min-width="250"
+                           align="center">
+            <template slot-scope="scope">
+              {{ experimentalName }}
+            </template>
+          </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 }}min
+            </template>
+          </el-table-column>
+          <el-table-column prop="submitTime"
+                           label="提交时间"
+                           min-width="150"
+                           align="center">
+          </el-table-column>
+          <el-table-column label="操作"
+                           align="center"
+                           width="160">
+            <template slot-scope="scope">
+              <el-button type="text"
+                         @click="show(scope.row)">查看成绩报告</el-button>
+              <el-button 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="activations"
+                  ref="table"
+                  stripe
+                  header-align="center"
+                  @selection-change="handleSelectionActivationChange"
+                  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 + (pageActivation - 1) * pageSizeActivation + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="schoolName"
+                           label="学校"
+                           min-width="150"
+                           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="练习次数"
+                           min-width="90"
+                           align="center"></el-table-column>
+          <el-table-column prop="score"
+                           label="实验平均分"
+                           min-width="90"
+                           align="center"></el-table-column>
+          <el-table-column prop="score"
+                           label="实验最高分"
+                           min-width="90"
+                           align="center"></el-table-column>
+          <el-table-column prop="score"
+                           label="实验最低分"
+                           min-width="90"
+                           align="center"></el-table-column>
+          <el-table-column prop="timeSum"
+                           label="耗时最多"
+                           min-width="90"
+                           align="center">
+            <template slot-scope="scope">
+              {{ scope.row.timeSum }}min
+            </template>
+          </el-table-column>
+          <el-table-column prop="timeSum"
+                           label="耗时最少"
+                           min-width="90"
+                           align="center">
+            <template slot-scope="scope">
+              {{ scope.row.timeSum }}min
+            </template>
+          </el-table-column>
+          <el-table-column prop="submitTime"
+                           label="提交时间"
+                           min-width="150"
+                           align="center">
+          </el-table-column>
+          <el-table-column label="操作"
+                           align="center"
+                           width="160">
+            <template slot-scope="scope">
+              <el-button type="text"
+                         @click="show(scope.row)">查看成绩报告</el-button>
+              <el-button 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="totalActivation"
+                         @current-change="handleCurrentActivationChange"
+                         :current-page="pageActivation">
+          </el-pagination>
+        </div>
+      </template>
+    </el-card>
+  </div>
 </template>
 
 <script>
@@ -110,308 +263,385 @@ import util from "@/libs/util";
 import echarts from "echarts";
 import axios from 'axios';
 export default {
-    data() {
-        return {
-            activeName: "", // 当前标签页
-            classId: "", // 当前班级id
-            classList: [], // 班级标签页列表
-            permissions: Number(this.$route.query.permissions),
-            experimentalName: this.$route.query.projectName,
-            id: this.$route.query.id,
-            keyword: "",
-            searchTimer: null,
-            listDataAll: [],
-            listData: [],
-            multipleSelection: [],
-            page: 1,
-            pageSize: 10,
-            total: 0,
-            peopleNum: 0, // 总人数
-            avgScore: 0, // 平均分
-            maxScore: 0,
-            minScore: 0,
-            errorAnalysis: {},
-            max: {},
-            min: {},
-            token: util.local.get(Setting.tokenKey),
-        };
+  data () {
+    return {
+      activeName: "", // 当前标签页
+      classId: "", // 当前班级id
+      classList: [], // 班级标签页列表
+      permissions: Number(this.$route.query.permissions),
+      experimentalName: this.$route.query.projectName,
+      id: this.$route.query.id,
+      keyword: "",
+      searchTimer: null,
+      listDataAll: [],
+      listData: [],
+      multipleSelection: [],
+      page: 1,
+      pageSize: 10,
+      total: 0,
+      peopleNum: 0, // 总人数
+      avgScore: 0, // 平均分
+      maxScore: 0,
+      minScore: 0,
+      errorAnalysis: {},
+      max: {},
+      min: {},
+      token: util.local.get(Setting.tokenKey),
+      curTab: '0',
+      tabs: [
+        {
+          id: '0',
+          name: '成绩报告'
+        },
+        {
+          id: '1',
+          name: '活跃度'
+        },
+      ],
+      activations: [],
+      multipleSelectionActivation: [],
+      pageActivation: 1,
+      pageSizeActivation: 10,
+      totalActivation: 0,
+    };
+  },
+  watch: {
+    keyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initData();
+      }, 500);
+    }
+  },
+  mounted () {
+    this.permissions && this.getSpliceClass() // 考核才需要查询班级列表
+    this.getData()
+  },
+  methods: {
+    handleClick (tab, event) { // 处理点击标签页
+      if (this.classId === tab.name) return;
+      this.classId = tab.name;
+      sessionStorage.setItem('activeName', tab.name)
+      this.getData();
     },
-    watch: {
-        keyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.initData();
-            }, 500);
+    // 获取拼接班级
+    getSpliceClass () {
+      this.$post(`${this.api.spliceClass}?assessmentId=${this.id}`).then(res => {
+        this.classList = res.list
+        const activeName = sessionStorage.getItem('activeName')
+        if (activeName && this.classList.some(item => item.id === activeName)) {
+          this.classId = activeName
+          this.activeName = activeName
+        } else {
+          this.classId = this.classList[0].id;
+          this.activeName = this.classList[0].id;
         }
+      }).catch(err => { })
     },
-    mounted() {
-        this.permissions && this.getSpliceClass() // 考核才需要查询班级列表
-        this.getData()
+    // tab切换
+    tabChange () {
+
     },
-    methods: {
-        handleClick(tab, event) { // 处理点击标签页
-            if (this.classId === tab.name) return;
-            this.classId = tab.name;
-            sessionStorage.setItem('activeName', tab.name)
-            this.getData();
-        },
-        // 获取拼接班级
-        getSpliceClass() {
-            this.$post(`${this.api.spliceClass}?assessmentId=${this.id}`).then(res => {
-                this.classList = res.list
-                const activeName = sessionStorage.getItem('activeName')
-                if(activeName && this.classList.some(item => item.id === activeName)) {
-                    this.classId = activeName
-                    this.activeName = activeName
-                }else {
-                    this.classId = this.classList[0].id;
-                    this.activeName = this.classList[0].id;
-                }
-            }).catch(err => {})
-        },
-        // 获取表格数据
-        async getData() {
-          // 考核和练习调不同接口
-          const res = this.permissions ?
-            await this.$post(`${this.api.getAssessmentDetail}?pageNum=${this.page}&pageSize=10000&assessmentId=${this.id}&classId=${this.classId}&keyword=${this.keyword}`) :
-            await this.$post(`${this.api.getPracticeDetail}?pageNum=${this.page}&pageSize=10000&projectId=${this.id}&keyword=${this.keyword}`)
-          this.listDataAll = res.page.records
-          this.total = res.page.total
-          this.avgScore = (+res.avgScore).toFixed(2)
-          this.peopleNum = res.peopleNum
-          this.maxScore = res.maxScore
-          this.minScore = res.minScore
-          this.errorAnalysis = res.errorAnalysis
-          this.max = res.highestErrorRate
-          this.min = res.minimumErrorRate
-          this.handlePage()
-          this.getChart()
-          this.errorChart()
+    // 获取表格数据
+    async getData () {
+      // 考核和练习调不同接口
+      const res = this.permissions ?
+        await this.$post(`${this.api.getAssessmentDetail}?pageNum=${this.page}&pageSize=10000&assessmentId=${this.id}&classId=${this.classId}&keyword=${this.keyword}`) :
+        await this.$post(`${this.api.getPracticeDetail}?pageNum=${this.page}&pageSize=10000&projectId=${this.id}&keyword=${this.keyword}`)
+      this.listDataAll = res.page.records
+      this.total = res.page.total
+      this.avgScore = (+res.avgScore).toFixed(2)
+      this.peopleNum = res.peopleNum
+      this.maxScore = res.maxScore
+      this.minScore = res.minScore
+      this.errorAnalysis = res.errorAnalysis
+      this.max = res.highestErrorRate
+      this.min = res.minimumErrorRate
+      this.handlePage()
+      this.getChart()
+      this.errorChart()
+    },
+    initData () {
+      this.$refs.table.clearSelection();
+      this.page = 1;
+      this.getData();
+    },
+    // 分页
+    handlePage () {
+      const list = this.listDataAll
+      this.listData = list.slice((this.page - 1) * this.pageSize, this.page * this.pageSize)
+    },
+    // 查看成绩报告
+    show (row) {
+      this.$router.push(`show?reportId=${row.reportId}`)
+    },
+    // 导出(有勾选：就导勾选中的；没有勾选：就导全部)
+    exportData () {
+      // 考核和练习的接口不一样
+      let url = this.permissions
+        ? `${this.api.exportAssessmentInfo}?assessmentId=${this.id}&classId=${this.classId}`
+        : `${this.api.exportPracticeInfo}?projectId=${this.id}`
+      // 有勾选，就带上勾选的id
+      if (this.multipleSelection.length) {
+        const ids = this.multipleSelection.map(e => e.reportId)
+        url += `&ids=${ids.toString()}`
+      }
+      axios.get(url, {
+        headers: {
+          token: this.token
         },
-        initData() {
+        responseType: 'blob'
+      }).then((res) => {
+        util.downloadFileDirect(`学生${this.permissions ? '考核' : '练习'}成绩.xls`, new Blob([res.data]))
+      }).catch(res => { })
+    },
+    // 导出实验报告
+    exportReport () {
+      this.listData.forEach(async e => {
+        const { report, userScores } = await this.$get(`${this.api.reportDetail}?reportId=${e.reportId}`)
+        const list = userScores
+        list.map((e, i) => {
+          if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+        })
+        for (const i in report) {
+          if (report[i] && typeof report[i] === 'string') report[i] = report[i].replace(/<[^>]+>/g, '')
+        }
+        report.purpose = report.purpose.replace(/<[^>]+>/g, '')
+        this.$post(this.api.exportBankExperimentReport, {
+          ...report,
+          experimentalData: list
+        }).then(res => {
+          util.downloadFileDirect(`${e.userName}的实验报告.docx`, new Blob([res]))
+        }).catch(res => { })
+      })
+    },
+    handleDelete (row) { // 删除
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$post(this.api.deleteExperimentalReport, [row.reportId]).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 item.reportId;
+          });
+          this.$post(this.api.deleteExperimentalReport, ids).then(res => {
+            this.multipleSelection = [];
             this.$refs.table.clearSelection();
-            this.page = 1;
+            util.successMsg("删除成功");
             this.getData();
+          }).catch(res => {
+          });
+        }).catch(() => {
+        });
+      } else {
+        util.errorMsg("请先选择数据 ！");
+      }
+    },
+    handleSelectionChange (val) { // 多选
+      this.multipleSelection = val;
+    },
+    handleCurrentChange (val) { // 切换分页
+      this.page = val;
+      this.handlePage();
+    },
+
+    handleSelectionActivationChange (val) { // 多选
+      this.multipleSelectionActivation = val;
+    },
+    handleCurrentActivationChange (val) { // 切换分页
+      this.pageActivation = val;
+      this.handlePage();
+    },
+
+    // 导出(有勾选：就导勾选中的；没有勾选：就导全部)
+    exportDataActivation () {
+      // 考核和练习的接口不一样
+      let url = this.permissions
+        ? `${this.api.exportAssessmentInfo}?assessmentId=${this.id}&classId=${this.classId}`
+        : `${this.api.exportPracticeInfo}?projectId=${this.id}`
+      // 有勾选，就带上勾选的id
+      if (this.multipleSelection.length) {
+        const ids = this.multipleSelection.map(e => e.reportId)
+        url += `&ids=${ids.toString()}`
+      }
+      axios.get(url, {
+        headers: {
+          token: this.token
         },
-        // 分页
-        handlePage(){
-            const list = this.listDataAll
-            this.listData = list.slice((this.page - 1) * this.pageSize,this.page * this.pageSize)
+        responseType: 'blob'
+      }).then((res) => {
+        util.downloadFileDirect(`学生${this.permissions ? '考核' : '练习'}成绩.xls`, new Blob([res.data]))
+      }).catch(res => { })
+    },
+    getChart () { // 初始化折线图
+      const data = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+      const list = this.listDataAll
+      list.map(n => {
+        n.score;
+        if (n.score === 0) {
+          data[0]++;
+        } else if (n.score > 0 && n.score <= 10) {
+          data[1]++;
+        } else if (n.score > 10 && n.score <= 20) {
+          data[2]++;
+        } else if (n.score > 20 && n.score <= 30) {
+          data[3]++;
+        } else if (n.score > 30 && n.score <= 40) {
+          data[4]++;
+        } else if (n.score > 40 && n.score <= 50) {
+          data[5]++;
+        } else if (n.score > 50 && n.score <= 60) {
+          data[6]++;
+        } else if (n.score > 60 && n.score <= 70) {
+          data[7]++;
+        } else if (n.score > 70 && n.score <= 80) {
+          data[8]++;
+        } else if (n.score > 80 && n.score <= 90) {
+          data[9]++;
+        } else if (n.score > 90 && n.score <= 100) {
+          data[10]++;
+        }
+      })
+      let myChart = echarts.init(document.getElementById("chart"));
+      myChart.setOption({
+        title: { text: "实验分数分布图" },
+        tooltip: {},
+        xAxis: {
+          name: "分数",
+          type: "category",
+          boundaryGap: false,
+          interval: 10,
+          data: ["0", "10", "20", "30", "40", "50", "60", "70", "80", "90", '100']
         },
-        // 查看成绩报告
-        show(row) {
-            this.$router.push(`show?reportId=${row.reportId}`)
+        yAxis: {
+          name: "人数",
+          type: "value",
+          interval: 1
         },
-        // 导出(有勾选：就导勾选中的；没有勾选：就导全部)
-        exportData() {
-          // 考核和练习的接口不一样
-          let url = this.permissions
-                      ? `${this.api.exportAssessmentInfo}?assessmentId=${this.id}&classId=${this.classId}`
-                      : `${this.api.exportPracticeInfo}?projectId=${this.id}`
-          // 有勾选，就带上勾选的id
-          if (this.multipleSelection.length) {
-            const ids = this.multipleSelection.map(e => e.reportId)
-            url += `&ids=${ids.toString()}`
-          }
-          axios.get(url, {
-            headers: {
-              token: this.token
-            },
-            responseType: 'blob'
-          }).then((res) => {
-            util.downloadFileDirect(`学生${this.permissions ? '考核' : '练习'}成绩.xls`,new Blob([res.data]))
-          }).catch(res => {})
+        series: [{
+          data,
+          type: "line",
+          areaStyle: {},
+          color: ["#8191fd"]
+        }]
+      });
+    },
+    // 错误率统计图
+    errorChart () {
+      const data = this.errorAnalysis.scoringPointList
+      const option = {
+        tooltip: {
+          trigger: 'axis',
         },
-        handleDelete(row) { // 删除
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(this.api.deleteExperimentalReport, [row.reportId]).then(res => {
-                    util.successMsg("删除成功");
-                    this.getData();
-                }).catch(res => {
-                });
-            }).catch(() => {
-            });
+        grid: {
+          left: '5%',
+          right: '5%',
+          top: '10%',
+          bottom: '30%'
         },
-        delAllData() { // 批量删除
-            if (this.multipleSelection.length) {
-                this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", {
-                    type: "warning"
-                }).then(() => {
-                    let ids = this.multipleSelection.map(item => {
-                        return item.reportId;
-                    });
-                    this.$post(this.api.deleteExperimentalReport, ids).then(res => {
-                        this.multipleSelection = [];
-                        this.$refs.table.clearSelection();
-                        util.successMsg("删除成功");
-                        this.getData();
-                    }).catch(res => {
-                    });
-                }).catch(() => {
-                });
-            } else {
-                util.errorMsg("请先选择数据 ！");
+        dataZoom: [//滑动条
+          {
+            // xAxisIndex: 0,//这里是从X轴的0刻度开始
+            show: true,
+            type: 'slider',
+            start: 0,
+            end: 150,
+            xAxisIndex: [0],
+            bottom: -10,
+          }
+        ],
+        xAxis: [{
+          type: 'category',
+          axisLine: {
+            lineStyle: {
+              color: '#57617B'
             }
-        },
-        handleSelectionChange(val) { // 多选
-            this.multipleSelection = val;
-        },
-        handleCurrentChange(val) { // 切换分页
-            this.page = val;
-            this.handlePage();
-        },
-        getChart() { // 初始化折线图
-            const data = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-            const list = this.listDataAll
-            list.map(n => {
-                n.score;
-                if (n.score === 0) {
-                    data[0]++;
-                } else if (n.score > 0 && n.score <= 10) {
-                    data[1]++;
-                } else if (n.score > 10 && n.score <= 20) {
-                    data[2]++;
-                } else if (n.score > 20 && n.score <= 30) {
-                    data[3]++;
-                } else if (n.score > 30 && n.score <= 40) {
-                    data[4]++;
-                } else if (n.score > 40 && n.score <= 50) {
-                    data[5]++;
-                } else if (n.score > 50 && n.score <= 60) {
-                    data[6]++;
-                } else if (n.score > 60 && n.score <= 70) {
-                    data[7]++;
-                } else if (n.score > 70 && n.score <= 80) {
-                    data[8]++;
-                } else if (n.score > 80 && n.score <= 90) {
-                    data[9]++;
-                } else if (n.score > 90 && n.score <= 100) {
-                    data[10]++;
-                }
-            })
-            let myChart = echarts.init(document.getElementById("chart"));
-            myChart.setOption({
-                title: { text: "实验分数分布图" },
-                tooltip: {},
-                xAxis: {
-                    name: "分数",
-                    type: "category",
-                    boundaryGap: false,
-                    interval: 10,
-                    data: ["0", "10", "20", "30", "40", "50", "60", "70", "80", "90", '100']
-                },
-                yAxis: {
-                    name: "人数",
-                    type: "value",
-                    interval: 1
-                },
-                series: [{
-                    data,
-                    type: "line",
-                    areaStyle: {},
-                    color: ["#8191fd"]
-                }]
-            });
-        },
-        // 错误率统计图
-        errorChart() {
-          const data = this.errorAnalysis.scoringPointList
-          const option = {
-            tooltip: {
-              trigger: 'axis',
-            },
-            grid: {
-              left: '5%',
-              right: '5%',
-              top: '25%',
-              bottom: '15%'
+          },
+          axisLabel: {
+            interval: 0,
+            textStyle: {
+              color: '#333',
             },
-            dataZoom: [//滑动条
-              {
-                // xAxisIndex: 0,//这里是从X轴的0刻度开始
-                show: true,
-                type: 'slider',
-                start: 0,
-                end: 150,
-                xAxisIndex: [0],
-                bottom: -10,
+            formatter: function (value, index) {
+              value = value.substring(0, 10) + (value.length > 10 ? '...' : '')
+              // if (index % 2 != 0) {
+              //   return '\n\n' + value;
+              // } else {
+              //   return value;
+              // }
+              return value
+            }
+            // rotate: 45
+          },
+          data: data.map(e => e.judgmentName)
+        }],
+        yAxis: [
+          {
+            type: 'value',
+            name: '错误率',
+            nameGap: 10,
+            axisLine: {
+              lineStyle: {
+                color: '#333'
               }
-            ],
-            xAxis: [{
-              type: 'category',
-              axisLine: {
-                lineStyle: {
-                  color: '#57617B'
-                }
-              },
-              axisLabel: {
-                interval: 0,
-                textStyle: {
-                  color: '#333',
-                },
-                // rotate: 60
+            },
+            axisLabel: {
+              margin: 10,
+              textStyle: {
+                fontSize: 12,
+                color: '#333'
               },
-              data: data.map(e => e.judgmentName)
-            }],
-            yAxis: [
-              {
-                type: 'value',
-                name: '错误率',
-                nameGap: 10,
-                axisLine: {
-                  lineStyle: {
-                    color: '#333'
-                  }
-                },
-                axisLabel: {
-                  margin: 10,
-                  textStyle: {
-                    fontSize: 12,
-                    color: '#333'
-                  },
-                  formatter: '{value}%'
-                },
-              }
-            ],
-            series: [{
-                name: '错误率',
-                type: 'bar',
-                barWidth: 25,
-                axisLabel: {
-                  margin: 10,
-                  textStyle: {
-                    fontSize: 12,
-                    color: '#333'
-                  },
-                  formatter: '{value}%'
-                },
-                itemStyle: {
-                  normal: {
-                    barBorderRadius: [10, 10, 0, 0],
-                    color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
-                      offset: 0,
-                      color: "#009AFD"
-                    }, {
-                      offset: 0.8,
-                      color: "#33DAFF"
-                    }], false),
-                    shadowColor: 'rgba(0, 0, 0, 0.1)',
-                  }
-                },
-                data: data.map(e => e.errorRate)
-              }
-            ]
+              formatter: '{value}%'
+            },
           }
-          echarts.init(document.querySelector(`#chart1`)).setOption(option)
+        ],
+        series: [{
+          name: '错误率',
+          type: 'bar',
+          barWidth: 25,
+          axisLabel: {
+            margin: 10,
+            textStyle: {
+              fontSize: 12,
+              color: '#333'
+            },
+            formatter: '{value}%'
+          },
+          itemStyle: {
+            normal: {
+              barBorderRadius: [10, 10, 0, 0],
+              color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+                offset: 0,
+                color: "#009AFD"
+              }, {
+                offset: 0.8,
+                color: "#33DAFF"
+              }], false),
+              shadowColor: 'rgba(0, 0, 0, 0.1)',
+            }
+          },
+          data: data.map(e => e.errorRate)
         }
+        ]
+      }
+      echarts.init(document.querySelector(`#chart1`)).setOption(option)
     }
+  }
 };
 </script>
 
 <style lang="scss" scoped>
-
 /deep/ .head-card {
     .el-card__body {
         padding-bottom: 0px;
@@ -470,19 +700,19 @@ export default {
         }
     }
     .chart {
-      width: calc(100% - 660px);
+        width: calc(100% - 660px);
     }
 }
 .wrong {
-  .line {
-    display: flex;
-    // justify-content: center;
-    width: 920px;
-    margin: 0 auto 10px;
-    .jud-name {
-      width: 500px;
-      margin-right: 100px;
+    .line {
+        display: flex;
+        // justify-content: center;
+        width: 920px;
+        margin: 0 auto 10px;
+        .jud-name {
+            width: 500px;
+            margin-right: 100px;
+        }
     }
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/expSystem/backstage/addModel.vue b/src/pages/expSystem/backstage/addModel.vue
new file mode 100644
index 0000000..bae108e
--- /dev/null
+++ b/src/pages/expSystem/backstage/addModel.vue
@@ -0,0 +1,222 @@
+<template>
+  <div class="wrap">
+    <el-card shadow="hover"
+             class="m-b-20">
+      <div class="flex-between">
+        <el-page-header @back="back"
+                        :content="isDetail ? '查看源模型' : (id ? '编辑源模型' : '新增源模型')"></el-page-header>
+        <div v-if="!isDetail">
+          <el-button type="primary"
+                     round
+                     v-preventReClick
+                     @click="submit(1)">发布</el-button>
+          <el-button v-if="!postStatus"
+                     type="primary"
+                     round
+                     v-preventReClick
+                     @click="submit(0)">草稿</el-button>
+        </div>
+      </div>
+    </el-card>
+
+    <el-card shadow="hover">
+      <el-form label-width="80px"
+               :disabled="isDetail">
+        <div class="item name">
+          <label>模型名称</label>
+          <el-input placeholder="请输入模型名称"
+                    v-model="form.modelName"
+                    maxlength="25"
+                    style="width: 400px"></el-input>
+        </div>
+        <div class="item name">
+          <label>模型分类</label>
+          <el-cascader :options="categoryList"
+                       v-model="categoryIdCus"
+                       :props="categoryProps"
+                       clearable>
+          </el-cascader>
+        </div>
+        <div class="item code">
+          <label>模型代码</label>
+          <codemirror :key="codeKey"
+                      :code.sync="form.modelDemo"
+                      :readOnly="isDetail"></codemirror>
+        </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import codemirror from '@/components/codemirror'
+export default {
+  components: { codemirror },
+  data () {
+    return {
+      systemId: +this.$route.query.systemId,
+      categoryId: +this.$route.query.categoryId,
+      id: +this.$route.query.id,
+      postStatus: +this.$route.query.postStatus,
+      isDetail: Boolean(this.$route.query.show), // 是否是查看
+      isModel: Boolean(this.$route.query.model), // 是否是从模型列表进来的，模型和源模型查询详情的接口不一样
+      categoryIdCus: [],
+      form: {
+        modelName: '',
+        modelDemo: ''
+      },
+      categoryList: [],
+      categoryProps: {
+        checkStrictly: true,
+        label: 'categoryName',
+        value: 'id'
+      },
+      codeKey: 1,
+      submiting: false,
+      updateTime: 0
+    };
+  },
+  watch: {
+    // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+    form: {
+      handler () {
+        this.updateTime++
+      },
+      deep: true
+    },
+  },
+  mounted () {
+    this.getType()
+  },
+  methods: {
+    // 获取详情
+    async getData () {
+      // 模型/源模型
+      const res = await this.$post(`${this.api[this.isModel ? 'referenceFindById' : 'modelFindById']}?id=${this.id}`)
+      const { data } = res
+      const { modelName, categoryId, modelDemo } = data
+      this.form = {
+        modelName,
+        modelDemo
+      }
+      this.handleId(this.categoryList, categoryId)
+      this.codeKey++
+    },
+    // 处理id
+    handleId (list, id, parentId = []) {
+      list.map(e => {
+        // 取得父级id跟子级id的集合
+        if (id === e.id) {
+          parentId.shift() // 全部的id要去掉
+          this.categoryIdCus = [...parentId, e.id]
+        } else {
+          e.children && this.handleId(e.children, id, [...parentId, e.id])
+        }
+      })
+    },
+    // 获取分类
+    getType () {
+      this.$post(this.api.sourceModelClassification).then(res => {
+        const { data } = res
+        // 没有子级，删除children属性
+        const handleLeaf = list => {
+          list.map(e => {
+            if (e.children.length) {
+              handleLeaf(e.children)
+            } else {
+              delete e.children
+            }
+          })
+        }
+        handleLeaf(data)
+        this.categoryList = data[0].children
+        if (this.id) {
+          this.getData()
+        } else {
+          this.handleId(data, this.categoryId)
+        }
+      }).catch(res => { })
+    },
+    // 保存
+    submit (postStatus, fromBack) {
+      if (this.submiting) return false
+      const { modelName, categoryId, modelDemo } = this.form
+      const categoryIdCus = this.categoryIdCus
+      const id = this.id
+      if (!modelName) return this.$message.error('请输入模型名称')
+      if (categoryIdCus[0] === 1) return this.$message.error('请选择模型分类')
+      if (postStatus) {
+        if (!modelDemo) return this.$message.error('请输入模型代码')
+      }
+      this.submiting = true
+      const data = {
+        categoryId: categoryIdCus[categoryIdCus.length - 1],
+        modelName,
+        modelDemo,
+        postStatus,
+        systemId: this.systemId
+      }
+      if (id) {
+        data.id = id
+        this.$post(this.api.updateSysModelDemo, data).then(res => {
+          this.$message.success('编辑成功')
+          fromBack || this.$router.back()
+        }).catch(res => {
+          this.submiting = false
+        })
+      } else {
+        this.$post(this.api.saveAcademyModelDemo, data).then(res => {
+          this.$message.success('新增成功')
+          fromBack || this.$router.back()
+        }).catch(res => {
+          this.submiting = false
+        })
+      }
+    },
+    // 返回上一页
+    backPage () {
+      this.$router.back()
+    },
+    // 返回
+    back () {
+      const id = this.id
+      const updateTime = this.updateTime
+      // 更改了信息才需要提示
+      if ((id && updateTime > 1) || (!id && updateTime)) {
+        this.$confirm(`编辑的内容未保存，是否保存？`, '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.submit(this.postStatus ? 1 : 0, 1)
+          this.backPage()
+        }).catch(() => {
+          this.backPage()
+        })
+      } else {
+        this.backPage()
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.item {
+    display: flex;
+    margin-bottom: 20px;
+    label {
+        padding: 0 15px 0 20px;
+    }
+    &.name {
+        align-items: center;
+        label {
+            text-align: right;
+        }
+    }
+    &.code {
+        flex-direction: column;
+        label {
+            margin-bottom: 15px;
+        }
+    }
+}
+</style>
diff --git a/src/pages/expSystem/backstage/compiler.vue b/src/pages/expSystem/backstage/compiler.vue
new file mode 100644
index 0000000..065fcfa
--- /dev/null
+++ b/src/pages/expSystem/backstage/compiler.vue
@@ -0,0 +1,56 @@
+<template>
+  <div class="wrap">
+    <div class="line">
+      <span class="field">功能</span>
+      <span class="field">操作</span>
+    </div>
+    <div class="line">
+      <span class="field">粘贴代码</span>
+      <div class="field">
+        <el-switch v-model="isOpen"
+                   :active-text="isOpen ? '关闭' : '启用'"
+                   :active-value="0"
+                   :inactive-value="1"
+                   style="margin: 0 10px 0 10px"
+                   @change="switchOff(scope.row)"></el-switch>
+      </div>
+    </div>
+
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      systemId: this.$route.query.systemId,
+      isOpen: 0
+    };
+  },
+  mounted () { },
+  methods: {
+
+    switchOff (row) {
+      // this.$get(`${this.api.updateIsOpen}?isOpen=${row.ccupationlabOpen}&projectId=${row.projectId}&platformId=${this.queryData.platformId}`).then(res => {
+      //   util.successMsg("更新启用状态成功");
+      //   this.getData();
+      // }).catch(err => {
+      //   console.log(err);
+      // });
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+.wrap {
+    padding: 30px;
+}
+.line {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+    text-align: center;
+    .field {
+        width: 100px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/expSystem/backstage/index.vue b/src/pages/expSystem/backstage/index.vue
new file mode 100644
index 0000000..aaf3f43
--- /dev/null
+++ b/src/pages/expSystem/backstage/index.vue
@@ -0,0 +1,73 @@
+<template>
+  <div>
+    <el-card shadow="hover"
+             class="m-b-20">
+      <el-page-header :content="'系统后台 / '+ $route.query.name"
+                      @back="back"></el-page-header>
+    </el-card>
+    <div class="page"
+         style="padding: 0">
+      <div class="tabs">
+        <a class="item"
+           v-for="(item,index) in tabs"
+           :key="index"
+           :class="{active: index == active}"
+           @click="tabChange(index)">{{ item }}</a>
+      </div>
+
+      <model v-if="active == 'model'"></model>
+      <sourceModel v-else-if="active == 'sourceModel'"></sourceModel>
+      <compiler v-else-if="active == 'compiler'"></compiler>
+    </div>
+  </div>
+</template>
+
+<script>
+import model from "./model";
+import sourceModel from "./sourceModel";
+import compiler from "./compiler";
+export default {
+  data () {
+    return {
+      active: this.$route.query.type || 'model',
+      tabs: {
+        model: "模型列表管理",
+        sourceModel: "源模型管理",
+        compiler: '编译器管理'
+      }
+    };
+  },
+  computed: {
+
+  },
+  components: {
+    model,
+    sourceModel,
+    compiler
+  },
+  created () { },
+  methods: {
+    tabChange (index) {
+      this.active = index
+      this.$router.push({
+        path: 'backstage',
+        query: {
+          ...this.$route.query,
+          page: 1,
+          type: index,
+          categoryId: ''
+        }
+      })
+    },
+    back () {
+      this.$router.push('list')
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page {
+    min-height: calc(100vh - 250px);
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/expSystem/backstage/model.vue b/src/pages/expSystem/backstage/model.vue
new file mode 100644
index 0000000..6ff578b
--- /dev/null
+++ b/src/pages/expSystem/backstage/model.vue
@@ -0,0 +1,308 @@
+<template>
+    <div class="wrap">
+        <div class="side">
+            <org ref="tree" @initData="initData" @getData="getData"></org>
+        </div>
+
+        <div class="right">
+            <h6 class="p-title">筛选</h6>
+            <div class="tool">
+                <ul class="filter">
+                    <li>
+                        <el-input placeholder="请输入模型名称" prefix-icon="el-icon-search" v-model.trim="keyword" clearable></el-input>
+                    </li>
+                </ul>
+                <div>
+                    <el-button type="primary" round @click="add">导入模型</el-button>
+                    <el-button type="primary" round @click="batchDel">批量移除</el-button>
+                </div>
+            </div>
+
+            <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center"></el-table-column>
+                <el-table-column type="index" label="序号" width="55" align="center"></el-table-column>
+                <el-table-column prop="modelName" label="模型名称" align="center"></el-table-column>
+                <el-table-column v-if="isTopLevel" prop="categoryName" label="分类" width="150" align="center"></el-table-column>
+                <el-table-column prop="createTime" label="导入时间" align="center"></el-table-column>
+                <el-table-column label="状态" align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.isOpen ? '禁用' : '启用' }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="200" align="center">
+                    <template slot-scope="scope">
+                        <el-button type="text" @click="show(scope.row)">查看</el-button>
+                        <el-button type="text" @click="del(scope.row)">移除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="pagination">
+                <el-pagination background layout="total, prev, pager, next" :current-page="page" @current-change="handleCurrentChange" :total="total"></el-pagination>
+            </div>
+        </div>
+
+        <el-dialog title="请选择需要导入的模型" :visible.sync="modelVisible" width="500px" class="dialog" :close-on-click-modal="false">
+          <div class="model-wrap">
+            <el-tree
+              v-if="modelData.length"
+              :data="modelData" v-loading="modelLoading"
+              ref="model"
+              default-expand-all
+              show-checkbox
+              node-key="id"
+              :props="{children: 'children', label: 'categoryName', isLeaf: 'leaf'}">
+            </el-tree>
+            <div class="none" v-else>暂无可导入的模型</div>
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="modelVisible = false">取 消</el-button>
+            <el-button type="primary" @click="submit">确 定</el-button>
+          </span>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import org from "./modelType"
+export default {
+    data() {
+        return {
+            systemId: this.$route.query.systemId,
+            isTopLevel: true, // 是否是在顶级分类
+            listData: [],
+            keyword: '',
+            page: +this.$route.query.page || 1,
+            pageSize: 10,
+            total: 0,
+            multipleSelection: [],
+            modelVisible: false,
+            modelLoading: false,
+            modelData: [],
+            submiting: false
+        };
+    },
+    components: {
+        org
+    },
+    watch: {
+        keyword: function(val) {
+            clearTimeout(this.searchTimer);
+            this.searchTimer = setTimeout(() => {
+                this.initData()
+            }, 500)
+        }
+    },
+    mounted() {},
+    methods: {
+        getData() {
+          const curNode = this.$refs.tree.$refs.tree.getCurrentNode() // 获取当前选中的分类
+          this.isTopLevel = !curNode.level && curNode.categoryName === '全部'
+          // 如果是首级，要调另一个接口
+          if (this.isTopLevel) {
+            this.$post(this.api.getAllModelList, {
+              modelName: this.keyword,
+              pageNum: this.page,
+              pageSize: this.pageSize,
+              systemId: this.systemId
+            }).then(res => {
+              this.listData = res.data.records
+              this.total = res.data.total
+            }).catch(res => {})
+          } else {
+            this.$post(this.api.referenceDemoList, {
+              modelName: this.keyword,
+              pageNum: this.page,
+              pageSize: this.pageSize,
+              categoryId: curNode.id
+            }).then(res => {
+              this.listData = res.data.records
+              this.total = res.data.total
+            }).catch(res => {})
+          }
+        },
+        initData() {
+            this.$refs.table.clearSelection()
+            this.page = 1
+            this.getData()
+        },
+        // 导入模型
+        add() {
+            if (!this.$refs.tree.orgList.length) return this.$message.error('请先添加模型分类')
+            if (this.isTopLevel) return this.$message.error('请选择子分类进入导入模型')
+            this.modelVisible = true
+            this.modelLoading = true
+            // 获取模型列表，用以跟源模型列表作比对，重复的不再显示
+            this.$post(this.api.getAllModelList, {
+                pageNum: 1,
+                pageSize: 10000,
+                systemId: this.systemId
+            }).then(res => {
+                const modelList = res.data.records
+
+                // 查询源模型分类
+                this.$post(this.api.sourceModelClassification).then(res => {
+                    let { data } = res
+                    const promises = []
+                    const addType = list => {
+                        list.map((e, i) => {
+                            // 用promise储存以添加完后更新数据
+                            promises.push(new Promise((resolve,reject) => {
+                                // 获取源模型列表
+                                this.$post(this.api.sysModelDemoList, {
+                                    pageNum: 1,
+                                    pageSize: 10000,
+                                    categoryId: e.id
+                                }).then(res => {
+                                    const { records } = res.data
+                                    const modelChildren = []
+                                    // 判重，重复的模型不再显示，通过模型的copyId和源模型的id作比对
+                                    records.map(n => {
+                                        if (!modelList.find(e => e.copyId === n.id)) {
+                                            n.categoryName = n.modelName
+                                            modelChildren.push(n)
+                                        }
+                                    })
+                                    // 如果有未导入的模型，则添加到子级，否则设置为disabled
+                                    if (modelChildren.length) {
+                                      e.children = [...e.children, ...modelChildren]
+                                    } else if (records.length) {
+                                      e.disabled = true
+                                    }
+                                    resolve()
+                                }).catch(res => {
+                                    reject()
+                                })
+                            }))
+                            e.children && e.children.length && addType(e.children)
+                        })
+                    }
+                    addType(data)
+                    // 筛选出disabled不为true的分类，因为没有模型的分类不需要展示
+                    const handleType = list => {
+                      return list.filter((e, i) => {
+                        return !e.disabled
+                      }).map(e => {
+                        if (e.children) {
+                          e.children = handleType(e.children)
+                        }
+                        return e
+                      })
+                    }
+                    Promise.all(promises).then(_ => {
+                      data = handleType(data)
+                      this.modelData = (data.length && data[0].children && data[0].children.length) ? data : []
+                      this.modelLoading = false
+                    }).catch(res => {})
+                }).catch(res => {})
+            }).catch(res => {})
+        },
+        // 把删除了的分类去除
+        
+        // 查看模型
+        show(row) {
+            this.$router.push(`/addModel?categoryId=${this.$refs.tree.$refs.tree.getCurrentKey()}&id=${row.id}&show=1&model=1`)
+        },
+        // 删除模型
+        del(row) {
+            this.$confirm("确定要删除吗？", "提示", {
+                type: "warning"
+            }).then(() => {
+                this.$post(this.api.deleteReferenceDemo, [row.id]).then(res => {
+                    this.$message.success("删除成功")
+                    this.getData()
+                }).catch(res => {})
+            }).catch(() => {})
+        },
+        handleSelectionChange(val) {
+            this.multipleSelection = val
+        },
+        // 批量删除
+        batchDel() {
+            if (this.multipleSelection.length) {
+                this.$confirm("确定要删除吗？", "提示", {
+                    type: "warning"
+                }).then(() => {
+                    let ids = this.multipleSelection.map(e => e.id)
+                    this.$post(this.api.deleteReferenceDemo, ids).then(res => {
+                        this.$refs.table.clearSelection()
+                        this.$message.success("删除成功")
+                        this.getData()
+                    }).catch(res => {})
+                }).catch(() => {})
+            } else {
+                this.$message.error("请先选择模型 ！")
+            }
+        },
+        handleCurrentChange(val) {
+            this.page = val
+            this.$router.push({
+              path: 'backstage',
+              query: {
+                ...this.$route.query,
+                page: val
+              }
+            })
+            this.getData()
+        },
+        // 导入模型提交
+        submit() {
+            if (this.submiting) return false
+            const data = []
+            const systemId = this.systemId
+            if (this.$refs.model) {
+              const list = this.$refs.model.getCheckedNodes() // 获取选择的分类模型
+              const categoryId = this.$refs.tree.$refs.tree.getCurrentKey() // 获取当前分类
+              if (!list.length) return this.$message.error('请选择模型')
+              this.submiting = true
+              list.map(e => {
+                // 有categoryId的才是模型，只导入模型，不导入分类
+                e.categoryId && data.push({
+                    systemId,
+                    categoryId,
+                    copyId: e.id
+                })
+              })
+              this.$post(this.api.saveReferenceDemo, data).then(res => {
+                  this.modelVisible = false
+                  this.initData()
+                  setTimeout(() => {
+                      this.submiting = false
+                  }, 2000)
+              }).catch(res => {
+                  this.submiting = false
+              })
+            } else {
+              this.submiting = false
+              this.modelVisible = false
+            }
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.wrap {
+    display: flex;
+    min-height: calc(100vh - 310px);
+    padding: 0 24px;
+    .side {
+        width: 300px;
+        padding: 24px 10px 24px 0;
+        margin-right: 24px;
+        border-right: 1px solid rgba(0, 0, 0, 0.06);
+    }
+    .right {
+        width: calc(100% - 374px);
+        padding: 24px;
+    }
+}
+.el-input__inner{
+    height: 32px;
+}
+.model-wrap {
+  max-height: 400px;
+  overflow: auto;
+  .none {
+    text-align: center;
+    color: #8b8b8b;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/expSystem/backstage/modelType.vue b/src/pages/expSystem/backstage/modelType.vue
new file mode 100644
index 0000000..43bdb6c
--- /dev/null
+++ b/src/pages/expSystem/backstage/modelType.vue
@@ -0,0 +1,321 @@
+<template>
+  <div>
+    <div>
+      <div class="front-switch">
+        <el-switch v-model="modelIsShow"
+                   :active-value="0"
+                   :inactive-value="1"
+                   active-text="内置模型按钮前台展示"
+                   @change="changeModelStatus"></el-switch>
+      </div>
+      <div class="flex-between m-b-20">
+        <el-button type="text"
+                   icon="el-icon-refresh"
+                   @click="syncModel">同步原始模型列表</el-button>
+        <el-button type="text"
+                   @click="addType(0)">添加</el-button>
+      </div>
+      <org-tree v-if="orgList.length"
+                :data="orgList"
+                default-expand-all
+                ref="tree"
+                node-key="id"
+                highlight-current
+                :expand-on-click-node="false"
+                @node-click="getSingle"
+                :props="{children: 'children', label: 'categoryName', isLeaf: 'leaf'}">
+        <span class="custom-tree-node"
+              slot-scope="{ node, data }">
+          <span style="display: inline-block; margin-right: 20px">{{ node.label }}</span>
+          <span>
+            <el-button type="text"
+                       icon="el-icon-edit-outline"
+                       @click="editType(data)">
+            </el-button>
+            <el-button type="text"
+                       icon="el-icon-circle-plus-outline"
+                       @click="addType(node, data)">
+            </el-button>
+            <el-button type="text"
+                       icon="el-icon-delete"
+                       @click="delType(data)">
+            </el-button>
+          </span>
+        </span>
+      </org-tree>
+      <div class="none"
+           v-else>暂无数据，请点击添加按钮添加模型分类</div>
+    </div>
+
+    <el-dialog :title="Form.id ? '编辑分类' : '新增分类'"
+               :visible.sync="typeVisible"
+               width="24%"
+               center
+               @close="closeDia"
+               :close-on-click-modal="false">
+      <el-form ref="Form"
+               :model="Form"
+               :rules="rules">
+        <el-form-item prop="categoryName">
+          <el-input placeholder="请输入分类名称"
+                    v-model="Form.categoryName"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="typeVisible = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="submit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import OrgTree from "@/components/org-tree/src/tree";
+export default {
+  props: ["Data"],
+  data () {
+    return {
+      systemId: this.$route.query.systemId,
+      modelIsShow: false,
+      orgList: [],
+      typeVisible: false,
+      Form: {
+        id: '',
+        parentId: '',
+        categoryName: '',
+        level: ''
+      },
+      rules: {
+        categoryName: [
+          { required: true, message: "请输入分类名称", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  components: {
+    OrgTree
+  },
+  mounted () {
+    this.getType()
+    this.getModelStatus()
+  },
+  methods: {
+    // 获取分类
+    getType () {
+      this.$post(`${this.api.modelClassList}?systemId=${this.systemId}`).then(res => {
+        const { data } = res
+        this.orgList = data
+        data.length && this.$nextTick(() => {
+          const categoryId = this.$route.query.categoryId
+          this.$refs.tree.setCurrentKey(categoryId || data[0].id)
+          this.$router.push({
+            path: 'backstage',
+            query: {
+              ...this.$route.query,
+              categoryId: this.$refs.tree.getCurrentKey()
+            }
+          }).catch(err => { })
+          this.$emit('getData')
+        })
+      }).catch(res => { })
+    },
+    // 获取内置模型按钮展示状态
+    getModelStatus () {
+      this.$post(`${this.api.checkIsShowBySystemId}?systemId=${this.systemId}`).then(res => {
+        this.modelIsShow = res.isShow // 0为展示 1为不展示
+      }).catch(res => { })
+    },
+    // 改变内置模型按钮展示状态
+    changeModelStatus (val) {
+      this.$post(`${this.api.modifyIsShowState}?systemId=${this.systemId}&isShow=${val}`).then(res => { }).catch(res => { })
+    },
+    getSingle () {
+      this.$router.push({
+        path: 'backstage',
+        query: {
+          ...this.$route.query,
+          categoryId: this.$refs.tree.getCurrentKey()
+        }
+      }).catch(err => { })
+      this.$emit('initData')
+    },
+    syncModelData () {
+      // 同步原始模型前删除原有数据
+      this.$post(`${this.api.delModelInfoBySystemId}?systemId=${this.systemId}`).then(res => {
+        this.$post(`${this.api.synchronizationMdel}?systemId=${this.systemId}`).then(res => {
+          this.$router.push({
+            path: 'backstage',
+            query: {
+              ...this.$route.query,
+              categoryId: ''
+            }
+          })
+          this.getType()
+        })
+      }).catch(() => { })
+    },
+    syncModel () {
+      if (this.orgList.length) {
+        this.$confirm('同步后当前的组织架构将会被删除，是否继续？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.syncModelData()
+        }).catch(() => { })
+      } else {
+        this.syncModelData()
+      }
+    },
+    // 添加分类和模型
+    async addData (id) {
+      // 查询源模型分类
+      this.$post(this.api.sourceModelClassification).then(res => {
+        const { data } = res
+        const systemId = this.systemId
+        const promises = []
+        // 递归添加源模型分类及模型
+        const addType = async (list, refId) => {
+          for (const e of list) {
+            // 用promise储存以添加完后更新数据
+            // promises.push(new Promise(async (resolve, reject) => {
+            // 新增分类
+            await this.$post(this.api.saveReferenceCategory, {
+              id: '',
+              categoryName: e.categoryName,
+              systemId,
+              level: e.level,
+              parentId: refId || id,
+              founder: 1
+            }).then(async res => {
+              const referenceCategoryId = res.referenceCategoryId // 把新增返回的id作为子级的parentId
+
+              // 查询源模型列表
+              promises.push(new Promise((resolve1, reject1) => {
+                this.$post(this.api.sysModelDemoList, {
+                  pageNum: 1,
+                  pageSize: 10000,
+                  categoryId: e.id
+                }).then(res => {
+                  let { records } = res.data
+                  records = records.filter(e => e.postStatus && !e.isOpen) // 只同步已发布且启用的源模型
+                  if (records.length) {
+                    const modelData = []
+                    // 处理新增模型需要的参数
+                    records.map(e => {
+                      modelData.push({
+                        systemId,
+                        categoryId: referenceCategoryId,
+                        copyId: e.id
+                      })
+                    })
+                    // 新增模型
+                    this.$post(this.api.saveReferenceDemo, modelData).then(res => {
+                      // resolve()
+                      resolve1()
+                    }).catch(res => {
+                      // reject()
+                      reject1()
+                    })
+                  } else {
+                    // resolve()
+                  }
+                  e.children = [...e.children, ...records]
+                }).catch(res => {
+                  // reject()
+                })
+              }))
+
+              // 如果有子级，则递归循环
+              this.$nextTick(() => {
+                e.children && e.children.length && addType(e.children, res.referenceCategoryId)
+              })
+            }).catch(res => {
+              // reject()
+            })
+            // }))
+          }
+        }
+        addType(data[0].children, id)
+        Promise.all(promises).then(_ => {
+          setTimeout(this.getType, 500)
+        })
+      }).catch(res => { })
+    },
+    // 添加分类
+    addType (node, data) {
+      this.typeVisible = true
+      this.Form.parentId = data ? data.id : 0
+      this.Form.level = node ? node.level : 0
+    },
+    // 编辑分类
+    editType (data) {
+      this.Form.id = data.id
+      this.Form.parentId = data ? data.parentId : 0
+      this.Form.categoryName = data.categoryName
+      this.typeVisible = true
+    },
+    // 保存分类
+    submit () {
+      this.$refs['Form'].validate((valid) => {
+        if (valid) {
+          const form = this.Form
+          const data = {
+            id: form.id,
+            parentId: form.parentId,
+            categoryName: form.categoryName,
+            systemId: this.systemId,
+            founder: 1
+          }
+          if (data.id) {
+            this.$post(this.api.updateModelClass, data).then(res => {
+              this.$message.success("编辑成功")
+              this.typeVisible = false
+              this.getType()
+            }).catch(res => { })
+          } else {
+            data.level = form.level
+            this.$post(this.api.saveReferenceCategory, data).then(res => {
+              this.$message.success("添加成功")
+              this.typeVisible = false
+              this.getType()
+            }).catch(res => { })
+          }
+        }
+      })
+    },
+    closeDia () {
+      this.$refs.Form.resetFields()
+      this.Form = {
+        id: '',
+        parentId: '',
+        categoryName: ''
+      }
+    },
+    // 删除分类
+    delType (item) {
+      this.$confirm("确定要删除分类吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$post(`${this.api.deleteModelClass}?categoryId=${item.id}`).then(res => {
+          this.$message.success("删除成功")
+          this.$emit('initData')
+          this.getType()
+        }).catch(res => { })
+      }).catch(() => { })
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.front-switch {
+    padding-bottom: 10px;
+    margin-bottom: 5px;
+    border-bottom: 1px solid #f0f0f0;
+}
+.none {
+    margin-top: 20px;
+    text-align: center;
+    color: #909399;
+    font-size: 12px;
+}
+</style>
diff --git a/src/pages/expSystem/backstage/sourceModel.vue b/src/pages/expSystem/backstage/sourceModel.vue
new file mode 100644
index 0000000..60bc0b0
--- /dev/null
+++ b/src/pages/expSystem/backstage/sourceModel.vue
@@ -0,0 +1,260 @@
+<template>
+  <div class="wrap">
+    <div class="side">
+      <org ref="tree"
+           @initData="initData"
+           @getData="getData"></org>
+    </div>
+
+    <div class="right">
+      <h6 class="p-title">筛选</h6>
+      <div class="tool">
+        <ul class="filter">
+          <li>
+            <el-input placeholder="请输入模型名称"
+                      prefix-icon="el-icon-search"
+                      v-model.trim="keyword"
+                      clearable></el-input>
+          </li>
+        </ul>
+        <div>
+          <el-button type="primary"
+                     round
+                     @click="add">新增模型</el-button>
+          <el-button type="primary"
+                     round
+                     @click="batchDel">批量删除</el-button>
+          <el-button type="primary"
+                     round
+                     @click="batchOff(1)">批量禁用</el-button>
+          <el-button type="primary"
+                     round
+                     @click="batchOff(0)">批量开启</el-button>
+        </div>
+      </div>
+
+      <el-table :data="listData"
+                class="table"
+                ref="table"
+                stripe
+                header-align="center"
+                @selection-change="handleSelectionChange">
+        <el-table-column type="selection"
+                         width="55"
+                         align="center"></el-table-column>
+        <el-table-column type="index"
+                         label="序号"
+                         width="55"
+                         align="center"></el-table-column>
+        <el-table-column prop="modelName"
+                         label="模型名称"
+                         align="center"></el-table-column>
+        <el-table-column v-if="isTopLevel"
+                         prop="categoryName"
+                         label="分类"
+                         width="150"
+                         align="center"></el-table-column>
+        <el-table-column prop="modifyName"
+                         label="编辑人"
+                         align="center"></el-table-column>
+        <el-table-column prop="updateTime"
+                         label="最新编辑时间"
+                         width="150"
+                         align="center"></el-table-column>
+        <el-table-column prop="workNumber"
+                         label="状态"
+                         width="100"
+                         align="center">
+          <template slot-scope="scope">
+            {{ scope.row.postStatus ? '已发布' : '草稿' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作"
+                         width="230">
+          <template slot-scope="scope">
+            <el-button type="text"
+                       @click="show(scope.row)">查看</el-button>
+            <el-button type="text"
+                       @click="edit(scope.row)">编辑</el-button>
+            <el-button type="text"
+                       @click="del(scope.row)">删除</el-button>
+            <el-switch v-if="scope.row.postStatus"
+                       v-model="scope.row.isOpen"
+                       :active-value="0"
+                       :inactive-value="1"
+                       style="margin: 0 10px 0 5px"
+                       :active-text="scope.row.isOpen ? '禁用' : '启用'"
+                       @change="switchOff($event,scope.row,scope.$index)"></el-switch>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination background
+                       layout="total, prev, pager, next"
+                       :current-page="page"
+                       @current-change="handleCurrentChange"
+                       :total="total"></el-pagination>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import org from "./sourceType"
+export default {
+  data () {
+    return {
+      systemId: this.$route.query.systemId,
+      isTopLevel: true, // 是否是在顶级分类
+      listData: [],
+      keyword: "",
+      page: +this.$route.query.page || 1,
+      pageSize: 10,
+      total: 0,
+      multipleSelection: []
+    };
+  },
+  components: {
+    org
+  },
+  watch: {
+    keyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initData()
+      }, 500)
+    }
+  },
+  mounted () {
+
+  },
+  methods: {
+    // 获取列表
+    getData () {
+      const curNode = this.$refs.tree.$refs.tree.getCurrentNode() // 获取当前选中的分类
+      this.isTopLevel = !curNode.level
+      // 如果是首级，要调另一个接口
+      if (!curNode.level) {
+        this.$post(this.api.getAllModelListBySys, {
+          modelName: this.keyword,
+          pageNum: this.page,
+          pageSize: this.pageSize
+        }).then(res => {
+          this.listData = res.data.records
+          this.total = res.data.total
+        }).catch(res => { })
+      } else {
+        this.$post(this.api.queryTheModelOfOurSchool, {
+          modelName: this.keyword,
+          pageNum: this.page,
+          pageSize: this.pageSize,
+          categoryId: curNode.id,
+          systemId: this.systemId
+        }).then(res => {
+          this.listData = res.data.records
+          this.total = res.data.total
+        }).catch(res => { })
+      }
+    },
+    initData () {
+      this.$refs.table.clearSelection()
+      this.page = 1
+      this.getData()
+    },
+    // 新增
+    add () {
+      this.$router.push(`addModel?categoryId=${this.$refs.tree.$refs.tree.getCurrentKey()}&systemId=${this.systemId}`)
+    },
+    // 批量删除
+    batchDel () {
+      if (this.multipleSelection.length) {
+        // 批量删除
+        let ids = this.multipleSelection.map(e => e.id)
+        this.$confirm("确定要删除吗？", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$post(this.api.deleteSysModelDemo, ids).then(res => {
+            this.$message.success('删除成功')
+            this.getData()
+          }).catch(res => { })
+        }).catch(() => { })
+      } else {
+        this.$message.error("请先选择模型 ！")
+      }
+    },
+    // 批量禁用启用
+    batchOff (isOpen) {
+      const off = isOpen === 0
+      if (this.multipleSelection.length) {
+        // 批量删除
+        let ids = this.multipleSelection.map(e => e.id)
+        this.$confirm(`确定要${off ? '启用' : '禁用'}吗？`, "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$post(`${this.api.bulkDisable}?isOpen=${isOpen}`, ids).then(res => {
+            this.$message.success(`${off ? '启用' : '禁用'}成功`)
+            this.getData()
+          }).catch(res => { })
+        }).catch(() => { })
+      } else {
+        this.$message.error("请先选择模型 ！")
+      }
+    },
+    // 查看
+    show (row) {
+      this.$router.push(`/addModel?categoryId=${this.$refs.tree.$refs.tree.getCurrentKey()}&id=${row.id}&show=1`)
+    },
+    // 编辑
+    edit (row) {
+      this.$router.push(`/addModel?categoryId=${this.$refs.tree.$refs.tree.getCurrentKey()}&id=${row.id}&postStatus=${row.postStatus}`)
+    },
+    del (row) {
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$post(this.api.deleteSysModelDemo, [row.id]).then(res => {
+          this.$message.success('删除成功')
+          this.getData()
+        }).catch(res => { })
+      }).catch(() => { })
+    },
+    switchOff (val, row, index) {
+      this.$post(`${this.api.bulkDisable}?isOpen=${val}`, [row.id]).then(res => {
+        this.$message.success(val ? '禁用成功' : '启用成功')
+      }).catch(res => { })
+    },
+    handleSelectionChange (val) {
+      this.multipleSelection = val
+    },
+    handleCurrentChange (val) {
+      this.page = val
+      this.$router.push({
+        path: 'backstage',
+        query: {
+          ...this.$route.query,
+          page: val
+        }
+      })
+      this.getData()
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.wrap {
+    display: flex;
+    padding: 0 24px;
+    .side {
+        width: 300px;
+        padding: 24px 10px 24px 0;
+        margin-right: 24px;
+        border-right: 1px solid rgba(0, 0, 0, 0.06);
+    }
+    .right {
+        width: calc(100% - 374px);
+        padding: 24px;
+    }
+}
+.el-input__inner {
+    height: 32px;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/expSystem/backstage/sourceType.vue b/src/pages/expSystem/backstage/sourceType.vue
new file mode 100644
index 0000000..c0b9e69
--- /dev/null
+++ b/src/pages/expSystem/backstage/sourceType.vue
@@ -0,0 +1,180 @@
+<template>
+  <div>
+    <div>
+      <org-tree :data="orgList"
+                default-expand-all
+                ref="tree"
+                node-key="id"
+                highlight-current
+                :expand-on-click-node="false"
+                @node-click="getSingle"
+                :props="{children: 'children', label: 'categoryName', isLeaf: 'leaf'}">
+        <span class="custom-tree-node"
+              slot-scope="{ node, data }">
+          <span style="display: inline-block; margin-right: 20px">{{ node.label }}</span>
+          <span>
+            <el-button v-if="node.level > 1"
+                       type="text"
+                       icon="el-icon-edit-outline"
+                       @click="editType(data)">
+            </el-button>
+            <el-button type="text"
+                       icon="el-icon-circle-plus-outline"
+                       @click="addType(node, data)">
+            </el-button>
+            <el-button v-if="node.level > 1"
+                       type="text"
+                       icon="el-icon-delete"
+                       @click="delType(data)">
+            </el-button>
+          </span>
+        </span>
+      </org-tree>
+    </div>
+
+    <el-dialog :title="Form.id ? '编辑分类' : '新增分类'"
+               :visible.sync="typeVisible"
+               width="24%"
+               center
+               @close="closeDia"
+               :close-on-click-modal="false">
+      <el-form ref="Form"
+               :model="Form"
+               :rules="rules">
+        <el-form-item prop="categoryName">
+          <el-input placeholder="请输入分类名称"
+                    v-model="Form.categoryName"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="typeVisible = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="submit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import OrgTree from "@/components/org-tree/src/tree";
+export default {
+  props: ["Data"],
+  data () {
+    return {
+      systemId: this.$route.query.systemId,
+      orgList: [],
+      typeVisible: false,
+      Form: {
+        id: '',
+        parentId: '',
+        categoryName: '',
+        level: ''
+      },
+      rules: {
+        categoryName: [
+          { required: true, message: "请输入分类名称", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  components: {
+    OrgTree
+  },
+  mounted () {
+    this.getType()
+  },
+  methods: {
+    getType () {
+      this.$post(`${this.api.schoolModelClassification}?systemId=${this.systemId}&type=1`).then(res => {
+        const { data } = res
+        this.orgList = data
+        data.length && this.$nextTick(() => {
+          const categoryId = this.$route.query.categoryId
+          this.$refs.tree.setCurrentKey(categoryId || data[0].id)
+          this.$router.push({
+            path: 'backstage',
+            query: {
+              ...this.$route.query,
+              categoryId: this.$refs.tree.getCurrentKey()
+            }
+          }).catch(err => { })
+          this.$emit('getData')
+        })
+      }).catch(res => { })
+    },
+    getSingle () {
+      this.$router.push({
+        path: 'backstage',
+        query: {
+          ...this.$route.query,
+          categoryId: this.$refs.tree.getCurrentKey()
+        }
+      }).catch(err => { })
+      this.$emit('initData')
+    },
+    // 添加分类
+    addType (node, data) {
+      this.typeVisible = true
+      this.Form.parentId = data ? data.id : 0
+      this.Form.level = node ? node.level : 0
+    },
+    // 编辑分类
+    editType (data) {
+      this.Form.id = data.id
+      this.Form.parentId = data ? data.parentId : 0
+      this.Form.categoryName = data.categoryName
+      this.typeVisible = true
+    },
+    // 保存分类
+    submit () {
+      this.$refs['Form'].validate((valid) => {
+        if (valid) {
+          const form = this.Form
+          const data = {
+            id: form.id,
+            parentId: form.parentId,
+            categoryName: form.categoryName,
+            systemId: this.systemId
+          }
+          if (data.id) {
+            this.$post(this.api.updateSourceModelCategory, data).then(res => {
+              this.$message.success("编辑成功")
+              this.typeVisible = false
+              this.getType()
+            }).catch(res => { })
+          } else {
+            data.level = form.level
+            this.$post(this.api.categorySave, data).then(res => {
+              this.$message.success("添加成功")
+              this.typeVisible = false
+              this.getType()
+            }).catch(res => { })
+          }
+        }
+      })
+    },
+    closeDia () {
+      this.$refs.Form.resetFields()
+      this.Form = {
+        id: '',
+        parentId: '',
+        categoryName: ''
+      }
+    },
+    // 删除分类
+    delType (item) {
+      this.$confirm("确定要删除分类吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$post(`${this.api.deleteSourceModelCategory}?categoryId=${item.id}`).then(res => {
+          this.$message.success("删除成功")
+          this.$emit('initData')
+          this.getType()
+        }).catch(res => { })
+      }).catch(() => { })
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+</style>
diff --git a/src/pages/expSystem/list/index.vue b/src/pages/expSystem/list/index.vue
new file mode 100644
index 0000000..9150499
--- /dev/null
+++ b/src/pages/expSystem/list/index.vue
@@ -0,0 +1,169 @@
+<template>
+  <div>
+    <div class="page">
+      <h6 class="p-title">筛选</h6>
+      <div class="tool mul">
+        <ul class="filter">
+          <li>
+            <label>系统类型</label>
+            <el-select v-model="systemType"
+                       clearable
+                       placeholder="请选择系统类型"
+                       @change="initData">
+              <el-option v-for="(item,index) in systemTypeList"
+                         :key="index"
+                         :label="item.label"
+                         :value="item.value"></el-option>
+            </el-select>
+          </li>
+          <li>
+            <el-input placeholder="请输入系统名称"
+                      prefix-icon="el-icon-search"
+                      v-model.trim="systemSearch"
+                      clearable></el-input>
+          </li>
+        </ul>
+      </div>
+
+      <el-table :data="systemData"
+                class="table"
+                stripe
+                header-align="center">
+        <el-table-column type="index"
+                         width="100"
+                         label="序号"
+                         align="center">
+        </el-table-column>
+        <el-table-column prop="systemName"
+                         label="系统名称"
+                         align="center"></el-table-column>
+        <el-table-column prop="type"
+                         label="系统类型"
+                         align="center">
+          <template slot-scope="scope">
+            {{ systemTypeKeys[scope.row.type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="state"
+                         label="系统状态"
+                         align="center">
+          <template slot-scope="scope">
+            {{ systemStatusKeys[scope.row.state] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="payamount"
+                         label="系统后台"
+                         align="center">
+          <template slot-scope="scope">
+            <el-button type="text"
+                       @click="toBackstage(scope.row)"
+                       v-if="scope.row.systemId !== '11'"
+                       v-auth="'/configure:系统后台进入'">进入</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination background
+                       @current-change="handleCurrentChange"
+                       layout="total, prev, pager, next"
+                       :total="totals">
+        </el-pagination>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import Setting from "@/setting";
+export default {
+  data () {
+    return {
+      systemAttribution: "",
+      systemType: "",
+      systemSearch: "",
+      searchTimer: null,
+      systemData: [{}],
+      totals: 0,
+      systemBelongKeys: {
+        1: '外部产品',
+        0: '内部系统'
+      },
+      systemTypeList: [
+        {
+          label: "编程类",
+          value: 0
+        },
+        {
+          label: "流程类",
+          value: 1
+        }
+      ],
+      systemTypeKeys: {
+        0: '编程类',
+        1: '流程类'
+      },
+      systemStatusKeys: {
+        0: '运行中',
+        1: '默认'
+      },
+      pageNo: +this.$route.query.page || 1,
+      pageSize: 10
+    };
+  },
+  watch: {
+    systemSearch: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initData();
+      }, 500);
+    }
+  },
+  mounted () {
+    this.getData();
+  },
+  methods: {
+    initData () {
+      this.pageNum = 1;
+      this.getData();
+    },
+    getData () {
+      let data = {
+        belong: this.systemAttribution,
+        type: this.systemType,
+        systemName: this.systemSearch,
+        pageNum: this.pageNo,
+        pageSize: this.pageSize,
+        supplierId: ''
+      };
+      this.$post(this.api.getAllService, data).then(res => {
+        this.systemData = res.serviceList.records;
+        this.totals = res.serviceList.total;
+      }).catch(res => {
+      });
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val;
+      this.$router.push(`list?page=${val}`)
+      this.getData();
+    },
+    edit (row) {
+      this.$router.push('configure');
+    },
+    // 进入系统后台
+    toBackstage (row) {
+      this.$router.push(`backstage?systemId=${row.systemId}&show=1&name=${row.systemName}`)
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.card {
+    min-height: calc(100vh - 300px);
+}
+.mag {
+    margin-right: 20px;
+}
+</style>
+
diff --git a/src/pages/match/manage/matchArch.vue b/src/pages/match/manage/matchArch.vue
index 542ab20..a47f9ba 100644
--- a/src/pages/match/manage/matchArch.vue
+++ b/src/pages/match/manage/matchArch.vue
@@ -1,108 +1,114 @@
 <template>
-    <!-- 报名人员 -->
-    <div class="page-content" style="padding: 24px">
-      <el-collapse v-model="curStep">
-        <el-collapse-item v-for="(item, i) in list" :key="i" :title="item.stageName" :name="item.stageId">
-          <div class="line">
-            <span>比赛方式：{{ item.methodName }}</span>
-            <span>比赛形式：{{ item.competitionType ? '团队赛' : '个人赛' }}</span>
-            <span>赛制：{{ item.ruleName }}</span>
-            <span>状态：{{ item.status }}</span>
-            <span>竞赛起止时间：{{ item.startTime + ' ~ ' + item.endTime }}</span>
-            <div>
-              <el-button type="primary" @click="toRank(item, i)">排名</el-button>
-              <el-button @click="toArch(item)">成绩管理</el-button>
-            </div>
+  <!-- 报名人员 -->
+  <div class="page-content"
+       style="padding: 24px">
+    <el-collapse v-if="list.length"
+                 v-model="curStep">
+      <el-collapse-item v-for="(item, i) in list"
+                        :key="i"
+                        :title="item.stageName"
+                        :name="item.stageId">
+        <div class="line">
+          <span>比赛方式：{{ item.methodName }}</span>
+          <span>比赛形式：{{ item.competitionType ? '团队赛' : '个人赛' }}</span>
+          <span>赛制：{{ item.ruleName }}</span>
+          <span>状态：{{ item.status }}</span>
+          <span>竞赛起止时间：{{ item.startTime + ' ~ ' + item.endTime }}</span>
+          <div>
+            <el-button type="primary"
+                       @click="toRank(item, i)">排名</el-button>
+            <el-button @click="toArch(item)">成绩管理</el-button>
           </div>
-        </el-collapse-item>
-      </el-collapse>
-    </div>
+        </div>
+      </el-collapse-item>
+    </el-collapse>
+  </div>
 </template>
 
 <script>
 import util from "@/libs/util";
 import Const from '@/const/match'
 export default {
-    name: "matchArch",
-    data() {
-        return {
-          id: +this.$route.query.id,
-          list: [],
-          form: {},
-          timer: null,
-          curStep: []
-        };
+  name: "matchArch",
+  data () {
+    return {
+      id: +this.$route.query.id,
+      list: [],
+      form: {},
+      timer: null,
+      curStep: []
+    };
+  },
+  mounted () {
+    this.$once('hook:beforeDestroy', function () {
+      clearInterval(this.timer)
+    })
+    this.getData()
+  },
+  methods: {
+    getData () {
+      this.$post(`${this.api.getCompetition}?competitionId=${this.id}`).then(({ competition }) => {
+        this.form = competition
+        this.timer = setInterval(this.handleStatus, 1000)
+        this.getArch()
+      }).catch(err => { })
     },
-    mounted() {
-      this.$once('hook:beforeDestroy', function() {
-        clearInterval(this.timer)
-      })
-      this.getData()
+    getArch () {
+      this.$post(this.api.detailsOfCompetitionStage, {
+        pageNum: 1,
+        pageSize: 100,
+        contestId: this.id,
+      }).then(({ page }) => {
+        const list = page.records
+        list.map(e => {
+          e.methodName = Const.methods.find(n => n.id === e.method).name
+          e.ruleName = Const.rules.find(n => n.id === e.rule).name
+        })
+        this.curStep = list.map(e => e.stageId)
+        this.list = list
+      }).catch(res => { });
     },
-    methods: {
-      getData() {
-        this.$post(`${this.api.getCompetition}?competitionId=${this.id}`).then(({ competition }) => {
-          this.form = competition
-          this.timer = setInterval(this.handleStatus, 1000)
-          this.getArch()
-        }).catch(err => {})
-      },
-      getArch() {
-        this.$post(this.api.detailsOfCompetitionStage, {
-          pageNum: 1,
-          pageSize: 100,
-          contestId: this.id,
-        }).then(({ page }) => {
-          const list = page.records
-          list.map(e => {
-            e.methodName = Const.methods.find(n => n.id === e.method).name
-            e.ruleName = Const.rules.find(n => n.id === e.rule).name
-          })
-          this.curStep = list.map(e => e.stageId)
-          this.list = list
-        }).catch(res => {});
-      },
-      // 报名时间、比赛时间、状态处理
-      handleStatus() {
-        const now = new Date()
-        this.form.competitionStage.map(e => {
-          const startTime = new Date(e.startTime)
-          const endTime = new Date(e.endTime)
-          const item = this.list.find(n => n.stageId == e.stageId)
-          if (item) {
-            if (now < startTime) {
-              this.$set(item, 'status', '未开始')
-            } else if (now >= startTime && now <= endTime) {
-              this.$set(item, 'status', '比赛中')
-            } else if (now > endTime) {
-              this.$set(item, 'status', '已完成')
-            }
+    // 报名时间、比赛时间、状态处理
+    handleStatus () {
+      const now = new Date()
+      this.form.competitionStage.map(e => {
+        const startTime = new Date(e.startTime)
+        const endTime = new Date(e.endTime)
+        const item = this.list.find(n => n.stageId == e.stageId)
+        if (item) {
+          if (now < startTime) {
+            this.$set(item, 'status', '未开始')
+          } else if (now >= startTime && now <= endTime) {
+            this.$set(item, 'status', '比赛中')
+          } else if (now > endTime) {
+            this.$set(item, 'status', '已完成')
           }
-        })
-      },
-      // 排名
-      toRank(row, i) {
-        this.$router.push(`rank?id=${this.id}&stageId=${row.stageId}&index=${i}&method=${row.method}&competitionType=${row.competitionType}&rule=${row.rule}`)
-      },
-      // 成绩管理
-      toArch(row) {
-        this.$router.push(`archList?id=${this.id}&stageId=${row.stageId}&method=${row.method}&competitionType=${row.competitionType}`)
-      }
+        }
+      })
+    },
+    // 排名
+    toRank (row, i) {
+      this.$router.push(`rank?id=${this.id}&stageId=${row.stageId}&index=${i}&method=${row.method}&competitionType=${row.competitionType}&rule=${row.rule}`)
+    },
+    // 成绩管理
+    toArch (row) {
+      this.$router.push(`archList?id=${this.id}&stageId=${row.stageId}&method=${row.method}&competitionType=${row.competitionType}`)
     }
+  }
 };
 </script>
 
 <style lang="scss" scoped>
 /deep/.el-collapse-item__header {
-  font-size: 16px;
-  color: #333;
+    font-size: 16px;
+    color: #333;
 }
 .line {
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  span {
-    margin-right: 30px;
-  }
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    span {
+        margin-right: 30px;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/match/manage/matchRank.vue b/src/pages/match/manage/matchRank.vue
index eb8864c..8ecdb8c 100644
--- a/src/pages/match/manage/matchRank.vue
+++ b/src/pages/match/manage/matchRank.vue
@@ -1,149 +1,245 @@
 <template>
-    <div>
-        <el-card shadow="hover" class="m-b-20 head-card">
-            <div class="flex-between m-b-20">
-                <el-page-header v-if="grades.length" @back="$router.back()" :content="grades[index].stageName + '/排名'"></el-page-header>
-            </div>
+  <div>
+    <el-card shadow="hover"
+             class="m-b-20 head-card">
+      <div class="flex-between m-b-20">
+        <el-page-header v-if="grades.length"
+                        @back="$router.back()"
+                        :content="grades[index].stageName + '/排名'"></el-page-header>
+      </div>
 
-        </el-card>
+    </el-card>
 
-        <el-card shadow="hover" class="m-b-20">
-            <div class="tabs">
-              <template v-for="(item, i) in grades">
-                <a v-if="i === index || !item.stageId" :key="i" class="item" :class="{active: item.stageId == active}" @click="tabChange(item.stageId)">{{ item.stageName }}排名</a>
-              </template>
-            </div>
-            <div class="flex-between" style="margin: 20px 0">
-                <div style="display: inline-flex;align-items: center">
-                  <el-radio v-model="type" :label="0" @change="typeChange">默认系统排序</el-radio>
-                  <el-radio v-model="type" :label="1" @change="typeChange">手动上传</el-radio>
-                  <el-button type="primary" :disabled="type === 0" class="ml20" @click="batchImport">上传文件</el-button>
-                </div>
-                <div>
-                  <!-- <el-button v-if="(type && uploadData.length) || (!type && !published) || (!type && sourceType == 1)" type="primary" @click="cancelPublish(1)">发布排名</el-button> -->
-                  <el-button v-if="!published" type="primary" @click="cancelPublish(1)">发布排名</el-button>
-                  <el-button v-else type="primary" @click="cancelPublish(0)">取消发布</el-button>
-                </div>
-            </div>
-            <el-table :data="list" class="table" ref="table" stripe header-align="center">
-                <el-table-column type="index" width="60" label="排名" align="center">
-                    <template slot-scope="scope">
-                        {{ scope.$index + (page - 1) * pageSize + 1 }}
-                    </template>
-                </el-table-column>
-                <template v-if="competitionType == 1">
-                  <el-table-column prop="teamName" label="团队名称" min-width="150" align="center"></el-table-column>
-                  <el-table-column prop="leaderName" label="队长" min-width="150" align="center"></el-table-column>
-                </template>
-                <el-table-column v-else prop="userName" label="学生姓名" min-width="100" align="center"></el-table-column>
-                <el-table-column prop="schoolName" label="学校" min-width="100" 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="score" label="分数" width="90" align="center"></el-table-column>
-                <el-table-column label="得分详情" align="center" width="160">
-                    <template slot-scope="scope">
-                        <el-button v-if="(!competitionType && scope.row.reportId) || competitionType" type="text" @click="show(scope.row, scope.$index)">查看</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>
-        </el-card>
-        
-        <el-dialog title="团队得分详情" :visible.sync="teamVisible" width="900px" :close-on-click-modal="false">
-          <h6 v-if="active" style="margin-bottom: 10px;font-size: 16px;">团队名称：{{ curRow.teamName }}  阶段名称：{{ stageName }}</h6>
-          <table class="table tc">
-            <tr>
-              <template v-if="!active">
-                <th width="100">阶段</th>
-                <th width="100">团队成绩</th>
-              </template>
-              <th width="60">序号</th>
-              <th width="100">姓名</th>
-              <th width="100">学校</th>
-              <th width="100">用时</th>
-              <th width="100">分数</th>
-              <th width="100">得分详情</th>
-            </tr>
-            <template v-if="teams.length">
-              <tr v-for="(item, i) in teams" :key="i">
-                <template v-if="!active && item.rowspan">
-                  <td :rowspan="item.rowspan">{{ item.stageName }}</td>
-                  <td class="scores" :rowspan="item.rowspan">
-                    <p class="score">{{ item.teamScore }}</p>
-                    <p>{{ item.teamCalculationMethodName }}</p>
-                    <p>权重：</p>
-                    <p>{{ item.pointWeight }}%</p>
-                  </td>
-                </template>
-                <template v-if="item.accountId">
-                  <td>{{ i + 1 }}</td>
-                  <td>{{ item.userName }}</td>
-                  <td>{{ item.schoolName }}</td>
-                  <td>{{ item.timeSum }}min</td>
-                  <td>{{ item.score }}</td>
-                  <td>
-                    <el-button v-if="item.reportId" type="text" @click="toReport(item)">查看</el-button>
-                  </td>
-                </template>
-                <td v-else colspan="6"></td>
-              </tr>
+    <el-card shadow="hover"
+             class="m-b-20">
+      <div class="tabs">
+        <template v-for="(item, i) in grades">
+          <a v-if="i === index || !item.stageId"
+             :key="i"
+             class="item"
+             :class="{active: item.stageId == active}"
+             @click="tabChange(item.stageId)">{{ item.stageName }}排名</a>
+        </template>
+      </div>
+      <div class="flex-between"
+           style="margin: 20px 0">
+        <div style="display: inline-flex;align-items: center">
+          <el-radio v-model="type"
+                    :label="0"
+                    @change="typeChange">默认系统排序</el-radio>
+          <el-radio v-model="type"
+                    :label="1"
+                    @change="typeChange">手动上传</el-radio>
+          <el-button type="primary"
+                     :disabled="type === 0"
+                     class="ml20"
+                     @click="batchImport">上传文件</el-button>
+        </div>
+        <div>
+          <!-- <el-button v-if="(type && uploadData.length) || (!type && !published) || (!type && sourceType == 1)" type="primary" @click="cancelPublish(1)">发布排名</el-button> -->
+          <el-button v-if="!published"
+                     type="primary"
+                     @click="cancelPublish(1)">发布排名</el-button>
+          <el-button v-else
+                     type="primary"
+                     @click="cancelPublish(0)">取消发布</el-button>
+        </div>
+      </div>
+      <el-table :data="list"
+                class="table"
+                ref="table"
+                stripe
+                header-align="center">
+        <el-table-column type="index"
+                         width="60"
+                         label="排名"
+                         align="center">
+          <template slot-scope="scope">
+            {{ scope.$index + (page - 1) * pageSize + 1 }}
+          </template>
+        </el-table-column>
+        <template v-if="competitionType == 1">
+          <el-table-column prop="teamName"
+                           label="团队名称"
+                           min-width="150"
+                           align="center"></el-table-column>
+          <el-table-column prop="leaderName"
+                           label="队长"
+                           min-width="150"
+                           align="center"></el-table-column>
+        </template>
+        <el-table-column v-else
+                         prop="userName"
+                         label="学生姓名"
+                         min-width="100"
+                         align="center"></el-table-column>
+        <el-table-column prop="schoolName"
+                         label="学校"
+                         min-width="100"
+                         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="score"
+                         label="分数"
+                         width="90"
+                         align="center"></el-table-column>
+        <el-table-column label="得分详情"
+                         align="center"
+                         width="160">
+          <template slot-scope="scope">
+            <el-button v-if="(!competitionType && scope.row.reportId) || competitionType"
+                       type="text"
+                       @click="show(scope.row, scope.$index)">查看</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>
+    </el-card>
+
+    <el-dialog title="团队得分详情"
+               :visible.sync="teamVisible"
+               width="900px"
+               :close-on-click-modal="false">
+      <h6 v-if="active"
+          style="margin-bottom: 10px;font-size: 16px;">团队名称：{{ curRow.teamName }} 阶段名称：{{ stageName }}</h6>
+      <table class="table tc">
+        <tr>
+          <template v-if="!active">
+            <th width="100">阶段</th>
+            <th width="100">团队成绩</th>
+          </template>
+          <th width="60">序号</th>
+          <th width="100">姓名</th>
+          <th width="100">学校</th>
+          <th width="100">用时</th>
+          <th width="100">分数</th>
+          <th width="100">得分详情</th>
+        </tr>
+        <template v-if="teams.length">
+          <tr v-for="(item, i) in teams"
+              :key="i">
+            <template v-if="!active && item.rowspan">
+              <td :rowspan="item.rowspan">{{ item.stageName }}</td>
+              <td class="scores"
+                  :rowspan="item.rowspan">
+                <p class="score">{{ item.teamScore }}</p>
+                <p>{{ item.teamCalculationMethodName }}</p>
+                <p>权重：</p>
+                <p>{{ item.pointWeight }}%</p>
+              </td>
+            </template>
+            <template v-if="item.accountId">
+              <td>{{ i + 1 }}</td>
+              <td>{{ item.userName }}</td>
+              <td>{{ item.schoolName }}</td>
+              <td>{{ item.timeSum }}min</td>
+              <td>{{ item.score }}</td>
+              <td>
+                <el-button v-if="item.reportId"
+                           type="text"
+                           @click="toReport(item)">查看</el-button>
+              </td>
             </template>
-            <tr v-else>
-              <td colspan="99">暂无数据</td>
-            </tr>
-            <tr v-if="!active && teams.length">
-              <td>综合得分</td>
-              <td>{{ curRow.score }}</td>
-              <td colspan="6">总排名：第{{ curRow.index }}名</td>
-            </tr>
-          </table>
-          <span slot="footer" class="dialog-footer">
-            <el-button size="small" type="primary" @click="teamVisible = false">确定</el-button>
-          </span>
-        </el-dialog>
-        
-        <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="upload"
-                    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.batchImportRanking"
-                    :file-list="uploadList"
-                    :headers="headers"
-                    :data="{
+            <td v-else
+                colspan="6"></td>
+          </tr>
+        </template>
+        <tr v-else>
+          <td colspan="99">暂无数据</td>
+        </tr>
+        <tr v-if="!active && teams.length">
+          <td>综合得分</td>
+          <td>{{ curRow.score }}</td>
+          <td colspan="6">总排名：第{{ curRow.index }}名</td>
+        </tr>
+      </table>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="small"
+                   type="primary"
+                   @click="teamVisible = false">确定</el-button>
+      </span>
+    </el-dialog>
+
+    <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="upload"
+                   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.batchImportRanking"
+                   :file-list="uploadList"
+                   :headers="headers"
+                   :data="{
                       competitionId: this.id,
                       stageId: this.stageId,
                       isOverallRanking: active ? 0 : 1,
                       schoolId: this.$store.state.user.schoolId
                     }"
-                    :auto-upload="false"
-                >
-                    <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>
+                   :auto-upload="false">
+          <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>
+
+    <el-dialog title="请选择发布排名时间"
+               :visible.sync="publishVisible"
+               width="260px"
+               :close-on-click-modal="false"
+               custom-class="publish-dia">
+      <el-date-picker popper-class="no-atTheMoment"
+                      v-model="publishTime"
+                      placeholder="请选择结束时间"
+                      type="datetime"
+                      :picker-options="pickerOptions">
+      </el-date-picker>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="small"
+                   @click="publishVisible = false">取 消</el-button>
+        <el-button size="small"
+                   type="primary"
+                   @click="publishSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -152,448 +248,471 @@ import util from "@/libs/util";
 import echarts from "echarts";
 import axios from 'axios';
 export default {
-    data() {
-        return {
-            id: +this.$route.query.id,
-            stageId: +this.$route.query.stageId,
-            index: +this.$route.query.index,
-            method: this.$route.query.method,
-            competitionType: +this.$route.query.competitionType,
-            rule: +this.$route.query.rule,
-            teamCalculationMethods: [
-              {
-                id: 0,
-                name: '最高分'
-              },
-              {
-                id: 1,
-                name: '平均分'
-              },
-              {
-                id: 2,
-                name: '求和'
-              }
-            ],
-            headers: {
-                token: util.local.get(Setting.tokenKey)
-            },
-            active: '',
-            grades: [],
-            list: [],
-            page: 1,
-            pageSize: 10,
-            total: 0,
-            type: 0,
-            teamVisible: false,
-            teams: [],
-            memberVisible: false,
-            members: [],
-            importVisible: false,
-            uploadList: [],
-            uploadFaild: false,
-            exportCode: '',
-            curRow: {},
-            stageName: '',
-            totalScore: 0,
-            published: false,
-            uploadData: [],
-            sourceType: ''
-        };
-    },
-    mounted() {
-        this.getStage()
-    },
-    methods: {
-        // 获排名
-        getData() {
-          // 查询是否已经发布排名
-          // this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}`).then(({ whetherToPublish }) => {
-          //   const ids = this.grades.map(e => e.stageId)
-          //   ids.pop()
-          //   // 如果已发布，查询发布上一次排名的来源——>默认顺序或者手动发布(返回数据:是否手动发布(1为是,0不是))
-          //   whetherToPublish && this.$post(`${this.api.queryPublicationSource}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}`).then(({ source }) => {
-          //     this.sourceType = source
-          //     this.type = source == 1 ? 1 : 0
-          //   }).catch(res => {})
-          //   this.published = whetherToPublish
-          //   this.getRank(whetherToPublish)
-          // }).catch(res => {})
+  data () {
+    return {
+      id: +this.$route.query.id,
+      stageId: +this.$route.query.stageId,
+      index: +this.$route.query.index,
+      method: this.$route.query.method,
+      competitionType: +this.$route.query.competitionType,
+      rule: +this.$route.query.rule,
+      teamCalculationMethods: [
+        {
+          id: 0,
+          name: '最高分'
+        },
+        {
+          id: 1,
+          name: '平均分'
+        },
+        {
+          id: 2,
+          name: '求和'
+        }
+      ],
+      headers: {
+        token: util.local.get(Setting.tokenKey)
+      },
+      active: '',
+      grades: [],
+      list: [],
+      page: 1,
+      pageSize: 10,
+      total: 0,
+      type: 0,
+      teamVisible: false,
+      teams: [],
+      memberVisible: false,
+      members: [],
+      importVisible: false,
+      uploadList: [],
+      uploadFaild: false,
+      exportCode: '',
+      curRow: {},
+      stageName: '',
+      totalScore: 0,
+      published: false,
+      uploadData: [],
+      sourceType: '',
+      publishVisible: false,
+      publishTime: '',
+      pickerOptions: {
+        // 控制过往日期不可选
+        disabledDate (time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+        // 控制过往时间不可选
+        selectableRange: (() => {
+          let data = new Date();
+          let hour = data.getHours();
+          let minute = data.getMinutes();
+          let second = data.getSeconds();
+          return [`${hour}:${minute}:${second} - 23:59:59`]
+        })(),
+      }
+    };
+  },
+  mounted () {
+    this.getStage()
+  },
+  methods: {
+    // 获排名
+    getData () {
+      // 查询是否已经发布排名
+      // this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}`).then(({ whetherToPublish }) => {
+      //   const ids = this.grades.map(e => e.stageId)
+      //   ids.pop()
+      //   // 如果已发布，查询发布上一次排名的来源——>默认顺序或者手动发布(返回数据:是否手动发布(1为是,0不是))
+      //   whetherToPublish && this.$post(`${this.api.queryPublicationSource}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}`).then(({ source }) => {
+      //     this.sourceType = source
+      //     this.type = source == 1 ? 1 : 0
+      //   }).catch(res => {})
+      //   this.published = whetherToPublish
+      //   this.getRank(whetherToPublish)
+      // }).catch(res => {})
 
 
 
-          // this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&publicationType=${this.type}`).then(({ whetherToPublish }) => {
-          //   const ids = this.grades.map(e => e.stageId)
-          //   ids.pop()
-          //   // 如果已发布，查询发布上一次排名的来源——>默认顺序或者手动发布(返回数据:是否手动发布(1为是,0不是))
-          //   whetherToPublish ?
-          //     this.$post(`${this.api.selectTheLastSortStatus}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}`).then(({ source }) => {
-          //     this.sourceType = source
-          //     this.type = source == 1 ? 1 : 0
-          //     this.getRank(whetherToPublish)
-          //   }).catch(res => {}) :
-          //     this.getRank()
-          //   this.published = whetherToPublish
-          // }).catch(res => {})
+      // this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&publicationType=${this.type}`).then(({ whetherToPublish }) => {
+      //   const ids = this.grades.map(e => e.stageId)
+      //   ids.pop()
+      //   // 如果已发布，查询发布上一次排名的来源——>默认顺序或者手动发布(返回数据:是否手动发布(1为是,0不是))
+      //   whetherToPublish ?
+      //     this.$post(`${this.api.selectTheLastSortStatus}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}`).then(({ source }) => {
+      //     this.sourceType = source
+      //     this.type = source == 1 ? 1 : 0
+      //     this.getRank(whetherToPublish)
+      //   }).catch(res => {}) :
+      //     this.getRank()
+      //   this.published = whetherToPublish
+      // }).catch(res => {})
 
-          this.$post(`${this.api.selectTheLastSortStatus}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}`).then(({ source }) => {
-            this.sourceType = source
-            this.type = source == 1 ? 1 : 0
-            this.getRank()
-          }).catch(res => {})
-        },
-        // 查询排名
-        getRank() {
-          // 手动上传的排名接口
-          if (this.type) {
-            this.$post(this.api.manuallyUploadedRankings, {
-              pageNum: this.page,
-              pageSize: this.pageSize,
-              competitionId: this.id,
-              isOverallRanking: this.active ? 0 : 1,
-              stageId: this.active || this.stageId
-            }).then(({ message, publishStatus }) => {
-              // isRelease 0未发布，1已发布
-              this.published = publishStatus
-              this.sourceType = message.total ? message.records[0].isRelease : 0
-              this.list = message.records
-              this.total = message.total
-            }).catch(res => {})
-          } else { // 默认排名接口
-            if (!this.active) {
-              // 总分排名
-              const ids = this.grades.map(e => e.stageId)
-              this.$post(this.api.overallStandingsInThePointsRace, {
-                pageNum: this.page,
-                pageSize: this.pageSize,
-                competitionId: this.id,
-                publicationType: this.type,
-                locationStageId: this.stageId,
-                stageIds: ids.splice(0, ids.length - 1)
-              }).then(({ page, publishStatus }) => {
-                this.published = publishStatus
-                this.list = page
-                this.total = total
-              }).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.published = publishStatus
-                this.list = page
-                this.total = total
-              }).catch(res => {})
+      this.$post(`${this.api.selectTheLastSortStatus}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}`).then(({ source }) => {
+        this.sourceType = source
+        this.type = source == 1 ? 1 : 0
+        this.getRank()
+      }).catch(res => { })
+    },
+    // 查询排名
+    getRank () {
+      // 手动上传的排名接口
+      if (this.type) {
+        this.$post(this.api.manuallyUploadedRankings, {
+          pageNum: this.page,
+          pageSize: this.pageSize,
+          competitionId: this.id,
+          isOverallRanking: this.active ? 0 : 1,
+          stageId: this.active || this.stageId
+        }).then(({ message, publishStatus }) => {
+          // isRelease 0未发布，1已发布
+          this.published = publishStatus
+          this.sourceType = message.total ? message.records[0].isRelease : 0
+          this.list = message.records
+          this.total = message.total
+        }).catch(res => { })
+      } else { // 默认排名接口
+        if (!this.active) {
+          // 总分排名
+          const ids = this.grades.map(e => e.stageId)
+          this.$post(this.api.overallStandingsInThePointsRace, {
+            pageNum: this.page,
+            pageSize: this.pageSize,
+            competitionId: this.id,
+            publicationType: this.type,
+            locationStageId: this.stageId,
+            stageIds: ids.splice(0, ids.length - 1)
+          }).then(({ page, publishStatus }) => {
+            this.published = publishStatus
+            this.list = page
+            this.total = total
+          }).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.published = publishStatus
+            this.list = page
+            this.total = total
+          }).catch(res => { })
+        }
+      }
+    },
+    // 获取阶段
+    getStage () {
+      this.$post(this.api.detailsOfCompetitionStage, {
+        pageNum: 1,
+        pageSize: 100,
+        contestId: this.id,
+      }).then(({ page }) => {
+        this.grades = page.records.slice(0, this.index + 1)
+        this.active = this.grades[this.index].stageId
+        // 积分赛才显示总分
+        this.rule == 0 && this.grades.push({
+          stageId: 0,
+          stageName: '总分'
+        })
+        this.getData()
+      }).catch(res => { });
+    },
+    // 排序类型切换回调
+    typeChange (val) {
+      this.$post(`${this.api.toggleTheSortingMode}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&whetherToManuallyPublish=${this.type}`).then(res => { }).catch(res => { })
+
+
+      // this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&publicationType=${this.type}`).then(({ whetherToPublish }) => {
+      // if (whetherToPublish && !val) this.sourceType = '0'
+      this.getRank()
+      // this.published = whetherToPublish
+      // }).catch(res => {})
+    },
+    initData () {
+      this.page = 1
+      this.getData()
+    },
+    // tab回调
+    tabChange (i) {
+      this.type = 0
+      this.active = i
+      this.initData()
+    },
+    // 查看详情
+    show (row, i) {
+      this.teams = []
+      // 个人：跳转实验报告，团队：弹框显示成员列表
+      if (this.competitionType == 1) {
+        row.index = i + 1
+        this.curRow = row
+        this.teamVisible = true
+        this.stageName = this.grades.find(e => e.stageId == this.active).stageName
+        const data = {
+          pageNum: 1,
+          pageSize: 100,
+          competitionId: this.id,
+          teamId: row.teamId
+        }
+        // 阶段传当前阶段的id，总分传所有阶段的id
+        if (this.active) {
+          data.stageId = this.active
+          this.$post(this.api.stageTeamScoreDetails, data).then(({ page }) => {
+            this.teams = page.records
+          }).catch(res => { })
+        } else {
+          const ids = this.grades.map(e => e.stageId)
+          ids.pop()
+          data.stageIds = ids.splice(0, this.index + 1)
+          // 发布跟没发布调不同的接口
+          // if (this.published) {
+          this.$post(this.api.totalRankingScoreDetails, data).then(({ data }) => {
+            if (data.length) {
+              const result = []
+              // 合并数据
+              data.map(e => {
+                const team = e.stageTeamInformation
+                if (team.length) {
+                  const teamCItem = this.teamCalculationMethods.find(n => n.id == e.teamCalculationMethod)
+                  if (teamCItem) team[0].teamCalculationMethodName = teamCItem.name
+                  team[0].rowspan = team.length
+                  team.map(n => {
+                    n = Object.assign(n, e)
+                  })
+                  result.push(...team)
+                } else {
+                  e.rowspan = 1
+                  result.push(e)
+                }
+              })
+              this.teams = result
             }
-          }
-        },
-        // 获取阶段
-        getStage() {
-          this.$post(this.api.detailsOfCompetitionStage, {
-            pageNum: 1,
-            pageSize: 100,
-            contestId: this.id,
-          }).then(({ page }) => {
-            this.grades = page.records.slice(0, this.index + 1)
-            this.active = this.grades[this.index].stageId
-            // 积分赛才显示总分
-            this.rule == 0 && this.grades.push({
-              stageId: 0,
-              stageName: '总分'
-            })
-            this.getData()
-          }).catch(res => {});
-        },
-        // 排序类型切换回调
-        typeChange(val) {
-          this.$post(`${this.api.toggleTheSortingMode}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&whetherToManuallyPublish=${this.type}`).then(res => {}).catch(res => {})
-          
+          }).catch(res => { })
+          // } else { // 没发布
+          //   this.$post(this.api.totalRankingScoreDetails, data).then(({ page }) => {
+          //     const list = page.records
+          // page.records.map((e, i) => {
+          //   if (!list.find(n => n.stageId == e.stageId && n.rowspan)) {
+          //     e.rowspan = list.filter(n => n.stageId == e.stageId).length
+          //     this.$post(this.api.stageTeamScoreDetails, {
+          //       pageNum: 1,
+          //       pageSize: 100,
+          //       competitionId: this.id,
+          //       teamId: row.teamId,
+          //       stageId: e.stageId
+          //     }).then(({ page }) => {
+
+          //     }).catch(res => {})
+          //   }
+          // })
+          //   let totalScore = 0
+          //   this.totalScore = totalScore
+          //   this.teams = list
+          //   console.log("🚀 ~ file: matchRank.vue:346 ~ this.$post ~ list", list)
 
-          // this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&publicationType=${this.type}`).then(({ whetherToPublish }) => {
-            // if (whetherToPublish && !val) this.sourceType = '0'
-            this.getRank()
-            // this.published = whetherToPublish
           // }).catch(res => {})
-        },
-        initData() {
-          this.page = 1
-          this.getData()
-        },
-        // tab回调
-        tabChange(i) {
-          this.type = 0
-          this.active = i
-          this.initData()
-        },
-        // 查看详情
-        show(row, i) {
-          this.teams = []
-          // 个人：跳转实验报告，团队：弹框显示成员列表
-          if (this.competitionType == 1) {
-            row.index = i + 1
-            this.curRow = row
-            this.teamVisible = true
-            this.stageName = this.grades.find(e => e.stageId == this.active).stageName
-            const data = {
-              pageNum: 1,
-              pageSize: 100,
-              competitionId: this.id,
-              teamId: row.teamId
-            }
-            // 阶段传当前阶段的id，总分传所有阶段的id
-            if (this.active) {
-              data.stageId = this.active
-              this.$post(this.api.stageTeamScoreDetails, data).then(({ page }) => {
-                this.teams = page.records
-              }).catch(res => {})
-            } else {
-              const ids = this.grades.map(e => e.stageId)
-              ids.pop()
-              data.stageIds = ids.splice(0, this.index + 1)
-              // 发布跟没发布调不同的接口
-              // if (this.published) {
-                this.$post(this.api.totalRankingScoreDetails, data).then(({ data }) => {
-                  if (data.length) {
-                    const result = []
-                    // 合并数据
-                    data.map(e => {
-                      const team = e.stageTeamInformation
-                      if (team.length) {
-                        const teamCItem = this.teamCalculationMethods.find(n => n.id == e.teamCalculationMethod)
-                        if (teamCItem) team[0].teamCalculationMethodName = teamCItem.name
-                        team[0].rowspan = team.length
-                        team.map(n => {
-                          n = Object.assign(n, e)
-                        })
-                        result.push(...team)
-                      } else {
-                        e.rowspan = 1
-                        result.push(e)
-                      }
-                    })
-                    this.teams = result
-                  }
-                }).catch(res => {})
-              // } else { // 没发布
-              //   this.$post(this.api.totalRankingScoreDetails, data).then(({ page }) => {
-              //     const list = page.records
-                  // page.records.map((e, i) => {
-                  //   if (!list.find(n => n.stageId == e.stageId && n.rowspan)) {
-                  //     e.rowspan = list.filter(n => n.stageId == e.stageId).length
-                  //     this.$post(this.api.stageTeamScoreDetails, {
-                  //       pageNum: 1,
-                  //       pageSize: 100,
-                  //       competitionId: this.id,
-                  //       teamId: row.teamId,
-                  //       stageId: e.stageId
-                  //     }).then(({ page }) => {
-                        
-                  //     }).catch(res => {})
-                  //   }
-                  // })
-                //   let totalScore = 0
-                //   this.totalScore = totalScore
-                //   this.teams = list
-                //   console.log("🚀 ~ file: matchRank.vue:346 ~ this.$post ~ list", list)
+          // }
 
-                // }).catch(res => {})
-              // }
-              
-            }
-          } else {
-            this.toReport(row)
-          }
-        },
-        // 跳转实验报告
-        toReport(row) {
-          this.$router.push(`/match/report?reportId=${row.reportId}`)
-        },
-        handleCurrentChange(val) { // 切换分页
-            this.page = val;
-            this.getData();
-        },
-        // 发布排名
-        publishSubmit() {
-          const { startTime, endTime } = this.grades[this.index]
-          if (Date.now() <= new Date(endTime)) return util.errorMsg('当前阶段还在进行中,请在本阶段结束后再发布!')
-          if (this.type) { // 手动发布
-            this.$post(this.api.batchRelease, this.list.map(e => e.id)).then(res => {
-              this.getData()
-              util.successMsg('发布成功！')
-            }).catch(res => {})
-          } else {
-            let data = [] // 手动上传后发布排名，数据直接取批量上传后返回的data
-            if (!this.type) { // 默认排序
-              // 处理默认排序的数据
-              const { list, id } = this
-              const isOverall = this.active ? 0 : 1
-              if (list.length) {
-                const isPerson = this.competitionType == 0
-                list.map(e => {
-                  e.competitionId = id
-                  e.isOverallRanking = isOverall
-                  e.stageId = this.stageId
-                  // if (isOverall) delete e.stageId
-                  if (isPerson) e.teamId = null // 个人赛则teamId传null
-                })
-                data = list
-              }
-            }
-            data.forEach(e => {
-              e.publicationType = this.type
+        }
+      } else {
+        this.toReport(row)
+      }
+    },
+    // 跳转实验报告
+    toReport (row) {
+      this.$router.push(`/match/report?reportId=${row.reportId}`)
+    },
+    handleCurrentChange (val) { // 切换分页
+      this.page = val;
+      this.getData();
+    },
+    // 发布排名
+    publishSubmit () {
+      const { startTime, endTime } = this.grades[this.index]
+      if (Date.now() <= new Date(endTime)) return util.errorMsg('当前阶段还在进行中,请在本阶段结束后再发布!')
+      if (this.type) { // 手动发布
+        this.$post(this.api.batchRelease, this.list.map(e => e.id)).then(res => {
+          this.getData()
+          util.successMsg('发布成功！')
+        }).catch(res => { })
+      } else {
+        let data = [] // 手动上传后发布排名，数据直接取批量上传后返回的data
+        if (!this.type) { // 默认排序
+          // 处理默认排序的数据
+          const { list, id } = this
+          const isOverall = this.active ? 0 : 1
+          if (list.length) {
+            const isPerson = this.competitionType == 0
+            list.map(e => {
+              e.competitionId = id
+              e.isOverallRanking = isOverall
+              e.stageId = this.stageId
+              // if (isOverall) delete e.stageId
+              if (isPerson) e.teamId = null // 个人赛则teamId传null
             })
-            const ids = this.grades.map(e => e.stageId)
-            ids.pop()
-            // 发布前校验
-            // this.$post(`${this.api.releaseVerification}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&whetherToManuallyPublish=${this.type}`).then(res => {
-              this.$post(this.api.publishRanking, data).then(res => {
-                this.uploadData = []
-                this.getData()
-                util.successMsg('发布成功！')
-              }).catch(res => {})
-            // }).catch(res => {})
+            data = list
           }
-        },
-        // 发布排名确认
-        publish() {
-          // 如果已发布，并且上次发布的类型跟这次发布的类型不一致，则要提示确认
-          // if (this.published && this.sourceType != this.type) {
-          //   this.$confirm(this.sourceType == 1 && !this.type ?
-          //     '手动排名已发布，是否要取消手动排名的内容，改为系统排名的内容？' :
-          //     '默认系统排名已发布，是否要取消系统排名的内容，改为手动发布的内容？', '提示', {
-          //     type: 'success'
-          //   }).then(() => {
-          //     this.publishSubmit()
-          //   }).catch(() => {})
-          // } else {
-          //   this.publishSubmit()
-          // }
+        }
+        data.forEach(e => {
+          e.publicationType = this.type
+        })
+        const ids = this.grades.map(e => e.stageId)
+        ids.pop()
+        // 发布前校验
+        // this.$post(`${this.api.releaseVerification}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&whetherToManuallyPublish=${this.type}`).then(res => {
+        this.$post(this.api.publishRanking, data).then(res => {
+          this.uploadData = []
+          this.getData()
+          util.successMsg('发布成功！')
+        }).catch(res => { })
+        // }).catch(res => {})
+      }
+    },
+    // 发布排名确认
+    publish () {
+      // 如果已发布，并且上次发布的类型跟这次发布的类型不一致，则要提示确认
+      // if (this.published && this.sourceType != this.type) {
+      //   this.$confirm(this.sourceType == 1 && !this.type ?
+      //     '手动排名已发布，是否要取消手动排名的内容，改为系统排名的内容？' :
+      //     '默认系统排名已发布，是否要取消系统排名的内容，改为手动发布的内容？', '提示', {
+      //     type: 'success'
+      //   }).then(() => {
+      //     this.publishSubmit()
+      //   }).catch(() => {})
+      // } else {
+      //   this.publishSubmit()
+      // }
 
-          this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&publicationType=${this.type}`).then(({ whetherToPublish }) => {
-            whetherToPublish ?
-              this.$confirm('排名已经发布，是否直接覆盖？', '提示', {
-                type: 'success'
-              }).then(() => {
-                this.publishSubmit()
-              }).catch(() => {}) :
-              this.publishSubmit()
-          }).catch(res => {})
-          // this.publishSubmit()
-        },
-        // 取消发布排名
-        cancelPublish(publish) {
-          const ids = this.grades.map(e => e.stageId)
-          const stageIds = ids.splice(0, ids.length - 1)
-          const query = []
-          stageIds.map(e => {
-            query.push('stageIds=' + e)
-          })
-          // 如果是发布排名，则先删除已发布的排名，再调发布排名的接口
-          // 如果是取消发布，则直接调取消发布的接口
-          if (publish) {
-            // this.type ?
-              this.publish()
-            //   this.$post(this.api.deleteLastPublication, {
-            //   competitionId: this.id,
-            //   isOverallRanking: this.active ? 0 : 1,
-            //   stageIds: this.active ? [this.active] : stageIds
-            // }).then(res => {
-            //   this.publish()
-            // }).catch(res => {})
-          } else {
-            this.$post(`${this.api.cancelRanking}?competitionId=${this.id}&isOverallRanking=${this.active ? 0 : 1}&${this.active ? 'stageIds=' + this.active : query.join('&')}`).then(res => {
-              this.sourceType = ''
-              this.type = 0
-              this.getData()
-              util.successMsg('取消发布成功！')
-            }).catch(res => {})
-          }
-        },
-        // 批量导入
-        batchImport() {
-          this.importVisible = true
-          this.uploadList = []
-          this.uploadFaild = false
-        },
-        // 模板下载
-        download() {
-          location.href = this.api[this.competitionType == 1 ? 'rankImportTeam' : 'rankImportPerson']
-        },
-        // 上传文件
-        handleExceed(files, fileList) {
-          util.warningMsg(
-            `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`
-          )
-        },
-        // 下载失败文件
-        showFaild() {
-          axios.get(`${this.api.rankExportFailure}?exportCode=${this.exportCode}&competitionId=${this.id}`, {
-            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) {
-            const { exportCode } = res.data
-            if (exportCode) {
-              this.exportCode = exportCode
-              this.uploadFaild = true
-              util.errorMsg(`本次上传有${res.data.failureNum}个错误信息录入`)
-            } else {
-              this.importVisible = false
-              this.getRank()
-              util.successMsg('请检查数据后，点击发布排名以发布数据！')
-            }
-          } else {
-            util.errorMsg(res.message || "上传失败，请检查数据")
-          }
-        },
-        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.list.length ?
-            this.$post(this.api.cancelImport, this.list.map(e => e.id)).then(res => {
-              this.$refs.upload.submit()
-            }).catch(res => {}) :
-            this.$refs.upload.submit()
+      this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&publicationType=${this.type}`).then(({ whetherToPublish }) => {
+        whetherToPublish ?
+          this.$confirm('排名已经发布，是否直接覆盖？', '提示', {
+            type: 'success'
+          }).then(() => {
+            this.publishSubmit()
+          }).catch(() => { }) :
+          this.publishSubmit()
+      }).catch(res => { })
+      // this.publishSubmit()
+    },
+    // 定时发布排名
+    publishSubmit () {
+
+    },
+    // 取消发布排名
+    cancelPublish (publish) {
+      const ids = this.grades.map(e => e.stageId)
+      const stageIds = ids.splice(0, ids.length - 1)
+      const query = []
+      stageIds.map(e => {
+        query.push('stageIds=' + e)
+      })
+      // 如果是发布排名，则先删除已发布的排名，再调发布排名的接口
+      // 如果是取消发布，则直接调取消发布的接口
+      if (publish) {
+        // this.type ?
+        // this.publish()
+        this.publishTime = new Date()
+        this.publishVisible = true
+        //   this.$post(this.api.deleteLastPublication, {
+        //   competitionId: this.id,
+        //   isOverallRanking: this.active ? 0 : 1,
+        //   stageIds: this.active ? [this.active] : stageIds
+        // }).then(res => {
+        //   this.publish()
+        // }).catch(res => {})
+      } else {
+        this.$post(`${this.api.cancelRanking}?competitionId=${this.id}&isOverallRanking=${this.active ? 0 : 1}&${this.active ? 'stageIds=' + this.active : query.join('&')}`).then(res => {
+          this.sourceType = ''
+          this.type = 0
+          this.getData()
+          util.successMsg('取消发布成功！')
+        }).catch(res => { })
+      }
+    },
+    // 批量导入
+    batchImport () {
+      this.importVisible = true
+      this.uploadList = []
+      this.uploadFaild = false
+    },
+    // 模板下载
+    download () {
+      location.href = this.api[this.competitionType == 1 ? 'rankImportTeam' : 'rankImportPerson']
+    },
+    // 上传文件
+    handleExceed (files, fileList) {
+      util.warningMsg(
+        `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`
+      )
+    },
+    // 下载失败文件
+    showFaild () {
+      axios.get(`${this.api.rankExportFailure}?exportCode=${this.exportCode}&competitionId=${this.id}`, {
+        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) {
+        const { exportCode } = res.data
+        if (exportCode) {
+          this.exportCode = exportCode
+          this.uploadFaild = true
+          util.errorMsg(`本次上传有${res.data.failureNum}个错误信息录入`)
+        } else {
+          this.importVisible = false
+          this.getRank()
+          util.successMsg('请检查数据后，点击发布排名以发布数据！')
         }
-    }
+      } else {
+        util.errorMsg(res.message || "上传失败，请检查数据")
+      }
+    },
+    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.list.length ?
+        this.$post(this.api.cancelImport, this.list.map(e => e.id)).then(res => {
+          this.$refs.upload.submit()
+        }).catch(res => { }) :
+        this.$refs.upload.submit()
+    },
+  }
 };
 </script>
 
 <style lang="scss" scoped>
 .table {
-  width: 100%;
-  border-collapse: collapse;
-  th, td {
-    padding: 12px;
-    border: 1px solid #ebeef5;
-  }
-  &.tc {
-    text-align: center;
-  }
-  th {
-    text-align: center;
-    background-color: #f8faff;
-  }
-  .scores {
-    line-height: 1.6;
-  }
-  .score {
-    font-size: 16px;
-    font-weight: 600;
-    color: #9076FF;
-  }
+    width: 100%;
+    border-collapse: collapse;
+    th,
+    td {
+        padding: 12px;
+        border: 1px solid #ebeef5;
+    }
+    &.tc {
+        text-align: center;
+    }
+    th {
+        text-align: center;
+        background-color: #f8faff;
+    }
+    .scores {
+        line-height: 1.6;
+    }
+    .score {
+        font-size: 16px;
+        font-weight: 600;
+        color: #9076ff;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/product/list/index.vue b/src/pages/product/list/index.vue
index 7aea694..4fa5b09 100644
--- a/src/pages/product/list/index.vue
+++ b/src/pages/product/list/index.vue
@@ -163,7 +163,7 @@ export default {
   data () {
     const that = this
     return {
-      carouselHeight: '350px',
+      carouselHeight: '533px',
       banners: [],
       timer: null,
       curTab: '',
@@ -304,7 +304,7 @@ export default {
     }
   },
   mounted () {
-    this.carouselHeight = parseInt(window.innerWidth / 5.48) + 'px'
+    this.carouselHeight = parseInt(window.innerWidth / 3.6) + 'px'
     this.getBanner()
     this.getSubject()
     this.getLabel()
diff --git a/src/pages/product/show/index.vue b/src/pages/product/show/index.vue
index 2207c0c..81730d2 100644
--- a/src/pages/product/show/index.vue
+++ b/src/pages/product/show/index.vue
@@ -9,15 +9,22 @@
     </el-card>
     <div class="inner">
       <div class="top">
-        <div v-if="form.interfaceDiagrams && height"
-             class="pics"
-             :style="{height: form.interfaceDiagrams.length === 1 ? height: 'auto'}">
-          <el-image class="pic"
-                    v-for="(pic, i) in form.interfaceDiagrams"
-                    :key="i"
-                    :src="pic"
-                    :preview-src-list="form.interfaceDiagrams">
+        <div class="pics"
+             v-if="form.mall.coverDrawing">
+          <el-image :class="['cover', {full: !form.interfaceDiagrams}]"
+                    :src="form.mall.coverDrawing"
+                    :preview-src-list="form.pics">
           </el-image>
+          <div v-if="form.interfaceDiagrams"
+               class="interface">
+            <div class="pic"
+                 v-for="(pic, i) in form.interfaceDiagrams"
+                 :key="i">
+              <el-image :src="pic"
+                        :preview-src-list="form.pics">
+              </el-image>
+            </div>
+          </div>
         </div>
         <div class="right"
              id="fields">
@@ -184,7 +191,9 @@ export default {
       ],
       form: {
         classificationIds: [],
-        mall: {},
+        mall: {
+          coverDrawing: ''
+        },
         goodsRes: {}
       },
       chapterList: [],
@@ -229,9 +238,12 @@ export default {
     getData () {
       this.$get(`${this.api.detailsOfGoods}?mallId=${this.id}`).then(res => {
         const e = res.orderDetails
-        // 图片展示封面+界面图
-        e.interfaceDiagrams = [e.mall.coverDrawing]
-        if (e.mall.interfaceDiagram) e.interfaceDiagrams.push(...e.mall.interfaceDiagram.split(',').slice(0, 3))
+        e.pics = [e.mall.coverDrawing]
+        if (e.mall.interfaceDiagram) {
+          const pics = e.mall.interfaceDiagram.split(',').slice(0, 3)
+          e.pics.push(...pics)
+          e.interfaceDiagrams = pics
+        }
         this.form = e
         this.chapterList = ''
         e.mall.associatedProduct && this.getChapter()
@@ -316,7 +328,7 @@ export default {
 .wrap {
     background: #f3f6fa;
     .inner {
-        width: 1154px;
+        width: 1146px;
         margin: 0 auto;
     }
     .top {
@@ -325,31 +337,37 @@ export default {
         background-color: #fff;
         border-radius: 10px;
         .pics {
-            width: 436px;
-            margin-right: 24px;
+            display: flex;
+            flex-wrap: wrap;
+            width: 502px;
+            margin-right: 20px;
+            .cover {
+                width: 370px;
+                height: 278px;
+                margin-right: 10px;
+                border-radius: 8px;
+                overflow: hidden;
+                &.full {
+                    width: 100%;
+                }
+            }
             .pic {
-                width: 140px;
-                height: 62px;
-                margin-right: 8px;
+                width: 114px;
+                height: 86px;
+                margin-bottom: 10px;
                 border-radius: 8px;
-                &:first-child {
+                overflow: hidden;
+                .el-image {
                     width: 100%;
-                    height: 192px;
-                    margin-bottom: 12px;
+                    height: 100%;
                 }
                 &:last-child {
-                    margin-right: 0;
-                }
-                &:only-child {
-                    // max-height: 266px;
-                    // height: auto;
-                    height: 100%;
-                    margin: 0;
+                    margin-bottom: 0;
                 }
             }
         }
         .right {
-            width: 646px;
+            width: 592px;
             overflow: hidden;
         }
         h6 {
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index ec1d3c5..2cfa48e 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -176,6 +176,7 @@
               </el-form-item>
             </el-form>
             <div class="text-right">
+              <el-button @click="showNoteAdd = false">取消</el-button>
               <el-button type="primary"
                          @click="submitNote">保存</el-button>
             </div>
@@ -875,7 +876,7 @@ $height: 700px;
             margin-right: 10px;
         }
         &:hover {
-            background-color: #528adf;
+            background-color: #ac89fd;
         }
         &.active {
             background-color: $main-color;
@@ -911,7 +912,6 @@ $height: 700px;
 }
 .list {
     height: calc(700px - 70px);
-    overflow-y: auto;
     padding: 24px 16px;
     background: #fff;
     .title {
@@ -966,7 +966,7 @@ $height: 700px;
     }
     .chapters {
         margin-top: 16px;
-        max-height: calc(100% - 53px);
+        max-height: calc(100% - 138px);
         overflow: auto;
     }
     .chapter {
diff --git a/src/router/modules/expSystem.js b/src/router/modules/expSystem.js
new file mode 100644
index 0000000..c353664
--- /dev/null
+++ b/src/router/modules/expSystem.js
@@ -0,0 +1,35 @@
+import BasicLayout from "@/layouts/home";
+
+const meta = {};
+
+const pre = "expSystem-";
+
+export default {
+    path: "/expSystem",
+    name: "expSystem",
+    redirect: {
+        name: `${pre}list`
+    },
+    meta,
+    component: BasicLayout,
+    children: [
+        {
+            name: `${pre}list`,
+            path: `list`,
+            component: () => import("@/pages/expSystem/list"),
+            meta: { title: "实验系统管理" }
+        },
+        {
+            name: `${pre}backstage`,
+            path: `backstage`,
+            component: () => import("@/pages/expSystem/backstage"),
+            meta: { title: "系统后台" }
+        },
+        {
+            name: `${pre}addModel`,
+            path: `addModel`,
+            component: () => import("@/pages/expSystem/backstage/addModel"),
+            meta: { title: "新增源模型" }
+        }
+    ]
+};
diff --git a/src/setting.js b/src/setting.js
index ca7de8c..5690282 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -26,7 +26,7 @@ if (isPro) {
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 中台测试服
     // host = 'https://www.occupationlab.com/' // 正式服
-    // host = "http://192.168.31.151:9000/"; // 榕
+    host = "http://192.168.31.152:9000/"; // 榕
     // host = 'http://192.168.31.52:9000/'; // 赓
 }
 
@@ -87,7 +87,7 @@ const Setting = {
     // 相同路由，不同参数间进行切换，是否强力更新
     sameRouteForceUpdate: false,
     // 是否使用动态路由(即角色权限,开启了的话就会取后端返回的权限树来显示头部导肮和页面按钮)
-    dynamicRoute: true,
+    dynamicRoute: false,
     // 文件上传
     upload: {
         apiURL: uploadURL,