修改日志时间过滤bug，错误原因改为返回信息

src/layout/header/BredCum.vue

@@ -14,9 +14,9 @@ const getBredcurm = ()=>{
     let mached = route.matched.filter(item => item.meta && item.meta.title);
     //判断第一个是否是首页,如果不是，构造一个
     const first = mached[0];
-    if(first && first.path !== '/dashboard'){
+    if(first && first.path !== '/xyunLog'){
         //构造一个
-        mached = [{path: '/dashboard',meta:{title:'首页'}} as any].concat(mached);
+        mached = [{path: '/xyunLog',meta:{title:'首页'}} as any].concat(mached);
     }
     //设置面包屑导航数据
     tabs.value = mached;

src/layout/tabs/Tabs.vue

@@ -28,7 +28,7 @@ const setActiveTab = () => {
 }
 //删除选项卡
 const removeTab = (targetName: string) => {
-    if (targetName === '/dashboard') return;
+    if (targetName === '/xyunLog') return;
     //选项卡数据列表
     const tabs = tabsList.value;
     //当前激活的选项卡

src/router/index.ts

 import { createRouter, createWebHashHistory, RouteRecordRaw } from "vue-router";
-import {store} from '@/store'
 import Layout from '@/layout/index.vue'
 const routes: Array<RouteRecordRaw> = [
     {
         path: '/',
         component: Layout,
-        redirect: '/dashboard',
-        children: [
-            {
-                path: '/dashboard',
-                component: () => import('@/views/dashboard/index.vue'),
-                name: 'dashboard',
-                meta: {
-                    title: '首页',
-                    icon: '#icondashboard'
-                }
-            },
-        ]
+        redirect: '/xyunLog',
     },
     {
         path: '/login',

src/services/api/log/logApi.ts → src/services/api/systemApi/log/logApi.ts

-import { request } from "../config";
+import { request } from "../../config";
 
 // 查询日志
 export function getQueryxyunLog(

src/services/api/scheduledTask/scheduledTaskAPI.ts → src/services/api/systemApi/scheduledTask/scheduledTaskAPI.ts

-import { request } from "../config";
+import { request } from "../../config";
 
 // 定时任务列表
 export function getQuartzJobList() {
@@ -9,11 +9,11 @@ export function getQuartzJobList() {
 }
 
 // 定时任务创建
-export function addQuartzJob(data?: any) {
+export function addQuartzJob(inVo: any) {
   return request({
     url: "/api/quartz/job/create",
     method: "post",
-    data,
+    data: inVo,
   });
 }
 
@@ -27,11 +27,11 @@ export function deleteQuartzJob(parameters: { id: any }) {
 }
 
 // 定时任务编辑
-export function putQuartzJob(parameters: any) {
+export function putQuartzJob(inVo: any, id: number) {
   return request({
     url: "/api/quartz/job/update",
     method: "put",
-    data: parameters,
+    data: { inVo, id },
   });
 }
 

src/services/api/synchronization/synchronizationAPI.ts → src/services/api/systemApi/synchronization/synchronizationAPI.ts

-import { request } from "../config";
+import { request } from "../../config";
 
 // 查询金蝶参数
 export function getSynchronization() {

src/services/api/tableRelation/tableRelationAPI.ts → src/services/api/systemApi/tableRelation/tableRelationAPI.ts

-import { request } from "../config";
+import { request } from "../../config";
 
 // 查询表关系
 export function getTableRelation(pageNo?: number, pageSize?: number) {

src/store/modules/menu.ts

@@ -17,7 +17,7 @@ export const state: MenuState = {
     collapse: false,
     menuList: [
         {
-            path: '/dashboard',
+            path: '/xyunLog',
             component: "Layout",
             meta: {
                 title: "首页",

src/views/exception/404.vue

@@ -3,7 +3,7 @@
     <div class="content">
       <h1>404</h1>
       <div class="desc">抱歉，您访问的页面不存在</div>
-      <div class="action">
+      <div class="action">首页
         <el-button type="primary" @click="handleToHome">返回首页</el-button>
       </div>
     </div>

src/views/system/synchronizationManage.vue

@@ -96,7 +96,7 @@ import {
   getStart,
   getManual,
   getOff,
-} from "@/services/api/synchronization/synchronizationAPI";
+} from "@/services/api/systemApi/synchronization/synchronizationAPI";
 import { ref, reactive, onMounted } from "vue";
 import { ElMessage } from "element-plus";
 import type { FormInstance, FormRules } from "element-plus";

src/views/system/tableConfigData/useXyunLog.ts

 import { ref, onMounted } from "vue";
-import { getQueryxyunLog } from "@/services/api/log/logApi";
+import { getQueryxyunLog } from "@/services/api/systemApi/log/logApi";
 
 export const useXyunLogTableList = () => {
   const tableList = ref([]);

src/views/system/tableRelation.vue

@@ -15,7 +15,7 @@
         setScrollLeft="left"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="tableName" label="表名称" width="155"/>
+        <el-table-column prop="tableName" label="表名称" width="230" sortable/>
         <el-table-column prop="tableHeader" label="表名" align="center" width="220"/>
         <el-table-column prop="tableDate" label="表头日期字段" align="center" width="155"/>
         <el-table-column
@@ -119,7 +119,7 @@
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button @click="dialogVisible = false">关闭</el-button>
+        <el-button @click="onClose">关闭</el-button>
         <el-button type="primary" @click="onConfirm(tableRelationRef)"
           >确认</el-button
         >
@@ -130,13 +130,13 @@
 
 <script lang="ts" setup>
 import { reactive, ref } from "vue";
-import { ElMessageBox, FormInstance, FormRules, ElMessage } from "element-plus";
+import { ElMessageBox, FormInstance, ElMessage } from "element-plus";
 import {
   getTableRelation,
   addTableRelation,
   editTableRelation,
   deleteTableRelation,
-} from "@/services/api/tableRelation/tableRelationAPI";
+} from "@/services/api/systemApi/tableRelation/tableRelationAPI";
 
 const tableRelationRef = ref<FormInstance>();
 const tableRelationList = ref([]);
@@ -179,8 +179,13 @@ const handleCurrentChange = (val: number) => {
   init(val, pageSizes.value);
 };
 const handleClose = () => {
+  tableRelationRef.value?.resetFields()
   dialogVisible.value = false;
 };
+const onClose = () => {
+  tableRelationRef.value?.resetFields()
+  dialogVisible.value = false;
+}
 const modifyTableRelation = (scope: any) => {
   tableRelationForm.value = scope;
   modifyId.value = scope.id;
@@ -224,8 +229,7 @@ const onConfirm = (formEl: FormInstance | undefined) => {
             if (res.code !== 200)
               return ElMessage({ type: "error", message: "添加失败！" });
             init();
-            ElMessage({ type: "error", message: "添加成功！" });
-            formEl.resetFields();
+            ElMessage({ type: "success", message: "添加成功！" });
           }
         );
       } else {
@@ -236,8 +240,7 @@ const onConfirm = (formEl: FormInstance | undefined) => {
             if (res.code !== 200)
               return ElMessage({ type: "error", message: "修改失败！" });
             init();
-            ElMessage({ type: "error", message: "修改成功！" });
-            formEl.resetFields();
+            ElMessage({ type: "success", message: "修改成功！" });
           }
         );
       }
@@ -245,6 +248,8 @@ const onConfirm = (formEl: FormInstance | undefined) => {
       console.log("校验失败", fields);
     }
   });
+  console.log(tableRelationRef.value?.resetFields);
+  formEl.resetFields()
   dialogVisible.value = false;
 };
 </script>

src/views/system/xyunLog.vue

 <template>
   <div class="router">
     <el-card>
-      <el-space
-        direction="vertical"
-        alignment="align-items: left"
-        style="margin-top: 30px"
-      >
+      <el-space direction="vertical" alignment="align-items: left" style="margin-top: 30px">
         <!-- 过滤条件框 -->
         <div>
           <el-form :model="filterForm">
             <el-space :size="40">
               <el-form-item label="选择时间：">
-                <el-date-picker
-                  v-model="dateTime"
-                  type="datetimerange"
-                  range-separator="至"
-                  start-placeholder="开始时间"
-                  end-placeholder="结束时间"
-                  @change="dateChange"
-                />
+                <el-date-picker v-model="dateTime" type="datetimerange" range-separator="至" start-placeholder="开始时间"
+                  end-placeholder="结束时间" @change="dateChange" />
               </el-form-item>
               <el-form-item label="名称：" width="60px">
-                <el-input
-                  v-model="filterForm.name"
-                  placeholder="请输入名称"
-                  clearable
-                />
+                <el-input v-model="filterForm.name" placeholder="请输入名称" clearable />
               </el-form-item>
               <el-form-item label="内容" width="60px">
-                <el-input
-                  v-model="filterForm.content"
-                  placeholder="请输入内容"
-                  clearable
-                />
+                <el-input v-model="filterForm.content" placeholder="请输入内容" clearable />
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" @click="handleScreen">筛选</el-button>
@@ -45,35 +27,18 @@
       <el-divider />
 
       <!-- 表格 -->
-      <el-table
-        v-loading="loading"
-        :data="tableList"
-        border
-        stripe
-        style="width: 100%"
-        @selection-change="handleSelectionChange"
-        @filter-change="filterChange"
-      >
+      <el-table v-loading="loading" :data="tableList" border stripe style="width: 100%"
+        @selection-change="handleSelectionChange" @filter-change="filterChange">
         <!-- <el-table-column type="selection" width="55" /> -->
         <el-table-column type="index" :index="indexMethod(1)" />
-        <el-table-column
-          prop="flag"
-          label="同步状态"
-          :filters="[
-            { text: '同步成功', value: '1' },
-            { text: '同步失败', value: '0' },
-          ]"
-          :filter-multiple="false"
-          filter-placement="bottom-end"
-          align="center"
-          width="155px"
-        >
+        <el-table-column prop="flag" label="同步状态" :filters="[
+          { text: '同步成功', value: '1' },
+          { text: '同步失败', value: '0' },
+        ]" :filter-multiple="false" filter-placement="bottom-end" align="center" width="155px">
           <template #default="scope">
-            <el-tag
-              :type="scope.row.flag === 1 ? 'success' : ''"
-              disable-transitions
-              >{{ scope.row.flag === 1 ? "同步成功" : "同步失败" }}</el-tag
-            >
+            <el-tag :type="scope.row.flag === 1 ? 'success' : ''" disable-transitions>{{ scope.row.flag === 1 ? "同步成功" :
+                "同步失败"
+            }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="name" label="名称" align="center" />
@@ -81,79 +46,21 @@
         <el-table-column prop="createTime" label="创建时间" align="center" />
         <el-table-column label="操作" align="center" width="155px">
           <template #default="scope">
-            <el-button
-              link
-              type="primary"
-              size="small"
-              @click="handleDetails(scope.row)"
-              >详情</el-button
-            >
+            <el-button link type="primary" size="small" @click="handleDetails(scope.row)">详情</el-button>
           </template>
         </el-table-column>
       </el-table>
 
       <div style="margin-top: 20px">
-        <el-pagination
-          v-model:currentPage="currentPage"
-          v-model:page-size="pageSize"
-          :page-sizes="[10, 20, 30]"
-          layout="->, total,sizes, prev, pager, next, jumper"
-          :total="total"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          hide-on-single-page
-        />
+        <el-pagination v-model:currentPage="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 20, 30]"
+          layout="->, total,sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange"
+          @current-change="handleCurrentChange" hide-on-single-page />
       </div>
     </el-card>
-
-    <!-- 添加对话框 -->
-    <!-- <el-dialog v-model="dialogVisible" title="添加日志" width="40%">
-      <el-form
-        :model="addForm"
-        label-position="right"
-        label-width="100px"
-        style="padding: 0 5%"
-      >
-        <el-form-item label="名称：">
-          <el-input v-model="addForm.name" placeholder="请输入名称：" />
-        </el-form-item>
-        <el-form-item label="同步状态：">
-          <el-input v-model="addForm.flag" placeholder="请输入同步状态：" />
-        </el-form-item>
-        <el-form-item label="内容：">
-          <el-input v-model="addForm.content" placeholder="请输入内容：" />
-        </el-form-item>
-        <el-form-item label="请求参数：">
-          <el-input
-            type="textarea"
-            v-model="addForm.data"
-            placeholder="请输入请求参数："
-          />
-        </el-form-item>
-        <el-form-item label="同步时长：">
-          <el-input v-model="addForm.costime" placeholder="请输入同步时长：" />
-        </el-form-item>
-        <el-form-item label="错误原因：">
-          <el-input v-model="addForm.message" placeholder="请输入错误原因：" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="cancelVisible">取消</el-button>
-          <el-button type="primary" @click="confirmVisible">确认</el-button>
-        </span>
-      </template>
-    </el-dialog> -->
-
     <!-- 详情页面 -->
     <el-dialog v-model="visible" title="详情页面" width="40%">
-      <el-form
-        :model="detailForm"
-        label-position="left"
-        label-width="100px"
-        style="padding: 0 5%"
-        :disabled="(disabled = true)"
-      >
+      <el-form :model="detailForm" label-position="left" label-width="100px" style="padding: 0 5%"
+        :disabled="(disabled = true)">
         <el-form-item label="名称：">
           <el-input v-model="detailForm.name" placeholder="名称为" />
         </el-form-item>
@@ -164,12 +71,7 @@
           <el-input v-model="detailForm.content" placeholder="内容为" />
         </el-form-item>
         <el-form-item label="请求参数：">
-          <el-input
-            type="textarea"
-            :rows="5"
-            v-model="detailForm.data"
-            placeholder="请求参数为"
-          />
+          <el-input type="textarea" :rows="5" v-model="detailForm.data" placeholder="请求参数为" />
         </el-form-item>
         <el-form-item label="同步时长：">
           <el-input v-model="detailForm.costime" placeholder="同步时长为为" />
@@ -177,13 +79,8 @@
         <el-form-item label="创建时间：">
           <el-input v-model="detailForm.createTime" placeholder="创建时间为" />
         </el-form-item>
-        <el-form-item label="错误原因：">
-          <el-input
-            type="textarea"
-            :rows="4"
-            v-model="detailForm.message"
-            placeholder="错误原因为"
-          />
+        <el-form-item label="返回信息：">
+          <el-input type="textarea" :rows="4" v-model="detailForm.message" placeholder="返回信息为" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -199,7 +96,7 @@
 import { ref, nextTick } from "vue";
 import moment from "moment";
 import { ElTable } from "element-plus";
-import { getQueryxyunLog } from "@/services/api/log/logApi";
+import { getQueryxyunLog } from "@/services/api/systemApi/log/logApi";
 import { useXyunLogTableList } from "./tableConfigData/useXyunLog";
 
 interface List {
@@ -308,6 +205,8 @@ const page = (
         tableList.value = res.data.records;
         total.value = res.data.total;
       }
+      filterForm.value.dateFrom = ''
+      filterForm.value.dateTo = ''
     });
 };
 // 每页新条数
@@ -337,4 +236,5 @@ const handleCurrentChange = (val: number) => {
   );
 };
 </script>
-<style scoped></style>
+<style scoped>
+</style>