Merge branch 'master' of http://124.222.105.7:3000/dianliang/dl_site_system

# Conflicts: # dl_vue/src/router/index.js
2025-06-26 15:51:04 +08:00 · 2025-06-26 15:51:04 +08:00 · 03d9590d59
commit 03d9590d59
parent 8ffeb87743 ffa80b15ba
10 changed files with 317 additions and 384 deletions
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiCategoryController.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiCategoryController.java
@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
@ -28,84 +29,62 @@ import com.ruoyi.common.core.page.TableDataInfo;

 /**
 * 网站栏目Controller
- * 
- * @author vinjor-m
+ *
+ * @author pqz
 * @date 2025-06-19
 */
@RestController
@RequestMapping("/busi/category")
-public class BusiCategoryController extends BaseController
-{
+public class BusiCategoryController extends BaseController {
    @Autowired
    private IBusiCategoryService busiCategoryService;

    /**
-     * 查询网站栏目列表
-     */
-    @PreAuthorize("@ss.hasPermi('busi:category:list')")
+     * 网站栏目树形结构
+     *
+     * @param busiCategory {@link BusiCategory}
+     * @return com.ruoyi.common.core.domain.AjaxResult
+     * @author PQZ
+     * @date 14:01 2025/6/23
+     **/
    @GetMapping("/list")
-    public AjaxResult list(BusiCategory busiCategory,
-                                @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
-                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize)
-    {
-        Page<BusiCategory> page = new Page<>(pageNum, pageSize);
-        IPage<BusiCategory> list = busiCategoryService.queryListPage(busiCategory,page);
-        return success(list);
+    public AjaxResult list(BusiCategory busiCategory) {
+        return success(busiCategoryService.treeCategory(busiCategory));
    }

-    /**
-     * 导出网站栏目列表
-     */
-    @PreAuthorize("@ss.hasPermi('busi:category:export')")
-    @Log(title = "网站栏目", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, BusiCategory busiCategory)
-    {
-        List<BusiCategory> list = busiCategoryService.list();
-        ExcelUtil<BusiCategory> util = new ExcelUtil<BusiCategory>(BusiCategory.class);
-        util.exportExcel(response, list, "网站栏目数据");
-    }

    /**
     * 获取网站栏目详细信息
     */
-    @PreAuthorize("@ss.hasPermi('busi:category:query')")
    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") String id) {
        return success(busiCategoryService.getById(id));
    }

    /**
     * 新增网站栏目
     */
-    @PreAuthorize("@ss.hasPermi('busi:category:add')")
    @Log(title = "网站栏目", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult add(@RequestBody BusiCategory busiCategory)
-    {
+    public AjaxResult add(@RequestBody BusiCategory busiCategory) {
        return toAjax(busiCategoryService.save(busiCategory));
    }

    /**
     * 修改网站栏目
     */
-    @PreAuthorize("@ss.hasPermi('busi:category:edit')")
    @Log(title = "网站栏目", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult edit(@RequestBody BusiCategory busiCategory)
-    {
+    public AjaxResult edit(@RequestBody BusiCategory busiCategory) {
        return toAjax(busiCategoryService.updateById(busiCategory));
    }

    /**
     * 删除网站栏目
     */
-    @PreAuthorize("@ss.hasPermi('busi:category:remove')")
    @Log(title = "网站栏目", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
        List<String> list = new ArrayList<>(Arrays.asList(ids));
        return toAjax(busiCategoryService.removeByIds(list));
    }
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiCategory.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiCategory.java
@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.DlBaseEntity;
 /**
 * 网站栏目对象 dl_busi_category
 * 
- * @author vinjor-m
+ * @author pqz
 * @date 2025-06-19
 */
@TableName("dl_busi_category")
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiCategoryMapper.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiCategoryMapper.java
@ -1,21 +1,15 @@
 package com.ruoyi.busi.mapper;

-import java.util.List;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.busi.domain.BusiCategory;
-import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.busi.domain.BusiCategory;
 import org.apache.ibatis.annotations.Mapper;

 /**
 * 网站栏目Mapper接口
- * 
+ *
 * @author vinjor-m
 * @date 2025-06-19
 */
@Mapper
-public interface BusiCategoryMapper extends BaseMapper<BusiCategory>
-{
-    IPage<BusiCategory> queryListPage(@Param("entity") BusiCategory entity, Page<BusiCategory> page);
+public interface BusiCategoryMapper extends BaseMapper<BusiCategory> {
 }
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiCategoryService.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiCategoryService.java
@ -1,18 +1,27 @@
 package com.ruoyi.busi.service;

-import java.util.List;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.busi.domain.BusiCategory;
+import com.ruoyi.busi.vo.BusiCategoryVO;
+
+import java.util.List;

 /**
 * 网站栏目Service接口
- * 
- * @author vinjor-m
+ *
+ * @author pqz
 * @date 2025-06-19
 */
-public interface IBusiCategoryService extends IService<BusiCategory>
-{
-    IPage<BusiCategory> queryListPage(BusiCategory pageReqVO, Page<BusiCategory> page);
+public interface IBusiCategoryService extends IService<BusiCategory> {
+
+    /**
+     * 树形结构查询网站栏目
+     *
+     * @param category {@link BusiCategory}
+     * @return java.util.List<com.ruoyi.busi.vo.BusiCategoryVO>
+     * @author PQZ
+     * @date 14:06 2025/6/23
+     **/
+    List<BusiCategoryVO> treeCategory(BusiCategory category);
+
 }
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCategoryServiceImpl.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCategoryServiceImpl.java
@ -1,30 +1,86 @@
 package com.ruoyi.busi.service.impl;

-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.busi.domain.BusiCategory;
+import com.ruoyi.busi.mapper.BusiCategoryMapper;
+import com.ruoyi.busi.service.IBusiCategoryService;
+import com.ruoyi.busi.vo.BusiCategoryVO;
+import com.ruoyi.common.core.domain.DlBaseEntity;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.busi.mapper.BusiCategoryMapper;
-import com.ruoyi.busi.domain.BusiCategory;
-import com.ruoyi.busi.service.IBusiCategoryService;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;

 /**
 * 网站栏目Service业务层处理
- * 
- * @author vinjor-m
+ *
+ * @author pqz
 * @date 2025-06-19
 */
@Service
-public class BusiCategoryServiceImpl extends ServiceImpl<BusiCategoryMapper,BusiCategory>  implements IBusiCategoryService
-{
+public class BusiCategoryServiceImpl extends ServiceImpl<BusiCategoryMapper, BusiCategory> implements IBusiCategoryService {
    @Autowired
    private BusiCategoryMapper busiCategoryMapper;

+
+    /**
+     * 树形结构查询网站栏目
+     *
+     * @param category {@link BusiCategory}
+     * @return java.util.List<com.ruoyi.busi.vo.BusiCategoryVO>
+     * @author PQZ
+     * @date 14:06 2025/6/23
+     **/
    @Override
-    public IPage<BusiCategory> queryListPage(BusiCategory pageReqVO, Page<BusiCategory> page) {
-        return busiCategoryMapper.queryListPage(pageReqVO, page);
+    public List<BusiCategoryVO> treeCategory(BusiCategory category) {
+        //查询全部栏目
+        LambdaQueryWrapper<BusiCategory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag,0)
+                .eq(BusiCategory::getTenantId,category.getTenantId())
+                .orderByAsc(DlBaseEntity::getCreateTime);
+        if (StringUtils.isEmpty(category.getCatgName())) {
+            lambdaQueryWrapper.like(BusiCategory::getCatgName,category.getCatgName());
+        }
+        List<BusiCategory> list = list(lambdaQueryWrapper);
+        return buildCategoryTree(list);
+    }
+
+
+    /**
+     * 生成树结构
+     * @author PQZ
+     * @date 14:11 2025/6/23
+     * @param list 网站栏目列表
+     * @return java.util.List<com.ruoyi.busi.vo.BusiCategoryVO>
+    **/
+    private List<BusiCategoryVO> buildCategoryTree(List<BusiCategory> list) {
+        // Map存放id到VO的映射
+        Map<String, BusiCategoryVO> idToNodeMap = new HashMap<>();
+        // 先将所有节点转换为VO，并放入Map
+        for (BusiCategory category : list) {
+            BusiCategoryVO vo = new BusiCategoryVO();
+            BeanUtils.copyProperties(category,vo);
+            idToNodeMap.put(vo.getId(), vo);
+        }
+        List<BusiCategoryVO> roots = new ArrayList<>();
+        // 构建树
+        for (BusiCategoryVO node : idToNodeMap.values()) {
+            String parentId = node.getParentId();
+            if (parentId == null || parentId.trim().isEmpty() || !idToNodeMap.containsKey(parentId)) {
+                // 根节点
+                roots.add(node);
+            } else {
+                // 作为父节点的子节点
+                BusiCategoryVO parent = idToNodeMap.get(parentId);
+                parent.getChildren().add(node);
+            }
+        }
+        return roots;
    }
 }
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiCategoryVO.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiCategoryVO.java
@ -0,0 +1,27 @@
+package com.ruoyi.busi.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.busi.domain.BusiCategory;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.DlBaseEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 网站栏目VO
+ * @author PQZ
+ * @date 14:03 2025/6/23
+**/
+@Data
+public class BusiCategoryVO extends BusiCategory {
+
+    /**
+     * 子集
+     */
+    private List<BusiCategory> children = new ArrayList<>();
+
+}
--- a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiCategoryMapper.xml
+++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiCategoryMapper.xml
@ -32,24 +32,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        select id, code, catg_name, catg_level, catg_type, parent_id, prods_junior, prods_all, title, keyword, description, sort, content, prod_up, prod_down, tenant_id, creator, create_time, updater, update_time, del_flag from dl_busi_category
    </sql>

-    <select id="queryListPage" parameterType="BusiCategory" resultMap="BusiCategoryResult">
-        <include refid="selectBusiCategoryVo"/>
-        <where>
-                        <if test="entity.code != null  and entity.code != ''"> and code = #{entity.code}</if>
-                        <if test="entity.catgName != null  and entity.catgName != ''"> and catg_name like concat('%', #{entity.catgName}, '%')</if>
-                        <if test="entity.catgLevel != null "> and catg_level = #{entity.catgLevel}</if>
-                        <if test="entity.catgType != null  and entity.catgType != ''"> and catg_type = #{entity.catgType}</if>
-                        <if test="entity.parentId != null  and entity.parentId != ''"> and parent_id = #{entity.parentId}</if>
-                        <if test="entity.prodsJunior != null "> and prods_junior = #{entity.prodsJunior}</if>
-                        <if test="entity.prodsAll != null "> and prods_all = #{entity.prodsAll}</if>
-                        <if test="entity.title != null  and entity.title != ''"> and title = #{entity.title}</if>
-                        <if test="entity.keyword != null  and entity.keyword != ''"> and keyword = #{entity.keyword}</if>
-                        <if test="entity.description != null  and entity.description != ''"> and description = #{entity.description}</if>
-                        <if test="entity.sort != null "> and sort = #{entity.sort}</if>
-                        <if test="entity.content != null  and entity.content != ''"> and content = #{entity.content}</if>
-                        <if test="entity.prodUp != null  and entity.prodUp != ''"> and prod_up = #{entity.prodUp}</if>
-                        <if test="entity.prodDown != null  and entity.prodDown != ''"> and prod_down = #{entity.prodDown}</if>
-                        <if test="entity.tenantId != null  and entity.tenantId != ''"> and tenant_id = #{entity.tenantId}</if>
-        </where>
-    </select>
 </mapper>
--- a/dl_vue/src/router/index.js
+++ b/dl_vue/src/router/index.js
@ -101,6 +101,20 @@ export const constantRoutes = [
        meta: { title: '产品详情' }
      }
    ]
+  },
+  {
+    path: '/category',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'categoryForm',
+        component: () => import('@/views/busi/category/form/categoryForm'),
+        name: 'CategoryForm',
+        meta: { title: '栏目信息' }
+      }
+    ]
  }
 ]

--- a/dl_vue/src/views/busi/category/form/categoryForm.vue
+++ b/dl_vue/src/views/busi/category/form/categoryForm.vue
@ -0,0 +1,118 @@
+<template>
+  <!-- 添加或修改网站栏目对话框 -->
+  <div class="app-container">
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="栏目编号" prop="code">
+            <el-input v-model="form.code" placeholder="请输入栏目编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="栏目名称" prop="catgName">
+            <el-input v-model="form.catgName" placeholder="请输入栏目名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="栏目类型" prop="catgType">
+            <el-select v-model="form.catgType" placeholder="请选择通告栏目类型" >
+              <el-option
+                v-for="dict in dict.type.category_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="排序" prop="sort">
+            <el-input v-model="form.sort" placeholder="请输入排序" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import {addCategory} from "@/api/busi/category";
+export default {
+  name: "categoryForm",
+  dicts: ['category_type'],
+  data(){
+    return{
+      //弹出层标题
+      title:"",
+      //表单参数
+      form:{
+        code:"",
+        catgName:"",
+        catgType:"",
+      },
+      //列表页入参
+      query:{},
+      //表单校验规则
+      rules:{
+        code: [
+          { required: true, trigger: "blur", message: "请输入栏目编号" }
+        ],
+        catgName: [
+          { required: true, trigger: "blur", message: "请输入栏目名称" }
+        ],
+        catgType: [
+          { required: true, trigger: "blur", message: "请选择栏目类型" }
+        ],
+      }
+    }
+  },
+  created() {
+    this.query = this.$route.query
+  },
+
+  methods:{
+
+    /**确定按钮*/
+    submitForm(){
+      if (this.query.catgLevel){
+        this.form.catgLevel = this.query.catgLevel
+      }
+      if (this.query.parentId){
+        this.form.parentId = this.query.parentId
+      }
+      addCategory(this.form).then((res) => {
+        if (res.code == 200){
+          this.$modal.msgSuccess("保存成功");
+          this.cancel();
+        }
+      });
+    },
+
+    /**取消按钮*/
+    cancel(){
+      this.reset();
+      //关闭当前页面
+      this.$store.dispatch("tagsView/delView", this.$route);
+      // 调用全局挂载的方法，关闭当前页
+      this.$router.go(-1)
+    },
+
+    /**表单重置*/
+    reset(){
+
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/dl_vue/src/views/busi/category/index.vue
+++ b/dl_vue/src/views/busi/category/index.vue
@ -1,14 +1,6 @@
 <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="栏目code" prop="code">
-        <el-input
-          v-model="queryParams.code"
-          placeholder="请输入栏目code"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
      <el-form-item label="栏目名称" prop="catgName">
        <el-input
          v-model="queryParams.catgName"
@ -17,76 +9,11 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-      <el-form-item label="栏目级别" prop="catgLevel">
-        <el-input
-          v-model="queryParams.catgLevel"
-          placeholder="请输入栏目级别"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="上级栏目id" prop="parentId">
-        <el-input
-          v-model="queryParams.parentId"
-          placeholder="请输入上级栏目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="直接下级产品数" prop="prodsJunior">
-        <el-input
-          v-model="queryParams.prodsJunior"
-          placeholder="请输入直接下级产品数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="递归产品数" prop="prodsAll">
-        <el-input
-          v-model="queryParams.prodsAll"
-          placeholder="请输入递归产品数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="页面title" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入页面title"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="页面keyword" prop="keyword">
-        <el-input
-          v-model="queryParams.keyword"
-          placeholder="请输入页面keyword"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="排序" prop="sort">
-        <el-input
-          v-model="queryParams.sort"
-          placeholder="请输入排序"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="站点唯一编码" prop="tenantId">
-        <el-input
-          v-model="queryParams.tenantId"
-          placeholder="请输入站点唯一编码"
-          clearable
-          @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
@ -95,64 +22,42 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
-          v-hasPermi="['busi:category: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="['busi:category: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="['busi:category: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="['busi:category:export']"
-        >导出</el-button>
-      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
-
-    <el-table v-loading="loading" :data="categoryList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="栏目code" align="center" prop="code" />
-      <el-table-column label="栏目名称" align="center" prop="catgName" />
-      <el-table-column label="栏目级别" align="center" prop="catgLevel" />
-      <el-table-column label="栏目类型(一级才栏目才设置)" align="center" prop="catgType" />
-      <el-table-column label="上级栏目id" align="center" prop="parentId" />
-      <el-table-column label="直接下级产品数" align="center" prop="prodsJunior" />
-      <el-table-column label="递归产品数" align="center" prop="prodsAll" />
-      <el-table-column label="页面title" align="center" prop="title" />
-      <el-table-column label="页面keyword" align="center" prop="keyword" />
-      <el-table-column label="页面description" align="center" prop="description" />
+    <el-table
+      row-key="id"
+      border
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      v-loading="loading" :data="categoryList" >
+      <el-table-column label="栏目名称" align="left" prop="catgName" />
+      <el-table-column label="栏目级别" align="center" prop="catgLevel">
+        <template slot-scope="scope">
+          {{scope.row.catgLevel}}级栏目
+        </template>
+      </el-table-column>
+      <el-table-column label="栏目类型" align="center" prop="catgType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.category_type" :value="scope.row.catgType"/>
+        </template>
+      </el-table-column>
      <el-table-column label="排序" align="center" prop="sort" />
-      <el-table-column label="内容html" align="center" prop="content" />
-      <el-table-column label="产品上方内容html" align="center" prop="prodUp" />
-      <el-table-column label="产品下方内容html" align="center" prop="prodDown" />
-      <el-table-column label="站点唯一编码" align="center" prop="tenantId" />
+      <el-table-column label="修改时间" align="center" prop="updateTime">
+        <template slot-scope="scope">
+          <span v-if="scope.row.updateTime == null">{{scope.row.createTime}}</span>
+          <span v-else>{{scope.row.updateTime}}</span>
+        </template>
+      </el-table-column>
      <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="handleChildAdd(scope.row)"
+            v-hasPermi="['busi:category:edit']"
+          >添加子栏目</el-button>
          <el-button
            size="mini"
            type="text"
@ -170,74 +75,16 @@
        </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="栏目code" prop="code">
-          <el-input v-model="form.code" placeholder="请输入栏目code" />
-        </el-form-item>
-        <el-form-item label="栏目名称" prop="catgName">
-          <el-input v-model="form.catgName" placeholder="请输入栏目名称" />
-        </el-form-item>
-        <el-form-item label="栏目级别" prop="catgLevel">
-          <el-input v-model="form.catgLevel" placeholder="请输入栏目级别" />
-        </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="prodsJunior">
-          <el-input v-model="form.prodsJunior" placeholder="请输入直接下级产品数" />
-        </el-form-item>
-        <el-form-item label="递归产品数" prop="prodsAll">
-          <el-input v-model="form.prodsAll" placeholder="请输入递归产品数" />
-        </el-form-item>
-        <el-form-item label="页面title" prop="title">
-          <el-input v-model="form.title" placeholder="请输入页面title" />
-        </el-form-item>
-        <el-form-item label="页面keyword" prop="keyword">
-          <el-input v-model="form.keyword" placeholder="请输入页面keyword" />
-        </el-form-item>
-        <el-form-item label="页面description" prop="description">
-          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="排序" prop="sort">
-          <el-input v-model="form.sort" placeholder="请输入排序" />
-        </el-form-item>
-        <el-form-item label="内容html">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="产品上方内容html" prop="prodUp">
-          <el-input v-model="form.prodUp" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="产品下方内容html" prop="prodDown">
-          <el-input v-model="form.prodDown" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="站点唯一编码" prop="tenantId">
-          <el-input v-model="form.tenantId" 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 { listCategory, getCategory, delCategory, addCategory, updateCategory } from "@/api/busi/category";
+import { listCategory,delCategory} from "@/api/busi/category";

 export default {
  name: "Category",
+  components:{},
+  dicts: ['category_type'],
  data() {
    return {
      // 遮罩层
@ -250,39 +97,10 @@ export default {
      multiple: true,
      // 显示搜索条件
      showSearch: true,
-      // 总条数
-      total: 0,
      // 网站栏目表格数据
      categoryList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        catgName: null,
-        catgLevel: null,
-        catgType: null,
-        parentId: null,
-        prodsJunior: null,
-        prodsAll: null,
-        title: null,
-        keyword: null,
-        description: null,
-        sort: null,
-        content: null,
-        prodUp: null,
-        prodDown: null,
-        tenantId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
+      queryParams: {},
    };
  },
  created() {
@ -293,111 +111,49 @@ export default {
    getList() {
      this.loading = true;
      listCategory(this.queryParams).then(response => {
-        this.categoryList = response.data.records;
-        this.total = response.data.total;
+        console.log(response.data)
+        this.categoryList = response.data;
        this.loading = false;
      });
    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        code: null,
-        catgName: null,
-        catgLevel: null,
-        catgType: null,
-        parentId: null,
-        prodsJunior: null,
-        prodsAll: null,
-        title: null,
-        keyword: null,
-        description: null,
-        sort: null,
-        content: null,
-        prodUp: null,
-        prodDown: null,
-        tenantId: null,
-        creator: null,
-        createTime: null,
-        updater: null,
-        updateTime: null,
-        delFlag: 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.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
+
    /** 新增按钮操作 */
    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加网站栏目";
+      this.$router.push({path:'/category/categoryForm',query:{catgLevel:1}})
    },
+
+    /**添加子栏目*/
+    handleChildAdd(row){
+      this.$router.push({path:'/category/categoryForm',query:{catgLevel:row.catgLevel+1,parentId:row.id}})
+    },
+
    /** 修改按钮操作 */
    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getCategory(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改网站栏目";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateCategory(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addCategory(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
+
    },
+
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除网站栏目编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除网站栏目"' + row.catgName + '"？').then(function() {
        return delCategory(ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('busi/category/export', {
-        ...this.queryParams
-      }, `category_${new Date().getTime()}.xlsx`)
-    }
+
  }
 };
 </script>