Merge branch 'dev-prof-phrase1.0-0720' of...

Merge branch 'dev-prof-phrase1.0-0720' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-prof-phrase1.0-0720

src/views/education/create-component.vue

@@ -265,22 +265,25 @@
                                                                     </el-select>
                                                                 </el-form-item>
                                                             </el-col>
-                                                            <el-row>
-                                                                <el-col :span="10">
-                                                                    <el-form-item label="是否有试看限制">
-                                                                        <el-radio-group v-model="item3.content5">
-                                                                            <el-radio label="1">是</el-radio>
-                                                                            <el-radio label="0">否</el-radio>
-                                                                        </el-radio-group>
-                                                                    </el-form-item>
-                                                                </el-col>
-                                                                <el-col :span="10" v-if="item3.content5 == 1">
-                                                                    <el-form-item label="试看时长">
-                                                                        <el-input maxlength="8" type="input" rows="4" v-model="item3.content6" size="small" placeholder="请输入试看时长" style="width:300px"></el-input>
-                                                                        <span class="word-num">(秒)</span>
-                                                                    </el-form-item>                                                                   
-                                                                </el-col>
-                                                            </el-row>                                                            
+                                                            <el-col :span="10">
+                                                                <el-form-item label="是否有试看限制">
+                                                                    <el-radio-group v-model="item3.content5">
+                                                                        <el-radio label="1">是</el-radio>
+                                                                        <el-radio label="0">否</el-radio>
+                                                                    </el-radio-group>                                                           
+                                                                    <!-- <el-radio-group v-if="!item3.content5" v-model="item3.content5">
+                                                                        <el-radio label="1">是</el-radio>
+                                                                        <el-radio label=null>否1</el-radio>
+                                                                        <el-radio label=undefind>否1</el-radio>
+                                                                    </el-radio-group> -->
+                                                                </el-form-item>
+                                                            </el-col>
+                                                            <el-col :span="10" v-if="item3.content5 == 1">
+                                                                <el-form-item label="试看时长">
+                                                                    <el-input maxlength="8" type="input" rows="4" v-model="item3.content6" size="small" placeholder="请输入试看时长" style="width:300px"></el-input>
+                                                                    <span class="word-num">(秒)</span>
+                                                                </el-form-item>                                                                   
+                                                            </el-col>
                                                         </el-row>
 
                                                     </div>
@@ -742,6 +745,10 @@ export default {
             vm.GET('portal/portalComponent/OnlineExamList').then((res) => {
                 if( res.code == '000000') {
                     vm.testIdSelect = res.data.onlineExamList;
+                    vm.testIdSelect.unshift({
+                        id: 0,
+                        onlineExamName: '无考试'
+                    })
                     for(let i=0; i<vm.testIdSelect.length; i++) {
                         let type = vm.testIdSelect[i].isNeedApproval;  // isNeedApproval: 0 全部考试 1 需审核考试
                         if( type && type == 1 ) {  
@@ -780,6 +787,10 @@ export default {
             vm.GET('portal/portalComponent/CourseList').then((res) => {
                 if( res.code == '000000') {
                     vm.courseIdSelect = res.data.courseList
+                    vm.courseIdSelect.unshift({
+                        id: 0,
+                        name: '无课程'
+                    })
                 }else {
 					vm.$message.info(res.message)
 				}
@@ -968,7 +979,9 @@ export default {
                             content1: '',
                             content2: '',
                             content3: '0',
-                            content4: ''
+                            content4: '',
+                            content5: 0,
+                            content6: 0,
                         }]
                     })
                 }else if(item.partConfigModelList[i].type == 2) {  // 课程
@@ -986,7 +999,11 @@ export default {
                             id: '',
                             seqNo: '',
                             content1: '',
-                            content2: ''
+                            content2: '',
+                            content3: '0',
+                            content4: '',
+                            content5: '0',
+                            content6: '',
                         }]
                     })
                 }