From fc34d7b911f0120d2278772e57b1b2c38fe2800e Mon Sep 17 00:00:00 2001
From: qianlishi <1432731663@qq.com>
Date: Mon, 13 Dec 2021 12:23:11 +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=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 report-ui/src/router/index.js                     |  2 +-
 report-ui/src/views/accessAuthority/index.vue     |  4 ++--
 report-ui/src/views/accessRole/index.vue          |  8 ++++++++
 report-ui/src/views/accessUser/index.vue          |  8 ++++++++
 .../datasource/components/EditDataSource.vue      |  5 -----
 .../src/views/{report => }/datasource/index.vue   | 15 +++++++++------
 6 files changed, 28 insertions(+), 14 deletions(-)
 rename report-ui/src/views/{report => }/datasource/components/EditDataSource.vue (97%)
 rename report-ui/src/views/{report => }/datasource/index.vue (96%)

diff --git a/report-ui/src/router/index.js b/report-ui/src/router/index.js
index dce9304e..073e766c 100644
--- a/report-ui/src/router/index.js
+++ b/report-ui/src/router/index.js
@@ -119,7 +119,7 @@ export const constantRouterMap = [
       { 
         path: 'datasource', 
         name: 'datasource', 
-        component: () => import('@/views/report/datasource/index'), 
+        component: () => import('@/views/datasource/index'), 
         meta: { 
           title: '数据源', 
           icon: 'icondatabase', 
diff --git a/report-ui/src/views/accessAuthority/index.vue b/report-ui/src/views/accessAuthority/index.vue
index cba0b850..153aaa66 100755
--- a/report-ui/src/views/accessAuthority/index.vue
+++ b/report-ui/src/views/accessAuthority/index.vue
@@ -1,10 +1,10 @@
 <!--
- * @Descripttion: 权限管理
+ * @Descripttion: 用户权限--权限管理
  * @version: 
  * @Author: qianlishi
  * @Date: 2021-12-11 14:48:27
  * @LastEditors: qianlishi
- * @LastEditTime: 2021-12-13 09:48:59
+ * @LastEditTime: 2021-12-13 12:20:56
 -->
 <template>
   <anji-crud ref="listPage" :option="crudOption" />
diff --git a/report-ui/src/views/accessRole/index.vue b/report-ui/src/views/accessRole/index.vue
index 4f55a9d1..3e762e23 100755
--- a/report-ui/src/views/accessRole/index.vue
+++ b/report-ui/src/views/accessRole/index.vue
@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 用户权限--角色管理
+ * @version: 
+ * @Author: qianlishi
+ * @Date: 2021-12-11 14:48:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-12-13 12:20:46
+-->
 <template>
   <anji-crud ref="listPage" :option="crudOption">
     <template slot="rowButtonInMore" slot-scope="props">
diff --git a/report-ui/src/views/accessUser/index.vue b/report-ui/src/views/accessUser/index.vue
index 1c3d109c..9b75ab00 100755
--- a/report-ui/src/views/accessUser/index.vue
+++ b/report-ui/src/views/accessUser/index.vue
@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 用户权限--用户管理
+ * @version: 
+ * @Author: qianlishi
+ * @Date: 2021-12-11 14:48:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-12-13 12:20:35
+-->
 <template>
   <anji-crud ref="listPage" :option="crudOption">
     <template slot="rowButtonInMore" slot-scope="props">
diff --git a/report-ui/src/views/report/datasource/components/EditDataSource.vue b/report-ui/src/views/datasource/components/EditDataSource.vue
similarity index 97%
rename from report-ui/src/views/report/datasource/components/EditDataSource.vue
rename to report-ui/src/views/datasource/components/EditDataSource.vue
index 0e0c7676..caed1924 100644
--- a/report-ui/src/views/report/datasource/components/EditDataSource.vue
+++ b/report-ui/src/views/datasource/components/EditDataSource.vue
@@ -155,9 +155,6 @@ export default {
       testReplyCode: null
     };
   },
-  // 在生命周期 beforeCreate里面改变this指向
-  beforeCreate: function() {},
-  mounted() {},
   methods: {
     async setDataSource() {
       this.dialogForm = {
@@ -215,12 +212,10 @@ export default {
           if (this.dialogForm.id == undefined) {
             const { code } = await reportDataSourceAdd(this.dialogForm);
             if (code != "200") return;
-            // this.queryByPage()
             this.$emit("refreshList");
           } else {
             const { code } = await reportDataSourceUpdate(this.dialogForm);
             if (code != "200") return;
-            // this.queryByPage()
             this.$emit("refreshList");
           }
           this.closeDialog();
diff --git a/report-ui/src/views/report/datasource/index.vue b/report-ui/src/views/datasource/index.vue
similarity index 96%
rename from report-ui/src/views/report/datasource/index.vue
rename to report-ui/src/views/datasource/index.vue
index 3fd60348..4850ab38 100644
--- a/report-ui/src/views/report/datasource/index.vue
+++ b/report-ui/src/views/datasource/index.vue
@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 报表设计--数据源
+ * @version: 
+ * @Author: qianlishi
+ * @Date: 2021-12-11 14:48:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-12-13 12:21:33
+-->
 <template>
   <anji-crud ref="listPage" :option="crudOption">
     <template v-slot:buttonLeftOnTable>
@@ -18,9 +26,6 @@
         >编辑</el-button
       >
     </template>
-    <!--自定义的卡片插槽，将在编辑详情页面，出现在底部新卡片-->
-    <!--这里可以将自定义的弹出框代码，放入到page中
-    -->
     <template v-slot:pageSection>
       <EditDataSource
         ref="EditDataSource"
@@ -40,7 +45,7 @@ import {
   reportDataSourceUpdate,
   reportDataSourceDetail
 } from "@/api/reportDataSource";
-import EditDataSource from "@/views/report/datasource/components/EditDataSource";
+import EditDataSource from "./components/EditDataSource";
 export default {
   name: "ReportDataSource",
   components: {
@@ -209,8 +214,6 @@ export default {
       }
     };
   },
-
-  created() {},
   methods: {
     operateDatasource(type, prop) {
       this.dialogVisibleSetDataSource = true;