From eef0168f78d81a6eb8856976c3e04cc1046c32df Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 16 一月 2025 10:38:29 +0800
Subject: [PATCH] 测试完成
---
vue.config.js | 4
src/assets/images/profile.jpg | 0
src/views/system/user/profile/index.vue | 18 +++++-
src/api/AiCentre/SingleTask.js | 8 ++
external (2).zip | 0
src/views/knowledge/education/index.vue | 2
src/router/index.js | 26 ++++----
src/assets/logo/logoxh.png | 0
src/views/patient/propaganda/QuestionnaireTask.vue | 6 -
src/assets/logo/logoxh3.png | 0
/dev/null | 0
src/views/patient/patient/ExternalPatient.vue | 4
src/views/followvisit/record/detailpage/index.vue | 4 -
src/views/outsideChainwt.vue | 10 ++-
src/views/knowledge/education/compilequer/index.vue | 2
src/views/patient/propaganda/particty.vue | 1
src/views/followvisit/discharge/index.vue | 5 +
src/views/outsideChainwtnew.vue | 37 ++++++------
18 files changed, 74 insertions(+), 53 deletions(-)
diff --git "a/external \0502\051.zip" "b/external \0502\051.zip"
new file mode 100644
index 0000000..27c8933
--- /dev/null
+++ "b/external \0502\051.zip"
Binary files differ
diff --git a/src/api/AiCentre/SingleTask.js b/src/api/AiCentre/SingleTask.js
index 9480392..7cb15f2 100644
--- a/src/api/AiCentre/SingleTask.js
+++ b/src/api/AiCentre/SingleTask.js
@@ -47,6 +47,14 @@
data: data,
});
}
+ // 浠诲姟閫夊彇鎮ｈ�呬俊鎭�
+ export function getTaskpatientQC(data) {
+ return request({
+ url: "/smartor/patarchive/getPatientInfoQC",
+ method: "post",
+ data: data,
+ });
+ }
// 鏂板鎴栦慨鏀逛换鍔�
export function Editsingletask(data) {
return request({
diff --git a/src/assets/images/profile.jpg b/src/assets/images/profile.jpg
index 77d3c32..c165d3b 100644
--- a/src/assets/images/profile.jpg
+++ b/src/assets/images/profile.jpg
Binary files differ
diff --git a/src/assets/logo/logoxh.png b/src/assets/logo/logoxh.png
index 77d3c32..c0760d3 100644
--- a/src/assets/logo/logoxh.png
+++ b/src/assets/logo/logoxh.png
Binary files differ
diff --git a/src/assets/logo/logoxh1.png b/src/assets/logo/logoxh1.png
deleted file mode 100644
index c0760d3..0000000
--- a/src/assets/logo/logoxh1.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/logo/logoxh3.png b/src/assets/logo/logoxh3.png
new file mode 100644
index 0000000..77d3c32
--- /dev/null
+++ b/src/assets/logo/logoxh3.png
Binary files differ
diff --git a/src/router/index.js b/src/router/index.js
index 6f4d0f9..84042a6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -96,19 +96,19 @@
component: () => import('@/views/error/401'),
hidden: true
},
- // {
- // path: '',
- // component: Layout,
- // redirect: 'index',
- // children: [
- // {
- // path: 'index',
- // component: () => import('@/views/index'),
- // name: 'Index',
- // meta: { title: '棣栭〉', icon: 'dashboard', affix: true }
- // }
- // ]
- // },
+ {
+ path: '',
+ component: Layout,
+ redirect: 'index',
+ children: [
+ {
+ path: 'index',
+ component: () => import('@/views/index'),
+ name: 'Index',
+ meta: { title: '棣栭〉', icon: 'dashboard', affix: true }
+ }
+ ]
+ },
{
path: '/user',
component: Layout,
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 624a9cb..85dbad0 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -221,7 +221,8 @@
width="120"
>
<template slot-scope="scope">
- <div v-if="scope.row.sendstate == 1">
+ <el-tooltip class="item" effect="dark" :content="scope.row.remark" placement="top-start">
+ <div v-if="scope.row.sendstate == 1">
<el-tag type="primary" :disable-transitions="false"
>琚鍙�</el-tag
>
@@ -247,6 +248,8 @@
<div v-if="scope.row.sendstate == 6">
<el-tag type="danger" :disable-transitions="false">宸插畬鎴�</el-tag>
</div>
+ </el-tooltip>
+
</template>
</el-table-column>
<!-- <el-table-column
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 6dddd22..3477ff8 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -663,9 +663,7 @@
taskid: this.taskid,
}).then((res) => {
if (res.code == 200) {
- objson = res.rows[0];
-
-
+ objson = res.rows[0].serviceSubtaskList[0];
objson.suggest = son;
Editsingletaskson(objson).then((res) => {
if (res.code) {
diff --git a/src/views/knowledge/education/compilequer/index.vue b/src/views/knowledge/education/compilequer/index.vue
index 116116c..be12c5b 100644
--- a/src/views/knowledge/education/compilequer/index.vue
+++ b/src/views/knowledge/education/compilequer/index.vue
@@ -943,7 +943,7 @@
// 鑾峰彇鍏夋爣鎵�鍦ㄤ綅缃�
let length = quill.getSelection().index;
// 鎻掑叆鍥剧墖||瑙嗛 res.info涓烘湇鍔″櫒杩斿洖鐨勫浘鐗囧湴鍧�
- if (type == "mp4" || type == "MP4") {
+ if (type == "mp4" || type == "MP4"|| type == "avi"|| type == "AVI") {
window.jsValue = imgUrl;
quill.insertEmbed(length, "video", imgUrl);
} else {
diff --git a/src/views/knowledge/education/index.vue b/src/views/knowledge/education/index.vue
index 8b17e2c..3be5dc8 100644
--- a/src/views/knowledge/education/index.vue
+++ b/src/views/knowledge/education/index.vue
@@ -824,7 +824,7 @@
// 鎵撳紑缁熻鍥捐〃
statistics() {
//鍙栨暟鎹�
- let obj = { assortid: 13, isavailable: "", pageNum: 1, pageSize: 10 };
+ let obj = { assortid: 13, isavailable: "", pageNum: 1, pageSize: 20 };
getlibrarylist(obj).then((response) => {
console.log(response.rows, "response.rows");
response.rows.forEach((item) => {
diff --git a/src/views/outsideChainwt.vue b/src/views/outsideChainwt.vue
index 760eb81..fec6b42 100644
--- a/src/views/outsideChainwt.vue
+++ b/src/views/outsideChainwt.vue
@@ -383,10 +383,12 @@
var obj = item.svyLibTemplateTargetoptions.find(
(items) => items.optioncontent == item.scriptResult
);
- if (obj.isabnormal) {
- console.log(obj.isabnormal);
- form.excep = 1;
- this.excep=1;
+ if (obj) {
+ if (obj.isabnormal) {
+ console.log(obj.isabnormal);
+ form.excep = 1;
+ this.excep=1;
+ }
}
});
diff --git a/src/views/outsideChainwtnew.vue b/src/views/outsideChainwtnew.vue
index 833cc29..23931a4 100644
--- a/src/views/outsideChainwtnew.vue
+++ b/src/views/outsideChainwtnew.vue
@@ -63,7 +63,6 @@
<el-checkbox-group
class="custom-radio"
v-model="item.scriptResult"
- @change="updateScore($event, index, item)"
>
<el-checkbox
border
@@ -409,10 +408,12 @@
var obj = item.svyLibTemplateTargetoptions.find(
(items) => items.optioncontent == item.scriptResult
);
- if (obj.isabnormal) {
- console.log(obj.isabnormal);
- form.excep = 1;
- this.excep = 1;
+ if (obj) {
+ if (obj.isabnormal) {
+ console.log(obj.isabnormal);
+ form.excep = 1;
+ this.excep = 1;
+ }
}
});
@@ -446,19 +447,19 @@
}
},
// 澶勭悊澶氶�夐�夐」
- updateScore(selectedvalues, index, arr) {
- // 锟斤拷鍔犲垎鏁�
- let score = 0;
- selectedvalues.forEach((value) => {
- const selectedOption = arr.svyLibTemplateTargetoptions.find(
- (option) => option.optioncontent == value
- );
- if (selectedOption) {
- score += Number(selectedOption.score);
- }
- });
- this.questionList[index].score = score;
- },
+ // updateScore(selectedvalues, index, arr) {
+ // // 锟斤拷鍔犲垎鏁�
+ // let score = 0;
+ // selectedvalues.forEach((value) => {
+ // const selectedOption = arr.svyLibTemplateTargetoptions.find(
+ // (option) => option.optioncontent == value
+ // );
+ // if (selectedOption) {
+ // score += Number(selectedOption.score);
+ // }
+ // });
+ // this.questionList[index].score = score;
+ // },
},
};
</script>
diff --git a/src/views/patient/patient/ExternalPatient.vue b/src/views/patient/patient/ExternalPatient.vue
index a4d5e2f..91eee25 100644
--- a/src/views/patient/patient/ExternalPatient.vue
+++ b/src/views/patient/patient/ExternalPatient.vue
@@ -86,7 +86,7 @@
icon="el-icon-upload2"
size="medium"
@click="handleImport"
- v-hasPermi="['system:user:import']"
+
>瀵煎叆</el-button
>
</div>
@@ -97,7 +97,7 @@
icon="el-icon-download"
size="medium"
@click="handleExport"
- v-hasPermi="['system:user:export']"
+
>瀵煎嚭</el-button
>
</div>
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 888c794..1576ef2 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -75,7 +75,6 @@
v-for="(item, index) in checkboxlist"
:key="index"
:label="item.value"
- :disabled="!item.disabled"
>
{{ item.label }}</el-checkbox
>
@@ -873,7 +872,7 @@
import { messagelistpatient } from "@/api/patient/homepage";
import store from "@/store";
import {
- getTaskpatient,
+ getTaskpatientQC,
getlibrarylist,
getFollowuplist,
getQtemplatelist,
@@ -1260,7 +1259,6 @@
{
value: "4",
label: "鐭俊",
-
},
{
value: "5",
@@ -1628,7 +1626,7 @@
this.patientqueryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
}
- getTaskpatient(this.patientqueryParams).then((response) => {
+ getTaskpatientQC(this.patientqueryParams).then((response) => {
this.patientuserList = response.rows;
this.patientuserList.forEach((item) => {
if (item.endtime) {
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 2ca56cb..bc575f6 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -78,7 +78,6 @@
v-for="(item, index) in checkboxlist"
:key="index"
:label="item.value"
- :disabled="!item.disabled"
@change="checkboxChange($event, item.value)"
>
{{ item.label }}</el-checkbox
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index ad530f9..5321727 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -23,9 +23,21 @@
<svg-icon icon-class="email" />鐢ㄦ埛閭
<div class="pull-right">{{ user.email }}</div>
</li>
- <li class="list-group-item">
- <svg-icon icon-class="tree" />鎵�灞為儴闂�
- <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
+ <li class="list-group-item" v-if="user.belongWards[0]">
+ <svg-icon icon-class="tree" />鎵�灞為櫌鍖�
+ <div class="pull-right" >{{ user.belongWards[0].districtName }}</div>
+ </li>
+ <li class="list-group-item" v-else>
+ <svg-icon icon-class="tree" />鎵�灞為櫌鍖�
+ <div class="pull-right" >鏈厤缃�</div>
+ </li>
+ <li class="list-group-item" v-if="user.belongDepts[0]">
+ <svg-icon icon-class="tree" />鎵�灞炵瀹�
+ <div class="pull-right" >{{ user.belongDepts[0].deptName }}</div>
+ </li>
+ <li class="list-group-item" v-else>
+ <svg-icon icon-class="tree" />鎵�灞炵瀹�
+ <div class="pull-right" >鏈厤缃�</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />鎵�灞炶鑹�
diff --git a/vue.config.js b/vue.config.js
index 9e0a97b..184340d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,10 +35,10 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `http://192.168.168.60: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`,
+ // target:`http://localhost:8095`,
// target: `http://192.168.101.135:8095`,
// target: `http://192.168.101.166:8093`,
// target: `http://192.168.191.181:8095`,
--
Gitblit v1.9.3