From f6bc6ed2dec9cd60853db928fa6e56a92ab5de0d Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 12 二月 2025 11:07:17 +0800
Subject: [PATCH] 测试完成
---
src/api/login.js | 4 ++--
src/store/modules/user.js | 8 +++++---
src/views/login.vue | 17 ++++++++---------
vue.config.js | 2 +-
src/views/followvisit/record/detailpage/index.vue | 17 ++++++++++-------
src/api/AiCentre/Qtemplate.js | 4 ++--
src/views/outsideChainwtnew.vue | 3 +++
src/views/patient/propaganda/QuestionnaireTask.vue | 1 +
8 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/src/api/AiCentre/Qtemplate.js b/src/api/AiCentre/Qtemplate.js
index a29da63..87743e1 100644
--- a/src/api/AiCentre/Qtemplate.js
+++ b/src/api/AiCentre/Qtemplate.js
@@ -162,8 +162,8 @@
export function taskdepthospgetsonlist(data) {
return request({
url: "/smartor/taskdept/list",
- method: "get",
- params: data,
+ method: "post",
+ data: data,
});
}
// 鍒犻櫎绉戝鐥呭尯妯℃澘鍒嗙被
diff --git a/src/api/login.js b/src/api/login.js
index 45b9bab..4d3977e 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -1,13 +1,13 @@
import request from '@/utils/request'
// 鐧诲綍鏂规硶
-export function login(username, password, code, uuid,guid) {
+export function login(username, password, code, uuid,orgid) {
const data = {
username,
password,
code,
uuid,
- guid,
+ orgid,
}
return request({
url: '/login',
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 9c01098..6bdcc72 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -114,16 +114,18 @@
actions: {
// 鐧诲綍
Login({ commit }, userInfo) {
+ console.log(userInfo,'user info');
+
const username = userInfo.username.trim()
const password = userInfo.password
const code = userInfo.code
const uuid = userInfo.uuid
- const guid = userInfo.guid
+ const orgid = userInfo.orgid
return new Promise((resolve, reject) => {
- login(username, password, code, uuid,guid).then(res => {
+ login(username, password, code, uuid,orgid).then(res => {
setToken(res.token)
commit('SET_TOKEN', res.token)
- localStorage.setItem('guid', guid);
+ localStorage.setItem('orgid', orgid);
resolve()
}).catch(error => {
reject(error)
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index acd20aa..6e7ae29 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -480,10 +480,12 @@
if (res.code === 200) {
this.tableDatatop = res.data.scriptResult.script;
this.tableDatatop.forEach((item) => {
- if (item.scriptResult && item.scriptType != 2) {
+ console.log(item.scriptResultId,'scriptResultId');
+
+ if (item.scriptResultId && item.scriptType != 2) {
item.isoption = 3;
- item.scriptResult = JSON.parse(item.scriptResult);
- } else if (item.scriptResult && item.scriptType == 2) {
+ item.scriptResult = item.scriptResult;
+ } else if (item.scriptResultId && item.scriptType == 2) {
item.scriptResult = item.scriptResult.split("&");
item.isoption = 3;
}
@@ -556,9 +558,10 @@
var objs = item.svyLibTemplateTargetoptions.find(
(items) => items.optioncontent == item.scriptResult
);
-
- if (objs.isabnormal) {
- excep = 1;
+ if (obj) {
+ if (objs.isabnormal) {
+ excep = 1;
+ }
}
let obj = {
@@ -572,7 +575,7 @@
if (item.scriptType == 2 && item.scriptResult[0]) {
obj.asrtext = item.scriptResult.join("&");
} else if (item.scriptType != 2 && item.scriptResult) {
- obj.asrtext = JSON.stringify(item.scriptResult);
+ obj.asrtext = item.scriptResult;
}
if (item.isoption == 3) {
diff --git a/src/views/login.vue b/src/views/login.vue
index 23bab52..3b58d3a 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -37,8 +37,8 @@
</el-input>
</el-form-item>
<!-- 涓�===================姘� -->
- <!-- <el-form-item prop="guid">
- <el-select style="width: 100%;" v-model="loginForm.guid" placeholder="璇烽�夋嫨闄㈠尯">
+ <!-- <el-form-item prop="orgid">
+ <el-select style="width: 100%;" v-model="loginForm.orgid" placeholder="璇烽�夋嫨闄㈠尯">
<el-option
v-for="item in options"
:key="item.value"
@@ -112,8 +112,7 @@
password: "",
rememberMe: false,
code: "",
- uuid: "",
- guid:'',
+ orgid:'1',
},
options: [
{ value: "1", label: "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�" },
@@ -126,7 +125,7 @@
password: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" },
],
- // guid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
+ // orgid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
},
loading: false,
// 楠岃瘉鐮佸紑鍏�
@@ -147,9 +146,9 @@
created() {
this.getCode();
this.getCookie();
- if (localStorage.getItem('guid')) {
- this.loginForm.guid = localStorage.getItem('guid');
- }
+ // if (localStorage.getItem('orgid')) {
+ // this.loginForm.orgid = localStorage.getItem('orgid');
+ // }
},
methods: {
getCode() {
@@ -191,7 +190,7 @@
Cookies.remove("password");
Cookies.remove("rememberMe");
}
- localStorage.removeItem('guid');
+ this.loginForm.orgid = '1',
this.$store
.dispatch("Login", this.loginForm)
.then(() => {
diff --git a/src/views/outsideChainwtnew.vue b/src/views/outsideChainwtnew.vue
index 83c09e1..302c3dc 100644
--- a/src/views/outsideChainwtnew.vue
+++ b/src/views/outsideChainwtnew.vue
@@ -408,6 +408,8 @@
var obj = item.svyLibTemplateTargetoptions.find(
(items) => items.optioncontent == item.scriptResult
);
+ console.log(obj,'obj');
+
if (obj) {
if (obj.isabnormal) {
console.log(obj.isabnormal);
@@ -425,6 +427,7 @@
}
});
form.svyLibTemplateScriptVOS = arr;
+ form.type = 2;
Cachequestionnaire(form).then((res) => {
if (res.code == 200) {
if (subm) {
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 25e65e6..7e6015b 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -1975,6 +1975,7 @@
this.objyl.suitway = this.objyl.suitway.join(",");
}
this.objyl.templateid = this.objyl.svyid;
+ this.form.libtemplateid = this.objyl.svyid;
this.objyl.isoperation = 1;
this.objyl.svyTaskTemplateScriptVOS = this.objyl.svyTemplateLibScripts;
this.form.svyTaskTemplateVO=this.objyl;
diff --git a/vue.config.js b/vue.config.js
index 1708384..21f5d7c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `http://192.168.2.13:8095`,
+ // target: `http://192.168.168.60:8095`,
// target: `http://10.202.20.185:8095`,
// target: `http://192.168.100.184:8095`,
// target:`http://localhost:8095`,
--
Gitblit v1.9.3