From 8cac0e32b97480422f5c34831490767a5ded8397 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 9 Sep 2024 14:20:36 +0800
Subject: [PATCH] pic

---
 public/sysConfig.json                       |  4 +--
 src/components/doctorCheck/CheckPicture.vue | 34 +++++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/public/sysConfig.json b/public/sysConfig.json
index adc08ae..41ac789 100644
--- a/public/sysConfig.json
+++ b/public/sysConfig.json
@@ -1,5 +1,5 @@
 {
-    "apiurl": "http://140.143.162.39:9529",
+    "apiurl": "http://192.168.2.67:9529/",
     "softName": "神豚体检管理系统",
-    "pacsApi":"http://140.143.162.39:9530"
+    "pacsApi":"http://192.168.2.74:9529/"
 }
\ No newline at end of file
diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue
index e584688..3414ba7 100644
--- a/src/components/doctorCheck/CheckPicture.vue
+++ b/src/components/doctorCheck/CheckPicture.vue
@@ -69,6 +69,7 @@ import { mapState } from "vuex";
 import { Loading } from "element-ui";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { getPagePriv, checkPagePriv, deepCopy, arrayExistObj } from "../../utlis/proFunc";
+import { hadoopGet, hadoopPost, hadoopPut, hadoopDel } from "../../api/hadoopApi"
 import CheckPictureUpload from "./CheckPictureUpload.vue";
 
 export default {
@@ -154,16 +155,16 @@ export default {
       //   "creatorId": "3a0c4180-107c-0c89-b25b-0bd34666dcec",
       //   "id": "3a0f6a3c-88a5-d5f7-d59b-ef3b38074901"
       // }
-      getapi(
-        `/api/app/registercheckpicture/getregistercheckpictureinregistercheckid?RegisterCheckId=${registerCheckId}`
-      ).then((res) => {
-        if (res.code > -1) {
-          this.checkPictures = res.data
-          this.checkPictures.forEach(e => {
-            e.isPrintTrans = e.isPrint == "Y" ? true : false
-          });
-        }
-      });
+      hadoopGet('pacsApi', `/api/app/registercheckpicture/getregistercheckpictureinregistercheckid?RegisterCheckId=${registerCheckId}`)
+        // getapi(`/api/app/registercheckpicture/getregistercheckpictureinregistercheckid?RegisterCheckId=${registerCheckId}`)
+        .then((res) => {
+          if (res.code > -1) {
+            this.checkPictures = res.data
+            this.checkPictures.forEach(e => {
+              e.isPrintTrans = e.isPrint == "Y" ? true : false
+            });
+          }
+        });
     },
 
     // 生成 图片预览列表
@@ -171,7 +172,7 @@ export default {
       let srcList = []
       let image = curImag.pictureFilename.indexOf('http') > -1
         ? curImag.pictureFilename
-        : this.sysConfig.apiurl + curImag.pictureFilename;
+        : (this.sysConfig.pacsApi || this.sysConfig.apiurl) + curImag.pictureFilename;
       srcList.push(image)
       let lfind = arrayExistObj(oriList, 'id', curImag.id)
       if (lfind > -1) {
@@ -194,7 +195,7 @@ export default {
       if (fileName.indexOf('base64') > -1 || fileName.indexOf('http') > -1) {
         return fileName
       } else {
-        return this.sysConfig.apiurl + fileName
+        return (this.sysConfig.pacsApi || this.sysConfig.apiurl) + fileName
       }
     },
 
@@ -229,7 +230,7 @@ export default {
       this.$peisAPI.imageAcquisition(JSON.stringify(toOutShell))
         .then(async (res) => {
           let lres = JSON.parse(res)
-          console.log('this.$peisAPI.imageAcquisition',lres)
+          console.log('this.$peisAPI.imageAcquisition', lres)
           if (lres.code > -1) {
             for (let i = 0; i < lres.data.length; i++) {
               let item = lres.data[i];
@@ -261,14 +262,15 @@ export default {
                 }]
               }
               try {
-                await postapi('/api/app/RegisterCheckPicture/InstrumentMapping', body)
+                //await postapi('/api/app/RegisterCheckPicture/InstrumentMapping', body)
+                await hadoopPost('pacsApi', '/api/app/RegisterCheckPicture/InstrumentMapping', body)
               } catch (error) {
                 console.log('btnGetPic err', error)
               }
             }
             this.getCheckPictures(this.dataTransOpts.tableS.register_check.id)
-          }else{
-            console.log('this.$peisAPI.imageAcquisition',lres.message)
+          } else {
+            console.log('this.$peisAPI.imageAcquisition', lres.message)
           }
         }).catch(err => {
           this.$message.error(err)