diff --git a/report-ui/src/router/index.js b/report-ui/src/router/index.js
index 073e766c..e177ab6b 100644
--- a/report-ui/src/router/index.js
+++ b/report-ui/src/router/index.js
@@ -131,7 +131,7 @@ export const constantRouterMap = [
{
path: 'resultset',
name: 'resultset',
- component: () => import('@/views/report/resultset/index'),
+ component: () => import('@/views/resultset/index'),
meta: {
title: '数据集',
icon: 'iconAPIwangguan',
diff --git a/report-ui/src/views/report/resultset/components/DataView.vue b/report-ui/src/views/resultset/components/DataView.vue
similarity index 62%
rename from report-ui/src/views/report/resultset/components/DataView.vue
rename to report-ui/src/views/resultset/components/DataView.vue
index 2469a64f..5d1a7e86 100644
--- a/report-ui/src/views/report/resultset/components/DataView.vue
+++ b/report-ui/src/views/resultset/components/DataView.vue
@@ -16,48 +16,41 @@
@json-save="onJsonSave"
/>
+ 关闭
+
diff --git a/report-ui/src/views/report/resultset/components/EditDataSet.vue b/report-ui/src/views/resultset/components/EditDataSet.vue
similarity index 98%
rename from report-ui/src/views/report/resultset/components/EditDataSet.vue
rename to report-ui/src/views/resultset/components/EditDataSet.vue
index f98d9a6e..966d17b2 100644
--- a/report-ui/src/views/report/resultset/components/EditDataSet.vue
+++ b/report-ui/src/views/resultset/components/EditDataSet.vue
@@ -204,11 +204,6 @@
-
-
-
-
-
@@ -381,7 +376,6 @@
@@ -585,9 +579,6 @@ export default {
testReplyCode: null
};
},
- // 在生命周期 beforeCreate里面改变this指向
- beforeCreate: function() {},
- mounted() {},
methods: {
// 编辑数据集,获取单条数据详情
async addOrEditDataSet(row, type) {
diff --git a/report-ui/src/views/report/resultset/components/MonacoEditor.vue b/report-ui/src/views/resultset/components/MonacoEditor.vue
similarity index 100%
rename from report-ui/src/views/report/resultset/components/MonacoEditor.vue
rename to report-ui/src/views/resultset/components/MonacoEditor.vue
diff --git a/report-ui/src/views/report/resultset/components/util/javascript-completion.js b/report-ui/src/views/resultset/components/util/javascript-completion.js
similarity index 100%
rename from report-ui/src/views/report/resultset/components/util/javascript-completion.js
rename to report-ui/src/views/resultset/components/util/javascript-completion.js
diff --git a/report-ui/src/views/report/resultset/components/util/log-language.js b/report-ui/src/views/resultset/components/util/log-language.js
similarity index 100%
rename from report-ui/src/views/report/resultset/components/util/log-language.js
rename to report-ui/src/views/resultset/components/util/log-language.js
diff --git a/report-ui/src/views/report/resultset/components/util/sql-completion.js b/report-ui/src/views/resultset/components/util/sql-completion.js
similarity index 100%
rename from report-ui/src/views/report/resultset/components/util/sql-completion.js
rename to report-ui/src/views/resultset/components/util/sql-completion.js
diff --git a/report-ui/src/views/report/resultset/index.vue b/report-ui/src/views/resultset/index.vue
similarity index 89%
rename from report-ui/src/views/report/resultset/index.vue
rename to report-ui/src/views/resultset/index.vue
index bdda5160..ab2f1420 100644
--- a/report-ui/src/views/report/resultset/index.vue
+++ b/report-ui/src/views/resultset/index.vue
@@ -1,10 +1,15 @@
+
-
+
新增
@@ -21,7 +26,7 @@
type="text"
@click="operateDataset('edit', props)"
v-permission="'resultsetManage:update'"
- >编辑
+ >编辑
@@ -30,12 +35,9 @@
type="text"
@click="dataView(props)"
v-permission="'resultsetManage:query'"
- >数据预览
+ >数据预览
-
-
+