shihang il y a 6 ans
Parent
commit
3a2e8798ec

+ 10 - 4
src/dashoo.cn/backend/api/conf/app.conf

@@ -23,11 +23,17 @@ type=mysql
 #user=ixcell
 #pwd=ixcell123456
 
+#阿里云 BioBank服务器
+name=biobank_db
+host=47.92.238.200
+user=biobank_user
+pwd=8ebE5iH4Vo7I
+
 #AWS BioBank服务器
-name=BiobankDB
-host=mydb01.cnbkzlqg5w7l.rds.cn-north-1.amazonaws.com.cn
-user=mydb01_user
-pwd=mydb01_user58717168
+#name=BiobankDB
+#host=mydb01.cnbkzlqg5w7l.rds.cn-north-1.amazonaws.com.cn
+#user=mydb01_user
+#pwd=mydb01_user58717168
 
 #临沂 BioBank服务器
 #name=BiobankDB

Fichier diff supprimé car celui-ci est trop grand
+ 897 - 82
src/dashoo.cn/backend/api/controllers/home.go


+ 2 - 2
src/dashoo.cn/frontend_web/nuxt.config.js

@@ -159,8 +159,8 @@ module.exports = {
   },
 
   axios: {
-    // baseURL: '//localhost:9081/api/' // 本机开发使用
-    baseURL: '//52.80.133.197:9081/api/' // BioBank on AWS发布使用
+    baseURL: '//localhost:9081/api/' // 本机开发使用
+    // baseURL: '//47.92.238.200:9081/api/' // BioBank on AWS发布使用
     // baseURL: '//188.188.30.89:9081/api/' //临沂使用
     // baseURL: '//api09.labsop.cn/api/'
     // baseURL: '//192.168.0.211:10091/api/' // 花生所系统

+ 1 - 0
src/dashoo.cn/frontend_web/src/pages/samples/prerecorded/index.vue

@@ -1346,6 +1346,7 @@
         // 执行打印操作
         window.PrintReport(this.Printscheme,
           `samplespreinput,${this.peintitemid},${this.authUser.Profile.AccCode}`)
+          console.log("00000000000000p",this.Printscheme)
       }
     }
   }

+ 4 - 2
src/dashoo.cn/frontend_web/src/static/js/printUtilities.js

@@ -158,13 +158,15 @@ function doPrint(aname) {
 }
 
 function PrintReport(repID, param) {
+  console.log("2222222222222222222222",repID,param)
   param = utf16to8(param);
   param = base64encode(param);
   param = param.replace("+", "%2B");
   var href = "bmisrep://rep=" + repID + "&param=" + param;
-  //var url = "localhost:10091"
-  var url= "52.80.133.197:9081"
+  var url = "localhost:10091"
+  //var url= "47.92.238.200:9081"
   href = href + "&host=" + url;
+  console.log("222222222222222",href)
 
   if (typeof preview == "undefined") {
     preview = true;

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff