diff --git a/pages.json b/pages.json index ce716823..52f60fec 100644 --- a/pages.json +++ b/pages.json @@ -35,6 +35,18 @@ } } }, + { + "path": "pages/medicalRecords/PendingApprovalIndex", + "style": { + "navigationBarTitleText": "待审核医案", + "enablePullDownRefresh": true, // 禁止下拉刷新 + "app-plus": { + "bounce": "none", + "titleNView": false, + "popGesture": "none" + } + } + }, { "path": "pages/articleList/index", "style": { @@ -59,6 +71,18 @@ } } }, + { + "path": "pages/medicalRecords/evaluateDetail", + "style": { + "navigationBarTitleText": "医案", + "enablePullDownRefresh": true, // 禁止下拉刷新 + "app-plus": { + "bounce": "none", + "titleNView": false, + "popGesture": "none" + } + } + }, { "path": "pages/articleList/article", diff --git a/pages/articleList/article.vue b/pages/articleList/article.vue index 7ab08695..37454a4d 100644 --- a/pages/articleList/article.vue +++ b/pages/articleList/article.vue @@ -187,6 +187,7 @@ export default { fileList1: [], containerHeight: null, + pollInterval: null, formData: { message: "", }, @@ -776,11 +777,12 @@ export default { const poll = () => { this.getMedicalDetail(() => { // 停止轮询 - clearInterval(pollInterval); + clearInterval(this.pollInterval); + this.pollInterval = null; }); }; // 每5秒发送一次请求,直到收到正确的响应 - const pollInterval = setInterval(poll, 5000); + this. pollInterval = setInterval(poll, 5000); //调用后端 SSE 接口,发送问题并接收实时回答 // this.startSSE(params); @@ -1183,9 +1185,11 @@ export default { }, }, onHide() { + this.closeWebSocket(); }, onUnload() { + this.pollInterval() this.closeWebSocket(); }, }; diff --git a/pages/articleList/index.vue b/pages/articleList/index.vue index e49cb40b..661a1483 100644 --- a/pages/articleList/index.vue +++ b/pages/articleList/index.vue @@ -176,7 +176,8 @@ export default { this.tabsList = [ { id: 0, title: "草稿箱", statusTitle: '' }, { id: 1, title: "待审核",statusTitle: '待审核',color:'#f59442' }, - { id: 3, title: "已通过",statusTitle: '已通过' ,color:'#22be98' }, + { id: 3, title: "质量检测中",statusTitle: '检测中' ,color:'#22be98' }, + { id: 4, title: "已通过",statusTitle: '已通过' ,color:'#22be98' }, { id: 2, title: "未通过",statusTitle: '未通过',color:"#e78084" }, ]; this.taihumedId = this.tabsList[0].id; diff --git a/pages/component/commonComponents/DepartmentMenu.vue b/pages/component/commonComponents/DepartmentMenu.vue new file mode 100644 index 00000000..c483d615 --- /dev/null +++ b/pages/component/commonComponents/DepartmentMenu.vue @@ -0,0 +1,51 @@ + + + + + + \ No newline at end of file diff --git a/pages/doctors/index.vue b/pages/doctors/index.vue index 048c1673..26d49632 100644 --- a/pages/doctors/index.vue +++ b/pages/doctors/index.vue @@ -7,7 +7,7 @@ :backState="2000" > - + - + - + {{ item.title }} + + + @@ -424,7 +434,7 @@ else{ background-color: #fff; } .doctors_list { - margin: 0 30rpx 20rpx; + margin: 0 20rpx 20rpx; } .doctors_item { border: 1rpx solid $themeColor; @@ -602,4 +612,9 @@ else{ box-shadow: 0 0 8rpx rgba(0, 0, 0, 0.04), /* 外部柔光阴影 */ inset -4rpx 0 6rpx rgba(0, 0, 0, 0.03); /* 内阴影模拟夹层效果 */ } +.hidden2{ + line-height: 24px; + max-height: 48px; + height: auto; + } diff --git a/pages/medicalRecords/PendingApprovalIndex.vue b/pages/medicalRecords/PendingApprovalIndex.vue new file mode 100644 index 00000000..0ab89fff --- /dev/null +++ b/pages/medicalRecords/PendingApprovalIndex.vue @@ -0,0 +1,473 @@ + + + + + diff --git a/pages/medicalRecords/evaluateDetail.vue b/pages/medicalRecords/evaluateDetail.vue new file mode 100644 index 00000000..84069594 --- /dev/null +++ b/pages/medicalRecords/evaluateDetail.vue @@ -0,0 +1,1712 @@ + + + + + diff --git a/pages/medicalRecords/index.vue b/pages/medicalRecords/index.vue index 14904ff8..026a9032 100644 --- a/pages/medicalRecords/index.vue +++ b/pages/medicalRecords/index.vue @@ -11,7 +11,7 @@ - {{ statusTitle }} + {{item.state==4?'质检未通过': statusTitle }} + + + + {{ item.createTime }} - - {{ item.title }} + + {{ item.title }} + + + + --> - + - + + + 是否在我的医案中展示 + + + + 编辑医案 - 医案详情 + @@ -116,9 +215,11 @@ \ No newline at end of file + diff --git a/pages/talents/index.vue b/pages/talents/index.vue index af4ffe26..74db7e39 100644 --- a/pages/talents/index.vue +++ b/pages/talents/index.vue @@ -1,408 +1,489 @@ \ No newline at end of file + diff --git a/static/icon/a.png b/static/icon/a.png new file mode 100644 index 00000000..40d7fe27 Binary files /dev/null and b/static/icon/a.png differ diff --git a/static/icon/a_.png b/static/icon/a_.png new file mode 100644 index 00000000..f1a784ae Binary files /dev/null and b/static/icon/a_.png differ diff --git a/static/icon/aa.png b/static/icon/aa.png new file mode 100644 index 00000000..1d40ace4 Binary files /dev/null and b/static/icon/aa.png differ diff --git a/static/icon/b.png b/static/icon/b.png new file mode 100644 index 00000000..a50e19c0 Binary files /dev/null and b/static/icon/b.png differ diff --git a/static/icon/b_.png b/static/icon/b_.png new file mode 100644 index 00000000..e2d27ac9 Binary files /dev/null and b/static/icon/b_.png differ diff --git a/static/icon/bb.png b/static/icon/bb.png new file mode 100644 index 00000000..57721d78 Binary files /dev/null and b/static/icon/bb.png differ diff --git a/static/icon/c.png b/static/icon/c.png new file mode 100644 index 00000000..2ba6ce7e Binary files /dev/null and b/static/icon/c.png differ diff --git a/static/icon/c_.png b/static/icon/c_.png new file mode 100644 index 00000000..59d54faa Binary files /dev/null and b/static/icon/c_.png differ diff --git a/static/icon/cc.png b/static/icon/cc.png new file mode 100644 index 00000000..f0ae1b9c Binary files /dev/null and b/static/icon/cc.png differ diff --git a/static/icon/jiancezhong.png b/static/icon/jiancezhong.png new file mode 100644 index 00000000..3c37f16f Binary files /dev/null and b/static/icon/jiancezhong.png differ diff --git a/static/icon/jing2.png b/static/icon/jing2.png new file mode 100644 index 00000000..1efaf06c Binary files /dev/null and b/static/icon/jing2.png differ diff --git a/static/icon/jingpin.png b/static/icon/jingpin.png new file mode 100644 index 00000000..4b407429 Binary files /dev/null and b/static/icon/jingpin.png differ diff --git a/static/icon/jingpinganli.png b/static/icon/jingpinganli.png new file mode 100644 index 00000000..9d466a3d Binary files /dev/null and b/static/icon/jingpinganli.png differ