调整上线

.env.production

@@ -8,10 +8,10 @@ VITE_PUBLIC_PATH = /admin/
 VITE_APP_ENV = 'production'
 
 # 多麦管理系统/生产环境
-VITE_APP_BASE_API = 'https://www.saas.duomailianmeng.com/srv'
+VITE_APP_BASE_API = 'https://www.saas.duomailianmeng.com/service/admin'
 
 # 接口前缀
-# VITE_GLOB_API_URL_PREFIX = /srv
+# VITE_GLOB_API_URL_PREFIX = /admin
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

src/api/monitor/job.js

@@ -1,9 +1,9 @@
 import request from '@/utils/request'
 
-// 查询定时任务调度列表
+// 查询定时任务列表
 export function listJob(query) {
   return request({
-    url: '/monitor/job/list',
+    url: '/task/list',
     method: 'get',
     params: query
   })
@@ -17,55 +17,49 @@ export function getJob(jobId) {
   })
 }
 
-// 新增定时任务调度
+// 添加定时任务
 export function addJob(data) {
   return request({
-    url: '/monitor/job',
+    url: '/task/add',
     method: 'post',
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     data: data
   })
 }
 
-// 修改定时任务调度
+// 修改定时任务
 export function updateJob(data) {
   return request({
-    url: '/monitor/job',
+    url: '/task/update',
-    method: 'put',
+    method: 'post',
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     data: data
   })
 }
 
-// 删除定时任务调度
+// 删除定时任务
 export function delJob(jobId) {
   return request({
-    url: '/monitor/job/' + jobId,
+    url: `/task/remove/${jobId}`,
     method: 'delete'
   })
 }
 
-// 任务状态修改
+// 切换定时任务状态
-export function changeJobStatus(jobId, status) {
+export function changeJobStatus(query) {
-  const data = {
-    jobId,
-    status
-  }
   return request({
-    url: '/monitor/job/changeStatus',
+    url: '/task/changeStatus',
-    method: 'put',
+    method: 'get',
-    data: data
+    params: query
   })
 }
 
 
-// 定时任务立即执行一次
+// 立即运行任务
-export function runJob(jobId, jobGroup) {
+export function runJob(query) {
-  const data = {
-    jobId,
-    jobGroup
-  }
   return request({
-    url: '/monitor/job/run',
+    url: '/task/run',
-    method: 'put',
+    method: 'get',
-    data: data
+    params: query
   })
 }

src/router/index.js

@@ -84,6 +84,76 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    name: "System",
+    path: "/system",
+    hidden: true,
+    redirect: "noRedirect",
+    component: Layout,
+    alwaysShow: true,
+    meta: {
+        title: "系统管理",
+        icon: "system",
+        noCache: false,
+        link: null
+    },
+    children: [
+        {
+            name: "User",
+            path: "user",
+            hidden: false,
+            component: () => import('@/views/system/user/index'),
+            meta: {
+                title: "用户管理",
+                icon: "user",
+                noCache: false,
+                link: null
+            }
+        },
+       
+        {
+            name: "Apply",
+            path: "apply",
+            hidden: false,
+            component: () => import('@/views/system/apply/index'),
+            meta: {
+                title: "提报管理",
+                icon: "excel",
+                noCache: false,
+                link: null
+            }
+        }
+    ]
+},
+{
+    name: "Monitor",
+    path: "/monitor",
+    hidden: true,
+    redirect: "noRedirect",
+    component: Layout,
+    alwaysShow: true,
+    meta: {
+        title: "系统监控",
+        icon: "monitor",
+        noCache: false,
+        link: null
+    },
+    children: [
+       
+        {
+            name: "Job",
+            path: "job",
+            hidden: true,
+            component: () => import('@/views/monitor/job/index'),
+            meta: {
+                title: "定时任务",
+                icon: "job",
+                noCache: false,
+                link: null
+            }
+        }
+    ]
+}
   
 ]
 

src/store/modules/permission.js

@@ -7,8 +7,8 @@ import InnerLink from '@/layout/components/InnerLink'
 
 // 匹配views里面所有的.vue文件
 const modules = import.meta.glob('./../../views/**/*.vue')
-const route2r = '[{"name":"System","path":"/system","hidden":false,"redirect":"noRedirect","component":"Layout","alwaysShow":true,"meta":{"title":"系统管理","icon":"system","noCache":false,"link":null},"children":[{"name":"User","path":"user","hidden":false,"component":"system/user/index","meta":{"title":"用户管理","icon":"user","noCache":false,"link":null}},{"name":"Role","path":"role","hidden":false,"component":"system/role/index","meta":{"title":"角色管理","icon":"peoples","noCache":false,"link":null}},{"name":"Apply","path":"apply","hidden":false,"component":"system/apply/index","meta":{"title":"提报管理","icon":"excel","noCache":false,"link":null}},{"name":"Menu","path":"menu","hidden":false,"component":"system/menu/index","meta":{"title":"菜单管理","icon":"tree-table","noCache":false,"link":null}},{"name":"Dept","path":"dept","hidden":false,"component":"system/dept/index","meta":{"title":"部门管理","icon":"tree","noCache":false,"link":null}},{"name":"Post","path":"post","hidden":false,"component":"system/post/index","meta":{"title":"岗位管理","icon":"post","noCache":false,"link":null}},{"name":"Dict","path":"dict","hidden":false,"component":"system/dict/index","meta":{"title":"字典管理","icon":"dict","noCache":false,"link":null}},{"name":"Config","path":"config","hidden":false,"component":"system/config/index","meta":{"title":"参数设置","icon":"edit","noCache":false,"link":null}},{"name":"Notice","path":"notice","hidden":false,"component":"system/notice/index","meta":{"title":"通知公告","icon":"message","noCache":false,"link":null}},{"name":"Log","path":"log","hidden":false,"redirect":"noRedirect","component":"ParentView","alwaysShow":true,"meta":{"title":"日志管理","icon":"log","noCache":false,"link":null},"children":[{"name":"Operlog","path":"operlog","hidden":false,"component":"monitor/operlog/index","meta":{"title":"操作日志","icon":"form","noCache":false,"link":null}},{"name":"Logininfor","path":"logininfor","hidden":false,"component":"monitor/logininfor/index","meta":{"title":"登录日志","icon":"logininfor","noCache":false,"link":null}}]}]},{"name":"Monitor","path":"/monitor","hidden":false,"redirect":"noRedirect","component":"Layout","alwaysShow":true,"meta":{"title":"系统监控","icon":"monitor","noCache":false,"link":null},"children":[{"name":"Online","path":"online","hidden":false,"component":"monitor/online/index","meta":{"title":"在线用户","icon":"online","noCache":false,"link":null}},{"name":"Job","path":"job","hidden":false,"component":"monitor/job/index","meta":{"title":"定时任务","icon":"job","noCache":false,"link":null}},{"name":"Druid","path":"druid","hidden":false,"component":"monitor/druid/index","meta":{"title":"数据监控","icon":"druid","noCache":false,"link":null}},{"name":"Server","path":"server","hidden":false,"component":"monitor/server/index","meta":{"title":"服务监控","icon":"server","noCache":false,"link":null}},{"name":"Cache","path":"cache","hidden":false,"component":"monitor/cache/index","meta":{"title":"缓存监控","icon":"redis","noCache":false,"link":null}},{"name":"CacheList","path":"cacheList","hidden":false,"component":"monitor/cache/list","meta":{"title":"缓存列表","icon":"redis-list","noCache":false,"link":null}}]},{"name":"Tool","path":"/tool","hidden":false,"redirect":"noRedirect","component":"Layout","alwaysShow":true,"meta":{"title":"系统工具","icon":"tool","noCache":false,"link":null},"children":[{"name":"Build","path":"build","hidden":false,"component":"tool/build/index","meta":{"title":"表单构建","icon":"build","noCache":false,"link":null}},{"name":"Gen","path":"gen","hidden":false,"component":"tool/gen/index","meta":{"title":"代码生成","icon":"code","noCache":false,"link":null}},{"name":"Swagger","path":"swagger","hidden":false,"component":"tool/swagger/index","meta":{"title":"系统接口","icon":"swagger","noCache":false,"link":null}}]}]'
+const routerjson = '[{"name":"System","path":"/system","hidden":false,"redirect":"noRedirect","component":"Layout","alwaysShow":true,"meta":{"title":"系统管理","icon":"system","noCache":false,"link":null},"children":[{"name":"User","path":"user","hidden":false,"component":"system/user/index","meta":{"title":"用户管理","icon":"user","noCache":false,"link":null}},{"name":"Apply","path":"apply","hidden":false,"component":"system/apply/index","meta":{"title":"提报管理","icon":"excel","noCache":false,"link":null}}]},{"name":"Monitor","path":"/monitor","hidden":false,"redirect":"noRedirect","component":"Layout","alwaysShow":true,"meta":{"title":"系统监控","icon":"monitor","noCache":false,"link":null},"children":[{"name":"Job","path":"job","hidden":false,"component":"monitor/job/index","meta":{"title":"定时任务","icon":"job","noCache":false,"link":null}}]}]'
-const dwx = JSON.parse(route2r)
+const dwx = JSON.parse(routerjson)
 const usePermissionStore = defineStore(
   'permission',
   {

src/views/monitor/job/index.vue

@@ -2,32 +2,17 @@
    <div class="app-container">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
          <el-form-item label="任务名称" prop="jobName">
-            <el-input
+            <el-input v-model="queryParams.jobName" placeholder="请输入任务名称" clearable style="width: 200px"
-               v-model="queryParams.jobName"
+               @keyup.enter="handleQuery" />
-               placeholder="请输入任务名称"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
          </el-form-item>
-         <el-form-item label="任务组名" prop="jobGroup">
+         <!-- <el-form-item label="任务组名" prop="jobGroup">
             <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable style="width: 200px">
-               <el-option
+               <el-option v-for="dict in sys_job_group" :key="dict.value" :label="dict.label" :value="dict.value" />
-                  v-for="dict in sys_job_group"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
             </el-select>
-         </el-form-item>
+         </el-form-item> -->
-         <el-form-item label="任务状态" prop="status">
+         <el-form-item label="任务状态" prop="jobStatus">
-            <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable style="width: 200px">
+            <el-select v-model="queryParams.jobStatus" placeholder="请选择任务状态" clearable style="width: 200px">
-               <el-option
+               <el-option v-for="dict in jobStatusList" :key="dict.value" :label="dict.label" :value="dict.value" />
-                  v-for="dict in sys_job_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
             </el-select>
          </el-form-item>
          <el-form-item>
@@ -38,104 +23,68 @@
 
       <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
-            <el-button
+            <el-button type="primary" plain icon="Plus" @click="handleAdd">新增定时任务</el-button>
-               type="primary"
-               plain
-               icon="Plus"
-               @click="handleAdd"
-               v-hasPermi="['monitor:job:add']"
-            >新增</el-button>
          </el-col>
          <el-col :span="1.5">
-            <el-button
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-               type="success"
+               v-hasPermi="['monitor:job:edit']">修改</el-button>
-               plain
-               icon="Edit"
-               :disabled="single"
-               @click="handleUpdate"
-               v-hasPermi="['monitor:job:edit']"
-            >修改</el-button>
          </el-col>
          <el-col :span="1.5">
-            <el-button
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-               type="danger"
+               v-hasPermi="['monitor:job:remove']">删除</el-button>
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['monitor:job:remove']"
-            >删除</el-button>
          </el-col>
          <el-col :span="1.5">
-            <el-button
+            <el-button type="warning" plain icon="Download" @click="handleExport"
-               type="warning"
+               v-hasPermi="['monitor:job:export']">导出</el-button>
-               plain
-               icon="Download"
-               @click="handleExport"
-               v-hasPermi="['monitor:job:export']"
-            >导出</el-button>
          </el-col>
          <el-col :span="1.5">
-            <el-button
+            <el-button type="info" plain icon="Operation" @click="handleJobLog"
-               type="info"
+               v-hasPermi="['monitor:job:query']">日志</el-button>
-               plain
-               icon="Operation"
-               @click="handleJobLog"
-               v-hasPermi="['monitor:job:query']"
-            >日志</el-button>
          </el-col>
          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
       <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
+         <el-table-column label="任务ID" width="100" align="center" prop="id" />
          <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
-         <el-table-column label="任务组名" align="center" prop="jobGroup">
+
+         <!-- <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" /> -->
+         <el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
+         <el-table-column label="任务状态" align="center">
             <template #default="scope">
-               <dict-tag :options="sys_job_group" :value="scope.row.jobGroup" />
+               <el-switch v-model="scope.row.jobStatus" :active-value="0" :inactive-value="1"
+                  @change="handleStatusChange(scope.row)"></el-switch>
             </template>
          </el-table-column>
-         <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
+         <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true">
-         <el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
-         <el-table-column label="状态" align="center">
             <template #default="scope">
-               <el-switch
+               {{ scope.row.createTime.replace("T", " ") }}
-                  v-model="scope.row.status"
-                  active-value="0"
-                  inactive-value="1"
-                  @change="handleStatusChange(scope.row)"
-               ></el-switch>
             </template>
          </el-table-column>
          <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-tooltip content="修改" placement="top">
+               <el-tooltip content="修改任务" placement="top">
-                  <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['monitor:job:edit']"></el-button>
+                  <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
                </el-tooltip>
-               <el-tooltip content="删除" placement="top">
+               <el-tooltip content="删除任务" placement="top">
-                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['monitor:job:remove']"></el-button>
+                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
                </el-tooltip>
-               <el-tooltip content="执行一次" placement="top">
+               <el-tooltip content="立即运行" placement="top">
-                  <el-button link type="primary" icon="CaretRight" @click="handleRun(scope.row)" v-hasPermi="['monitor:job:changeStatus']"></el-button>
+                  <el-button link type="primary" icon="CaretRight" @click="handleRun(scope.row)"></el-button>
                </el-tooltip>
-               <el-tooltip content="任务详细" placement="top">
+               <!-- <el-tooltip content="任务详细" placement="top">
-                  <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['monitor:job:query']"></el-button>
+                  <el-button link type="primary" icon="View" @click="handleView(scope.row)"></el-button>
                </el-tooltip>
                <el-tooltip content="调度日志" placement="top">
-                  <el-button link type="primary" icon="Operation" @click="handleJobLog(scope.row)" v-hasPermi="['monitor:job:query']"></el-button>
+                  <el-button link type="primary" icon="Operation" @click="handleJobLog(scope.row)"></el-button>
-               </el-tooltip>
+               </el-tooltip> -->
             </template>
          </el-table-column>
       </el-table>
 
-      <pagination
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-         v-show="total > 0"
+         v-model:limit="queryParams.pageSize" @pagination="getList" />
-         :total="total"
-         v-model:page="queryParams.pageNum"
-         v-model:limit="queryParams.pageSize"
-         @pagination="getList"
-      />
 
       <!-- 添加或修改定时任务对话框 -->
       <el-dialog :title="title" v-model="open" width="820px" append-to-body>
@@ -146,24 +95,12 @@
                      <el-input v-model="form.jobName" placeholder="请输入任务名称" />
                   </el-form-item>
                </el-col>
-               <el-col :span="12">
-                  <el-form-item label="任务分组" prop="jobGroup">
-                     <el-select v-model="form.jobGroup" placeholder="请选择">
-                        <el-option
-                           v-for="dict in sys_job_group"
-                           :key="dict.value"
-                           :label="dict.label"
-                           :value="dict.value"
-                        ></el-option>
-                     </el-select>
-                  </el-form-item>
-               </el-col>
                <el-col :span="24">
-                  <el-form-item prop="invokeTarget">
+                  <el-form-item prop="jobClazz">
                      <template #label>
                         <span>
-                           调用方法
+                           任务全类名
-                           <el-tooltip placement="top">
+                           <!-- <el-tooltip placement="top">
                               <template #content>
                                  <div>
                                     Bean调用示例：ryTask.ryParams('ry')
@@ -172,10 +109,10 @@
                                  </div>
                               </template>
                <el-icon><question-filled /></el-icon>
-                           </el-tooltip>
+               </el-tooltip> -->
                         </span>
                      </template>
-                     <el-input v-model="form.invokeTarget" placeholder="请输入调用目标字符串" />
+                     <el-input v-model="form.jobClazz" placeholder="请输入任务全类名" />
                   </el-form-item>
                </el-col>
                <el-col :span="24">
@@ -193,31 +130,24 @@
                <el-col :span="24" v-if="form.jobId !== undefined">
                   <el-form-item label="状态">
                      <el-radio-group v-model="form.status">
-                        <el-radio
+                        <el-radio v-for="dict in sys_job_status" :key="dict.value" :value="dict.value">{{ dict.label
-                           v-for="dict in sys_job_status"
+                           }}</el-radio>
-                           :key="dict.value"
-                           :value="dict.value"
-                        >{{ dict.label }}</el-radio>
                      </el-radio-group>
                   </el-form-item>
                </el-col>
                <el-col :span="12">
-                  <el-form-item label="执行策略" prop="misfirePolicy">
+                  <el-form-item label="备注" prop="remark">
-                     <el-radio-group v-model="form.misfirePolicy">
+                     <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" :rows="3" />
-                        <el-radio-button value="1">立即执行</el-radio-button>
-                        <el-radio-button value="2">执行一次</el-radio-button>
-                        <el-radio-button value="3">放弃执行</el-radio-button>
-                     </el-radio-group>
                   </el-form-item>
                </el-col>
-               <el-col :span="12">
+               <!-- <el-col :span="12">
                   <el-form-item label="是否并发" prop="concurrent">
                      <el-radio-group v-model="form.concurrent">
                         <el-radio-button value="0">允许</el-radio-button>
                         <el-radio-button value="1">禁止</el-radio-button>
                      </el-radio-group>
                   </el-form-item>
-               </el-col>
+               </el-col> -->
             </el-row>
          </el-form>
          <template #footer>
@@ -251,7 +181,7 @@
                   <el-form-item label="下次执行时间：">{{ parseTime(form.nextValidTime) }}</el-form-item>
                </el-col>
                <el-col :span="24">
-                  <el-form-item label="调用目标方法：">{{ form.invokeTarget }}</el-form-item>
+                  <el-form-item label="调用目标方法：">{{ form.jobClazz }}</el-form-item>
                </el-col>
                <el-col :span="12">
                   <el-form-item label="任务状态：">
@@ -289,7 +219,7 @@ import { listJob, getJob, delJob, addJob, updateJob, runJob, changeJobStatus } f
 import Crontab from '@/components/Crontab'
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_job_group, sys_job_status } = proxy.useDict("sys_job_group", "sys_job_status");
+// const { sys_job_group, sys_job_status } = proxy.useDict("sys_job_group", "sys_job_status");
 
 const jobList = ref([]);
 const open = ref(false);
@@ -303,6 +233,10 @@ const title = ref("");
 const openView = ref(false);
 const openCron = ref(false);
 const expression = ref("");
+const jobStatusList = ref([
+   { label: '正常', value: 0 },
+   { label: '暂停', value: 1 }
+])
 
 const data = reactive({
    form: {},
@@ -310,12 +244,11 @@ const data = reactive({
       pageNum: 1,
       pageSize: 10,
       jobName: undefined,
-    jobGroup: undefined,
+      jobStatus: undefined
-    status: undefined
    },
    rules: {
       jobName: [{ required: true, message: "任务名称不能为空", trigger: "blur" }],
-    invokeTarget: [{ required: true, message: "调用目标字符串不能为空", trigger: "blur" }],
+      jobClazz: [{ required: true, message: "任务全类名不能为空", trigger: "blur" }],
       cronExpression: [{ required: true, message: "cron执行表达式不能为空", trigger: "change" }]
    }
 });
@@ -326,8 +259,18 @@ const { queryParams, form, rules } = toRefs(data);
 function getList() {
    loading.value = true;
    listJob(queryParams.value).then(response => {
-    jobList.value = response.rows;
+      console.log("定时任务列表", response)
-    total.value = response.total;
+      jobList.value = response.data.records.map(item => {
+         item._isInit = true;
+         return item;
+      });
+      // 数据加载完成后，延迟将_isInit设为false
+      setTimeout(() => {
+         jobList.value.forEach(item => {
+            item._isInit = false;
+         });
+      }, 0);
+      total.value = response.data.total;
       loading.value = false;
    });
 }
@@ -346,14 +289,12 @@ function cancel() {
 /** 表单重置 */
 function reset() {
    form.value = {
-    jobId: undefined,
+      id: undefined,
       jobName: undefined,
       jobGroup: undefined,
-    invokeTarget: undefined,
+      jobClazz: undefined,
       cronExpression: undefined,
-    misfirePolicy: 1,
+      remark: undefined,
-    concurrent: 1,
-    status: "0"
    };
    proxy.resetForm("jobRef");
 }
@@ -396,22 +337,31 @@ function handleCommand(command, row) {
 
 // 任务状态修改
 function handleStatusChange(row) {
-  let text = row.status === "0" ? "启用" : "停用";
+   if (row._isInit) return;
+   const params = {
+      jobId: row.id,
+      targetStatus: row.jobStatus
+   };
+   let text = row.jobStatus === 0 ? "启用" : "停用";
    proxy.$modal.confirm('确认要"' + text + '""' + row.jobName + '"任务吗?').then(function () {
-    return changeJobStatus(row.jobId, row.status);
+      return changeJobStatus(params);
    }).then(() => {
       proxy.$modal.msgSuccess(text + "成功");
    }).catch(function () {
-    row.status = row.status === "0" ? "1" : "0";
+      row.jobStatus = row.jobStatus === 0 ? 1 : 0;
    });
 }
 
-/* 立即执行一次 */
+/* 立即运行任务 */
 function handleRun(row) {
-  proxy.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗?').then(function () {
+   const params = {
-    return runJob(row.jobId, row.jobGroup);
+      jobId: row.id
+   };
+   proxy.$modal.confirm('确认要立即运行"' + row.jobName + '"任务吗?').then(function () {
+      return runJob(params);
    }).then(() => {
-    proxy.$modal.msgSuccess("执行成功");})
+      proxy.$modal.msgSuccess("执行成功");
+   })
       .catch(() => { });
 }
 
@@ -443,6 +393,7 @@ function handleJobLog(row) {
 /** 新增按钮操作 */
 function handleAdd() {
    reset();
+   form.value.id = undefined;
    open.value = true;
    title.value = "添加任务";
 }
@@ -450,19 +401,21 @@ function handleAdd() {
 /** 修改按钮操作 */
 function handleUpdate(row) {
    reset();
-  const jobId = row.jobId || ids.value;
+   form.value.id = row.id;
-  getJob(jobId).then(response => {
+   form.value.jobName = row.jobName;
-    form.value = response.data;
+   form.value.jobClazz = row.jobClazz;
+   form.value.jobStatus = row.jobStatus;
+   form.value.cronExpression = row.cronExpression;
+   form.value.remark = row.remark;
    open.value = true;
    title.value = "修改任务";
-  });
 }
-
+const currentJobId = ref(null);
 /** 提交按钮 */
 function submitForm() {
    proxy.$refs["jobRef"].validate(valid => {
       if (valid) {
-      if (form.value.jobId != undefined) {
+         if (form.value.id != undefined) {
             updateJob(form.value).then(response => {
                proxy.$modal.msgSuccess("修改成功");
                open.value = false;
@@ -481,7 +434,7 @@ function submitForm() {
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const jobIds = row.jobId || ids.value;
+   const jobIds = row.id || ids.value;
    proxy.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项?').then(function () {
       return delJob(jobIds);
    }).then(() => {

src/views/system/apply/index.vue

@@ -146,7 +146,7 @@ import { onMounted } from "vue";
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+// const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 const applyList = ref([]);
 
 const roleList = ref([]);

src/views/system/user/index.vue

@@ -17,18 +17,17 @@
         <pane size="84">
           <el-col>
             <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="团长名称" prop="nickname">
+              <el-form-item label="团长名称" prop="colonelName">
-                <el-input v-model="queryParams.nickname" placeholder="请输入团长名称" clearable style="width: 240px"
+                <el-input v-model="queryParams.colonelName" placeholder="请输入团长名称" clearable style="width: 240px"
                   @keyup.enter="handleQuery" />
               </el-form-item>
-              <el-form-item label="手机号码" prop="phonenumber">
+              <el-form-item label="手机号码" prop="phone">
-                <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
+                <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable style="width: 240px"
                   @keyup.enter="handleQuery" />
               </el-form-item>
               <el-form-item label="状态" prop="status">
                 <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-                  <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
+                  <el-option v-for="dict in statusList" :key="dict.value" :label="dict.label" :value="dict.value" />
-                    :value="dict.value" />
                 </el-select>
               </el-form-item>
               <el-form-item label="创建时间" style="width: 308px">
@@ -72,8 +71,19 @@
                 :show-overflow-tooltip="true" />
               <!-- <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" /> -->
               <el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible"
-                width="120" />
+                width="200" />
-              <el-table-column label="状态" align="center" key="memberStatus" v-if="columns[5].visible">
+              <el-table-column label="服务费比例" align="center" key="serviceRate" prop="serviceRate"
+                v-if="columns[4].visible" width="200">
+                <template #default="scope">
+                  <span>{{ scope.row.serviceRate }}%</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="自动提报状态" align="center" key="status" prop="status" v-if="columns[5].visible">
+                <template #default="scope">
+                  <span>{{ scope.row.autoApply ? '开启' : '关闭' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="账号状态" align="center" key="memberStatus" v-if="columns[5].visible">
                 <template #default="scope">
                   <el-switch v-model="scope.row.memberStatus" :active-value="0" :inactive-value="1"
                     @change="handleStatusChange(scope.row)"></el-switch>
@@ -85,7 +95,8 @@
                   <span>{{ parseTime(scope.row.createTime) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+              <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width"
+                v-if="false">
                 <template #default="scope">
                   <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
                     <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -244,7 +255,7 @@ import "splitpanes/dist/splitpanes.css"
 const router = useRouter();
 const appStore = useAppStore()
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
+// const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
 
 const userList = ref([]);
 const open = ref(false);
@@ -262,6 +273,10 @@ const enabledDeptOptions = ref(undefined);
 const initPassword = ref(undefined);
 const postOptions = ref([]);
 const roleOptions = ref([]);
+const statusList = ref([
+  { value: 0, label: "正常" },
+  { value: 1, label: "停用" }
+]);
 /*** 用户导入参数 */
 const upload = reactive({
   // 是否显示弹出层（用户导入）
@@ -333,7 +348,8 @@ const filterNode = (value, data) => {
 /** 查询用户列表 */
 function getList() {
   loading.value = true;
-  listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
+  console.log('查询', queryParams.value)
+  listUser(proxy.addDateRange(queryParams.value)).then(res => {
     loading.value = false;
     userList.value = res.data.records.map(item => {
       item._isInit = true;
@@ -379,6 +395,9 @@ function handleNodeClick(data) {
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1;
+  console.log('搜索', dateRange.value)
+  queryParams.value.startDate = dateRange.value[0];
+  queryParams.value.endDate = dateRange.value[1];
   getList();
 };