From fdf8b9cc7995c8d2022ac512c48a7567f6d2af9a Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 05 七月 2024 16:15:37 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/patient/PatientChart.vue | 2
src/views/outsideChainxj.vue | 38 ++++++++++---------
dist.zip | 0
vue.config.js | 2
src/App.vue | 2
src/views/outsideChain.vue | 11 ++++-
src/views/patient/propaganda/Missioncreation.vue | 2 +
src/views/patient/propaganda/particty.vue | 36 +++++++++--------
src/api/AiCentre/external.js | 2
9 files changed, 54 insertions(+), 41 deletions(-)
diff --git a/dist.zip b/dist.zip
index 820214c..cffa2f1 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/App.vue b/src/App.vue
index 798390b..baa6d41 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,7 +2,7 @@
<div id="app">
<router-view />
<theme-picker />
- <Assistant />
+ <Assistant v-if="" />
</div>
</template>
diff --git a/src/api/AiCentre/external.js b/src/api/AiCentre/external.js
index 23a414a..59a65d4 100644
--- a/src/api/AiCentre/external.js
+++ b/src/api/AiCentre/external.js
@@ -3,7 +3,7 @@
// 澶栭摼鑾峰彇闅忚鎴栭棶鍗疯鎯�
export function getExternalfollowup(data) {
return request({
- url: "/smartor/serviceTask/getScriptInfoByCondition",
+ url: "/smartor/servicetask/getScriptInfoByCondition",
// url: "/smartor/servicetask/getScriptInfoByCondition",
method: "post",
data: data
diff --git a/src/views/outsideChain.vue b/src/views/outsideChain.vue
index 15503eb..8ae89d1 100644
--- a/src/views/outsideChain.vue
+++ b/src/views/outsideChain.vue
@@ -1,7 +1,7 @@
<template>
<div class="questionnaire">
<div class="CONTENT">
- <div class="title">鏆戞湡闂嵎</div>
+ <div class="title">闅忚闂嵎</div>
<div class="preview-left">
<!-- 鍗曢�� -->
<div
@@ -76,13 +76,20 @@
getQuestionnaire() {
let taskid = this.$route.query.param1;
let patid = this.$route.query.param2;
+ console.log(taskid, "taskid");
+ console.log(patid, "patid");
// let taskid =
// "OFp7tn/B6x7IzKJetvGWHdSWBj7msRlnlj6am9dyuHTH6sEt4uBbVCUXs5kcF/e4O2W6vqHf2Bz9K3/evbYDmw==";
// let patid =
// "CVk0j8O86AeCqhV5WPsBBYDg9fec0wDoDlP9imYK4wDBNIkxywZzMJEGlPagOxnq6qr2WYZo0U8MUGWRGnq8ZA==";
- this.taskid = this.decrypt(taskid);
+ // this.taskid = this.decrypt(taskid);
this.patid = this.decrypt(patid);
+ this.taskid = taskid;
+ this.patid = patid;
+ console.log(this.taskid, "this.taskid");
+ console.log(this.patid, "this.patid");
+
// this.$modal.msgSuccess("鐢ㄦ埛id涓�" + this.patid);
// this.$modal.msgSuccess("浠诲姟id涓�" + this.taskid);
let taskids = this.encrypt(this.taskid);
diff --git a/src/views/outsideChainxj.vue b/src/views/outsideChainxj.vue
index 75873a9..3f213a6 100644
--- a/src/views/outsideChainxj.vue
+++ b/src/views/outsideChainxj.vue
@@ -50,27 +50,29 @@
methods: {
// 鑾峰彇鏁版嵁
getQuestionnaire() {
- let taskid = this.$route.query.param1;
- let patid = this.$route.query.param2;
- // let taskid =
- // "OFp7tn/B6x7IzKJetvGWHdSWBj7msRlnlj6am9dyuHTH6sEt4uBbVCUXs5kcF/e4O2W6vqHf2Bz9K3/evbYDmw==";
- // let patid =
- // "CVk0j8O86AeCqhV5WPsBBYDg9fec0wDoDlP9imYK4wDBNIkxywZzMJEGlPagOxnq6qr2WYZo0U8MUGWRGnq8ZA==";
- this.taskid = this.decrypt(taskid);
- this.patid = this.decrypt(patid);
+ // let taskid = this.$route.query.param1;
+ // let patid = this.$route.query.param2;
+ // // let taskid =
+ // // "OFp7tn/B6x7IzKJetvGWHdSWBj7msRlnlj6am9dyuHTH6sEt4uBbVCUXs5kcF/e4O2W6vqHf2Bz9K3/evbYDmw==";
+ // // let patid =
+ // // "CVk0j8O86AeCqhV5WPsBBYDg9fec0wDoDlP9imYK4wDBNIkxywZzMJEGlPagOxnq6qr2WYZo0U8MUGWRGnq8ZA==";
+ // this.taskid = this.decrypt(taskid);
+ // this.patid = this.decrypt(patid);
- // this.$modal.msgSuccess("鐢ㄦ埛id涓�" + this.patid);
- // this.$modal.msgSuccess("浠诲姟id涓�" + this.taskid);
- let taskids = this.encrypt(this.taskid);
- let patids = this.encrypt(this.patid);
- getExternalfollowup({ param1: taskids, param2: patids }).then((res) => {
- if (res.code == 200) {
- this.questionList = res.rows;
- }
- });
+ // // this.$modal.msgSuccess("鐢ㄦ埛id涓�" + this.patid);
+ // // this.$modal.msgSuccess("浠诲姟id涓�" + this.taskid);
+ // let taskids = this.encrypt(this.taskid);
+ // let patids = this.encrypt(this.patid);
+ // getExternalfollowup({ param1: taskids, param2: patids }).then((res) => {
+ // if (res.code == 200) {
+ // this.questionList = res.rows;
+ // }
+ // });
// 涓存椂鑾峰彇鏁版嵁
axios
- .get("http://localhost:8089/profile/upload/show/娴嬭瘯/娴嬭瘯.html")
+ .get(
+ "http://116.62.18.175:8096/profile/upload/show/鎸傚彿闇�鐭�/鎸傚彿闇�鐭�.html"
+ )
.then((response) => {
console.log(response.data, "鏁版嵁"); // 杈撳嚭鑾峰彇鍒扮殑鏂囦欢鍐呭
this.richText = response.data;
diff --git a/src/views/patient/patient/PatientChart.vue b/src/views/patient/patient/PatientChart.vue
index 0ef70bd..615b771 100644
--- a/src/views/patient/patient/PatientChart.vue
+++ b/src/views/patient/patient/PatientChart.vue
@@ -739,7 +739,7 @@
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
- allhosp: "1",
+ allhosp: "0",
pageSize: 10,
idcardno: undefined,
name: undefined,
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index 6c05224..cfd8047 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -897,6 +897,8 @@
"绾夸笅锛堢焊璐級",
"绾夸笂锛堢煭淇�/閽夐拤鐨勬枃鏈棰戯級",
"瀹ｆ暀閾炬帴",
+ "寰俊鍏紬鍙�",
+ "鐭俊",
];
getlibrarylist(queryParams).then((response) => {
this.userList = response.rows;
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 58b9660..5254501 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -46,7 +46,7 @@
<el-input
style="width: 220px"
:disabled="true"
- v-model="form.templateName"
+ v-model="form.templatename"
placeholder="鐐瑰嚮鍙充晶閫夋嫨"
/> </el-form-item
></el-col>
@@ -727,13 +727,13 @@
{ label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "updateBy" },
],
tableLabelcy: [
- { label: "闅忚鍚嶇О", width: "", prop: "templateName" },
+ { label: "闅忚鍚嶇О", width: "", prop: "templatename" },
{ label: "闅忚璁″垝", width: "", prop: "impTemplate" },
{ label: "淇敼鏃ユ湡", width: "", prop: "uploadTime" },
{ label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "updateBy" },
],
tableLabelfz: [
- { label: "閫氱煡鍚嶇О", width: "", prop: "templateName" },
+ { label: "閫氱煡鍚嶇О", width: "", prop: "templatename" },
{ label: "閫氱煡妯＄増", width: "", prop: "impTemplate" },
{ label: "淇敼鏃ユ湡", width: "", prop: "uploadTime" },
{ label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "updateBy" },
@@ -766,6 +766,8 @@
{ label: "鏀粯瀹�", value: 7 },
{ label: "鏅鸿兘灏忕▼搴�", value: 8 },
{ label: "閽夐拤", value: 9 },
+ { label: "绾夸笅锛堢焊璐級", value: 10 },
+ { label: "绾夸笂锛堢煭淇�/閽夐拤鐨勬枃鏈�侀棶鍗烽摼鎺ワ級", value: 11 },
],
// 鏃堕棿澶勭悊
daytime: [], //鏃ユ湡
@@ -849,7 +851,7 @@
form: {
patTaskRelevances: [],
sendType: 1,
- templateName: "",
+ templatename: "",
templateid: null,
libtemplateid: null,
},
@@ -919,14 +921,14 @@
};
this.currenttype = this.$route.query.type;
console.log(this.currenttype, "1");
- // 鍑洪櫌銆侀棬璇娿�佷笓鐥呴殢璁�
- this.title = "闅忚鍐呭鍒楄〃";
- this.tableLabel = this.tableLabelmz;
- this.checkboxlist = ["绾歌川", "澶氬獟浣�", "鐢佃瘽", "寰俊鍏紬鍙�"];
- getFollowuplist(queryParams).then((response) => {
- this.userList = response.rows;
- this.total = response.total;
- });
+ // 鍑洪櫌銆侀棬璇娿�佷笓鐥呴殢璁�
+ this.title = "闅忚鍐呭鍒楄〃";
+ this.tableLabel = this.tableLabelmz;
+ this.checkboxlist = ["绾歌川", "澶氬獟浣�", "鐢佃瘽", "寰俊鍏紬鍙�"];
+ getFollowuplist(queryParams).then((response) => {
+ this.userList = response.rows;
+ this.total = response.total;
+ });
},
nextstep() {
if (this.Editprogress <= 3) {
@@ -963,7 +965,7 @@
// 纭閫夋嫨妯＄増鏀惧叆浠诲姟妯＄増
selectfn(row, type) {
// 妯＄増鎯呭喌涓嬭幏鍙栨ā鐗堜俊鎭�
- console.log(row,'閫夋嫨妯＄増');
+ console.log(row, "閫夋嫨妯＄増");
this.libName = row.templateName;
this.libId = row.id;
getvFollowup({ id: row.id }).then((res) => {
@@ -1260,7 +1262,7 @@
this.Tasktemplate.tempDetpRelevances = null;
this.Tasktemplate.libtemplateid = id;
this.Tasktemplate.isoperation = 1;
- this.Tasktemplate.libtemplateName = this.Tasktemplate.templateName;
+ this.Tasktemplate.libtemplatename = this.Tasktemplate.templatename;
console.log(this.libName, this.libId);
TaskTemplatecomit(this.Tasktemplate).then((response) => {
@@ -1268,9 +1270,9 @@
this.previewtf = false;
this.form.templateid = response.data;
this.form.libtemplateid = this.libId;
- this.form.templateName = this.libName;
- console.log(this.form.templateName, "ss");
- this.$modal.msgSuccess("閫夋嫨妯＄増鎴愬姛", this.form.templateName);
+ this.form.templatename = this.libName;
+ console.log(this.form.templatename, "ss");
+ this.$modal.msgSuccess("閫夋嫨妯＄増鎴愬姛", this.form.templatename);
});
},
// 澶勭悊鏈嶅姟褰㈠紡
diff --git a/vue.config.js b/vue.config.js
index 610b425..e50341a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,7 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.2.8:8089`,
- target:`http://localhost:8089`,
+ target:`http://localhost:8095`,
// target: `http://www.hxsoft.com:8080`,
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.3