diff --git a/package.json b/package.json index 5d6457f..120bc69 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "@vue/composition-api": "^1.7.2", "axios": "0.24.0", "clipboard": "2.0.8", + "codemirror": "^5.65.12", "core-js": "3.25.3", "echarts": "5.4.0", "element-ui": "2.9.1", diff --git a/src/api/engine/engine.js b/src/api/engine/engine.js index fd60229..5aad0fa 100644 --- a/src/api/engine/engine.js +++ b/src/api/engine/engine.js @@ -79,7 +79,7 @@ export function findById(id) { //通过id删除数据 export function dels(id) { return request({ - url: '/engine/engine/delete/' + id, + url: '/engine/version/delete/' + id, method: 'post', data: id }) @@ -107,5 +107,13 @@ export function selectEngineById(id){ }) } +//根据版本id查询版本信息 +export function sel(id){ + return request({ + url: "/engine/version/selectListById/" + id, + method: "post" + }) +} + diff --git a/src/api/port/port/index.js b/src/api/port/port/index.js index 827af15..e88472a 100644 --- a/src/api/port/port/index.js +++ b/src/api/port/port/index.js @@ -79,3 +79,11 @@ export function doBuyInterface(data) { data:data }) } +//资产列表 +export function findConnectorUserList(data) { + return request({ + url: '/mart/connector/findConnectorUserList', + method: 'post', + data:data + }) +} diff --git a/src/api/task/task.js b/src/api/task/task.js index 6af774c..d05e80f 100644 --- a/src/api/task/task.js +++ b/src/api/task/task.js @@ -77,5 +77,15 @@ export function findByNodeId(nodeId) { }) } +//联查记录添加 +export function addTaskJoin(data) { + return request({ + url: "/task/taskJoin/addTaskJoin/", + method: "POST", + data:data + }) +} + + diff --git a/src/components/JavaIDE.vue/java.vue b/src/components/JavaIDE.vue/java.vue new file mode 100644 index 0000000..64fff9a --- /dev/null +++ b/src/components/JavaIDE.vue/java.vue @@ -0,0 +1,57 @@ + + + + + + diff --git a/src/main.js b/src/main.js index 0c72ebe..03c51e0 100644 --- a/src/main.js +++ b/src/main.js @@ -1,6 +1,23 @@ import Vue from 'vue' import Cookies from 'js-cookie' +//引入文件、、 +import VueCodeMirror from 'vue-codemirror' +import 'codemirror/lib/codemirror.css' +Vue.use(VueCodeMirror) +// + + +//codemirror +import VueCodemirror from 'vue-codemirror' +import 'codemirror/lib/codemirror.css' +Vue.use(VueCodemirror) + +import 'codemirror/lib/codemirror.css' + + + + import Element from 'element-ui' import './assets/styles/element-variables.scss' diff --git a/src/views/components/task/formData.vue b/src/views/components/task/formData.vue index 117a4c1..985f474 100644 --- a/src/views/components/task/formData.vue +++ b/src/views/components/task/formData.vue @@ -97,7 +97,7 @@ - + + diff --git a/src/views/components/task/formJoin.vue b/src/views/components/task/formJoin.vue new file mode 100644 index 0000000..0a111a0 --- /dev/null +++ b/src/views/components/task/formJoin.vue @@ -0,0 +1,135 @@ + + + + diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index 2b91e06..c70cef2 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -66,17 +66,21 @@ 导出 + + 新增 + @@ -564,8 +568,6 @@ export default { handleAdd() { - // this.reset(); - this.open = true; this.title = "添加规则引擎"; @@ -576,8 +578,6 @@ export default { handleUpdate(row) { - // this.reset(); - this.form = row; this.open = true; @@ -673,20 +673,35 @@ export default { beforeCreate() { }, //生命周期 - 创建之前", + beforeMount() { + }, //生命周期 - 挂载之前", + beforeUpdate() { + }, //生命周期 - 更新之前", + updated() { + }, //生命周期 - 更新之后", + beforeDestroy() { + }, //生命周期 - 销毁之前", + destroyed() { + }, //生命周期 - 销毁完成", + activated() { + } //如果页面有keep-alive缓存功能，这个函数会触发", + }; + + diff --git a/src/views/engine/engine/list.vue b/src/views/engine/engine/list.vue index f27af45..31c79b8 100644 --- a/src/views/engine/engine/list.vue +++ b/src/views/engine/engine/list.vue @@ -2,119 +2,232 @@
- 新增 + 新增 + + + + + + + - + + + - + + + - - + + + + - - - + - - - - - + + + + + + +
+ 取 消 + 确 定 + + 生成引擎类 +
+ - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 取 消 + + 确 定 + +
+ + +
+ diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue index 0dad770..400d8fe 100644 --- a/src/views/port/port/employee.vue +++ b/src/views/port/port/employee.vue @@ -180,8 +180,10 @@ - + +

余额：{{ userBalanceData.userBalance || '加载中...' }}

+ 共计：{{buyForm.connectorPrice*buyForm.connectorFrequency}}元
@@ -204,6 +206,7 @@ import {getBirthday} from "@/api/port/port"; import {getPostcode} from "@/api/port/port"; import {getWeather} from "@/api/port/port"; import {doBuyInterface} from "@/api/port/port"; +import {userBalance} from "@/api/system/user"; export default { //import引入的组件需要注入到对象中才能使用" components: {}, @@ -212,6 +215,9 @@ export default { //这里存放数据" return { + userBalanceData: { + userBalance: '加载中...' + }, formWeather:{}, data:[], defaultProps: { @@ -305,6 +311,26 @@ export default { watch: {}, //方法集合", methods: { + async fetchUserBalance() { + try { + const userId = localStorage.getItem('userId'); + console.log(userId)// 登录后把userId存到了localStorage + if (!userId) { + this.userBalanceData = {userBalance: '未登录'}; + return; + } + const response = await userBalance(userId); + if (response.data) { + console.log(response.data) + this.userBalanceData.userBalance = response.data; + } else { + this.userBalanceData.userBalance = {userBalance: '获取失败'}; + } + } catch (error) { + this.userBalanceData = {userBalance: '获取失败'}; + console.error('Error fetching user balance:', error); + } + }, buyInterface(){ doBuyInterface(this.buyForm).then((res)=>{ console.log(res); @@ -414,6 +440,7 @@ export default { }, //生命周期 - 创建完成（可以访问当前this实例）", created() { + this.fetchUserBalance(); this.findConnectorList(); }, //生命周期 - 挂载完成（可以访问DOM元素）", diff --git a/src/views/task/task/antvX6.vue b/src/views/task/task/antvX6.vue index 9c71c1d..3b15bb5 100644 --- a/src/views/task/task/antvX6.vue +++ b/src/views/task/task/antvX6.vue @@ -20,7 +20,20 @@ - + + + + + + + + + + + @@ -30,52 +43,33 @@