Merge branch 'master' of https://gitlab-pro.ezijing.com/ezijing-web/saas-lab

src/modules/admin/lab/experiment/components/DMLFormDialog.vue

@@ -182,11 +182,11 @@ function handleSubmit() {
         <el-tab-pane label="旅程资源" :name="2">
           <el-form-item label="是否允许学生新建如下资源">
             <el-radio-group v-model="form.is_use_common">
-              <el-radio :label="0">否</el-radio>
-              <el-radio :label="1">是</el-radio>
+              <el-radio :label="1">否</el-radio>
+              <el-radio :label="0">是</el-radio>
             </el-radio-group>
           </el-form-item>
-          <template v-if="form.is_use_common === 0">
+          <template v-if="form.is_use_common === 1">
             <el-divider />
             <el-form-item label="用户/事件数据" label-width="118">
               <el-select v-model="form.ids" multiple style="width: 100%" disabled>

src/modules/student/contest/views/Lab.vue

@@ -133,7 +133,7 @@ const handleShowHead = function () {
             <!-- <Book :competition_id="id" :key="resizeKey"></Book> -->
             <Book :competition_id="id"></Book>
           </el-tab-pane>
-          <el-tab-pane label="操作视频" lazy>
+          <el-tab-pane label="操作视频" lazy v-if="false">
             <Video :competition_id="id"></Video>
           </el-tab-pane>
           <el-tab-pane label="讨论交流" lazy>