From 68af7c7ffd951d181044f3f72b1f5a7b64dfb2cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Fri, 8 Mar 2024 09:38:07 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/components/indicatorMonitoring.vue | 205 +++++++++++++++--- src/views/system/question/index.vue | 24 +- 2 files changed, 193 insertions(+), 36 deletions(-) diff --git a/src/views/manage/components/indicatorMonitoring.vue b/src/views/manage/components/indicatorMonitoring.vue index b391a76..88e14e3 100644 --- a/src/views/manage/components/indicatorMonitoring.vue +++ b/src/views/manage/components/indicatorMonitoring.vue @@ -9,67 +9,200 @@
+
+ + +
+ + - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/system/question/index.vue b/src/views/system/question/index.vue index c8f9751..ed52632 100644 --- a/src/views/system/question/index.vue +++ b/src/views/system/question/index.vue @@ -40,9 +40,9 @@ @@ -181,6 +181,8 @@ export default { }, cleardepartment() { this.classificationform.diseaseTypeId = '' + this.classificationform.departmentName = '' + this.classificationform.diseaseTypeName = '' }, changedepartment(e) { this.classificationform.departmentName = this.departmentlist.find(el => el.id == e).departmentName @@ -196,7 +198,23 @@ export default { }, //切换发布状态 switchstatus(e, item) { - + if (!item.departmentId && !this.diseaseTypeId) { + this.$message.error('请选择问卷所属的科室以及科室病种后发布!'); + this.getList(); + return + } + let query = { + id: item.id, + questionnaireStatus: e + } + updateclassification(query).then(res => { + if (e == 'PUBLISHED') { + this.$modal.msgSuccess("修改为已发布"); + } else if (e == 'UNPUBLISHED') { + this.$modal.msgSuccess("修改为未发布"); + } + }) + this.getList(); }, // 节点单击事件 handleNodeClick(data) { From 8579dca38e5c477f12133873fdf4873a9f0a100d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Fri, 8 Mar 2024 09:38:22 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/manage/indicatorMonitoring.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/api/manage/indicatorMonitoring.js diff --git a/src/api/manage/indicatorMonitoring.js b/src/api/manage/indicatorMonitoring.js new file mode 100644 index 0000000..4d4f95c --- /dev/null +++ b/src/api/manage/indicatorMonitoring.js @@ -0,0 +1,12 @@ +import request from '@/utils/request' + + +// 查询检测检测项目结果曲线统计 +export function curveStatistics(query) { + return request({ + url: `/manage/projectResult/curveStatistics`, + method: 'get', + params: query + }) +} + From c6b239ab1c8c78d4c063ee906abed3f888540a1e Mon Sep 17 00:00:00 2001 From: shidongli Date: Fri, 8 Mar 2024 09:50:44 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=89=8B=E6=9C=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operationInfo/operationInfo/index.vue | 46 ++----------------- 1 file changed, 5 insertions(+), 41 deletions(-) diff --git a/src/views/operationInfo/operationInfo/index.vue b/src/views/operationInfo/operationInfo/index.vue index a786e86..3fa34ea 100644 --- a/src/views/operationInfo/operationInfo/index.vue +++ b/src/views/operationInfo/operationInfo/index.vue @@ -440,23 +440,6 @@ export default { this.diseaseTypeName = '请选择病种'; this.innerVisibleshow = false; }, - - // 左侧科室 - // itemdata(item) { - // if (item) { - // this.itemname = item.id - // this.form.departmentId = this.itemname - // this.form.departmentName = item.departmentName - // this.loading = true; - // this.queryParams.departmentId = this.itemname - // this.getList() - // } else { - // this.queryParams.departmentId = '' - // this.itemname = null - // this.getList() - - // } - // }, // 左侧科室 itemdata(item) { if (item) { @@ -479,7 +462,6 @@ export default { let sum = 0; this.DepartmentoList.forEach((item) => { if (item.countNum != null) { - console.log(item.countNum) sum += item.countNum; } this.count = sum; @@ -494,7 +476,6 @@ export default { listOperationInfo(this.queryParams).then(response => { this.operationInfoList = response.rows; this.operationInfoList.forEach(e => { - console.log(e) }) this.total = response.total; this.loading = false; @@ -511,8 +492,8 @@ export default { reset() { this.form = { id: null, - // departmentId: null, - // departmentName: null, + departmentId: null, + departmentName: null, operationName: null, operationCode: null, operationInfo: null, @@ -554,19 +535,6 @@ export default { }, /** 新增按钮操作 */ handleAdd() { - // console.log(this.itemname) - // if (!this.itemname) { - // this.$modal.msgError("请先选择科室"); - // } else { - // // this.reset(); - // this.form.operationName = null; - // this.form.operationInfo = null; - // this.open = true; - // this.title = "添加手术信息"; - // if (this.title == "添加手术信息") { - // this.disabled = false; - // } - // } this.reset(); if (this.itemname) { this.form.departmentName = this.departmentName @@ -589,11 +557,8 @@ export default { this.open = true; const id = row.id || this.ids getOperationInfo(id).then(response => { - this.form.operationInfo = response.data.operationInfo; - this.form.operationName = response.data.operationName; - this.form.departmentId = response.data.departmentId; - this.form.departmentName = response.data.departmentName; - this.form.id = response.data.id; + this.form = response.data; + this.departmentName = response.data.departmentName; this.open = true; this.title = "修改手术信息"; if (this.title == "修改手术信息") { @@ -604,11 +569,11 @@ export default { }, /** 提交按钮 */ submitForm() { + this.form.departmentName = this.departmentName console.log(this.form,'0000') this.$refs["form"].validate(valid => { if (valid) { if (this.form.id!=null) { - this.form.departmentName = this.departmentName updateOperationInfo(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; @@ -622,7 +587,6 @@ export default { } else { this.form.departmentName = this.departmentName - console.log(this.form,'1111') } addOperationInfo(this.form).then(response => { this.$modal.msgSuccess("新增成功"); From d3f5ee2b2cde848a978f013044a9b5d409192bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Fri, 8 Mar 2024 10:07:12 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/visitin/index.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue index a1a6655..33897ca 100644 --- a/src/views/manage/visitin/index.vue +++ b/src/views/manage/visitin/index.vue @@ -124,6 +124,7 @@ + @@ -169,12 +170,14 @@ + + + + diff --git a/src/views/system/taskType/index.vue b/src/views/system/taskType/index.vue new file mode 100644 index 0000000..9558c1b --- /dev/null +++ b/src/views/system/taskType/index.vue @@ -0,0 +1,308 @@ + + + + +