From 48145f787eda81815f653ad21161a60e89b6a303 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 13 十一月 2024 16:41:32 +0800
Subject: [PATCH] 2024.11.13
---
service/taskservice.js | 80 ++++++++++++++++++++++++---------------
1 files changed, 49 insertions(+), 31 deletions(-)
diff --git a/service/taskservice.js b/service/taskservice.js
index 231dc8b..5290f73 100644
--- a/service/taskservice.js
+++ b/service/taskservice.js
@@ -1,10 +1,10 @@
-const Multipart = require('../utils/Multipart.min')
-const $f = require('./baserequest')
-const util = require('../utils/util')
+const Multipart = require('../utils/Multipart.min');
+const $f = require('./baserequest');
+const util = require('../utils/util');
-const baseUrl = "https://fyami.com.cn:447"
-// const baseUrl = "http://47.100.191.150:9005"
-const imgUrl = baseUrl + '/images/'
+const baseUrl = $f.spUrl;
+// const baseUrl = 'http://192.168.0.138:8082';
+const imgUrl = $f.spPicUrl;
module.exports = {
imgUrl,
@@ -13,9 +13,9 @@
getTopTask: function (fun) {
let cb = {
url: `/task/alltask/0`,
- }
- Object.assign(cb, fun)
- $f.get(cb, baseUrl)
+ };
+ Object.assign(cb, fun);
+ $f.get(cb, baseUrl);
},
//鑾峰彇瀛愪换鍔$粺璁�
@@ -25,19 +25,35 @@
params: {
topTaskId: topTaskId,
sceneTypeId: sceneTypeId,
- }
- }
- Object.assign(cb, fun)
- $f.get(cb, baseUrl)
+ },
+ };
+ Object.assign(cb, fun);
+ $f.get(cb, baseUrl);
},
//鑾峰彇瀛愪换鍔¤鎯�
getSubtask: function (stGuid, fun) {
let cb = {
url: `/subtask/${stGuid}`,
+ };
+ Object.assign(cb, fun);
+ $f.get(cb, baseUrl);
+ },
+
+ //鏍规嵁鍦烘櫙id鑾峰彇瀛愪换鍔¤鎯�
+ getSubtaskByScene: function ({ sceneId, startTime, endTime }, fun) {
+ let cb = {
+ url: `/subtask/byScene/`,
+ params: { sceneId: sceneId },
+ };
+ if (startTime) {
+ cb.params.startTime = startTime;
}
- Object.assign(cb, fun)
- $f.get(cb, baseUrl)
+ if (endTime) {
+ cb.params.endTime = endTime;
+ }
+ Object.assign(cb, fun);
+ $f.get(cb, baseUrl);
},
//鑾峰彇瀛愪换鍔¢棶棰�
@@ -46,32 +62,34 @@
url: `/problemlist/subtask`,
params: {
stGuid: stGuid,
- }
- }
- Object.assign(cb, fun)
- $f.get(cb, baseUrl)
+ },
+ };
+ Object.assign(cb, fun);
+ $f.get(cb, baseUrl);
},
//涓婁紶鏁存敼鍥剧墖
uploadChangePic: function (pId, paths, fun) {
- const fields = [{
- name: 'problemId',
- value: pId
- }]
- const files = []
+ const fields = [
+ {
+ name: 'problemId',
+ value: pId,
+ },
+ ];
+ const files = [];
paths.forEach(p => {
files.push({
name: 'images',
- filePath: p
- })
+ filePath: p,
+ });
});
console.log(files);
let p = new Multipart({
fields,
- files
- }).submit(baseUrl + `/problemlist/changeProblem`)
+ files,
+ }).submit(baseUrl + `/problemlist/changeProblem`);
p.then(res => {
- fun.success(res)
- })
+ fun.success(res);
+ });
},
-}
\ No newline at end of file
+};
--
Gitblit v1.9.3