From a46348ad86f5df632c58bed5866a70f798b75d5e Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 12 四月 2024 17:33:37 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 37 ++++--------------
src/api/monitor/job.js | 6 +-
src/views/patient/LinkQuestionnaire/index.vue | 2
src/views/repositoryai/templateku/configurat/index.vue | 7 ++-
src/api/AiCentre/SingleTask.js | 12 +++++-
src/views/patient/LinkMission/index.vue | 2
src/views/patient/propaganda/particty.vue | 48 +++++++++++++----------
7 files changed, 55 insertions(+), 59 deletions(-)
diff --git a/src/api/AiCentre/SingleTask.js b/src/api/AiCentre/SingleTask.js
index fe373e5..f896576 100644
--- a/src/api/AiCentre/SingleTask.js
+++ b/src/api/AiCentre/SingleTask.js
@@ -19,7 +19,7 @@
// 鏌ヨ瀹ｆ暀浠诲姟璇︽儏鍒楄〃
export function gethetaskinfo(Id) {
return request({
- url: "/smartor/hetask/getInfo" + Id,
+ url: "/smartor/hetask/getInfo/" + Id,
method: "get",
});
}
@@ -55,11 +55,19 @@
data: data,
});
}
- // 鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟
+ // 鍗曚竴浠诲姟鍒楄〃
export function getTasklist(data) {
return request({
url: "/smartor/taskcall/list",
method: "post",
data: data,
});
+ }
+ // 鍗曚竴浠诲姟璇︽儏
+ export function getTaskInfo(data) {
+ return request({
+ url: "/smartor/taskcall/queryTaskByCondition",
+ method: "post",
+ data: data,
+ });
}
\ No newline at end of file
diff --git a/src/api/monitor/job.js b/src/api/monitor/job.js
index c05c420..41d76bc 100644
--- a/src/api/monitor/job.js
+++ b/src/api/monitor/job.js
@@ -50,7 +50,7 @@
status
}
return request({
- url: '/monitor/job/changeStatus/edit',
+ url: '/monitor/job/changeStatus',
method: 'post',
data: data
})
@@ -64,8 +64,8 @@
jobGroup
}
return request({
- url: '/monitor/job/run/edit',
+ url: '/monitor/job/run',
method: 'post',
data: data
})
-}
\ No newline at end of file
+}
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 19d89c1..e8de0b2 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -173,7 +173,7 @@
prop="nickName"
/>
- <el-table-column
+ <!-- <el-table-column
label="瀹℃牳浜�"
align="center"
key="create_by"
@@ -191,7 +191,7 @@
<template slot-scope="scope">
<span>{{ parseTime(scope.row.create_time) }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
label="鍒涘缓浜�"
align="center"
@@ -251,25 +251,12 @@
size="medium"
type="text"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:user:edit']"
><span class="button-xq"
><i class="el-icon-s-data"></i>璇︽儏</span
></el-button
>
- <!-- <el-button
- size="medium"
- type="text"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:user:edit']"
- ><span class="button-bb"
- ><i class="el-icon-s-order"></i>鎶ヨ〃</span
- ></el-button
- > -->
- <el-button
- size="medium"
- type="text"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:user:edit']"
+
+ <el-button size="medium" type="text" @click="deletefn(scope.row)"
><span class="button-sc"
><i class="el-icon-delete"></i>鍒犻櫎</span
></el-button
@@ -352,7 +339,7 @@
resetUserPwd,
changeUserStatus,
} from "@/api/system/user";
-import { getTasklist, getlibrarylist } from "@/api/AiCentre/index";
+import { getTasklist, getTaskInfo } from "@/api/AiCentre/index";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -527,7 +514,7 @@
// 鏌ヨ鍙傛暟
topqueryParams: {
pageNum: 1,
- pageSize: 1000,
+ pageSize: 10,
userName: undefined,
tagid: undefined,
topic: undefined,
@@ -721,9 +708,6 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- // this.$router.push({
- // path: "/followvisit/tasklist/FollowupDetails/",
- // });
this.$router.push({
path: "/followvisit/particty",
query: { type: this.tasktopic },
@@ -731,16 +715,13 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
- // const userId = row.userId || this.ids;
- // this.$router.push({
- // path: "/followvisit/tasklist/FollowupDetails/",
- // query: { id: row.id },
- // });
this.$router.push({
path: "/followvisit/particty",
- query: { type: 2 },
+ query: { type: row.type, id: row.taskid },
});
},
+ // 鍒犻櫎浠诲姟
+ deletefn(){},
/** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
handleResetPwd(row) {
this.$prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
diff --git a/src/views/patient/review/index.vue b/src/views/patient/LinkMission/index.vue
similarity index 84%
copy from src/views/patient/review/index.vue
copy to src/views/patient/LinkMission/index.vue
index 7f55ecf..d9967cc 100644
--- a/src/views/patient/review/index.vue
+++ b/src/views/patient/LinkMission/index.vue
@@ -1,5 +1,5 @@
<template>
- <div>澶嶆煡閫氱煡</div>
+ <div>瀹ｆ暀閾炬帴椤�</div>
</template>
<script>
diff --git a/src/views/patient/review/index.vue b/src/views/patient/LinkQuestionnaire/index.vue
similarity index 84%
rename from src/views/patient/review/index.vue
rename to src/views/patient/LinkQuestionnaire/index.vue
index 7f55ecf..782bec9 100644
--- a/src/views/patient/review/index.vue
+++ b/src/views/patient/LinkQuestionnaire/index.vue
@@ -1,5 +1,5 @@
<template>
- <div>澶嶆煡閫氱煡</div>
+ <div>闂嵎閾炬帴椤�</div>
</template>
<script>
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index e0b184f..d659f2a 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -69,6 +69,7 @@
>
<el-time-picker
is-range
+ arrow-control
@change="changeTime"
v-model="time1"
range-separator="鑷�"
@@ -85,6 +86,7 @@
>
<el-time-picker
is-range
+ arrow-control
@change="changeTime"
v-model="time2"
range-separator="鑷�"
@@ -101,6 +103,7 @@
>
<el-time-picker
is-range
+ arrow-control
@change="changeTime"
v-model="time3"
range-separator="鑷�"
@@ -641,7 +644,7 @@
getlibrarylist,
getFollowuplist,
getQtemplatelist,
- edithetask,
+ getTaskInfo,
addhetask,
gethetaskinfo,
delhetaskinfo,
@@ -824,8 +827,7 @@
created() {
this.id = this.$route.query.id;
this.form.type = this.$route.query.type;
- this.Addsubtask();
- this.Getsubtask();
+ this.Getdetails();
this.Acquisitiontype();
},
@@ -952,13 +954,12 @@
console.log(filteredArray, "瀛樺墠鍙橀噺");
this.form.textParam = this.convertFormat2ToFormat1(filteredArray);
-
if (this.form.id) {
this.form.isoperation = 2;
} else {
this.form.isoperation = 1;
}
- Editsingletask(this.form).then((response) => {
+ Editsingletask(this.form).then((res) => {
if (res.code == 200) {
if (this.form.id) {
this.$modal.msgSuccess("鏂板鎴愬姛");
@@ -1077,12 +1078,22 @@
Acknowledgereference() {
this.quote = true;
},
- // 鏂板瀛愪换鍔�
- Addsubtask() {
- this.topqueryParams.pguid = 2;
- // addsvr_prjtask(this.topqueryParams).then((res) => {
- // console.log(res);
- // });
+ // 鑾峰彇璇︽儏
+ Getdetails() {
+ if (this.id) {
+ getTaskInfo({ taskid: this.id }).then((res) => {
+ const filteredArray = "";
+ if (res.code == 200) {
+ this.form = res.data;
+ this.checkList = this.form.serviceform.split(",");
+ filteredArray = this.convertFormat1ToFormat2(this.form.textParam);
+ this.variableList = this.transitionList.concat(filteredArray);
+ } else {
+ this.$modal.msgError(res.code);
+ }
+ console.log(res);
+ });
+ }
},
// 鏂板娲鹃�佹偅鑰�
AddDispatchpatients() {
@@ -1093,16 +1104,6 @@
this.dialogVisiblepatient = false;
},
- // 鏌ヨ瀛愪换鍔″垪琛�
- Getsubtask() {
- this.topqueryParams.pguid = 2;
- console.log(this.topqueryParams, "aa");
- messagelistpatient(this.topqueryParams).then((res) => {
- this.userList = res.rows;
- this.total = res.total;
- console.log(this.userList, "ss");
- });
- },
// 鍙橀噺---------------
variableEdit(index, row) {
console.log(index, row);
@@ -1168,6 +1169,11 @@
}
}
this.form.sendTimeslot = combinedData;
+ // 灞曠ず鏁版嵁涓存椂瀛樺偍鏃ユ湡銆佹棭銆佷腑銆佹櫄
+ this.form.sendlimitabegin = this.daytime.join(",");
+ this.form.sendlimitaend = this.time1.join(",");
+ this.form.sendlimitnbegin = this.time2.join(",");
+ this.form.sendlimitnend = this.time3.join(",");
console.log(combinedData, "combinedData");
},
},
diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue
index 0182187..1971fbf 100644
--- a/src/views/repositoryai/templateku/configurat/index.vue
+++ b/src/views/repositoryai/templateku/configurat/index.vue
@@ -1197,7 +1197,7 @@
this.getaddtopiclist();
},
getaddtopiclist() {
- console.log(11);
+ console.log(12);
this.drawer = true;
getverbaltricklist(this.queryParams).then((res) => {
this.loading = false;
@@ -1236,11 +1236,12 @@
this.topicobj = row;
} else {
getverbaltrick({ id: row.id }).then((res) => {
- if (res.code == 200) {
+ if (res.data) {
this.topicobj = res.data;
console.log(res.data, "topicobj");
} else {
- console.log("娌℃壘鍒�");
+ this.topicobj = row;
+ console.log("娌℃壘鍒伴�夐」锛岃鏌ョ湅闂搴撴槸鍚︽纭厤缃�");
}
});
}
--
Gitblit v1.9.3