From 77598aae828fccb75a7544529eb3ed0231f38ba4 Mon Sep 17 00:00:00 2001
From: qianlishi <1432731663@qq.com>
Date: Mon, 13 Dec 2021 12:33:36 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=8A=A5=E8=A1=A8=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 report-ui/src/router/index.js                 |  2 +-
 .../resultset/components/DataView.vue         | 35 ++++++---------
 .../resultset/components/EditDataSet.vue      |  9 ----
 .../resultset/components/MonacoEditor.vue     |  0
 .../components/util/javascript-completion.js  |  0
 .../resultset/components/util/log-language.js |  0
 .../components/util/sql-completion.js         |  0
 .../views/{report => }/resultset/index.vue    | 45 ++++++++++---------
 8 files changed, 40 insertions(+), 51 deletions(-)
 rename report-ui/src/views/{report => }/resultset/components/DataView.vue (62%)
 rename report-ui/src/views/{report => }/resultset/components/EditDataSet.vue (98%)
 rename report-ui/src/views/{report => }/resultset/components/MonacoEditor.vue (100%)
 rename report-ui/src/views/{report => }/resultset/components/util/javascript-completion.js (100%)
 rename report-ui/src/views/{report => }/resultset/components/util/log-language.js (100%)
 rename report-ui/src/views/{report => }/resultset/components/util/sql-completion.js (100%)
 rename report-ui/src/views/{report => }/resultset/index.vue (89%)

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"
     />
     <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="closeDialog"
-        >关闭</el-button
-        >
-      </span>
+      <el-button type="primary" @click="closeDialog">关闭</el-button>
+    </span>
   </el-dialog>
 </template>
 <script>
 import vueJsonEditor from "vue-json-editor";
 export default {
-  name: 'Support',
+  name: "Support",
   components: { vueJsonEditor },
   props: {
     visib: {
       required: true,
       type: Boolean,
-      default: false,
-    },
+      default: false
+    }
   },
   data() {
     return {
       dialogCaseResult: false,
       caseResultTitle: "",
-      caseResultContent: null,
-    }
+      caseResultContent: null
+    };
   },
-  // 在生命周期 beforeCreate里面改变this指向
-  beforeCreate: function () {},
-  mounted() {},
   methods: {
-
-    dataViewPreview(caseResultTitle, caseResultContent){
-      this.caseResultTitle = caseResultTitle
-      this.caseResultContent = caseResultContent
+    dataViewPreview(caseResultTitle, caseResultContent) {
+      this.caseResultTitle = caseResultTitle;
+      this.caseResultContent = caseResultContent;
     },
 
     // 关闭模态框
     closeDialog() {
-      this.$emit('handleClose')
+      this.$emit("handleClose");
     },
     onJsonChange(value) {},
-    onJsonSave(value) {},
-
-  },
-}
+    onJsonSave(value) {}
+  }
+};
 </script>
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 @@
                       </template>
                     </el-table-column>
                   </el-table>
-                  <!--                  <el-checkbox-->
-                  <!--                    v-model="isShowPagination"-->
-                  <!--                    @change="changePagination"-->
-                  <!--                    >加入分页参数-->
-                  <!--                  </el-checkbox>-->
                 </el-tab-pane>
                 <el-tab-pane label="数据转换" name="second">
                   <template>
@@ -381,7 +376,6 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="warning" @click="test">测试</el-button> -->
         <el-button @click="closeDialog">取消</el-button>
         <el-button type="primary" @click="submit('form')">保存</el-button>
       </div>
@@ -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 @@
+<!--
+ * @Descripttion: 用户权限--数据集
+ * @version: 
+ * @Author: qianlishi
+ * @Date: 2021-12-11 14:48:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-12-13 12:28:54
+-->
 <template>
   <anji-crud ref="listPage" :option="crudOption">
     <template v-slot:buttonLeftOnTable>
-      <el-dropdown
-        placement="bottom"
-        @command="operateDataset"
-      >
+      <el-dropdown placement="bottom" @command="operateDataset">
         <el-button type="primary" icon="el-icon-plus">
           新增
           <i class="el-icon-arrow-down el-icon--right"></i>
@@ -21,7 +26,7 @@
         type="text"
         @click="operateDataset('edit', props)"
         v-permission="'resultsetManage:update'"
-      >编辑
+        >编辑
       </el-button>
     </template>
 
@@ -30,12 +35,9 @@
         type="text"
         @click="dataView(props)"
         v-permission="'resultsetManage:query'"
-      >数据预览
+        >数据预览
       </el-button>
     </template>
-    <!--自定义的卡片插槽，将在编辑详情页面，出现在底部新卡片-->
-    <!--这里可以将自定义的弹出框代码，放入到page中
-    -->
     <template v-slot:pageSection>
       <EditDataSet
         ref="EditDataSet"
@@ -60,8 +62,8 @@ import {
   reportDataSetUpdate,
   reportDataSetDetail
 } from "@/api/reportDataSet";
-import EditDataSet from "@/views/report/resultset/components/EditDataSet";
-import DataView from "@/views/report/resultset/components/DataView";
+import EditDataSet from "./components/EditDataSet";
+import DataView from "./components/DataView";
 
 export default {
   name: "ReportDataSet",
@@ -109,12 +111,12 @@ export default {
             },
             label: "数据集类型",
             field: "setType"
-          },
+          }
         ],
         // 操作按钮
         buttons: {
           customButton: {
-            operationWidth: 150
+            operationWidth: 180
           },
           query: {
             api: reportDataSetList,
@@ -157,7 +159,7 @@ export default {
             editField: "setCode",
             inputType: "input",
             rules: [
-              {min: 1, max: 50, message: "不超过50个字符", trigger: "blur"}
+              { min: 1, max: 50, message: "不超过50个字符", trigger: "blur" }
             ],
             disabled: false
           },
@@ -168,7 +170,7 @@ export default {
             editField: "setName",
             inputType: "input",
             rules: [
-              {min: 1, max: 100, message: "不超过100个字符", trigger: "blur"}
+              { min: 1, max: 100, message: "不超过100个字符", trigger: "blur" }
             ],
             disabled: false
           },
@@ -179,7 +181,7 @@ export default {
             editField: "setDesc",
             inputType: "input",
             rules: [
-              {min: 1, max: 255, message: "不超过255个字符", trigger: "blur"}
+              { min: 1, max: 255, message: "不超过255个字符", trigger: "blur" }
             ],
             disabled: false
           },
@@ -190,7 +192,7 @@ export default {
             editField: "sourceCode",
             inputType: "input",
             rules: [
-              {min: 1, max: 50, message: "不超过50个字符", trigger: "blur"}
+              { min: 1, max: 50, message: "不超过50个字符", trigger: "blur" }
             ],
             disabled: false
           },
@@ -201,7 +203,7 @@ export default {
             editField: "setType",
             inputType: "input",
             rules: [
-              {min: 1, max: 50, message: "不超过50个字符", trigger: "blur"}
+              { min: 1, max: 50, message: "不超过50个字符", trigger: "blur" }
             ],
             disabled: false
           },
@@ -270,8 +272,6 @@ export default {
     };
   },
 
-  created() {
-  },
   methods: {
     operateDataset(type, prop) {
       this.dialogVisibleSetDataSet = true;
@@ -296,3 +296,8 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+/deep/.el-dropdown {
+  margin-right: 20px;
+}
+</style>