代码提交

src/api/course/userCourseCategory.js

@@ -53,24 +53,27 @@ export function exportUserCourseCategory(query) {
 }
 
 // 查询分类父列表
-export function getAllCourseCategoryList() {
+export function getAllCourseCategoryList(params) {
   return request({
     url: '/course/userCourseCategory/getAllList',
-    method: 'get'
+    method: 'get',
+    params: params
   })
 }
 
 
-export function getCatePidList() {
+export function getCatePidList(categoryType) {
   return request({
     url: '/course/userCourseCategory/getCatePidList',
-    method: 'get'
+    method: 'get',
+    params: { categoryType }
   })
 }
 
-export function getCateListByPid(pid) {
+export function getCateListByPid(pid, categoryType) {
   return request({
     url: '/course/userCourseCategory/getCateListByPid/' + pid,
-    method: 'get'
+    method: 'get',
+    params: { categoryType }
   })
 }

src/components/VideoUpload/index.vue

@@ -269,7 +269,7 @@ export default {
       this.getLibraryList();
     },
     getRootTypeList() {
-      getCatePidList().then(response => {
+      getCatePidList(0).then(response => {
         this.typeOptions = response.data
       });
     },
@@ -279,7 +279,7 @@ export default {
       if (!val) {
         return
       }
-      await getCateListByPid(val).then(response => {
+      await getCateListByPid(val, 0).then(response => {
         this.typeSubOptions = response.data
       })
     },

src/views/components/course/userCourseCatalogDetails.vue

@@ -859,7 +859,7 @@ export default {
       this.resourceList();
     },
     getRootTypeList() {
-      getCatePidList().then(response => {
+      getCatePidList(0).then(response => {
         this.addBatchData.typeOptions = response.data
       });
     },
@@ -869,7 +869,7 @@ export default {
       if (!val) {
         return
       }
-      await getCateListByPid(val).then(response => {
+      await getCateListByPid(val, 0).then(response => {
         this.addBatchData.typeSubOptions = response.data
       })
     },

src/views/course/courseQuestionBank/QuestionBank.vue

@@ -291,7 +291,7 @@ export default {
       return this.alphabet[index];
     },
     getCategoryType() {
-      getCatePidList().then(response => {
+      getCatePidList(0).then(response => {
         this.questionRootTypeOptions = response.data
       });
     },
@@ -301,7 +301,7 @@ export default {
       if (!val) {
         return
       }
-      getCateListByPid(val).then(response => {
+      getCateListByPid(val, 0).then(response => {
         this.questionSubTypeOptions = response.data
       })
     },

src/views/course/courseQuestionBank/index.vue

@@ -432,7 +432,7 @@ export default {
       listUserCourseCategory().then(response => {
         this.questionTypeOptions = response.data
       });
-      getCatePidList().then(response => {
+      getCatePidList(0).then(response => {
         this.questionRootTypeOptions = response.data
       });
     },
@@ -440,7 +440,7 @@ export default {
       if (!val) {
         return
       }
-      getCateListByPid(val).then(response => {
+      getCateListByPid(val, 0).then(response => {
         this.questionSubTypeOptions = response.data
       })
     },

src/views/course/courseRedPacketLog/index.vue

@@ -377,7 +377,7 @@ export default {
 	    this.subCategoryOptions=[];
 	    return
 	  }
-	  getCateListByPid(pid).then(response => {
+	  getCateListByPid(pid, 0).then(response => {
 	    this.subCategoryOptions = response.data;
 	  });
 	},

src/views/course/publicCourseCategory/index.vue

@@ -0,0 +1,338 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="分类名称" prop="cateName">
+        <el-input
+          v-model="queryParams.cateName"
+          placeholder="请输入分类名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否推荐" prop="isShow">
+        <el-select v-model="queryParams.isShow" placeholder="是否推荐" clearable size="small">
+             <el-option
+               v-for="dict in orOptions"
+               :key="dict.dictValue"
+               :label="dict.dictLabel"
+               :value="dict.dictValue"
+             />
+           </el-select>
+      </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="['course:publicCourseCategory: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="['course:publicCourseCategory: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="['course:publicCourseCategory:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['course:publicCourseCategory:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+    height="500" border
+      v-loading="loading"
+      :data="publicCourseCategoryList"
+      row-key="cateId"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column label="分类id" align="left" prop="cateId" />
+      <el-table-column label="分类名称" align="left" prop="cateName" />
+      <el-table-column  label="状态" align="center" prop="isShow">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.isShow === 1" :type="''">显示</el-tag>
+            <el-tag v-else :type=" 'info' ">隐藏</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="排序" sortable align="center" prop="sort" />
+      <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="['course:publicCourseCategory:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['course:publicCourseCategory:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改公域分类对话框 -->
+    <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="pid"  >
+          <treeselect v-model="form.pid" :options="categoryOptions" :normalizer="normalizer" placeholder="请选择上级分类" />
+        </el-form-item>
+        <el-form-item label="分类名称" prop="cateName">
+          <el-input v-model="form.cateName" placeholder="请输入分类名称" />
+        </el-form-item>
+        <el-form-item label="状态" prop="isShow">
+            <el-radio v-model="form.isShow" label="1">显示</el-radio>
+            <el-radio v-model="form.isShow" label="0">隐藏</el-radio>
+        </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="form.sort" placeholder="请输入排序" />
+        </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>
+  </div>
+</template>
+
+<script>
+import { listUserCourseCategory, getUserCourseCategory, delUserCourseCategory, addUserCourseCategory, updateUserCourseCategory, exportUserCourseCategory } from "@/api/course/userCourseCategory";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+export default {
+  name: "PublicCourseCategory",
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      orOptions:[],
+      categoryOptions:[],
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 公域分类表格数据
+      publicCourseCategoryList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        pid: null,
+        cateName: null,
+        sort: null,
+        isShow: null,
+        isDel: null,
+        categoryType: '1'
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        pid: [
+          { required: true, message: "父id不能为空", trigger: "blur" }
+        ],
+        cateName: [
+          { required: true, message: "分类名称不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_company_or").then(response => {
+      this.orOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询公域分类列表 */
+    getList() {
+      this.loading = true;
+      listUserCourseCategory(this.queryParams).then(response => {
+        this.publicCourseCategoryList = this.handleTree(response.data, "cateId", "pid");
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 转换公域分类数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.cateId,
+        label: node.cateName,
+        children: node.children
+      };
+    },
+    getTreeselect() {
+      listUserCourseCategory({ categoryType: '1' }).then(response => {
+        this.categoryOptions = [];
+        const data = { cateId: 0, cateName: '顶级目录', children: [] };
+        data.children = response.data.filter(item => item.pid == 0)
+        this.categoryOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        cateId: null,
+        pid: null,
+        cateName: null,
+        sort: null,
+        isShow: null,
+        categoryType: '1',
+        createTime: null,
+        updateTime: null,
+        isDel: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.cateId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getTreeselect();
+      this.open = true;
+      this.title = "添加公域分类";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      const cateId = row.cateId || this.ids
+      getUserCourseCategory(cateId).then(response => {
+        this.form = response.data;
+        this.form.isShow = response.data.isShow.toString();
+        this.open = true;
+        this.title = "修改公域分类";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.cateId != null) {
+            updateUserCourseCategory(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addUserCourseCategory(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const cateIds = row.cateId || this.ids;
+      this.$confirm('是否确认删除公域分类编号为"' + cateIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delUserCourseCategory(cateIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有公域分类数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportUserCourseCategory(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/course/userCourse/index.vue

@@ -414,7 +414,7 @@ export default {
   },
   created() {
     this.getList();
-    getCatePidList().then(response => {
+    getCatePidList(0).then(response => {
       this.categoryOptions = response.data;
     });
 
@@ -463,7 +463,7 @@ export default {
         this.subCategoryOptions = [];
         return
       }
-      getCateListByPid(pid).then(response => {
+      getCateListByPid(pid, 0).then(response => {
         this.subCategoryOptions = response.data;
       });
     },
@@ -474,7 +474,7 @@ export default {
         return
       }
       this.queryParams.subCateId = null;
-      getCateListByPid(pid).then(response => {
+      getCateListByPid(pid, 0).then(response => {
         this.querySubCateOptions = response.data;
       });
     },
@@ -505,7 +505,7 @@ export default {
       };
     },
     getTreeselect() {
-      getAllCourseCategoryList().then(response => {
+      getAllCourseCategoryList({ categoryType: 0 }).then(response => {
         this.categoryOptions = [];
         const data = this.handleTree(response.data, "cateId", "pid");
         this.categoryOptions = data;

src/views/course/userCourse/public.vue

@@ -596,7 +596,7 @@ export default {
   },
   created() {
     this.getList();
-    getCatePidList().then(response => {
+    getCatePidList(1).then(response => {
       this.categoryOptions = response.data;
     });
 
@@ -645,7 +645,7 @@ export default {
         this.subCategoryOptions = [];
         return
       }
-      getCateListByPid(pid).then(response => {
+      getCateListByPid(pid, 1).then(response => {
         this.subCategoryOptions = response.data;
       });
     },
@@ -656,7 +656,7 @@ export default {
         return
       }
       this.queryParams.subCateId = null;
-      getCateListByPid(pid).then(response => {
+      getCateListByPid(pid, 1).then(response => {
         this.querySubCateOptions = response.data;
       });
     },
@@ -691,7 +691,7 @@ export default {
       };
     },
     getTreeselect() {
-      getAllCourseCategoryList().then(response => {
+      getAllCourseCategoryList({ categoryType: 1 }).then(response => {
         this.categoryOptions = [];
         const data = this.handleTree(response.data, "cateId", "pid");
         this.categoryOptions = data;
@@ -781,7 +781,7 @@ export default {
       getUserCourse(courseId).then(response => {
         this.form = response.data;
         // this.form.cateId = response.data.cateId.toString();
-        getCateListByPid(this.form.cateId).then(response => {
+        getCateListByPid(this.form.cateId, 1).then(response => {
           this.subCategoryOptions = response.data;
         });
         // this.form.courseType = response.data.courseType.toString();

src/views/course/userCourseCategory/index.vue

@@ -189,7 +189,8 @@ export default {
         cateName: null,
         sort: null,
         isShow: null,
-        isDel: null
+        isDel: null,
+        categoryType: '0'
       },
       // 表单参数
       form: {},
@@ -232,7 +233,7 @@ export default {
       };
     },
     getTreeselect() {
-      listUserCourseCategory().then(response => {
+      listUserCourseCategory({ categoryType: '0' }).then(response => {
         this.categoryOptions = [];
         const data = { cateId: 0, cateName: '顶级目录', children: [] };
         data.children = response.data.filter(item => item.pid == 0)
@@ -252,6 +253,7 @@ export default {
         cateName: null,
         sort: null,
         isShow: null,
+        categoryType: '0',
         createTime: null,
         updateTime: null,
         isDel: null

src/views/course/userCourseNote/index.vue

@@ -327,7 +327,7 @@ export default {
   },
   created() {
     this.getList();
-    getCatePidList().then(response => {
+    getCatePidList(0).then(response => {
         this.noteCateIdOptions = response.data;
     });
     getAllCourse().then(response => {

src/views/course/videoResource/index.vue

@@ -1170,7 +1170,7 @@ export default {
       });
     },
     getRootTypeList() {
-      getCatePidList().then(response => {
+      getCatePidList(0).then(response => {
         this.rootTypeList = response.data
       });
     },
@@ -1188,7 +1188,7 @@ export default {
       if (!val) {
         return
       }
-      await getCateListByPid(val).then(response => {
+      await getCateListByPid(val, 0).then(response => {
         this.subTypeList = response.data
       })
     },