update 报表设计 数据集

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', 

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 type="primary" @click="closeDialog">关闭</el-button>
-        >关闭</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) {
-    dataViewPreview(caseResultTitle, caseResultContent){
+      this.caseResultTitle = caseResultTitle;
-      this.caseResultTitle = caseResultTitle
+      this.caseResultContent = caseResultContent;
-      this.caseResultContent = caseResultContent
     },
 
     // 关闭模态框
     closeDialog() {
-      this.$emit('handleClose')
+      this.$emit("handleClose");
     },
     onJsonChange(value) {},
-    onJsonSave(value) {},
+    onJsonSave(value) {}
-
+  }
-  },
+};
-}
 </script>

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) {

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
+      <el-dropdown placement="bottom" @command="operateDataset">
-        placement="bottom"
-        @command="operateDataset"
-      >
         <el-button type="primary" icon="el-icon-plus">
           新增
           <i class="el-icon-arrow-down el-icon--right"></i>
@@ -33,9 +38,6 @@
         >数据预览
       </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 EditDataSet from "./components/EditDataSet";
-import DataView from "@/views/report/resultset/components/DataView";
+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>