选择课程等

2 years ago · 4d98052b9a
parent 423bb87fb1
commit 4d98052b9a
6 changed files with 52 additions and 20 deletions
--- a/README.md
+++ b/README.md
@ -0,0 +1 @@
+# 中台前端
--- a/src/store/index.js
+++ b/src/store/index.js
@ -22,7 +22,8 @@ const store = new Vuex.Store({
        btns: [],
        routes: [],
        customerPage: 1,
-        matchPage: 1
+        matchPage: 1,
+        platformSource: 0
    },
    actions: {
        setSystemId({ state,commit },systemId) {
@ -87,6 +88,9 @@ const store = new Vuex.Store({
        SET_M_PAGE: (state, page) => {
            state.matchPage = page
        },
+        SET_M_SOURCE: (state, platformSource) => {
+            state.platformSource = platformSource
+        },
    }
 });
 
--- a/src/views/course/AddCurriculum.vue
+++ b/src/views/course/AddCurriculum.vue
@ -278,9 +278,9 @@
              <el-input placeholder="请输入系统名称" prefix-icon="el-icon-search" v-model.trim="systemKeyword" clearable></el-input>

              <ul class="systems">
-                <li v-for="(item, i) in systems" :key="i">
+                <li v-for="(item, i) in systems" :key="i" :title="item.systemName">
                  <el-checkbox v-model="item.check" @change="val => systemChange(val, item)"></el-checkbox>
-                  <div class="name" @click="getProject(item)">
+                  <div :class="['name', {active: curSystem == item.systemId}]" @click="getProject(item)">
                    <span>{{ item.systemName }}</span>
                    <i class="el-icon-arrow-right"></i>
                  </div>
@ -296,7 +296,7 @@
              <el-input placeholder="请输入项目名称" prefix-icon="el-icon-search" v-model.trim="projectKeyword" clearable></el-input>

              <ul class="systems">
-                <li v-for="(item, i) in projects" :key="i">
+                <li v-for="(item, i) in projects" :key="i" :title="item.projectName">
                  <el-checkbox v-model="item.check" :label="item.projectName" @change="val => projectChange(val, item)"></el-checkbox>
                </li>
              </ul>
@ -308,20 +308,20 @@
                <span>已选择项目（{{ checkeds.length }}个）</span>
              </div>
              <el-input style="width: 200px;margin-bottom: 20px;" placeholder="请输入项目名称" prefix-icon="el-icon-search" v-model.trim="checkedKeyword" clearable></el-input>
-              <el-table :data="checkeds" class="table" stripe header-align="center">
-                <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
+              <el-table :data="checkeds" class="table" stripe header-align="center" max-height="470">
+                <el-table-column type="index" width="55" label="序号" align="center"></el-table-column>
                <el-table-column prop="applicationName" label="系统名称" align="center">
                  <template slot-scope="scope">
                    {{ systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
                  </template>
                </el-table-column>
-                <el-table-column prop="projectName" width="90" label="系统类型" align="center">
+                <el-table-column prop="projectName" width="80" label="系统类型" align="center">
                  <template slot-scope="scope">
                    {{ scope.row.type }}
                  </template>
                </el-table-column>
                <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
-                <el-table-column label="操作" align="center" width="60">
+                <el-table-column label="操作" align="center" width="55">
                  <template slot-scope="scope">
                    <i class="el-icon-delete rm" @click="delProject(scope.$index)"></i>
                  </template>
@ -443,6 +443,7 @@ export default {
            systemAll: [],
            systems: [],
            systemChecked: [],
+            curSystem: '',
            projects: [],
            projectAll: [],
            projectKeyword: '',
@ -625,6 +626,7 @@ export default {
        getProject(item) {
          const { check } = item // 项目选中状态跟随系统
          const checked = this.permissions ? this.assessmentData : this.practiceData
+          this.curSystem = item.systemId
          this.$get(`${this.api.getInternalProjectBySystemId}?permissions=${this.permissions}&systemId=${item.systemId}`).then(res => {
            this.projectAll = JSON.parse(JSON.stringify(res)) // 全部项目，另外保存
            const result = []
@ -964,17 +966,19 @@ $avatar-width: 104px;
    margin-bottom: 15px;
  }
  .item {
+    width: 250px;
    max-height: 600px;
+    padding: 10px;
    margin-right: 20px;
-    overflow: auto;
+    overflow: hidden;
  }
  .system {
-    width: 280px;
-    padding: 10px;
    background-color: #f9f9f9;
  }
  .systems {
    margin-top: 10px;
+    max-height: 550px;
+    overflow: auto;
    li {
      display: flex;
      align-items: center;
@ -987,16 +991,23 @@ $avatar-width: 104px;
      align-items: center;
      margin-left: 5px;
      cursor: pointer;
-      &:hover {
+      &.active, &:hover {
        color: #9076FF;
      }
+      span {
+        max-width: 200px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
      }
    }
-  .project {
-    width: 350px;
  }
  .checked {
    flex: 1;
+    width: auto;
+    .el-table .cell {
+      font-size: 12px;
+    }
  }
  .rm {
    font-size: 14px;
--- a/src/views/match/list/index.vue
+++ b/src/views/match/list/index.vue
@ -28,13 +28,13 @@
            <ul class="filter">
                <li>
                    <label>大赛来源：</label>
-                    <el-select v-model="form.platformSource" clearable @change="getData">
+                    <el-select v-model="form.platformSource" clearable @change="sourceChange">
                        <el-option v-for="(item, i) in sourceList" :key="i" :label="item.name" :value="item.id"></el-option>
                    </el-select>
                </li>
                <li>
                    <label>大赛范围：</label>
-                    <el-select v-model="form.competitionScope" clearable @change="getData">
+                    <el-select v-model="form.competitionScope" clearable @change="initData">
                        <el-option v-for="(item, i) in rangeList" :key="i" :label="item.name" :value="item.id"></el-option>
                    </el-select>
                </li>
@ -147,7 +147,7 @@ export default {
                publishStatus: "",
                startTime: "",
                endTime: "",
-                platformSource: 0, // 大赛来源(0中台，1职站)
+                platformSource: +this.$route.query.platformSource || 0, // 大赛来源(0中台，1职站)
                competitionScope: '', // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
            },
            multipleSelection: [],
@ -251,6 +251,18 @@ export default {
            this.$refs.table.clearSelection();
            this.initData();
        },
+        // 大赛来源回调
+        sourceChange(val) {
+          this.$router.push({
+            path: '/match',
+            query: {
+              ...this.$route.query,
+              platformSource: val
+            }
+          })
+          this.$store.commit('SET_M_SOURCE', val)
+          this.initData()
+        },
        delData(row) {
            this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
                type: "warning"
--- a/src/views/match/manage/index.vue
+++ b/src/views/match/manage/index.vue
@ -95,7 +95,7 @@ export default {
        },
        // 返回列表
        backPage(){
-          this.$router.push(`/match?page=${this.$store.state.matchPage}`)
+          this.$router.push(`/match?page=${this.$store.state.matchPage}&platformSource=${this.$store.state.platformSource}`)
        },
        // tab切换
        tabSwitch(i) {
--- a/src/views/match/preview/index.vue
+++ b/src/views/match/preview/index.vue
@ -136,7 +136,11 @@ export default {
      // 公告列表
      getNotice() {
        this.$post(`${this.api.queryAnnouncementByContestId}?pageNum=1&pageSize=1000&contestId=${this.form.id}`).then(({ data }) => {
-          this.notices = data.records.filter(e => e.status) // 只显示已发布的（status 0草稿 1为已发布）
+          const records = data.records.filter(e => e.status) // 只显示已发布的（status 0草稿 1为已发布）
+          records.map(e => {
+            e.announcementText = e.announcementText.replace(/<img.*?(?:>|\/>)/gi, '')
+          })
+          this.notices = records
        }).catch(res => {})
      },
      // 预览附件