From 9e8be0743750e799004afa803e7c47ac87dbd0ad Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 25 一月 2024 10:47:15 +0800
Subject: [PATCH] opcua迁移
---
jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java | 2
/dev/null | 483 -----------------------------------------------------
jcdm-admin/src/main/resources/application.yml | 2
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 2
jcdm-ui/vue.config.js | 2
5 files changed, 4 insertions(+), 487 deletions(-)
diff --git a/jcdm-admin/src/main/resources/application.yml b/jcdm-admin/src/main/resources/application.yml
index 1478553..f470bcc 100644
--- a/jcdm-admin/src/main/resources/application.yml
+++ b/jcdm-admin/src/main/resources/application.yml
@@ -18,7 +18,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8081
+ port: 8080
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java
index 2959b26..b2ce549 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java
@@ -25,7 +25,7 @@
private IDaParamCollectionService daParamCollectionService = BeanUtils.getBean(IDaParamCollectionService.class);
private IDaPassingStationCollectionService daPassingStationCollectionService = BeanUtils.getBean(IDaPassingStationCollectionService.class);
private List<DataValue> s=null;
- public void getSn(String Node, String value) throws Exception {
+ public void Transit(String Node, String value) throws Exception {
log.info(Node+":"+value);
String[] parts = Node.split("[.]");
ClientHandler clientHandler=new ClientHandler();
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/controller/DaTileMatchRulesController.java b/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/controller/DaTileMatchRulesController.java
deleted file mode 100644
index bbb88e9..0000000
--- a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/controller/DaTileMatchRulesController.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.jcdm.main.da.tileMatchRules.controller;
-
-import com.jcdm.common.annotation.Log;
-import com.jcdm.common.core.controller.BaseController;
-import com.jcdm.common.core.domain.AjaxResult;
-import com.jcdm.common.core.page.TableDataInfo;
-import com.jcdm.common.enums.BusinessType;
-import com.jcdm.common.utils.poi.ExcelUtil;
-import com.jcdm.main.da.tileMatchRules.domain.DaTileMatchRules;
-import com.jcdm.main.da.tileMatchRules.service.IDaTileMatchRulesService;
-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 jiang
- * @date 2024-01-24
- */
-@RestController
-@RequestMapping("/da/tileMatchRules")
-public class DaTileMatchRulesController extends BaseController
-{
- @Autowired
- private IDaTileMatchRulesService daTileMatchRulesService;
-
- /**
- * 鏌ヨ閰嶇摝瑙勫垯鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('da:tileMatchRules:list')")
- @GetMapping("/list")
- public TableDataInfo list(DaTileMatchRules daTileMatchRules)
- {
- startPage();
- List<DaTileMatchRules> list = daTileMatchRulesService.selectDaTileMatchRulesList(daTileMatchRules);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭閰嶇摝瑙勫垯鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('da:tileMatchRules:export')")
- @Log(title = "閰嶇摝瑙勫垯", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, DaTileMatchRules daTileMatchRules)
- {
- List<DaTileMatchRules> list = daTileMatchRulesService.selectDaTileMatchRulesList(daTileMatchRules);
- ExcelUtil<DaTileMatchRules> util = new ExcelUtil<DaTileMatchRules>(DaTileMatchRules.class);
- util.exportExcel(response, list, "閰嶇摝瑙勫垯鏁版嵁");
- }
-
- /**
- * 鑾峰彇閰嶇摝瑙勫垯璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('da:tileMatchRules:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(daTileMatchRulesService.selectDaTileMatchRulesById(id));
- }
-
- /**
- * 鏂板閰嶇摝瑙勫垯
- */
- @PreAuthorize("@ss.hasPermi('da:tileMatchRules:add')")
- @Log(title = "閰嶇摝瑙勫垯", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody DaTileMatchRules daTileMatchRules)
- {
- return toAjax(daTileMatchRulesService.insertDaTileMatchRules(daTileMatchRules));
- }
-
- /**
- * 淇敼閰嶇摝瑙勫垯
- */
- @PreAuthorize("@ss.hasPermi('da:tileMatchRules:edit')")
- @Log(title = "閰嶇摝瑙勫垯", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody DaTileMatchRules daTileMatchRules)
- {
- return toAjax(daTileMatchRulesService.updateDaTileMatchRules(daTileMatchRules));
- }
-
- /**
- * 鍒犻櫎閰嶇摝瑙勫垯
- */
- @PreAuthorize("@ss.hasPermi('da:tileMatchRules:remove')")
- @Log(title = "閰嶇摝瑙勫垯", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(daTileMatchRulesService.deleteDaTileMatchRulesByIds(ids));
- }
-}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/domain/DaTileMatchRules.java b/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/domain/DaTileMatchRules.java
deleted file mode 100644
index 91822ac..0000000
--- a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/domain/DaTileMatchRules.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package com.jcdm.main.da.tileMatchRules.domain;
-
-import com.jcdm.common.annotation.Excel;
-import com.jcdm.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 閰嶇摝瑙勫垯瀵硅薄 da_tile_match_rules
- *
- * @author jiang
- * @date 2024-01-24
- */
-public class DaTileMatchRules extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 涓婚敭id */
- private Long id;
-
- /** 浜у搧绯诲垪 */
- @Excel(name = "浜у搧绯诲垪")
- private String productSeries;
-
- /** 鎵爜瀵硅薄1 */
- @Excel(name = "鎵爜瀵硅薄1")
- private String scanObject1;
-
- /** 鎵爜瀵硅薄2 */
- @Excel(name = "鎵爜瀵硅薄2")
- private String scanObject2;
-
- /** 杞村悕绉� */
- @Excel(name = "杞村悕绉�")
- private String axisName;
-
- /** 棰堝悕绉� */
- @Excel(name = "棰堝悕绉�")
- private String neckName;
-
- /** 鐡﹀悕绉� */
- @Excel(name = "鐡﹀悕绉�")
- private String tileName;
-
- /** 杞村弬鏁版暟浣嶇疆 */
- @Excel(name = "杞村弬鏁版暟浣嶇疆")
- private Long axisParameterNoPosition;
-
- /** 棰堝弬鏁版暟浣嶇疆 */
- @Excel(name = "棰堝弬鏁版暟浣嶇疆")
- private Long neckParameterPosition;
-
- /** 杞村�� */
- @Excel(name = "杞村��")
- private String axisValue;
-
- /** 棰堝�� */
- @Excel(name = "棰堝��")
- private String neckValue;
-
- /** 鐡﹂鑹� */
- @Excel(name = "鐡﹂鑹�")
- private String tileColor;
-
- /** 鍒涘缓鐢ㄦ埛 */
- @Excel(name = "鍒涘缓鐢ㄦ埛")
- private String createUser;
-
- /** 鏇存敼鐢ㄦ埛 */
- @Excel(name = "鏇存敼鐢ㄦ埛")
- private String updateUser;
-
- /** 鐘舵�侊紙1鍚堟牸銆�2涓嶅悎鏍硷級 */
- @Excel(name = "鐘舵��", readConverterExp = "1=鍚堟牸銆�2涓嶅悎鏍�")
- private String state;
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
- public void setProductSeries(String productSeries)
- {
- this.productSeries = productSeries;
- }
-
- public String getProductSeries()
- {
- return productSeries;
- }
- public void setScanObject1(String scanObject1)
- {
- this.scanObject1 = scanObject1;
- }
-
- public String getScanObject1()
- {
- return scanObject1;
- }
- public void setScanObject2(String scanObject2)
- {
- this.scanObject2 = scanObject2;
- }
-
- public String getScanObject2()
- {
- return scanObject2;
- }
- public void setAxisName(String axisName)
- {
- this.axisName = axisName;
- }
-
- public String getAxisName()
- {
- return axisName;
- }
- public void setNeckName(String neckName)
- {
- this.neckName = neckName;
- }
-
- public String getNeckName()
- {
- return neckName;
- }
- public void setTileName(String tileName)
- {
- this.tileName = tileName;
- }
-
- public String getTileName()
- {
- return tileName;
- }
- public void setAxisParameterNoPosition(Long axisParameterNoPosition)
- {
- this.axisParameterNoPosition = axisParameterNoPosition;
- }
-
- public Long getAxisParameterNoPosition()
- {
- return axisParameterNoPosition;
- }
- public void setNeckParameterPosition(Long neckParameterPosition)
- {
- this.neckParameterPosition = neckParameterPosition;
- }
-
- public Long getNeckParameterPosition()
- {
- return neckParameterPosition;
- }
- public void setAxisValue(String axisValue)
- {
- this.axisValue = axisValue;
- }
-
- public String getAxisValue()
- {
- return axisValue;
- }
- public void setNeckValue(String neckValue)
- {
- this.neckValue = neckValue;
- }
-
- public String getNeckValue()
- {
- return neckValue;
- }
- public void setTileColor(String tileColor)
- {
- this.tileColor = tileColor;
- }
-
- public String getTileColor()
- {
- return tileColor;
- }
- 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 setState(String state)
- {
- this.state = state;
- }
-
- public String getState()
- {
- return state;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("productSeries", getProductSeries())
- .append("scanObject1", getScanObject1())
- .append("scanObject2", getScanObject2())
- .append("axisName", getAxisName())
- .append("neckName", getNeckName())
- .append("tileName", getTileName())
- .append("axisParameterNoPosition", getAxisParameterNoPosition())
- .append("neckParameterPosition", getNeckParameterPosition())
- .append("axisValue", getAxisValue())
- .append("neckValue", getNeckValue())
- .append("tileColor", getTileColor())
- .append("createUser", getCreateUser())
- .append("createTime", getCreateTime())
- .append("updateUser", getUpdateUser())
- .append("updateTime", getUpdateTime())
- .append("state", getState())
- .toString();
- }
-}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/mapper/DaTileMatchRulesMapper.java b/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/mapper/DaTileMatchRulesMapper.java
deleted file mode 100644
index 0dec29b..0000000
--- a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/mapper/DaTileMatchRulesMapper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.jcdm.main.da.tileMatchRules.mapper;
-
-import com.jcdm.main.da.tileMatchRules.domain.DaTileMatchRules;
-
-import java.util.List;
-
-/**
- * 閰嶇摝瑙勫垯Mapper鎺ュ彛
- *
- * @author jiang
- * @date 2024-01-24
- */
-public interface DaTileMatchRulesMapper
-{
- /**
- * 鏌ヨ閰嶇摝瑙勫垯
- *
- * @param id 閰嶇摝瑙勫垯涓婚敭
- * @return 閰嶇摝瑙勫垯
- */
- public DaTileMatchRules selectDaTileMatchRulesById(Long id);
-
- /**
- * 鏌ヨ閰嶇摝瑙勫垯鍒楄〃
- *
- * @param daTileMatchRules 閰嶇摝瑙勫垯
- * @return 閰嶇摝瑙勫垯闆嗗悎
- */
- public List<DaTileMatchRules> selectDaTileMatchRulesList(DaTileMatchRules daTileMatchRules);
-
- /**
- * 鏂板閰嶇摝瑙勫垯
- *
- * @param daTileMatchRules 閰嶇摝瑙勫垯
- * @return 缁撴灉
- */
- public int insertDaTileMatchRules(DaTileMatchRules daTileMatchRules);
-
- /**
- * 淇敼閰嶇摝瑙勫垯
- *
- * @param daTileMatchRules 閰嶇摝瑙勫垯
- * @return 缁撴灉
- */
- public int updateDaTileMatchRules(DaTileMatchRules daTileMatchRules);
-
- /**
- * 鍒犻櫎閰嶇摝瑙勫垯
- *
- * @param id 閰嶇摝瑙勫垯涓婚敭
- * @return 缁撴灉
- */
- public int deleteDaTileMatchRulesById(Long id);
-
- /**
- * 鎵归噺鍒犻櫎閰嶇摝瑙勫垯
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteDaTileMatchRulesByIds(Long[] ids);
-}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/service/IDaTileMatchRulesService.java b/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/service/IDaTileMatchRulesService.java
deleted file mode 100644
index 63254f1..0000000
--- a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/service/IDaTileMatchRulesService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.jcdm.main.da.tileMatchRules.service;
-
-import com.jcdm.main.da.tileMatchRules.domain.DaTileMatchRules;
-
-import java.util.List;
-
-/**
- * 閰嶇摝瑙勫垯Service鎺ュ彛
- *
- * @author jiang
- * @date 2024-01-24
- */
-public interface IDaTileMatchRulesService
-{
- /**
- * 鏌ヨ閰嶇摝瑙勫垯
- *
- * @param id 閰嶇摝瑙勫垯涓婚敭
- * @return 閰嶇摝瑙勫垯
- */
- public DaTileMatchRules selectDaTileMatchRulesById(Long id);
-
- /**
- * 鏌ヨ閰嶇摝瑙勫垯鍒楄〃
- *
- * @param daTileMatchRules 閰嶇摝瑙勫垯
- * @return 閰嶇摝瑙勫垯闆嗗悎
- */
- public List<DaTileMatchRules> selectDaTileMatchRulesList(DaTileMatchRules daTileMatchRules);
-
- /**
- * 鏂板閰嶇摝瑙勫垯
- *
- * @param daTileMatchRules 閰嶇摝瑙勫垯
- * @return 缁撴灉
- */
- public int insertDaTileMatchRules(DaTileMatchRules daTileMatchRules);
-
- /**
- * 淇敼閰嶇摝瑙勫垯
- *
- * @param daTileMatchRules 閰嶇摝瑙勫垯
- * @return 缁撴灉
- */
- public int updateDaTileMatchRules(DaTileMatchRules daTileMatchRules);
-
- /**
- * 鎵归噺鍒犻櫎閰嶇摝瑙勫垯
- *
- * @param ids 闇�瑕佸垹闄ょ殑閰嶇摝瑙勫垯涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteDaTileMatchRulesByIds(Long[] ids);
-
- /**
- * 鍒犻櫎閰嶇摝瑙勫垯淇℃伅
- *
- * @param id 閰嶇摝瑙勫垯涓婚敭
- * @return 缁撴灉
- */
- public int deleteDaTileMatchRulesById(Long id);
-}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/service/impl/DaTileMatchRulesServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/service/impl/DaTileMatchRulesServiceImpl.java
deleted file mode 100644
index 862b696..0000000
--- a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/service/impl/DaTileMatchRulesServiceImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.jcdm.main.da.tileMatchRules.service.impl;
-
-import com.jcdm.common.utils.DateUtils;
-import com.jcdm.main.da.tileMatchRules.domain.DaTileMatchRules;
-import com.jcdm.main.da.tileMatchRules.mapper.DaTileMatchRulesMapper;
-import com.jcdm.main.da.tileMatchRules.service.IDaTileMatchRulesService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 閰嶇摝瑙勫垯Service涓氬姟灞傚鐞�
- *
- * @author jiang
- * @date 2024-01-24
- */
-@Service
-public class DaTileMatchRulesServiceImpl implements IDaTileMatchRulesService
-{
- @Autowired
- private DaTileMatchRulesMapper daTileMatchRulesMapper;
-
- /**
- * 鏌ヨ閰嶇摝瑙勫垯
- *
- * @param id 閰嶇摝瑙勫垯涓婚敭
- * @return 閰嶇摝瑙勫垯
- */
- @Override
- public DaTileMatchRules selectDaTileMatchRulesById(Long id)
- {
- return daTileMatchRulesMapper.selectDaTileMatchRulesById(id);
- }
-
- /**
- * 鏌ヨ閰嶇摝瑙勫垯鍒楄〃
- *
- * @param daTileMatchRules 閰嶇摝瑙勫垯
- * @return 閰嶇摝瑙勫垯
- */
- @Override
- public List<DaTileMatchRules> selectDaTileMatchRulesList(DaTileMatchRules daTileMatchRules)
- {
- return daTileMatchRulesMapper.selectDaTileMatchRulesList(daTileMatchRules);
- }
-
- /**
- * 鏂板閰嶇摝瑙勫垯
- *
- * @param daTileMatchRules 閰嶇摝瑙勫垯
- * @return 缁撴灉
- */
- @Override
- public int insertDaTileMatchRules(DaTileMatchRules daTileMatchRules)
- {
- daTileMatchRules.setCreateTime(DateUtils.getNowDate());
- return daTileMatchRulesMapper.insertDaTileMatchRules(daTileMatchRules);
- }
-
- /**
- * 淇敼閰嶇摝瑙勫垯
- *
- * @param daTileMatchRules 閰嶇摝瑙勫垯
- * @return 缁撴灉
- */
- @Override
- public int updateDaTileMatchRules(DaTileMatchRules daTileMatchRules)
- {
- daTileMatchRules.setUpdateTime(DateUtils.getNowDate());
- return daTileMatchRulesMapper.updateDaTileMatchRules(daTileMatchRules);
- }
-
- /**
- * 鎵归噺鍒犻櫎閰嶇摝瑙勫垯
- *
- * @param ids 闇�瑕佸垹闄ょ殑閰嶇摝瑙勫垯涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteDaTileMatchRulesByIds(Long[] ids)
- {
- return daTileMatchRulesMapper.deleteDaTileMatchRulesByIds(ids);
- }
-
- /**
- * 鍒犻櫎閰嶇摝瑙勫垯淇℃伅
- *
- * @param id 閰嶇摝瑙勫垯涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteDaTileMatchRulesById(Long id)
- {
- return daTileMatchRulesMapper.deleteDaTileMatchRulesById(id);
- }
-}
diff --git a/jcdm-main/src/main/resources/mapper/da/tileMatchRules/DaTileMatchRulesMapper.xml b/jcdm-main/src/main/resources/mapper/da/tileMatchRules/DaTileMatchRulesMapper.xml
deleted file mode 100644
index 3de08c8..0000000
--- a/jcdm-main/src/main/resources/mapper/da/tileMatchRules/DaTileMatchRulesMapper.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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.da.tileMatchRules.mapper.DaTileMatchRulesMapper">
-
- <resultMap type="DaTileMatchRules" id="DaTileMatchRulesResult">
- <result property="id" column="id" />
- <result property="productSeries" column="product_series" />
- <result property="scanObject1" column="scan_object1" />
- <result property="scanObject2" column="scan_object2" />
- <result property="axisName" column="axis_name" />
- <result property="neckName" column="neck_name" />
- <result property="tileName" column="tile_name" />
- <result property="axisParameterNoPosition" column="axis_parameter_no_position" />
- <result property="neckParameterPosition" column="neck_parameter_position" />
- <result property="axisValue" column="axis_value" />
- <result property="neckValue" column="neck_value" />
- <result property="tileColor" column="tile_color" />
- <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="state" column="state" />
- </resultMap>
-
- <sql id="selectDaTileMatchRulesVo">
- select id, product_series, scan_object1, scan_object2, axis_name, neck_name, tile_name, axis_parameter_no_position, neck_parameter_position, axis_value, neck_value, tile_color, create_user, create_time, update_user, update_time, state from da_tile_match_rules
- </sql>
-
- <select id="selectDaTileMatchRulesList" parameterType="DaTileMatchRules" resultMap="DaTileMatchRulesResult">
- <include refid="selectDaTileMatchRulesVo"/>
- <where>
- <if test="productSeries != null and productSeries != ''"> and product_series = #{productSeries}</if>
- <if test="scanObject1 != null and scanObject1 != ''"> and scan_object1 = #{scanObject1}</if>
- <if test="scanObject2 != null and scanObject2 != ''"> and scan_object2 = #{scanObject2}</if>
- <if test="axisName != null and axisName != ''"> and axis_name like concat('%', #{axisName}, '%')</if>
- <if test="neckName != null and neckName != ''"> and neck_name like concat('%', #{neckName}, '%')</if>
- <if test="tileName != null and tileName != ''"> and tile_name like concat('%', #{tileName}, '%')</if>
- <if test="axisParameterNoPosition != null "> and axis_parameter_no_position = #{axisParameterNoPosition}</if>
- <if test="neckParameterPosition != null "> and neck_parameter_position = #{neckParameterPosition}</if>
- <if test="axisValue != null and axisValue != ''"> and axis_value = #{axisValue}</if>
- <if test="neckValue != null and neckValue != ''"> and neck_value = #{neckValue}</if>
- <if test="tileColor != null and tileColor != ''"> and tile_color = #{tileColor}</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="state != null and state != ''"> and state = #{state}</if>
- </where>
- </select>
-
- <select id="selectDaTileMatchRulesById" parameterType="Long" resultMap="DaTileMatchRulesResult">
- <include refid="selectDaTileMatchRulesVo"/>
- where id = #{id}
- </select>
-
- <insert id="insertDaTileMatchRules" parameterType="DaTileMatchRules" useGeneratedKeys="true" keyProperty="id">
- insert into da_tile_match_rules
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="productSeries != null">product_series,</if>
- <if test="scanObject1 != null">scan_object1,</if>
- <if test="scanObject2 != null">scan_object2,</if>
- <if test="axisName != null">axis_name,</if>
- <if test="neckName != null">neck_name,</if>
- <if test="tileName != null">tile_name,</if>
- <if test="axisParameterNoPosition != null">axis_parameter_no_position,</if>
- <if test="neckParameterPosition != null">neck_parameter_position,</if>
- <if test="axisValue != null">axis_value,</if>
- <if test="neckValue != null">neck_value,</if>
- <if test="tileColor != null">tile_color,</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="state != null">state,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="productSeries != null">#{productSeries},</if>
- <if test="scanObject1 != null">#{scanObject1},</if>
- <if test="scanObject2 != null">#{scanObject2},</if>
- <if test="axisName != null">#{axisName},</if>
- <if test="neckName != null">#{neckName},</if>
- <if test="tileName != null">#{tileName},</if>
- <if test="axisParameterNoPosition != null">#{axisParameterNoPosition},</if>
- <if test="neckParameterPosition != null">#{neckParameterPosition},</if>
- <if test="axisValue != null">#{axisValue},</if>
- <if test="neckValue != null">#{neckValue},</if>
- <if test="tileColor != null">#{tileColor},</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="state != null">#{state},</if>
- </trim>
- </insert>
-
- <update id="updateDaTileMatchRules" parameterType="DaTileMatchRules">
- update da_tile_match_rules
- <trim prefix="SET" suffixOverrides=",">
- <if test="productSeries != null">product_series = #{productSeries},</if>
- <if test="scanObject1 != null">scan_object1 = #{scanObject1},</if>
- <if test="scanObject2 != null">scan_object2 = #{scanObject2},</if>
- <if test="axisName != null">axis_name = #{axisName},</if>
- <if test="neckName != null">neck_name = #{neckName},</if>
- <if test="tileName != null">tile_name = #{tileName},</if>
- <if test="axisParameterNoPosition != null">axis_parameter_no_position = #{axisParameterNoPosition},</if>
- <if test="neckParameterPosition != null">neck_parameter_position = #{neckParameterPosition},</if>
- <if test="axisValue != null">axis_value = #{axisValue},</if>
- <if test="neckValue != null">neck_value = #{neckValue},</if>
- <if test="tileColor != null">tile_color = #{tileColor},</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="state != null">state = #{state},</if>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteDaTileMatchRulesById" parameterType="Long">
- delete from da_tile_match_rules where id = #{id}
- </delete>
-
- <delete id="deleteDaTileMatchRulesByIds" parameterType="String">
- delete from da_tile_match_rules 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/views/main/da/tileMatchRules/index.vue b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
deleted file mode 100644
index e8ec77e..0000000
--- a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
+++ /dev/null
@@ -1,483 +0,0 @@
-<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="productSeries">
- <el-input
- v-model="queryParams.productSeries"
- placeholder="璇疯緭鍏ヤ骇鍝佺郴鍒�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
-<!-- <el-form-item label="鎵爜瀵硅薄1" prop="scanObject1">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.scanObject1"-->
-<!-- placeholder="璇疯緭鍏ユ壂鐮佸璞�1"-->
-<!-- clearable-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鎵爜瀵硅薄2" prop="scanObject2">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.scanObject2"-->
-<!-- placeholder="璇疯緭鍏ユ壂鐮佸璞�2"-->
-<!-- clearable-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="杞村悕绉�" prop="axisName">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.axisName"-->
-<!-- placeholder="璇疯緭鍏ヨ酱鍚嶇О"-->
-<!-- clearable-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="棰堝悕绉�" prop="neckName">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.neckName"-->
-<!-- placeholder="璇疯緭鍏ラ鍚嶇О"-->
-<!-- clearable-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- />-->
-<!-- </el-form-item>-->
- <el-form-item label="鐡﹀悕绉�" prop="tileName">
- <el-input
- v-model="queryParams.tileName"
- placeholder="璇疯緭鍏ョ摝鍚嶇О"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
-<!-- <el-form-item label="杞村弬鏁版暟浣嶇疆" prop="axisParameterNoPosition">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.axisParameterNoPosition"-->
-<!-- placeholder="璇疯緭鍏ヨ酱鍙傛暟鏁颁綅缃�"-->
-<!-- clearable-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="棰堝弬鏁版暟浣嶇疆" prop="neckParameterPosition">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.neckParameterPosition"-->
-<!-- placeholder="璇疯緭鍏ラ鍙傛暟鏁颁綅缃�"-->
-<!-- clearable-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="杞村��" prop="axisValue">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.axisValue"-->
-<!-- placeholder="璇疯緭鍏ヨ酱鍊�"-->
-<!-- clearable-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="棰堝��" prop="neckValue">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.neckValue"-->
-<!-- placeholder="璇疯緭鍏ラ鍊�"-->
-<!-- clearable-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鐡﹂鑹�" prop="tileColor">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.tileColor"-->
-<!-- placeholder="璇疯緭鍏ョ摝棰滆壊"-->
-<!-- clearable-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.createUser"-->
-<!-- placeholder="璇疯緭鍏ュ垱寤虹敤鎴�"-->
-<!-- clearable-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.updateUser"-->
-<!-- placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�"-->
-<!-- clearable-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- />-->
-<!-- </el-form-item>-->
- <el-form-item label="鐘舵��" prop="state">
- <el-input
- v-model="queryParams.state"
- 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="['da:tileMatchRules: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="['da:tileMatchRules: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="['da:tileMatchRules: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="['da:tileMatchRules:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table border v-loading="loading" :data="tileMatchRulesList" @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="productSeries">
-
- </el-table-column>
- <el-table-column label="鎵爜瀵硅薄1" align="center" prop="scanObject1" width="100">
-
- </el-table-column>
- <el-table-column label="鎵爜瀵硅薄2" align="center" prop="scanObject2" width="100">
-
- </el-table-column>
- <el-table-column label="杞村悕绉�" align="center" prop="axisName">
-
- </el-table-column>
- <el-table-column label="棰堝悕绉�" align="center" prop="neckName">
-
- </el-table-column>
- <el-table-column label="鐡﹀悕绉�" align="center" prop="tileName">
-
- </el-table-column>
- <el-table-column label="杞村弬鏁颁綅缃�" align="center" prop="axisParameterNoPosition" width="100">
-
- </el-table-column>
- <el-table-column label="棰堝弬鏁颁綅缃�" align="center" prop="neckParameterPosition" width="100">
-
- </el-table-column>
- <el-table-column label="杞村��" align="center" prop="axisValue">
-
- </el-table-column>
- <el-table-column label="棰堝��" align="center" prop="neckValue">
-
- </el-table-column>
- <el-table-column label="鐡﹂鑹�" align="center" prop="tileColor">
-
- </el-table-column>
-<!-- <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">-->
-
-<!-- </el-table-column>-->
-<!-- <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">-->
-
-<!-- </el-table-column>-->
- <el-table-column label="鐘舵��" align="center" prop="state">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.state"/>
- </template>
- </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="['da:tileMatchRules:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="danger"
- plain
- style="width: 72px"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['da:tileMatchRules: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="1000px" append-to-body>
- <span slot="title">
- <i class="el-icon-s-order"></i>
- {{titleName}}
- </span>
- <el-form ref="form" inline :model="form" :rules="rules" label-width="80px">
- <el-form-item label="浜у搧绯诲垪" prop="productSeries">
- <el-input v-model="form.productSeries" placeholder="璇疯緭鍏ヤ骇鍝佺郴鍒�" />
- </el-form-item>
- <el-form-item label="鎵爜瀵硅薄1" prop="scanObject1">
- <el-input v-model="form.scanObject1" placeholder="璇疯緭鍏ユ壂鐮佸璞�1" />
- </el-form-item>
- <el-form-item label="鎵爜瀵硅薄2" prop="scanObject2">
- <el-input v-model="form.scanObject2" placeholder="璇疯緭鍏ユ壂鐮佸璞�2" />
- </el-form-item>
- <el-form-item label="杞村悕绉�" prop="axisName">
- <el-input v-model="form.axisName" placeholder="璇疯緭鍏ヨ酱鍚嶇О" />
- </el-form-item>
- <el-form-item label="棰堝悕绉�" prop="neckName">
- <el-input v-model="form.neckName" placeholder="璇疯緭鍏ラ鍚嶇О" />
- </el-form-item>
- <el-form-item label="鐡﹀悕绉�" prop="tileName">
- <el-input v-model="form.tileName" placeholder="璇疯緭鍏ョ摝鍚嶇О" />
- </el-form-item>
- <el-form-item label="杞村弬鏁颁綅缃�" prop="axisParameterNoPosition">
- <el-input v-model="form.axisParameterNoPosition" placeholder="璇疯緭鍏ヨ酱鍙傛暟浣嶇疆" />
- </el-form-item>
- <el-form-item label="棰堝弬鏁颁綅缃�" prop="neckParameterPosition">
- <el-input v-model="form.neckParameterPosition" placeholder="璇疯緭鍏ラ鍙傛暟浣嶇疆" />
- </el-form-item>
- <el-form-item label="杞村��" prop="axisValue">
- <el-input v-model="form.axisValue" placeholder="璇疯緭鍏ヨ酱鍊�" />
- </el-form-item>
- <el-form-item label="棰堝��" prop="neckValue">
- <el-input v-model="form.neckValue" placeholder="璇疯緭鍏ラ鍊�" />
- </el-form-item>
- <el-form-item label="鐡﹂鑹�" prop="tileColor">
- <el-input v-model="form.tileColor" placeholder="璇疯緭鍏ョ摝棰滆壊" />
- </el-form-item>
- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">
- <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />
- </el-form-item>
- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">
- <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />
- </el-form-item>
- <el-form-item label="鐘舵��" prop="state">
- <el-select v-model="form.state" placeholder="璇烽�夋嫨鐘舵��" >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { listTileMatchRules, getTileMatchRules, delTileMatchRules, addTileMatchRules, updateTileMatchRules } from "@/api/main/bs/tileMatchRules/tileMatchRules";
-
-export default {
- name: "TileMatchRules",
- dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable'],
- data() {
- return {
- // 閬僵灞�
- loading: true,
- titleName: "",
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 閰嶇摝瑙勫垯琛ㄦ牸鏁版嵁
- tileMatchRulesList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- productSeries: null,
- scanObject1: null,
- scanObject2: null,
- axisName: null,
- neckName: null,
- tileName: null,
- axisParameterNoPosition: null,
- neckParameterPosition: null,
- axisValue: null,
- neckValue: null,
- tileColor: null,
- createUser: null,
- updateUser: null,
- state: null
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- id: [
- { required: true, message: "涓婚敭id涓嶈兘涓虹┖", trigger: "blur" }
- ],
- }
- };
- },
- created() {
- this.getList();
- },
- methods: {
- /** 鏌ヨ閰嶇摝瑙勫垯鍒楄〃 */
- getList() {
- this.loading = true;
- listTileMatchRules(this.queryParams).then(response => {
- this.tileMatchRulesList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- productSeries: null,
- scanObject1: null,
- scanObject2: null,
- axisName: null,
- neckName: null,
- tileName: null,
- axisParameterNoPosition: null,
- neckParameterPosition: null,
- axisValue: null,
- neckValue: null,
- tileColor: null,
- createUser: null,
- createTime: null,
- updateUser: null,
- updateTime: null,
- state: 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
- getTileMatchRules(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) {
- updateTileMatchRules(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addTileMatchRules(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 delTileMatchRules(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('da/tileMatchRules/export', {
- ...this.queryParams
- }, `tileMatchRules_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 2ea6b1f..7e60eb6 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -183,7 +183,7 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.10.196:8081/websocket/message/",
+ url: "ws://192.168.10.196:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
diff --git a/jcdm-ui/vue.config.js b/jcdm-ui/vue.config.js
index f0c5690..d22457d 100644
--- a/jcdm-ui/vue.config.js
+++ b/jcdm-ui/vue.config.js
@@ -34,7 +34,7 @@
open: true,
proxy: {
[process.env.VUE_APP_BASE_API]: {
- target: `http://localhost:8081`,
+ target: `http://localhost:8080`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.3