diff --git a/public/sysConfig.json b/public/sysConfig.json index 4333d45..406f5e0 100644 --- a/public/sysConfig.json +++ b/public/sysConfig.json @@ -1,5 +1,6 @@ { "apiurl": "http://192.168.2.67:9529", "softName": "神豚体检管理系统", - "pacsApi":"http://192.168.2.74:9529" + "pacsApi":"http://192.168.2.74:9529", + "dcmServe":"http://192.168.2.67:5081" } \ No newline at end of file diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue index 3414ba7..3282bec 100644 --- a/src/components/doctorCheck/CheckPicture.vue +++ b/src/components/doctorCheck/CheckPicture.vue @@ -5,18 +5,26 @@ 采图 -
- 导图 -
-
- 裁图 +
+ Dcm
保存
+ + + + 更多 + + + 导入图片 + 裁剪图片 + +
@@ -128,7 +136,7 @@ export default { "dataTransOpts", "doctorCheck", "patientRegister", - "customerOrg", + "customerOrg" ]), lmoment(date, forMat) { return moment(new Date(date)).format(forMat); @@ -280,6 +288,38 @@ export default { }, + // 浏览Dcm文件 + btnBrowseDcm() { + if (!this.doctorCheck.RegisterCheckId) { + this.$message.warning({ showClose: true, message: "未选中组合项目！" }); + return; + } + + // 创建一个新的 元素 + let a = document.createElement('a'); + + // 设置 href 属性为要跳转的 URL + a.href = `${this.sysConfig.dcmServe}/?mrn=0000002`; + + //（可选）设置 target 属性，比如在新窗口打开 + a.target = '_blank'; + + //（可选）防止浏览器将链接添加到历史记录 + a.rel = 'noopener noreferrer'; + + // 将新创建的 元素添加到 DOM 中 + // 注意：这一步是可选的，如果你只想模拟点击而不想在页面上显示 元素，可以省略这一步 + // document.body.appendChild(a); + + // 模拟点击 元素 + a.click(); + + //（可选）移除刚才添加到 DOM 中的 元素 + // 如果你选择了将 元素添加到 DOM 中，现在可以移除它 + // document.body.removeChild(a); + + }, + //导图（上传图片） btnExpPic() { if (!this.doctorCheck.RegisterCheckId) { diff --git a/src/components/doctorCheck/CheckPictureUpload.vue b/src/components/doctorCheck/CheckPictureUpload.vue index 777e468..050e94d 100644 --- a/src/components/doctorCheck/CheckPictureUpload.vue +++ b/src/components/doctorCheck/CheckPictureUpload.vue @@ -41,6 +41,7 @@ import moment from "moment"; import { mapState } from "vuex"; import { getapi, postapi, putapi, deletapi } from "@/api/api"; +import { hadoopGet, hadoopPost, hadoopPut, hadoopDel } from "../../api/hadoopApi" import { arrayExistObj, deepCopy } from '@/utlis/proFunc'; @@ -62,7 +63,7 @@ export default { mounted() { }, computed: { - ...mapState(["dict", "doctorCheck", "patientRegister", "customerOrg"]), + ...mapState(["dict", "doctorCheck", "patientRegister", "customerOrg","sysConfig"]), lmoment(date, forMat) { return moment(new Date(date)).format(forMat); }, @@ -127,7 +128,9 @@ export default { pictureBaseStr: data }] } - postapi('/api/app/registercheckpicture/uploadregistercheckpicturemany', body) + + // postapi('/api/app/registercheckpicture/uploadregistercheckpicturemany', body) //体检服务器 + hadoopPost('pacsApi','/api/app/registercheckpicture/uploadregistercheckpicturemany', body) // 图片服务器 .then(res => { if (res.code != -1) { count++; diff --git a/src/components/occDisease/ImageTextReport.vue b/src/components/occDisease/ImageTextReport.vue index 4e92eab..6cf91bd 100644 --- a/src/components/occDisease/ImageTextReport.vue +++ b/src/components/occDisease/ImageTextReport.vue @@ -83,7 +83,6 @@ export default { this.tableData = [] return } - postapi('/api/app/OccupationalDisease/GetRegisterCheckPictureByPatientRegisterId', { patientRegisterId }) .then((res) => { console.log("获取图文报告 CheckDetails", res.data); @@ -99,18 +98,18 @@ export default { // 生成 图片预览列表 previewSrcList(oriList, curImag) { let srcList = [] - let image = curImag.indexOf('http') > -1 ? curImag : this.sysConfig.apiurl + curImag; + let image = curImag.indexOf('http') > -1 ? curImag : (this.sysConfig.pacsApi || this.sysConfig.apiurl) + curImag; srcList.push(image) let lfind = arrayExistObj(oriList, 'id', curImag.id) if (lfind > -1) { for (let i = lfind + 1; i < oriList.length; i++) { let e = oriList[i]; - image = e.indexOf('http') > -1 ? e : this.sysConfig.apiurl + e; + image = e.indexOf('http') > -1 ? e : (this.sysConfig.pacsApi || this.sysConfig.apiurl) + e; srcList.push(image) } for (let index = 0; index < lfind; index++) { let e = oriList[index]; - image = e.indexOf('http') > -1 ? e : this.sysConfig.apiurl + e; + image = e.indexOf('http') > -1 ? e : (this.sysConfig.pacsApi || this.sysConfig.apiurl) + e; srcList.push(image) } } diff --git a/src/views/HomeBak.vue b/src/views/HomeBak.vue deleted file mode 100644 index d3094ee..0000000 --- a/src/views/HomeBak.vue +++ /dev/null @@ -1,1062 +0,0 @@ - - - diff --git a/src/views/doctorCheck/checkPicImport.vue b/src/views/doctorCheck/checkPicImport.vue index ce0f22e..ef409d0 100644 --- a/src/views/doctorCheck/checkPicImport.vue +++ b/src/views/doctorCheck/checkPicImport.vue @@ -125,6 +125,7 @@ import { read, readFile, utils } from "xlsx"; import FileSaver from 'file-saver'; import { getapi, postapi, putapi, deletapi } from "@/api/api"; +import { hadoopGet, hadoopPost, hadoopPut, hadoopDel } from "../../api/hadoopApi" import { getPagePriv, checkPagePriv, deepCopy, arrayExistObj, arrayFilter, dddw, tcdate } from '../../utlis/proFunc'; import ElProgressOCX from "../../components/report/ElProgressOCX.vue"; @@ -162,6 +163,7 @@ export default { //获取用户当前页面的权限 let userPriv = window.sessionStorage.getItem('userPriv') if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName)) + // console.log("this.sysConfig",this.sysConfig) }, //页面挂载完成，一般页面渲染数据放在这里 @@ -171,7 +173,7 @@ export default { }, computed: { - ...mapState(["window", "dict", "elProgress", "patientRegister", "customerOrg"]), + ...mapState(["window", "dict", "elProgress", "patientRegister", "customerOrg","sysConfig"]), }, methods: { @@ -391,7 +393,8 @@ export default { break; } - postapi(url, body) + // postapi(url, body) // 体检服务器 + hadoopPost('pacsApi',url, body) // 图片服务器 .then(res => { if (res.code > -1) { rd.importState = "导入成功"