Merge remote-tracking branch 'origin/master'

src/api/course/courseWatchComment.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询看课评论列表
+export function listCourseWatchComment(query) {
+  return request({
+    url: '/course/courseWatchComment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// // 查询看课评论详细
+// export function getCourseWatchComment(commentId) {
+//   return request({
+//     url: '/course/courseWatchComment/' + commentId,
+//     method: 'get'
+//   })
+// }
+
+// // 新增看课评论
+// export function addCourseWatchComment(data) {
+//   return request({
+//     url: '/course/courseWatchComment',
+//     method: 'post',
+//     data: data
+//   })
+// }
+//
+// // 修改看课评论
+// export function updateCourseWatchComment(data) {
+//   return request({
+//     url: '/course/courseWatchComment',
+//     method: 'put',
+//     data: data
+//   })
+// }
+//
+// 删除看课评论
+export function delCourseWatchComment(commentId) {
+  return request({
+    url: '/course/courseWatchComment/' + commentId,
+    method: 'delete'
+  })
+}
+
+// 导出看课评论
+export function exportCourseWatchComment(query) {
+  return request({
+    url: '/course/courseWatchComment/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 手动拉黑外部联系人
+export function addBlack(query) {
+  return request({
+    url: '/course/courseWatchComment/addBlack',
+    method: 'put',
+    params: query
+  })
+}

src/api/course/userCourseComplaintRecord.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询看课投诉记录列表
+export function listUserCourseComplaintRecord(query) {
+  return request({
+    url: '/course/userCourseComplaintRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// // 查询看课投诉记录详细
+// export function getUserCourseComplaintRecord(recordId) {
+//   return request({
+//     url: '/course/userCourseComplaintRecord/' + recordId,
+//     method: 'get'
+//   })
+// }
+//
+// // 新增看课投诉记录
+// export function addUserCourseComplaintRecord(data) {
+//   return request({
+//     url: '/course/userCourseComplaintRecord',
+//     method: 'post',
+//     data: data
+//   })
+// }
+//
+// // 修改看课投诉记录
+// export function updateUserCourseComplaintRecord(data) {
+//   return request({
+//     url: '/course/userCourseComplaintRecord',
+//     method: 'put',
+//     data: data
+//   })
+// }
+
+// 删除看课投诉记录
+export function delUserCourseComplaintRecord(recordId) {
+  return request({
+    url: '/course/userCourseComplaintRecord/' + recordId,
+    method: 'delete'
+  })
+}
+
+// 导出看课投诉记录
+export function exportUserCourseComplaintRecord(query) {
+  return request({
+    url: '/course/userCourseComplaintRecord/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/course/userCourseComplaintType.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询看课投诉类型列表
+export function listUserCourseComplaintType(query) {
+  return request({
+    url: '/course/userCourseComplaintType/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询看课投诉类型详细
+export function getUserCourseComplaintType(complaintTypeId) {
+  return request({
+    url: '/course/userCourseComplaintType/' + complaintTypeId,
+    method: 'get'
+  })
+}
+
+// 新增看课投诉类型
+export function addUserCourseComplaintType(data) {
+  return request({
+    url: '/course/userCourseComplaintType',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改看课投诉类型
+export function updateUserCourseComplaintType(data) {
+  return request({
+    url: '/course/userCourseComplaintType',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除看课投诉类型
+export function delUserCourseComplaintType(complaintTypeIds) {
+  return request({
+    url: '/course/userCourseComplaintType/' + complaintTypeIds,
+    method: 'delete'
+  })
+}
+
+// 导出看课投诉类型
+export function exportUserCourseComplaintType(query) {
+  return request({
+    url: '/course/userCourseComplaintType/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/his/packageCate.js

@@ -23,6 +23,12 @@ export function getAllCateList(query) {
     params: query
   })
 }
+export function cateList() {
+  return request({
+    url: '/his/packageCate/cateList',
+    method: 'get',
+  })
+}
 // 新增套餐包分类
 export function addPackageCate(data) {
   return request({

src/api/system/set.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询用户设置列表
+export function listSet(query) {
+  return request({
+    url: '/system/set/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户设置详细
+export function getSet(userId) {
+  return request({
+    url: '/system/set/' + userId,
+    method: 'get'
+  })
+}
+
+// 新增用户设置
+export function addSet(data) {
+  return request({
+    url: '/system/set',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户设置
+export function updateSet(data) {
+  return request({
+    url: '/system/set',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户设置
+export function delSet(userId) {
+  return request({
+    url: '/system/set/' + userId,
+    method: 'delete'
+  })
+}
+
+// 导出用户设置
+export function exportSet(query) {
+  return request({
+    url: '/system/set/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/components/course/courseWatchComment.vue

@@ -0,0 +1,334 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户昵称" prop="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入用户昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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:courseWatchComment: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:courseWatchComment: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:courseWatchComment: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:courseWatchComment:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="courseWatchCommentList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="评论id" align="center" prop="commentId" />-->
+      <el-table-column label="用户昵称" align="center" prop="nickName" width="130px" />
+<!--      <el-table-column label="用户类型，1-管理员，2-用户" align="center" prop="userType" />-->
+<!--      <el-table-column label="课程id" align="center" prop="courseId" />-->
+<!--      <el-table-column label="视频id" align="center" prop="videoId" />-->
+<!--      <el-table-column label="评论类型 1：评论，2：回复" align="center" prop="type" />-->
+<!--      <el-table-column label="父评论id" align="center" prop="parentId" />-->
+      <el-table-column label="评论内容" align="center" prop="content" />
+      <el-table-column label="评论时间" align="center" prop="createTime" width="160px"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="110px">
+        <template slot-scope="scope">
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['course:courseWatchComment:edit']"-->
+<!--          >修改</el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['course:courseWatchComment: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"
+    />
+
+<!--    &lt;!&ndash; 添加或修改看课评论对话框 &ndash;&gt;-->
+<!--    <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="用户id" prop="userId">-->
+<!--          <el-input v-model="form.userId" placeholder="请输入用户id" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="用户类型，1-管理员，2-用户" prop="userType">-->
+<!--          <el-select v-model="form.userType" placeholder="请选择用户类型，1-管理员，2-用户">-->
+<!--            <el-option label="请选择字典生成" value="" />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="课程id" prop="courseId">-->
+<!--          <el-input v-model="form.courseId" placeholder="请输入课程id" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="视频id" prop="videoId">-->
+<!--          <el-input v-model="form.videoId" placeholder="请输入视频id" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="评论类型 1：评论，2：回复" prop="type">-->
+<!--          <el-select v-model="form.type" placeholder="请选择评论类型 1：评论，2：回复">-->
+<!--            <el-option label="请选择字典生成" value="" />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="父评论id" prop="parentId">-->
+<!--          <el-input v-model="form.parentId" placeholder="请输入父评论id" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="评论内容" prop="content">-->
+<!--          <el-input v-model="form.content" type="textarea" placeholder="请输入内容" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="是否是撤回的消息，1-是，0-否" prop="isRevoke">-->
+<!--          <el-select v-model="form.isRevoke" placeholder="请选择是否是撤回的消息，1-是，0-否">-->
+<!--            <el-option label="请选择字典生成" value="" />-->
+<!--          </el-select>-->
+<!--        </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 { listCourseWatchComment, delCourseWatchComment, exportCourseWatchComment } from "@/api/course/courseWatchComment";
+
+export default {
+  name: "CourseWatchComment",
+  props: {
+    courseId: {
+      type: [String, Number],
+      default: null
+    },
+    videoId: {
+      type: [String, Number],
+      default: null
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 看课评论表格数据
+      courseWatchCommentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        // userId: null,
+        // userType: null,
+        courseId: null,
+        videoId: null,
+        nickName: null,
+        // type: null,
+        // parentId: null,
+        // content: null,
+        // isRevoke: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    // 如果有传入的 props，则设置查询参数
+    if (this.courseId) {
+      this.queryParams.courseId = this.courseId;
+    }
+    if (this.videoId) {
+      this.queryParams.videoId = this.videoId;
+    }
+    // 只有当作为独立页面使用时才自动加载数据
+    if (this.courseId && this.videoId) {
+      this.getList();
+    }
+  },
+  methods: {
+    /** 查询看课评论列表 */
+    getList() {
+      this.loading = true;
+      listCourseWatchComment(this.queryParams).then(response => {
+        this.courseWatchCommentList = response.rows.list;
+        this.total = response.rows.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        commentId: null,
+        userId: null,
+        userType: null,
+        courseId: null,
+        videoId: null,
+        type: null,
+        parentId: null,
+        content: null,
+        createTime: null,
+        updateTime: null,
+        isRevoke: 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.commentId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // /** 新增按钮操作 */
+    // handleAdd() {
+    //   this.reset();
+    //   this.open = true;
+    //   this.title = "添加看课评论";
+    // },
+    // /** 修改按钮操作 */
+    // handleUpdate(row) {
+    //   this.reset();
+    //   const commentId = row.commentId || this.ids
+    //   getCourseWatchComment(commentId).then(response => {
+    //     this.form = response.data;
+    //     this.open = true;
+    //     this.title = "修改看课评论";
+    //   });
+    // },
+    // /** 提交按钮 */
+    // submitForm() {
+    //   this.$refs["form"].validate(valid => {
+    //     if (valid) {
+    //       if (this.form.commentId != null) {
+    //         updateCourseWatchComment(this.form).then(response => {
+    //           this.msgSuccess("修改成功");
+    //           this.open = false;
+    //           this.getList();
+    //         });
+    //       } else {
+    //         addCourseWatchComment(this.form).then(response => {
+    //           this.msgSuccess("新增成功");
+    //           this.open = false;
+    //           this.getList();
+    //         });
+    //       }
+    //     }
+    //   });
+    // },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const commentIds = row.commentId || this.ids;
+      this.$confirm('是否确认删除此看课评论？删除后不可恢复', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delCourseWatchComment(commentIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出当前看课评论数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportCourseWatchComment(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/components/course/userCourseCatalogDetails.vue

@@ -113,6 +113,12 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['course:userCourseVideo:edit']"
           >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleComment(scope.row)"
+          >查看评论</el-button>
           <el-button
             size="mini"
             type="text"
@@ -344,6 +350,14 @@
         <el-button type="primary" @click="batchRedSave">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog :title="commentDialog.title" :visible.sync="commentDialog.open" width="1000px" append-to-body :close-on-click-modal="false">
+      <course-watch-comment
+        ref="courseWatchComment"
+        :courseId="commentDialog.courseId"
+        :videoId="commentDialog.videoId"
+        v-if="commentDialog.open">
+      </course-watch-comment>
+    </el-dialog>
 
   </div>
 </template>
@@ -364,10 +378,11 @@ import QuestionBank from "@/views/course/courseQuestionBank/QuestionBank.vue";
 import VideoUpload from "@/components/VideoUpload/index.vue";
 import { listVideoResource } from '@/api/course/videoResource';
 import { getByIds } from '@/api/course/courseQuestionBank'
+import CourseWatchComment from "./courseWatchComment.vue";
 
 export default {
   name: "userCourseCatalog",
-  components: {VideoUpload,QuestionBank},
+  components: {VideoUpload,QuestionBank,CourseWatchComment},
   data() {
     return {
       duration: null,
@@ -465,7 +480,14 @@ export default {
           { required: true, message: "排序不能为空", trigger: "change" }
         ],
 
-      }
+      },
+      // 评论弹窗数据
+      commentDialog: {
+        open: false,
+        courseId: null,
+        videoId: null,
+        title: ""
+      },
     }
   },
   created() {
@@ -861,6 +883,13 @@ export default {
         this.getList();
       })
     },
+    /** 查看评论按钮操作 */
+    handleComment(row) {
+      this.commentDialog.courseId = row.courseId || this.courseId;
+      this.commentDialog.videoId = row.videoId;
+      this.commentDialog.title = `查看评论 - ${row.title}`;
+      this.commentDialog.open = true;
+    },
   }
 }
 </script>

src/views/course/courseWatchComment/index.vue

@@ -0,0 +1,369 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="搜索" prop="keywords">
+        <el-input
+          v-model="queryParams.keywords"
+          placeholder="请输入用户昵称/课程名称/视频名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+          style="width: 280px"
+        />
+      </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:courseWatchComment: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:courseWatchComment: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:courseWatchComment: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:courseWatchComment:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="courseWatchCommentList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="评论id" align="center" prop="commentId" />-->
+<!--      <el-table-column label="用户id" align="center" prop="userId" />-->
+      <el-table-column label="用户昵称" align="center" prop="nickName" width="130px" />
+<!--      <el-table-column label="用户类型，1-管理员，2-用户" align="center" prop="userType" />-->
+<!--      <el-table-column label="评论类型 1：评论，2：回复" align="center" prop="type" />-->
+<!--      <el-table-column label="父评论id" align="center" prop="parentId" />-->
+      <el-table-column label="评论内容" align="center" prop="content" />
+      <el-table-column label="所属课程" align="center" prop="courseName" />
+      <el-table-column label="所属小节" align="center" prop="title" />
+      <el-table-column label="评论时间" align="center" prop="createTime" width="160px"/>
+<!--      <el-table-column label="是否是撤回的消息，1-是，0-否" align="center" prop="isRevoke" />-->
+      <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:courseWatchComment:edit']"-->
+<!--          >修改</el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleAddKeyWords(scope.row)"
+          >添加关键字</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleAddBlack(scope.row)"
+          >拉黑</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['course:courseWatchComment: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"
+    />
+    <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="keyword">
+          <el-input v-model="form.keyword" 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>
+<!--    &lt;!&ndash; 添加或修改看课评论对话框 &ndash;&gt;-->
+<!--    <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="用户id" prop="userId">-->
+<!--          <el-input v-model="form.userId" placeholder="请输入用户id" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="用户类型，1-管理员，2-用户" prop="userType">-->
+<!--          <el-select v-model="form.userType" placeholder="请选择用户类型，1-管理员，2-用户">-->
+<!--            <el-option label="请选择字典生成" value="" />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="课程id" prop="courseId">-->
+<!--          <el-input v-model="form.courseId" placeholder="请输入课程id" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="视频id" prop="videoId">-->
+<!--          <el-input v-model="form.videoId" placeholder="请输入视频id" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="评论类型 1：评论，2：回复" prop="type">-->
+<!--          <el-select v-model="form.type" placeholder="请选择评论类型 1：评论，2：回复">-->
+<!--            <el-option label="请选择字典生成" value="" />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="父评论id" prop="parentId">-->
+<!--          <el-input v-model="form.parentId" placeholder="请输入父评论id" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="评论内容" prop="content">-->
+<!--          <el-input v-model="form.content" type="textarea" placeholder="请输入内容" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="是否是撤回的消息，1-是，0-否" prop="isRevoke">-->
+<!--          <el-select v-model="form.isRevoke" placeholder="请选择是否是撤回的消息，1-是，0-否">-->
+<!--            <el-option label="请选择字典生成" value="" />-->
+<!--          </el-select>-->
+<!--        </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 { listCourseWatchComment, delCourseWatchComment, exportCourseWatchComment, addBlack } from "@/api/course/courseWatchComment";
+import { addKeyword } from "@/api/system/keyword";
+
+export default {
+  name: "CourseWatchComment",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 看课评论表格数据
+      courseWatchCommentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        keywords: null,
+        isAll: true, //判断是否属于全局查询
+        // userId: null,
+        // userType: null,
+        // courseId: null,
+        // videoId: null,
+        // type: null,
+        // parentId: null,
+        // content: null,
+        // isRevoke: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        keyword: [
+          { required: true, message: "关键字不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询看课评论列表 */
+    getList() {
+      this.loading = true;
+      listCourseWatchComment(this.queryParams).then(response => {
+        this.courseWatchCommentList = response.rows.list;
+        this.total = response.rows.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        commentId: null,
+        userId: null,
+        userType: null,
+        courseId: null,
+        videoId: null,
+        type: null,
+        parentId: null,
+        content: null,
+        createTime: null,
+        updateTime: null,
+        isRevoke: null,
+        keyword: 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.commentId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 添加关键字按钮操作 */
+    handleAddKeyWords(row) {
+      this.reset();
+      this.form.keyword = row.content; // 将评论内容设置为关键字
+      this.open = true;
+      this.title = "添加到关键字";
+    },
+    /** 拉黑用户按钮操作 */
+    handleAddBlack(row) {
+      this.$confirm(`谨慎操作，确定要拉黑用户"${row.nickName}"吗`, "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        const data = {
+          fsUserId: row.userId,
+          commentStatus: 1
+        };
+        addBlack(data).then(response => {
+          this.msgSuccess("操作成功");
+          this.getList(); // 重新加载列表
+        }).catch(() => {
+          this.msgError("操作失败");
+        });
+      }).catch(() => {
+        // 用户取消操作
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          const data = {
+            keyword: this.form.keyword
+          };
+          addKeyword(data).then(response => {
+            this.msgSuccess("操作成功");
+            this.open = false;
+            this.getList();
+          }).catch(() => {
+            this.msgError("操作失败");
+          });
+        }
+      });
+    },
+    // /** 新增按钮操作 */
+    // handleAdd() {
+    //   this.reset();
+    //   this.open = true;
+    //   this.title = "添加看课评论";
+    // },
+    // /** 修改按钮操作 */
+    // handleUpdate(row) {
+    //   this.reset();
+    //   const commentId = row.commentId || this.ids
+    //   getCourseWatchComment(commentId).then(response => {
+    //     this.form = response.data;
+    //     this.open = true;
+    //     this.title = "修改看课评论";
+    //   });
+    // },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const commentIds = row.commentId || this.ids;
+      this.$confirm('是否确认删除此看课评论？删除后不可恢复', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delCourseWatchComment(commentIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出当前看课评论数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportCourseWatchComment(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/course/userCourseComplaintRecord/index.vue

@@ -0,0 +1,317 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户昵称" prop="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入用户昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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:userCourseComplaintRecord: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:userCourseComplaintRecord: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:userCourseComplaintRecord: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:userCourseComplaintRecord:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="userCourseComplaintRecordList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户昵称" align="center" prop="nickName" />
+      <el-table-column label="投诉类型" align="center" prop="complaintTypeName" />
+      <el-table-column label="所属课程" align="center" prop="courseName" />
+      <el-table-column label="所属小节" align="center" prop="title" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160px" />
+      <el-table-column label="看课状态" align="center" prop="status" />
+      <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:userCourseComplaintRecord:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['course:userCourseComplaintRecord:remove']"-->
+<!--          >删除</el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleAddBlack(scope.row)"
+            v-if="scope.row.status !== '已拉黑' "
+          >拉黑</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"
+    />
+
+    <!-- 添加或修改看课投诉记录对话框 -->
+<!--    <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="nickName">-->
+<!--          <el-input v-model="form.nickName" placeholder="请输入用户昵称" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="投诉类型" prop="complaintTypeName">-->
+<!--          <el-input v-model="form.complaintTypeName" placeholder="请输入投诉类型" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="所属课程" prop="courseName">-->
+<!--          <el-input v-model="form.courseName" placeholder="请输入所属课程" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="所属小节" prop="title">-->
+<!--          <el-input v-model="form.title" 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 { listUserCourseComplaintRecord, delUserCourseComplaintRecord, exportUserCourseComplaintRecord } from "@/api/course/userCourseComplaintRecord";
+import { addBlack } from "@/api/course/courseWatchComment";
+export default {
+  name: "UserCourseComplaintRecord",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 看课投诉记录表格数据
+      userCourseComplaintRecordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        nickName: null,
+        // userId: null,
+        // complaintTypeId: null,
+        // complaintContent: null,
+        // courseId: null,
+        // videoId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询看课投诉记录列表 */
+    getList() {
+      this.loading = true;
+      listUserCourseComplaintRecord(this.queryParams).then(response => {
+        this.userCourseComplaintRecordList = response.rows.list;
+        this.total = response.rows.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        recordId: null,
+        nickName: null,
+        complaintTypeName: null,
+        courseName: null,
+        title: null,
+        createTime: null
+        // userId: null,
+        // complaintTypeId: null,
+        // complaintContent: null,
+        // courseId: null,
+        // videoId: 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.recordId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // /** 新增按钮操作 */
+    // handleAdd() {
+    //   this.reset();
+    //   this.open = true;
+    //   this.title = "添加看课投诉记录";
+    // },
+    // /** 修改按钮操作 */
+    // handleUpdate(row) {
+    //   this.reset();
+    //   const recordId = row.recordId || this.ids
+    //   getUserCourseComplaintRecord(recordId).then(response => {
+    //     this.form = response.data;
+    //     this.open = true;
+    //     this.title = "修改看课投诉记录";
+    //   });
+    // },
+    // /** 提交按钮 */
+    // submitForm() {
+    //   this.$refs["form"].validate(valid => {
+    //     if (valid) {
+    //       if (this.form.recordId != null) {
+    //         updateUserCourseComplaintRecord(this.form).then(response => {
+    //           this.msgSuccess("修改成功");
+    //           this.open = false;
+    //           this.getList();
+    //         });
+    //       } else {
+    //         addUserCourseComplaintRecord(this.form).then(response => {
+    //           this.msgSuccess("新增成功");
+    //           this.open = false;
+    //           this.getList();
+    //         });
+    //       }
+    //     }
+    //   });
+    // },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const recordIds = row.recordId || this.ids;
+      this.$confirm('是否确认删除看课投诉记录编号为"' + recordIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delUserCourseComplaintRecord(recordIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有看课投诉记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportUserCourseComplaintRecord(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    },
+    /** 拉黑用户按钮操作 */
+    handleAddBlack(row) {
+      this.$confirm(`谨慎操作，确定要拉黑用户"${row.nickName}"吗`, "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        const data = {
+          fsUserId: row.userId,
+          commentStatus: 1
+        };
+        addBlack(data).then(response => {
+          this.msgSuccess("操作成功");
+          this.getList(); // 重新加载列表
+        }).catch(() => {
+          this.msgError("操作失败");
+        });
+      }).catch(() => {
+        // 用户取消操作
+      });
+    },
+  }
+};
+</script>

src/views/course/userCourseComplaintType/index.vue

@@ -0,0 +1,270 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="类型名称" prop="complaintTypeName">
+        <el-input
+          v-model="queryParams.complaintTypeName"
+          placeholder="请输入投诉类型名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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:userCourseComplaintType:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="userCourseComplaintTypeList"
+      row-key="complaintTypeId"
+      default-expand-all
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+<!--      <el-table-column label="父id，关联主键id" prop="parentId" />-->
+      <el-table-column label="投诉类型名称" align="center" prop="complaintTypeName" />
+      <el-table-column label="级别" align="center" prop="typeLevel" />
+      <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:userCourseComplaintType:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['course:userCourseComplaintType:add']"
+            v-if="scope.row.typeLevel === 1"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['course:userCourseComplaintType:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改看课投诉类型对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="上级类型" prop="parentId">
+          <treeselect
+            v-model="form.parentId"
+            :options="userCourseComplaintTypeOptions"
+            :normalizer="normalizer"
+            :disabled="true"
+            placeholder="请选择上级类型" />
+        </el-form-item>
+        <el-form-item label="当前类型名称" prop="complaintTypeName">
+          <el-input v-model="form.complaintTypeName" placeholder="请输入投诉类型名称" />
+        </el-form-item>
+<!--        <el-form-item label="级别" prop="typeLevel">-->
+<!--          <el-input v-model="form.typeLevel" 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 { listUserCourseComplaintType, getUserCourseComplaintType, delUserCourseComplaintType, addUserCourseComplaintType, updateUserCourseComplaintType, exportUserCourseComplaintType } from "@/api/course/userCourseComplaintType";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "UserCourseComplaintType",
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 看课投诉类型表格数据
+      userCourseComplaintTypeList: [],
+      // 看课投诉类型树选项
+      userCourseComplaintTypeOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        parentId: null,
+        complaintTypeName: null,
+        typeLevel: null,
+        isDel: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询看课投诉类型列表 */
+    getList() {
+      this.loading = true;
+      listUserCourseComplaintType(this.queryParams).then(response => {
+        this.userCourseComplaintTypeList = this.handleTree(response.data, "complaintTypeId", "parentId");
+        this.loading = false;
+      });
+    },
+    /** 转换看课投诉类型数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.complaintTypeId,
+        label: node.complaintTypeName,
+        children: node.children
+      };
+    },
+	/** 查询看课投诉类型下拉树结构 */
+    getTreeselect() {
+      listUserCourseComplaintType().then(response => {
+        this.userCourseComplaintTypeOptions = [];
+        const data = { complaintTypeId: 0, complaintTypeName: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "complaintTypeId", "parentId");
+        this.userCourseComplaintTypeOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        complaintTypeId: null,
+        parentId: null,
+        complaintTypeName: null,
+        typeLevel: null,
+        isDel: null,
+        createTime: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.complaintTypeId) {
+        this.form.parentId = row.complaintTypeId;
+        this.form.typeLevel = 2;
+      } else {
+        this.form.parentId = 0;
+        this.form.typeLevel = 1;
+      }
+      this.open = true;
+      this.title = "添加看课投诉类型";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentId = row.complaintTypeId;
+      }
+      getUserCourseComplaintType(row.complaintTypeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改看课投诉类型";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.complaintTypeId != null) {
+            updateUserCourseComplaintType(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addUserCourseComplaintType(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      // 收集要删除的所有ID（包括子级）
+      const complaintTypeIds = this.collectAllIds(row);
+      this.$confirm(`是否确认删除当前行数据及其子级？`, "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          return delUserCourseComplaintType(complaintTypeIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 递归收集所有子级ID */
+    collectAllIds(node) {
+      const ids = [node.complaintTypeId];
+
+      if (node.children && node.children.length > 0) {
+        node.children.forEach(child => {
+          ids.push(...this.collectAllIds(child));
+        });
+      }
+
+      return ids;
+    }
+  }
+};
+</script>

src/views/his/company/index.vue

@@ -206,6 +206,16 @@
         <el-form-item label="地址" prop="companyAddress">
           <el-input v-model="form.companyAddress" placeholder="请输入地址" />
         </el-form-item>
+        <el-form-item label="套餐包分类" prop="packageCateIds">
+          <el-select v-model="form.packageCateIds" multiple filterable placeholder="请选择套餐包分类" style="width: 300px;">
+            <el-option
+              v-for="item in cateList"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="随访医生" prop="followDoctorIds">
            <el-select v-model="form.followDoctorIds" multiple filterable placeholder="请选择随访医生" style="width: 300px;">
              <el-option
@@ -334,6 +344,7 @@ import {getFollowDoctorList} from "@/api/his/doctor";
 import {docList} from "@/api/his/doctor";
 import {getVoiceApiList } from "@/api/company/companyVoiceApi";
 import {getCitysArea} from "../../../api/company/company";
+import {cateList} from "@/api/his/packageCate";
 export default {
   name: "Company",
   data() {
@@ -388,6 +399,7 @@ export default {
         money:0,
       },
       followDoctorList:[],
+      cateList:[],
       // 表单参数
       form: {
         restartTime: '13:10',
@@ -438,6 +450,9 @@ export default {
        // followDoctorIds: [
        //   { required: true, message: "不能为空", trigger: "blur" }
        // ],
+       packageCateIds: [
+          { required: true, message: "套餐包分类不能为空", trigger: "blur" }
+        ],
      },
      // 表单校验
      deductRules: {
@@ -469,6 +484,9 @@ export default {
     });
     getFollowDoctorList().then((response) => {
       this.followDoctorList = response.rows;
+    });
+    cateList().then((response) => {
+      this.cateList = response.rows;
     });
 	docList().then(response => {
 	    this.doctor=response.rows;
@@ -611,12 +629,15 @@ export default {
         if(this.form.status!=null){
           this.form.status = String(this.form.status)
         }
-		if(this.form.doctorIds!=null){
-		  this.doctorIds = ((this.form.doctorIds).split(",")).map(Number);
-		}
+        if(this.form.doctorIds!=null){
+          this.doctorIds = ((this.form.doctorIds).split(",")).map(Number);
+        }
         if(this.form.followDoctorIds!=null){
            this.form.followDoctorIds= JSON.parse(this.form.followDoctorIds)
         }
+        if(this.form.packageCateIds!=null){
+           this.form.packageCateIds= JSON.parse(this.form.packageCateIds)
+        }
         if(this.form.companyType!=null){
           this.form.companyType = String(this.form.companyType)
         }
@@ -629,9 +650,15 @@ export default {
           if(this.form.followDoctorIds!=null){
              this.form.followDoctorIds= JSON.stringify(this.form.followDoctorIds)
           }
-		  if(this.doctorIds!=null){
-		     this.form.doctorIds= (this.doctorIds).toString()
-		  }
+          if(this.form.packageCateIds!=null){
+             this.form.packageCateIds= JSON.stringify(this.form.packageCateIds)
+          }
+          if(this.doctorIds!=null){
+            this.form.doctorIds= (this.doctorIds).toString()
+          }
+          if(this.doctorIds!=null){
+            this.form.doctorIds= (this.doctorIds).toString()
+          }
           if (this.form.companyId != null) {
             updateCompany(this.form).then(response => {
               this.msgSuccess("修改成功");

src/views/system/keyword/index.vue

@@ -20,16 +20,16 @@
 <!--          />-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-      <el-form-item label="所属公司" prop="companyId">
-        <el-select filterable v-model="queryParams.companyId" placeholder="请选择所属公司" clearable size="small">
-          <el-option
-            v-for="item in companys"
-            :key="item.companyId"
-            :label="item.companyName"
-            :value="item.companyId"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="所属公司" prop="companyId">-->
+<!--        <el-select filterable v-model="queryParams.companyId" placeholder="请选择所属公司" clearable size="small">-->
+<!--          <el-option-->
+<!--            v-for="item in companys"-->
+<!--            :key="item.companyId"-->
+<!--            :label="item.companyName"-->
+<!--            :value="item.companyId"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"  v-hasPermi="['system:keyword:list']">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -87,7 +87,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="关键字" align="center" prop="keyword" />
 <!--      <el-table-column label="类型" align="center" prop="typeName" />-->
-      <el-table-column label="所属公司" align="center" prop="companyName" />
+<!--      <el-table-column label="所属公司" align="center" prop="companyName" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -132,16 +132,16 @@
 <!--            />-->
 <!--          </el-select>-->
 <!--        </el-form-item>-->
-        <el-form-item label="所属公司" prop="companyId">
-          <el-select filterable v-model="form.companyId" placeholder="请选择所属公司">
-            <el-option
-              v-for="item in companys"
-              :key="item.companyId"
-              :label="item.companyName"
-              :value="item.companyId"
-            />
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="所属公司" prop="companyId">-->
+<!--          <el-select filterable v-model="form.companyId" placeholder="请选择所属公司">-->
+<!--            <el-option-->
+<!--              v-for="item in companys"-->
+<!--              :key="item.companyId"-->
+<!--              :label="item.companyName"-->
+<!--              :value="item.companyId"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -153,7 +153,7 @@
 
 <script>
 import { listKeyword, getKeyword, delKeyword, addKeyword, updateKeyword, exportKeyword } from "@/api/system/keyword";
-import { allList } from "@/api/system/dict/data";
+// import { allList } from "@/api/system/dict/data";
 import { getCompanyList } from "@/api/company/companyUser";
 
 export default {
@@ -201,7 +201,7 @@ export default {
   },
   created() {
     this.getList();
-    this.getTypeOptions();
+    // this.getTypeOptions();
     this.getCompanyOptions();
   },
   methods: {
@@ -320,11 +320,11 @@ export default {
         }).catch(() => {});
     },
     /** 获取类型选项 */
-    getTypeOptions() {
-      allList({ dictType: "keyword_type" }).then(response => {
-        this.typeOptions = response.data;
-      });
-    },
+    // getTypeOptions() {
+      // allList({ dictType: "keyword_type" }).then(response => {
+      //   this.typeOptions = response.data;
+      // });
+    // },
     /** 获取公司选项 */
     getCompanyOptions() {
       getCompanyList().then(response => {

src/views/system/user/index.vue

@@ -191,6 +191,8 @@
                     v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
                   <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
                     v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+                    <el-dropdown-item command="handleSetUser" icon="el-icon-warning-outline"
+                    v-hasPermi="['system:user:edit']">用户设置</el-dropdown-item>  
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -347,6 +349,7 @@
 
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate } from "@/api/system/user";
+import {addSet,getSet } from "@/api/system/set";
 import { getToken } from "@/utils/auth";
 import { treeselect } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
@@ -573,6 +576,9 @@ export default {
         case "handleAuthRole":
           this.handleAuthRole(row);
           break;
+        case "handleSetUser":
+          this.handleSetUser(row);
+          break  
         default:
           break;
       }
@@ -604,6 +610,49 @@ export default {
         this.title = "修改用户";
         this.form.password = "";
       });
+    },
+     /** 用户设置 */
+    handleSetUser(row) {
+      getSet(row.userId).then(response=>{
+        if(response.data){
+          this.$prompt('请输入"' + row.userName + '"的显示百分比', "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          closeOnClickModal: false,
+          inputPattern: /^[1-9]\d*$/,
+          inputErrorMessage: "请输入大于0的整数",
+          inputValue: response.data.rate
+        }).then(({ value }) => {
+            const param = {userId:row.userId,rate:value}
+            addSet(param).then(response => {
+              this.msgSuccess("设置成功，显示百分比是：" + value + "%");
+            });
+          }).catch(() => {});
+        } else {
+          // 如果 response.data 不存在，直接弹出提示框，不初始化值
+          this.$prompt('请输入"' + row.userName + '"的显示百分比', "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            closeOnClickModal: false,
+            inputPattern: /^[1-9]\d*$/,  // 匹配大于0的整数
+            inputErrorMessage: "请输入大于0的整数"
+          }).then(({ value }) => {
+            const param = { userId: row.userId, rate: value };
+            addSet(param).then(response => {
+              this.msgSuccess("设置成功，显示百分比是：" + value + "%");
+            }).catch(error => {
+              // 处理后端返回的错误
+              this.msgError("设置失败：" + error.message);
+            });
+          }).catch(() => {
+            // 用户取消操作
+            this.msgInfo("操作已取消");
+          });
+        }
+      }).catch(error => {
+        // 处理 getSet 请求失败的情况
+        this.msgError("获取当前设置失败：" + error.message);
+      });
     },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {