Merge branch 'master' of ssh://gitlab.frkj.cc:222/php/zhjwxt

admin/src/app/views/course/components/course-edit.vue

@@ -11,7 +11,7 @@
 			<el-form-item :label="t('courseType')" prop="course_type">
 				<el-select class="input-width" v-model="formData.course_type" :placeholder="t('courseTypePlaceholder')">
 					<el-option v-for="(item, index) in courseTypeList" :key="index" :label="item.name"
-						:value="item.name" />
+						:value="item.value" />
 				</el-select>
 			</el-form-item>
 			<el-form-item :label="t('duration')" prop="duration">

admin/src/app/views/course/course.vue

@@ -72,12 +72,21 @@
             :show-overflow-tooltip="true"
           />
 
-          <el-table-column
+    <!--      <el-table-column
             prop="course_type"
             :label="t('courseType')"
             min-width="120"
             :show-overflow-tooltip="true"
-          />
+          /> -->
+		  
+		  
+		  <el-table-column :label="t('courseName')" min-width="120" align="center" :show-overflow-tooltip="true">
+		      <template #default="{ row }">
+		          <div v-for="(item, index) in courseTypeList">
+		              <div v-if="item.value == row.course_type">{{ item.name }}</div>
+		          </div>
+		      </template>
+		  </el-table-column>
 
           <el-table-column
             prop="duration"
@@ -207,6 +216,8 @@ const dictData = () => {
 }
 
 
+
+
 const courseTypeList = ref([])
 const getcourseTypeList = async () => {
   courseTypeList.value = await (