diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 86c5017..e2a0c61 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -174,6 +174,7 @@ export default {
     // 前往评论列表
     async toComment (item) {
       await this.$post(`${this.api.noticeRead}?isRead=1&notifyId=${item.notifyId}`) // 该通知置为已读
+      this.getNotice()
       this.$router.push(`/station/preview?courseId=${item.cid}&commentId=${item.commentId}&notifyId=${item.notifyId}`)
     },
     getUserDetail () { // 获取用户详情
diff --git a/src/pages/achievement/teach/index.vue b/src/pages/achievement/teach/index.vue
index 94e2361..99b422b 100644
--- a/src/pages/achievement/teach/index.vue
+++ b/src/pages/achievement/teach/index.vue
@@ -546,6 +546,7 @@ export default {
     // 错误率统计图
     errorChart () {
       const data = this.errorAnalysis.scoringPointList
+      const maxFontLength = data.length > 13 ? 6 : 10
       const option = {
         tooltip: {
           trigger: 'axis',
@@ -580,7 +581,7 @@ export default {
               color: '#333',
             },
             formatter: function (value, index) {
-              value = value.substring(0, 10) + (value.length > 10 ? '...' : '')
+              value = value.substring(0, maxFontLength) + (value.length > maxFontLength ? '...' : '')
               // if (index % 2 != 0) {
               //   return '\n\n' + value;
               // } else {
diff --git a/src/pages/assessment/add/index.vue b/src/pages/assessment/add/index.vue
index 8f85195..ad70a69 100644
--- a/src/pages/assessment/add/index.vue
+++ b/src/pages/assessment/add/index.vue
@@ -1,79 +1,95 @@
 <template>
-    <div>
-        <el-form :disabled="isDetail">
-            <el-card shadow="hover" class="m-b-20">
-                <div class="flex-between">
-                    <el-page-header @back="goBack" :content="isDetail ? '查看' : (form.id ? '更新' : '创建') + '教学实验'"></el-page-header>
-                    <div>
-                        <el-button type="primary" @click="save(0)" v-show="!isDetail">{{ form.id ? "更新" : "创建" }}</el-button>
-                    </div>
-                </div>
-            </el-card>
+  <div>
+    <el-form :disabled="isDetail">
+      <el-card shadow="hover"
+               class="m-b-20">
+        <div class="flex-between">
+          <el-page-header @back="goBack"
+                          :content="isDetail ? '查看' : (form.id ? '更新' : '创建') + '教学实验'"></el-page-header>
+          <div>
+            <el-button type="primary"
+                       @click="save(0)"
+                       v-show="!isDetail">{{ form.id ? "更新" : "创建" }}</el-button>
+          </div>
+        </div>
+      </el-card>
 
-            <el-card shadow="hover" class="mgr20 m-b-20">
-                <div>
-                    <p class="m-b-20">考核名称</p>
-                    <el-input
-                        placeholder="请输入考核名称"
-                        v-model.trim="form.experimentalName"
-                        clearable
-                        maxlength="15"
-                        class="inline-input"
-                    ></el-input>
-                </div>
-            </el-card>
+      <el-card shadow="hover"
+               class="mgr20 m-b-20">
+        <div>
+          <p class="m-b-20">考核名称</p>
+          <el-input placeholder="请输入考核名称"
+                    v-model.trim="form.experimentalName"
+                    clearable
+                    maxlength="15"
+                    class="inline-input"></el-input>
+        </div>
+      </el-card>
 
-            <el-card shadow="hover" class="m-b-20">
-                <div>
-                    <p class="m-b-20">发布方式</p>
-                    <el-radio-group v-model="form.type" :disabled="form.id ? true : false">
-                        <el-radio :label="1">手动发布</el-radio>
-                        <el-radio :label="2">定时发布</el-radio>
-                    </el-radio-group>
-                </div>
-            </el-card>
-            <!-- 根据发布方式判断时间的显示 -->
-            <el-card shadow="hover" class="m-b-20">
-                <div>
-                    <p class="m-b-20">实验时间</p>
-                    <!-- 手动发布显示 -->
-                    <div class="date-inputs" v-if="form.type==1">
-                        实验时长：
-                        <el-input type="number" min="0" v-model.trim="duration.day" placeholder></el-input>
-                        天
-                        <el-input type="number" min="0" v-model.trim="duration.hour" placeholder></el-input>
-                        小时
-                        <el-input type="number" min="0" v-model.trim="duration.minute" placeholder></el-input>
-                        分
-                    </div>
-                    <!-- 定时发布显示 -->
-                    <div v-if="form.type==2" class="addAssess">
-                        <span class="mgr10">开始时间:</span>
-                        <el-date-picker
-                            size="small"
+      <el-card shadow="hover"
+               class="m-b-20">
+        <div>
+          <p class="m-b-20">发布方式</p>
+          <el-radio-group v-model="form.type"
+                          :disabled="form.id ? true : false">
+            <el-radio :label="1">手动发布</el-radio>
+            <el-radio :label="2">定时发布</el-radio>
+          </el-radio-group>
+        </div>
+      </el-card>
+      <!-- 根据发布方式判断时间的显示 -->
+      <el-card shadow="hover"
+               class="m-b-20">
+        <div>
+          <p class="m-b-20">实验时间</p>
+          <!-- 手动发布显示 -->
+          <div class="date-inputs"
+               v-if="form.type==1">
+            实验时长：
+            <el-input type="number"
+                      min="0"
+                      v-model.trim="duration.day"
+                      placeholder></el-input>
+            天
+            <el-input type="number"
+                      min="0"
+                      v-model.trim="duration.hour"
+                      placeholder></el-input>
+            小时
+            <el-input type="number"
+                      min="0"
+                      v-model.trim="duration.minute"
+                      placeholder></el-input>
+            分
+          </div>
+          <!-- 定时发布显示 -->
+          <div v-if="form.type==2"
+               class="addAssess">
+            <span class="mgr10">开始时间:</span>
+            <el-date-picker size="small"
                             v-model="date"
                             type="datetimerange"
                             range-separator="-"
                             start-placeholder="开始日期"
                             end-placeholder="结束日期"
-                            :picker-options="pickerOptions"
-                        ></el-date-picker>
-                    </div>
-                </div>
-            </el-card>
-            <el-card shadow="hover" class="mgr20 m-b-20">
-                <div>
-                    <p class="m-b-20">课程</p>
-                    <div class="inline-input">
-                        <el-select v-model="form.curriculumId" @change="initData">
-                            <el-option
-                                v-for="item in curriculumList"
-                                :key="item.cid"
-                                :label="item.curriculumName"
-                                :value="item.cid">
-                            </el-option>
-                        </el-select>
-                        <!-- <el-select v-model="form.curriculumId" @change="initData">
+                            :picker-options="pickerOptions"></el-date-picker>
+          </div>
+        </div>
+      </el-card>
+      <el-card shadow="hover"
+               class="mgr20 m-b-20">
+        <div>
+          <p class="m-b-20">课程</p>
+          <div class="inline-input">
+            <el-select v-model="form.mallId"
+                       @change="initData">
+              <el-option v-for="item in curriculumList"
+                         :key="item.mallId"
+                         :label="item.curriculumName"
+                         :value="item.mallId">
+              </el-option>
+            </el-select>
+            <!-- <el-select v-model="form.curriculumId" @change="initData">
                             <el-option
                                 v-for="item in systemList"
                                 :key="item.id"
@@ -81,530 +97,548 @@
                                 :value="item.id">
                             </el-option>
                         </el-select> -->
-                    </div>
-                </div>
-            </el-card>
-            <!-- 实训项目模块 -->
-            <el-card shadow="hover" class="m-b-20">
-                <div class="flex-between m-b-20">
-                    <span>实训项目</span>
-                    <div style="display: inline-flex;">
-                        <div>
-                            <el-input placeholder="请输入项目名称" prefix-icon="el-icon-search" v-model.trim="keyword" clearable></el-input>
-                        </div>
-                        <el-button style="margin-left: 5px" type="primary" round @click="toProject">自定义实验项目</el-button>
-                    </div>
-                </div>
-                <!-- 实训项目表格 -->
-                <el-table :data="projectData" class="table" stripe header-align="center">
-                    <!-- 单选实训项目ID -->
-                    <el-table-column width="60" label="选择" align="center">
-                        <template slot-scope="scope">
-                            <el-radio v-model="form.projectId" :label="scope.row.projectId">&nbsp;</el-radio>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
-                    <el-table-column prop="auth" label="项目权限" align="center">
-                        <template slot-scope="scope">
-                            {{ permissionsKeys[scope.row.permissions] }}
-                        </template>
-                    </el-table-column>
-                    <!-- <el-table-column prop="createUser" label="创建人" align="center"></el-table-column> -->
-                    <el-table-column prop="founder" label="创建人" align="center">
-                        <template slot-scope="scope">
-                            {{ scope.row.createUser }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
-                    <el-table-column label="操作" align="center">
-                        <template slot-scope="scope">
-                            <el-button type="text" @click="showProject(scope.row)">查看</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <div class="pagination">
-                    <el-pagination
-                        background
-                        :page-size="pageSize"
-                        @current-change="handleCurrentChange"
-                        layout="total,prev, pager, next"
-                        :total="total"
-                    ></el-pagination>
-                </div>
-            </el-card>
-            <el-card shadow="hover" class="mgr20 m-b-20">
-                <div>
-                    <p class="m-b-20">考核发布</p>
-                    <el-radio-group v-model="form.isSpecify">
-                        <el-radio :label="1">指定范围</el-radio>
-                        <el-radio :label="0">无指定范围</el-radio>
-                    </el-radio-group>
-                </div>
-                <div v-show="form.isSpecify == 1" style="padding-top: 24px;">
-                    <p class="m-b-20">班级名称</p>
-                    <el-input
-                        placeholder="请输入班级名称"
-                        v-model.trim="filterClassName"
-                        class="inline-input m-b-20"
-                        clearable>
-                        <el-button slot="append" icon="el-icon-search"></el-button>
-                    </el-input>
-                    <div v-show="tagList.length" class="m-b-20">
-                        <el-tag
-                            v-for="(tag, index) in tagList"
-                            :key="index"
-                            closable
-                            @close="handleCloseTag(tag)"
-                            style="margin-right: 10px">
-                            {{ tag.organizationName }}
-                        </el-tag>
-                    </div>
-                    <div class="tree-con">
-                        <student-tree
-                            ref="tree"
-                            node-key="id"
-                            show-checkbox
-                            highlight-current
-                            default-expand-all
-                            lazy
-                            :load="loadTree"
-                            :default-checked-keys="defaultCheckedKeys"
-                            :props="{children: 'children', label: 'organizationName', isLeaf: 'leaf'}"
-                            :filter-node-method="filterNode"
-                            @check="handleCheck">
-                        </student-tree>
-                    </div>
-                </div>
-            </el-card>
-            <!-- 邀请码 -->
-            <el-card v-if="form.isSpecify == 0" shadow="hover" class="m-b-20">
-                <div style="margin-bottom: 10px">
-                    <p class="m-b-20">设置邀请码</p>
-                    <el-radio-group v-model="form.isEnableCode">
-                        <el-radio :label="1">是</el-radio>
-                        <el-radio :label="0">否</el-radio>
-                    </el-radio-group>
-                </div>
-                <div v-if="form.isEnableCode == 1">
-                    <el-input style="display: inline-block;width: auto;margin-right: 10px" type="number" v-model.trim="form.invitationCode" maxlength="6" placeholder="请设置6个数字"></el-input>
-                    <el-button type="text" @click="createInv">随机</el-button>
-                </div>
-            </el-card>
-        </el-form>
-    </div>
+          </div>
+        </div>
+      </el-card>
+      <!-- 实训项目模块 -->
+      <el-card shadow="hover"
+               class="m-b-20">
+        <div class="flex-between m-b-20">
+          <span>实训项目</span>
+          <div style="display: inline-flex;">
+            <div>
+              <el-input placeholder="请输入项目名称"
+                        prefix-icon="el-icon-search"
+                        v-model.trim="keyword"
+                        clearable></el-input>
+            </div>
+            <el-button style="margin-left: 5px"
+                       type="primary"
+                       round
+                       @click="toProject">自定义实验项目</el-button>
+          </div>
+        </div>
+        <!-- 实训项目表格 -->
+        <el-table :data="projectData"
+                  class="table"
+                  stripe
+                  header-align="center">
+          <!-- 单选实训项目ID -->
+          <el-table-column width="60"
+                           label="选择"
+                           align="center">
+            <template slot-scope="scope">
+              <el-radio v-model="form.projectId"
+                        :label="scope.row.projectId">&nbsp;</el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column prop="projectName"
+                           label="项目名称"
+                           align="center"></el-table-column>
+          <el-table-column prop="auth"
+                           label="项目权限"
+                           align="center">
+            <template slot-scope="scope">
+              {{ permissionsKeys[scope.row.permissions] }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column prop="createUser" label="创建人" align="center"></el-table-column> -->
+          <el-table-column prop="founder"
+                           label="创建人"
+                           align="center">
+            <template slot-scope="scope">
+              {{ scope.row.createUser }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="createTime"
+                           label="创建时间"
+                           align="center"></el-table-column>
+          <el-table-column label="操作"
+                           align="center">
+            <template slot-scope="scope">
+              <el-button type="text"
+                         @click="showProject(scope.row)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pagination">
+          <el-pagination background
+                         :page-size="pageSize"
+                         @current-change="handleCurrentChange"
+                         layout="total,prev, pager, next"
+                         :total="total"></el-pagination>
+        </div>
+      </el-card>
+      <el-card shadow="hover"
+               class="mgr20 m-b-20">
+        <div>
+          <p class="m-b-20">考核发布</p>
+          <el-radio-group v-model="form.isSpecify">
+            <el-radio :label="1">指定范围</el-radio>
+            <el-radio :label="0">无指定范围</el-radio>
+          </el-radio-group>
+        </div>
+        <div v-show="form.isSpecify == 1"
+             style="padding-top: 24px;">
+          <p class="m-b-20">班级名称</p>
+          <el-input placeholder="请输入班级名称"
+                    v-model.trim="filterClassName"
+                    class="inline-input m-b-20"
+                    clearable>
+            <el-button slot="append"
+                       icon="el-icon-search"></el-button>
+          </el-input>
+          <div v-show="tagList.length"
+               class="m-b-20">
+            <el-tag v-for="(tag, index) in tagList"
+                    :key="index"
+                    closable
+                    @close="handleCloseTag(tag)"
+                    style="margin-right: 10px">
+              {{ tag.organizationName }}
+            </el-tag>
+          </div>
+          <div class="tree-con">
+            <student-tree ref="tree"
+                          node-key="id"
+                          show-checkbox
+                          highlight-current
+                          default-expand-all
+                          lazy
+                          :load="loadTree"
+                          :default-checked-keys="defaultCheckedKeys"
+                          :props="{children: 'children', label: 'organizationName', isLeaf: 'leaf'}"
+                          :filter-node-method="filterNode"
+                          @check="handleCheck">
+            </student-tree>
+          </div>
+        </div>
+      </el-card>
+      <!-- 邀请码 -->
+      <el-card v-if="form.isSpecify == 0"
+               shadow="hover"
+               class="m-b-20">
+        <div style="margin-bottom: 10px">
+          <p class="m-b-20">设置邀请码</p>
+          <el-radio-group v-model="form.isEnableCode">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
+        </div>
+        <div v-if="form.isEnableCode == 1">
+          <el-input style="display: inline-block;width: auto;margin-right: 10px"
+                    type="number"
+                    v-model.trim="form.invitationCode"
+                    maxlength="6"
+                    placeholder="请设置6个数字"></el-input>
+          <el-button type="text"
+                     @click="createInv">随机</el-button>
+        </div>
+      </el-card>
+    </el-form>
+  </div>
 </template>
 <script>
 import util from "@/libs/util";
 import { mapState, mapActions } from "vuex";
 import StudentTree from "@/components/student-tree/src/tree";
 export default {
-    components: { StudentTree },
-    data() {
-        return {
-            founderKeys: {
-                0: "系统",
-                1: "老师"
-            },
-            cidList: [],
-            permissionsKeys: {
-                0: "练习",
-                1: "考核",
-                2: "竞赛"
-            },
-            isDetail: Boolean(this.$route.query.show),
-            form: {
-                id: this.$route.query.id ? this.$route.query.id : "",
-                experimentalName: "",
-                type: 1, // 发布类型(1、手动发布 2、定时发布)
-                experimentDuration: "0d0h0m",
-                curriculumId: "",
-                projectId: "",
-                isSpecify: 1, // 考核发布(1、指定范围 0、无指定范围)
-                isEnableCode: 0, //是否设置邀请码
-                invitationCode: "",
-                status: 0, // 状态(0、待开始 1、进行中 2、已结束)
-                classId: "",
-                stuInfo: []
-            },
-            date: "", // 实验时间
-            duration: {
-                day: "",
-                hour: "",
-                minute: ""
-            }, // 实验时长
-            startTime: "0000-00-00 00:00:00", //开始时间
-            stopTime: "0000-00-00 00:00:00", //结束时间
-            expNameRepeat: false, // 考核名称是否重复
-            curriculumList: [], // 课程列表
-            filterClassName: "", // 班级名称搜索
-            tagList: [], // 班级名称标签
-            defaultCheckedKeys: [], // 默认选中
-            allCheckedNodes: [], // 当前选中和半选节点
-            keyword: "", // 项目名称搜索
-            searchTimer: null,
-            surplusTime: "",
-            projectDataAll: [],
-            projectData: [],
-            pickerOptions: {
-                disabledDate: time => {
-                    return time.getTime() < new Date().getTime() - 86400000;
-                }
-            },
-            page: 1,
-            pageSize: 5,
-            total: 0,
-            isToProject: false,
-            systemList: [],
-            submiting: false, // 新增编辑防抖标识
-            updateTime: 0
-        };
+  components: { StudentTree },
+  data () {
+    return {
+      founderKeys: {
+        0: "系统",
+        1: "老师"
+      },
+      cidList: [],
+      permissionsKeys: {
+        0: "练习",
+        1: "考核",
+        2: "竞赛"
+      },
+      isDetail: Boolean(this.$route.query.show),
+      form: {
+        id: this.$route.query.id ? this.$route.query.id : "",
+        experimentalName: "",
+        type: 1, // 发布类型(1、手动发布 2、定时发布)
+        experimentDuration: "0d0h0m",
+        curriculumId: "",
+        mallId: '',
+        projectId: "",
+        isSpecify: 1, // 考核发布(1、指定范围 0、无指定范围)
+        isEnableCode: 0, //是否设置邀请码
+        invitationCode: "",
+        status: 0, // 状态(0、待开始 1、进行中 2、已结束)
+        classId: "",
+        stuInfo: []
+      },
+      date: "", // 实验时间
+      duration: {
+        day: "",
+        hour: "",
+        minute: ""
+      }, // 实验时长
+      startTime: "0000-00-00 00:00:00", //开始时间
+      stopTime: "0000-00-00 00:00:00", //结束时间
+      expNameRepeat: false, // 考核名称是否重复
+      curriculumList: [], // 课程列表
+      filterClassName: "", // 班级名称搜索
+      tagList: [], // 班级名称标签
+      defaultCheckedKeys: [], // 默认选中
+      allCheckedNodes: [], // 当前选中和半选节点
+      keyword: "", // 项目名称搜索
+      searchTimer: null,
+      surplusTime: "",
+      projectDataAll: [],
+      projectData: [],
+      pickerOptions: {
+        disabledDate: time => {
+          return time.getTime() < new Date().getTime() - 86400000;
+        }
+      },
+      page: 1,
+      pageSize: 5,
+      total: 0,
+      isToProject: false,
+      systemList: [],
+      submiting: false, // 新增编辑防抖标识
+      updateTime: 0
+    };
+  },
+  computed: {
+    ...mapState("project", [
+      "assFields"
+    ])
+  },
+  // 离开的时候判断是否有保存更改的信息,没有则拦截并提示
+  beforeRouteLeave (to, from, next) {
+    if (!this.isToProject && this.updateTime) {
+      this.$confirm(`您所更改的内容未更新，是否更新？`, '提示', {
+        type: 'warning'
+      }).then(() => {
+        this.save(next)
+      }).catch(() => {
+        next()
+      })
+    } else {
+      next()
+    }
+  },
+  beforeDestroy () {
+    if (!this.isToProject) this.setAss({});
+  },
+  mounted () {
+    this.date = [util.formatDate("yyyy-MM-dd hh:mm:ss", new Date(new Date().getTime() + 300000)), util.formatDate("yyyy-MM-dd hh:mm:ss", new Date(new Date().getTime() + 300000))];
+    this.form.id && this.getData();
+    this.recoveryData();
+    this.getschoolCourse();
+  },
+  watch: {
+    // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+    form: {
+      handler (val) {
+        this.updateTime++
+      },
+      deep: true
     },
-    computed: {
-        ...mapState("project", [
-            "assFields"
-        ])
+    date: function (val) {
+      if (val[0] != "0000-00-00 00:00:00") {
+        this.startTime = util.formatDate("yyyy-MM-dd hh:mm:ss", new Date(val[0]));
+        this.stopTime = util.formatDate("yyyy-MM-dd hh:mm:ss", new Date(val[1]));
+        this.updateTime++
+      }
     },
-    // 离开的时候判断是否有保存更改的信息,没有则拦截并提示
-    beforeRouteLeave(to, from, next) {
-        if(!this.isToProject && this.updateTime){
-            this.$confirm(`您所更改的内容未更新，是否更新？`, '提示', {
-                type: 'warning'
-            }).then(() => {
-                this.save(next)
-            }).catch(() => {
-                next()
-            })
-        }else{
-            next()
-        }
+    duration: {
+      handler (n, o) {
+        this.form.experimentDuration = `${n.day ? n.day : 0}d${n.hour ? n.hour : 0}h${n.minute ? n.minute : 0}m`;
+        this.updateTime++
+      },
+      deep: true
     },
-    beforeDestroy() {
-        if (!this.isToProject) this.setAss({});
+    keyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initData();
+      }, 500);
     },
-    mounted() {
-        this.date = [util.formatDate("yyyy-MM-dd hh:mm:ss", new Date(new Date().getTime() + 300000)), util.formatDate("yyyy-MM-dd hh:mm:ss", new Date(new Date().getTime() + 300000))];
-        this.form.id && this.getData();
-        this.recoveryData();
-        this.getschoolCourse();
+    filterClassName (val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  methods: {
+    ...mapActions("project", [
+      "setAss"
+    ]),
+    handleCloseTag (tag) { // 关闭班级标签
+      this.allCheckedNodes = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+      let tagIndex = this.tagList.findIndex(i => i.id === tag.id);
+      this.tagList.splice(tagIndex, 1);
+      // 设置选中
+      let setKeys = [];
+      this.allCheckedNodes.forEach(i => {
+        if (i.level === 4 && i.parentId !== tag.id) setKeys.push(i.nodeKey);
+      });
+      this.$refs.tree.setCheckedKeys(setKeys);
+      this.allCheckedNodes = this.allCheckedNodes.filter(i => (i.level === 3 && i.id !== tag.id) || (i.level === 4 && i.parentId !== tag.id));
+    },
+    handleCheck (data, checked) { // 当复选框被点击的时候触发
+      // 全选和半选状态下的班级都显示在标签
+      let checkedClass = checked.checkedNodes.filter(i => i.level === 3);
+      let halfCheckedClass = checked.halfCheckedNodes.filter(i => i.level === 3);
+      this.tagList = [...checkedClass, ...halfCheckedClass].map(i => {
+        return { id: i.id, organizationName: i.organizationName };
+      });
+      // 缓存全选和半选状态下的所有节点
+      this.allCheckedNodes = [...checked.checkedNodes, ...checked.halfCheckedNodes];
     },
-    watch: {
-        // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
-        form: {
-          handler(val){
-            this.updateTime++
-          },
-          deep:true
-        },
-        date: function(val) {
-            if (val[0] != "0000-00-00 00:00:00") {
-                this.startTime = util.formatDate("yyyy-MM-dd hh:mm:ss", new Date(val[0]));
-                this.stopTime = util.formatDate("yyyy-MM-dd hh:mm:ss", new Date(val[1]));
-                this.updateTime++
-            }
-        },
-        duration: {
-            handler(n, o) {
-                this.form.experimentDuration = `${n.day ? n.day : 0}d${n.hour ? n.hour : 0}h${n.minute ? n.minute : 0}m`;
-                this.updateTime++
-            },
-            deep: true
-        },
-        keyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.initData();
-            }, 500);
-        },
-        filterClassName(val) {
-            this.$refs.tree.filter(val);
+    filterNode (value, data) { // 对树节点进行过滤
+      if (!value) return true;
+      return data.organizationName.indexOf(value) !== -1;
+    },
+    loadTree (node, resolve) { // 懒加载所在班级树结构
+      let level = 1;
+      let parentId = "";
+      if (node.level === 0) {
+        this.treeNode = node;
+        this.treeResolve = resolve;
+        this.getTreeData(resolve, level, parentId);
+      } else if (node.level > 3) {
+        return resolve([]);
+      } else {
+        if (node.data && node.data.level && node.data.id) {
+          this.getTreeData(resolve, node.data.level + 1, node.data.id);
         }
+      }
     },
-    methods: {
-        ...mapActions("project", [
-            "setAss"
-        ]),
-        handleCloseTag(tag) { // 关闭班级标签
-            this.allCheckedNodes = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
-            let tagIndex = this.tagList.findIndex(i => i.id === tag.id);
-            this.tagList.splice(tagIndex, 1);
-            // 设置选中
-            let setKeys = [];
-            this.allCheckedNodes.forEach(i => {
-                if (i.level === 4 && i.parentId !== tag.id) setKeys.push(i.nodeKey);
-            });
-            this.$refs.tree.setCheckedKeys(setKeys);
-            this.allCheckedNodes = this.allCheckedNodes.filter(i => (i.level === 3 && i.id !== tag.id) || (i.level === 4 && i.parentId !== tag.id));
-        },
-        handleCheck(data, checked) { // 当复选框被点击的时候触发
-            // 全选和半选状态下的班级都显示在标签
-            let checkedClass = checked.checkedNodes.filter(i => i.level === 3);
-            let halfCheckedClass = checked.halfCheckedNodes.filter(i => i.level === 3);
-            this.tagList = [...checkedClass, ...halfCheckedClass].map(i => {
-                return { id: i.id, organizationName: i.organizationName };
-            });
-            // 缓存全选和半选状态下的所有节点
-            this.allCheckedNodes = [...checked.checkedNodes, ...checked.halfCheckedNodes];
-        },
-        filterNode(value, data) { // 对树节点进行过滤
-            if (!value) return true;
-            return data.organizationName.indexOf(value) !== -1;
-        },
-        loadTree(node, resolve) { // 懒加载所在班级树结构
-            let level = 1;
-            let parentId = "";
-            if (node.level === 0) {
-                this.treeNode = node;
-                this.treeResolve = resolve;
-                this.getTreeData(resolve, level, parentId);
-            } else if (node.level > 3) {
-                return resolve([]);
-            } else {
-                if (node.data && node.data.level && node.data.id) {
-                    this.getTreeData(resolve, node.data.level + 1, node.data.id);
-                }
-            }
-        },
-        async getTreeData(resolve, level, parentId) { // 获取组织架构树数据
-            let { status, treeList } = await this.$post(`${this.api.stuOrganizationTree}?level=${level}&parentId=${parentId}`);
-            if (status === 200 && treeList.length) {
-                let result = [];
-                treeList.forEach(i => {
-                    if (i.level === 4) {
-                        i.nodeKey = `${i.parentId}-${i.id}`;
-                        i.leaf = true;
-                    } else {
-                        i.nodeKey = `${i.id}-${new Date().getTime()}`;
-                        i.leaf = false;
-                    }
-                    result.push(i);
-                });
-                this.$nextTick(() => {
-                    // 编辑时，设置默认勾选
-                    if (this.form.classInfo && this.form.classInfo.length) {
-                        let keys = this.form.classInfo.map(i => {
-                            return i.id;
-                        });
-                        this.defaultCheckedKeys = keys;
-                    }
-                    // 获取树结构选中和半选中状态下的数据
-                    let nodes = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
-                    this.allCheckedNodes = nodes;
-                    this.tagList = nodes.filter(i => i.level === 3);
-                });
-                return resolve(result);
-            } else {
-                return resolve([]);
-            }
-        },
-        getschoolCourse() { // 获取课程
-            this.$get(this.api.getSchoolEffectiveCourse).then(res => {
-                this.curriculumList = res.data;
-                if (this.curriculumList.length) {
-                    if (this.form.curriculumId){
-                        for(let i=0;i<this.curriculumList.length; i++) {
-                           if(this.curriculumList[i].cid == this.form.curriculumId){
-                               this.getProjectData();
-                           }
-                        }
-                    }else{
-                        this.form.curriculumId = this.curriculumList[0].cid;
-                        for(let i=0;i<this.curriculumList.length; i++) {
-                            this.cidList.push(this.curriculumList[i].cid)
-                        }
-                        this.getProjectData();
-                    }
-                }
-                this.$nextTick(() => {
-                  this.updateTime = 0
-                })
-            }).catch(err => {
-                console.log(err);
-            });
-        },
-        getProjectData() {
-            const curItem = this.curriculumList.find(e => e.cid === this.form.curriculumId)
-            let data={
-                pageNum:this.page,
-                pageSize:this.pageSize,
-                cid:this.form.curriculumId,
-                projectName:this.keyword,
-                systemId: curItem ? curItem.systemId : 1,
-                permissions: 1
-            }
-            this.$post(this.api.projectListByCourseId,data).then(res => {
-                let { status, data } = res;
-                if (status === 200 && data.records) {
-                    this.projectData = data.records
-                    this.total = data.total
-                }
-            }).catch(err => {
-            });
-        },
-        handlePage() {
-            let result = this.projectDataAll.slice((this.page - 1) * this.pageSize, this.page * this.pageSize);
-            this.projectData = result;
-        },
-        initData() {
-            this.page = 1;
-            this.getProjectData();
-        },
-        save(cb) { // 提交
-            if (this.submiting) return false
-            if (!this.form.experimentalName) return util.warningMsg("请填写考核名称");
-            if (this.expNameRepeat) return util.warningMsg("考核名称重复，请重新输入");
-            if (this.form.type !== 1) {
-                if (new Date().getTime() > new Date(this.startTime).getTime()) return util.warningMsg("开始时间不能早于当前时间");
-                let timestamp = new Date(new Date(this.stopTime).getTime() - new Date(this.startTime).getTime());
-                let minute = 1000 * 60;
-                let hour = minute * 60;
-                let day = hour * 24;
-                this.form.experimentDuration = `${Math.floor(timestamp / day)}d${Math.floor(timestamp % day / hour)}h${Math.floor(timestamp % day % hour / minute)}m`;
-            }
-            if (this.form.type == 1 && this.form.experimentDuration == "0d0h0m") return util.warningMsg("请填写实验时长");
-            if (this.form.type == 2 && this.startTime == "0000-00-00 00:00:00") return util.warningMsg("请填写实验时间");
-            if (this.form.type == 1) {
-              const { day, hour, minute } = this.duration
-              if (String(day).includes('.')) return util.warningMsg('实验天数请填写整数')
-              if (day < 0) return util.warningMsg('实验天数请勿填写负数')
-              if (String(hour).includes('.')) return util.warningMsg('实验小时请填写整数')
-              if (hour < 0) return util.warningMsg('实验小时请勿填写负数')
-              if (String(minute).includes('.')) return util.warningMsg('实验分钟请填写整数')
-              if (minute < 0) return util.warningMsg('实验分钟请勿填写负数')
-            }
-            if (!this.form.projectId) return util.warningMsg("请选择实训项目");
-            if (this.form.isSpecify == 0 && this.form.isEnableCode == 1) {
-                if (!this.form.invitationCode) return util.warningMsg("请设置邀请码");
-                if (!this.form.invitationCode || String(this.form.invitationCode).length < 6 || isNaN(this.form.invitationCode)) return util.warningMsg("请输入6位纯数字邀请码");
-            }
-            if (this.form.type == 2) {
-                this.form.startTime = this.startTime;
-                this.form.stopTime = this.stopTime;
-            }
-            let classId = [];
-            let stuInfo = [];
-            this.allCheckedNodes.forEach(i => {
-                if (i.level === 3) {
-                    classId.push(i.id);
-                } else if (i.level === 4) {
-                    stuInfo.push({ classId: i.parentId, stuAccountId: i.id });
-                }
-            });
-            if (this.isSpecify == 1 && !stuInfo.length) {
-                util.warningMsg("请选择学生");
-                return;
-            } else {
-                this.form.classId = classId.toString();
-                this.form.stuInfo = stuInfo;
-            }
-            this.submiting = true
-            if (this.form.id) {
-                this.$post(this.api.modifyAssessment, this.form).then(res => {
-                    this.updateTime = 0
-                    util.successMsg("修改成功");
-                    cb ? cb() : this.$router.back()
-                }).catch(err => {
-                    this.submiting = false
-                });
-            } else {
-                this.$post(this.api.saveAssessment, this.form).then(res => {
-                    this.updateTime = 0
-                    util.successMsg("创建成功");
-                    cb ? cb() : this.$router.back()
-                }).catch(err => {
-                    this.submiting = false
-                });
-            }
-        },
-        getData() { // 获取详情
-            this.$get(`${this.api.getDetailById}?id=${this.form.id}`).then(res => {
-                this.form = res.data;
-                this.formatDuration();
-                this.getschoolCourse();
-            }).catch(err => {
-            });
-        },
-        formatDuration() { // 格式化实验时长
-            let duration = this.form.experimentDuration.replace(/\D+/g, ",").split(",");
-            this.duration = {
-                day: duration[0],
-                hour: duration[1],
-                minute: duration[2]
-            };
-            this.date = [this.startTime, this.stopTime];
-            this.$nextTick(() => {
-              this.updateTime = 0
-            })
-        },
-        recoveryData() { // 恢复数据
-            if (JSON.stringify(this.assFields) != "{}") {
-                let info = this.assFields;
-                this.form = info.form;
-                this.duration = info.duration; // 实验时长
-                this.startTime = info.startTime; //开始时间
-                this.stopTime = info.startTime; //结束时间
-                this.expNameRepeat = info.expNameRepeat; // 考核名称是否重复
-                this.allCheckedNodes = info.allCheckedNodes; // 选中的树节点
-                this.formatDuration();
-            }
-        },
-        handleCacheData() { // 缓存数据,用于从项目管理页面返回时,数据回显
-            this.allCheckedNodes.forEach(i => {
-                if (i.level === 4) {
-                    this.form.stuInfo.push({ classId: i.parentId, stuAccountId: i.id });
-                }
-            });
-            let data = {
-                form: this.form,
-                date: this.date, // 实验时间
-                duration: this.duration, // 实验时长
-                startTime: this.startTime, //开始时间
-                stopTime: this.startTime, //结束时间
-                expNameRepeat: this.expNameRepeat, // 考核名称是否重复
-                allCheckedNodes: this.allCheckedNodes // 选中的树节点
-            };
-            this.setAss(data);
-            this.isToProject = true;
-        },
-        toProject() {
-            this.handleCacheData();
-            this.$router.push("/project/list?show=1");
-        },
-        showProject(row) {
-            this.handleCacheData();
-            this.$router.push(`/project/add?projectId=${row.projectId}&show=1`);
-        },
-        createInv() {
-            let result = "";
-            for (let i = 0; i < 6; i++) {
-                result += Math.floor(Math.random() * 10);
-            }
-            this.form.invitationCode = result;
-        },
-        handleCurrentChange(val) {
-            this.page = val;
-            this.getProjectData();
-        },
-        // 返回上一页
-        backPage() {
-          this.$router.back()
-        },
-        goBack() {
-          // 更改了信息才需要提示
-          if (this.updateTime) {
-            this.$confirm(`编辑的内容未保存，是否保存？`, '提示', {
-              type: 'warning'
-            }).then(() => {
-              this.save()
-            }).catch(() => {
-              this.updateTime = 0
-              this.backPage()
-            })
+    async getTreeData (resolve, level, parentId) { // 获取组织架构树数据
+      let { status, treeList } = await this.$post(`${this.api.stuOrganizationTree}?level=${level}&parentId=${parentId}`);
+      if (status === 200 && treeList.length) {
+        let result = [];
+        treeList.forEach(i => {
+          if (i.level === 4) {
+            i.nodeKey = `${i.parentId}-${i.id}`;
+            i.leaf = true;
           } else {
-            this.updateTime = 0
-            this.backPage()
+            i.nodeKey = `${i.id}-${new Date().getTime()}`;
+            i.leaf = false;
+          }
+          result.push(i);
+        });
+        this.$nextTick(() => {
+          // 编辑时，设置默认勾选
+          if (this.form.classInfo && this.form.classInfo.length) {
+            let keys = this.form.classInfo.map(i => {
+              return i.id;
+            });
+            this.defaultCheckedKeys = keys;
           }
+          // 获取树结构选中和半选中状态下的数据
+          let nodes = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+          this.allCheckedNodes = nodes;
+          this.tagList = nodes.filter(i => i.level === 3);
+        });
+        return resolve(result);
+      } else {
+        return resolve([]);
+      }
+    },
+    getschoolCourse () { // 获取课程
+      this.$get(this.api.getSchoolEffectiveCourse).then(({ data }) => {
+        this.curriculumList = data;
+        if (this.curriculumList.length) {
+          if (!this.form.mallId) this.form.mallId = data[0].mallId
+          this.getProjectData()
         }
+        this.$nextTick(() => {
+          this.updateTime = 0
+        })
+      }).catch(err => { });
+    },
+    getProjectData () {
+      const curItem = this.curriculumList.find(e => e.mallId === this.form.mallId)
+      console.log("🚀 ~ file: index.vue:471 ~ getProjectData ~ curItem:", curItem)
+      let data = {
+        pageNum: this.page,
+        pageSize: this.pageSize,
+        cid: curItem.cid,
+        projectName: this.keyword,
+        systemId: curItem ? curItem.systemId : 1,
+        permissions: 1,
+        mallId: this.form.mallId
+      }
+      this.$post(this.api.projectListByCourseId, data).then(({ data }) => {
+        this.projectData = data.records
+        this.total = data.total
+      }).catch(err => { })
+    },
+    handlePage () {
+      let result = this.projectDataAll.slice((this.page - 1) * this.pageSize, this.page * this.pageSize);
+      this.projectData = result;
+    },
+    initData () {
+      this.page = 1;
+      this.getProjectData();
+    },
+    save (cb) { // 提交
+      if (this.submiting) return false
+      if (!this.form.experimentalName) return util.warningMsg("请填写考核名称");
+      if (this.expNameRepeat) return util.warningMsg("考核名称重复，请重新输入");
+      if (this.form.type !== 1) {
+        if (new Date().getTime() > new Date(this.startTime).getTime()) return util.warningMsg("开始时间不能早于当前时间");
+        let timestamp = new Date(new Date(this.stopTime).getTime() - new Date(this.startTime).getTime());
+        let minute = 1000 * 60;
+        let hour = minute * 60;
+        let day = hour * 24;
+        this.form.experimentDuration = `${Math.floor(timestamp / day)}d${Math.floor(timestamp % day / hour)}h${Math.floor(timestamp % day % hour / minute)}m`;
+      }
+      if (this.form.type == 1 && this.form.experimentDuration == "0d0h0m") return util.warningMsg("请填写实验时长");
+      if (this.form.type == 2 && this.startTime == "0000-00-00 00:00:00") return util.warningMsg("请填写实验时间");
+      if (this.form.type == 1) {
+        const { day, hour, minute } = this.duration
+        if (String(day).includes('.')) return util.warningMsg('实验天数请填写整数')
+        if (day < 0) return util.warningMsg('实验天数请勿填写负数')
+        if (String(hour).includes('.')) return util.warningMsg('实验小时请填写整数')
+        if (hour < 0) return util.warningMsg('实验小时请勿填写负数')
+        if (String(minute).includes('.')) return util.warningMsg('实验分钟请填写整数')
+        if (minute < 0) return util.warningMsg('实验分钟请勿填写负数')
+      }
+      if (!this.form.projectId) return util.warningMsg("请选择实训项目");
+      if (this.form.isSpecify == 0 && this.form.isEnableCode == 1) {
+        if (!this.form.invitationCode) return util.warningMsg("请设置邀请码");
+        if (!this.form.invitationCode || String(this.form.invitationCode).length < 6 || isNaN(this.form.invitationCode)) return util.warningMsg("请输入6位纯数字邀请码");
+      }
+      if (this.form.type == 2) {
+        this.form.startTime = this.startTime;
+        this.form.stopTime = this.stopTime;
+      }
+      let classId = [];
+      let stuInfo = [];
+      this.allCheckedNodes.forEach(i => {
+        if (i.level === 3) {
+          classId.push(i.id);
+        } else if (i.level === 4) {
+          stuInfo.push({ classId: i.parentId, stuAccountId: i.id });
+        }
+      });
+      if (this.isSpecify == 1 && !stuInfo.length) {
+        util.warningMsg("请选择学生");
+        return;
+      } else {
+        this.form.classId = classId.toString();
+        this.form.stuInfo = stuInfo;
+      }
+
+      const curItem = this.curriculumList.find(e => e.mallId === this.form.mallId)
+      this.form.curriculumId = curItem.cid
+      this.submiting = true
+      if (this.form.id) {
+        this.$post(this.api.modifyAssessment, this.form).then(res => {
+          this.updateTime = 0
+          util.successMsg("修改成功");
+          cb ? cb() : this.$router.back()
+        }).catch(err => {
+          this.submiting = false
+        });
+      } else {
+        this.$post(this.api.saveAssessment, this.form).then(res => {
+          this.updateTime = 0
+          util.successMsg("创建成功");
+          cb ? cb() : this.$router.back()
+        }).catch(err => {
+          this.submiting = false
+        });
+      }
+    },
+    getData () { // 获取详情
+      this.$get(`${this.api.getDetailById}?id=${this.form.id}`).then(res => {
+        this.form = res.data;
+        this.formatDuration();
+        this.getschoolCourse();
+      }).catch(err => {
+      });
+    },
+    formatDuration () { // 格式化实验时长
+      let duration = this.form.experimentDuration.replace(/\D+/g, ",").split(",");
+      this.duration = {
+        day: duration[0],
+        hour: duration[1],
+        minute: duration[2]
+      };
+      this.date = [this.startTime, this.stopTime];
+      this.$nextTick(() => {
+        this.updateTime = 0
+      })
+    },
+    recoveryData () { // 恢复数据
+      if (JSON.stringify(this.assFields) != "{}") {
+        let info = this.assFields;
+        this.form = info.form;
+        this.duration = info.duration; // 实验时长
+        this.startTime = info.startTime; //开始时间
+        this.stopTime = info.startTime; //结束时间
+        this.expNameRepeat = info.expNameRepeat; // 考核名称是否重复
+        this.allCheckedNodes = info.allCheckedNodes; // 选中的树节点
+        this.formatDuration();
+      }
+    },
+    handleCacheData () { // 缓存数据,用于从项目管理页面返回时,数据回显
+      this.allCheckedNodes.forEach(i => {
+        if (i.level === 4) {
+          this.form.stuInfo.push({ classId: i.parentId, stuAccountId: i.id });
+        }
+      });
+      let data = {
+        form: this.form,
+        date: this.date, // 实验时间
+        duration: this.duration, // 实验时长
+        startTime: this.startTime, //开始时间
+        stopTime: this.startTime, //结束时间
+        expNameRepeat: this.expNameRepeat, // 考核名称是否重复
+        allCheckedNodes: this.allCheckedNodes // 选中的树节点
+      };
+      this.setAss(data);
+      this.isToProject = true;
+    },
+    toProject () {
+      this.handleCacheData();
+      this.$router.push("/project/list?show=1");
+    },
+    showProject (row) {
+      this.handleCacheData();
+      this.$router.push(`/project/add?projectId=${row.projectId}&show=1`);
+    },
+    createInv () {
+      let result = "";
+      for (let i = 0; i < 6; i++) {
+        result += Math.floor(Math.random() * 10);
+      }
+      this.form.invitationCode = result;
+    },
+    handleCurrentChange (val) {
+      this.page = val;
+      this.getProjectData();
+    },
+    // 返回上一页
+    backPage () {
+      this.$router.back()
+    },
+    goBack () {
+      // 更改了信息才需要提示
+      if (this.updateTime) {
+        this.$confirm(`编辑的内容未保存，是否保存？`, '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.save()
+        }).catch(() => {
+          this.updateTime = 0
+          this.backPage()
+        })
+      } else {
+        this.updateTime = 0
+        this.backPage()
+      }
     }
+  }
 };
 </script>
 
@@ -621,37 +655,37 @@ export default {
     height: 400px;
     max-height: 400px;
     width: 100%;
-    border: 1px solid #DCDFE6;
+    border: 1px solid #dcdfe6;
     border-radius: 4px;
     padding: 10px 10px 10px 40px;
     overflow: auto;
-    /deep/ .el-tree-node__content{
+    /deep/ .el-tree-node__content {
         height: 30px;
-        .el-tree-node__expand-icon{
+        .el-tree-node__expand-icon {
             padding: 2px;
             color: #fff;
-            background-color: #9278FF;
+            background-color: #9278ff;
             border-radius: 30px;
             margin: 0 10px;
         }
-        .el-tree-node__expand-icon.is-leaf{
+        .el-tree-node__expand-icon.is-leaf {
             background-color: transparent;
         }
-        .el-icon-caret-right:before{
+        .el-icon-caret-right:before {
             font-size: 14px;
         }
-        .el-checkbox__inner{
+        .el-checkbox__inner {
             width: 18px;
             height: 18px;
-            border: 1px solid #9278FF;
+            border: 1px solid #9278ff;
             border-radius: 20px;
         }
-        .el-checkbox__inner::after{
+        .el-checkbox__inner::after {
             position: absolute;
             top: 3px;
             left: 6px;
         }
-        .el-checkbox__input.is-indeterminate .el-checkbox__inner::before{
+        .el-checkbox__input.is-indeterminate .el-checkbox__inner::before {
             position: absolute;
             top: 7px;
         }
diff --git a/src/pages/product/list/index.vue b/src/pages/product/list/index.vue
index 4fa5b09..3347515 100644
--- a/src/pages/product/list/index.vue
+++ b/src/pages/product/list/index.vue
@@ -9,6 +9,9 @@
             <img :src="item.banner"
                  alt=""
                  :style="{height: carouselHeight}">
+            <!-- <img src="https://huoran.oss-cn-shenzhen.aliyuncs.com/20230707/png/1677215781005844480.png"
+                 alt=""
+                 :style="{height: carouselHeight}"> -->
             <p class="banner-name">{{ item.title }}</p>
           </div>
         </el-carousel-item>
diff --git a/src/pages/product/show/index.vue b/src/pages/product/show/index.vue
index 406b758..6fb628d 100644
--- a/src/pages/product/show/index.vue
+++ b/src/pages/product/show/index.vue
@@ -505,6 +505,13 @@ export default {
     }
     .courses {
         margin-top: 40px;
+        /deep/.des {
+            div,
+            p,
+            span {
+                font-family: PingFangSC-Regular !important;
+            }
+        }
         .chapters {
             margin-top: 16px;
             max-height: calc(100% - 53px);
diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue
index 0d0a402..60e5864 100644
--- a/src/pages/project/add/index.vue
+++ b/src/pages/project/add/index.vue
@@ -24,7 +24,16 @@
                    :disabled="isDetail">
             <div class="flex">
               <el-form-item label="系统">
-                <el-select v-model="projectManage.systemId"
+                <el-cascader v-if="projectManage.founder"
+                             v-model="mallIds"
+                             :options="curs"
+                             :props="{ checkStrictly: true, value: 'id' }"
+                             popper-class="course-cas"
+                             @expand-change="curChange"
+                             @change="curChange"></el-cascader>
+
+                <el-select v-else
+                           v-model="projectManage.systemId"
                            placeholder="请选择"
                            @change="systemChange">
                   <el-option v-for="item in systemList"
@@ -285,6 +294,8 @@ export default {
       projectId: this.$route.query.projectId,
       founder: this.$route.query.founder,
       systemList: [],
+      mallIds: [],
+      curs: [],
       token: btoa(util.local.get(Setting.tokenKey)),
       isDetail: Boolean(this.$route.query.show),
 
@@ -293,6 +304,7 @@ export default {
         projectName: "", // 项目名称
         permissions: 0, // 项目权限(0、练习 1、考核 2、竞赛)
         systemId: this.$store.state.project.lastSystemId, // 系统id
+        mallId: '',
         hintOpen: 0, // 实验提示是否开启(0开启 1不开启 默认0)
         experimentHint: "", // 实验提示
         experimentTarget: "", // 实验目标
@@ -406,14 +418,14 @@ export default {
     ...mapActions("project", [
       "setSystemId", "setProject"
     ]),
-    getSystemData () {
-      this.$get(this.api.getSystemIdBySchool).then(res => {
-        this.systemList = res.data;
-      });
-    },
     getInfoData () { // 获取详情数据
       this.$get(`${this.api.getProjectDetail}?projectId=${this.projectId}`).then(res => {
         let { projectManage, projectJudgmentVos } = res;
+        const { mallId, systemId } = projectManage
+        if (mallId) {
+          this.mallIds = [mallId]
+          systemId && this.mallIds.push(systemId)
+        }
         this.projectManage = projectManage;
         this.originName = projectManage.projectName
         this.projectJudgmentData = projectJudgmentVos;
@@ -428,6 +440,31 @@ export default {
         console.log(err);
       });
     },
+    // 获取系统
+    async getSystemData () {
+      const { data } = await this.$get(this.api.getSystemIdBySchool)
+      this.systemList = data
+      const res = await this.$get(this.api.getSchoolEffectiveCourse)
+      if (res.data.length) {
+        res.data.map(e => {
+          e.id = e.mallId
+          e.label = e.curriculumName
+          e.children = data.filter(n => e.systemId.split(',').includes(n.id + '')) // 筛选出该课程下的系统
+        })
+        this.curs = res.data
+        console.log("🚀 ~ file: index.vue:431 ~ getSystemData ~ res.data:", res.data)
+      }
+    },
+    // 课程选择回调
+    curChange (val) {
+      const id = val[0]
+      if (val.length === 1) {
+        // 如果选择的是课程，则默认选中下面第一个系统
+        this.mallIds = [id, this.curs.find(e => e.id == id).children[0].id]
+      }
+      this.projectManage.mallId = id
+      this.projectManage.systemId = this.mallIds[1]
+    },
     projectNameExistis () { // 项目管理名称判重
       const { projectName } = this.projectManage
       if (this.originName === projectName) {
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index 98ea1d2..0edbe71 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -200,11 +200,19 @@
                  width="24%"
                  center
                  :close-on-click-modal="false">
-        <el-form>
-          <el-form-item>
-            <!--前端不用做名称判重了：@change='projectNameExistis'-->
+        <el-form label-width="70px">
+          <el-form-item label="项目名称">
             <el-input placeholder="请输入项目名称"
-                      v-model="projectName"></el-input>
+                      v-model="copyForm.projectName"></el-input>
+          </el-form-item>
+          <el-form-item v-if="!curRow.projectManage.founder"
+                        label="系统">
+            <el-cascader v-model="copyMallId"
+                         :options="curs"
+                         :props="{ checkStrictly: true, value: 'id' }"
+                         popper-class="course-cas"
+                         @expand-change="copySystemChange"
+                         @change="copySystemChange"></el-cascader>
           </el-form-item>
         </el-form>
         <span slot="footer"
@@ -237,7 +245,8 @@ export default {
         founder: +this.$route.query.founder || 2, // 创建人角色(0:系统 1:老师 2:全部)
         state: "", // 状态(0:草稿箱 1:已发布)
         permissions: "", // 项目权限(0:练习 1:考核 2:竞赛)
-        cid: ''
+        cid: '',
+        mallId: ''
       },
       keyword: "",
       status: "",
@@ -299,8 +308,14 @@ export default {
       pageSize: 10,
       multipleSelection: [],
       copyVisible: false,
-      projectName: "",
-      currentRow: {}, // 复制之后，提交到后台的数据
+      copyForm: {
+        projectName: '',
+        mallId: []
+      },
+      copyMallId: [],
+      curRow: {
+        projectManage: {}
+      }, // 复制之后，提交到后台的数据
       listDataAll: [],
       isFirst: true
     };
@@ -351,7 +366,7 @@ export default {
         projectName: this.keyword,
         pageNum: this.page,
         pageSize: this.pageSize,
-        systemId: this.systemId
+        systemId: this.systemId,
       };
       this.$post(this.api.queryProjectManage, data).then(res => {
         this.isFirst = false
@@ -371,12 +386,12 @@ export default {
     getschoolCourse () {
       this.$get(this.api.getSchoolEffectiveCourse).then(({ data }) => {
         this.curriculumList = data
-        const { cid } = this.queryData
+        const { mallId } = this.queryData
         if (data.length) {
-          this.cid = [cid || data[0].cid]
+          this.cid = [mallId || data[0].mallId]
           const all = this.systemListAll
           data.map(e => {
-            e.id = e.cid
+            e.id = e.mallId
             e.label = e.curriculumName
             e.children = all.filter(n => e.systemId.split(',').includes(n.id + '')) // 筛选出该课程下的系统
           })
@@ -387,12 +402,13 @@ export default {
     },
     // 课程选择回调
     curChange (val) {
-      const cid = val[0]
+      const mallId = val[0]
       if (val.length === 1) {
         // 如果选择的是课程，则默认选中下面第一个系统
-        this.cid = [cid, this.curs.find(e => e.id === cid).children[0].id]
+        this.cid = [mallId, this.curs.find(e => e.id === mallId).children[0].id]
       }
-      this.queryData.cid = cid
+      this.queryData.mallId = mallId
+      this.queryData.cid = this.curs.find(e => e.id === mallId).cid
       this.systemId = this.cid[1]
       this.initData()
     },
@@ -481,48 +497,44 @@ export default {
         console.log(err);
       });
     },
-    projectNameExistis () { // 项目管理名称判重
-      if (this.projectName) {
-        this.$post(this.api.queryNameIsExist, { projectName: this.projectName }).then(res => {
-          if (res.status === 200) {
-            this.projectNameRepeat = false;
-          }
-        }).catch(err => {
-          this.projectNameRepeat = true;
-        });
-      } else {
-        this.projectNameRepeat = false;
-      }
-    },
     copyData (projectId) { // 复制，根据项目id查询详情
       this.copyVisible = true;
       this.$get(`${this.api.getProjectDetail}?projectId=${projectId}`).then(res => {
-        this.projectName = res.projectManage.projectName;
-        this.currentRow = {
-          projectManage: res.projectManage,
-          projectJudgmentList: res.projectJudgmentVos
+        this.copyMallId = []
+        this.copyForm.projectName = res.projectManage.projectName;
+        this.curRow = {
+          projectManage: JSON.parse(JSON.stringify(res.projectManage)),
+          projectJudgmentList: JSON.parse(JSON.stringify(res.projectJudgmentVos))
         };
       }).catch(err => {
         console.log(err);
       });
     },
+    // 复制项目系统选择回调
+    copySystemChange (val) {
+      this.copyForm.mallId = val[0]
+    },
     copySubmit () {
-      if (!this.projectName) {
+      const form = this.copyForm
+      const row = this.curRow
+      const fromSystem = !row.projectManage.founder
+      if (!form.projectName) {
         util.warningMsg("请输入项目名称");
         return;
       }
-      ;
-      if (this.projectNameRepeat) {
-        util.warningMsg("该项目名称已存在");
+      // 系统创建的才需要选择系统
+      if (fromSystem && !form.mallId) {
+        util.warningMsg("请选择系统");
         return;
       }
-      this.currentRow.projectManage.projectName = this.projectName;
-      this.currentRow.projectManage.projectId = "";
-      this.currentRow.projectManage.founder = 1
-      this.currentRow.projectJudgmentList.forEach(i => {
+      row.projectManage.projectName = form.projectName
+      if (fromSystem) row.projectManage.mallId = form.mallId
+      row.projectManage.projectId = "";
+      row.projectManage.founder = 1
+      row.projectJudgmentList.forEach(i => {
         i.projectId = "";
       });
-      this.$post(`${this.api.copyProjectManage}`, this.currentRow).then(res => {
+      this.$post(`${this.api.copyProjectManage}`, row).then(res => {
         this.initData();
         util.successMsg("复制实验项目成功");
         this.copyVisible = false;
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index dd68c5f..f312016 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -151,7 +151,8 @@
       <div class="tab-content">
         <template v-if="active === 1">
           <div class="page">
-            <div v-html="briefIntroduction"></div>
+            <div class="des"
+                 v-html="briefIntroduction"></div>
           </div>
         </template>
         <template v-if="active === 2">
@@ -202,15 +203,13 @@
                                   :key="i">
                   <p class="sign">{{ item.createTime }}</p>
                   <div class="ver">
-                    <div>
-                      {{ item.noteName }}
-                      <span class="action">
-                        <i class="el-icon-edit-outline"
-                           @click="editNote(item)"></i>
-                        <i class="el-icon-delete"
-                           @click="delNote(item)"></i>
-                      </span>
-                    </div>
+                    {{ item.noteName }}
+                    <span class="action">
+                      <i class="el-icon-edit-outline"
+                         @click="editNote(item)"></i>
+                      <i class="el-icon-delete"
+                         @click="delNote(item)"></i>
+                    </span>
                   </div>
                   <div class="des"
                        v-html="item.noteContent"></div>
@@ -251,7 +250,7 @@
                     <i class="icon el-icon-chat-dot-square"
                        @click="showReplay(item)"></i>
                     <!-- 当前用户是管理员 || 该条评论是学生发的（没有createRoleName即是学生） || 当前用户的account==该条评论的创建人accountId -->
-                    <i v-if="item.currentRoleName.includes('管理员') || !item.createRoleName || item.currentAccountId == item.createAccountId"
+                    <i v-if="(item.currentRoleName && item.currentRoleName.includes('管理员')) || !item.createRoleName || item.currentAccountId == item.createAccountId"
                        class="icon el-icon-delete"
                        @click="delComment(item)"></i>
 
@@ -305,7 +304,7 @@
                         <i class="icon el-icon-chat-dot-square"
                            @click="showReplay(reply)"></i>
                         <!-- 当前用户是管理员 || 该条评论是学生发的（没有createRoleName即是学生） || 当前用户的account==该条评论的创建人accountId -->
-                        <i v-if="reply.currentRoleName.includes('管理员') || !reply.createRoleName || reply.currentAccountId == reply.createAccountId"
+                        <i v-if="(reply.currentRoleName && reply.currentRoleName.includes('管理员')) || !reply.createRoleName || reply.currentAccountId == reply.createAccountId"
                            class="icon el-icon-delete"
                            @click="delComment(reply)"></i>
                         <!-- <div class="like-wrap"
@@ -570,7 +569,7 @@ export default {
     // 查询是否过期
     getStatus () {
       this.$get(this.api.whetherToRenewTheFee, {
-        cid: this.courseId
+        mallId: this.mallId
       }).then(({ isRenew }) => {
         // 1正常显示资源，0显示续费
         this.overdue = isRenew
@@ -972,7 +971,7 @@ export default {
         // 银行系统
         sessionStorage.removeItem('projectId')
         sessionStorage.removeItem('submited')
-        location.href = `${Setting.bankPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&test=true&manager=1`
+        location.href = `${Setting.bankPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&mallId=${this.mallId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&test=true&manager=1`
       } else if (systemId == 12) {
         // 众筹系统
         window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1`);
@@ -999,6 +998,14 @@ $height: 700px;
         color: #333;
         line-height: 24px;
     }
+
+    /deep/.des {
+        div,
+        p,
+        span {
+            font-family: PingFangSC-Regular !important;
+        }
+    }
 }
 .video_wid,
 .cover {
diff --git a/src/setting.js b/src/setting.js
index 512ac51..be0456c 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.152:9000/"; // 榕
+    host = "http://192.168.31.152:9000/"; // 榕
     // host = 'http://192.168.31.51:9000/'; // 赓
 }
 
diff --git a/src/styles/page/station.scss b/src/styles/page/station.scss
index 0e9c739..2d818c6 100644
--- a/src/styles/page/station.scss
+++ b/src/styles/page/station.scss
@@ -120,7 +120,7 @@
         align-items: center;
         padding-bottom: 10px;
         margin: -22px 0 20px;
-        font-size: 18px;
+        font-size: 20px;
         color: #9076ff;
         border-bottom: 1px dashed #bfbfbf;
     }