代码提交

vue-fastapi-backend/module_admin/dao/datasec_config_dao.py

@@ -1,6 +1,6 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
-from sqlalchemy import update, delete
+from sqlalchemy import update, delete,desc
 from datetime import datetime, time
 from typing import List
 
@@ -33,7 +33,8 @@ class DatasecConfigDao:
                 datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time(0, 0, 0)),
                 datetime.combine(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)),
             ) if query_object.begin_time and query_object.end_time else True
-        ).order_by(DatasecConfig.onum)
+        )    .order_by(desc(DatasecConfig.create_time))
+
 
         return await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
 

vue-fastapi-frontend/src/views/meta/metatask/index.vue

@@ -117,7 +117,7 @@
               plain
               icon="edit"
               
-              :disabled="singleOne"
+              :disabled="multiple"
               @click="handleUpdate"
               v-hasPermi="['meta:metatask:edit']"
               >修改</el-button
@@ -338,7 +338,6 @@
   <el-button 
     link 
     type="primary" 
-    :disabled="row.status === 'ONLINE'" 
     icon="Edit" 
     @click="handleUpdate(row)" 
     v-hasPermi="['meta:metatask:edit']"
@@ -482,7 +481,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="数据库" prop="dbCode">
               <el-input
@@ -494,7 +493,7 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
           <el-col :span="24">
            <div style="color: #909399; font-size: 13px; margin-bottom: 4px;margin-left: 20px;">
@@ -899,28 +898,57 @@ const handleLogRow = (row) => {
 };
 
 const submitForm = async () => {
-
   proxy.$refs["taskForm"].validate(async (valid) => {
-    if (valid) {
+    if (!valid) return;
-      const submitForm = { ...form.value };
-      submitForm.dbCode = clickNode.value.type;
-      submitForm.dbRName = clickNode.value.name;
-      if (submitForm.metataskId !== undefined) {
 
-        await updatemetatask(submitForm);
+    const submitData = { ...form.value };
-        proxy.$modal.msgSuccess("修改成功");
+
+
+    const isOnline = submitData.status === 'ONLINE';
+    const metataskId = submitData.metataskId;
+
+    // ⭐ ONLINE 状态：先确认 → 下线 → 再保存
+    if (isOnline) {
+      try {
+        await proxy.$modal.confirm(
+          "该任务当前为【上线状态】，提交修改将导致任务下线，是否确认继续？"
+        );
+
+        // 1️⃣ 先下线
+        await downOrUpmetatask(String(metataskId), "OFFLINE");
+
+
+        submitData.status='OFFLINE'
+        // 2️⃣ 再保存
+        await updatemetatask(submitData);
+
+        proxy.$modal.msgSuccess("修改成功，任务已下线");
         open.value = false;
         getList();
+      } catch (e) {
+        // 用户取消 或 接口异常
+        return;
+      }
+    } 
+    // ⭐ 非 ONLINE：正常保存
+    else {
+      if (metataskId !== undefined) {
+        await updatemetatask(submitData);
+        proxy.$modal.msgSuccess("修改成功");
       } else {
-        await addmetatask(submitForm);
+            submitData.dbRName = clickNode.value.name;
+    submitData.dbCode = clickNode.value.type;
+        await addmetatask(submitData);
         proxy.$modal.msgSuccess("新增成功");
+      }
+
       open.value = false;
       getList();
     }
-    }
   });
 };
 
+
 const handleDelete = async (row) => {
   let isDelete = true;
   if(row.metataskId!=null){

vue-fastapi-frontend/src/views/meta/metatask/secConfig.vue

@@ -61,8 +61,7 @@
               type="success"
               plain
               icon="edit"
-              
+              :disabled="single"
-              :disabled="singleOne"
               @click="handleUpdate"
               v-hasPermi="['meta:metatask:edit']"
               >修改</el-button
@@ -252,7 +251,6 @@
   <el-button 
     link 
     type="primary" 
-    :disabled="row.status === 'ONLINE'" 
      icon="Edit" 
     @click="handleUpdate(row)" 
     v-hasPermi="['meta:metatask:edit']"
@@ -665,27 +663,50 @@ const handleLogRow = (row) => {
 };
 
 const submitForm = async () => {
-
   proxy.$refs["taskForm"].validate(async (valid) => {
-    if (valid) {
+    if (!valid) return;
-      const submitForm = { ...form.value };
+
+    const submitData = { ...form.value };
+    const isEdit = submitData.onum !== undefined;
+    const isOnline = submitData.status === 'ONLINE';
+
+    try {
+      // ⭐ 编辑 + ONLINE：保存时提示 → 下线 → 再保存
+      if (isEdit && isOnline) {
+        await proxy.$modal.confirm(
+          "该任务当前为【上线状态】，提交修改将导致任务下线，是否确认继续？"
+        );
+
+        // 1️⃣ 先下线
+        await downOrUpmetatask(String(submitData.onum), "OFFLINE");
 
-      if (submitForm.onum !== undefined) {
+        // 2️⃣ 同步状态后保存
+        submitData.status = 'OFFLINE';
+        await editDatasecConfig(submitData);
 
-        await editDatasecConfig(submitForm);
+        proxy.$modal.msgSuccess("修改成功，任务已下线");
+      }
+      // ⭐ 编辑 + 非 ONLINE
+      else if (isEdit) {
+        await editDatasecConfig(submitData);
         proxy.$modal.msgSuccess("修改成功");
-        open.value = false;
+      }
-        getList();
+      // ⭐ 新增
-      } else {
+      else {
-        await addDatasecConfig(submitForm);
+        await addDatasecConfig(submitData);
         proxy.$modal.msgSuccess("新增成功");
+      }
+
       open.value = false;
       getList();
-      }
+    } catch (e) {
+      // 用户取消确认 / 接口异常 → 不继续
+      return;
     }
   });
 };
 
+
 const handleDelete = async (row) => {
   let isDelete = true;
   if(row.onum!=null){

vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue

@@ -618,10 +618,7 @@ function openEditDialog(row) {
     ElMessage.warning('请选择一条记录进行编辑')
     return
   }
-    if (row.status !== 'OFFLINE') {
+   
-    ElMessage.warning('仅支持下线状态的任务进行修改')
-    return
-  }
   title.value = '编辑标签任务'
   Object.assign(form, row)
   loadRightTable(row.onum)
@@ -648,30 +645,56 @@ function handleRowDelete(row) {
     .catch(() => {})
 }
 
-function submitForm() {
+const submitForm = async () => {
-  bizFormRef.value.validate(async valid => {
+  bizFormRef.value.validate(async (valid) => {
-    if (!valid) return
+    if (!valid) return;
-    let tabonums=[]
+
-    rightTableData.value.forEach(item=>{
+    // 组装提交数据
-      tabonums.push(item.onum)
+    const tabonums = rightTableData.value.map(item => item.onum);
+    const submitData = {
+      ...form,
+      tabOnumList: tabonums
+    };
+
+    const isEdit = !!submitData.onum;
+    const isOnline = submitData.status === 'ONLINE';
 
-    })
-    console.log( rightTableData.value,"sss")
-    const submitData = { ...form,tabOnumList:tabonums }
     try {
-      if (title.value.includes('新增')) {
+      // ⭐ 编辑 + ONLINE：保存时确认 → 下线 → 保存
-        await addTaskBizConfig(submitData)
+      if (isEdit && isOnline) {
-        ElMessage.success('新增成功')
+        await proxy.$modal.confirm(
-      } else {
+          '该任务当前为【上线状态】，保存修改将导致任务下线，是否确认继续？'
-        await updateTaskBizConfig(submitData)
+        );
-        ElMessage.success('编辑成功')
+
+        // 1️⃣ 先下线
+        await downOrUpmetatask(submitData.onum, 'OFFLINE');
+
+        // 2️⃣ 状态同步为 OFFLINE 再保存
+        submitData.status = 'OFFLINE';
+        await updateTaskBizConfig(submitData);
+
+        proxy.$modal.msgSuccess('修改成功，任务已下线');
       }
-      open.value = false
+      // ⭐ 编辑 + 非 ONLINE
-      getList()
+      else if (isEdit) {
-    } catch {
+        await updateTaskBizConfig(submitData);
+        proxy.$modal.msgSuccess('修改成功');
       }
-  })
+      // ⭐ 新增
-}
+      else {
+        await addTaskBizConfig(submitData);
+        proxy.$modal.msgSuccess('新增成功');
+      }
+
+      open.value = false;
+      getList();
+    } catch (e) {
+      // 用户取消确认 or 接口异常 → 直接终止
+      return;
+    }
+  });
+};
+
 
 function handleClose(done) {
   bizFormRef.value.resetFields()