fix

src/api/index.js

@@ -52,4 +52,5 @@ export default {
   delStaff: `/nakadai/nakadai/backstageStaff/delStaff`,
   expertResetPassword: `/nakadai/nakadai/backstageStaff/expertResetPassword`,
   updateAccountEnable: `/nakadai/nakadai/backstageStaff/updateAccountEnable`,
+  assessmentReviewSettingList: `/competition/competition/readAndAppraise/assessmentReviewSettingList`,
 }

src/layouts/footer/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div>
+  <div class="copyright">
-
+    <a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank">粤ICP备20072679号-3</a>
   </div>
 </template>
 <script>
@@ -14,4 +14,22 @@ export default {
   methods: {}
 };
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.copyright {
+  padding: 17px 0 9px;
+  text-align: center;
+  background-color: #0f1d2e;
+  font-size: 12px;
+  text-align: center;
+  line-height: 17px;
+
+  a {
+    color: #757f8a;
+    font-size: 12px;
+
+    &:hover {
+      color: #c7c7c7;
+    }
+  }
+}
+</style>

src/layouts/home/index.vue

@@ -10,6 +10,7 @@
           </transition>
           <el-backtop target=".content"></el-backtop>
         </div>
+        <v-footer v-if="inIframe" ref="footer"></v-footer>
       </div>
     </div>
   </div>
@@ -32,8 +33,11 @@ export default {
     vFooter
   },
   mounted () {
-    const { token } = this.$route.query
+    const { token, nakadai } = this.$route.query
     Setting.isDev && token && localStorage.setItem('review_token', token)
+    try {
+      nakadai ? localStorage.setItem('reviewFromNakadai', 1) : localStorage.removeItem('reviewFromNakadai') // 来自中台
+    } catch (e) { }
   },
 };
 </script>
@@ -68,13 +72,13 @@ export default {
 }
 
 .full {
-  padding: 20px;
-
   .layout {
     width: 100%;
 
     .content {
+      min-height: calc(100vh - 127px);
       height: auto;
+      padding: 0 20px;
     }
   }
 }

src/pages/account/login/index.vue

@@ -64,6 +64,7 @@
         <el-checkbox class="m-t-15 m-l-20" v-model="agreeCheck">同意，我已阅读</el-checkbox>
       </div>
     </div>
+    <v-footer ref="footer"></v-footer>
 
     <el-dialog title="重设密码" :visible.sync="resetPwVisible" :close-on-click-modal="false" width="500px">
       <el-form class="dia-form" ref="pwForm" label-width="110px" :model="pwForm" :rules="pwRules">
@@ -100,10 +101,14 @@
 </template>
 
 <script>
-import { mapState, mapMutations, mapActions } from 'vuex'
+import vFooter from '@/layouts/footer'
+import { mapState } from 'vuex'
 import Util from '@/libs/util'
 import Setting from "@/setting";
 export default {
+  components: {
+    vFooter
+  },
   data: function () {
     return {
       tabList: [
@@ -376,7 +381,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 100vh;
+  height: calc(100vh - 43px);
   background: url(../../../assets/images/shapes/shape1.png) (0 123px) / auto no-repeat,
     url(../../../assets/images/shapes/shape2.png) (35px 238px) / auto no-repeat,
     url(../../../assets/images/shapes/shape3.png) (0 485px) / auto no-repeat,

src/pages/allocationReview/list/index.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="page">
+    <el-tabs v-if="!fromNakadai" v-model="curTab" @tab-click="tabChange">
+      <el-tab-pane v-for="(item, i) in tabs" :key="i" :label="item.name" :name="item.id"></el-tab-pane>
+    </el-tabs>
+
     <h6 class="page-name">筛选</h6>
     <div class="tool">
       <ul class="filter">
@@ -42,18 +46,24 @@
 
     <el-table :data="list" v-loading="loading" class="table" ref="table" stripe header-align="center" row-key="stageId">
       <el-table-column type="index" width="50" label="序号" align="center"></el-table-column>
-      <el-table-column prop="competitionName" label="大赛名称" align="center" min-width="120"
+      <template v-if="curTab === '1'">
+        <el-table-column :key="1" prop="competitionName" label="大赛名称" align="center" min-width="120"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column :key="2" prop="stageName" label="阶段赛名称" align="center" min-width="100"></el-table-column>
+        <el-table-column :key="3" prop="competitionContent" label="比赛内容" align="center"
+          min-width="100"></el-table-column>
+      </template>
+      <el-table-column v-else :key="4" prop="competitionName" label="考核名称" align="center" min-width="120"
         show-overflow-tooltip></el-table-column>
-      <el-table-column prop="stageName" label="阶段赛名称" align="center" min-width="100"></el-table-column>
+      <el-table-column :key="5" prop="totalAnswer" label="总答卷数" align="center" width="90"></el-table-column>
-      <el-table-column prop="competitionContent" label="比赛内容" align="center" min-width="100"></el-table-column>
+      <el-table-column :key="6" prop="unReviewedAnswer" label="待评答卷数" align="center" width="90"></el-table-column>
-      <el-table-column prop="totalAnswer" label="总答卷数" align="center" width="90"></el-table-column>
+      <el-table-column :key="7" prop="reviewedAnswer" label="已评答卷数" align="center" width="90"></el-table-column>
-      <el-table-column prop="unReviewedAnswer" label="待评答卷数" align="center" width="90"></el-table-column>
+      <el-table-column :key="8" prop="time" label="评阅时间" align="center" width="160" />
-      <el-table-column prop="reviewedAnswer" label="已评答卷数" align="center" width="90"></el-table-column>
+      <el-table-column :key="9" prop="stage" label="评阅阶段" align="center" width="90"></el-table-column>
-      <el-table-column prop="time" label="评阅时间" align="center" width="160" />
+      <el-table-column :key="10" prop="reviewStatus" label="评阅情况" align="center" width="90"></el-table-column>
-      <el-table-column prop="stage" label="评阅阶段" align="center" width="90"></el-table-column>
+      <el-table-column :key="11" prop="taskAllocationStatus" label="任务分配情况" align="center"
-      <el-table-column prop="reviewStatus" label="评阅情况" align="center" width="90"></el-table-column>
+        width="100"></el-table-column>
-      <el-table-column prop="taskAllocationStatus" label="任务分配情况" align="center" width="100"></el-table-column>
+      <el-table-column :key="12" label="操作" align="center" width="220" fixed="right">
-      <el-table-column label="操作" align="center" width="220" fixed="right">
         <template slot-scope="scope">
           <template v-if="scope.row.seted">
             <el-button v-auth="'分配评阅任务:评阅进度'" type="text" @click="toProgress(scope.row)">评阅进度</el-button>
@@ -87,6 +97,22 @@ export default {
   data () {
     return {
       loading: false,
+      fromNakadai: localStorage.getItem('reviewFromNakadai'),
+      tabs: [
+        {
+          id: '1',
+          name: '竞赛'
+        },
+        {
+          id: '2',
+          name: '考核'
+        },
+        {
+          id: '3',
+          name: '练习'
+        },
+      ],
+      curTab: '1',
       dateList: [
         {
           id: '',
@@ -198,7 +224,7 @@ export default {
     async getList () {
       try {
         this.loading = true
-        const { pageList } = await this.$post(this.api.reviewSettingsList, {
+        const { pageList } = await this.$post(this.api[this.curTab === '1' ? 'reviewSettingsList' : 'assessmentReviewSettingList'], {
           ...this.filter,
           isTimed: this.month === 0 ? 0 : '',
           pageNum: this.page,
@@ -224,6 +250,10 @@ export default {
         this.loading = false
       }
     },
+    // tab切换回调
+    async tabChange () {
+      this.initData()
+    },
     // 切换页码
     currentChange (val) {
       this.page = val

src/pages/allocationReview/list/setup.vue

@@ -73,7 +73,7 @@
             <el-checkbox v-model="row.hasManualScoreType" :true-label="1">人工判分题</el-checkbox>
             <el-checkbox v-model="row.hasManualScoreType1" :true-label="1">整体评分表评分</el-checkbox>
           </el-form-item>
-          <el-form-item prop="name" label="成绩是否公布">
+          <el-form-item v-if="fromNakadai" prop="name" label="成绩是否公布">
             <el-radio v-model="row.resultsDetails" :label="0">是</el-radio>
             <span v-if="!row.resultsDetails" style="margin: 0 10px 0 -20px;font-size: 12px;color: #333;">公布时间：{{
               row.resultAnnouncementTime
@@ -102,6 +102,7 @@ export default {
   props: ['visible', 'row'],
   data () {
     return {
+      fromNakadai: localStorage.getItem('reviewFromNakadai'),
       arabicToChinese: Util.arabicToChinese,
       difficults: TestPaperConst.difficults,
       questionTypes: QuesConst.questionTypes,