1.蜜蜂所首页样本统计表，2.修改发版方式的url

src/dashoo.cn/backend/api/business/samplesfileinfo/samplesfileinfoService.go

@@ -2,6 +2,7 @@ package samplesfileinfo
 
 import (
 	"strconv"
+	"strings"
 
 	. "dashoo.cn/backend/api/models"
 	. "dashoo.cn/backend/api/mydb"
@@ -32,7 +33,13 @@ func (s *SamplesFileInfoService) GetPagingEntitiesWithOrderSearch(acccode string
 	}
 	tblmain := acccode + SamplesMaintbName
 	tbldetail := acccode + SamplesDetailFiletbName
-	tbldonor := acccode + DonorstbName
+	//当是蜜蜂所用户时，取acccode + AnimalInfoName  动物表数据
+	tbldonor := ""
+	if(strings.EqualFold(acccode,"sBBo4")){
+		tbldonor = acccode + AnimalInfoName
+	}else{
+		tbldonor = acccode + DonorstbName
+	}
 	groupdetail := acccode + GroupDetailName
 
 	sqlCount := " select count(*) from " + tbldetail + " a  left join " + tblmain + " b on a.SampleCode = b.SampleCode left join " + tbldonor + " c on b.SourceId = c.Id left join " + groupdetail + " d on d.SampleId = a.Id where " + where

src/dashoo.cn/backend/api/business/samplesinfo/samplesinfoService.go

@@ -49,7 +49,13 @@ func (s *SamplesInfoService) GetPagingEntitiesWithOrderSearch(acccode string, pa
 	}
 	tbldetail := acccode + SamplesDetailtbName
 	tblmain := acccode + SamplesMaintbName
-	tbldonor := acccode + DonorstbName
+	//当是蜜蜂所用户时，取acccode + AnimalInfoName  动物表数据
+	tbldonor := ""
+	if(strings.EqualFold(acccode,"sBBo4")){
+		tbldonor = acccode + AnimalInfoName
+	}else{
+		tbldonor = acccode + DonorstbName
+	}
 	groupdetail := acccode + GroupDetailName
 
 	sqlCount := " select count(*) from " + tbldetail + " a  left join " + tblmain + " b on a.SampleCode = b.SampleCode left join " + tbldonor + " c on b.SourceId = c.Id left join Shelf d on a.ShelfId=d.Id left join Box e on a.BoxId=e.Id left join Equipment f on a.EquipmentId=f.Id left join " + groupdetail + " g on g.SampleId=a.Id where " + where

src/dashoo.cn/frontend_animal/nuxt.config.js

@@ -16,17 +16,17 @@ module.exports = {
   head: {
     title: '样本库系统',
     meta: [{
-        charset: 'utf-8'
-      },
-      {
-        name: 'viewport',
-        content: 'width=device-width, initial-scale=1'
-      },
-      {
-        hid: 'description',
-        name: 'description',
-        content: '样本库系统'
-      }
+      charset: 'utf-8'
+    },
+    {
+      name: 'viewport',
+      content: 'width=device-width, initial-scale=1'
+    },
+    {
+      hid: 'description',
+      name: 'description',
+      content: '样本库系统'
+    }
     ],
     link: [{
       rel: 'icon',
@@ -34,12 +34,12 @@ module.exports = {
       href: '/favicon.ico'
     }],
     script: [{
-        src: '/js/utils.js'
-      },
-      {
-        src: '/js/printUtilities.js'
-      }
-    ],
+      src: '/js/utils.js'
+    },
+    {
+      src: '/js/printUtilities.js'
+    }
+    ]
   },
   /*
    ** Customize the progress bar color
@@ -54,7 +54,7 @@ module.exports = {
     babel: {
       plugins: ['transform-decorators-legacy', 'transform-class-properties']
     },
-    extend(config, {
+    extend (config, {
       isDev,
       isClient
     }) {
@@ -129,7 +129,7 @@ module.exports = {
   modules: [
     // '@nuxtjs/auth',
     '~/modules/auth',
-    '@nuxtjs/axios',
+    '@nuxtjs/axios'
   ],
   auth: {
     user: {
@@ -159,8 +159,8 @@ module.exports = {
   },
 
   axios: {
-    // baseURL: '//localhost:9081/api/' // 本机开发使用
-    baseURL: '//192.168.0.192:9081/api/' // 蜜蜂所使用
+    baseURL: '//localhost:9081/api/' // 本机开发使用
+    // baseURL: '/api/' // 蜜蜂所正式发版使用
     // baseURL: '//47.92.238.200:9081/api/' // BioBank on ALi发布使用
     // baseURL: '//188.188.30.89:9081/api/' //临沂使用
     // baseURL: '//api09.labsop.cn/api/'
@@ -174,16 +174,16 @@ module.exports = {
    ** 客户端使用：process.env.appclient 服务端使用：context.appclient
    */
   env: {
-    appclient: 'biobank', //因顿LIMS:lims,样本库：biobank,细胞制备：cellbank，样本搜索判断，登录跳转判断
+    appclient: 'biobank', // 因顿LIMS:lims,样本库：biobank,细胞制备：cellbank，样本搜索判断，登录跳转判断
 
-    //imgserverhost: 'http://47.92.238.200:9081', // BioBank服务地址,图片上传文件    
+    // imgserverhost: 'http://47.92.238.200:9081', // BioBank服务地址,图片上传文件
     // imgserverhost: 'http://localhost:9081', // BioBank服务地址,图片上传文件
     // upfilehost: 'http://weed1.labsop.cn:9333/dir/assign', // 附件上传
-    imgserverhost: 'http://192.168.0.192:9081', // 蜜蜂所服务地址,图片上传文件
-    upfilehost: 'http://192.168.0.192:9333/dir/assign', // 蜜蜂所附件上传
+    imgserverhost: '/serveruploadfile', // 蜜蜂所服务地址,图片上传文件
+    upfilehost: '/uploadfile' // 蜜蜂所附件上传
 
-    //imgserverhost: 'http://188.188.30.89:9081', // 临沂服务地址,图片上传文件
-    //upfilehost: '188.188.30.89:9333/dir/assign', // 临沂附件上传
+    // imgserverhost: 'http://188.188.30.89:9081', // 临沂服务地址,图片上传文件
+    // upfilehost: '188.188.30.89:9333/dir/assign', // 临沂附件上传
 
   }
 }

src/dashoo.cn/frontend_web/src/pages/biobank/sampleRK/_opera/operation.vue

@@ -144,7 +144,7 @@
                 <legend style="color:#436EEE"></legend>
                 <i class="icon icon-paragraph-justify">样本信息</i>
                 <span style="float: right;">
-                  <el-button type="primary" class="el-button--mini" @click="EquipmentlistShow" :disabled="SampleRKform.ApplyStatus != 0">样本存储AAAAAA</el-button>
+                  <el-button type="primary" class="el-button--mini" @click="EquipmentlistShow" :disabled="SampleRKform.ApplyStatus != 0">样本存储</el-button>
                 </span>
               </div>
               <el-table :data="SamplesList" border style="width: 100%" @selection-change="handleSelectionChange">
@@ -175,7 +175,7 @@
     </el-card>
 
     <!-- 获取容器列表 -->
-    <el-dialog title="样本存储BBB" :visible.sync="Equipmentdialog">
+    <el-dialog title="样本存储" :visible.sync="Equipmentdialog">
       <el-form :model="equipmentForm" :rules="storarules" ref="equipmentForm">
         <el-form-item label="选择存储容器" prop="EquipmentId" required label-width="120px">
           <el-select v-model="equipmentForm.EquipmentId" placeholder="请选择存储容器" style="width:100%">