diff --git a/src/views/report/Overvoewnew.vue b/src/views/report/Overvoewnew.vue
index b3824df4..efa75904 100644
--- a/src/views/report/Overvoewnew.vue
+++ b/src/views/report/Overvoewnew.vue
@@ -35,27 +35,27 @@
                   placeholder="请选择状态" allowClear :options="statusList">
         </a-select>
       </div>
-<!--      <div class="select" v-if="[3].includes(currentTab) ">-->
-<!--        <a-tree-select-->
-<!--            :getPopupContainer="-->
-<!--                (triggerNode) => triggerNode.parentNode || document.body-->
-<!--              "-->
-<!--            v-model:value="categoryTypeId"-->
-<!--            show-search-->
-<!--            style="width: 100%"-->
-<!--            :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"-->
-<!--            placeholder="请选择内容分类"-->
-<!--            allow-clear-->
-<!--            tree-default-expand-all-->
-<!--            :fieldNames="{-->
-<!--                children: 'children',-->
-<!--                label: 'name',-->
-<!--                value: 'code',-->
-<!--              }"-->
-<!--            :tree-data="sysTypeOptions"-->
-<!--        >-->
-<!--        </a-tree-select>-->
-<!--      </div>-->
+      <div class="select" v-if="[3].includes(currentTab) ">
+        <a-tree-select
+            :getPopupContainer="
+                (triggerNode) => triggerNode.parentNode || document.body
+              "
+            v-model:value="categoryTypeId"
+            show-search
+            style="width: 100%"
+            :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+            placeholder="请选择内容分类"
+            allow-clear
+            tree-default-expand-all
+            :fieldNames="{
+                children: 'children',
+                label: 'name',
+                value: 'code',
+              }"
+            :tree-data="sysTypeOptions"
+        >
+        </a-tree-select>
+      </div>
       <div class="select" v-if="currentTab !== 6">
         <a-input
             style="width: 100%; height: 40px; border-radius: 3px"
@@ -213,6 +213,7 @@ import {message} from "ant-design-vue";
 import Cookies from "vue-cookies";
 import {useStore} from "vuex";
 import orgjson from './org.json';
+// import fl from './fl.json';
 import PostSelectNew from "@/components/growthpath/PostSelect.vue";
 import OfficeSelect from "@/components/growthpath/OfficeSelect.vue";
 import draggable from 'vuedraggable';
@@ -224,6 +225,8 @@ export default {
   setup() {
     const store = useStore();
     const sysTypeOptions = computed(() => store.state.content_type);
+    // const sysTypeOptions = fl;
+
     const state = reactive({
       tableLoading: false, // table加载图标
       tableDataTotal: 0, // 数据总条数
@@ -528,7 +531,7 @@ export default {
           startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null,
           endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null,
           orgPath: state.orgPath,
-          category: findPathByValue(state.categoryTypeId)
+          category: findPathByValue(sysTypeOptions, state.categoryTypeId)
         });
       } else if (state.currentTab === 2) {
         res = await api.facePageList({
@@ -874,6 +877,9 @@ export default {
             ellipsis: true,
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value);
+            },
           },
           {
             title: "参加人数",
@@ -881,6 +887,9 @@ export default {
             ellipsis: true,
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value);
+            },
           },
           {
             title: "参考率",
@@ -899,6 +908,9 @@ export default {
             key: "passNum",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value);
+            },
           },
           {
             title: "及格率",
@@ -919,7 +931,7 @@ export default {
             width: 120,
             align: "center",
             customRender: (text) => {
-              return formatTextRate(text.value);
+              return formatValNull(text.value);
             },
           },
           {
@@ -929,6 +941,9 @@ export default {
             key: "medianScore",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value);
+            },
           },
           {
             title: "平均答题时长(分钟)",
@@ -937,6 +952,9 @@ export default {
             key: "avgTestDuration",
             width: 160,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value);
+            },
           },
           {
             title: "发布时间",
@@ -1102,7 +1120,7 @@ export default {
             ellipsis: true,
             fixed: "left",
             key: "caseName",
-            width: 120,
+            width: 150,
             align: "left",
           },
           {
@@ -1111,7 +1129,7 @@ export default {
             ellipsis: true,
             align: "center",
             fixed: "left",
-            width: 120,
+            width: 150,
           },
           {
             title: "专业分类",
@@ -1255,6 +1273,9 @@ export default {
             key: "keywords",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value)
+            },
           },
           {
             title: "课件数量",
@@ -1366,8 +1387,8 @@ export default {
         columns.value = [
           {
             title: "课程名称",
-            dataIndex: "offCourseName",
-            key: "offCourseName",
+            dataIndex: "offCoursePlanName",
+            key: "offCoursePlanName",
             width: 120,
             ellipsis: true,
             align: "left",
@@ -1419,6 +1440,9 @@ export default {
             key: "address",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value)
+            },
           },
           {
             title: "授课讲师",
@@ -1427,9 +1451,10 @@ export default {
             key: "teacher",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value)
+            },
           },
-
-
           {
             title: "是否作业",
             dataIndex: "hasWorkInfo",
@@ -1437,6 +1462,9 @@ export default {
             key: "hasWorkInfo",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return text.value == 1 ? "是" : "否";
+            },
           },
           {
             title: "是否考试",
@@ -1445,6 +1473,9 @@ export default {
             key: "hasTest",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return text.value == 1 ? "是" : "否";
+            },
           },
           {
             title: "参加人数",
@@ -1461,6 +1492,9 @@ export default {
             key: "assessmentNum",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value);
+            },
           },
           {
             title: "平均评分",
@@ -1469,6 +1503,9 @@ export default {
             key: "assessmentScore",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value);
+            },
           },
           {
             title: "作业完成人数",
@@ -1477,6 +1514,9 @@ export default {
             key: "workCompNum",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value);
+            },
           },
           {
             title: "作业平均分",
@@ -1485,6 +1525,9 @@ export default {
             key: "workAvgScore",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value);
+            },
           },
           {
             title: "考试完成人数",
@@ -1493,6 +1536,9 @@ export default {
             key: "testCompNum",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value);
+            },
           },
           {
             title: "考试平均分",
@@ -1501,6 +1547,9 @@ export default {
             key: "testAvgScore",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatValNull(text.value);
+            },
           },
 
           {
@@ -1518,6 +1567,9 @@ export default {
             key: "reportCreateTime",
             width: 120,
             align: "center",
+            customRender: (text) => {
+              return formatDate(text.value)
+            },
           },
         ];
       } else if (index === 1) {
@@ -1612,6 +1664,9 @@ export default {
             key: "studentLearnRate",
             width: 120,
             align: "center",
+            customRender (text) {
+              return formatTextRate(text.value);
+            },
           },
           {
             title: "完成人数",
@@ -1628,6 +1683,9 @@ export default {
             key: "studentCompleteRate",
             width: 120,
             align: "center",
+            customRender (text) {
+              return formatTextRate(text.value);
+            },
           },
           {
             title: "总任务数",
@@ -1644,6 +1702,9 @@ export default {
             key: "taskRate",
             width: 120,
             align: "center",
+            customRender (text) {
+              return formatTextRate(text.value);
+            },
           },
           {
             title: "在线课程数",
@@ -1688,6 +1749,7 @@ export default {
             dataIndex: "examNum",
             ellipsis: true,
             key: "examNum",
+            align: "center",
             width: 120,
           },
           {
@@ -1695,6 +1757,7 @@ export default {
             dataIndex: "examPassRate",
             ellipsis: true,
             key: "examPassRate",
+            align: "center",
             width: 120,
             customRender: (text) => {
               return formatTextRate(text.value);
@@ -1753,11 +1816,24 @@ export default {
     };
     //时间格式化 后续抽到 工具类中
     const formatTime_ = (time, format = "YYYY-MM-DD HH:mm:ss") => {
+      if(!time){
+        return null;
+      }
       return dayjs(time).format(format);
     };
     //后续抽到 工具类中
     function formatTextRate(value) {
-      return value ? value + "%" : "0%";
+      if (!value && value != 0) {
+        return "-";
+      }
+      return value + "%";
+    }
+
+    function formatValNull(val) {
+      if (!val && val !== 0) {
+        return "-";
+      }
+      return val;
     }
 
     // 获取名称路径的函数
@@ -1769,7 +1845,7 @@ export default {
             return path + node.name;
           }
           if (node.children) {
-            let result = recursiveSearch(node.children, value, path + node.name + '-');
+            let result = recursiveSearch(node.children, value, path + node.name + '/');
             if (result) {
               return result;
             }
@@ -1778,7 +1854,7 @@ export default {
         return null;
       }
 
-      if (!data) {
+      if (!data || !value) {
         return null;
       }
       return recursiveSearch(data, value, '');
@@ -2054,4 +2130,7 @@ export default {
 //  background-color: #eff4fc;
 //  cursor: move; // 启用拖拽光标
 //}
+.ant-table-tbody > tr > td {
+  user-select: text !important;
+}
 </style>