From 83cb8ef2d8a0f564214b8b0f3c9c05155fc93ce7 Mon Sep 17 00:00:00 2001 From: shidongli Date: Thu, 27 Jun 2024 18:12:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/manage/Auditing.js | 19 +- src/api/manage/portrait.js | 9 + src/views/manage/Auditing/index.vue | 169 ++++++++--- src/views/manage/components/portrait.vue | 356 ++++++++++------------- src/views/manage/manualReview/index.vue | 1 + 5 files changed, 316 insertions(+), 238 deletions(-) create mode 100644 src/api/manage/portrait.js diff --git a/src/api/manage/Auditing.js b/src/api/manage/Auditing.js index 0b8ac9a..1f55d42 100644 --- a/src/api/manage/Auditing.js +++ b/src/api/manage/Auditing.js @@ -58,4 +58,21 @@ export function getPortaitInfo(patientId) { url: `/manage/signRecord/getPortaitInfo/${patientId}`, method: 'get', }) -} \ No newline at end of file +} +// 画像审核 +export function updatePortaitCheckStatus(data) { + return request({ + url: `/manage/signRecord/updatePortaitCheckStatus`, + method: 'post', + data + }) +} +// 画像审核查询 +export function getPortaitByPatient(query) { + return request({ + url: '/manage/labelfieldcontent/getPortaitByPatient', + method: 'get', + params: query + }) +} + diff --git a/src/api/manage/portrait.js b/src/api/manage/portrait.js new file mode 100644 index 0000000..3ce3534 --- /dev/null +++ b/src/api/manage/portrait.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function groupingValue(query) { + return request({ + url: '/manage/labelfieldcontent/groupingValue', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/views/manage/Auditing/index.vue b/src/views/manage/Auditing/index.vue index 2d6b0c1..d60f382 100644 --- a/src/views/manage/Auditing/index.vue +++ b/src/views/manage/Auditing/index.vue @@ -1,5 +1,5 @@ @@ -116,8 +179,8 @@ import { getRouteNodeList, getByPatientId, - audit, - updateRouteCheckStatus + updateRouteCheckStatus, + updatePortaitCheckStatus } from '@/api/manage/Auditing.js' import { getAge } from "@/utils/age"; import portrait from '../components/portrait.vue' @@ -130,25 +193,42 @@ export default { name: "Auditing", data() { return { - activeNametab: 'route',//切换 + activeNametab: 'portrait',//切换 baseUrl: process.env.VUE_APP_BASE_API, activeNames: ['-1', '-2', '-3'], list: {}, // nodelist: [], lookitem: {}, routeCheckStatus: undefined, + patientId: null, + portraitlistdata: [], + CheckStatus: undefined, + portaitCheckStatus: undefined, }; }, created() { - this.info(); + // this.info(); + this.patientId = this.$route.query.patientId + this.CheckStatus = this.$route.query.routeCheckStatus + console.log(this.CheckStatus, 'CheckStatus') + getByPatientId(this.$route.query.patientId).then(res => { + res.data.birthDate ? res.data.age = getAge(res.data.birthDate) : '' + this.list = res.data + this.portaitCheckStatus = res.data.portaitCheckStatus + console.log(this.portaitCheckStatus, '------') + }) + + // console.log(this.portaitCheckStatus, '--------------') }, methods: { //路径审核页面传值 onrouteCheckStatus(e) { this.routeCheckStatus = e.routeCheckStatus }, + // 画像审核传值 portraitlist(val) { - console.log(val, '999999999') + this.portraitlistdata = val + console.log(this.portraitlistdata, '999999999') }, handleClick(tab, event) { console.log(tab, event, this.activeNametab); @@ -182,12 +262,14 @@ export default { }) } else { let obj = { - routeCheckPerson: JSON.parse(localStorage.getItem('user')).nickName, - routeCheckRemark: value, - routeCheckStatus: 'DISAGREE', - // manageRouteNodeIds: manageRouteNodeIds + patientId: this.patientId, + portaitCheckRemark: value, + portaitCheckStatus: 'DISAGREE', + signPatientRecordId: this.$route.query.signRecordId, + labelFieldContentList: [], } - audit(obj).then(res => { + obj.labelFieldContentList = this.portraitlistdata + updatePortaitCheckStatus(obj).then(res => { this.$notify({ type: 'success', title: '提示', @@ -234,18 +316,23 @@ export default { }) } else { let obj = { - routeCheckPerson: JSON.parse(localStorage.getItem('user')).nickName, - routeCheckRemark: value, - routeCheckStatus: 'AGREE', - // manageRouteNodeIds: manageRouteNodeIds + patientId: this.patientId, + portaitCheckRemark: value, + portaitCheckStatus: 'AGREE', + signPatientRecordId: this.$route.query.signRecordId, + labelFieldContentList: [], } - audit(obj).then(res => { + obj.labelFieldContentList = this.portraitlistdata + console.log(obj, 'tijiao') + // return + updatePortaitCheckStatus(obj).then(res => { this.$notify({ type: 'success', title: '提示', message: '画像审核通过', duration: 3000 }); + this.info() }) } }) @@ -254,6 +341,8 @@ export default { getByPatientId(this.$route.query.patientId).then(res => { res.data.birthDate ? res.data.age = getAge(res.data.birthDate) : '' this.list = res.data + this.portaitCheckStatus = res.data.portaitCheckStatus + console.log(this.portaitCheckStatus, '===============') }) // getRouteNodeList({ patientId: this.$route.query.patientId, taskCreateType: 'MANUAL_CREATE', routeCheckStatus: "UNAUDITED" }).then(res => { // this.nodelist = res.data diff --git a/src/views/manage/components/portrait.vue b/src/views/manage/components/portrait.vue index e63e321..3bbba58 100644 --- a/src/views/manage/components/portrait.vue +++ b/src/views/manage/components/portrait.vue @@ -1,178 +1,145 @@ - \ No newline at end of file + .icon { + width: 45px; + right: -20px; + top: 40px; + position: relative; + } + .form { + width: 100%; + ::v-deep .el-form-item { + display: flex; + } + ::v-deep .el-form-item__content { + flex: 1; + } + ::v-deep .el-input__inner { + height: 30px !important; + line-height: 30px !important; + } + + ::v-deep .el-form-item__label { + font-size: 12px !important; + } + } +} + diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue index 05e8b81..cecf4fd 100644 --- a/src/views/manage/manualReview/index.vue +++ b/src/views/manage/manualReview/index.vue @@ -454,6 +454,7 @@ export default { query: { patientId: row.patientId, signRecordId: row.id, + routeCheckStatus:row.routeCheckStatus }, }); }, From 4026af0a5ca6140ae4fad8703dc36331cced6898 Mon Sep 17 00:00:00 2001 From: shidongli Date: Thu, 27 Jun 2024 18:16:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AF=9D=E6=9C=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/script/index.vue | 5 ++--- src/views/system/preview/index.vue | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/manage/script/index.vue b/src/views/manage/script/index.vue index 699a76c..381bdd9 100644 --- a/src/views/manage/script/index.vue +++ b/src/views/manage/script/index.vue @@ -480,11 +480,10 @@ export default { // 话术 see(row) { Cookies.set("id", row.id) + Cookies.set("scriptId", row.scriptId) this.$router.push({ path: "/knowledge/preview", - query: { - id: row.id, - }, + }); }, seescript(row) { diff --git a/src/views/system/preview/index.vue b/src/views/system/preview/index.vue index 154eab9..bb57470 100644 --- a/src/views/system/preview/index.vue +++ b/src/views/system/preview/index.vue @@ -534,6 +534,7 @@ export default { } }, mounted() { + // console.log(this.$router.query,'query') this.initG6Editor(); this.getlist() @@ -813,7 +814,7 @@ export default { // 将二进制数据转换为Blob对象 const blob = new Blob([bytes], { type: mimeType }); // 创建File对象 - const file = new File([blob], nowdatanew+name + '.jpg', { type: mimeType }); + const file = new File([blob], Cookies.get('scriptId') + '.jpg', { type: mimeType }); return file; }, From 260e881bec04e4e138dd270f07986afd9f60dfa4 Mon Sep 17 00:00:00 2001 From: shidongli Date: Fri, 28 Jun 2024 09:25:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/components/PathReview.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/manage/components/PathReview.vue b/src/views/manage/components/PathReview.vue index 8275fd5..8328c29 100644 --- a/src/views/manage/components/PathReview.vue +++ b/src/views/manage/components/PathReview.vue @@ -377,6 +377,9 @@ export default { this.informationlist = res.data loading.close(); }) + .catch(()=>{ + loading.close(); + }) }, getlist() { if (!this.routelist) { From 7c916d381a50def08289a96215c5f713ea1e0619 Mon Sep 17 00:00:00 2001 From: shidongli Date: Fri, 28 Jun 2024 09:36:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/manualReview/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue index cecf4fd..dae3a3b 100644 --- a/src/views/manage/manualReview/index.vue +++ b/src/views/manage/manualReview/index.vue @@ -443,6 +443,7 @@ export default { path: "/task/LookAuditing", query: { patientId: row.patientId, + signRecordId: row.id, routeCheckStatus: this.queryParams.routeCheckStatus, }, });