diff --git a/src/common/portrait.styl b/src/common/portrait.styl index 2d36ae6..5773862 100644 --- a/src/common/portrait.styl +++ b/src/common/portrait.styl @@ -197,7 +197,7 @@ height: 40px; font-size: 14px; right: 50px; - top: 60px; + top: 50px; } // flex .d-flex{ @@ -258,6 +258,11 @@ cursor:pointer; } +.pointerEdit { + font-size: 16px; + margin-right: 20px; +} + .fill-height{ height:100%; } @@ -323,3 +328,19 @@ h2{ .fill-height{ height:100%; } + +// .ant-form-item-label { +// text-align: left; +// } + +// .ant-form-item-control { +// width:100% +// } +.ant-form-item-children(:only-child) { + display: flex; + flex-wrap: nowrap; +} +.ant-card-head-title { + font-weight: 600 !important; + font-size: 18px !important; +} diff --git a/src/components/CaseTable/CaseKTOne.vue b/src/components/CaseTable/CaseKTOne.vue new file mode 100644 index 0000000..48ce70b --- /dev/null +++ b/src/components/CaseTable/CaseKTOne.vue @@ -0,0 +1,78 @@ + + + + + + + ~ + + + + + + + + + + + + + + diff --git a/src/components/CaseTable/CaseKTTwo.vue b/src/components/CaseTable/CaseKTTwo.vue new file mode 100644 index 0000000..48958e0 --- /dev/null +++ b/src/components/CaseTable/CaseKTTwo.vue @@ -0,0 +1,82 @@ + + + + + + + ~ + + + + + + + + + + + + + + diff --git a/src/components/CaseTable/CaseTable.vue b/src/components/CaseTable/CaseTable.vue index c1e265e..7f1a64f 100644 --- a/src/components/CaseTable/CaseTable.vue +++ b/src/components/CaseTable/CaseTable.vue @@ -23,16 +23,23 @@ 废弃 - 查看详情 + + 查看详情 + + + {{ item }} + + diff --git a/src/components/Echarts/Analysis.vue b/src/components/Echarts/Analysis.vue index 58187d0..ae2fe27 100644 --- a/src/components/Echarts/Analysis.vue +++ b/src/components/Echarts/Analysis.vue @@ -33,11 +33,40 @@ export default { nameList: [], // 对照组名称数组 dataList: [], series: [], + stringList: [], colorList: ['#5470C6', '#91CC75', '#FAC858', '#EE6666', '#73C0DE'], }; }, + + computed: { + option() { + return { + tooltip: { + trigger: 'axis', + axisPointer: { + // 坐标轴指示器,坐标轴触发有效 + type: 'shadow', // 默认为直线,可选为:'line' | 'shadow' + }, + }, + legend: { data: this.lists.stringList }, + grid: { + left: '3%', + right: '4%', + bottom: '3%', + containLabel: true, + }, + xAxis: { type: 'value' }, + yAxis: { + type: 'category', + data: this.nameList, + }, + series: this.series, + }; + }, + }, watch: { - lists() { + async lists() { + // debugger; this.nameList = []; this.dataList = []; this.series = []; @@ -47,35 +76,34 @@ export default { this.nameList.push(this.lists.selGroupNums[i].name); let arr = []; // 遍历 横坐标 数组 + // if (this.lists.selGroupNums[i].list.length > 0) { + console.log(this.lists.stringList); for (let j = 0; j < this.lists.stringList.length; j++) { + let obj = { + name: this.lists.stringList[j], + value: 0, + }; // 遍历 每个对照组 下的list数组 for (let k = 0; k < this.lists.selGroupNums[i].list.length; k++) { // 当 某个横坐标 等于 某个对照组下的list数组的content时,添加 content 和 value if (this.lists.selGroupNums[i].list[k].content === this.lists.stringList[j]) { - let obj = { - name: this.lists.selGroupNums[i].list[k].content, - value: this.lists.selGroupNums[i].list[k].nums, - }; - arr.push(obj); - break; - // 当 不等于 且 当前处于 list数组最后一位时 - } else if (k === this.lists.selGroupNums[i].list.length - 1) { - let obj = { - name: this.lists.stringList[i], - value: 0, - }; - arr.push(obj); + obj.value = this.lists.selGroupNums[i].list[k].nums; break; } } + arr.push(obj); } + // } this.dataList.push(arr); } + // 遍历 存储的数组 ,动态生成统计图的数据 for (let i = 0; i < this.dataList[0].length; i++) { let arr1 = []; for (let k = 0; k < this.dataList.length; k++) { - arr1.push(this.dataList[k][i].value); + if (this.dataList[k][i]) { + arr1.push(this.dataList[k][i].value); + } } let obj = { name: this.dataList[0][i].name, @@ -88,7 +116,8 @@ export default { }; this.series.push(obj); } - this.drawLine(); + console.log(this.series); + await this.drawLine(); }, }, mounted() { @@ -97,31 +126,11 @@ export default { methods: { drawLine() { // 基于准备好的dom,初始化echarts实例 - let myChart = this.$echarts.init(document.getElementById('Analysis')); + let myChart = document.getElementById('Analysis'); // 绘制图表 - var option = { - tooltip: { - trigger: 'axis', - axisPointer: { - // 坐标轴指示器,坐标轴触发有效 - type: 'shadow', // 默认为直线,可选为:'line' | 'shadow' - }, - }, - legend: { data: this.lists.stringList }, - grid: { - left: '3%', - right: '4%', - bottom: '3%', - containLabel: true, - }, - xAxis: { type: 'value' }, - yAxis: { - type: 'category', - data: this.nameList, - }, - series: this.series, - }; - myChart.setOption(option); + myChart.removeAttribute('_echarts_instance_'); + let myChart1 = this.$echarts.init(myChart); + myChart1.setOption(this.option); }, }, }; diff --git a/src/components/Echarts/Cisualmap.vue b/src/components/Echarts/Cisualmap.vue index 717e03d..88a2c80 100644 --- a/src/components/Echarts/Cisualmap.vue +++ b/src/components/Echarts/Cisualmap.vue @@ -106,13 +106,15 @@ export default { }; }, }, - watch: { - hospitalId() { - this.init(this.drawLine); - }, - }, + // watch: { + // hospitalId() { + // this.init(this.drawLine); + // }, + // }, mounted() { - this.init(this.drawLine); + setTimeout(() => { + this.init(this.drawLine); + }, 500); }, methods: { async drawLine() { @@ -121,82 +123,10 @@ export default { let myChart2 = this.$echarts.init(document.getElementById('Cisualmap2')); await this.getData(); // 绘制图表 - var option1 = { - title: { - left: 'center', - text: '新建病例', - }, - tooltip: { - trigger: 'item', - formatter: '数量 : {c}', - }, - dataZoom: [ - { - type: 'slider', - xAxisIndex: 0, - filterMode: 'empty', - }, - { - type: 'inside', - xAxisIndex: 0, - filterMode: 'empty', - }, - ], - xAxis: { - type: 'category', - data: this.dateList1, - }, - yAxis: { type: 'value' }, - series: [ - { - data: this.dataList1, - type: 'line', - areaStyle: { color: 'rgba(229,244,254,1)' }, - lineStyle: { color: 'rgb(45,151,213)' }, - itemStyle: { color: 'rgb(45,151,213)' }, - smooth: true, - }, - ], - }; - var option2 = { - title: { - left: 'center', - text: '已完成病例', - }, - tooltip: { - trigger: 'item', - formatter: '数量 : {c}', - }, - dataZoom: [ - { - type: 'slider', - xAxisIndex: 0, - filterMode: 'empty', - }, - { - type: 'inside', - xAxisIndex: 0, - filterMode: 'empty', - }, - ], - xAxis: { - type: 'category', - data: this.dateList2, - }, - yAxis: { type: 'value' }, - series: [ - { - data: this.dataList2, - type: 'line', - areaStyle: { color: 'rgba(229,244,254,1)' }, - lineStyle: { color: 'rgb(45,151,213)' }, - itemStyle: { color: 'rgb(45,151,213)' }, - smooth: true, - }, - ], - }; - myChart1.setOption(this.option1); - myChart2.setOption(this.option2); + setTimeout(() => { + myChart1.setOption(this.option1); + myChart2.setOption(this.option2); + }, 100); }, async getData() { try { diff --git a/src/components/Echarts/Piemap.vue b/src/components/Echarts/Piemap.vue index 812b7ad..a001918 100644 --- a/src/components/Echarts/Piemap.vue +++ b/src/components/Echarts/Piemap.vue @@ -1,7 +1,7 @@ - - + + + + diff --git a/src/components/Echarts/Treemap.vue b/src/components/Echarts/Treemap.vue index 32c60be..2acbeba 100644 --- a/src/components/Echarts/Treemap.vue +++ b/src/components/Echarts/Treemap.vue @@ -1,7 +1,7 @@ - - + + diff --git a/src/views/CaseSearch/CaseSearch.vue b/src/views/CaseSearch/CaseSearch.vue index dfdd440..479f0fe 100644 --- a/src/views/CaseSearch/CaseSearch.vue +++ b/src/views/CaseSearch/CaseSearch.vue @@ -722,6 +722,11 @@ + + + + + 搜索 @@ -729,8 +734,9 @@ diff --git a/src/views/Index/Index.vue b/src/views/Index/Index.vue index ae30ce1..504763b 100644 --- a/src/views/Index/Index.vue +++ b/src/views/Index/Index.vue @@ -1,13 +1,16 @@ - - - + + + + + + - + @@ -16,11 +19,6 @@ - @@ -29,16 +27,18 @@ import Treemap from 'components/Echarts/Treemap.vue'; import Cisualmap from 'components/Echarts/Cisualmap.vue'; import Categorymap from 'components/Echarts/Categorymap.vue'; import Piemap from 'components/Echarts/Piemap.vue'; +import PiemapHos from 'components/Echarts/PiemapHos.vue'; +import { mapState } from 'vuex'; export default { name: 'Index', - components: { Treemap, Cisualmap, Categorymap, Piemap }, + components: { Treemap, Cisualmap, Categorymap, Piemap, PiemapHos }, data() { return { str: '', showVideo: false, }; }, - + computed: mapState('home', ['hospitalId']), methods: {}, }; diff --git a/src/views/Meeting/Meeting.vue b/src/views/Meeting/Meeting.vue index 481985b..dac55d7 100644 --- a/src/views/Meeting/Meeting.vue +++ b/src/views/Meeting/Meeting.vue @@ -30,7 +30,7 @@ - + @@ -81,6 +81,7 @@ export default { endTime: '', // 结束时间 placeholderParticipants: '请在此输入参会人员...', maxSize: 2048, + max500: 500, placeholderContent: '请在此输入研讨内容...', placeholderMeeting: '请在此输入会议纪要...', visible: false, @@ -127,7 +128,16 @@ export default { if (!err) { try { const { host, place, startTime, endTime, participants, discussionContent, meetingMinutes } = this; - const previewInfo = { host, place, startTime, endTime, participants, meetingMinutes, discussionContent }; + const previewInfo = { + host, + place, + startTime, + endTime, + participants, + meetingMinutes, + discussionContent, + taskId: this.ptProps.taskId, + }; // 提交表单 const params = { param: previewInfo }; this.saveConRec(params); @@ -192,7 +202,8 @@ export default { const res = await shareConRec(params); const { data, msg, code } = res.data; if (code === 200) { - console.log('data: ', data); + // console.log('data: ', data); + window.open(data.path); } else { throw msg; } diff --git a/src/views/PatientInfo/PatientInfo.vue b/src/views/PatientInfo/PatientInfo.vue index 6452622..23e2b75 100644 --- a/src/views/PatientInfo/PatientInfo.vue +++ b/src/views/PatientInfo/PatientInfo.vue @@ -1,500 +1,72 @@ - + - - - - - - + + + + + + - - - - - - {{ b.showValue }} - - - - - {{ ques.showValue }} - - - - - {{ b.showValue }} - - - - - 点击上传 - - - - - - - {{ f.showValue }} - - - - - - - - - - - - - - - {{ ques.showValue }} - - - - - - - - - - - - - - - {{ b.showValue }} - - - - - - - - - - - - - - {{ ques.showValue }} - - - - - - - - - - 说明: - - - - - - - {{ f.showValue }} - - - - - - - - - - - - - - - {{ b.showValue }} - - - - - - {{ ques.showValue }} - - - - - - {{ b.showValue }} - - - - - - 点击上传 - - - - - - - {{ f.showValue }} - - - - - - - - - - - - - - - {{ ques.showValue }} - - - - - - - - - - - - - - - - {{ b.showValue }} - - - - - - - - - - - - - - - {{ ques.showValue }} - - - - - - - - - - 说明: - - - - - - - {{ f.showValue }} - - - - - - - - - qwe - - - - - - - - {{ h.units }} - - 图片识别 - - - - - - - - - - {{ a.units }} - - 图片识别 - - - - - - - {{ w.name }}: - - - - - + --> + + + + - - {{ b.showValue }} + + {{ b.showValue }} - + {{ ques.showValue }} - {{ b.showValue }} + {{ b.showValue }} @@ -502,53 +74,61 @@ - - + + + {{ f.showValue }} - - + + - + + - + {{ ques.showValue }} - + @@ -556,83 +136,100 @@ - - - {{ b.showValue }} + + + {{ b.showValue }} - + - + - - + + - + {{ ques.showValue }} - + + :max-length="500" + @change="inputChange1(a.id, $event, j.showValue, a.recordId, a.optionVos)" + /> - 说明: + 说明: - - - + + + {{ f.showValue }} - + - + - + - - + + @@ -653,7 +250,7 @@ @@ -663,17 +260,17 @@ @@ -689,11 +286,11 @@ - + {{ f.showValue }} @@ -715,6 +312,7 @@ > @@ -795,6 +395,7 @@ - 说明: + 说明: @@ -828,11 +429,13 @@ :label="p.question" > @@ -844,7 +447,7 @@ @@ -858,16 +461,482 @@ - - - {{ e.units }} + + + {{ a.units }} - 图片识别 + 图片识别 - - + + + + + {{ w.name }}: + + + + + + + + {{ b.showValue }} + + + + + {{ ques.showValue }} + + + + + {{ b.showValue }} + + + + + 点击上传 + + + + + + {{ f.showValue }} + + + + + + + + + + + + + + {{ ques.showValue }} + + + + + + + + + + + + + + + {{ b.showValue }} + + + + + + + + + + + + + + {{ ques.showValue }} + + + + + + + + + + 说明: + + + + + + + {{ f.showValue }} + + + + + + + + + + + + + + + {{ b.showValue }} + + + + + + {{ ques.showValue }} + + + + + + {{ b.showValue }} + + + + + + 点击上传 + + + + + + + {{ f.showValue }} + + + + + + + + + + + + + + + {{ ques.showValue }} + + + + + + + + + + + + + + + + {{ b.showValue }} + + + + + + + + + + + + + + + {{ ques.showValue }} + + + + + + + + + + 说明: + + + + + + + {{ f.showValue }} + + + + + + + + + qwe + + + + + + + + {{ h.units }} + + 图片识别 + + + + + + + + + + {{ e.units }} + + 图片识别 + + + + + + + +