From f1836e2107bdb13687dddb94de72b91efb49a393 Mon Sep 17 00:00:00 2001
From: admin <418351270@qq.com>
Date: 星期一, 08 一月 2024 08:26:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/IBsBeatSettingService.java         |   61 +
 jcdm-ui/src/views/main/bs/beatSetting/index.vue                                                 |  336 +++++++++
 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/mapper/ScStationConfMapper.java            |   61 +
 jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/impl/BsBeatSettingServiceImpl.java |   96 ++
 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java                  |  193 +++++
 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/controller/ScStationConfController.java    |  104 +++
 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/IScStationConfService.java         |   61 +
 jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/controller/BsBeatSettingController.java    |  104 +++
 jcdm-main/src/main/resources/mapper/bs/beatSetting/BsBeatSettingMapper.xml                      |  103 +++
 jcdm-ui/src/api/main/sc/stationConf.js                                                          |   44 +
 jcdm-ui/src/views/main/em/equipmentArchives/index.vue                                           |   20 
 jcdm-ui/src/views/main/sc/stationConf/index.vue                                                 |  342 ++++++++++
 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/impl/ScStationConfServiceImpl.java |   96 ++
 jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/domain/BsBeatSetting.java                  |  152 ++++
 jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/mapper/BsBeatSettingMapper.java            |   61 +
 jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml                      |  114 +++
 jcdm-ui/src/api/main/bs/beatSetting/beatSetting.js                                              |   44 +
 17 files changed, 1,977 insertions(+), 15 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/controller/BsBeatSettingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/controller/BsBeatSettingController.java
new file mode 100644
index 0000000..1615c3d
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/controller/BsBeatSettingController.java
@@ -0,0 +1,104 @@
+package com.jcdm.main.bs.beatSetting.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.jcdm.common.annotation.Log;
+import com.jcdm.common.core.controller.BaseController;
+import com.jcdm.common.core.domain.AjaxResult;
+import com.jcdm.common.enums.BusinessType;
+import com.jcdm.main.bs.beatSetting.domain.BsBeatSetting;
+import com.jcdm.main.bs.beatSetting.service.IBsBeatSettingService;
+import com.jcdm.common.utils.poi.ExcelUtil;
+import com.jcdm.common.core.page.TableDataInfo;
+
+/**
+ * 鑺傛媿璁剧疆Controller
+ * 
+ * @author Yi
+ * @date 2024-01-05
+ */
+@RestController
+@RequestMapping("/bs/beatSetting")
+public class BsBeatSettingController extends BaseController
+{
+    @Autowired
+    private IBsBeatSettingService bsBeatSettingService;
+
+    /**
+     * 鏌ヨ鑺傛媿璁剧疆鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('bs:beatSetting:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BsBeatSetting bsBeatSetting)
+    {
+        startPage();
+        List<BsBeatSetting> list = bsBeatSettingService.selectBsBeatSettingList(bsBeatSetting);
+        return getDataTable(list);
+    }
+
+    /**
+     * 瀵煎嚭鑺傛媿璁剧疆鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('bs:beatSetting:export')")
+    @Log(title = "鑺傛媿璁剧疆", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BsBeatSetting bsBeatSetting)
+    {
+        List<BsBeatSetting> list = bsBeatSettingService.selectBsBeatSettingList(bsBeatSetting);
+        ExcelUtil<BsBeatSetting> util = new ExcelUtil<BsBeatSetting>(BsBeatSetting.class);
+        util.exportExcel(response, list, "鑺傛媿璁剧疆鏁版嵁");
+    }
+
+    /**
+     * 鑾峰彇鑺傛媿璁剧疆璇︾粏淇℃伅
+     */
+    @PreAuthorize("@ss.hasPermi('bs:beatSetting:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(bsBeatSettingService.selectBsBeatSettingById(id));
+    }
+
+    /**
+     * 鏂板鑺傛媿璁剧疆
+     */
+    @PreAuthorize("@ss.hasPermi('bs:beatSetting:add')")
+    @Log(title = "鑺傛媿璁剧疆", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BsBeatSetting bsBeatSetting)
+    {
+        return toAjax(bsBeatSettingService.insertBsBeatSetting(bsBeatSetting));
+    }
+
+    /**
+     * 淇敼鑺傛媿璁剧疆
+     */
+    @PreAuthorize("@ss.hasPermi('bs:beatSetting:edit')")
+    @Log(title = "鑺傛媿璁剧疆", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsBeatSetting bsBeatSetting)
+    {
+        return toAjax(bsBeatSettingService.updateBsBeatSetting(bsBeatSetting));
+    }
+
+    /**
+     * 鍒犻櫎鑺傛媿璁剧疆
+     */
+    @PreAuthorize("@ss.hasPermi('bs:beatSetting:remove')")
+    @Log(title = "鑺傛媿璁剧疆", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bsBeatSettingService.deleteBsBeatSettingByIds(ids));
+    }
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/domain/BsBeatSetting.java b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/domain/BsBeatSetting.java
new file mode 100644
index 0000000..62395e2
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/domain/BsBeatSetting.java
@@ -0,0 +1,152 @@
+package com.jcdm.main.bs.beatSetting.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.jcdm.common.annotation.Excel;
+import com.jcdm.common.core.domain.BaseEntity;
+
+/**
+ * 鑺傛媿璁剧疆瀵硅薄 bs_beat_setting
+ * 
+ * @author Yi
+ * @date 2024-01-05
+ */
+public class BsBeatSetting extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 涓婚敭id */
+    private Long id;
+
+    /** 浜у搧缂栫爜 */
+    @Excel(name = "浜у搧缂栫爜")
+    private String productCode;
+
+    /** 浜у搧鍚嶇О */
+    @Excel(name = "浜у搧鍚嶇О")
+    private String productName;
+
+    /** 鑺傛媿 */
+    @Excel(name = "鑺傛媿")
+    private String beat;
+
+    /** 棰勭暀瀛楁1 */
+    @Excel(name = "棰勭暀瀛楁1")
+    private String spareField1;
+
+    /** 棰勭暀瀛楁2 */
+    @Excel(name = "棰勭暀瀛楁2")
+    private String spareField2;
+
+    /** 鍒涘缓鐢ㄦ埛 */
+    @Excel(name = "鍒涘缓鐢ㄦ埛")
+    private String createUser;
+
+    /** 鏇存敼鐢ㄦ埛 */
+    @Excel(name = "鏇存敼鐢ㄦ埛")
+    private String updateUser;
+
+    /** 鏁版嵁鏉ユ簮 */
+    @Excel(name = "鏁版嵁鏉ユ簮")
+    private String dataSource;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setProductCode(String productCode) 
+    {
+        this.productCode = productCode;
+    }
+
+    public String getProductCode() 
+    {
+        return productCode;
+    }
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+    public void setBeat(String beat) 
+    {
+        this.beat = beat;
+    }
+
+    public String getBeat() 
+    {
+        return beat;
+    }
+    public void setSpareField1(String spareField1) 
+    {
+        this.spareField1 = spareField1;
+    }
+
+    public String getSpareField1() 
+    {
+        return spareField1;
+    }
+    public void setSpareField2(String spareField2) 
+    {
+        this.spareField2 = spareField2;
+    }
+
+    public String getSpareField2() 
+    {
+        return spareField2;
+    }
+    public void setCreateUser(String createUser) 
+    {
+        this.createUser = createUser;
+    }
+
+    public String getCreateUser() 
+    {
+        return createUser;
+    }
+    public void setUpdateUser(String updateUser) 
+    {
+        this.updateUser = updateUser;
+    }
+
+    public String getUpdateUser() 
+    {
+        return updateUser;
+    }
+    public void setDataSource(String dataSource) 
+    {
+        this.dataSource = dataSource;
+    }
+
+    public String getDataSource() 
+    {
+        return dataSource;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("productCode", getProductCode())
+            .append("productName", getProductName())
+            .append("beat", getBeat())
+            .append("spareField1", getSpareField1())
+            .append("spareField2", getSpareField2())
+            .append("remark", getRemark())
+            .append("createUser", getCreateUser())
+            .append("createTime", getCreateTime())
+            .append("updateUser", getUpdateUser())
+            .append("updateTime", getUpdateTime())
+            .append("dataSource", getDataSource())
+            .toString();
+    }
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/mapper/BsBeatSettingMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/mapper/BsBeatSettingMapper.java
new file mode 100644
index 0000000..c5c6918
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/mapper/BsBeatSettingMapper.java
@@ -0,0 +1,61 @@
+package com.jcdm.main.bs.beatSetting.mapper;
+
+import java.util.List;
+import com.jcdm.main.bs.beatSetting.domain.BsBeatSetting;
+
+/**
+ * 鑺傛媿璁剧疆Mapper鎺ュ彛
+ * 
+ * @author Yi
+ * @date 2024-01-05
+ */
+public interface BsBeatSettingMapper 
+{
+    /**
+     * 鏌ヨ鑺傛媿璁剧疆
+     * 
+     * @param id 鑺傛媿璁剧疆涓婚敭
+     * @return 鑺傛媿璁剧疆
+     */
+    public BsBeatSetting selectBsBeatSettingById(Long id);
+
+    /**
+     * 鏌ヨ鑺傛媿璁剧疆鍒楄〃
+     * 
+     * @param bsBeatSetting 鑺傛媿璁剧疆
+     * @return 鑺傛媿璁剧疆闆嗗悎
+     */
+    public List<BsBeatSetting> selectBsBeatSettingList(BsBeatSetting bsBeatSetting);
+
+    /**
+     * 鏂板鑺傛媿璁剧疆
+     * 
+     * @param bsBeatSetting 鑺傛媿璁剧疆
+     * @return 缁撴灉
+     */
+    public int insertBsBeatSetting(BsBeatSetting bsBeatSetting);
+
+    /**
+     * 淇敼鑺傛媿璁剧疆
+     * 
+     * @param bsBeatSetting 鑺傛媿璁剧疆
+     * @return 缁撴灉
+     */
+    public int updateBsBeatSetting(BsBeatSetting bsBeatSetting);
+
+    /**
+     * 鍒犻櫎鑺傛媿璁剧疆
+     * 
+     * @param id 鑺傛媿璁剧疆涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteBsBeatSettingById(Long id);
+
+    /**
+     * 鎵归噺鍒犻櫎鑺傛媿璁剧疆
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteBsBeatSettingByIds(Long[] ids);
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/IBsBeatSettingService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/IBsBeatSettingService.java
new file mode 100644
index 0000000..988143b
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/IBsBeatSettingService.java
@@ -0,0 +1,61 @@
+package com.jcdm.main.bs.beatSetting.service;
+
+import java.util.List;
+import com.jcdm.main.bs.beatSetting.domain.BsBeatSetting;
+
+/**
+ * 鑺傛媿璁剧疆Service鎺ュ彛
+ * 
+ * @author Yi
+ * @date 2024-01-05
+ */
+public interface IBsBeatSettingService 
+{
+    /**
+     * 鏌ヨ鑺傛媿璁剧疆
+     * 
+     * @param id 鑺傛媿璁剧疆涓婚敭
+     * @return 鑺傛媿璁剧疆
+     */
+    public BsBeatSetting selectBsBeatSettingById(Long id);
+
+    /**
+     * 鏌ヨ鑺傛媿璁剧疆鍒楄〃
+     * 
+     * @param bsBeatSetting 鑺傛媿璁剧疆
+     * @return 鑺傛媿璁剧疆闆嗗悎
+     */
+    public List<BsBeatSetting> selectBsBeatSettingList(BsBeatSetting bsBeatSetting);
+
+    /**
+     * 鏂板鑺傛媿璁剧疆
+     * 
+     * @param bsBeatSetting 鑺傛媿璁剧疆
+     * @return 缁撴灉
+     */
+    public int insertBsBeatSetting(BsBeatSetting bsBeatSetting);
+
+    /**
+     * 淇敼鑺傛媿璁剧疆
+     * 
+     * @param bsBeatSetting 鑺傛媿璁剧疆
+     * @return 缁撴灉
+     */
+    public int updateBsBeatSetting(BsBeatSetting bsBeatSetting);
+
+    /**
+     * 鎵归噺鍒犻櫎鑺傛媿璁剧疆
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑鑺傛媿璁剧疆涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteBsBeatSettingByIds(Long[] ids);
+
+    /**
+     * 鍒犻櫎鑺傛媿璁剧疆淇℃伅
+     * 
+     * @param id 鑺傛媿璁剧疆涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteBsBeatSettingById(Long id);
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/impl/BsBeatSettingServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/impl/BsBeatSettingServiceImpl.java
new file mode 100644
index 0000000..a2c19a0
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/impl/BsBeatSettingServiceImpl.java
@@ -0,0 +1,96 @@
+package com.jcdm.main.bs.beatSetting.service.impl;
+
+import java.util.List;
+import com.jcdm.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.jcdm.main.bs.beatSetting.mapper.BsBeatSettingMapper;
+import com.jcdm.main.bs.beatSetting.domain.BsBeatSetting;
+import com.jcdm.main.bs.beatSetting.service.IBsBeatSettingService;
+
+/**
+ * 鑺傛媿璁剧疆Service涓氬姟灞傚鐞�
+ * 
+ * @author Yi
+ * @date 2024-01-05
+ */
+@Service
+public class BsBeatSettingServiceImpl implements IBsBeatSettingService 
+{
+    @Autowired
+    private BsBeatSettingMapper bsBeatSettingMapper;
+
+    /**
+     * 鏌ヨ鑺傛媿璁剧疆
+     * 
+     * @param id 鑺傛媿璁剧疆涓婚敭
+     * @return 鑺傛媿璁剧疆
+     */
+    @Override
+    public BsBeatSetting selectBsBeatSettingById(Long id)
+    {
+        return bsBeatSettingMapper.selectBsBeatSettingById(id);
+    }
+
+    /**
+     * 鏌ヨ鑺傛媿璁剧疆鍒楄〃
+     * 
+     * @param bsBeatSetting 鑺傛媿璁剧疆
+     * @return 鑺傛媿璁剧疆
+     */
+    @Override
+    public List<BsBeatSetting> selectBsBeatSettingList(BsBeatSetting bsBeatSetting)
+    {
+        return bsBeatSettingMapper.selectBsBeatSettingList(bsBeatSetting);
+    }
+
+    /**
+     * 鏂板鑺傛媿璁剧疆
+     * 
+     * @param bsBeatSetting 鑺傛媿璁剧疆
+     * @return 缁撴灉
+     */
+    @Override
+    public int insertBsBeatSetting(BsBeatSetting bsBeatSetting)
+    {
+        bsBeatSetting.setCreateTime(DateUtils.getNowDate());
+        return bsBeatSettingMapper.insertBsBeatSetting(bsBeatSetting);
+    }
+
+    /**
+     * 淇敼鑺傛媿璁剧疆
+     * 
+     * @param bsBeatSetting 鑺傛媿璁剧疆
+     * @return 缁撴灉
+     */
+    @Override
+    public int updateBsBeatSetting(BsBeatSetting bsBeatSetting)
+    {
+        bsBeatSetting.setUpdateTime(DateUtils.getNowDate());
+        return bsBeatSettingMapper.updateBsBeatSetting(bsBeatSetting);
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎鑺傛媿璁剧疆
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑鑺傛媿璁剧疆涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteBsBeatSettingByIds(Long[] ids)
+    {
+        return bsBeatSettingMapper.deleteBsBeatSettingByIds(ids);
+    }
+
+    /**
+     * 鍒犻櫎鑺傛媿璁剧疆淇℃伅
+     * 
+     * @param id 鑺傛媿璁剧疆涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteBsBeatSettingById(Long id)
+    {
+        return bsBeatSettingMapper.deleteBsBeatSettingById(id);
+    }
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/controller/ScStationConfController.java b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/controller/ScStationConfController.java
new file mode 100644
index 0000000..fa44622
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/controller/ScStationConfController.java
@@ -0,0 +1,104 @@
+package com.jcdm.main.sc.stationConf.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.jcdm.common.annotation.Log;
+import com.jcdm.common.core.controller.BaseController;
+import com.jcdm.common.core.domain.AjaxResult;
+import com.jcdm.common.enums.BusinessType;
+import com.jcdm.main.sc.stationConf.domain.ScStationConf;
+import com.jcdm.main.sc.stationConf.service.IScStationConfService;
+import com.jcdm.common.utils.poi.ExcelUtil;
+import com.jcdm.common.core.page.TableDataInfo;
+
+/**
+ * 宸ヤ綅缁堢閰嶇疆Controller
+ * 
+ * @author Yi
+ * @date 2024-01-06
+ */
+@RestController
+@RequestMapping("/sc/stationConf")
+public class ScStationConfController extends BaseController
+{
+    @Autowired
+    private IScStationConfService scStationConfService;
+
+    /**
+     * 鏌ヨ宸ヤ綅缁堢閰嶇疆鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('sc:stationConf:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ScStationConf scStationConf)
+    {
+        startPage();
+        List<ScStationConf> list = scStationConfService.selectScStationConfList(scStationConf);
+        return getDataTable(list);
+    }
+
+    /**
+     * 瀵煎嚭宸ヤ綅缁堢閰嶇疆鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('sc:stationConf:export')")
+    @Log(title = "宸ヤ綅缁堢閰嶇疆", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ScStationConf scStationConf)
+    {
+        List<ScStationConf> list = scStationConfService.selectScStationConfList(scStationConf);
+        ExcelUtil<ScStationConf> util = new ExcelUtil<ScStationConf>(ScStationConf.class);
+        util.exportExcel(response, list, "宸ヤ綅缁堢閰嶇疆鏁版嵁");
+    }
+
+    /**
+     * 鑾峰彇宸ヤ綅缁堢閰嶇疆璇︾粏淇℃伅
+     */
+    @PreAuthorize("@ss.hasPermi('sc:stationConf:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(scStationConfService.selectScStationConfById(id));
+    }
+
+    /**
+     * 鏂板宸ヤ綅缁堢閰嶇疆
+     */
+    @PreAuthorize("@ss.hasPermi('sc:stationConf:add')")
+    @Log(title = "宸ヤ綅缁堢閰嶇疆", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ScStationConf scStationConf)
+    {
+        return toAjax(scStationConfService.insertScStationConf(scStationConf));
+    }
+
+    /**
+     * 淇敼宸ヤ綅缁堢閰嶇疆
+     */
+    @PreAuthorize("@ss.hasPermi('sc:stationConf:edit')")
+    @Log(title = "宸ヤ綅缁堢閰嶇疆", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ScStationConf scStationConf)
+    {
+        return toAjax(scStationConfService.updateScStationConf(scStationConf));
+    }
+
+    /**
+     * 鍒犻櫎宸ヤ綅缁堢閰嶇疆
+     */
+    @PreAuthorize("@ss.hasPermi('sc:stationConf:remove')")
+    @Log(title = "宸ヤ綅缁堢閰嶇疆", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(scStationConfService.deleteScStationConfByIds(ids));
+    }
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java
new file mode 100644
index 0000000..3e418c0
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java
@@ -0,0 +1,193 @@
+package com.jcdm.main.sc.stationConf.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.jcdm.common.annotation.Excel;
+import com.jcdm.common.core.domain.BaseEntity;
+
+/**
+ * 宸ヤ綅缁堢閰嶇疆瀵硅薄 sc_station_conf
+ * 
+ * @author Yi
+ * @date 2024-01-06
+ */
+public class ScStationConf extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 涓婚敭id */
+    private Long id;
+
+    /** 宸ュ簭缂栧彿 */
+    @Excel(name = "宸ュ簭缂栧彿")
+    private String processesCode;
+
+    /** 宸ュ簭鍚嶇О */
+    @Excel(name = "宸ュ簭鍚嶇О")
+    private String processesName;
+
+    /** 宸ュ簭绫诲瀷 */
+    @Excel(name = "宸ュ簭绫诲瀷")
+    private String processesType;
+
+    /** IP鍦板潃 */
+    @Excel(name = "IP鍦板潃")
+    private String ipAddress;
+
+    /** 棰勭暀瀛楁1 */
+    @Excel(name = "棰勭暀瀛楁1")
+    private String spareField1;
+
+    /** 棰勭暀瀛楁2 */
+    @Excel(name = "棰勭暀瀛楁2")
+    private String spareField2;
+
+    /** 棰勭暀瀛楁3 */
+    @Excel(name = "棰勭暀瀛楁3")
+    private String spareField3;
+
+    /** 棰勭暀瀛楁4 */
+    @Excel(name = "棰勭暀瀛楁4")
+    private String spareField4;
+
+    /** 鍒涘缓鐢ㄦ埛 */
+    @Excel(name = "鍒涘缓鐢ㄦ埛")
+    private String createUser;
+
+    /** 鏇存敼鐢ㄦ埛 */
+    @Excel(name = "鏇存敼鐢ㄦ埛")
+    private String updateUser;
+
+    /** 澶囨敞 */
+    @Excel(name = "澶囨敞")
+    private String remarks;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setProcessesCode(String processesCode) 
+    {
+        this.processesCode = processesCode;
+    }
+
+    public String getProcessesCode() 
+    {
+        return processesCode;
+    }
+    public void setProcessesName(String processesName) 
+    {
+        this.processesName = processesName;
+    }
+
+    public String getProcessesName() 
+    {
+        return processesName;
+    }
+    public void setProcessesType(String processesType) 
+    {
+        this.processesType = processesType;
+    }
+
+    public String getProcessesType() 
+    {
+        return processesType;
+    }
+    public void setIpAddress(String ipAddress) 
+    {
+        this.ipAddress = ipAddress;
+    }
+
+    public String getIpAddress() 
+    {
+        return ipAddress;
+    }
+    public void setSpareField1(String spareField1) 
+    {
+        this.spareField1 = spareField1;
+    }
+
+    public String getSpareField1() 
+    {
+        return spareField1;
+    }
+    public void setSpareField2(String spareField2) 
+    {
+        this.spareField2 = spareField2;
+    }
+
+    public String getSpareField2() 
+    {
+        return spareField2;
+    }
+    public void setSpareField3(String spareField3) 
+    {
+        this.spareField3 = spareField3;
+    }
+
+    public String getSpareField3() 
+    {
+        return spareField3;
+    }
+    public void setSpareField4(String spareField4) 
+    {
+        this.spareField4 = spareField4;
+    }
+
+    public String getSpareField4() 
+    {
+        return spareField4;
+    }
+    public void setCreateUser(String createUser) 
+    {
+        this.createUser = createUser;
+    }
+
+    public String getCreateUser() 
+    {
+        return createUser;
+    }
+    public void setUpdateUser(String updateUser) 
+    {
+        this.updateUser = updateUser;
+    }
+
+    public String getUpdateUser() 
+    {
+        return updateUser;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("processesCode", getProcessesCode())
+            .append("processesName", getProcessesName())
+            .append("processesType", getProcessesType())
+            .append("ipAddress", getIpAddress())
+            .append("spareField1", getSpareField1())
+            .append("spareField2", getSpareField2())
+            .append("spareField3", getSpareField3())
+            .append("spareField4", getSpareField4())
+            .append("createUser", getCreateUser())
+            .append("createTime", getCreateTime())
+            .append("updateUser", getUpdateUser())
+            .append("updateTime", getUpdateTime())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/mapper/ScStationConfMapper.java b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/mapper/ScStationConfMapper.java
new file mode 100644
index 0000000..1945691
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/mapper/ScStationConfMapper.java
@@ -0,0 +1,61 @@
+package com.jcdm.main.sc.stationConf.mapper;
+
+import java.util.List;
+import com.jcdm.main.sc.stationConf.domain.ScStationConf;
+
+/**
+ * 宸ヤ綅缁堢閰嶇疆Mapper鎺ュ彛
+ * 
+ * @author Yi
+ * @date 2024-01-06
+ */
+public interface ScStationConfMapper 
+{
+    /**
+     * 鏌ヨ宸ヤ綅缁堢閰嶇疆
+     * 
+     * @param id 宸ヤ綅缁堢閰嶇疆涓婚敭
+     * @return 宸ヤ綅缁堢閰嶇疆
+     */
+    public ScStationConf selectScStationConfById(Long id);
+
+    /**
+     * 鏌ヨ宸ヤ綅缁堢閰嶇疆鍒楄〃
+     * 
+     * @param scStationConf 宸ヤ綅缁堢閰嶇疆
+     * @return 宸ヤ綅缁堢閰嶇疆闆嗗悎
+     */
+    public List<ScStationConf> selectScStationConfList(ScStationConf scStationConf);
+
+    /**
+     * 鏂板宸ヤ綅缁堢閰嶇疆
+     * 
+     * @param scStationConf 宸ヤ綅缁堢閰嶇疆
+     * @return 缁撴灉
+     */
+    public int insertScStationConf(ScStationConf scStationConf);
+
+    /**
+     * 淇敼宸ヤ綅缁堢閰嶇疆
+     * 
+     * @param scStationConf 宸ヤ綅缁堢閰嶇疆
+     * @return 缁撴灉
+     */
+    public int updateScStationConf(ScStationConf scStationConf);
+
+    /**
+     * 鍒犻櫎宸ヤ綅缁堢閰嶇疆
+     * 
+     * @param id 宸ヤ綅缁堢閰嶇疆涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteScStationConfById(Long id);
+
+    /**
+     * 鎵归噺鍒犻櫎宸ヤ綅缁堢閰嶇疆
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteScStationConfByIds(Long[] ids);
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/IScStationConfService.java b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/IScStationConfService.java
new file mode 100644
index 0000000..7cf315e
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/IScStationConfService.java
@@ -0,0 +1,61 @@
+package com.jcdm.main.sc.stationConf.service;
+
+import java.util.List;
+import com.jcdm.main.sc.stationConf.domain.ScStationConf;
+
+/**
+ * 宸ヤ綅缁堢閰嶇疆Service鎺ュ彛
+ * 
+ * @author Yi
+ * @date 2024-01-06
+ */
+public interface IScStationConfService 
+{
+    /**
+     * 鏌ヨ宸ヤ綅缁堢閰嶇疆
+     * 
+     * @param id 宸ヤ綅缁堢閰嶇疆涓婚敭
+     * @return 宸ヤ綅缁堢閰嶇疆
+     */
+    public ScStationConf selectScStationConfById(Long id);
+
+    /**
+     * 鏌ヨ宸ヤ綅缁堢閰嶇疆鍒楄〃
+     * 
+     * @param scStationConf 宸ヤ綅缁堢閰嶇疆
+     * @return 宸ヤ綅缁堢閰嶇疆闆嗗悎
+     */
+    public List<ScStationConf> selectScStationConfList(ScStationConf scStationConf);
+
+    /**
+     * 鏂板宸ヤ綅缁堢閰嶇疆
+     * 
+     * @param scStationConf 宸ヤ綅缁堢閰嶇疆
+     * @return 缁撴灉
+     */
+    public int insertScStationConf(ScStationConf scStationConf);
+
+    /**
+     * 淇敼宸ヤ綅缁堢閰嶇疆
+     * 
+     * @param scStationConf 宸ヤ綅缁堢閰嶇疆
+     * @return 缁撴灉
+     */
+    public int updateScStationConf(ScStationConf scStationConf);
+
+    /**
+     * 鎵归噺鍒犻櫎宸ヤ綅缁堢閰嶇疆
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑宸ヤ綅缁堢閰嶇疆涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteScStationConfByIds(Long[] ids);
+
+    /**
+     * 鍒犻櫎宸ヤ綅缁堢閰嶇疆淇℃伅
+     * 
+     * @param id 宸ヤ綅缁堢閰嶇疆涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteScStationConfById(Long id);
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/impl/ScStationConfServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/impl/ScStationConfServiceImpl.java
new file mode 100644
index 0000000..f29f9d5
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/impl/ScStationConfServiceImpl.java
@@ -0,0 +1,96 @@
+package com.jcdm.main.sc.stationConf.service.impl;
+
+import java.util.List;
+import com.jcdm.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.jcdm.main.sc.stationConf.mapper.ScStationConfMapper;
+import com.jcdm.main.sc.stationConf.domain.ScStationConf;
+import com.jcdm.main.sc.stationConf.service.IScStationConfService;
+
+/**
+ * 宸ヤ綅缁堢閰嶇疆Service涓氬姟灞傚鐞�
+ * 
+ * @author Yi
+ * @date 2024-01-06
+ */
+@Service
+public class ScStationConfServiceImpl implements IScStationConfService 
+{
+    @Autowired
+    private ScStationConfMapper scStationConfMapper;
+
+    /**
+     * 鏌ヨ宸ヤ綅缁堢閰嶇疆
+     * 
+     * @param id 宸ヤ綅缁堢閰嶇疆涓婚敭
+     * @return 宸ヤ綅缁堢閰嶇疆
+     */
+    @Override
+    public ScStationConf selectScStationConfById(Long id)
+    {
+        return scStationConfMapper.selectScStationConfById(id);
+    }
+
+    /**
+     * 鏌ヨ宸ヤ綅缁堢閰嶇疆鍒楄〃
+     * 
+     * @param scStationConf 宸ヤ綅缁堢閰嶇疆
+     * @return 宸ヤ綅缁堢閰嶇疆
+     */
+    @Override
+    public List<ScStationConf> selectScStationConfList(ScStationConf scStationConf)
+    {
+        return scStationConfMapper.selectScStationConfList(scStationConf);
+    }
+
+    /**
+     * 鏂板宸ヤ綅缁堢閰嶇疆
+     * 
+     * @param scStationConf 宸ヤ綅缁堢閰嶇疆
+     * @return 缁撴灉
+     */
+    @Override
+    public int insertScStationConf(ScStationConf scStationConf)
+    {
+        scStationConf.setCreateTime(DateUtils.getNowDate());
+        return scStationConfMapper.insertScStationConf(scStationConf);
+    }
+
+    /**
+     * 淇敼宸ヤ綅缁堢閰嶇疆
+     * 
+     * @param scStationConf 宸ヤ綅缁堢閰嶇疆
+     * @return 缁撴灉
+     */
+    @Override
+    public int updateScStationConf(ScStationConf scStationConf)
+    {
+        scStationConf.setUpdateTime(DateUtils.getNowDate());
+        return scStationConfMapper.updateScStationConf(scStationConf);
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎宸ヤ綅缁堢閰嶇疆
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑宸ヤ綅缁堢閰嶇疆涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteScStationConfByIds(Long[] ids)
+    {
+        return scStationConfMapper.deleteScStationConfByIds(ids);
+    }
+
+    /**
+     * 鍒犻櫎宸ヤ綅缁堢閰嶇疆淇℃伅
+     * 
+     * @param id 宸ヤ綅缁堢閰嶇疆涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteScStationConfById(Long id)
+    {
+        return scStationConfMapper.deleteScStationConfById(id);
+    }
+}
diff --git a/jcdm-main/src/main/resources/mapper/bs/beatSetting/BsBeatSettingMapper.xml b/jcdm-main/src/main/resources/mapper/bs/beatSetting/BsBeatSettingMapper.xml
new file mode 100644
index 0000000..f0a65db
--- /dev/null
+++ b/jcdm-main/src/main/resources/mapper/bs/beatSetting/BsBeatSettingMapper.xml
@@ -0,0 +1,103 @@
+<?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.jcdm.main.bs.beatSetting.mapper.BsBeatSettingMapper">
+    
+    <resultMap type="BsBeatSetting" id="BsBeatSettingResult">
+        <result property="id"    column="id"    />
+        <result property="productCode"    column="product_code"    />
+        <result property="productName"    column="product_name"    />
+        <result property="beat"    column="beat"    />
+        <result property="spareField1"    column="spare_field_1"    />
+        <result property="spareField2"    column="spare_field_2"    />
+        <result property="remark"    column="remark"    />
+        <result property="createUser"    column="create_user"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateUser"    column="update_user"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="dataSource"    column="data_source"    />
+    </resultMap>
+
+    <sql id="selectBsBeatSettingVo">
+        select id, product_code, product_name, beat, spare_field_1, spare_field_2, remark, create_user, create_time, update_user, update_time, data_source from bs_beat_setting
+    </sql>
+
+    <select id="selectBsBeatSettingList" parameterType="BsBeatSetting" resultMap="BsBeatSettingResult">
+        <include refid="selectBsBeatSettingVo"/>
+        <where>  
+            <if test="productCode != null  and productCode != ''"> and product_code = #{productCode}</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="beat != null  and beat != ''"> and beat = #{beat}</if>
+            <if test="spareField1 != null  and spareField1 != ''"> and spare_field_1 = #{spareField1}</if>
+            <if test="spareField2 != null  and spareField2 != ''"> and spare_field_2 = #{spareField2}</if>
+            <if test="createUser != null  and createUser != ''"> and create_user = #{createUser}</if>
+            <if test="updateUser != null  and updateUser != ''"> and update_user = #{updateUser}</if>
+            <if test="dataSource != null  and dataSource != ''"> and data_source = #{dataSource}</if>
+        </where>
+    </select>
+    
+    <select id="selectBsBeatSettingById" parameterType="Long" resultMap="BsBeatSettingResult">
+        <include refid="selectBsBeatSettingVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertBsBeatSetting" parameterType="BsBeatSetting" useGeneratedKeys="true" keyProperty="id">
+        insert into bs_beat_setting
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="productCode != null">product_code,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="beat != null and beat != ''">beat,</if>
+            <if test="spareField1 != null">spare_field_1,</if>
+            <if test="spareField2 != null">spare_field_2,</if>
+            <if test="remark != null">remark,</if>
+            <if test="createUser != null">create_user,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateUser != null">update_user,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="dataSource != null">data_source,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="productCode != null">#{productCode},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="beat != null and beat != ''">#{beat},</if>
+            <if test="spareField1 != null">#{spareField1},</if>
+            <if test="spareField2 != null">#{spareField2},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="dataSource != null">#{dataSource},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBsBeatSetting" parameterType="BsBeatSetting">
+        update bs_beat_setting
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="productCode != null">product_code = #{productCode},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="beat != null and beat != ''">beat = #{beat},</if>
+            <if test="spareField1 != null">spare_field_1 = #{spareField1},</if>
+            <if test="spareField2 != null">spare_field_2 = #{spareField2},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createUser != null">create_user = #{createUser},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateUser != null">update_user = #{updateUser},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="dataSource != null">data_source = #{dataSource},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBsBeatSettingById" parameterType="Long">
+        delete from bs_beat_setting where id = #{id}
+    </delete>
+
+    <delete id="deleteBsBeatSettingByIds" parameterType="String">
+        delete from bs_beat_setting where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml b/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml
new file mode 100644
index 0000000..887a0bd
--- /dev/null
+++ b/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml
@@ -0,0 +1,114 @@
+<?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.jcdm.main.sc.stationConf.mapper.ScStationConfMapper">
+    
+    <resultMap type="ScStationConf" id="ScStationConfResult">
+        <result property="id"    column="id"    />
+        <result property="processesCode"    column="processes_code"    />
+        <result property="processesName"    column="processes_name"    />
+        <result property="processesType"    column="processes_type"    />
+        <result property="ipAddress"    column="ip_address"    />
+        <result property="spareField1"    column="spare_field_1"    />
+        <result property="spareField2"    column="spare_field_2"    />
+        <result property="spareField3"    column="spare_field_3"    />
+        <result property="spareField4"    column="spare_field_4"    />
+        <result property="createUser"    column="create_user"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateUser"    column="update_user"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectScStationConfVo">
+        select id, processes_code, processes_name, processes_type, ip_address, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from sc_station_conf
+    </sql>
+
+    <select id="selectScStationConfList" parameterType="ScStationConf" resultMap="ScStationConfResult">
+        <include refid="selectScStationConfVo"/>
+        <where>  
+            <if test="processesCode != null  and processesCode != ''"> and processes_code = #{processesCode}</if>
+            <if test="processesName != null  and processesName != ''"> and processes_name like concat('%', #{processesName}, '%')</if>
+            <if test="processesType != null  and processesType != ''"> and processes_type = #{processesType}</if>
+            <if test="ipAddress != null  and ipAddress != ''"> and ip_address = #{ipAddress}</if>
+            <if test="spareField1 != null  and spareField1 != ''"> and spare_field_1 = #{spareField1}</if>
+            <if test="spareField2 != null  and spareField2 != ''"> and spare_field_2 = #{spareField2}</if>
+            <if test="spareField3 != null  and spareField3 != ''"> and spare_field_3 = #{spareField3}</if>
+            <if test="spareField4 != null  and spareField4 != ''"> and spare_field_4 = #{spareField4}</if>
+            <if test="createUser != null  and createUser != ''"> and create_user = #{createUser}</if>
+            <if test="updateUser != null  and updateUser != ''"> and update_user = #{updateUser}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectScStationConfById" parameterType="Long" resultMap="ScStationConfResult">
+        <include refid="selectScStationConfVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertScStationConf" parameterType="ScStationConf" useGeneratedKeys="true" keyProperty="id">
+        insert into sc_station_conf
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="processesCode != null">processes_code,</if>
+            <if test="processesName != null">processes_name,</if>
+            <if test="processesType != null">processes_type,</if>
+            <if test="ipAddress != null">ip_address,</if>
+            <if test="spareField1 != null">spare_field_1,</if>
+            <if test="spareField2 != null">spare_field_2,</if>
+            <if test="spareField3 != null">spare_field_3,</if>
+            <if test="spareField4 != null">spare_field_4,</if>
+            <if test="createUser != null">create_user,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateUser != null">update_user,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="processesCode != null">#{processesCode},</if>
+            <if test="processesName != null">#{processesName},</if>
+            <if test="processesType != null">#{processesType},</if>
+            <if test="ipAddress != null">#{ipAddress},</if>
+            <if test="spareField1 != null">#{spareField1},</if>
+            <if test="spareField2 != null">#{spareField2},</if>
+            <if test="spareField3 != null">#{spareField3},</if>
+            <if test="spareField4 != null">#{spareField4},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateScStationConf" parameterType="ScStationConf">
+        update sc_station_conf
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="processesCode != null">processes_code = #{processesCode},</if>
+            <if test="processesName != null">processes_name = #{processesName},</if>
+            <if test="processesType != null">processes_type = #{processesType},</if>
+            <if test="ipAddress != null">ip_address = #{ipAddress},</if>
+            <if test="spareField1 != null">spare_field_1 = #{spareField1},</if>
+            <if test="spareField2 != null">spare_field_2 = #{spareField2},</if>
+            <if test="spareField3 != null">spare_field_3 = #{spareField3},</if>
+            <if test="spareField4 != null">spare_field_4 = #{spareField4},</if>
+            <if test="createUser != null">create_user = #{createUser},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateUser != null">update_user = #{updateUser},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteScStationConfById" parameterType="Long">
+        delete from sc_station_conf where id = #{id}
+    </delete>
+
+    <delete id="deleteScStationConfByIds" parameterType="String">
+        delete from sc_station_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/jcdm-ui/src/api/main/bs/beatSetting/beatSetting.js b/jcdm-ui/src/api/main/bs/beatSetting/beatSetting.js
new file mode 100644
index 0000000..fd20dac
--- /dev/null
+++ b/jcdm-ui/src/api/main/bs/beatSetting/beatSetting.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 鏌ヨ鑺傛媿璁剧疆鍒楄〃
+export function listBeatSetting(query) {
+  return request({
+    url: '/bs/beatSetting/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 鏌ヨ鑺傛媿璁剧疆璇︾粏
+export function getBeatSetting(id) {
+  return request({
+    url: '/bs/beatSetting/' + id,
+    method: 'get'
+  })
+}
+
+// 鏂板鑺傛媿璁剧疆
+export function addBeatSetting(data) {
+  return request({
+    url: '/bs/beatSetting',
+    method: 'post',
+    data: data
+  })
+}
+
+// 淇敼鑺傛媿璁剧疆
+export function updateBeatSetting(data) {
+  return request({
+    url: '/bs/beatSetting',
+    method: 'put',
+    data: data
+  })
+}
+
+// 鍒犻櫎鑺傛媿璁剧疆
+export function delBeatSetting(id) {
+  return request({
+    url: '/bs/beatSetting/' + id,
+    method: 'delete'
+  })
+}
diff --git a/jcdm-ui/src/api/main/sc/stationConf.js b/jcdm-ui/src/api/main/sc/stationConf.js
new file mode 100644
index 0000000..baebb1e
--- /dev/null
+++ b/jcdm-ui/src/api/main/sc/stationConf.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 鏌ヨ宸ヤ綅缁堢閰嶇疆鍒楄〃
+export function listStationConf(query) {
+  return request({
+    url: '/sc/stationConf/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 鏌ヨ宸ヤ綅缁堢閰嶇疆璇︾粏
+export function getStationConf(id) {
+  return request({
+    url: '/sc/stationConf/' + id,
+    method: 'get'
+  })
+}
+
+// 鏂板宸ヤ綅缁堢閰嶇疆
+export function addStationConf(data) {
+  return request({
+    url: '/sc/stationConf',
+    method: 'post',
+    data: data
+  })
+}
+
+// 淇敼宸ヤ綅缁堢閰嶇疆
+export function updateStationConf(data) {
+  return request({
+    url: '/sc/stationConf',
+    method: 'put',
+    data: data
+  })
+}
+
+// 鍒犻櫎宸ヤ綅缁堢閰嶇疆
+export function delStationConf(id) {
+  return request({
+    url: '/sc/stationConf/' + id,
+    method: 'delete'
+  })
+}
diff --git a/jcdm-ui/src/views/main/bs/beatSetting/index.vue b/jcdm-ui/src/views/main/bs/beatSetting/index.vue
new file mode 100644
index 0000000..6179c36
--- /dev/null
+++ b/jcdm-ui/src/views/main/bs/beatSetting/index.vue
@@ -0,0 +1,336 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+        <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="productName">
+            <el-input
+              v-model="queryParams.productName"
+              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-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+          </el-form-item>
+        </el-form>
+    </el-card>
+
+    <el-card style="margin-top: 10px" class="box-card">
+        <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="['bs:beatSetting: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="['bs:beatSetting: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="['bs:beatSetting: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="['bs:beatSetting:export']"
+            >瀵煎嚭</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table border v-loading="loading" :data="beatSettingList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="浜у搧缂栫爜" align="center" prop="productCode">
+          </el-table-column>
+          <el-table-column label="浜у搧鍚嶇О" align="center" prop="productName">
+          </el-table-column>
+          <el-table-column label="鑺傛媿" align="center" prop="beat">
+          </el-table-column>
+          <el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="success"
+                plain
+                style="width: 72px"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['bs:beatSetting:edit']"
+              >淇敼</el-button>
+              <el-button
+                size="mini"
+                type="danger"
+                plain
+                style="width: 72px"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['bs:beatSetting:remove']"
+              >鍒犻櫎</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+    </el-card>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 娣诲姞鎴栦慨鏀硅妭鎷嶈缃璇濇 -->
+    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
+      <span slot="title">
+        <i class="el-icon-s-order"></i>
+        {{titleName}}
+      </span>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="浜у搧缂栫爜" prop="productCode">
+          <el-select style="width: 100%" @change="handleSelectChange(form.productCode)" v-model="form.productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�">
+            <el-option
+              v-for="item in options"
+              :key="item.productCode"
+              :label="item.productCode"
+              :value="item.productCode">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item  label="浜у搧鍚嶇О" prop="productName">
+          <el-input  disabled v-model="form.productName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+        </el-form-item>
+        <el-form-item label="鑺傛媿" prop="beat">
+          <el-input v-model="form.beat" placeholder="璇疯緭鍏ヨ妭鎷�" />
+        </el-form-item>
+        <el-form-item label="澶囨敞" prop="remark">
+          <el-input v-model="form.remark" 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 { listBeatSetting, getBeatSetting, delBeatSetting, addBeatSetting, updateBeatSetting } from "@/api/main/bs/beatSetting/beatSetting";
+import {listProductBom} from "@/api/main/bs/ProductBom/ProductBom";
+
+export default {
+  name: "BeatSetting",
+  data() {
+    return {
+      // 閬僵灞�
+      loading: true,
+      titleName: "",
+      options: [],
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 鑺傛媿璁剧疆琛ㄦ牸鏁版嵁
+      beatSettingList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        productCode: null,
+        productName: null,
+        beat: null,
+        spareField1: null,
+        spareField2: null,
+        createUser: null,
+        updateUser: null,
+        dataSource: null
+      },
+      productCodeQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        productCode: null,
+        productName: null,
+        beat: null,
+        spareField1: null,
+        spareField2: null,
+        createUser: null,
+        updateUser: null,
+        dataSource: null
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        id: [
+          { required: true, message: "涓婚敭id涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        beat: [
+          { required: true, message: "鑺傛媿涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.initProductBom();
+  },
+  methods: {
+    /** 鏌ヨ鑺傛媿璁剧疆鍒楄〃 */
+    handleSelectChange(selectedOption) {
+      this.productCodeQueryParams.productCode = selectedOption;
+      listProductBom(this.productCodeQueryParams).then(response => {
+        this.form.productName = response.rows[0].productName;
+      });
+    },
+    initProductBom(){
+      listProductBom(this.queryParams).then(response => {
+        this.options = response.rows;
+      });
+    },
+
+    getList() {
+      this.loading = true;
+      listBeatSetting(this.queryParams).then(response => {
+        this.beatSettingList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        id: null,
+        productCode: null,
+        productName: null,
+        beat: null,
+        spareField1: null,
+        spareField2: null,
+        remark: null,
+        createUser: null,
+        createTime: null,
+        updateUser: null,
+        updateTime: null,
+        dataSource: 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.titleName = "娣诲姞鑺傛媿璁剧疆";
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getBeatSetting(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.titleName = "淇敼鑺傛媿璁剧疆";
+      });
+    },
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateBeatSetting(this.form).then(response => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBeatSetting(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 delBeatSetting(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download('bs/beatSetting/export', {
+        ...this.queryParams
+      }, `beatSetting_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
index a516032..c3dd8e1 100644
--- a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
+++ b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
@@ -157,19 +157,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-<!--        <el-form-item label="浜х嚎缂栫爜" prop="lineCode">-->
-<!--          <el-input v-model="form.lineCode" placeholder="璇疯緭鍏ヤ骇绾跨紪鐮�" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="浜х嚎缂栫爜" prop="lineCode">-->
-<!--          <el-select style="width: 100%" @change="handleSelectChangelineCode(form.processesCode)" v-model="form.lineCode" placeholder="璇疯緭鍏ヤ骇绾跨紪鐮�">-->
-<!--            <el-option-->
-<!--              v-for="item in options"-->
-<!--              :key="item.lineCode"-->
-<!--              :label="item.lineCode"-->
-<!--              :value="item.lineCode">-->
-<!--            </el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
         <el-form-item label="澶囨敞" prop="remark">
           <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
         </el-form-item>
@@ -273,12 +260,15 @@
     // 鍦ㄨ繖閲岀紪鍐欏鐞嗛�変腑浜嬩欢鐨勯�昏緫
     handleSelectChange(selectedOption) {
       this.form.lineCode = null;
-      listLineInfo(selectedOption).then(response => {
+      let param = {
+        workshopCode : selectedOption
+      }
+      listLineInfo(param).then(response => {
         this.lineOptions = response.rows;
       });
     },
     getList() {
-      this.$modal.msgSuccess("淇敼鎴愬姛");
+      // this.$modal.msgSuccess("淇敼鎴愬姛");
       console.log(this.queryParams)
       this.loading = true;
       listEquipmentArchives(this.queryParams).then(response => {
diff --git a/jcdm-ui/src/views/main/sc/stationConf/index.vue b/jcdm-ui/src/views/main/sc/stationConf/index.vue
new file mode 100644
index 0000000..202325f
--- /dev/null
+++ b/jcdm-ui/src/views/main/sc/stationConf/index.vue
@@ -0,0 +1,342 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="宸ュ簭缂栧彿" prop="processesCode">
+            <el-input
+              v-model="queryParams.processesCode"
+              placeholder="璇疯緭鍏ュ伐搴忕紪鍙�"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="宸ュ簭鍚嶇О" prop="processesName">
+            <el-input
+              v-model="queryParams.processesName"
+              placeholder="璇疯緭鍏ュ伐搴忓悕绉�"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="IP鍦板潃" prop="ipAddress">
+            <el-input
+              v-model="queryParams.ipAddress"
+              placeholder="璇疯緭鍏P鍦板潃"
+              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-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+          </el-form-item>
+        </el-form>
+    </el-card>
+
+    <el-card style="margin-top: 10px" class="box-card">
+        <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:stationConf: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:stationConf: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:stationConf: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:stationConf:export']"
+            >瀵煎嚭</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table border v-loading="loading" :data="stationConfList" @selection-change="handleSelectionChange">
+          <el-form-item type="selection" width="55" align="center" >
+          </el-form-item>
+          <el-table-column label="宸ュ簭缂栧彿" align="center" prop="processesCode">
+          </el-table-column>
+          <el-table-column label="宸ュ簭鍚嶇О" align="center" prop="processesName">
+          </el-table-column>
+          <el-table-column label="IP鍦板潃" align="center" prop="ipAddress">
+          </el-table-column>
+          <el-table-column label="澶囨敞" align="center" prop="remarks">
+          </el-table-column>
+          <el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="success"
+                plain
+                style="width: 72px"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['sc:stationConf:edit']"
+              >淇敼</el-button>
+              <el-button
+                size="mini"
+                type="danger"
+                plain
+                style="width: 72px"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['sc:stationConf:remove']"
+              >鍒犻櫎</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+    </el-card>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 娣诲姞鎴栦慨鏀瑰伐浣嶇粓绔厤缃璇濇 -->
+    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
+      <span slot="title">
+        <i class="el-icon-s-order"></i>
+        {{titleName}}
+      </span>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="宸ュ簭缂栧彿" prop="processesCode">
+          <el-select style="width: 100%" @change="handleSelectChangeprocessesCode(form.processesCode)" v-model="form.processesCode" placeholder="璇烽�夋嫨宸ュ簭缂栧彿">
+            <el-option
+              v-for="item in options"
+              :key="item.index"
+              :label="item.processesName"
+              :value="item.processesCode">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="宸ュ簭鍚嶇О" prop="processesName">
+          <el-input  disabled v-model="form.processesName" placeholder="璇疯緭鍏ュ伐搴忓悕绉�" />
+        </el-form-item>
+        <el-form-item label="IP鍦板潃" prop="ipAddress">
+          <el-input v-model="form.ipAddress" placeholder="璇疯緭鍏P鍦板潃" />
+        </el-form-item>
+        <el-form-item label="澶囨敞" prop="remarks">
+          <el-input v-model="form.remarks" 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 {listStationConf, getStationConf, delStationConf, addStationConf, updateStationConf} from "@/api/main/sc/stationConf";
+import {listProcesses} from "@/api/main/bs/processes/processes";
+
+export default {
+  name: "StationConf",
+  data() {
+    return {
+      options: [],
+      // 閬僵灞�
+      loading: true,
+      titleName: "",
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 宸ヤ綅缁堢閰嶇疆琛ㄦ牸鏁版嵁
+      stationConfList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        processesCode: null,
+        processesName: null,
+        processesType: null,
+        ipAddress: null,
+        spareField1: null,
+        spareField2: null,
+        spareField3: null,
+        spareField4: null,
+        createUser: null,
+        updateUser: null,
+        remarks: null
+      },
+      processesCodeQueryParams:{
+        pageNum: 1,
+        pageSize: 10,
+        processesCodes: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        id: [
+          { required: true, message: "涓婚敭id涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.initProcesses();
+  },
+  methods: {
+
+    handleSelectChangeprocessesCode(selectedOption) {
+      this.processesCodeQueryParams.processesCodes = selectedOption;
+      listProcesses(this.queryParams).then(response => {
+        this.form.processesName = response.rows[0].processesName;
+      });
+    },
+    initProcesses(){
+      listProcesses(this.queryParams).then(response => {
+        this.options = response.rows;
+      });
+    },
+    /** 鏌ヨ宸ヤ綅缁堢閰嶇疆鍒楄〃 */
+    getList() {
+      this.loading = true;
+      listStationConf(this.queryParams).then(response => {
+        this.stationConfList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        id: null,
+        processesCode: null,
+        processesName: null,
+        processesType: null,
+        ipAddress: null,
+        spareField1: null,
+        spareField2: null,
+        spareField3: null,
+        spareField4: null,
+        createUser: null,
+        createTime: null,
+        updateUser: null,
+        updateTime: null,
+        remarks: 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.titleName = "娣诲姞宸ヤ綅缁堢閰嶇疆";
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getStationConf(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.titleName = "淇敼宸ヤ綅缁堢閰嶇疆";
+      });
+    },
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateStationConf(this.form).then(response => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addStationConf(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 delStationConf(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download('sc/stationConf/export', {
+        ...this.queryParams
+      }, `stationConf_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

--
Gitblit v1.9.3