Merge branch 'v2.0_ch' into v2.0

src/router/modules/etaMenu.js

@@ -12,7 +12,7 @@ export default[
       {
         path:'etaMenuList',
         name:'etaMenuList',
-        component:() => import('@/views/etaMenu_manage/etaMenuConfig.vue'),
+        component:() => import('@/views/etaMenu/etaMenuConfig.vue'),
         meta:{
           title:'ETA菜单配置'
         },

src/views/etaMenu_manage/components/ModifyMenuDialog.vue → src/views/etaMenu/components/ModifyMenuDialog.vue

@@ -79,7 +79,7 @@
 
 <script setup>
 import { ref, watch, computed, onMounted } from 'vue';
-import _ from 'lodash'; // 确保项目中已安装lodash库
+import _ from 'lodash';
 import ChoosedIconDialog from './ChoosedIconDialog.vue';
 
 // Props

src/views/etaMenu_manage/etaMenuConfig.vue → src/views/etaMenu/etaMenuConfig.vue

@@ -7,43 +7,39 @@
             </t-input>
         </div>
         <div class="menu-table">
-            <el-table border
+            <t-enhanced-table
                 :data="tableData"
+                :columns="tableColumns"
                 row-key="MenuId"
-                :tree-props="{children:'Children'}"
+                :bordered="true"
+                :tree="{ childrenKey: 'Children' }"
+                :treeExpandAndFoldIcon="treeExpandIcon"
             >
-                <el-table-column v-for="column in tableColumns" :key="column.key"
-                    header-align="center"
-                    :align="column.key==='Name'?'':'center'"
-                    :prop="column.key"
-                    :label="column.label">
-                    <template #default="scope">
-                        <!-- 菜单名称 -->
-                        <div class="menu-name" v-if="column.key==='Name'">
-                            <span>{{scope.row[column.key]}}</span>
-                        </div>
-                        <!-- 图标 -->
-                        <div class="menu-icon" v-else-if="column.key==='IconPath'">
-                            <img :src="scope.row[column.key]" v-if="scope.row[column.key]" style="width:24px;height:24px;">
-                            <span v-else>-</span>
-                        </div>
-                        <!-- 状态 -->
-                        <div class="menu-status" v-else-if="column.key==='Hidden'">
-                            <span>{{scope.row[column.key]===0?'显示':'隐藏'}}</span>
-                        </div>
-                        <div v-else>
-                            <span>{{scope.row[column.key]}}</span>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="操作">
-                    <template #default="scope">
-                        <t-button variant="text" theme="primary" @click="handleModifyMenu('addNext',scope.row)">添加子项</t-button>
-                        <t-button variant="text" theme="primary" @click="handleModifyMenu('edit',scope.row)">编辑</t-button>
-                        <t-button variant="text" theme="primary" style="color:#FF0000;" @click="deleteMenu(scope.row)">删除</t-button>
-                    </template>
-                </el-table-column>
-            </el-table>
+                <!-- 菜单名称 -->
+                <template #Name="{ row }">
+                    <div class="menu-name">
+                        <span>{{row.Name}}</span>
+                    </div>
+                </template>
+                <!-- 图标 -->
+                <template #IconPath="{ row }">
+                    <div class="menu-icon">
+                        <img :src="row.IconPath" v-if="row.IconPath" style="width:24px;height:24px;">
+                        <span v-else>-</span>
+                    </div>
+                </template>
+                <!-- 状态 -->
+                <template #Hidden="{ row }">
+                    <div class="menu-status">
+                        <span>{{row.Hidden===0?'显示':'隐藏'}}</span>
+                    </div>
+                </template>
+                <template #opt="{ row }">
+                    <t-button variant="text" theme="primary" @click="handleModifyMenu('addNext',row)">添加子项</t-button>
+                    <t-button variant="text" theme="primary" @click="handleModifyMenu('edit',row)">编辑</t-button>
+                    <t-button variant="text" theme="primary" style="color:#FF0000;" @click="deleteMenu(row)">删除</t-button>
+                </template>
+            </t-enhanced-table>
         </div>
         <ModifyMenuDialog 
             :isShowMenuDialog="isShowMenuDialog"
@@ -57,26 +53,35 @@
     </div>
 </template>
 
-<script setup>
+<script setup lang="jsx">
 import { ref, onMounted } from 'vue';
 import { menuConfigInterface } from '@/api/modules/etaMenuApi';
 import ModifyMenuDialog from './components/ModifyMenuDialog.vue';
-import { SearchIcon } from 'tdesign-icons-vue-next';
-import { ElTable, ElTableColumn } from 'element-plus';
-import 'element-plus/es/components/table/style/css';
+import { SearchIcon, ChevronRightIcon, ChevronDownIcon } from 'tdesign-icons-vue-next';
 
 const Keyword = ref('');
 const tableColumns = ref([
-  { label: '菜单名称', key: 'Name' },
-  { label: '图标', key: 'IconPath' },
-  { label: '状态', key: 'Hidden' },
-  { label: '创建时间', key: 'CreateTime' },
+  { title: '菜单名称', colKey: 'Name' },
+  { title: '图标', colKey: 'IconPath', align: 'center' },
+  { title: '状态', colKey: 'Hidden', align: 'center' },
+  { title: '创建时间', colKey: 'CreateTime', align: 'center' },
+  { title:'操作', colKey:'opt', align: 'center' }
 ]);
 const tableData = ref([]);
 const formData = ref({});
 const openType = ref('add');
 const isShowMenuDialog = ref(false);
 
+const treeExpandIcon = computed(() => {
+  // 自定义展开图标
+  return treeExpandAndFoldIconRender;
+});
+
+// 自定义展开图标组件
+const treeExpandAndFoldIconRender = (h, { type, row }) => {
+  return type === 'expand' ? <ChevronRightIcon /> : <ChevronDownIcon />;
+};
+
 // 获取菜单数据
 const getMenuData = async () => {
   try {

src/views/training/classifyManage.vue

@@ -93,11 +93,11 @@ watch(isModifyDialogShow, (newVal) => {
 });
 
 // 方法
-
 const treeExpandAndFoldIconRender = (h, { type, row }) => {
   return type === 'expand' ? <ChevronRightIcon /> : <ChevronDownIcon />;
 };
 
+// 修改分类信息弹窗
 const handleModifyClassify = (data) => {
   currentClassify.value = _.cloneDeep(data);
   if (data.ParentId === 0) {
@@ -106,6 +106,7 @@ const handleModifyClassify = (data) => {
   isModifyDialogShow.value = true;
 };
 
+// 修改分类信息
 const modifyClassify = async () => {
   await formData.value.validate();
   let res = null;
@@ -127,6 +128,7 @@ const modifyClassify = async () => {
   isModifyDialogShow.value = false;
 };
 
+// 删除分类信息
 const deleteClassify = async (data) => {
   if (data.Children && data.Children.length) {
     await $confirmDialog({
@@ -149,6 +151,7 @@ const deleteClassify = async (data) => {
   }
 };
 
+// 获取数据
 const getTableData = async () => {
   ClassifyInterface.getClassifyList({
     Keyword: searchText.value

src/views/training/components/addTags.vue

@@ -48,10 +48,8 @@ import { TagInterface } from '@/api/modules/trainingApi';
 import { SearchIcon } from 'tdesign-icons-vue-next';
 import _ from 'lodash';
 
-// 定义 emit 函数
 const emit = defineEmits(['modify', 'close']);
 
-// 定义props
 const props = defineProps({
   isModifyDialogShow: {
     type: Boolean,
@@ -71,10 +69,6 @@ const props = defineProps({
   },
 });
 
-// 定义组件
-const components = {
-  SearchIcon,
-};
 
 // 定义响应式数据
 const searchText = ref('');

src/views/training/labelManage.vue

@@ -66,16 +66,15 @@ const total = ref(0);
 const currentLabel = ref({});
 const isModifyDialogShow = ref(false);
 
-// handleModifyLabel 方法
+// 修改标签信息弹窗
 const handleModifyLabel = (data) => {
-    // currentLabel.value = 
   currentLabel.value = _.cloneDeep(data);
   isModifyDialogShow.value = true;
 };
 
-// modifyLabel 方法
+// 修改标签名称的函数
 const modifyLabel = async () => {
-    console.log(currentLabel.value);
+    // console.log(currentLabel.value);
     
   if (!currentLabel.value.TagName) {
     MessagePlugin.warning("请输入标签名称");
@@ -106,7 +105,7 @@ const modifyLabel = async () => {
   isModifyDialogShow.value = false;
 };
 
-// deleteLabel 方法
+// 删除标签
 const deleteLabel = async (label) => {
     if (label.VideoTotal !== 0) {
         await  $confirmDialog({
@@ -128,7 +127,7 @@ const deleteLabel = async (label) => {
     });
 };
 
-// getTableData 方法
+// 获取标签列表数据
 const getTableData = async () => {
   tableLoading.value = true;
   const res = await TagInterface.getTagList({
@@ -147,7 +146,7 @@ const getTableData = async () => {
   total.value = res.Data.Paging.Totals;
 };
 
-// handleCurrentChange 方法
+// 页码变化
 const handleCurrentChange = (page) => {
   currentPage.value = page;
   getTableData();

src/views/training/videoManage.vue

@@ -288,8 +288,8 @@ const endingPreview = () => {
 
 // 生命周期钩子 - 组件挂载时执行
 onMounted(() => {
-  getClassifyList(); // 假设这是 mixin 或组件内定义的方法
-  getTagList();     // 假设这是 mixin 或组件内定义的方法
+  getClassifyList();
+  getTagList();
   getTableData();
 });
 </script>