fix

src/pages/achievement/list/project.vue

@@ -7,7 +7,7 @@
         <li v-if="form.permissions">
           <label>时间</label>
           <el-radio-group v-model="form.month"
-                          @change="monthChange">
+                          @change="initData">
             <el-radio v-for="(item,index) in dateList"
                       :key="index"
                       :label="item.id"
@@ -29,7 +29,7 @@
         <li>
           <label>实验项目分类</label>
           <el-radio-group v-model="form.permissions"
-                          @change="perChange">
+                          @change="initData">
             <el-radio v-for="(item,index) in projectType"
                       :key="index"
                       :label="item.id"
@@ -40,7 +40,7 @@
           <label>班级</label>
           <el-select v-model="form.classId"
                      clearable
-                     @change="classChange">
+                     @change="initData">
             <el-option v-for="item in classList"
                        :key="item.id"
                        :label="item.className"
@@ -51,7 +51,7 @@
         <li>
           <label>课程</label>
           <el-select v-model="form.mallId"
-                     @change="mallIdChange">
+                     @change="initData">
             <el-option v-for="(item, i) in curs"
                        :key="i"
                        :label="item.curriculumName"
@@ -160,12 +160,13 @@
 
 <script>
 import util from "@/libs/util";
+import qs from 'qs'
 export default {
   name: "achievement",
   data () {
     return {
       form: {
-        classId: this.$route.query.class ? +this.$route.query.class : '',
+        classId: +this.$route.query.classId || '',
         mallId: +this.$route.query.mallId || '',
         permissions: this.$route.query.permissions ? +this.$route.query.permissions : 0,
         month: +this.$route.query.month || '',
@@ -309,49 +310,6 @@ export default {
         this.loading = false
       });
     },
-    monthChange () {
-      this.$router.push({
-        path: 'list',
-        query: {
-          ...this.$route.query,
-          month: val
-        }
-      })
-      this.initData()
-    },
-    // 项目分类回调
-    perChange (val) {
-      this.$router.push({
-        path: 'list',
-        query: {
-          ...this.$route.query,
-          permissions: val
-        }
-      })
-      this.initData()
-    },
-    // 班级回调
-    classChange (val) {
-      this.$router.push({
-        path: 'list',
-        query: {
-          ...this.$route.query,
-          classId: val
-        }
-      })
-      this.initData()
-    },
-    // 课程回调
-    mallIdChange (val) {
-      this.$router.push({
-        path: 'list',
-        query: {
-          ...this.$route.query,
-          mallId: val
-        }
-      })
-      this.initData()
-    },
     initData () {
       this.$refs.table.clearSelection();
       this.page = 1;
@@ -363,7 +321,7 @@ export default {
     },
     // 进入实验记录
     entry (row) {
-      this.$store.commit('achievement/setReferrer', this.$route.fullPath)
+      this.$store.commit('achievement/setReferrer', `${this.$route.path}?${qs.stringify(this.form)}&page=${this.page}`)
       this.$router.push(`project?id=${row.assessmentId || row.projectId}&projectName=${row.projectName}&permissions=${row.permissions || 0}&mallId=${this.form.mallId}&classId=${row.classId || ''}`)
     },
     handleDelete (row) { // 删除

src/pages/activity/manage/add/index.vue

@@ -400,16 +400,16 @@ export default {
       this.submiting = true
       if (form.id) {
         this.$post(this.api.updateActivity, form).then(res => {
-          this.pass = true
-          this.updateTime = 0
-          this.$router.back()
+          this.backList()
           util.successMsg("修改成功");
         }).catch(err => {
           this.submiting = false
         });
       } else {
         this.$post(this.api.saveActivity, form).then(res => {
-          this.backList()
+          this.pass = true
+          this.updateTime = 0
+          this.$router.push('manage')
           util.successMsg("创建成功");
         }).catch(err => {
           this.submiting = false

src/pages/activity/manage/list/index.vue

@@ -375,7 +375,7 @@ export default {
     },
     handleCurrentChange (val) {
       this.page = val;
-      this.$router.push(`list?page=${val}`)
+      this.$router.push(`manage?page=${val}`)
       this.getData()
     },
     transferTime (date, type) {

src/pages/activity/manage/manage/notice.vue

@@ -76,7 +76,6 @@ export default {
     return {
       token: util.local.get(Setting.tokenKey),
       id: this.$route.query.id,
-      keyword: "",
       listData: [],
       multipleSelection: [],
       page: +this.$route.query.page || 1,
@@ -84,14 +83,6 @@ export default {
       totals: 0
     };
   },
-  watch: {
-    keyword: function (val) {
-      clearTimeout(this.searchTimer);
-      this.searchTimer = setTimeout(() => {
-        this.getData();
-      }, 500);
-    }
-  },
   mounted () {
     this.getData()
   },

src/pages/assessment/add/index.vue

@@ -542,7 +542,7 @@ export default {
         this.$post(this.api.saveAssessment, this.form).then(res => {
           this.updateTime = 0
           util.successMsg("创建成功");
-          cb ? cb() : this.backPage()
+          cb ? cb() : this.$router.push('list')
         }).catch(err => {
           this.submiting = false
         });

src/pages/assessment/list/index.vue

@@ -435,7 +435,6 @@ export default {
     async getCourse () {
       const { data } = await this.$get(this.api.getSchoolEffectiveCourse)
       this.curs.push(...data)
-      this.page = 1
       this.getData(1)
     },
     // 课程选择回调

src/pages/course/add/index.vue

@@ -394,7 +394,7 @@ export default {
               }).then(() => {
                 this.$router.replace(`/course/contentSettings?id=${courseId}`);
               }).catch(() => {
-                cb ? cb() : this.$router.back()
+                cb ? cb() : this.$router.push('list')
               });
             }).catch(err => {
               this.submiting = false;

src/pages/expSystem/backstage/sourceModel.vue

@@ -3,7 +3,7 @@
     <div class="side">
       <org ref="tree"
            @initData="catetoryClick"
-           @getData="getData"></org>
+           @loadData="loadData"></org>
     </div>
 
     <div class="right">
@@ -198,14 +198,17 @@ export default {
       this.listData = res.data.records
       this.total = res.data.total
     },
+    loadData (school) {
+      this.isSystem = school
+      this.getData()
+    },
     // 分类点击回调
     catetoryClick (school) {
       this.isSystem = school
       this.initData()
     },
     initData (school) {
-      this.page = 1
-      this.getData()
+      this.handleCurrentChange(1)
     },
     // 新增
     add () {

src/pages/expSystem/backstage/sourceType.vue

@@ -118,7 +118,7 @@ export default {
             isSystem
           }
         }).catch(err => { })
-        this.$emit('initData', +isSystem)
+        this.$emit('loadData', +isSystem)
       })
     },
     // 分类类型选择回调

src/pages/information/addarticle/index.vue

@@ -236,7 +236,7 @@ export default {
               this.submiting = false;
               util.successMsg("创建成功");
               this.updateTime = 0
-              cb ? cb() : this.$router.back()
+              cb ? cb() : this.$router.push('list')
             })
               .catch(err => {
                 this.submiting = false;

src/pages/match/add/index.vue

@@ -270,7 +270,7 @@ export default {
           this.editing = false
         }
       } else {
-        this.$router.push(`/match?page=${this.$store.state.match.page}`)
+        this.backPage()
       }
     },
     back () {

src/pages/match/list/index.vue

@@ -382,8 +382,7 @@ export default {
       })
     },
     initData () {
-      this.page = 1;
-      this.getData();
+      this.handleCurrentChange(1)
     },
     // 缓存参数及分页
     setCache () {
@@ -403,6 +402,14 @@ export default {
       }).then(async () => {
         await this.$post(`${this.api.copyCompetition}?competitionId=${row.id}`)
         util.successMsg('复制成功')
+        this.form = {
+          keyword: '',
+          month: '',
+          publishStatus: '',
+          startTime: '',
+          endTime: '',
+        }
+        this.date = []
         this.initData()
       }).catch(() => { })
     },

src/pages/match/manage/matchArchList.vue

@@ -494,7 +494,7 @@ export default {
     },
     handleCurrentChange (val) { // 切换分页
       this.$router.push({
-        path: 'manage',
+        path: 'archList',
         query: {
           ...this.$route.query,
           page: val

src/pages/match/manage/matchInfo.vue

@@ -146,8 +146,8 @@
                   <td>
                     <span v-if="item.score >= 0"
                           class="m-r-10">分数{{item.score}}</span>
-                    <el-button type="text"
-                               :disabled="item.resultsDetails === 1 || (form.completeCompetitionSetup.competitionType && !item.reportId) || (form.completeCompetitionSetup.competitionType === 0 && !item.reportId)"
+                    <el-button v-if="form.completeCompetitionSetup.competitionType || (!form.completeCompetitionSetup.competitionType && item.resultsDetails === 0 && item.reportId)"
+                               type="text"
                                @click="show(item)">查看成绩详情</el-button>
                   </td>
                 </tr>
@@ -268,7 +268,8 @@
             <td>{{ item.timeSum }}min</td>
             <td>{{ item.score }}</td>
             <td>
-              <el-button type="text"
+              <el-button v-if="curRow.resultsDetails === 0 && item.reportId"
+                         type="text"
                          @click="toReport(item)">查看</el-button>
             </td>
           </tr>

src/pages/match/manage/matchSignup.vue

@@ -449,12 +449,13 @@ export default {
     }
   },
   mounted () {
-    this.initData()
+    this.getData()
     this.getInfo()
     this.getTeam()
   },
   methods: {
     init () {
+      this.keyword = ''
       this.initData()
       this.getTeam()
       this.getClient()
@@ -496,8 +497,7 @@ export default {
       }).catch(err => { })
     },
     initData () {
-      this.page = 1
-      this.getData()
+      this.handleCurrentChange(1)
     },
     handleSelectionChange (val) {
       this.multipleSelection = val;
@@ -513,7 +513,7 @@ export default {
       this.page = val;
       this.getData();
     },
-    switchOff (val, row, index) {
+    switchOff (val, row) {
       this.$put(`${this.api.disableRegistration}?competitionRegistrationId=${row.id}&isDisable=${val}`).then(res => { }).catch(err => { });
     },
     // 排序回调
@@ -606,7 +606,6 @@ export default {
     cancelUpload () {
       this.uploading = false
       this.$refs.upload.abort()
-      this.keyword = ''
       this.init()
       this.importVisible = false
     },
@@ -880,9 +879,10 @@ export default {
     // 批量删除
     async batchDel () {
       const list = this.multipleSelection
-      const tips = list.length ? (this.info.completeCompetitionSetup.competitionType && list.find(e => e.captain === '是') ? '删除队长后，该团队下所有成员都会同步移除报名，已有的成绩也会一并删除，成绩排名将会受影响，是否确认删除？' : '删除后该参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定要删除？') : '删除后参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定删除全部报名人员？'
+      const tips = list.length ? (this.info.completeCompetitionSetup.competitionType && list.find(e => e.captain === '是') ? '删除队长后，该团队下所有成员都会同步移除报名，已有的成绩也会一并删除，成绩排名将会受影响，是否确认删除？' : '删除后该参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定要删除？') : '删除后参赛人员已有的成绩会一并删除，成绩排名将会受影响，<span style="font-size: 15px;color: #f00">是否确定删除全部报名人员？</span>'
       this.$confirm(tips, "提示", {
-        type: "warning"
+        type: "warning",
+        dangerouslyUseHTMLString: true
       }).then(async () => {
         if (list.length) {
           await this.$post(this.api.batchDeleteApplicants, { registrationVOS: list })

src/pages/product/list/index.vue

@@ -295,7 +295,7 @@ export default {
     this.getSubject()
     this.getLabel()
     this.getClass()
-    this.initData()
+    this.getData()
   },
   methods: {
     // 获取banner

src/pages/project/list/index.vue

@@ -302,7 +302,6 @@ export default {
         projectManage: {}
       }, // 复制之后，提交到后台的数据
       listDataAll: [],
-      isFirst: true
     };
   },
   computed: {
@@ -330,7 +329,6 @@ export default {
     }
 
     this.getSystemData()
-    this.getData()
   },
   methods: {
     ...mapActions("project", [
@@ -338,14 +336,12 @@ export default {
     ]),
     getData () {
       this.setSystemId(this.form.systemId);
-      if (this.isFirst) this.page = +this.$route.query.page || 1
       let data = {
         ...this.form,
         pageNum: this.page,
         pageSize: this.pageSize,
       };
       this.$post(this.api.queryProjectManage, data).then(res => {
-        this.isFirst = false
         this.listData = res.data.records;
         this.total = res.data.total;
       }).catch(err => {
@@ -372,7 +368,7 @@ export default {
             e.children = all.filter(n => e.systemId.split(',').includes(n.id + '')) // 筛选出该课程下的系统
           })
           this.curs = data
-          this.curChange(this.cid)
+          this.curChange(this.cid, 1)
         }
       }).catch(err => { })
     },
@@ -459,12 +455,10 @@ export default {
       this.$get(`${this.api.updateIsOpen}?isOpen=${row.ccupationlabOpen}&projectId=${row.projectId}&platformId=${this.form.platformId}`).then(res => {
         util.successMsg("更新启用状态成功");
         this.getData();
-      }).catch(err => {
-        console.log(err);
-      });
+      }).catch(err => { });
     },
     // 课程选择回调
-    curChange (val) {
+    curChange (val, first) {
       const mallId = val[0]
       if (val.length === 1) {
         // 如果选择的是课程，则默认选中下面第一个系统
@@ -473,7 +467,7 @@ export default {
       this.form.mallId = mallId
       this.form.cid = this.curs.find(e => e.id === mallId).cid
       this.form.systemId = this.cid[1]
-      this.initData()
+      first ? this.getData() : this.initData()
     },
     copyData (projectId) { // 复制，根据项目id查询详情
       this.copyVisible = true;
@@ -530,6 +524,11 @@ export default {
         i.projectId = ''
       });
       this.$post(`${this.api.copyProjectManage}`, row).then(res => {
+        this.form.projectName = ''
+        this.form.state = ''
+        this.form.permissions = ''
+        this.form.founder = 2
+
         this.initData();
         util.successMsg("复制实验项目成功");
         this.copyVisible = false;

src/pages/station/list/index.vue

@@ -64,7 +64,7 @@ export default {
     return {
       isSq: Setting.isSq,
       keyword: this.$route.query.keyword || '',
-      active: 0,
+      active: +this.$route.query.active || 0,
       tabs: [
         {
           id: 0,
@@ -95,7 +95,7 @@ export default {
         }).catch(err => { });
     },
     goPreview (item) {
-      this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.goodsName}&mallId=${item.mallId || ''}&keyword=${this.keyword}`);
+      this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.goodsName}&mallId=${item.mallId || ''}&keyword=${this.keyword}&active=${this.active}`);
     },
     // tab切换
     tabChange (item) {

src/pages/station/preview/index.vue

@@ -3,7 +3,7 @@
     <el-card shadow="hover"
              class="m-b-20">
       <div class="flex-between">
-        <el-page-header @back="goBack"
+        <el-page-header @back="back"
                         :content="curriculumName || courseName"></el-page-header>
       </div>
     </el-card>
@@ -559,10 +559,11 @@ export default {
 
   },
   methods: {
-    goBack () {
+    back () {
+      const { query } = this.$route
       this.fromAdmin ?
         this.$router.back() :
-        this.$router.push(`/station?keyword=${this.$route.query.keyword || ''}`)
+        this.$router.push(`/station?keyword=${query.keyword || ''}&active=${query.active || 0}`)
     },
     init () {
       this.insertScript();

src/store/modules/activity.js

@@ -1,5 +1,5 @@
 /**
- * 赛事相关
+ * 活动相关
  * */
 export default {
     namespaced: true,

src/store/modules/expSystem.js

@@ -1,5 +1,5 @@
 /**
- * 赛事相关
+ * 实验系统相关
  * */
 export default {
     namespaced: true,