From ffb5cf79a2d5d7603cb97e79bd04f598eceb0352 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 20 三月 2025 10:41:29 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/physical/index.vue | 4
src/views/patient/patient/physical.vue | 4
public/favicon2.ico | 0
vue.config.js | 2
src/views/patient/medtechnician/SpecializedService.vue | 4
src/views/patient/patient/index.vue | 25 ++--
src/views/followvisit/satisfaction/index.vue | 4
src/views/followvisit/linem/index.vue | 3
src/api/AiCentre/indicator.js | 7 +
src/views/patient/propaganda/index.vue | 4
src/views/sfstatistics/analyse/index.vue | 132 +++++++++++++++++++++++--
src/views/followvisit/record/detailpage/index.vue | 6 +
src/layout/components/TagsView/ScrollPane.vue | 2
src/views/patient/patient/hospital.vue | 4
src/views/patient/patient/behospitalized.vue | 4
src/views/patient/patient/profile/index.vue | 8 +
public/favicon.ico | 0
src/views/patient/propaganda/Missioncreation.vue | 12 +-
src/views/patient/propaganda/particty.vue | 16 +-
19 files changed, 182 insertions(+), 59 deletions(-)
diff --git a/public/favicon.ico b/public/favicon.ico
index 3c7a2b4..5816d48 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/public/favicon2.ico b/public/favicon2.ico
new file mode 100644
index 0000000..3c7a2b4
--- /dev/null
+++ b/public/favicon2.ico
Binary files differ
diff --git a/src/api/AiCentre/indicator.js b/src/api/AiCentre/indicator.js
index 695c223..3bd93f2 100644
--- a/src/api/AiCentre/indicator.js
+++ b/src/api/AiCentre/indicator.js
@@ -23,6 +23,13 @@
method: "get",
});
}
+// 鎸囨爣缁熻
+export function Labelstatistics(Id) {
+ return request({
+ url: "/smartor/serviceSubtaskDetail/countPatByTarget/" + Id,
+ method: "get",
+ });
+}
// 淇敼鎸囨爣鍙婂叾鍏宠仈閫夐」
export function gettargetInfoedit(data) {
return request({
diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index bb753a1..d94e371 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -87,7 +87,7 @@
bottom: 0px;
}
.el-scrollbar__wrap {
- height: 49px;
+ height: 59px;
}
}
}
diff --git a/src/views/followvisit/linem/index.vue b/src/views/followvisit/linem/index.vue
index a73719a..3c58b70 100644
--- a/src/views/followvisit/linem/index.vue
+++ b/src/views/followvisit/linem/index.vue
@@ -739,7 +739,7 @@
justify-content: center;
padding: 30px;
background: #daeaf5;
-
+color:blue
img {
width: 100px;
height: 100px;
@@ -755,7 +755,6 @@
border: 1px solid #dcdfe6;
-webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
0 0 6px 0 rgba(0, 0, 0, 0.04);
-
.topic-dev {
margin-bottom: 25px;
font-size: 20px !important;
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 1484a67..9f82a3e 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -681,6 +681,7 @@
subId: this.id,
taskid: this.taskid,
scriptid: item.id,
+ templatequestionnum:item.scriptno,
questiontext: item.scriptContent,
};
if (item.scriptType == 2 && item.scriptResult[0]) {
@@ -712,10 +713,13 @@
this.tableDatatop.forEach((item, index) => {
console.log(item.scriptResult, "scriptResult");
item.scriptResult = item.scriptResult.join("&");
- item.templatequestionnum = index + 1;
+ // item.templatequestionnum = index + 1;
item.subId = this.id;
item.taskid = this.taskid;
item.asrtext = item.matchedtext;
+ item.templatequestionnum = item.scriptno;
+ item.targetid = item.targetid;
+ item.scriptid = item.id;
if (!item.id) {
item.isoperation = 1;
}
diff --git a/src/views/followvisit/satisfaction/index.vue b/src/views/followvisit/satisfaction/index.vue
index 73901fb..63e1995 100644
--- a/src/views/followvisit/satisfaction/index.vue
+++ b/src/views/followvisit/satisfaction/index.vue
@@ -198,7 +198,7 @@
key="nickName"
prop="nickName"
/>
- <el-table-column
+ <!-- <el-table-column
label="涓绘不鍖荤敓"
align="center"
key="nickName"
@@ -209,7 +209,7 @@
align="center"
key="nickName"
prop="nickName"
- />
+ /> -->
<el-table-column
label="鎵ц鐘舵��"
diff --git a/src/views/patient/medtechnician/SpecializedService.vue b/src/views/patient/medtechnician/SpecializedService.vue
index 996e241..d50ab4a 100644
--- a/src/views/patient/medtechnician/SpecializedService.vue
+++ b/src/views/patient/medtechnician/SpecializedService.vue
@@ -304,7 +304,7 @@
key="phone"
prop="phone"
/>
- <el-table-column
+ <!-- <el-table-column
label="璐ｄ换鎶ゅ＋"
width="120"
align="center"
@@ -317,7 +317,7 @@
align="center"
key="drname"
prop="drname"
- />
+ /> -->
<!-- <el-table-column
label="鐥呭巻鍙�"
diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index 6cf033e..dd20000 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -216,7 +216,7 @@
prop="bedNo"
width="120"
/>
- <el-table-column
+ <!-- <el-table-column
label="涓绘不鍖荤敓"
align="center"
key="drname"
@@ -229,7 +229,7 @@
key="nurseName"
prop="nurseName"
width="120"
- />
+ /> -->
<el-table-column
label="鎿嶄綔"
diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue
index 524bb40..ee09b8a 100644
--- a/src/views/patient/patient/hospital.vue
+++ b/src/views/patient/patient/hospital.vue
@@ -226,7 +226,7 @@
prop="bedNo"
width="120"
/>
- <el-table-column
+ <!-- <el-table-column
label="涓绘不鍖荤敓"
align="center"
key="drname"
@@ -239,7 +239,7 @@
key="nurseName"
prop="nurseName"
width="120"
- />
+ /> -->
<el-table-column
label="鎿嶄綔"
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index f6d51ee..dfcd5b2 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -207,8 +207,12 @@
align="center"
key="age"
prop="age"
- width="60"
- />
+ width="160"
+ > <template slot-scope="scope">
+ <span v-if="scope.row.age">{{ scope.row.age }}{{scope.row.ageUnit }}</span><span v-if="scope.row.age2">{{ scope.row.age2 }}{{scope.row.ageUnit2 }}</span>
+
+ </template>
+ </el-table-column>
<el-table-column
label="鍑虹敓骞存湀"
align="center"
@@ -963,7 +967,7 @@
allhosp: "1",
pageSize: 10,
searchscope: 2,
- tagname:'',
+ tagname: "",
idcardno: undefined,
name: undefined,
status: undefined,
@@ -1085,7 +1089,7 @@
},
RiskMarker(row) {
this.RiskVisible = true;
- this.RiskObj=row;
+ this.RiskObj = row;
},
// 鍙栨秷鎸夐挳
@@ -1115,13 +1119,13 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.dateRange = [];
- this.queryParams= {
+ (this.queryParams = {
pageNum: 1,
allhosp: "1",
pageSize: 10,
searchscope: 2,
- },
- this.handleQuery();
+ }),
+ this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -1201,14 +1205,13 @@
});
},
RiskService() {
-
this.RiskObj.visitFlag = this.Risklist.join(", ");
this.RiskObj.visitType = this.Riskradio;
alterpatient(this.RiskObj).then((res) => {
- if (res.code==200) {
+ if (res.code == 200) {
this.getList();
- this.Risklist=[];
- this.Riskradio=1;
+ this.Risklist = [];
+ this.Riskradio = 1;
this.$modal.msgSuccess("寮傚父璁板綍鎴愬姛");
}
});
diff --git a/src/views/patient/patient/physical.vue b/src/views/patient/patient/physical.vue
index 4d19dbc..f53258a 100644
--- a/src/views/patient/patient/physical.vue
+++ b/src/views/patient/patient/physical.vue
@@ -241,13 +241,13 @@
prop="hospitalname"
width="120"
/>
- <el-table-column
+ <!-- <el-table-column
label="鍖荤敓"
align="center"
key="drname"
prop="drname"
width="120"
- />
+ /> -->
<el-table-column
label="灏辫瘖鏃堕棿"
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index 53093d6..c38ea4c 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -172,6 +172,8 @@
v-model="inputValue"
@change="handleInputConfirm"
filterable
+ remote
+ :remote-method="remoteMethod"
allow-create
default-first-option
placeholder="璇烽�夋嫨/鏌ヨ"
@@ -422,7 +424,7 @@
prop="leavehospitaldistrictname"
width="120"
/>
- <el-table-column
+ <!-- <el-table-column
label="涓绘不鍖荤敓"
align="center"
key="drname"
@@ -436,7 +438,7 @@
key="nurseName"
prop="nurseName"
width="120"
- />
+ /> -->
</el-table>
<pagination
v-show="total > 0"
@@ -1261,6 +1263,8 @@
});
},
remoteMethod(value) {
+ console.log('瑙﹀彂');
+
const illnessqueryParams = {
pageNum: 1,
pageSize: 100,
diff --git a/src/views/patient/physical/index.vue b/src/views/patient/physical/index.vue
index 5532a90..672801f 100644
--- a/src/views/patient/physical/index.vue
+++ b/src/views/patient/physical/index.vue
@@ -336,7 +336,7 @@
key="phone"
prop="phone"
/>
- <el-table-column
+ <!-- <el-table-column
label="璐ｄ换鎶ゅ＋"
width="120"
align="center"
@@ -349,7 +349,7 @@
align="center"
key="drname"
prop="drname"
- />
+ /> -->
<!-- <el-table-column
label="鐥呭巻鍙�"
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index 6315be1..f0c7a23 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -778,8 +778,8 @@
{ label: "韬唤璇�", width: "200", prop: "sfzh" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
- { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
- { label: "涓绘不鍖荤敓", width: "", prop: "drname" },
+ // { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
+ // { label: "涓绘不鍖荤敓", width: "", prop: "drname" },
{ label: "绉戝", width: "240", prop: "dept" },
{ label: "鐥呭尯", width: "240", prop: "leavehospitaldistrictname" },
],
@@ -790,8 +790,8 @@
{ label: "韬唤璇�", width: "200", prop: "sfzh" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
- { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
- { label: "涓绘不鍖荤敓", width: "", prop: "drname" },
+ // { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
+ // { label: "涓绘不鍖荤敓", width: "", prop: "drname" },
{ label: "绉戝", width: "180", prop: "deptName" },
{ label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
],
@@ -1196,8 +1196,8 @@
{ label: "韬唤璇�", width: "200", prop: "sfzh" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
- { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
- { label: "鍖荤敓", width: "", prop: "drname" },
+ // { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
+ // { label: "鍖荤敓", width: "", prop: "drname" },
{ label: "绉戝", width: "180", prop: "dept" },
{ label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
];
diff --git a/src/views/patient/propaganda/index.vue b/src/views/patient/propaganda/index.vue
index e403f2f..70e2ff4 100644
--- a/src/views/patient/propaganda/index.vue
+++ b/src/views/patient/propaganda/index.vue
@@ -279,7 +279,7 @@
key="sfzh"
prop="sfzh"
/>
- <el-table-column
+ <!-- <el-table-column
label="璐ｄ换鎶ゅ＋"
width="120"
align="center"
@@ -292,7 +292,7 @@
align="center"
key="drname"
prop="drname"
- />
+ /> -->
<!-- <el-table-column
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 98f8c51..8da280e 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -884,8 +884,8 @@
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
{ label: "鎮ｈ�呮爣绛�", width: "", prop: "tag" },
- { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
- { label: "涓绘不鍖荤敓", width: "", prop: "drname" },
+ // { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
+ // { label: "涓绘不鍖荤敓", width: "", prop: "drname" },
{ label: "绉戝", width: "240", prop: "dept" },
{ label: "鐥呭尯", width: "240", prop: "leavehospitaldistrictname" },
],
@@ -898,8 +898,8 @@
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
- { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
- { label: "涓绘不鍖荤敓", width: "", prop: "drname" },
+ // { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
+ // { label: "涓绘不鍖荤敓", width: "", prop: "drname" },
{ label: "绉戝", width: "180", prop: "deptName" },
{ label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
],
@@ -1527,8 +1527,8 @@
{ label: "骞撮緞", width: "", prop: "age" },
{ label: "鎮ｈ�呮爣绛�", width: "", prop: "tag" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
- { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
- { label: "鍖荤敓", width: "", prop: "drname" },
+ // { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
+ // { label: "鍖荤敓", width: "", prop: "drname" },
{ label: "绉戝", width: "180", prop: "dept" },
{ label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
];
@@ -1542,8 +1542,8 @@
{ label: "骞撮緞", width: "", prop: "age" },
{ label: "鎮ｈ�呮爣绛�", width: "", prop: "tag" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
- { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
- { label: "鍖荤敓", width: "", prop: "drname" },
+ // { label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
+ // { label: "鍖荤敓", width: "", prop: "drname" },
{ label: "绉戝", width: "180", prop: "dept" },
{ label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
];
diff --git a/src/views/sfstatistics/analyse/index.vue b/src/views/sfstatistics/analyse/index.vue
index c4b52eb..7356406 100644
--- a/src/views/sfstatistics/analyse/index.vue
+++ b/src/views/sfstatistics/analyse/index.vue
@@ -5,7 +5,14 @@
<div class="value">
<el-form ref="form" :model="form" label-width="120px">
<el-form-item label="閫夋嫨鎸囨爣鍚嶇О">
- <el-select v-model="value" filterable placeholder="璇烽�夋嫨">
+ <el-select
+ remote
+ :remote-method="remoteMethod"
+ default-first-option
+ v-model="value"
+ filterable
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in options"
:key="item.value"
@@ -19,19 +26,30 @@
</div>
</div>
<div class="formindex">
- <el-table :data="tableData" border style="width: 100%">
- <el-table-column prop="date" label="鎸囨爣鍚嶇О"> </el-table-column>
- <el-table-column prop="name" label="鍗曢」鍚嶇О"> </el-table-column>
- <el-table-column prop="address" label="鍗曢」鍑虹幇娆℃暟"> </el-table-column>
- <el-table-column prop="times" label="鎸囨爣鍑虹幇娆℃暟">
+ <el-table
+ v-loading="loading"
+ :data="tableData"
+ :span-method="objectSpanMethod"
+ border
+ :summary-method="getSummaries"
+ show-summary
+ style="width: 100%"
+ >
+ <el-table-column prop="targetname" label="鎸囨爣鍚嶇О"> </el-table-column>
+ <el-table-column prop="targetShowCount" label="鎸囨爣鍑虹幇娆℃暟"> </el-table-column>
+ <el-table-column prop="matchedtext" label="鍗曢」鍚嶇О"> </el-table-column>
+ <el-table-column prop="count" label="鍗曢」閫変腑娆℃暟"> </el-table-column>
+ <el-table-column prop="percentage" label="鍗犳瘮">
+ <template slot-scope="scope">
+ <span>{{ (Number(scope.row.percentage)*100).toFixed(2) }}%</span> </template>
</el-table-column>
- <el-table-column prop="proportion" label="鍗犳瘮"> </el-table-column>
</el-table>
</div>
</div>
</template>
<script>
+import { gettargetInfo, Labelstatistics } from "@/api/AiCentre/index";
export default {
name: "indexanalysis",
data() {
@@ -56,29 +74,117 @@
name: "鏈�",
address: 1,
times: 2,
- proportion: "50%",
+ proportion: "50",
},
{
date: "鍙戠儹鏈夋棤",
name: "鏃�",
address: 1,
times: 2,
- proportion: "50%",
+ proportion: "50",
},
{
date: "鍙戠儹鏈夋棤",
name: "鍏朵粬",
address: 0,
times: 2,
- proportion: "0%",
+ proportion: "0",
},
],
+ queryParams: {
+ pageNum: 1,
+ pageSize: 66,
+ },
};
},
- created() {},
+ created() {
+ this.getList();
+ },
- methods: {},
+ methods: {
+ getList() {
+ this.loading = true;
+ gettargetInfo(this.queryParams).then((res) => {
+ this.targetList = res.rows;
+ this.Labelstatistics(res.rows[0].id)
+ });
+ },
+ Labelstatistics(id){
+ Labelstatistics(id).then((res) => {
+ this.tableData = res.data;
+ this.loading = false;
+ });
+ },
+ remoteMethod(value) {
+ const illnessqueryParams = {
+ pageNum: 1,
+ pageSize: 66,
+ tagname: value,
+ };
+ setTimeout(() => {
+ gettargetInfo(this.illnessqueryParams).then((res) => {
+ this.targetList = res.rows;
+ });
+ }, 200);
+ },
+ objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+ if (columnIndex === 0 || columnIndex === 1) {
+ const totalRows = this.tableData.length;
+ if (rowIndex === 0) {
+ return [totalRows, 1];
+ } else {
+ // 鍏朵粬琛岄殣钘�
+ return [0, 0];
+ }
+ }
+ },
+ getSummaries(param) {
+ const { columns, data } = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ console.log(data, "data");
+
+ if (index === 0) {
+ sums[index] = "鍚堣"; // 淇敼涓衡�滃悎璁♀�濇洿绗﹀悎璇箟
+ return;
+ }
+ if (column.property === "percentage") {
+ // 瀵瑰崰姣斿垪杩涜鐗规畩澶勭悊
+ const values = data.map((item) => Number(item[column.property]));
+ const total = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + value;
+ } else {
+ return prev;
+ }
+ }, 0);
+ sums[index] = `${total*100}%`; // 鐩存帴娣诲姞鐧惧垎鍙�
+ } else if (column.property === "targetShowCount") {
+ sums[index] = data[0].targetShowCount + " 娆�"; // 涓烘鏁扮浉鍏冲垪娣诲姞鍗曚綅
+ } else {
+ const values = data.map((item) => Number(item[column.property]));
+ if (!values.every((value) => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + curr;
+ } else {
+ return prev;
+ }
+ }, 0);
+ if (column.property === "count") {
+ sums[index] += " 娆�"; // 涓烘鏁扮浉鍏冲垪娣诲姞鍗曚綅
+ }
+ } else {
+ sums[index] = "/";
+ }
+ }
+ });
+ return sums;
+ },
+ },
};
</script>
@@ -89,7 +195,7 @@
0 0 6px 0 rgba(0, 0, 0, 0.04);
margin: 15px;
.title-top {
- background-color: #00bbd3;
+ background-color: #6784f2;
color: #fff;
padding: 10px 20px;
font-size: 20px;
diff --git a/vue.config.js b/vue.config.js
index 25f1f4d..61507eb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,7 +37,7 @@
[process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.168.60:8095`,
// target: `http://192.168.144.34:8095`,
- // target: `http://61.160.111.174:8095`,
+ // target: `http://192.168.100.121:8095`,
target:`http://localhost:8095`,
// target: `http://192.168.101.135:8095`,
// target: `http://192.168.101.166:8093`,
--
Gitblit v1.9.3