Merge branch 'master' of http://182.92.203.7:2001/r/xiehe_website

杨磊

14 小时以前 afe2fbc5b0375c7c06853fc981deec74e04fd630

 src/views/classManage/studentJob.vue

@@ -44,7 +44,7 @@
          <el-table-column label="序号" prop="id" width="70"> </el-table-column>
          <el-table-column label="名称" prop="name"> </el-table-column>
          <el-table-column label="作业完成情况" #default="scope">
            <span v-if="scope.row.submitState == 'WaitCheck'" style="color: #ff6d00">待批改</span>
            <span v-if="scope.row.submitState == 'WaitCheck'" style="color: #019e58">待批改</span>
            <span v-if="scope.row.submitState == 'Normal'" style="color: #67c23a">已批改</span>
            <span v-if="!scope.row.submitState" style="color: red">未提交</span>
          </el-table-column>
@@ -303,13 +303,13 @@
          color: #333;
          line-height: 30px;
          text-align: left;
          border-left: 6px solid #ff6c00;
          border-left: 6px solid #019e58;
          padding-left: 10px;
        }
      }
      margin-top: 20px;
      ::v-deep .el-tabs__nav-wrap::after {
        background-color: #ff6d00;
        background-color: #019e58;
        height: 1px;
      }

@@ -320,7 +320,7 @@
      }

      ::v-deep .is-active {
        background-color: #ff6d00;
        background-color: #019e58;
        color: #fff;
        border-radius: 3px 3px 0 0;
      }