修复部分input框回车页面刷新问题/修改按钮组查询传参规则

zkqy-ui/src/views/monitor/job/log.vue

@@ -1,6 +1,14 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+      @submit.native.prevent
+    >
       <el-form-item label="任务名称" prop="jobName">
         <el-input
           v-model="queryParams.jobName"
@@ -52,8 +60,16 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -67,7 +83,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['monitor:job:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -77,7 +94,8 @@
           size="mini"
           @click="handleClean"
           v-hasPermi="['monitor:job:remove']"
-        >清空</el-button>
+          >清空</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -87,7 +105,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['monitor:job:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -96,33 +115,81 @@
           icon="el-icon-close"
           size="mini"
           @click="handleClose"
-        >关闭</el-button>
+          >关闭</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="jobLogList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
-      <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
-      <el-table-column label="任务组名" align="center" prop="jobGroup" :show-overflow-tooltip="true">
+      <el-table-column
+        label="日志编号"
+        width="80"
+        align="center"
+        prop="jobLogId"
+      />
+      <el-table-column
+        label="任务名称"
+        align="center"
+        prop="jobName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="任务组名"
+        align="center"
+        prop="jobGroup"
+        :show-overflow-tooltip="true"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
+          <dict-tag
+            :options="dict.type.sys_job_group"
+            :value="scope.row.jobGroup"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
-      <el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="调用目标字符串"
+        align="center"
+        prop="invokeTarget"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="日志信息"
+        align="center"
+        prop="jobMessage"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="执行状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.sys_common_status"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="执行时间" align="center" prop="createTime" width="180">
+      <el-table-column
+        label="执行时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -130,13 +197,14 @@
             icon="el-icon-view"
             @click="handleView(scope.row)"
             v-hasPermi="['monitor:job:query']"
-          >详细</el-button>
+            >详细</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -144,7 +212,12 @@
     />
 
     <!-- 调度日志详细 -->
-    <el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog
+      title="调度日志详细"
+      :visible.sync="open"
+      width="700px"
+      append-to-body
+    >
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">
@@ -153,13 +226,19 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="任务分组：">{{ form.jobGroup }}</el-form-item>
-            <el-form-item label="执行时间：">{{ form.createTime }}</el-form-item>
+            <el-form-item label="执行时间：">{{
+              form.createTime
+            }}</el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="调用方法：">{{ form.invokeTarget }}</el-form-item>
+            <el-form-item label="调用方法：">{{
+              form.invokeTarget
+            }}</el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="日志信息：">{{ form.jobMessage }}</el-form-item>
+            <el-form-item label="日志信息：">{{
+              form.jobMessage
+            }}</el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="执行状态：">
@@ -168,7 +247,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="异常信息：" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
+            <el-form-item label="异常信息：" v-if="form.status == 1">{{
+              form.exceptionInfo
+            }}</el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -180,12 +261,12 @@
 </template>
 
 <script>
-import { getJob} from "@/api/monitor/job";
+import { getJob } from "@/api/monitor/job";
 import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog";
 
 export default {
   name: "JobLog",
-  dicts: ['sys_common_status', 'sys_job_group'],
+  dicts: ["sys_common_status", "sys_job_group"],
   data() {
     return {
       // 遮罩层
@@ -212,14 +293,14 @@ export default {
         pageSize: 10,
         jobName: undefined,
         jobGroup: undefined,
-        status: undefined
-      }
+        status: undefined,
+      },
     };
   },
   created() {
     const jobId = this.$route.params && this.$route.params.jobId;
     if (jobId !== undefined && jobId != 0) {
-      getJob(jobId).then(response => {
+      getJob(jobId).then((response) => {
         this.queryParams.jobName = response.data.jobName;
         this.queryParams.jobGroup = response.data.jobGroup;
         this.getList();
@@ -232,7 +313,8 @@ export default {
     /** 查询调度日志列表 */
     getList() {
       this.loading = true;
-      listJobLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listJobLog(this.addDateRange(this.queryParams, this.dateRange)).then(
+        (response) => {
           this.jobLogList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -257,7 +339,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.jobLogId);
+      this.ids = selection.map((item) => item.jobLogId);
       this.multiple = !selection.length;
     },
     /** 详细按钮操作 */
@@ -268,28 +350,40 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const jobLogIds = this.ids;
-      this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项？').then(function() {
-        return delJobLog(jobLogIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项？')
+        .then(function () {
+          return delJobLog(jobLogIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 清空按钮操作 */
     handleClean() {
-      this.$modal.confirm('是否确认清空所有调度日志数据项？').then(function() {
-        return cleanJobLog();
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("清空成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("是否确认清空所有调度日志数据项？")
+        .then(function () {
+          return cleanJobLog();
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("清空成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('/monitor/jobLog/export', {
-        ...this.queryParams
-      }, `log_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "/monitor/jobLog/export",
+        {
+          ...this.queryParams,
+        },
+        `log_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>

zkqy-ui/src/views/relateTable/index.vue

@@ -7,6 +7,7 @@
       :inline="true"
       v-show="showSearch"
       label-width="68px"
+      @submit.native.prevent
     >
       <el-form-item label="表格组名" prop="dtName">
         <el-input

zkqy-ui/src/views/system/dept/index.vue

@@ -6,6 +6,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
+      @submit.native.prevent
     >
       <el-form-item label="部门名称" prop="deptName">
         <el-input

zkqy-ui/src/views/system/excuteBtnMange/index.vue

@@ -6,6 +6,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
+      @submit.native.prevent
     >
       <el-form-item label="按钮组名" prop="btnGroupName">
         <el-input
@@ -589,6 +590,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      // btnGroupName: "",
       // 分页数据
       total: 0,
       // 表单参数
@@ -854,7 +856,9 @@ export default {
     /** 查询菜单列表 */
     getList() {
       this.loading = true;
-
+      if (this.queryParams.btnGroupName) {
+        this.queryParams.btnParentId = null;
+      }
       listBtn(this.queryParams).then((response) => {
         let res = this.setRootBtnKey(response.rows);
         this.btnList = res;

zkqy-ui/src/views/system/tenant/index.vue

@@ -187,7 +187,6 @@
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          
         </template>
       </el-table-column>
     </el-table>
@@ -668,35 +667,39 @@ export default {
               tenantId: this.fromTenantId,
               dataSource: this.dataSourceForm,
             };
-            bindDatasource(query).then((response) => {
-              if (response.code == 200) {
-                let data = {
-                  userName: this.dataSourceForm.tenantAccount,
-                  nickName: this.currentTenantInfo.tenantName,
-                  userType: "01",
-                  tenantId: this.currentTenantInfo.tenantId,
-                  password: "123456",
-                };
-                createTenant(data)
-                  .then(async (res) => {
-                    if (res.code == 200) {
-                      let resp = await initTenantMenuData(
-                        this.currentTenantInfo.tenantId
-                      );
-                      if ((resp.code = 200)) {
-                        this.$modal.msgSuccess("新增成功");
-                        this.dataSourceOpen = false;
+            bindDatasource(query)
+              .then((response) => {
+                if (response.code == 200) {
+                  let data = {
+                    userName: this.dataSourceForm.tenantAccount,
+                    nickName: this.currentTenantInfo.tenantName,
+                    userType: "01",
+                    tenantId: this.currentTenantInfo.tenantId,
+                    password: "123456",
+                  };
+                  createTenant(data)
+                    .then(async (res) => {
+                      if (res.code == 200) {
+                        let resp = await initTenantMenuData(
+                          this.currentTenantInfo.tenantId
+                        );
+                        if ((resp.code = 200)) {
+                          this.$modal.msgSuccess("新增成功");
+                          this.dataSourceOpen = false;
 
-                        // loading.close();
-                        this.getList();
+                          // loading.close();
+                          this.getList();
+                        }
                       }
-                    }
-                  })
-                  .finally(() => {
-                    this.dialogLoading = fasle;
-                  });
-              }
-            });
+                    })
+                    .finally(() => {
+                      this.dialogLoading = fasle;
+                    });
+                }
+              })
+              .finally(() => {
+                this.dialogLoading = fasle;
+              });
           }
         }
       });

zkqy-ui/src/views/tableMange/components/DataFilterPanel.vue

@@ -160,7 +160,7 @@ export default {
     // 编辑条件回调
     editHandler() {},
     // 删除条件回调
-    delHandler() {
+    delHandler(index) {
       this.tableData.splice(index, 1);
     },
     // 获取数据筛选条件