|
|
|
@ -44,34 +44,46 @@ |
|
|
|
size="small" |
|
|
|
>P</el-button |
|
|
|
> |
|
|
|
<!-- <el-popover placement="top-end" width="500" trigger="click" :title="scope.row.itemName"> |
|
|
|
<el-button |
|
|
|
style="min-width: 23px; padding: 5.8px; margin-left: 2px" |
|
|
|
:disabled="rowResultDisabled(scope.row)" |
|
|
|
@click="btnPacsRessulst(scope.row)" |
|
|
|
size="small" |
|
|
|
>S</el-button |
|
|
|
> |
|
|
|
<!-- <el-popover |
|
|
|
placement="top-end" |
|
|
|
width="500" |
|
|
|
trigger="click" |
|
|
|
:title="scope.row.itemName" |
|
|
|
> |
|
|
|
<el-tabs v-model="activeName"> |
|
|
|
<el-tab-pane label="文字结果" name="first"> |
|
|
|
<el-table :data="gridData"> |
|
|
|
<el-table-column |
|
|
|
width="150" |
|
|
|
property="date" |
|
|
|
label="日期" |
|
|
|
></el-table-column> |
|
|
|
<el-table-column |
|
|
|
width="100" |
|
|
|
property="name" |
|
|
|
label="姓名" |
|
|
|
property="checkDate" |
|
|
|
label="检查日期" |
|
|
|
align="center" |
|
|
|
></el-table-column> |
|
|
|
<el-table-column |
|
|
|
width="300" |
|
|
|
property="address" |
|
|
|
label="地址" |
|
|
|
property="itemResult" |
|
|
|
label="项目结果" |
|
|
|
align="center" |
|
|
|
></el-table-column> |
|
|
|
</el-table> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="折线图" name="second"></el-tab-pane> |
|
|
|
<el-tab-pane label="折线图" name="second"> |
|
|
|
<div |
|
|
|
style="height: 200px; width: 200px" |
|
|
|
ref="chart" |
|
|
|
></div> |
|
|
|
</el-tab-pane> |
|
|
|
</el-tabs> |
|
|
|
<el-button |
|
|
|
slot="reference" |
|
|
|
style="min-width: 23px; padding: 5.8px; margin-left: 2px" |
|
|
|
:disabled="rowResultDisabled(scope.row)" |
|
|
|
@click="btnPacsRessulst(scope.row, scope.$index)" |
|
|
|
@click="btnPacsRessulst(scope.row)" |
|
|
|
size="small" |
|
|
|
>S</el-button |
|
|
|
> |
|
|
|
@ -262,6 +274,35 @@ |
|
|
|
:refFuncOther="handlePacsResult" |
|
|
|
/> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<el-dialog |
|
|
|
:title="curRow.itemName" |
|
|
|
:visible.sync="previousResults" |
|
|
|
width="500px" |
|
|
|
:close-on-click-modal="true" |
|
|
|
:show-close="false" |
|
|
|
@close="resultsclose" |
|
|
|
> |
|
|
|
<el-tabs v-model="activeName"> |
|
|
|
<el-tab-pane label="文字结果" name="first"> |
|
|
|
<el-table :data="gridData"> |
|
|
|
<el-table-column |
|
|
|
property="checkDate" |
|
|
|
label="检查日期" |
|
|
|
align="center" |
|
|
|
></el-table-column> |
|
|
|
<el-table-column |
|
|
|
property="itemResult" |
|
|
|
label="项目结果" |
|
|
|
align="center" |
|
|
|
></el-table-column> |
|
|
|
</el-table> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="折线图" name="second"> |
|
|
|
<div style="height: 400px; width: 500px" ref="chart1"></div> |
|
|
|
</el-tab-pane> |
|
|
|
</el-tabs> |
|
|
|
</el-dialog> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
@ -271,7 +312,7 @@ import { mapState } from "vuex"; |
|
|
|
import { getapi, postapi, putapi, deletapi } from "@/api/api"; |
|
|
|
import { arrayExistObj, dddw, deepCopy } from "../../utlis/proFunc"; |
|
|
|
import PacsTemplate from "./PacsTemplate.vue"; |
|
|
|
|
|
|
|
import * as echarts from "echarts"; |
|
|
|
export default { |
|
|
|
components: { |
|
|
|
PacsTemplate, |
|
|
|
@ -280,28 +321,8 @@ export default { |
|
|
|
data() { |
|
|
|
return { |
|
|
|
activeName: "first", |
|
|
|
gridData: [ |
|
|
|
{ |
|
|
|
date: "2016-05-02", |
|
|
|
name: "王小虎", |
|
|
|
address: "上海市普陀区金沙江路 1518 弄", |
|
|
|
}, |
|
|
|
{ |
|
|
|
date: "2016-05-04", |
|
|
|
name: "王小虎", |
|
|
|
address: "上海市普陀区金沙江路 1518 弄", |
|
|
|
}, |
|
|
|
{ |
|
|
|
date: "2016-05-01", |
|
|
|
name: "王小虎", |
|
|
|
address: "上海市普陀区金沙江路 1518 弄", |
|
|
|
}, |
|
|
|
{ |
|
|
|
date: "2016-05-03", |
|
|
|
name: "王小虎", |
|
|
|
address: "上海市普陀区金沙江路 1518 弄", |
|
|
|
}, |
|
|
|
], |
|
|
|
previousResults:false, |
|
|
|
gridData: [], |
|
|
|
resultStatus: [], //结果状态提示数据 |
|
|
|
tipsNormal: { |
|
|
|
id: "01", |
|
|
|
@ -353,6 +374,7 @@ export default { |
|
|
|
result: "", |
|
|
|
summary: "", |
|
|
|
}, |
|
|
|
curRow:{} |
|
|
|
}; |
|
|
|
}, |
|
|
|
|
|
|
|
@ -448,9 +470,90 @@ export default { |
|
|
|
} |
|
|
|
}); |
|
|
|
}, |
|
|
|
btnPacsRessulst(row, index) { |
|
|
|
console.log("显示", row); |
|
|
|
btnPacsRessulst(row) { |
|
|
|
this.curRow = row; |
|
|
|
postapi("/api/app/RegisterCheckItem/GetItemTwoHistoricalResults", { |
|
|
|
registerCheckId: row.registerCheckId, |
|
|
|
itemId: row.itemId, |
|
|
|
}).then((res) => { |
|
|
|
if (res.code != -1) { |
|
|
|
this.previousResults=true |
|
|
|
this.gridData = res.data; |
|
|
|
this.$nextTick(()=>{ |
|
|
|
this.initEcharts(); |
|
|
|
}) |
|
|
|
} |
|
|
|
}); |
|
|
|
}, |
|
|
|
initEcharts() { |
|
|
|
let yAxisData = []; |
|
|
|
let xAxisData = []; |
|
|
|
for(let i=0;i<this.gridData.length;i++){ |
|
|
|
if(this.gridData[i].checkDate){ |
|
|
|
xAxisData.push(this.gridData[i].checkDate) |
|
|
|
yAxisData.push(this.gridData[i].itemResult) |
|
|
|
} |
|
|
|
} |
|
|
|
let myChart = echarts.init(this.$refs.chart1); |
|
|
|
let option1 = { |
|
|
|
tooltip: { |
|
|
|
trigger: "axis", |
|
|
|
confine: true, |
|
|
|
}, |
|
|
|
legend: { |
|
|
|
type: "scroll", |
|
|
|
orient: "horizontal", // 垂直 |
|
|
|
right: "3%", // 左对齐 |
|
|
|
top: "0%", // 位于顶部 |
|
|
|
}, |
|
|
|
grid: { |
|
|
|
show: false, |
|
|
|
left: "2%", |
|
|
|
right: "2%", |
|
|
|
top: "6%", |
|
|
|
bottom: "0%", |
|
|
|
containLabel: true, |
|
|
|
}, |
|
|
|
xAxis: { |
|
|
|
type: "category", |
|
|
|
data: xAxisData, |
|
|
|
axisLabel: { |
|
|
|
textStyle: { |
|
|
|
fontSize: "14", |
|
|
|
}, |
|
|
|
}, |
|
|
|
axisLine: { |
|
|
|
show: true, |
|
|
|
}, |
|
|
|
}, |
|
|
|
yAxis: { |
|
|
|
type: "value", |
|
|
|
axisLabel: { |
|
|
|
textStyle: { |
|
|
|
fontSize: "14", |
|
|
|
}, |
|
|
|
}, |
|
|
|
}, |
|
|
|
series: [ |
|
|
|
{ |
|
|
|
name: "项目结果", |
|
|
|
type: "line", |
|
|
|
data: yAxisData, |
|
|
|
}, |
|
|
|
], |
|
|
|
}; |
|
|
|
myChart.setOption(option1) |
|
|
|
}, |
|
|
|
resultsclose(){ |
|
|
|
this.activeName="first" |
|
|
|
}, |
|
|
|
// chartTabs(tab) { |
|
|
|
// if (tab.name == "second") { |
|
|
|
// this.$nextTick(() => { |
|
|
|
// this.initEcharts(); |
|
|
|
// }); |
|
|
|
// } |
|
|
|
// }, |
|
|
|
// 颜色转换 |
|
|
|
// displayName: "错误", |
|
|
|
// dataInputPrompt: "×", |
|
|
|
@ -702,8 +805,6 @@ export default { |
|
|
|
this.dialogWinPacsTemplate = true; |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 双击选择结果模版的结果 |
|
|
|
dblclickResult(item) { |
|
|
|
this.moreResult.result = ""; |
|
|
|
|
罗斌杰
1 year ago