教育学习模块，新增专业类别；

修改系统名字为CMC智联云枢办公系统

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcResourceMapper.xml

@@ -56,12 +56,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectCmcResourceListBelow" parameterType="CmcResource" resultMap="CmcResourceResult">
-        SELECT r.resource_id, r.uploader, r.upload_dept, r.title, r.source_path, r.type, r.field_id, r.upload_time, r.hours
+        SELECT r.resource_id, r.uploader, r.upload_dept, r.title, r.source_path, r.type, r.field_id, tree.field, r.upload_time, r.hours
         FROM cmc_resource AS r
         LEFT JOIN sys_user AS u ON u.user_id = r.uploader
         LEFT JOIN sys_dept AS d ON d.dept_id = r.upload_dept
         RIGHT JOIN (
-        SELECT rf2.field_id FROM
+        SELECT rf2.field_id, rf2.field FROM
         ( SELECT rf1.field_id AS sub_field_id, rf1.parent_id AS sub_parent_id, rf0.field_id, rf0.parent_id
         FROM cmc_resource_field AS rf0
         LEFT JOIN cmc_resource_field AS rf1 ON rf1.parent_id = rf0.field_id

oa-ui/.env.development

@@ -1,10 +1,16 @@
+###
+ # @Author: ysh
+ # @Date: 2024-06-21 18:51:04
+ # @LastEditors: 
+ # @LastEditTime: 2025-03-25 17:00:43
+### 
 # 页面标题
-VUE_APP_TITLE = CMC综合办公系统
+VUE_APP_TITLE = CMC智联云枢办公系统
 
 # 开发环境配置
 ENV = 'development'
 
-# CMC综合办公系统/开发环境
+# CMC智联云枢办公系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

oa-ui/.env.production

@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = CMC综合办公系统
+VUE_APP_TITLE = CMC智联云枢办公系统
 
 # 生产环境配置
 ENV = 'production'
 
-# CMC综合办公系统/生产环境
+# CMC智联云枢办公系统/生产环境
 VUE_APP_BASE_API = '/prod-api'

oa-ui/.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = CMC综合办公系统
+VUE_APP_TITLE = CMC智联云枢办公系统
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# CMC综合办公系统/测试环境
+# CMC智联云枢办公系统/测试环境
 VUE_APP_BASE_API = '/stage-api'

oa-ui/src/api/oa/study/resource.js

@@ -8,7 +8,14 @@ export function listResource(query) {
     params: query
   })
 }
-
+// 查询cmc学习资料列表根据类名
+export function getListBelow(query) {
+  return request({
+    url: '/oa/resource/getListBelow',
+    method: 'get',
+    params: query
+  })
+}
 // 查询cmc学习资料详细
 export function getResource(resourceId) {
   return request({

oa-ui/src/api/oa/study/resourceField.js

@@ -0,0 +1,50 @@
+/*
+ * @Author: ysh
+ * @Date: 2025-03-24 10:15:00
+ * @LastEditors: 
+ * @LastEditTime: 2025-03-24 10:15:15
+ */
+import request from '@/utils/request'
+
+// 查询cmc专业领域列表
+export function listField(query) {
+  return request({
+    url: '/oa/field/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc专业领域详细
+export function getField(fieldId) {
+  return request({
+    url: '/oa/field/' + fieldId,
+    method: 'get'
+  })
+}
+
+// 新增cmc专业领域
+export function addField(data) {
+  return request({
+    url: '/oa/field',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc专业领域
+export function updateField(data) {
+  return request({
+    url: '/oa/field',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc专业领域
+export function delField(fieldId) {
+  return request({
+    url: '/oa/field/' + fieldId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/login.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-12 17:34:58
+ * @LastEditTime: 2025-03-25 16:52:11
 -->
 <template>
   <el-row class="login-wrapper">
@@ -14,7 +14,7 @@
     </el-col>
     <el-col :xs="18" class="login-box">
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-        <h3 class="title">CMC综合办公系统</h3>
+        <h3 class="title">CMC智联云枢办公系统</h3>
         <el-form-item prop="username">
           <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
             <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -207,7 +207,7 @@ export default {
   padding: 0 20px;
 
   .title {
-    font-size: 40px;
+    font-size: 30px;
     margin-bottom: 40px;
     color: #504d4d;
     font-family: 'CMCTitle';

oa-ui/src/views/oa/study/components/resourceTree.vue

@@ -0,0 +1,245 @@
+<template>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
+      </el-col>
+    </el-row>
+    <el-input v-model="filterText" placeholder="输入关键字过滤" />
+    <el-tree v-if="refreshTable" ref="tree" :data="treeData" :props="defaultProps" node-key="fieldId"
+      :default-expanded-keys="[1, 2, 3, 4]" @node-click="handleNodeClick" :highlight-current="true"
+      :filter-node-method="filterNode" :default-expand-all="isExpandAll" :expand-on-click-node="false">
+      <!-- 自定义节点样式 -->
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+        <span>{{ node.label }}</span>
+        <span v-if="isModify">
+          <el-button v-hasPermi="['oa:resource:edit']" type="text" icon="el-icon-plus" size="mini" @click="() => append(data)">
+            新增
+          </el-button>
+          <el-button v-hasPermi="['oa:resource:remove']" type="text" icon="el-icon-delete" size="mini" @click="() => remove(node, data)">
+            删除
+          </el-button>
+        </span>
+      </span>
+    </el-tree>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="formRef" :model="form" :rules="rules">
+        <el-form-item label="父级专业" prop="parentId">
+          <treeselect v-model="form.parentId" :options="treeData" :normalizer="normalizer" :show-count="true"
+            placeholder="选择上级专业" />
+        </el-form-item>
+        <el-form-item label="专业名称" prop="field">
+          <el-input v-model="form.field" placeholder="请输入专业名称" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="open = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listField, getField, delField, addField, updateField } from "@/api/oa/study/resourceField";
+import { listResource, getResource, delResource, addResource, updateResource } from "@/api/oa/study/resource";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+export default {
+  components: { Treeselect },
+  props: {
+    isModify: Boolean,
+    default: true
+  },
+  data() {
+    return {
+      treeData: [],       // 树形结构数据
+      defaultProps: {     // 树形组件配置
+        children: 'children',
+        label: 'field'
+      },
+      filterText: '',
+      isExpandAll: false,
+      refreshTable: true,
+      title: '',
+      open: false,
+      form: {
+        fieldId: undefined,
+        field: "",
+        parentId: undefined,
+      },
+      rules: {
+        field: [
+          { required: true, message: "专业名称不能为空", trigger: "blur" }
+        ],
+        parentId: [
+          { required: true, message: "父级专业不能为空", trigger: "change" }
+        ]
+      },
+      // 菜单树选项
+      menuOptions: [],
+    }
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.initTree();
+  },
+  methods: {
+    async initTree() {
+      const response = await listField({ pageSize: 9999 });
+      this.treeData = [{
+        fieldId: 0,
+        field: '全部专业',
+        children: []
+      }]
+      this.treeData[0].children = this.buildTree(response.rows);
+      this.$emit('getTreeData', this.buildTree(response.rows))
+    },
+    buildTree(items) {
+      const map = {};      // 哈希表存储所有节点
+      const roots = [];     // 存储根节点
+      // 先遍历所有项，存入哈希表
+      items.forEach(item => {
+        map[item.fieldId] = { ...item, children: [] };
+      });
+      // 再次遍历建立父子关系
+      items.forEach(item => {
+        const node = map[item.fieldId];
+        if (item.parentId === 0) {
+          roots.push(node);
+        } else {
+          const parent = map[item.parentId];
+          if (parent) {
+            parent.children.push(node);
+          }
+        }
+      });
+      return roots;
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.field.indexOf(value) !== -1;
+    },
+    async loadNode(node, resolve) {
+      if (node.level === 0) {
+        // 加载根节点
+        return resolve(await this.fetchRootNodes());
+      }
+      // 加载子节点
+      resolve(await this.fetchChildNodes(node.key));
+    },
+    handleNodeClick(data) {
+      if (data.fieldId == 0) {
+        this.$emit('clickNode', {})
+      } else {
+        this.$emit('clickNode', data)
+      }
+    },
+    append(data) {
+      this.resetForm();
+      this.title = "新增专业";
+      this.open = true;
+      this.form.parentId = data.fieldId; // 设置父节点为当前节点
+    },
+    async remove(node, data) {
+      if (!data.children) {
+        data.children = []
+      }
+      let list = await listResource({ fieldId: data.fieldId });
+      this.$confirm('确定删除该专业吗？', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        if (data.children.length > 0) {
+          this.$message.error("删除失败，存在子专业，无法删除！");
+          return
+        }
+        if (list.total > 0) {
+          this.$message.error("删除失败，存在资料数据，无法删除！");
+          return
+        }
+        delField(data.fieldId).then(() => {
+          this.$message.success("删除成功");
+          this.initTree();
+          // 如果删除的是当前选中节点，清空选择
+          if (this.$refs.tree.getCurrentKey() === data.fieldId) {
+            this.$emit("clickNode", {});
+          }
+        });
+      });
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    // 表单提交
+    submitForm() {
+      this.$refs.formRef.validate(valid => {
+        if (valid) {
+          if (this.form.fieldId) {
+            updateField(this.form).then(() => {
+              this.$message.success("修改成功");
+              this.open = false;
+              this.initTree();
+            });
+          } else {
+            addField(this.form).then(() => {
+              this.$message.success("新增成功");
+              this.open = false;
+              this.initTree();
+            });
+          }
+        }
+      });
+    },
+    // 重置表单
+    resetForm() {
+      this.form = {
+        fieldId: undefined,
+        field: "",
+        parentId: undefined
+      };
+      if (this.$refs.formRef) {
+        this.$refs.formRef.resetFields();
+      }
+    },
+
+    /** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.fieldId,
+        label: node.field,
+        children: node.children
+      };
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.tree-container {
+  width: 300px;
+  padding: 20px;
+}
+
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding: 8px 0;
+}
+</style>

oa-ui/src/views/oa/study/components/studyRight.vue

@@ -2,11 +2,42 @@
  * @Author: ysh
  * @Date: 2025-03-05 15:36:17
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-13 16:13:05
+ * @LastEditTime: 2025-03-25 16:50:59
 -->
 <template>
-  <div class="right-box">
-    <div class="video">
+  <div>
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <resource-tree :isModify="false" @clickNode="queryField"></resource-tree>
+      </el-col>
+      <el-col :span="16">
+        <el-form :model="videoParams" size="small" :inline="true" label-width="68px" @submit.native.prevent>
+          <el-form-item label="资料名称" prop="title">
+            <el-input v-model="videoParams.title" placeholder="请输入资料名称" clearable
+              @keyup.enter.native="handleVideoQuery" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleVideoQuery">搜索</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table :data="videoList" style="width: 100%">
+          <el-table-column align="center" label="序号" type="index" />
+          <el-table-column align="center" label="名称" prop="title" />
+          <el-table-column align="center" label="学时" prop="hours" />
+          <el-table-column align="center" label="操作">
+            <template slot-scope="{row}">
+              <el-button type="text" @click="addToStudy(row)">
+                添加课程
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination v-show="videoTotal > 0" :total="videoTotal" :page.sync="videoParams.pageNum"
+          :layout="'total, prev, pager, next,jumper'" :limit.sync="videoParams.pageSize" :autoScroll="false"
+          @pagination="getVideoList" />
+      </el-col>
+    </el-row>
+    <!-- <div class="video">
       <el-tabs v-model="videoTab" type="card">
         <el-form :model="videoParams" size="small" :inline="true" label-width="68px" @submit.native.prevent>
           <el-form-item label="视频名称" prop="title">
@@ -28,12 +59,12 @@
                   添加课程
                 </el-button>
               </template>
-            </el-table-column>
-          </el-table>
-          <pagination v-show="videoTotal > 0" :total="videoTotal" :page.sync="videoParams.pageNum"
-            :layout="'total, prev, pager, next,jumper'" :limit.sync="videoParams.pageSize" :autoScroll="false"
-            @pagination="getVideoList" />
-        </el-tab-pane>
+      </el-table-column>
+      </el-table>
+      <pagination v-show="videoTotal > 0" :total="videoTotal" :page.sync="videoParams.pageNum"
+        :layout="'total, prev, pager, next,jumper'" :limit.sync="videoParams.pageSize" :autoScroll="false"
+        @pagination="getVideoList" />
+      </el-tab-pane>
       </el-tabs>
     </div>
     <div class="pdf">
@@ -53,10 +84,10 @@
             <el-table-column align="center" label="学时" prop="hours" />
             <el-table-column align="center" label="操作">
               <template slot-scope="{row}">
-                <el-button type="text" @click="addToStudy(row)">
-                  添加课程
-                </el-button>
-              </template>
+                    <el-button type="text" @click="addToStudy(row)">
+                      添加课程
+                    </el-button>
+                  </template>
             </el-table-column>
           </el-table>
           <pagination v-show="pdfTotal > 0" :total="pdfTotal" :page.sync="pdfParams.pageNum"
@@ -64,15 +95,17 @@
             @pagination="getPdfList" />
         </el-tab-pane>
       </el-tabs>
-    </div>
+    </div> -->
   </div>
 </template>
 
 <script>
-import { listResource, getResource, delResource, addResource, updateResource } from "@/api/oa/study/resource";
+import { listResource, getResource, delResource, addResource, updateResource, getListBelow } from "@/api/oa/study/resource";
 import { listStudy, getStudy, delStudy, addStudy, updateStudy } from "@/api/oa/study/myStudy";
+import resourceTree from './resourceTree.vue';
 
 export default {
+  components: { resourceTree },
   data() {
     return {
       videoList: [],
@@ -91,12 +124,25 @@ export default {
   },
   methods: {
     getVideoList() {
-      this.videoParams.type = '视频'
+      // this.videoParams.type = '视频'
+      listResource(this.videoParams).then(response => {
+        this.videoList = response.rows;
+        this.videoTotal = response.total;
+      });
+    },
+    getList() {
       listResource(this.videoParams).then(response => {
         this.videoList = response.rows;
         this.videoTotal = response.total;
       });
     },
+    getAllListByFiedldId() {
+      this.loading = true;
+      getListBelow(this.videoParams).then(response => {
+        this.videoList = response.rows;
+        this.videoTotal = response.total;
+      })
+    },
     getPdfList() {
       this.pdfParams.type = '文档'
       listResource(this.pdfParams).then(response => {
@@ -131,7 +177,15 @@ export default {
           this.$emit('refreshList');
         });
       })
-
+    },
+    queryField(data) {
+      if (data.fieldId) {
+        this.videoParams.fieldId = data.fieldId
+        this.getAllListByFiedldId();
+      } else {
+        this.videoParams.fieldId = null
+        this.getList();
+      }
     }
   },
 }

oa-ui/src/views/oa/study/myStudy.vue

@@ -2,27 +2,11 @@
  * @Author: ysh
  * @Date: 2025-03-05 14:00:18
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-12 10:43:08
+ * @LastEditTime: 2025-03-25 14:12:17
 -->
 <template>
   <div>
     <study-head></study-head>
-    <!-- <div class="main app-contrainer">
-      <div class="left">
-        <div class="title">
-          我的学习记录
-          <div class="line"></div>
-        </div>
-        <study-left ref="studyLeft"></study-left>
-      </div>
-      <div class="right">
-        <div class="title">
-          学习资料库
-          <div class="line"></div>
-        </div>
-        <study-right ref="studyRight" @refreshList="getStudyList"></study-right>
-      </div>
-    </div> -->
     <div class="main app-container">
       <el-row>
         <el-col :md="12" :sm="24" class="left">

oa-ui/src/views/oa/study/resource.vue

@@ -2,154 +2,187 @@
  * @Author: ysh
  * @Date: 2025-03-05 09:15:54
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-12 10:02:46
+ * @LastEditTime: 2025-03-25 13:59:38
 -->
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="资料名称" prop="title">
-        <el-input v-model="queryParams.title" placeholder="请输入资料名称" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="上传人" prop="uploader">
-        <el-input v-model="queryParams.uploader" placeholder="请输入上传人" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="上传部门" prop="uploadDept">
-        <el-input v-model="queryParams.uploadDept" placeholder="请输入上传部门" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="专业领域" prop="field">
-        <el-input v-model="queryParams.field" placeholder="请输入专业领域" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="上传时间" prop="uploadTime">
-        <el-date-picker clearable v-model="queryParams.uploadTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择上传时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['oa:resource:add']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['oa:resource:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['oa:resource:remove']">删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['oa:resource:export']">导出</el-button>
+    <el-row :gutter="20">
+      <el-col :span="6">
+        <el-row>
+          <div class="title">
+            专业领域
+            <div class="line"></div>
+          </div>
+          <resource-tree @getTreeData="getTreeDataFn" @clickNode="queryField">
+          </resource-tree>
+        </el-row>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+      <el-col :span="18">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="68px">
+          <el-form-item label="资料名称" prop="title">
+            <el-input v-model="queryParams.title" placeholder="请输入资料名称" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="上传人" prop="uploader">
+            <el-select v-model="queryParams.uploader" filterable clearable @change="handleQuery">
+              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+                :value="item.userId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="上传部门" prop="uploadDept">
+            <el-select v-model="queryParams.uploadDept" filterable clearable @change="handleQuery">
+              <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+                :value="item.deptId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="上传时间" prop="uploadTime">
+            <el-date-picker clearable v-model="queryParams.uploadTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择上传时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+              v-hasPermi="['oa:resource:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+              v-hasPermi="['oa:resource:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+              v-hasPermi="['oa:resource:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+              v-hasPermi="['oa:resource:export']">导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
-    <el-table v-loading="loading" :data="resourceList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="资料id" align="center" prop="resourceId" />
-      <el-table-column label="上传人" align="center" prop="uploader">
-        <template slot-scope="scope">
-          {{ getUserName(scope.row.uploader) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="上传部门" align="center" prop="uploadDept">
-        <template slot-scope="scope">
-          {{ getDeptName(scope.row.uploadDept) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="上传附件" align="center" prop="sourcePath" :formatter="formatterPath" />
-      <el-table-column label="专业领域" align="center" prop="field" />
-      <el-table-column label="类型" align="center" prop="type" />
-      <el-table-column label="上传时间" align="center" prop="uploadTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="学时" align="center" prop="hours" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:resource:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:resource:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table v-loading="loading" :data="resourceList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="资料id" align="center" prop="resourceId" />
+          <el-table-column label="上传人" align="center" prop="uploader">
+            <template slot-scope="scope">
+              {{ getUserName(scope.row.uploader) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="上传部门" align="center" prop="uploadDept">
+            <template slot-scope="scope">
+              {{ getDeptName(scope.row.uploadDept) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="资料名称" align="center" prop="title" />
+          <el-table-column label="上传附件" align="center" prop="sourcePath" :formatter="formatterPath" />
+          <el-table-column label="专业领域" align="center" prop="field" />
+          <el-table-column label="类型" align="center" prop="type" />
+          <el-table-column label="上传时间" align="center" prop="uploadTime" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="学时" align="center" prop="hours" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['oa:resource:edit']">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['oa:resource:remove']">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
 
-    <!-- 添加或修改cmc学习资料对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="资料名称" prop="title">
-          <el-input v-model="form.title" placeholder="请输入资料名称" />
-        </el-form-item>
-        <el-form-item label="上传附件" prop="sourcePath">
-          <FileUpload v-if="form.sourcePath == null || form.sourcePath == ''" :isShowTip="false" :limit="1"
-            :filePathName="'教育学习/学习资料'" :fileType="['pdf', 'mp4']" :fileSize="10240" @input="getDocumentPath">
-          </FileUpload>
-          <div v-if="form.sourcePath">
-            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.sourcePath}`)">
-              {{ getFileName(form.sourcePath) }}
-            </el-link>
-            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.sourcePath}`"
-              :underline="false" target="_blank">
-              <span class="el-icon-download">下载文件</span>
-            </el-link>
-            <el-link class="ml20" type="danger" @click="handleDeleteDocument" :underline="false"
-              v-hasPermi="['oa:resource:edit']">
-              <span class="el-icon-delete">删除文件</span>
-            </el-link>
-            <!-- <FileUpload v-if="taskName == '参培申请'" :limit="1" :filePathName="'参培/佐证附件'"
+        <!-- 添加或修改cmc学习资料对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+          <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+            <el-form-item label="资料名称" prop="title">
+              <el-input v-model="form.title" placeholder="请输入资料名称" />
+            </el-form-item>
+            <el-form-item label="上传附件" prop="sourcePath">
+              <FileUpload v-if="form.sourcePath == null || form.sourcePath == ''" :isShowTip="false" :limit="1"
+                :filePathName="'教育学习/学习资料'" :fileType="['pdf', 'mp4']" :fileSize="10240" @input="getDocumentPath">
+              </FileUpload>
+              <div v-if="form.sourcePath">
+                <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.sourcePath}`)">
+                  {{ getFileName(form.sourcePath) }}
+                </el-link>
+                <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.sourcePath}`"
+                  :underline="false" target="_blank">
+                  <span class="el-icon-download">下载文件</span>
+                </el-link>
+                <el-link class="ml20" type="danger" @click="handleDeleteDocument" :underline="false"
+                  v-hasPermi="['oa:resource:edit']">
+                  <span class="el-icon-delete">删除文件</span>
+                </el-link>
+                <!-- <FileUpload v-if="taskName == '参培申请'" :limit="1" :filePathName="'参培/佐证附件'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getDocumentPath"></FileUpload> -->
+              </div>
+              <div style="font-size:12px;color:#e45656">
+                tips:文档仅支持pdf格式，视频仅支持mp4格式
+              </div>
+            </el-form-item>
+            <el-form-item label="资料类型" prop="type">
+              <el-select v-model="form.type" clearable>
+                <el-option label="视频" value="视频"></el-option>
+                <el-option label="文档" value="文档"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="专业领域" prop="fieldId">
+              <!-- <el-input v-model="form.fieldId" placeholder="请输入专业领域" /> -->
+              <!-- <el-cascader :options="fieldOptions" v-model="form.fieldId" :show-all-levels="false"
+                :props="{ children: 'children', label: 'field', value: 'fieldId' }">
+                <template slot-scope="{ node, data }">
+                  <span>{{ data.field }}</span>
+                </template>
+              </el-cascader> -->
+              <el-tag>{{ form.field }}</el-tag>
+              <el-tree ref="fieldIdTree" class="tree-border" :data="fieldOptions" show-checkbox
+                :default-expanded-keys="this.form.fieldId ? [this.form.fieldId] : []" node-key="fieldId"
+                empty-text="加载中，请稍候" :check-strictly="true" @check="handleChechChange"
+                :props="{ children: 'children', label: 'field', value: 'fieldId' }">
+              </el-tree>
+            </el-form-item>
+            <el-form-item label="学时" prop="hours">
+              <el-input-number v-model="form.hours" :min="0" :precision="1" />
+            </el-form-item>
+            <el-form-item label="上传人" prop="uploader">
+              {{ getUserName(form.uploader) }}
+            </el-form-item>
+            <el-form-item label="上传部门" prop="uploadDept">
+              {{ getDeptName(form.uploadDept) }}
+            </el-form-item>
+            <el-form-item label="上传时间" prop="uploadTime">
+              {{ form.uploadTime }}
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
           </div>
-          <div style="font-size:12px;color:#e45656">
-            tips:文档仅支持pdf格式，视频仅支持mp4格式
-          </div>
-        </el-form-item>
-        <el-form-item label="资料类型" prop="type">
-          <el-select v-model="form.type" clearable>
-            <el-option label="视频" value="视频"></el-option>
-            <el-option label="文档" value="文档"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="专业领域" prop="field">
-          <el-input v-model="form.field" placeholder="请输入专业领域" />
-        </el-form-item>
-        <el-form-item label="学时" prop="hours">
-          <el-input-number v-model="form.hours" :min="0" :precision="1" />
-        </el-form-item>
-        <el-form-item label="上传人" prop="uploader">
-          {{ getUserName(form.uploader) }}
-        </el-form-item>
-        <el-form-item label="上传部门" prop="uploadDept">
-          {{ getDeptName(form.uploadDept) }}
-        </el-form-item>
-        <el-form-item label="上传时间" prop="uploadTime">
-          {{ form.uploadTime }}
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+        </el-dialog>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
-import { listResource, getResource, delResource, addResource, updateResource } from "@/api/oa/study/resource";
+import { listResource, getResource, delResource, addResource, updateResource, getListBelow } from "@/api/oa/study/resource";
 import { parseTime } from "@/utils/ruoyi";
-
+import resourceTree from './components/resourceTree.vue';
 export default {
+  components: { resourceTree },
   name: "Resource",
   data() {
     return {
@@ -180,7 +213,7 @@ export default {
         uploadDept: null,
         title: null,
         sourcePath: null,
-        field: null,
+        fieldId: null,
         type: null,
         uploadTime: null,
         hours: null
@@ -188,8 +221,10 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {},
+      treeData: [],
+      fieldOptions: [],
+      currentCheckedKey: null,
     };
   },
   watch: {
@@ -205,7 +240,7 @@ export default {
       } else {
         this.form.type = ''
       }
-    }
+    },
   },
   created() {
     this.getList();
@@ -220,6 +255,14 @@ export default {
         this.loading = false;
       });
     },
+    getAllListByFiedldId() {
+      this.loading = true;
+      getListBelow(this.queryParams).then(response => {
+        this.resourceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -233,7 +276,7 @@ export default {
         uploadDept: null,
         title: null,
         sourcePath: null,
-        field: null,
+        fieldId: null,
         type: null,
         uploadTime: null,
         hours: null
@@ -264,6 +307,9 @@ export default {
       this.form.uploadDept = this.$store.getters.deptId;
       this.form.uploadTime = parseTime(new Date(), '{y}-{m}-{d}');
       this.title = "新增学习资料";
+      this.$nextTick(() => {
+        this.$refs.fieldIdTree.setCheckedKeys([]);
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -272,11 +318,16 @@ export default {
       getResource(resourceId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cmc学习资料";
+        this.title = "修改学习资料";
+        console.log(this.$refs.fieldIdTree);
+        this.$nextTick(() => {
+          this.$refs.fieldIdTree.setCheckedKeys([this.form.fieldId]);
+        });
       });
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.resourceId != null) {
@@ -326,7 +377,78 @@ export default {
     formatterPath(row) {
       let name = this.getFileName(row.sourcePath)
       return name
+    },
+    queryField(data) {
+      if (data.fieldId) {
+        this.queryParams.fieldId = data.fieldId
+        this.getAllListByFiedldId();
+      } else {
+        this.queryParams.fieldId = null
+        this.getList();
+      }
+    },
+    getTreeDataFn(data) {
+      this.fieldOptions = this.removeEmptyChildren(data);
+    },
+    removeEmptyChildren(arr) {
+      return arr.map(item => {
+        // 创建新对象（不修改原对象）
+        const newItem = { ...item };
+        // 递归处理子节点
+        if (newItem.children && Array.isArray(newItem.children)) {
+          if (newItem.children.length === 0) {
+            delete newItem.children; // 删除空数组属性
+          } else {
+            newItem.children = this.removeEmptyChildren(newItem.children); // 递归处理子节点
+          }
+        }
+
+        return newItem;
+      });
+    },
+    handleChechChange(currentNode, checkedStatus) {
+      const checkedKeys = checkedStatus.checkedKeys;
+      let currentId = currentNode.fieldId;
+      // 如果选中超过1个节点
+      if (checkedKeys.length > 1) {
+        // 保留最后一个选中的节点
+        const lastKey = checkedKeys.filter(item => item == currentId);
+        this.$refs.fieldIdTree.setCheckedKeys([lastKey]);
+        this.form.fieldId = currentId
+        this.form.field = currentNode.field;
+        return;
+      }
+      // 如果取消选中当前节点
+      if (checkedKeys.length === 0) {
+        this.currentCheckedKey = null;
+        this.form.fieldId = null;
+        this.form.field = null;
+      } else {
+        this.currentCheckedKey = checkedKeys[0];
+        this.form.fieldId = currentId;
+        this.form.field = currentNode.field;
+      }
     }
   }
-};
+}
 </script>
+
+<style lang="scss" scoped>
+.title {
+  position: relative;
+  font-weight: bold;
+  font-size: 18px;
+  padding-left: 40px;
+  padding-bottom: 20px;
+
+  .line {
+    position: absolute;
+    left: 22px;
+    top: 3px;
+    width: 5px;
+    height: 20px;
+    border-radius: 10px;
+    background-color: #2893e5;
+  }
+}
+</style>

oa-ui/src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">CMC综合办公系统</h3>
+      <h3 class="title">CMC智联云枢办公系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

oa-ui/vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || 'CMC综合办公系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || 'CMC智联云枢办公系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口