yue 3 هفته پیش
والد
کامیت
687fe5e085

+ 11 - 8
SourceCode/IntelligentRailwayCosting/app/config.yml

@@ -5,7 +5,7 @@ app:
   use_version: true
   source_path: './temp_files'
   task_api_url: 'http://127.0.0.1:5123/api/v1'
-  task_max_projects: 1 # 最大项目数同时运行
+  task_max_projects: 3 # 最大项目数同时运行
   task_interval: 60  # 秒
 db:
   # SQL Server 配置
@@ -25,25 +25,28 @@ db:
     trusted_connection: false
   sqlserver_mian_2020:
     driver: '{ODBC Driver 17 for SQL Server}'
-#    server: 192.168.0.81,1433
-    server: shvber.com,5030
+    server: 192.168.0.81,1433
+#    server: shvber.com,5030
     username: iwb
     password: 123456Qsc
     database: Iwb_RecoData2020
     trusted_connection: false
   Iwb_RailwayCosting:
     driver: '{ODBC Driver 17 for SQL Server}'
-#    server: 192.168.0.81,1433
-    server: shvber.com,5030
+    server: 192.168.0.81,1433
+#    server: shvber.com,5030
     username: iwb
     password: 123456Qsc
     database: iwb_railway_costing_v1
     trusted_connection: false
   Iwb_RecoData2024:
     driver: '{ODBC Driver 17 for SQL Server}'
-    server: shvber.com,50535
-    username: sa
-    password: Iwb2017
+    server: 192.168.0.81,1433
+    username: iwb
+    password: 123456Qsc
+#    server: shvber.com,50535
+#    username: sa
+#    password: Iwb2017
     database: Iwb_RecoData2024
     trusted_connection: false
   Iwb_RecoData2020:

+ 3 - 3
SourceCode/IntelligentRailwayCosting/app/routes/project_task.py

@@ -159,7 +159,7 @@ def start_task(task_id:int):
             return ResponseBase.error(msg)
         else:
             msg = '运行成功'
-        return ResponseBase.success(msg)
+        return ResponseBase.success(message=msg)
     except Exception as e:
         return ResponseBase.error(f'运行失败:{str(e)}')
 
@@ -170,7 +170,7 @@ def cancel_task(task_id:int):
         msg = task_service.cancel_run_task(task_id)
         if msg:
             return ResponseBase.error(msg)
-        return ResponseBase.success('启动采集成功')
+        return ResponseBase.success(message='启动采集成功')
     except Exception as e:
         return ResponseBase.error(f'启动采集失败:{str(e)}')
 
@@ -182,6 +182,6 @@ def start_send(task_id:int):
         msg = task_service.start_send_task(task_id)
         if msg:
             return ResponseBase.error(msg)
-        return ResponseBase.success('启动发送成功')
+        return ResponseBase.success(message='启动发送成功')
     except Exception as e:
         return ResponseBase.error(f'启动发送失败:{str(e)}')

+ 1 - 1
SourceCode/IntelligentRailwayCosting/app/views/static/base/js/utils.js

@@ -30,7 +30,7 @@ function IwbAjax(opt) {
 			console.log(`[${opt.url}]返回数据:`, data)
 			if (data.success) {
 				if (opt.isAlert) {
-					MsgSuccess(data.message||'操作成功')
+					MsgSuccess('操作成功',data.message||"")
 				}
 				if (opt.table) {
 					IwbTable($(opt.table))