From 04f79eab65aec630b36ded8b329c4f2dd2eecd4e Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期五, 22 十一月 2024 09:42:24 +0800
Subject: [PATCH] opcUA界面优化
---
billion-main/src/main/java/com/billion/main/sc/service/impl/ScCollectionParamConfServiceImpl.java | 98 +++++
billion-ui/src/views/main/sc/opcConf/index.vue | 74 +++
billion-main/src/main/resources/mapper/sc/ScCollectionParamConfMapper.xml | 146 +++++++
billion-main/src/main/java/com/billion/main/sc/controller/ScCollectionParamConfController.java | 98 +++++
billion-ui/src/api/main/sc/collectionParamConf.js | 44 ++
billion-main/src/main/java/com/billion/main/sc/service/IScCollectionParamConfService.java | 63 +++
billion-main/src/main/java/com/billion/main/sc/mapper/ScCollectionParamConfMapper.java | 63 +++
billion-ui/src/views/main/sc/collectionParamConf/index.vue | 427 ++++++++++++++++++++++
billion-main/src/main/java/com/billion/main/sc/domain/ScCollectionParamConf.java | 85 ++++
9 files changed, 1,087 insertions(+), 11 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/sc/controller/ScCollectionParamConfController.java b/billion-main/src/main/java/com/billion/main/sc/controller/ScCollectionParamConfController.java
new file mode 100644
index 0000000..a884266
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/sc/controller/ScCollectionParamConfController.java
@@ -0,0 +1,98 @@
+package com.billion.main.sc.controller;
+
+import com.billion.common.annotation.Log;
+import com.billion.common.core.controller.BaseController;
+import com.billion.common.core.domain.AjaxResult;
+import com.billion.common.core.page.TableDataInfo;
+import com.billion.common.enums.BusinessType;
+import com.billion.common.utils.poi.ExcelUtil;
+import com.billion.main.sc.domain.ScCollectionParamConf;
+import com.billion.main.sc.service.IScCollectionParamConfService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鍙傛暟閲囬泦閰嶇疆Controller
+ *
+ * @author HDY
+ * @date 2024-11-21
+ */
+@RestController
+@RequestMapping("/sc/collectionParamConf")
+public class ScCollectionParamConfController extends BaseController
+{
+ @Autowired
+ private IScCollectionParamConfService scCollectionParamConfService;
+
+ /**
+ * 鏌ヨ鍙傛暟閲囬泦閰嶇疆鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('sc:collectionParamConf:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(ScCollectionParamConf scCollectionParamConf)
+ {
+ startPage();
+ List<ScCollectionParamConf> list = scCollectionParamConfService.selectScCollectionParamConfList(scCollectionParamConf);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鍙傛暟閲囬泦閰嶇疆鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('sc:collectionParamConf:export')")
+ @Log(title = "鍙傛暟閲囬泦閰嶇疆", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ScCollectionParamConf scCollectionParamConf)
+ {
+ List<ScCollectionParamConf> list = scCollectionParamConfService.selectScCollectionParamConfList(scCollectionParamConf);
+ ExcelUtil<ScCollectionParamConf> util = new ExcelUtil<ScCollectionParamConf>(ScCollectionParamConf.class);
+ util.exportExcel(response, list, "鍙傛暟閲囬泦閰嶇疆鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鍙傛暟閲囬泦閰嶇疆璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('sc:collectionParamConf:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(scCollectionParamConfService.selectScCollectionParamConfById(id));
+ }
+
+ /**
+ * 鏂板鍙傛暟閲囬泦閰嶇疆
+ */
+ @PreAuthorize("@ss.hasPermi('sc:collectionParamConf:add')")
+ @Log(title = "鍙傛暟閲囬泦閰嶇疆", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ScCollectionParamConf scCollectionParamConf)
+ {
+ return toAjax(scCollectionParamConfService.insertScCollectionParamConf(scCollectionParamConf));
+ }
+
+ /**
+ * 淇敼鍙傛暟閲囬泦閰嶇疆
+ */
+ @PreAuthorize("@ss.hasPermi('sc:collectionParamConf:edit')")
+ @Log(title = "鍙傛暟閲囬泦閰嶇疆", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ScCollectionParamConf scCollectionParamConf)
+ {
+ return toAjax(scCollectionParamConfService.updateScCollectionParamConf(scCollectionParamConf));
+ }
+
+ /**
+ * 鍒犻櫎鍙傛暟閲囬泦閰嶇疆
+ */
+ @PreAuthorize("@ss.hasPermi('sc:collectionParamConf:remove')")
+ @Log(title = "鍙傛暟閲囬泦閰嶇疆", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(scCollectionParamConfService.deleteScCollectionParamConfByIds(ids));
+ }
+}
diff --git a/billion-main/src/main/java/com/billion/main/sc/domain/ScCollectionParamConf.java b/billion-main/src/main/java/com/billion/main/sc/domain/ScCollectionParamConf.java
new file mode 100644
index 0000000..5488d47
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/sc/domain/ScCollectionParamConf.java
@@ -0,0 +1,85 @@
+package com.billion.main.sc.domain;
+
+import com.billion.common.annotation.Excel;
+import com.billion.main.common.BaseEntity;
+import lombok.Data;
+
+/**
+ * 鍙傛暟閲囬泦閰嶇疆瀵硅薄 sc_collection_param_conf
+ *
+ * @author HDY
+ * @date 2024-11-21
+ */
+@Data
+public class ScCollectionParamConf extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 涓婚敭id */
+ private Long id;
+
+ /** 浜у搧缂栫爜 */
+ @Excel(name = "浜у搧缂栫爜")
+ private String productCode;
+
+ /** 浜у搧鍨嬪彿 */
+ @Excel(name = "浜у搧鍨嬪彿")
+ private String productType;
+
+ /** 宸ヤ綅缂栫爜 */
+ @Excel(name = "宸ヤ綅缂栫爜")
+ private String locationCode;
+
+ /** 鍙傛暟缂栫爜 */
+ @Excel(name = "鍙傛暟缂栫爜")
+ private String paramCode;
+
+ /** 鍙傛暟鍚嶇О */
+ @Excel(name = "鍙傛暟鍚嶇О")
+ private String paramName;
+
+ /** 鍙傛暟闆嗙紪鐮� */
+ @Excel(name = "鍙傛暟闆嗙紪鐮�")
+ private String paramSetCode;
+
+ /** 鍙傛暟闆嗗悕绉� */
+ @Excel(name = "鍙傛暟闆嗗悕绉�")
+ private String paramSetName;
+
+ /** 閲囬泦鍦板潃 */
+ @Excel(name = "閲囬泦鍦板潃")
+ private String node;
+
+ /** 閲囬泦绫诲瀷锛�1鐗╂枡杩芥函锛�2鎷х揣杩芥函锛屽叾浠栵級 */
+ @Excel(name = "閲囬泦绫诲瀷", readConverterExp = "1=鐗╂枡杩芥函锛�2鎷х揣杩芥函锛屽叾浠�")
+ private String type;
+
+ /** 鍗曚綅 */
+ @Excel(name = "鍗曚綅")
+ private String unit;
+
+ /** 涓婇檺鍊� */
+ @Excel(name = "涓婇檺鍊�")
+ private String paramUpper;
+
+ /** 涓嬮檺鍊� */
+ @Excel(name = "涓嬮檺鍊�")
+ private String paramLower;
+
+ /** 涓績鍊� */
+ @Excel(name = "涓績鍊�")
+ private String paramCentral;
+
+ /** 鏄剧ず椤哄簭 */
+ @Excel(name = "鏄剧ず椤哄簭")
+ private Integer orderNum;
+
+ /** 鏄惁璁㈤槄 */
+ @Excel(name = "鏄惁璁㈤槄")
+ private String subscribe;
+
+ /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛� */
+ private String delFlag;
+
+
+}
diff --git a/billion-main/src/main/java/com/billion/main/sc/mapper/ScCollectionParamConfMapper.java b/billion-main/src/main/java/com/billion/main/sc/mapper/ScCollectionParamConfMapper.java
new file mode 100644
index 0000000..c6f88b8
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/sc/mapper/ScCollectionParamConfMapper.java
@@ -0,0 +1,63 @@
+package com.billion.main.sc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.billion.main.sc.domain.ScCollectionParamConf;
+
+import java.util.List;
+
+/**
+ * 鍙傛暟閲囬泦閰嶇疆Mapper鎺ュ彛
+ *
+ * @author HDY
+ * @date 2024-11-21
+ */
+public interface ScCollectionParamConfMapper extends BaseMapper<ScCollectionParamConf>
+{
+ /**
+ * 鏌ヨ鍙傛暟閲囬泦閰嶇疆
+ *
+ * @param id 鍙傛暟閲囬泦閰嶇疆涓婚敭
+ * @return 鍙傛暟閲囬泦閰嶇疆
+ */
+ public ScCollectionParamConf selectScCollectionParamConfById(Long id);
+
+ /**
+ * 鏌ヨ鍙傛暟閲囬泦閰嶇疆鍒楄〃
+ *
+ * @param scCollectionParamConf 鍙傛暟閲囬泦閰嶇疆
+ * @return 鍙傛暟閲囬泦閰嶇疆闆嗗悎
+ */
+ public List<ScCollectionParamConf> selectScCollectionParamConfList(ScCollectionParamConf scCollectionParamConf);
+
+ /**
+ * 鏂板鍙傛暟閲囬泦閰嶇疆
+ *
+ * @param scCollectionParamConf 鍙傛暟閲囬泦閰嶇疆
+ * @return 缁撴灉
+ */
+ public int insertScCollectionParamConf(ScCollectionParamConf scCollectionParamConf);
+
+ /**
+ * 淇敼鍙傛暟閲囬泦閰嶇疆
+ *
+ * @param scCollectionParamConf 鍙傛暟閲囬泦閰嶇疆
+ * @return 缁撴灉
+ */
+ public int updateScCollectionParamConf(ScCollectionParamConf scCollectionParamConf);
+
+ /**
+ * 鍒犻櫎鍙傛暟閲囬泦閰嶇疆
+ *
+ * @param id 鍙傛暟閲囬泦閰嶇疆涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteScCollectionParamConfById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鍙傛暟閲囬泦閰嶇疆
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteScCollectionParamConfByIds(Long[] ids);
+}
diff --git a/billion-main/src/main/java/com/billion/main/sc/service/IScCollectionParamConfService.java b/billion-main/src/main/java/com/billion/main/sc/service/IScCollectionParamConfService.java
new file mode 100644
index 0000000..e05f865
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/sc/service/IScCollectionParamConfService.java
@@ -0,0 +1,63 @@
+package com.billion.main.sc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.billion.main.sc.domain.ScCollectionParamConf;
+
+import java.util.List;
+
+/**
+ * 鍙傛暟閲囬泦閰嶇疆Service鎺ュ彛
+ *
+ * @author HDY
+ * @date 2024-11-21
+ */
+public interface IScCollectionParamConfService extends IService<ScCollectionParamConf>
+{
+ /**
+ * 鏌ヨ鍙傛暟閲囬泦閰嶇疆
+ *
+ * @param id 鍙傛暟閲囬泦閰嶇疆涓婚敭
+ * @return 鍙傛暟閲囬泦閰嶇疆
+ */
+ public ScCollectionParamConf selectScCollectionParamConfById(Long id);
+
+ /**
+ * 鏌ヨ鍙傛暟閲囬泦閰嶇疆鍒楄〃
+ *
+ * @param scCollectionParamConf 鍙傛暟閲囬泦閰嶇疆
+ * @return 鍙傛暟閲囬泦閰嶇疆闆嗗悎
+ */
+ public List<ScCollectionParamConf> selectScCollectionParamConfList(ScCollectionParamConf scCollectionParamConf);
+
+ /**
+ * 鏂板鍙傛暟閲囬泦閰嶇疆
+ *
+ * @param scCollectionParamConf 鍙傛暟閲囬泦閰嶇疆
+ * @return 缁撴灉
+ */
+ public int insertScCollectionParamConf(ScCollectionParamConf scCollectionParamConf);
+
+ /**
+ * 淇敼鍙傛暟閲囬泦閰嶇疆
+ *
+ * @param scCollectionParamConf 鍙傛暟閲囬泦閰嶇疆
+ * @return 缁撴灉
+ */
+ public int updateScCollectionParamConf(ScCollectionParamConf scCollectionParamConf);
+
+ /**
+ * 鎵归噺鍒犻櫎鍙傛暟閲囬泦閰嶇疆
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鍙傛暟閲囬泦閰嶇疆涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteScCollectionParamConfByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鍙傛暟閲囬泦閰嶇疆淇℃伅
+ *
+ * @param id 鍙傛暟閲囬泦閰嶇疆涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteScCollectionParamConfById(Long id);
+}
diff --git a/billion-main/src/main/java/com/billion/main/sc/service/impl/ScCollectionParamConfServiceImpl.java b/billion-main/src/main/java/com/billion/main/sc/service/impl/ScCollectionParamConfServiceImpl.java
new file mode 100644
index 0000000..c0ce90a
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/sc/service/impl/ScCollectionParamConfServiceImpl.java
@@ -0,0 +1,98 @@
+package com.billion.main.sc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.billion.common.utils.DateUtils;
+import com.billion.main.sc.domain.ScCollectionParamConf;
+import com.billion.main.sc.mapper.ScCollectionParamConfMapper;
+import com.billion.main.sc.service.IScCollectionParamConfService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鍙傛暟閲囬泦閰嶇疆Service涓氬姟灞傚鐞�
+ *
+ * @author HDY
+ * @date 2024-11-21
+ */
+@Service
+public class ScCollectionParamConfServiceImpl extends ServiceImpl<ScCollectionParamConfMapper, ScCollectionParamConf> implements IScCollectionParamConfService
+{
+ @Autowired
+ private ScCollectionParamConfMapper scCollectionParamConfMapper;
+
+ /**
+ * 鏌ヨ鍙傛暟閲囬泦閰嶇疆
+ *
+ * @param id 鍙傛暟閲囬泦閰嶇疆涓婚敭
+ * @return 鍙傛暟閲囬泦閰嶇疆
+ */
+ @Override
+ public ScCollectionParamConf selectScCollectionParamConfById(Long id)
+ {
+ return scCollectionParamConfMapper.selectScCollectionParamConfById(id);
+ }
+
+ /**
+ * 鏌ヨ鍙傛暟閲囬泦閰嶇疆鍒楄〃
+ *
+ * @param scCollectionParamConf 鍙傛暟閲囬泦閰嶇疆
+ * @return 鍙傛暟閲囬泦閰嶇疆
+ */
+ @Override
+ public List<ScCollectionParamConf> selectScCollectionParamConfList(ScCollectionParamConf scCollectionParamConf)
+ {
+ return scCollectionParamConfMapper.selectScCollectionParamConfList(scCollectionParamConf);
+ }
+
+ /**
+ * 鏂板鍙傛暟閲囬泦閰嶇疆
+ *
+ * @param scCollectionParamConf 鍙傛暟閲囬泦閰嶇疆
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertScCollectionParamConf(ScCollectionParamConf scCollectionParamConf)
+ {
+ scCollectionParamConf.setCreateTime(DateUtils.getNowDate());
+ return scCollectionParamConfMapper.insertScCollectionParamConf(scCollectionParamConf);
+ }
+
+ /**
+ * 淇敼鍙傛暟閲囬泦閰嶇疆
+ *
+ * @param scCollectionParamConf 鍙傛暟閲囬泦閰嶇疆
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateScCollectionParamConf(ScCollectionParamConf scCollectionParamConf)
+ {
+ scCollectionParamConf.setUpdateTime(DateUtils.getNowDate());
+ return scCollectionParamConfMapper.updateScCollectionParamConf(scCollectionParamConf);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鍙傛暟閲囬泦閰嶇疆
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鍙傛暟閲囬泦閰嶇疆涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteScCollectionParamConfByIds(Long[] ids)
+ {
+ return scCollectionParamConfMapper.deleteScCollectionParamConfByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鍙傛暟閲囬泦閰嶇疆淇℃伅
+ *
+ * @param id 鍙傛暟閲囬泦閰嶇疆涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteScCollectionParamConfById(Long id)
+ {
+ return scCollectionParamConfMapper.deleteScCollectionParamConfById(id);
+ }
+}
diff --git a/billion-main/src/main/resources/mapper/sc/ScCollectionParamConfMapper.xml b/billion-main/src/main/resources/mapper/sc/ScCollectionParamConfMapper.xml
new file mode 100644
index 0000000..fd4f26b
--- /dev/null
+++ b/billion-main/src/main/resources/mapper/sc/ScCollectionParamConfMapper.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.billion.main.sc.mapper.ScCollectionParamConfMapper">
+
+ <resultMap type="ScCollectionParamConf" id="ScCollectionParamConfResult">
+ <result property="id" column="id" />
+ <result property="productCode" column="product_code" />
+ <result property="productType" column="product_type" />
+ <result property="locationCode" column="location_code" />
+ <result property="paramCode" column="param_code" />
+ <result property="paramName" column="param_name" />
+ <result property="paramSetCode" column="param_set_code" />
+ <result property="paramSetName" column="param_set_name" />
+ <result property="node" column="node" />
+ <result property="type" column="type" />
+ <result property="unit" column="unit" />
+ <result property="paramUpper" column="param_upper" />
+ <result property="paramLower" column="param_lower" />
+ <result property="paramCentral" column="param_central" />
+ <result property="orderNum" column="order_num" />
+ <result property="subscribe" column="subscribe" />
+ <result property="delFlag" column="del_flag" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ </resultMap>
+
+ <sql id="selectScCollectionParamConfVo">
+ select id, product_code, product_type, location_code, param_code, param_name, param_set_code, param_set_name, node, type, unit, param_upper, param_lower, param_central, order_num, subscribe, del_flag, create_by, create_time, update_by, update_time from sc_collection_param_conf
+ </sql>
+
+ <select id="selectScCollectionParamConfList" parameterType="ScCollectionParamConf" resultMap="ScCollectionParamConfResult">
+ <include refid="selectScCollectionParamConfVo"/>
+ <where>
+ <if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if>
+ <if test="productType != null and productType != ''"> and product_type = #{productType}</if>
+ <if test="locationCode != null and locationCode != ''"> and location_code = #{locationCode}</if>
+ <if test="paramCode != null and paramCode != ''"> and param_code = #{paramCode}</if>
+ <if test="paramName != null and paramName != ''"> and param_name like concat('%', #{paramName}, '%')</if>
+ <if test="paramSetCode != null and paramSetCode != ''"> and param_set_code = #{paramSetCode}</if>
+ <if test="paramSetName != null and paramSetName != ''"> and param_set_name like concat('%', #{paramSetName}, '%')</if>
+ <if test="node != null and node != ''"> and node = #{node}</if>
+ <if test="type != null and type != ''"> and type = #{type}</if>
+ <if test="unit != null and unit != ''"> and unit = #{unit}</if>
+ <if test="paramUpper != null and paramUpper != ''"> and param_upper = #{paramUpper}</if>
+ <if test="paramLower != null and paramLower != ''"> and param_lower = #{paramLower}</if>
+ <if test="paramCentral != null and paramCentral != ''"> and param_central = #{paramCentral}</if>
+ <if test="orderNum != null "> and order_num = #{orderNum}</if>
+ <if test="subscribe != null and subscribe != ''"> and subscribe = #{subscribe}</if>
+ </where>
+ </select>
+
+ <select id="selectScCollectionParamConfById" parameterType="Long" resultMap="ScCollectionParamConfResult">
+ <include refid="selectScCollectionParamConfVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertScCollectionParamConf" parameterType="ScCollectionParamConf" useGeneratedKeys="true" keyProperty="id">
+ insert into sc_collection_param_conf
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="productCode != null">product_code,</if>
+ <if test="productType != null">product_type,</if>
+ <if test="locationCode != null">location_code,</if>
+ <if test="paramCode != null">param_code,</if>
+ <if test="paramName != null">param_name,</if>
+ <if test="paramSetCode != null">param_set_code,</if>
+ <if test="paramSetName != null">param_set_name,</if>
+ <if test="node != null">node,</if>
+ <if test="type != null">type,</if>
+ <if test="unit != null">unit,</if>
+ <if test="paramUpper != null">param_upper,</if>
+ <if test="paramLower != null">param_lower,</if>
+ <if test="paramCentral != null">param_central,</if>
+ <if test="orderNum != null">order_num,</if>
+ <if test="subscribe != null">subscribe,</if>
+ <if test="delFlag != null">del_flag,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="productCode != null">#{productCode},</if>
+ <if test="productType != null">#{productType},</if>
+ <if test="locationCode != null">#{locationCode},</if>
+ <if test="paramCode != null">#{paramCode},</if>
+ <if test="paramName != null">#{paramName},</if>
+ <if test="paramSetCode != null">#{paramSetCode},</if>
+ <if test="paramSetName != null">#{paramSetName},</if>
+ <if test="node != null">#{node},</if>
+ <if test="type != null">#{type},</if>
+ <if test="unit != null">#{unit},</if>
+ <if test="paramUpper != null">#{paramUpper},</if>
+ <if test="paramLower != null">#{paramLower},</if>
+ <if test="paramCentral != null">#{paramCentral},</if>
+ <if test="orderNum != null">#{orderNum},</if>
+ <if test="subscribe != null">#{subscribe},</if>
+ <if test="delFlag != null">#{delFlag},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ </trim>
+ </insert>
+
+ <update id="updateScCollectionParamConf" parameterType="ScCollectionParamConf">
+ update sc_collection_param_conf
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="productCode != null">product_code = #{productCode},</if>
+ <if test="productType != null">product_type = #{productType},</if>
+ <if test="locationCode != null">location_code = #{locationCode},</if>
+ <if test="paramCode != null">param_code = #{paramCode},</if>
+ <if test="paramName != null">param_name = #{paramName},</if>
+ <if test="paramSetCode != null">param_set_code = #{paramSetCode},</if>
+ <if test="paramSetName != null">param_set_name = #{paramSetName},</if>
+ <if test="node != null">node = #{node},</if>
+ <if test="type != null">type = #{type},</if>
+ <if test="unit != null">unit = #{unit},</if>
+ <if test="paramUpper != null">param_upper = #{paramUpper},</if>
+ <if test="paramLower != null">param_lower = #{paramLower},</if>
+ <if test="paramCentral != null">param_central = #{paramCentral},</if>
+ <if test="orderNum != null">order_num = #{orderNum},</if>
+ <if test="subscribe != null">subscribe = #{subscribe},</if>
+ <if test="delFlag != null">del_flag = #{delFlag},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteScCollectionParamConfById" parameterType="Long">
+ delete from sc_collection_param_conf where id = #{id}
+ </delete>
+
+ <delete id="deleteScCollectionParamConfByIds" parameterType="String">
+ delete from sc_collection_param_conf where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/billion-ui/src/api/main/sc/collectionParamConf.js b/billion-ui/src/api/main/sc/collectionParamConf.js
new file mode 100644
index 0000000..64744a8
--- /dev/null
+++ b/billion-ui/src/api/main/sc/collectionParamConf.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 鏌ヨ鍙傛暟閲囬泦閰嶇疆鍒楄〃
+export function listCollectionParamConf(query) {
+ return request({
+ url: '/sc/collectionParamConf/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鏌ヨ鍙傛暟閲囬泦閰嶇疆璇︾粏
+export function getCollectionParamConf(id) {
+ return request({
+ url: '/sc/collectionParamConf/' + id,
+ method: 'get'
+ })
+}
+
+// 鏂板鍙傛暟閲囬泦閰嶇疆
+export function addCollectionParamConf(data) {
+ return request({
+ url: '/sc/collectionParamConf',
+ method: 'post',
+ data: data
+ })
+}
+
+// 淇敼鍙傛暟閲囬泦閰嶇疆
+export function updateCollectionParamConf(data) {
+ return request({
+ url: '/sc/collectionParamConf',
+ method: 'put',
+ data: data
+ })
+}
+
+// 鍒犻櫎鍙傛暟閲囬泦閰嶇疆
+export function delCollectionParamConf(id) {
+ return request({
+ url: '/sc/collectionParamConf/' + id,
+ method: 'delete'
+ })
+}
diff --git a/billion-ui/src/views/main/sc/collectionParamConf/index.vue b/billion-ui/src/views/main/sc/collectionParamConf/index.vue
new file mode 100644
index 0000000..58d0cbe
--- /dev/null
+++ b/billion-ui/src/views/main/sc/collectionParamConf/index.vue
@@ -0,0 +1,427 @@
+<template>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="浜у搧缂栫爜" prop="productCode">
+ <el-input
+ v-model="queryParams.productCode"
+ placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="宸ヤ綅缂栫爜" prop="locationCode">
+ <el-input
+ v-model="queryParams.locationCode"
+ placeholder="璇疯緭鍏ュ伐浣嶇紪鐮�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傛暟缂栫爜" prop="paramCode">
+ <el-input
+ v-model="queryParams.paramCode"
+ placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傛暟鍚嶇О" prop="paramName">
+ <el-input
+ v-model="queryParams.paramName"
+ placeholder="璇疯緭鍏ュ弬鏁板悕绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傛暟闆嗙紪鐮�" prop="paramSetCode">
+ <el-input
+ v-model="queryParams.paramSetCode"
+ placeholder="璇疯緭鍏ュ弬鏁伴泦缂栫爜"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傛暟闆嗗悕绉�" prop="paramSetName">
+ <el-input
+ v-model="queryParams.paramSetName"
+ placeholder="璇疯緭鍏ュ弬鏁伴泦鍚嶇О"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="閲囬泦鍦板潃" prop="node">
+ <el-input
+ v-model="queryParams.node"
+ placeholder="璇疯緭鍏ラ噰闆嗗湴鍧�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-input
+ v-model="queryParams.unit"
+ placeholder="璇疯緭鍏ュ崟浣�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="涓婇檺鍊�" prop="paramUpper">
+ <el-input
+ v-model="queryParams.paramUpper"
+ placeholder="璇疯緭鍏ヤ笂闄愬��"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="涓嬮檺鍊�" prop="paramLower">
+ <el-input
+ v-model="queryParams.paramLower"
+ placeholder="璇疯緭鍏ヤ笅闄愬��"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="涓績鍊�" prop="paramCentral">
+ <el-input
+ v-model="queryParams.paramCentral"
+ placeholder="璇疯緭鍏ヤ腑蹇冨��"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鏄剧ず椤哄簭" prop="orderNum">
+ <el-input
+ v-model="queryParams.orderNum"
+ placeholder="璇疯緭鍏ユ樉绀洪『搴�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鏄惁璁㈤槄" prop="subscribe">
+ <el-input
+ v-model="queryParams.subscribe"
+ 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
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['sc:collectionParamConf: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="['sc:collectionParamConf: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="['sc:collectionParamConf: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="['sc:collectionParamConf:export']"
+ >瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+
+ <el-table v-loading="loading" :data="collectionParamConfList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="涓婚敭id" align="center" prop="id" />
+ <el-table-column label="浜у搧缂栫爜" align="center" prop="productCode" />
+ <el-table-column label="浜у搧鍨嬪彿" align="center" prop="productType" />
+ <el-table-column label="宸ヤ綅缂栫爜" align="center" prop="locationCode" />
+ <el-table-column label="鍙傛暟缂栫爜" align="center" prop="paramCode" />
+ <el-table-column label="鍙傛暟鍚嶇О" align="center" prop="paramName" />
+ <el-table-column label="鍙傛暟闆嗙紪鐮�" align="center" prop="paramSetCode" />
+ <el-table-column label="鍙傛暟闆嗗悕绉�" align="center" prop="paramSetName" />
+ <el-table-column label="閲囬泦鍦板潃" align="center" prop="node" />
+ <el-table-column label="閲囬泦绫诲瀷" align="center" prop="type" />
+ <el-table-column label="鍗曚綅" align="center" prop="unit" />
+ <el-table-column label="涓婇檺鍊�" align="center" prop="paramUpper" />
+ <el-table-column label="涓嬮檺鍊�" align="center" prop="paramLower" />
+ <el-table-column label="涓績鍊�" align="center" prop="paramCentral" />
+ <el-table-column label="鏄剧ず椤哄簭" align="center" prop="orderNum" />
+ <el-table-column label="鏄惁璁㈤槄" align="center" prop="subscribe" />
+ <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="['sc:collectionParamConf:edit']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['sc:collectionParamConf: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="productCode">
+ <el-input v-model="form.productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" />
+ </el-form-item>
+ <el-form-item label="宸ヤ綅缂栫爜" prop="locationCode">
+ <el-input v-model="form.locationCode" placeholder="璇疯緭鍏ュ伐浣嶇紪鐮�" />
+ </el-form-item>
+ <el-form-item label="鍙傛暟缂栫爜" prop="paramCode">
+ <el-input v-model="form.paramCode" placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�" />
+ </el-form-item>
+ <el-form-item label="鍙傛暟鍚嶇О" prop="paramName">
+ <el-input v-model="form.paramName" placeholder="璇疯緭鍏ュ弬鏁板悕绉�" />
+ </el-form-item>
+ <el-form-item label="鍙傛暟闆嗙紪鐮�" prop="paramSetCode">
+ <el-input v-model="form.paramSetCode" placeholder="璇疯緭鍏ュ弬鏁伴泦缂栫爜" />
+ </el-form-item>
+ <el-form-item label="鍙傛暟闆嗗悕绉�" prop="paramSetName">
+ <el-input v-model="form.paramSetName" placeholder="璇疯緭鍏ュ弬鏁伴泦鍚嶇О" />
+ </el-form-item>
+ <el-form-item label="閲囬泦鍦板潃" prop="node">
+ <el-input v-model="form.node" placeholder="璇疯緭鍏ラ噰闆嗗湴鍧�" />
+ </el-form-item>
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" />
+ </el-form-item>
+ <el-form-item label="涓婇檺鍊�" prop="paramUpper">
+ <el-input v-model="form.paramUpper" placeholder="璇疯緭鍏ヤ笂闄愬��" />
+ </el-form-item>
+ <el-form-item label="涓嬮檺鍊�" prop="paramLower">
+ <el-input v-model="form.paramLower" placeholder="璇疯緭鍏ヤ笅闄愬��" />
+ </el-form-item>
+ <el-form-item label="涓績鍊�" prop="paramCentral">
+ <el-input v-model="form.paramCentral" placeholder="璇疯緭鍏ヤ腑蹇冨��" />
+ </el-form-item>
+ <el-form-item label="鏄剧ず椤哄簭" prop="orderNum">
+ <el-input v-model="form.orderNum" placeholder="璇疯緭鍏ユ樉绀洪『搴�" />
+ </el-form-item>
+ <el-form-item label="鏄惁璁㈤槄" prop="subscribe">
+ <el-input v-model="form.subscribe" placeholder="璇疯緭鍏ユ槸鍚﹁闃�" />
+ </el-form-item>
+ <el-form-item label="鍒犻櫎鏍囧織" prop="delFlag">
+ <el-input v-model="form.delFlag" 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 { listCollectionParamConf, getCollectionParamConf, delCollectionParamConf, addCollectionParamConf, updateCollectionParamConf } from "@/api/main/sc/collectionParamConf";
+
+export default {
+ name: "CollectionParamConf",
+ data() {
+ return {
+ // 閬僵灞�
+ loading: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 鍙傛暟閲囬泦閰嶇疆琛ㄦ牸鏁版嵁
+ collectionParamConfList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ productCode: null,
+ productType: null,
+ locationCode: null,
+ paramCode: null,
+ paramName: null,
+ paramSetCode: null,
+ paramSetName: null,
+ node: null,
+ type: null,
+ unit: null,
+ paramUpper: null,
+ paramLower: null,
+ paramCentral: null,
+ orderNum: null,
+ subscribe: null,
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ }
+ };
+ },
+ created() {
+ this.getList();
+ },
+ methods: {
+ /** 鏌ヨ鍙傛暟閲囬泦閰嶇疆鍒楄〃 */
+ getList() {
+ this.loading = true;
+ listCollectionParamConf(this.queryParams).then(response => {
+ this.collectionParamConfList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ id: null,
+ productCode: null,
+ productType: null,
+ locationCode: null,
+ paramCode: null,
+ paramName: null,
+ paramSetCode: null,
+ paramSetName: null,
+ node: null,
+ type: null,
+ unit: null,
+ paramUpper: null,
+ paramLower: null,
+ paramCentral: null,
+ orderNum: null,
+ subscribe: null,
+ delFlag: null,
+ createBy: null,
+ createTime: null,
+ updateBy: null,
+ updateTime: 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 = "娣诲姞鍙傛暟閲囬泦閰嶇疆";
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getCollectionParamConf(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) {
+ updateCollectionParamConf(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addCollectionParamConf(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() {
+ return delCollectionParamConf(ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('sc/collectionParamConf/export', {
+ ...this.queryParams
+ }, `collectionParamConf_${new Date().getTime()}.xlsx`)
+ }
+ }
+};
+</script>
diff --git a/billion-ui/src/views/main/sc/opcConf/index.vue b/billion-ui/src/views/main/sc/opcConf/index.vue
index 9589179..24c30b2 100644
--- a/billion-ui/src/views/main/sc/opcConf/index.vue
+++ b/billion-ui/src/views/main/sc/opcConf/index.vue
@@ -1,6 +1,14 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="宸ヤ綅缂栧彿" prop="locationCode">
+ <el-input
+ v-model="queryParams.locationCode"
+ placeholder="璇疯緭鍏ュ伐浣嶇紪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-form-item label="宸ヤ綅鍚嶇О" prop="locationName">
<el-input
v-model="queryParams.locationName"
@@ -17,9 +25,20 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item>
+ <el-form-item label="閲囬泦绫诲瀷" prop="type">
+ <el-input
+ v-model="queryParams.node"
+ placeholder="璇疯緭鍏ラ噰闆嗙被鍨�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+
+ <el-form-item style="float: right" >
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+<!-- <el-button icon="el-icon-setting" size="mini" @click="toggleAdvancedSearch">楂樼骇鏌ヨ</el-button>-->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+
</el-form-item>
</el-form>
@@ -69,26 +88,33 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="opcConfList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" border :data="opcConfList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭id" align="center" prop="id" />
<el-table-column label="宸ヤ綅缂栫爜" align="center" prop="locationCode" />
<el-table-column label="宸ヤ綅鍚嶇О" align="center" prop="locationName" />
<el-table-column label="鍦板潃" align="center" prop="node" />
<el-table-column label="閲囬泦绫诲瀷" align="center" prop="type" />
- <el-table-column label="鏄惁璁㈤槄" align="center" prop="subscribe" />
+ <el-table-column label="鏄惁璁㈤槄" align="center" prop="subscribe" >
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.subscribe"/>
+ </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"
+ style="width: 72px"
+ type="success"
+ plain
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['sc:opcConf:edit']"
>淇敼</el-button>
<el-button
size="mini"
- type="text"
+ style="width: 72px"
+ type="danger"
+ plain
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['sc:opcConf:remove']"
@@ -106,10 +132,10 @@
/>
<!-- 娣诲姞鎴栦慨鏀筄PC浜や簰閰嶇疆瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <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="locationCode">
- <el-input v-model="form.locationCode" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.locationCode" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
<el-form-item label="宸ヤ綅鍚嶇О" prop="locationName">
<el-input v-model="form.locationName" placeholder="璇疯緭鍏ュ伐浣嶅悕绉�" />
@@ -117,9 +143,18 @@
<el-form-item label="鍦板潃" prop="node">
<el-input v-model="form.node" placeholder="璇疯緭鍏ュ湴鍧�" />
</el-form-item>
-<!-- <el-form-item label="鍒犻櫎鏍囧織" prop="delFlag">-->
-<!-- <el-input v-model="form.delFlag" placeholder="璇疯緭鍏ュ垹闄ゆ爣蹇�" />-->
-<!-- </el-form-item>-->
+ <el-form-item label="閲囬泦绫诲瀷" prop="type">
+ <el-input v-model="form.type" placeholder="璇疯緭鍏ラ噰闆嗙被鍨�" />
+ </el-form-item>
+ <el-form-item label="鏄惁璁㈤槄" prop="subscribe">
+ <el-radio-group v-model="form.subscribe">
+ <el-radio
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.value"
+ >{{dict.label}}</el-radio>
+ </el-radio-group>
+ </el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -134,8 +169,10 @@
export default {
name: "OpcConf",
+ dicts: ['sys_yes_no'],
data() {
return {
+ advancedSearchVisible: false,
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -168,6 +205,17 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ locationCode: [
+ { required: true, message: "宸ヤ綅缂栫爜涓嶈兘涓虹┖", trigger: "blur" },
+ { pattern: /^[a-zA-Z0-9]*$/, message: "鎬绘垚搴忓垪鍙蜂笉鑳藉寘鍚腑鏂囧瓧绗�", trigger: "blur" }
+ ],
+ locationName: [
+ { required: true, message: "宸ヤ綅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ node: [
+ { required: true, message: "鍦板潃涓嶈兘涓虹┖", trigger: "blur" },
+ { pattern: /^[a-zA-Z0-9]*$/, message: "鍦板潃涓嶈兘鍖呭惈涓枃瀛楃", trigger: "blur" }
+ ],
}
};
},
@@ -175,6 +223,10 @@
this.getList();
},
methods: {
+ toggleAdvancedSearch() {
+ this.advancedSearchVisible = !this.advancedSearchVisible;
+
+ },
/** 鏌ヨOPC浜や簰閰嶇疆鍒楄〃 */
getList() {
this.loading = true;
--
Gitblit v1.9.3