diff --git a/package.json b/package.json index 1aa9f70..829f7bb 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "axios": "0.24.0", "clipboard": "2.0.8", "core-js": "3.25.3", - "echarts": "5.4.0", + "echarts": "^5.5.1", "element-ui": "2.15.14", "file-saver": "2.0.5", "fuse.js": "6.4.3", diff --git a/src/api/engine/engine.js b/src/api/engine/engine.js index 63cc44a..48b9a8f 100644 --- a/src/api/engine/engine.js +++ b/src/api/engine/engine.js @@ -39,5 +39,47 @@ export function del(id){ } +//开启 +export function onEngine(id){ + return request({ + url: "/engine/engine/onEngine/" + id, + method: "post", + data:id + }) +} + + +//禁用 +export function forbiddenEngine(id){ + return request({ + url: "/engine/engine/forbiddenEngine/" + id, + method: "post", + data:id + }) +} + +export function selectLevel(){ + return request({ + url: "/engine/level/selectLevelList", + method: "post" + }) +} + +// 查询规则引擎版本列表 +export function getRuleEngineInfo(id) { + return request({ + url: '/engine/engine/getRuleEngineInfo/' + id, + method: 'put' + }) +} + + +// 通过id查询 +export function findById(id) { + return request({ + url: '/engine/engine/findById/' + id, + method: 'get' + }) +} diff --git a/src/api/port/port/index.js b/src/api/port/port/index.js index c2b8844..165c6b5 100644 --- a/src/api/port/port/index.js +++ b/src/api/port/port/index.js @@ -6,3 +6,35 @@ export function getPhonePlace(tel) { method: 'get' }) } + +export function findConnectorList(data) { + return request({ + url: '/mart/connector/findConnectorList', + method: 'post', + data:data + }) +} +export function addConnector(data) { + return request({ + url: '/mart/connector/addConnector', + method: 'post', + data:data + }) +} + +export function getDeleteConnector(connectorId) { + return request({ + url: '/mart/connector/getDeleteConnector?connectorId='+connectorId, + method: 'get' + }) +} + + +export function updateConnector(data) { + return request({ + url: '/mart/connector/updateConnector', + method: 'post', + data:data + }) +} + diff --git a/src/api/system/user.js b/src/api/system/user.js index bbc753d..47fc9f5 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -89,6 +89,15 @@ export function changeUserStatus(userId, status) { }) } +//对用户余额进行添加 +export function addUserMoney(data) { + return request({ + url: '/system/user/addUserMoney', + method: 'post', + data:data + }) +} + // 查询用户个人信息 export function getUserProfile() { return request({ diff --git a/src/api/version/version.js b/src/api/version/version.js new file mode 100644 index 0000000..4f71e50 --- /dev/null +++ b/src/api/version/version.js @@ -0,0 +1,57 @@ +import request from '@/utils/request' + +//查询规则引擎列表 +export function list(data){ + return request({ + url: "/engine/version/list", + method: "get", + data:data + }) +} + + + + +export function insert(data){ + return request({ + url: "/engine/version/insert", + method: "post", + data:data + }) +} + +// export function update(data){ +// return request({ +// url: "/engine/engine/update", +// method: "post", +// data:data +// }) +// } + + + +export function del(id){ + return request({ + url: "/engine/version/delete/" + id, + method: "post", + data:id + }) +} + + +export function selectLevel(){ + return request({ + url: "/engine/level/selectLevelList", + method: "post" + }) +} + +// 查询规则引擎版本列表 +export function getRuleEngineInfo(id) { + return request({ + url: '/engine/engine/getRuleEngineInfo/' + id, + method: 'put' + }) +} + + diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index 6a57bca..de89a74 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue index 6f719ad..d9164ce 100644 --- a/src/views/etl/switch/index.vue +++ b/src/views/etl/switch/index.vue @@ -77,27 +77,8 @@ - - - - - - - - - - - - - - - - - - -
连接池配置 diff --git a/src/views/money/pay/index.vue b/src/views/money/pay/index.vue index 8233b38..f397ff9 100644 --- a/src/views/money/pay/index.vue +++ b/src/views/money/pay/index.vue @@ -2,8 +2,10 @@
  • -

    充值说明

    +

    充值说明

    你敢充钱,我就敢让你没钱

    +

    子龙说你得有个小目标

    +

    什么小目标,得一个亿

  • 支付金额

    @@ -35,11 +37,13 @@ diff --git a/src/views/pay/customer/index.vue b/src/views/pay/customer/index.vue index 988ede8..660ea2c 100644 --- a/src/views/pay/customer/index.vue +++ b/src/views/pay/customer/index.vue @@ -103,7 +103,9 @@ - + {{ customer.appName }} diff --git a/src/views/port/port/index.vue b/src/views/port/port/index.vue index d6e6745..fe3d186 100644 --- a/src/views/port/port/index.vue +++ b/src/views/port/port/index.vue @@ -1,93 +1,221 @@ diff --git a/src/views/version/version/version.vue b/src/views/version/version/version.vue new file mode 100644 index 0000000..0adf58b --- /dev/null +++ b/src/views/version/version/version.vue @@ -0,0 +1,212 @@ + + + diff --git a/vue.config.js b/vue.config.js index d93d965..0f59bdd 100644 --- a/vue.config.js +++ b/vue.config.js @@ -38,7 +38,7 @@ module.exports = { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { target: `http://172.13.1.1/prod-api`, - // target: `http://127.0.0.1/8080`, + // target: `http://127.0.0.1/8080`, `http://172.13.1.1/prod-api`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''