检查表

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/DangerCheckItemPO.java

@@ -60,10 +60,6 @@ public class DangerCheckItemPO {
 	 * 最后更新时间
 	 */
 	private Timestamp updateTime;
-	/**
-	 * null
-	 */
-	private String updateBy;
 	/**
 	 * 是否删除(逻辑删除)
 	 */

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/vo/DangerCheckFormVO.java

@@ -22,10 +22,14 @@
 */
 package com.customs.cq.datacenter.business.domain.vo;
 
+import com.customs.cq.datacenter.business.entity.request.dangercheckitem.ReqCreateDangerCheckItem;
+import com.customs.cq.datacenter.common.enums.ECheckCycle;
 import lombok.Data;
 
 import com.customs.cq.datacenter.common.utils.LocalDateTimeUtil;
 import com.customs.cq.datacenter.common.utils.NumericUtil;
+
+import java.util.List;
 import java.util.Objects;
 
 import com.customs.cq.datacenter.common.core.vo.BasicVO;
@@ -54,4 +58,17 @@ public class DangerCheckFormVO extends DangerCheckFormPO implements BasicVO {
         }
         return LocalDateTimeUtil.toFormatFullString(this.getUpdateTime());
     }
+    /**
+     * 检查项列表
+     */
+    private List<ReqCreateDangerCheckItem> listItem;
+
+    /**
+     * 隐患分类名称
+     */
+    private String dangerCategoryTxt;
+
+    public String getDangerCategoryTxt() {
+        return ECheckCycle.getByValue(this.getCheckCycle()).getDesc();
+    }
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/request/dangercheckform/ReqCreateDangerCheckForm.java

@@ -22,8 +22,10 @@
 */
 package com.customs.cq.datacenter.business.entity.request.dangercheckform;
 
+import com.customs.cq.datacenter.business.entity.request.dangercheckitem.ReqCreateDangerCheckItem;
 import lombok.Data;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 隐患检查表
@@ -40,16 +42,12 @@ public class ReqCreateDangerCheckForm {
 	 * 隐患分类
 	 */
 	private Long dangerCategory;
-	/**
-	 * 检查频率 ECheckCycle
-	 */
-	private Integer checkCycle;
-	/**
-	 * 检查次数(周期内)
-	 */
-	private Integer checkTimes;
 	/**
 	 * 描述
 	 */
 	private String description;
+	/**
+	 * 检查项列表
+	 */
+	private List<ReqCreateDangerCheckItem> listItem;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/request/dangercheckform/ReqModifyDangerCheckForm.java

@@ -22,8 +22,10 @@
 */
 package com.customs.cq.datacenter.business.entity.request.dangercheckform;
 
+import com.customs.cq.datacenter.business.entity.request.dangercheckitem.ReqCreateDangerCheckItem;
 import lombok.Data;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 隐患检查表
@@ -44,14 +46,6 @@ public class ReqModifyDangerCheckForm {
 	 * 隐患分类
 	 */
 	private Long dangerCategory;
-	/**
-	 * 检查频率 ECheckCycle
-	 */
-	private Integer checkCycle;
-	/**
-	 * 检查次数(周期内)
-	 */
-	private Integer checkTimes;
 	/**
 	 * 描述
 	 */
@@ -60,4 +54,8 @@ public class ReqModifyDangerCheckForm {
 	 * 状态 EState
 	 */
 	private Integer status;
+	/**
+	 * 检查项列表
+	 */
+	private List<ReqCreateDangerCheckItem> listItem;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/request/dangercheckitem/ReqCreateDangerCheckItem.java

@@ -32,10 +32,6 @@ import java.time.LocalDate;
  */
 @Data
 public class ReqCreateDangerCheckItem {
-	/**
-	 * 所属隐患检查表
-	 */
-	private Long checkFormId;
 	/**
 	 * 检查项名称
 	 */

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/mapper/impl/DangerCheckItemMapperImpl.java

@@ -15,6 +15,8 @@ import com.customs.cq.datacenter.business.entity.search.SearchDangerCheckItem;
 import com.customs.cq.datacenter.business.domain.DangerCheckItemPO;
 import com.customs.cq.datacenter.business.mapper.DangerCheckItemMapper;
 
+import java.util.List;
+
 /**
  * 隐患检查表-检查项
  * @author lin.liu
@@ -97,4 +99,16 @@ public class DangerCheckItemMapperImpl extends BasicMapper<DangerCheckItemPO> {
         }
         return mapper.selectPage(new Page<>(search.getPage(), search.getLimit()), queryWrapper);
     }
+
+    public int removeByCheckForm(Long formId) {
+        LambdaQueryWrapper<DangerCheckItemPO> where = this.getQuery();
+        where.eq(DangerCheckItemPO::getCheckFormId, formId);
+        return mapper.delete(where);
+    }
+
+    public List<DangerCheckItemPO> list4CheckForm(Long formId) {
+        LambdaQueryWrapper<DangerCheckItemPO> where = this.getQuery();
+        where.eq(DangerCheckItemPO::getCheckFormId, formId);
+        return mapper.selectList(where);
+    }
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/service/DangerCategoryService.java

@@ -33,7 +33,9 @@ import com.customs.cq.datacenter.common.ExecutedResult;
 import com.customs.cq.datacenter.common.PagerResult;
 import com.customs.cq.datacenter.common.core.domain.model.LoginUser;
 import com.customs.cq.datacenter.common.core.service.BasicService;
+import com.customs.cq.datacenter.common.enums.EResultCode;
 import com.customs.cq.datacenter.common.enums.EYesOrNo;
+import com.customs.cq.datacenter.common.exception.ServiceException;
 import com.customs.cq.datacenter.common.helper.LoginHelper;
 import com.customs.cq.datacenter.common.model.NameValueDto;
 import com.customs.cq.datacenter.common.model.Tuple;
@@ -227,6 +229,14 @@ public class DangerCategoryService extends BasicService {
         return ExecutedResult.success(exists);
     }
 
+    public DangerCategoryPO check4IdExc(Long id) {
+        DangerCategoryPO exists = dao.selectById(id);
+        if (Objects.isNull(exists)) {
+            throw new ServiceException("[隐患类别]不存在：" + id, EResultCode.NOT_FOUND.getCode());
+        }
+        return exists;
+    }
+
     /**
      * 获取所有隐患类别下拉选项
      */

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/service/DangerCheckFormService.java

@@ -23,22 +23,34 @@
 package com.customs.cq.datacenter.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.customs.cq.datacenter.common.*;
+import com.customs.cq.datacenter.business.domain.DangerCategoryPO;
+import com.customs.cq.datacenter.business.domain.DangerCheckFormPO;
+import com.customs.cq.datacenter.business.domain.DangerCheckItemPO;
+import com.customs.cq.datacenter.business.domain.vo.DangerCheckFormVO;
+import com.customs.cq.datacenter.business.entity.request.dangercheckform.ReqCreateDangerCheckForm;
+import com.customs.cq.datacenter.business.entity.request.dangercheckform.ReqModifyDangerCheckForm;
+import com.customs.cq.datacenter.business.entity.request.dangercheckitem.ReqCreateDangerCheckItem;
+import com.customs.cq.datacenter.business.entity.search.SearchDangerCheckForm;
+import com.customs.cq.datacenter.business.mapper.impl.DangerCategoryMapperImpl;
+import com.customs.cq.datacenter.business.mapper.impl.DangerCheckFormMapperImpl;
+import com.customs.cq.datacenter.business.mapper.impl.DangerCheckItemMapperImpl;
+import com.customs.cq.datacenter.common.ExecutedResult;
+import com.customs.cq.datacenter.common.PagerResult;
+import com.customs.cq.datacenter.common.core.domain.model.LoginUser;
+import com.customs.cq.datacenter.common.core.service.BasicService;
+import com.customs.cq.datacenter.common.enums.EState;
 import com.customs.cq.datacenter.common.enums.EYesOrNo;
+import com.customs.cq.datacenter.common.helper.LoginHelper;
 import com.customs.cq.datacenter.common.model.Tuple;
 import com.customs.cq.datacenter.common.utils.*;
-import com.customs.cq.datacenter.common.core.service.BasicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
-import com.customs.cq.datacenter.business.mapper.impl.DangerCheckFormMapperImpl;
-import com.customs.cq.datacenter.business.entity.request.dangercheckform.ReqCreateDangerCheckForm;
-import com.customs.cq.datacenter.business.entity.request.dangercheckform.ReqModifyDangerCheckForm;
-import com.customs.cq.datacenter.business.entity.search.SearchDangerCheckForm;
-import com.customs.cq.datacenter.business.domain.DangerCheckFormPO;
-import com.customs.cq.datacenter.business.domain.vo.DangerCheckFormVO;
+import java.util.stream.Collectors;
 
 /**
  * 隐患检查表
@@ -49,27 +61,57 @@ import com.customs.cq.datacenter.business.domain.vo.DangerCheckFormVO;
 public class DangerCheckFormService extends BasicService {
     @Autowired
     private DangerCheckFormMapperImpl dao;
+    @Autowired
+    private DangerCheckItemMapperImpl checkItemMapper;
+    @Autowired
+    private DangerCategoryMapperImpl dangerCategoryMapper;
+    
+    @Autowired
+    private DangerCategoryService dangerCategoryService;
 
+    
+    
     public ExecutedResult<Long> create(ReqCreateDangerCheckForm request) {
+        DangerCategoryPO dangerCategory = dangerCategoryService.check4IdExc(request.getDangerCategory());
         // 转换po
         DangerCheckFormPO item = CopierUtil.mapTo(request, DangerCheckFormPO.class);
         // 设置主键
         item.setId(SnowFlakeUtil.getId());
+        // 检查频率
+        item.setCheckCycle(dangerCategory.getCheckCycle());
+        // 检查次数(周期内)
+        item.setCheckTimes(1);
         // 设置状态
-        //item.setStatus(EState.NORMAL.getValue());
+        item.setStatus(EState.NORMAL.getValue());
         // 设置记录创建时间
         item.setCreateTime(LocalDateTimeUtil.nowTimeStamp());
         // 是否删除(逻辑删除)初始值
         item.setIsDelete(EYesOrNo.NO.getValue());
+        // 创建人信息
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (Objects.nonNull(loginUser)) {
+            item.setCreateBy(loginUser.getUserId().toString());
+            item.setCreateByName(loginUser.getUsername());
+        }
 
         int result = this.dao.insert(item);
         if (result != 1) {
             return ExecutedResult.failed("创建[隐患检查表]失败。");
         }
+        // 插入检查项列表
+        checkItemMapper.insert(request.getListItem().stream().map(c -> {
+            DangerCheckItemPO checkItem = new DangerCheckItemPO();
+            checkItem.setCheckFormId(item.getId());
+            checkItem.setItemName(c.getItemName());
+            checkItem.setDescription(c.getDescription());
+            checkItem.setCreateTime(LocalDateTimeUtil.nowTimeStamp());
+            return checkItem;
+        }).collect(Collectors.toList()));
         return ExecutedResult.success(item.getId());
     }
 
     public ExecutedResult<String> modify(ReqModifyDangerCheckForm request) {
+        DangerCategoryPO dangerCategory = dangerCategoryService.check4IdExc(request.getDangerCategory());
         // 验证记录是否存在
         ExecutedResult<DangerCheckFormPO> checkExists = this.check4Id(request.getId());
         if (checkExists.isFailed()) {
@@ -77,11 +119,30 @@ public class DangerCheckFormService extends BasicService {
         }
         // 转换po
         DangerCheckFormPO item = CopierUtil.mapTo(request, DangerCheckFormPO.class);
+        // 检查频率
+        item.setCheckCycle(dangerCategory.getCheckCycle());
+        // 更新人信息
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (Objects.nonNull(loginUser)) {
+            item.setUpdateBy(loginUser.getUserId().toString());
+            item.setUpdateByName(loginUser.getUsername());
+        }
 
         int result = this.dao.updateById(item);
         if (result != 1) {
             return ExecutedResult.failed("编辑[隐患检查表]失败。");
         }
+        // 删除已有检查项
+        checkItemMapper.removeByCheckForm(request.getId());
+        // 插入检查项列表
+        checkItemMapper.insert(request.getListItem().stream().map(c -> {
+            DangerCheckItemPO checkItem = new DangerCheckItemPO();
+            checkItem.setCheckFormId(item.getId());
+            checkItem.setItemName(c.getItemName());
+            checkItem.setDescription(c.getDescription());
+            checkItem.setCreateTime(LocalDateTimeUtil.nowTimeStamp());
+            return checkItem;
+        }).collect(Collectors.toList()));
         return ExecutedResult.success();
     }
 
@@ -90,7 +151,13 @@ public class DangerCheckFormService extends BasicService {
 
         DangerCheckFormPO find = dao.selectById(id);
         if (null != find) {
+            // 获取检查项列表
+            List<DangerCheckItemPO> listItem = checkItemMapper.list4CheckForm(id);
+            DangerCategoryPO dangerCategory = dangerCategoryService.check4IdExc(find.getDangerCategory());
+
             result = CopierUtil.mapTo(find, DangerCheckFormVO.class);
+            result.setListItem(CopierUtil.mapTo(listItem, ReqCreateDangerCheckItem.class));
+            result.setDangerCategoryTxt(dangerCategory.getCategoryName());
         }
         return ExecutedResult.success(result);
     }
@@ -176,7 +243,17 @@ public class DangerCheckFormService extends BasicService {
 
         List<DangerCheckFormPO> list = this.dao.selectBatchIds(listId);
         if (ListUtil.isNotNullOrEmpty(list)) {
-            result = CopierUtil.mapTo(list, DangerCheckFormVO.class);
+            List<DangerCategoryPO> listDangerCategory = dangerCategoryMapper.selectBatchIds(list.stream().map(DangerCheckFormPO::getDangerCategory).distinct().collect(Collectors.toList()));
+            Map<Long, DangerCategoryPO> mapDangerCategory = listDangerCategory.stream()
+                    .collect(Collectors.toMap(DangerCategoryPO::getId, c -> c));
+            for (DangerCheckFormPO item : list) {
+                DangerCheckFormVO vo = CopierUtil.mapTo(item, DangerCheckFormVO.class);
+                vo.setDangerCategoryTxt("");
+                if (mapDangerCategory.containsKey(item.getDangerCategory())) {
+                    vo.setDangerCategoryTxt(mapDangerCategory.get(item.getDangerCategory()).getCategoryName());
+                }
+                result.add(vo);
+            }
         }
         return ExecutedResult.success(result);
     }
@@ -195,8 +272,17 @@ public class DangerCheckFormService extends BasicService {
         List<DangerCheckFormVO> listVo = new ArrayList<>();
         List<DangerCheckFormPO> list = pageList.getRecords();
         if (ListUtil.isNotNullOrEmpty(list)) {
-            // 转换vo
-            listVo = CopierUtil.mapTo(list, DangerCheckFormVO.class);
+            List<DangerCategoryPO> listDangerCategory = dangerCategoryMapper.selectBatchIds(list.stream().map(DangerCheckFormPO::getDangerCategory).distinct().collect(Collectors.toList()));
+            Map<Long, DangerCategoryPO> mapDangerCategory = listDangerCategory.stream()
+                    .collect(Collectors.toMap(DangerCategoryPO::getId, c -> c));
+            for (DangerCheckFormPO item : list) {
+                DangerCheckFormVO vo = CopierUtil.mapTo(item, DangerCheckFormVO.class);
+                vo.setDangerCategoryTxt("");
+                if (mapDangerCategory.containsKey(item.getDangerCategory())) {
+                    vo.setDangerCategoryTxt(mapDangerCategory.get(item.getDangerCategory()).getCategoryName());
+                }
+                listVo.add(vo);
+            }
         }
         PagerResult<DangerCheckFormVO> result = new PagerResult<>(pageList.getSize(), pageList.getCurrent(), pageList.getTotal(), listVo);
         return ExecutedResult.success(result);

secure-producting-vue/src/api/form/DangerCheckForm.js

@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+// 查询[隐患检查表]
+export function search(data) {
+  return request({
+    url: '/dangerCheckForm/search',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取[隐患检查表]
+export function detail(id) {
+  return request({
+    url: '/dangerCheckForm/get/' + id,
+    method: 'get'
+  })
+}
+
+// 创建[隐患检查表]
+export function create(data) {
+  return request({
+    url: '/dangerCheckForm/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 编辑[隐患检查表]
+export function modify(data) {
+  return request({
+    url: '/dangerCheckForm/modify',
+    method: 'post',
+    data: data
+  })
+}

secure-producting-vue/src/api/system/base.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 获取指定枚举类型的所有值
+export function listEnumValue(enumName) {
+  return request({
+    url: '/base/listEnumValue/' + enumName,
+    method: 'get'
+  })
+}

secure-producting-vue/src/router/index.js

@@ -219,6 +219,21 @@ export const dynamicRoutes = [
       }
     ]
   },
+  // 隐患检查表
+  {
+    path: '/from',
+    component: Layout,
+    hidden: true,
+    permissions: ['from:index:list'],
+    children: [
+      {
+        path: 'dangerCheckForm',
+        component: () => import('@/views/form/DangerCheckForm'),
+        name: 'DangerCheckForm',
+        meta: { title: '隐患检查表', activeMenu: '/form/dangerCheckForm' }
+      }
+    ]
+  },
   {
     path: '/policy',
     component: Layout,

secure-producting-vue/src/views/danger/DangerCategory.vue

@@ -13,6 +13,7 @@
       <el-form-item label="检查频率" prop="checkCycle">
         <el-select
           v-model="queryParams.checkCycle"
+          clearable
           placeholder="请选择"
           style="width: 240px"
         >

secure-producting-vue/src/views/form/DangerCheckForm.vue

@@ -0,0 +1,586 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true">
+      <el-form-item label="关键字" prop="keywords">
+        <el-input
+          v-model="queryParams.keywords"
+          placeholder="请输入关键字"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="隐患分类" prop="listDangerCategory">
+        <el-select
+          v-model="queryParams.listDangerCategory"
+          multiple
+          collapse-tags
+          collapse-tags-tooltip
+          placeholder="请选择"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="item in dangerCategoryList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="检查频率" prop="checkCycle">
+        <el-select
+          v-model="queryParams.checkCycle"
+          clearable
+          placeholder="请选择"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="item in checkCycleList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRangeCreateTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[
+            new Date(2000, 1, 1, 0, 0, 0),
+            new Date(2000, 1, 1, 23, 59, 59),
+          ]"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="search" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="Refresh" @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="Plus"
+          @click="handleAdd"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          >修改</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <el-table
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-dblclick="handleDetail"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="检查表名称" align="center" prop="name" />
+      <el-table-column label="隐患分类" align="center" prop="dangerCategoryTxt" />
+      <el-table-column label="检查频率" align="center" prop="checkCycleTxt" />
+      <el-table-column label="创建时间" align="center" prop="createTimeView" />
+      <el-table-column label="隐患分类" align="center" prop="dangerCategoryTxt" />
+      <el-table-column label="数据创建人" align="center" prop="createByName" />
+      <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="handleDetail(scope.row)"
+          >详情</el-button>
+          <el-button
+            link
+            type="primary"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.page"
+      v-model:limit="queryParams.limit"
+      @pagination="getList"
+    />
+
+    <!-- 添加对话框 -->
+    <el-dialog
+      :title="title"
+      v-model="dialogOpenCreate"
+      width="750px"
+      append-to-body
+    >
+      <el-form
+        ref="formCrateRef"
+        :model="formCreate"
+        :rules="rulesCreate"
+        label-width="85px"
+      >
+        <el-form-item label="检查表名称" prop="name">
+          <el-input v-model="formCreate.name" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="隐患分类" prop="dangerCategory">
+          <el-select
+            v-model="formCreate.dangerCategory"
+            placeholder="请选择"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in dangerCategoryList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="描述" prop="description">
+          <el-input v-model="formCreate.description" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="检查项" prop="listItem">
+            <div class="line-point" v-for="(item, key) in formCreate.listItem" :key="key">
+              <span class="point-index">{{(key+1)}}</span>
+              <span class="point-must">*</span>
+              <label>检查项名称:&nbsp;</label>
+              <el-input v-model="item.itemName" style="width:150px;" size="small" placeholder="请输入" />
+              &nbsp;
+              <span class="point-must">*</span>
+              <label>说明:&nbsp;</label>
+              <el-input v-model="item.description" type="textarea" :autosize="{ minRows: 1, maxRows: 2 }" style="width:230px;vertical-align:top;margin-top:5px;" size="small" placeholder="请输入" />
+              <el-button
+                v-if="key === formCreate.listItem.length - 1"
+                style="vertical-align: top; margin-left: 5px"
+                type="success"
+                icon="Plus"
+                circle
+                @click="handleAddPoint(1)"
+              ></el-button>
+              <el-button
+                v-if="key != 0"
+                style="vertical-align: top; margin-left: 5px"
+                type="danger"
+                icon="Minus"
+                circle
+                @click="handleRemovePoint(1, item)"
+              ></el-button>
+            </div>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button
+            :loading="createLoading"
+            type="primary"
+            @click="submitCreate"
+            >确 定</el-button>
+          <el-button @click="cancelCreate">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 修改对话框 -->
+    <el-dialog
+      :title="title"
+      v-model="dialogOpenModify"
+      width="750px"
+      append-to-body
+    >
+      <el-form
+        :disabled="isDetail"
+        ref="formModifyRef"
+        :model="formModify"
+        :rules="rulesModify"
+        label-width="85px"
+      >
+        <el-form-item label="检查表名称" prop="name">
+          <el-input v-model="formModify.name" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="隐患分类" prop="dangerCategory">
+          <el-select
+            v-model="formModify.dangerCategory"
+            placeholder="请选择"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in dangerCategoryList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-switch v-model="formModify.status" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+        <el-form-item label="描述" prop="description">
+          <el-input v-model="formModify.description" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="检查项" prop="listItem">
+            <div class="line-point" v-for="(item, key) in formModify.listItem" :key="key">
+              <span class="point-index">{{(key+1)}}</span>
+              <span class="point-must">*</span>
+              <label>检查项名称:&nbsp;</label>
+              <el-input v-model="item.itemName" style="width:150px;" size="small" placeholder="请输入" />
+              &nbsp;
+              <span class="point-must">*</span>
+              <label>说明:&nbsp;</label>
+              <el-input v-model="item.description" type="textarea" :autosize="{ minRows: 1, maxRows: 2 }" style="width:230px;vertical-align:top;margin-top:5px;" size="small" placeholder="请输入" />
+              <el-button
+                v-if="key === formModify.listItem.length - 1"
+                style="vertical-align: top; margin-left: 5px"
+                type="success"
+                icon="Plus"
+                circle
+                @click="handleAddPoint(2)"
+              ></el-button>
+              <el-button
+                v-if="key != 0"
+                style="vertical-align: top; margin-left: 5px"
+                type="danger"
+                icon="Minus"
+                circle
+                @click="handleRemovePoint(2, item)"
+              ></el-button>
+            </div>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button
+            v-if="isDetail === false"
+            :loading="modifyLoading"
+            type="primary"
+            @click="submitModify"
+            >确 定</el-button
+          >
+          <el-button @click="cancelModify">{{ cancelModifyTxt }}</el-button>
+          <el-button type="primary" v-if="isDetail" @click="changeModify">编 辑</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style scoped>
+  .line-point { margin-bottom:5px; }
+  .point-must { color:red; }
+  .point-index {
+    display: inline-block;
+    width: 25px;
+    line-height: 20px;
+    border: solid 1px;
+    border-radius: 10px;
+    margin-right: 5px;
+    text-align: center;
+    vertical-align: middle;
+    background-color: orangered;
+    color: white;
+  }
+</style>
+
+<script setup name="DangerCheckForm">
+import { listEnumValue } from "@/api/system/base"
+import { listAllDangerCategory } from "@/api/danger/DangerCategory";
+import { detail, modify, create, search } from "@/api/form/DangerCheckForm";
+
+const { proxy } = getCurrentInstance();
+
+const checkCycleList = ref([]);
+const dangerCategoryList = ref([]);
+const dataList = ref([]);
+
+const createLoading = ref(false);
+const dialogOpenCreate = ref(false);
+
+const modifyLoading = ref(false);
+const dialogOpenModify = ref(false);
+
+const total = ref(0);
+const dateRangeCreateTime = ref([]);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const title = ref("");
+const cancelModifyTxt = ref("取 消");
+const isDetail = ref(false);
+
+const queryParams = ref({
+  page: 1,
+  limit: 10,
+  createTimeRange: "",
+  keywords: undefined,
+  listStatus: undefined,
+  createTime: undefined,
+  listGridCategory: [],
+  listDangerCategory: [],
+});
+
+const formCreate = ref({});
+const rulesCreate = ref({
+  gridName: [
+    { required: true, message: "网格名称不能为空", trigger: "blur" },
+    { max: 50, message: "网格名称字符长度不能超过50", trigger: "blur" },
+  ],
+  department: [
+    { required: true, message: "所属部门不能为空", trigger: "blur" },
+    { max: 50, message: "所属部门字符长度不能超过50", trigger: "blur" },
+  ],
+  departmentName: [
+    { required: true, message: "部门名称不能为空", trigger: "blur" },
+    { max: 200, message: "部门名称字符长度不能超过200", trigger: "blur" },
+  ],
+  gridCategory: [{ required: true, message: "网格类型不能为空", trigger: "blur" }],
+  dangerCategory: [{ required: true, message: "隐患分类不能为空", trigger: "blur" }],
+  gridPersonDuty: [{ max: 500, message: "网格员职责字符长度不能超过500", trigger: "blur" }],
+});
+
+const formModify = ref({});
+const rulesModify = ref({
+  gridName: [
+    { required: true, message: "网格名称不能为空", trigger: "blur" },
+    { max: 50, message: "网格名称字符长度不能超过50", trigger: "blur" },
+  ],
+  department: [
+    { required: true, message: "所属部门不能为空", trigger: "blur" },
+    { max: 50, message: "所属部门字符长度不能超过50", trigger: "blur" },
+  ],
+  departmentName: [
+    { required: true, message: "部门名称不能为空", trigger: "blur" },
+    { max: 200, message: "部门名称字符长度不能超过200", trigger: "blur" },
+  ],
+  gridCategory: [{ required: true, message: "网格类型不能为空", trigger: "blur" }],
+  dangerCategory: [{ required: true, message: "隐患分类不能为空", trigger: "blur" }],
+  gridPersonDuty: [{ max: 500, message: "网格员职责字符长度不能超过500", trigger: "blur" }],
+  status: [{ required: true, message: "状态", trigger: "blur" }],
+});
+
+
+
+/** 查询列表 */
+function getList() {
+  if (
+    dateRangeCreateTime &&
+    dateRangeCreateTime.value &&
+    dateRangeCreateTime.value[0]
+  ) {
+    queryParams.value.createTimeRange = dateRangeCreateTime.value.join(" ~ ");
+  }
+  search(queryParams.value).then((response) => {
+    dataList.value = response.data.list;
+    total.value = response.data.total;
+  });
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.page = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRangeCreateTime.value = [];
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+
+
+/** 取消新增按钮 */
+function cancelCreate() {
+  dialogOpenCreate.value = false;
+  resetCreate();
+}
+/** 新增表单重置 */
+function resetCreate() {
+  formCreate.value = {
+    gridName: undefined,
+    listDepartment: undefined,
+    gridCategory: undefined,
+    dangerCategory: undefined,
+    gridPersonDuty: undefined,
+    listItem: [
+        {
+            itemName: '',
+            description: ''
+        }
+    ]
+  };
+  proxy.resetForm("formCrateRef");
+}
+/** 新增按钮 */
+function handleAdd() {
+  resetCreate();
+  dialogOpenCreate.value = true;
+  title.value = "检查表添加";
+}
+/** 新增提交 */
+function submitCreate() {
+  proxy.$refs["formCrateRef"].validate((valid) => {
+    if (valid) {
+      createLoading.value = true;
+
+      create(formCreate.value)
+        .then((response) => {
+          proxy.$modal.msgSuccess("新增成功");
+          dialogOpenCreate.value = false;
+          getList();
+        })
+        .finally(() => {
+          createLoading.value = false;
+        });
+    }
+  });
+}
+
+
+/** 取消编辑按钮 */
+function cancelModify() {
+  dialogOpenModify.value = false;
+  resetModify();
+}
+/** 编辑表单重置 */
+function resetModify() {
+  formModify.value = {
+    id: undefined,
+    gridName: undefined,
+    listDepartment: undefined,
+    gridCategory: undefined,
+    dangerCategory: undefined,
+    gridPersonDuty: undefined,
+    status: undefined,
+    listItem: undefined,
+  };
+  proxy.resetForm("formModifyRef");
+}
+/** 详情按钮 */
+function handleDetail(row) {
+  modifyLoading.value = true;
+  resetModify();
+  const id = row.id || ids.value[0];
+  detail(id).then((response) => {
+    isDetail.value = true;
+    modifyLoading.value = false;
+
+    formModify.value = response.data;
+
+    dialogOpenModify.value = true;
+    title.value = "检查表信息";
+    cancelModifyTxt.value = "关 闭";
+  });
+}
+/** 详情编辑 */
+function changeModify() {
+  isDetail.value = false;
+  title.value = "修改检查表";
+}
+/** 修改按钮 */
+function handleUpdate(row) {
+  modifyLoading.value = true;
+  resetModify();
+  const id = row.id || ids.value[0];
+  detail(id).then((response) => {
+    isDetail.value = false;
+    modifyLoading.value = false;
+
+    formModify.value = response.data;
+
+    dialogOpenModify.value = true;
+    title.value = "修改检查表";
+    cancelModifyTxt.value = "取 消";
+  });
+}
+/** 修改提交 */
+function submitModify() {
+  proxy.$refs["formModifyRef"].validate((valid) => {
+    if (valid) {
+      modifyLoading.value = true;
+
+      modify(formModify.value)
+        .then((response) => {
+          proxy.$modal.msgSuccess("修改成功");
+          dialogOpenModify.value = false;
+          getList();
+        })
+        .finally(() => {
+          modifyLoading.value = false;
+        });
+    }
+  });
+}
+/** 增加点位 */
+function handleAddPoint(type) {
+  if (type === 1) {
+    formCreate.value.listItem.push({
+        itemName: undefined,
+        description: undefined
+    });
+  } else {
+    formModify.value.listItem.push({
+        itemName: undefined,
+        description: undefined
+    });
+  }
+}
+/** 移除点位 */
+function handleRemovePoint(type, item) {
+    if (type === 1) {
+        const index = formCreate.value.listItem.indexOf(item);
+        if (index !== -1) {
+            formCreate.value.listItem.splice(index, 1);
+        }
+    } else {
+        const index = formModify.value.listItem.indexOf(item);
+        if (index !== -1) {
+            formModify.value.listItem.splice(index, 1);
+        }
+    }
+}
+
+
+
+/** 获取检查频率下拉框枚举值列表 */
+function getCheckCycleList() {
+  listEnumValue('ECheckCycle').then(response => {
+    checkCycleList.value = response.data;
+  });
+};
+/** 初始化隐患分类下拉框数据 */
+function initListDangerCategory() {
+  listAllDangerCategory().then((response) => {
+    dangerCategoryList.value = response.data;
+  });
+}
+
+
+
+// 获取检查频率下拉框枚举值列表
+getCheckCycleList();
+// 调用初始化隐患分类下拉框数据
+initListDangerCategory();
+// 调用列表查询
+getList();
+</script>

sql/20240814.sql

@@ -260,7 +260,6 @@ CREATE TABLE "SECURE_PRODUCTING"."SP_DANGER_CHECK_ITEM"(
   "DESCRIPTION" VARCHAR(500) NOT NULL DEFAULT '',
   "CREATE_TIME" BIGINT NOT NULL DEFAULT 0,
   "UPDATE_TIME" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(),
-  "UPDATE_BY" VARCHAR(50) NOT NULL DEFAULT '',
   "IS_DELETE" TINYINT NOT NULL DEFAULT 0,
   -- 主键
   PRIMARY KEY("ID")