diff --git a/package.json b/package.json index 757e520..3cdf280 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src" }, - "husky": { "hooks": { "pre-commit": "lint-staged" @@ -38,6 +37,7 @@ "url": "https://gitee.com/y_project/MuYu-Cloud.git" }, "dependencies": { + "@antv/x6": "^2.18.1", "@riophae/vue-treeselect": "0.4.0", "axios": "0.24.0", "clipboard": "2.0.8", @@ -50,19 +50,19 @@ "js-beautify": "1.13.0", "js-cookie": "3.0.1", "jsencrypt": "3.0.0-rc.1", + "lodash": "4.17.15", "nprogress": "0.2.0", "quill": "1.3.7", "screenfull": "5.0.2", "sortablejs": "1.10.2", "vue": "2.6.12", + "vue-codemirror": "^4.0.6", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", "vue-meta": "2.4.0", "vue-router": "3.4.9", "vuedraggable": "2.24.3", - "vuex": "3.6.0", - "lodash": "4.17.15", - "vue-codemirror": "^4.0.6" + "vuex": "3.6.0" }, "devDependencies": { "@vue/cli-plugin-babel": "4.4.6", diff --git a/src/api/etl/etl.js b/src/api/etl/etl.js index e84039d..27de1cd 100644 --- a/src/api/etl/etl.js +++ b/src/api/etl/etl.js @@ -1,17 +1,18 @@ import request from "@/utils/request"; -export function showTask() { +export function showTask(params) { return request({ url: '/integration/task/selectAll', method: 'get', + params }) } -export function addTask(params) { +export function addTask(data) { return request({ url: '/integration/task/addTask', method: 'post', - params + data }) } diff --git a/src/api/market/orders.js b/src/api/market/orders.js new file mode 100644 index 0000000..84befa5 --- /dev/null +++ b/src/api/market/orders.js @@ -0,0 +1,9 @@ +import request from "@/utils/request"; + +export function selectList(data){ + return request({ + url:"/market/orders/list", + method: "POST", + data: data + }) +} diff --git a/src/api/property/asDisplay.js b/src/api/property/asDisplay.js new file mode 100644 index 0000000..e0bb0ae --- /dev/null +++ b/src/api/property/asDisplay.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function getConnectList(data) { + return request({ + url: '/property/dataSource/dataName', + method: 'post', + data: data + }) +} diff --git a/src/api/property/asauth.js b/src/api/property/asauth.js new file mode 100644 index 0000000..ac7e6f2 --- /dev/null +++ b/src/api/property/asauth.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function getConnectList(data) { + return request({ + url: '/property/connect/selectConnect', + method: 'post', + data: data + }) +} diff --git a/src/api/property/astr.js b/src/api/property/astr.js new file mode 100644 index 0000000..5527a6d --- /dev/null +++ b/src/api/property/astr.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function getSelectList(data) { + return request({ + url: '/property/dataSource/dataName', + method: 'post', + data: data + }) +} diff --git a/src/api/property/property.js b/src/api/property/property.js new file mode 100644 index 0000000..6a5b1a0 --- /dev/null +++ b/src/api/property/property.js @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +export function getConnectList(data) { + return request({ + url: '/property/connect/selectConnect', + method: 'post', + data: data + }) +} + +export function insertConnectList(data) { + return request({ + url: '/property/connect/add', + method: 'post', + data: data + }) +} + +export function updConnectList(data) { + return request({ + url: '/property/connect/upd', + method: 'put', + data: data + }) +} + +export function textHandleClick(data) { + return request({ + url: '/property/connect/text', + method: 'post', + data: data + }) +} + +export function delHandleClick(data) { + return request({ + url: '/property/connect/del/'+data, + method: 'Delete', + data: data + }) +} + +export function selectHandleClick(data) { + return request({ + url: '/property/tableField/list', + method: 'post', + data: data + }) +} diff --git a/src/api/rule/maintain.js b/src/api/rule/maintain.js index 1c583ac..d650c62 100644 --- a/src/api/rule/maintain.js +++ b/src/api/rule/maintain.js @@ -2,8 +2,38 @@ import request from '@/utils/request' export function getList(data) { return request({ - url: '/rule/ruleData/list', + url: '/cloud-rule/ruleData/list', method: 'post', data: data }) } + +export function save(data) { + return request({ + url: '/cloud-rule/ruleData/add', + method: 'post', + data: data + }) +} + +export function update(data) { + return request({ + url: `/cloud-rule/ruleData/upd/${data.ruleId}`, + method: 'put', + data: data + }) +} +//获取单条 +export function get(id){ + return request({ + url: "/cloud-rule/ruleData/"+id, + method : "GET", + }) +} +//客户信息删除 +export function del(ruleId){ + return request({ + url: `/cloud-rule/ruleData/del/${ruleId}`, + method : "DELETE", + }) +} diff --git a/src/assets/images/login-background.jpg b/src/assets/images/login-background.jpg index 8a89eb8..bca88ad 100644 Binary files a/src/assets/images/login-background.jpg and b/src/assets/images/login-background.jpg differ diff --git a/src/assets/images/pay.png b/src/assets/images/pay.png index bb8b967..0ce1d7e 100644 Binary files a/src/assets/images/pay.png and b/src/assets/images/pay.png differ diff --git a/src/assets/img/1.png b/src/assets/img/1.png new file mode 100644 index 0000000..9f95f32 Binary files /dev/null and b/src/assets/img/1.png differ diff --git a/src/assets/img/2.png b/src/assets/img/2.png new file mode 100644 index 0000000..3922e3f Binary files /dev/null and b/src/assets/img/2.png differ diff --git a/src/assets/img/3.png b/src/assets/img/3.png new file mode 100644 index 0000000..98d5680 Binary files /dev/null and b/src/assets/img/3.png differ diff --git a/src/assets/img/4.png b/src/assets/img/4.png new file mode 100644 index 0000000..9b4712f Binary files /dev/null and b/src/assets/img/4.png differ diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue index a96ba63..e6645eb 100644 --- a/src/components/Pagination/index.vue +++ b/src/components/Pagination/index.vue @@ -25,10 +25,6 @@ export default { required: true, type: Number }, - page: { - type: Number, - default: 1 - }, limit: { type: Number, default: 20 diff --git a/src/router/index.js b/src/router/index.js index 87207fb..2e56e9d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -45,11 +45,7 @@ export const constantRoutes = [ component: () => import('@/views/login'), hidden: true }, - { - path: '/easyFlow', - component: () => import('@/components/ef/panel'), - hidden: true - }, + { path: '/register', component: () => import('@/views/register'), @@ -162,6 +158,20 @@ export const dynamicRoutes = [ } ] }, + { + path: '/rule/versions', + component: Layout, + hidden: true, + permissions: ['rule:versions:list'], + children: [ + { + path: 'index/:ruleId(\\d+)', + component: () => import('@/views/rule/versions/index'), + name: 'Rule', + meta: {title: '规则维护', activeMenu: '/rule/versions'} + } + ] + }, { path: '/tool/gen-edit', component: Layout, diff --git a/src/views/etl/task/index.vue b/src/views/etl/task/index.vue index 3c42060..63e3157 100644 --- a/src/views/etl/task/index.vue +++ b/src/views/etl/task/index.vue @@ -1,6 +1,28 @@